summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorDiego Santa Cruz <Diego.SantaCruz@spinetix.com>2021-03-09 14:05:46 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-03-10 10:30:39 +0000
commitaafa7a3f3a06bef6ad797d085e2788928571b74c (patch)
tree7378717967046bc21e653bb761a238e69388c550 /scripts
parent90a39ca9f4ce845aff84eeda1165f49e98c88315 (diff)
downloadpoky-aafa7a3f3a06bef6ad797d085e2788928571b74c.tar.gz
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. (From OE-Core rev: b27bff26a9640dfdfba4fc711a9b28acb4501d2b) Signed-off-by: Diego Santa Cruz <Diego.SantaCruz@spinetix.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/sstate-diff-machines.sh4
1 files changed, 3 insertions, 1 deletions
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
127 fi 127 fi
128done 128done
129 129
130COMPARE_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"
131
130function compareSignatures() { 132function compareSignatures() {
131 MACHINE1=$1 133 MACHINE1=$1
132 MACHINE2=$2 134 MACHINE2=$2
@@ -134,7 +136,7 @@ function compareSignatures() {
134 PRE_PATTERN="" 136 PRE_PATTERN=""
135 [ -n "${PATTERN}" ] || PRE_PATTERN="-v" 137 [ -n "${PATTERN}" ] || PRE_PATTERN="-v"
136 [ -n "${PATTERN}" ] || PATTERN="MACHINE" 138 [ -n "${PATTERN}" ] || PATTERN="MACHINE"
137 for TASK in do_configure.sigdata do_populate_sysroot.sigdata do_package_write_ipk.sigdata; do 139 for TASK in $COMPARE_TASKS; do
138 printf "\n\n === Comparing signatures for task ${TASK} between ${MACHINE1} and ${MACHINE2} ===\n" | tee -a ${OUTPUT}/signatures.${MACHINE2}.${TASK}.log 140 printf "\n\n === Comparing signatures for task ${TASK} between ${MACHINE1} and ${MACHINE2} ===\n" | tee -a ${OUTPUT}/signatures.${MACHINE2}.${TASK}.log
139 diff ${OUTPUT}/${MACHINE1}/list.M ${OUTPUT}/${MACHINE2}/list.M | grep ${PRE_PATTERN} "${PATTERN}" | grep ${TASK} > ${OUTPUT}/signatures.${MACHINE2}.${TASK} 141 diff ${OUTPUT}/${MACHINE1}/list.M ${OUTPUT}/${MACHINE2}/list.M | grep ${PRE_PATTERN} "${PATTERN}" | grep ${TASK} > ${OUTPUT}/signatures.${MACHINE2}.${TASK}
140 for i in `cat ${OUTPUT}/signatures.${MACHINE2}.${TASK} | sed 's#[^/]*/\([^/]*\)/.*#\1#g' | sort -u | xargs`; do 142 for i in `cat ${OUTPUT}/signatures.${MACHINE2}.${TASK} | sed 's#[^/]*/\([^/]*\)/.*#\1#g' | sort -u | xargs`; do