From b5b67adcc17e3e74dbcda09ff3f8a4636aa53486 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 18 May 2024 19:40:22 +0200 Subject: Merging debian version 6.7.7-1. Signed-off-by: Daniel Baumann --- debian/bin/diff-gencontrol | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100755 debian/bin/diff-gencontrol (limited to 'debian/bin/diff-gencontrol') diff --git a/debian/bin/diff-gencontrol b/debian/bin/diff-gencontrol new file mode 100755 index 0000000000..b84823e031 --- /dev/null +++ b/debian/bin/diff-gencontrol @@ -0,0 +1,30 @@ +#!/bin/bash +set -euE + +REF_BASE=${1:-master} + +REPO=$(git rev-parse --show-toplevel) +COMMIT_BASE=$(git merge-base --fork-point "$REF_BASE") + +TMP=$(mktemp -d) +trap "rm -rf '$TMP'" EXIT + +function git { + command git -c advice.detachedHead=false -c init.defaultBranch=main -C "$TMP" "$@" +} + +git init -q +git remote add origin "$REPO" +git fetch -q --depth 1 origin "$COMMIT_BASE" +git checkout -q FETCH_HEAD + +for i in "$TMP" "$REPO"; do + pushd "$i" > /dev/null + echo "Running gencontrol in '$i'" + ./debian/bin/gencontrol.py + popd > /dev/null +done + +for i in control rules.gen generated.signed-amd64 generated.signed-arm64; do + diff -ruN "$TMP"/debian/$i "$REPO"/debian/$i | wdiff -dn | colordiff +done -- cgit v1.2.3