From b27bff26a9640dfdfba4fc711a9b28acb4501d2b Mon Sep 17 00:00:00 2001 From: Diego Santa Cruz Date: Tue, 9 Mar 2021 14:05:46 +0100 Subject: sstate-diff-machines.sh: support rpm, deb and tar package types in analysis The sstate-diff-machines.sh script's --analyze option was only supporting ipk packages, this adds rpm, deb and tar packages, checking all the used package types simultaneously. Without this changing sstate between machines would not report an error if the difference occured in packages and ipk packaging was not enabled. Signed-off-by: Diego Santa Cruz Signed-off-by: Richard Purdie --- scripts/sstate-diff-machines.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/sstate-diff-machines.sh b/scripts/sstate-diff-machines.sh index 1d721eb87d..8b64e11be1 100755 --- a/scripts/sstate-diff-machines.sh +++ b/scripts/sstate-diff-machines.sh @@ -127,6 +127,8 @@ for M in ${machines}; do fi done +COMPARE_TASKS="do_configure.sigdata do_populate_sysroot.sigdata do_package_write_ipk.sigdata do_package_write_rpm.sigdata do_package_write_deb.sigdata do_package_write_tar.sigdata" + function compareSignatures() { MACHINE1=$1 MACHINE2=$2 @@ -134,7 +136,7 @@ function compareSignatures() { PRE_PATTERN="" [ -n "${PATTERN}" ] || PRE_PATTERN="-v" [ -n "${PATTERN}" ] || PATTERN="MACHINE" - for TASK in do_configure.sigdata do_populate_sysroot.sigdata do_package_write_ipk.sigdata; do + for TASK in $COMPARE_TASKS; do printf "\n\n === Comparing signatures for task ${TASK} between ${MACHINE1} and ${MACHINE2} ===\n" | tee -a ${OUTPUT}/signatures.${MACHINE2}.${TASK}.log diff ${OUTPUT}/${MACHINE1}/list.M ${OUTPUT}/${MACHINE2}/list.M | grep ${PRE_PATTERN} "${PATTERN}" | grep ${TASK} > ${OUTPUT}/signatures.${MACHINE2}.${TASK} for i in `cat ${OUTPUT}/signatures.${MACHINE2}.${TASK} | sed 's#[^/]*/\([^/]*\)/.*#\1#g' | sort -u | xargs`; do -- cgit 1.2.3-korg