Patch review
cover Patch review
Please review this set of patches for dunfell and have comments back by end of day Monday.
The following changes since commit 2e8b103c4fb3b6aa07c271e716d057d71b7fa543:
config.json: add [email protected] to QA email list (2020-06-10 18:23:06 +0100)
are available in the Git repository at:
git://git.yoctoproject.org/yocto-autobuilder-helper contrib/sakoman
http://git.yoctoproject.org/cgit.cgi/yocto-autobuilder-helper/log/?h=contrib/sakoman
Richard Purdie (3):
config.json: Ensure trigger-build and trigger-build-posttrigger match
layer setup
config.json: Use buildtools from 3.2 M1 to fix bugs in openssl
reporting
scripts/publish-artefacts: Convert md5sum to sha256sum
Ross Burton (1):
config.json: generate the buildtools tarballs for aarch64
Tummalapalli, Vineela (1):
publish-artefacts: Improve sha256 checksum handling
Vineela (1):
scripts/utils.py: Convert md5sum to sha256sum for layer tarballs
config.json | 5 ++- scripts/publish-artefacts | 94 ++++++++++++++++++++------------------- scripts/utils.py | 2 +- 3 files changed, 53 insertions(+), 48 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/6 config.json: Ensure trigger-build and trigger-build-posttrigger match layer setup
From: Richard Purdie <[email protected]>
--- config.json | 1 + 1 file changed, 1 insertion(+)
config.json +1 -0
@@ -179,6 +179,7 @@ "MACHINE" : "qemux86", "step1" : { "BBTARGETS" : "universe -c fetch -k", + "ADDLAYER" : ["${BUILDDIR}/../meta-selftest"], "extravars" : [ "SOURCE_MIRROR_FETCH = '1'" ]
Signature · 1 line
2.17.1
PATCH 2/6 config.json: generate the buildtools tarballs for aarch64
In reply to Steve SakomanFrom: Ross Burton <[email protected]>
--- config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
config.json +1 -1
@@ -609,7 +609,7 @@ }, "step3" : { "SDKMACHINE" : "aarch64", - "BBTARGETS" : "uninative-tarball" + "BBTARGETS" : "buildtools-tarball buildtools-extended-tarball uninative-tarball" } }, "build-appliance" : {
Signature · 1 line
2.17.1
PATCH 3/6 config.json: Use buildtools from 3.2 M1 to fix bugs in openssl reporting
In reply to Steve SakomanFrom: Richard Purdie <[email protected]>
--- config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
config.json +1 -1
@@ -10,7 +10,7 @@ "BUILDTOOLS_URL_TEMPLOCAL" : "/srv/autobuilder/autobuilder.yoctoproject.org/pub/non-release/20200309-15/buildtools/x86_64-buildtools-extended-nativesdk-standalone-3.0+snapshot-20200309.sh", "BUILDTOOLS_URL_TEMPLOCAL2" : "http://downloads.yoctoproject.org/releases/yocto/milestones/yocto-3.1_M3/buildtools/x86_64-buildtools-extended-nativesdk-standalone-3.0+snapshot-20200315.sh", - "BUILDTOOLS_URL" : "/srv/autobuilder/autobuilder.yoctoproject.org/pub/non-release/20200430-14/buildtools/x86_64-buildtools-extended-nativesdk-standalone-3.1.sh", + "BUILDTOOLS_URL" : "http://downloads.yoctoproject.org/releases/yocto/milestones/yocto-3.2_M1/buildtools/x86_64-buildtools-extended-nativesdk-standalone-3.1+snapshot-20200617.sh", "REPO_STASH_DIR" : "${BASE_HOMEDIR}/git/mirror", "TRASH_DIR" : "${BASE_HOMEDIR}/git/trash",
Signature · 1 line
2.17.1
PATCH 4/6 scripts/publish-artefacts: Convert md5sum to sha256sum
In reply to Steve SakomanFrom: Richard Purdie <[email protected]>
--- scripts/publish-artefacts | 88 +++++++++++++++++++-------------------- 1 file changed, 44 insertions(+), 44 deletions(-)
scripts/publish-artefacts +44 -44
@@ -3,11 +3,11 @@ WORKDIR=$1 DEST=$2 target=$3 -md5sums(){ +sha256sums(){ dest=$1 - for x in `find $dest -maxdepth 5 -type f`; do - if [ ${x##*.} != md5sum ]; then - md5sum $x >> $x.md5sum + for x in `find $dest -maxdepth 5 -type f`; do + if [ ${x##*.} != sha256sum ]; then + sha256sum $x >> $x.sha256sum fi done }
@@ -18,7 +18,7 @@ case "$target" in "qemuarm"|"qemuarm64"|"qemumips64"|"qemumips"|"qemuppc"|"qemux86"|"qemux86-64"|"edgerouter"|"genericx86"|"genericx86-64"|"beaglebone") mkdir -p $DEST/toolchain/i686 mkdir -p $DEST/toolchain/x86_64 - md5sums $TMPDIR/deploy/sdk + sha256sums $TMPDIR/deploy/sdk cp -R --no-dereference --preserve=links $TMPDIR/deploy/sdk/poky-*i686-core-image* $DEST/toolchain/i686 cp -R --no-dereference --preserve=links $TMPDIR/deploy/sdk/poky-*x86_64-core-image* $DEST/toolchain/x86_64 ;;
@@ -34,7 +34,7 @@ case "$target" in mkdir -p $DEST/toolchain/i686 mkdir -p $DEST/toolchain/x86_64 mkdir -p $DEST/toolchain/aarch64 - md5sums $TMPDIR/deploy/sdk + sha256sums $TMPDIR/deploy/sdk cp -R --no-dereference --preserve=links $TMPDIR/deploy/sdk/*buildtools* $DEST/buildtools cp -R --no-dereference --preserve=links $TMPDIR/deploy/sdk/i686-nativesdk-libc* $DEST/toolchain/i686 cp -R --no-dereference --preserve=links $TMPDIR/deploy/sdk/x86_64-nativesdk-libc* $DEST/toolchain/x86_64
@@ -42,165 +42,165 @@ case "$target" in ;; "qemuarm64") mkdir -p $DEST/machines/qemu/qemuarm64 - md5sums $TMPDIR/deploy/images/qemuarm64 + sha256sums $TMPDIR/deploy/images/qemuarm64 cp -R --no-dereference --preserve=links $TMPDIR/deploy/images/qemuarm64/*qemuarm64* $DEST/machines/qemu/qemuarm64 cp -R --no-dereference --preserve=links $TMPDIR/deploy/images/qemuarm64/*Image* $DEST/machines/qemu/qemuarm64 ;; "qemuarm64-ptest") mkdir -p $DEST/machines/qemu/qemuarm64 - md5sums $TMPDIR/deploy/images/qemuarm64 + sha256sums $TMPDIR/deploy/images/qemuarm64 cp -R --no-dereference --preserve=links $TMPDIR/deploy/images/qemuarm64/*qemuarm64* $DEST/machines/qemu/qemuarm64 ;; "qemuarm") mkdir -p $DEST/machines/qemu/qemuarm - md5sums $TMPDIR/deploy/images/qemuarm + sha256sums $TMPDIR/deploy/images/qemuarm cp -R --no-dereference --preserve=links $TMPDIR/deploy/images/qemuarm/*qemuarm* $DEST/machines/qemu/qemuarm cp -R --no-dereference --preserve=links $TMPDIR/deploy/images/qemuarm/*Image* $DEST/machines/qemu/qemuarm ;; "beaglebone") mkdir -p $DEST/machines/beaglebone-yocto - md5sums $TMPDIR/deploy/images/beaglebone-yocto + sha256sums $TMPDIR/deploy/images/beaglebone-yocto cp -R --no-dereference --preserve=links $TMPDIR/deploy/images/beaglebone-yocto/*Image* $DEST/machines/beaglebone-yocto cp -R --no-dereference --preserve=links $TMPDIR/deploy/images/beaglebone-yocto/*u-boot* $DEST/machines/beaglebone-yocto cp -R --no-dereference --preserve=links $TMPDIR/deploy/images/beaglebone-yocto/*beaglebone-yocto* $DEST/machines/beaglebone-yocto ;; "qemuarm-alt") mkdir -p $DEST/machines/qemu/qemuarm-alt - md5sums $TMPDIR/deploy/images/qemuarm + sha256sums $TMPDIR/deploy/images/qemuarm cp -R --no-dereference --preserve=links $TMPDIR/deploy/images/qemuarm/*qemuarm* $DEST/machines/qemu/qemuarm-alt cp -R --no-dereference --preserve=links $TMPDIR/deploy/images/qemuarm/*Image* $DEST/machines/qemu/qemuarm-alt ;; "beaglebone-alt") mkdir -p $DEST/machines/beaglebone-yocto-alt - md5sums $TMPDIR/deploy/images/beaglebone-yocto + sha256sums $TMPDIR/deploy/images/beaglebone-yocto cp -R --no-dereference --preserve=links $TMPDIR/deploy/images/beaglebone-yocto/*Image* $DEST/machines/beaglebone-yocto-alt cp -R --no-dereference --preserve=links $TMPDIR/deploy/images/beaglebone-yocto/*u-boot* $DEST/machines/beaglebone-yocto-alt cp -R --no-dereference --preserve=links $TMPDIR/deploy/images/beaglebone-yocto/*beaglebone-yocto* $DEST/machines/beaglebone-yocto-alt ;; "qemumips64") mkdir -p $DEST/machines/qemu/qemumips64 - md5sums $TMPDIR/deploy/images/qemumips64 + sha256sums $TMPDIR/deploy/images/qemumips64 cp -R --no-dereference --preserve=links $TMPDIR/deploy/images/qemumips64/*qemumips64* $DEST/machines/qemu/qemumips64 ;; "qemumips") mkdir -p $DEST/machines/qemu/qemumips - md5sums $TMPDIR/deploy/images/qemumips + sha256sums $TMPDIR/deploy/images/qemumips cp -R --no-dereference --preserve=links $TMPDIR/deploy/images/qemumips/*qemumips* $DEST/machines/qemu/qemumips ;; "edgerouter") mkdir -p $DEST/machines/edgerouter - md5sums $TMPDIR/deploy/images/edgerouter + sha256sums $TMPDIR/deploy/images/edgerouter cp -R --no-dereference --preserve=links $TMPDIR/deploy/images/edgerouter/*edgerouter* $DEST/machines/edgerouter ;; "qemumips-alt") mkdir -p $DEST/machines/qemu/qemumips-alt - md5sums $TMPDIR/deploy/images/qemumips + sha256sums $TMPDIR/deploy/images/qemumips cp -R --no-dereference --preserve=links $TMPDIR/deploy/images/qemumips/*qemumips* $DEST/machines/qemu/qemumips-alt ;; "edgerouter-alt") mkdir -p $DEST/machines/edgerouter-alt - md5sums $TMPDIR/deploy/images/edgerouter + sha256sums $TMPDIR/deploy/images/edgerouter cp -R --no-dereference --preserve=links $TMPDIR/deploy/images/edgerouter/*edgerouter* $DEST/machines/edgerouter-alt ;; "qemuppc") mkdir -p $DEST/machines/qemu/qemuppc - md5sums $TMPDIR/deploy/images/qemuppc + sha256sums $TMPDIR/deploy/images/qemuppc cp -R --no-dereference --preserve=links $TMPDIR/deploy/images/qemuppc/*qemuppc* $DEST/machines/qemu/qemuppc ;; "qemuppc-alt") mkdir -p $DEST/machines/qemu/qemuppc-alt - md5sums $TMPDIR/deploy/images/qemuppc + sha256sums $TMPDIR/deploy/images/qemuppc cp -R --no-dereference --preserve=links $TMPDIR/deploy/images/qemuppc/*qemuppc* $DEST/machines/qemu/qemuppc-alt ;; "wic") mkdir -p $DEST/machines/qemu/qemux86 - md5sums $TMPDIR/deploy/wic_images/qemux86 + sha256sums $TMPDIR/deploy/wic_images/qemux86 cp -R --no-dereference --preserve=links $TMPDIR/deploy/wic_images/qemux86/*/*/*.direct $DEST/machines/qemu/qemux86 - cp -R --no-dereference --preserve=links $TMPDIR/deploy/wic_images/qemux86/*/*/*.direct.md5sum $DEST/machines/qemu/qemux86 + cp -R --no-dereference --preserve=links $TMPDIR/deploy/wic_images/qemux86/*/*/*.direct.sha256sum $DEST/machines/qemu/qemux86 mkdir -p $DEST/machines/genericx86 - md5sums $TMPDIR/deploy/wic_images/genericx86 + sha256sums $TMPDIR/deploy/wic_images/genericx86 cp -R --no-dereference --preserve=links $TMPDIR/deploy/wic_images/genericx86/*/*/*.direct $DEST/machines/genericx86 - cp -R --no-dereference --preserve=links $TMPDIR/deploy/wic_images/genericx86/*/*/*.direct.md5sum $DEST/machines/genericx86 + cp -R --no-dereference --preserve=links $TMPDIR/deploy/wic_images/genericx86/*/*/*.direct.sha256sum $DEST/machines/genericx86 mkdir -p $DEST/machines/qemu/qemux86-64 - md5sums $TMPDIR/deploy/wic_images/qemux86-64 + sha256sums $TMPDIR/deploy/wic_images/qemux86-64 cp -R --no-dereference --preserve=links $TMPDIR/deploy/wic_images/qemux86-64/*/*/*.direct $DEST/machines/qemu/qemux86-64 - cp -R --no-dereference --preserve=links $TMPDIR/deploy/wic_images/qemux86-64/*/*/*.direct.md5sum $DEST/machines/qemu/qemux86-64 + cp -R --no-dereference --preserve=links $TMPDIR/deploy/wic_images/qemux86-64/*/*/*.direct.sha256sum $DEST/machines/qemu/qemux86-64 mkdir -p $DEST/machines/genericx86-64 - md5sums $TMPDIR/deploy/wic_images/genericx86-64 + sha256sums $TMPDIR/deploy/wic_images/genericx86-64 cp -R --no-dereference --preserve=links $TMPDIR/deploy/wic_images/genericx86-64/*/*/*.direct $DEST/machines/genericx86-64 - cp -R --no-dereference --preserve=links $TMPDIR/deploy/wic_images/genericx86-64/*/*/*.direct.md5sum $DEST/machines/genericx86-64 + cp -R --no-dereference --preserve=links $TMPDIR/deploy/wic_images/genericx86-64/*/*/*.direct.sha256sum $DEST/machines/genericx86-64 ;; "qemux86-64") mkdir -p $DEST/machines/qemu/qemux86-64 - md5sums $TMPDIR/deploy/images/qemux86-64 + sha256sums $TMPDIR/deploy/images/qemux86-64 cp -R --no-dereference --preserve=links $TMPDIR/deploy/images/qemux86-64/*qemux86-64* $DEST/machines/qemu/qemux86-64 ;; "qemux86-64-ptest") mkdir -p $DEST/machines/qemu/qemux86-64 - md5sums $TMPDIR/deploy/images/qemux86-64 + sha256sums $TMPDIR/deploy/images/qemux86-64 cp -R --no-dereference --preserve=links $TMPDIR/deploy/images/qemux86-64/*qemux86-64* $DEST/machines/qemu/qemux86-64 ;; "genericx86-64") mkdir -p $DEST/machines/genericx86-64 - md5sums $TMPDIR/deploy/images/genericx86-64 + sha256sums $TMPDIR/deploy/images/genericx86-64 cp -R --no-dereference --preserve=links $TMPDIR/deploy/images/genericx86-64/*genericx86-64* $DEST/machines/genericx86-64 ;; "qemux86-64-alt") mkdir -p $DEST/machines/qemu/qemux86-64-alt - md5sums $TMPDIR/deploy/images/qemux86-64 + sha256sums $TMPDIR/deploy/images/qemux86-64 cp -R --no-dereference --preserve=links $TMPDIR/deploy/images/qemux86-64/*qemux86-64* $DEST/machines/qemu/qemux86-64-alt ;; "genericx86-64-alt") mkdir -p $DEST/machines/genericx86-64-alt - md5sums $TMPDIR/deploy/images/genericx86-64 + sha256sums $TMPDIR/deploy/images/genericx86-64 cp -R --no-dereference --preserve=links $TMPDIR/deploy/images/genericx86-64/*genericx86-64* $DEST/machines/genericx86-64-alt ;; "nightly-x86-64-bsp") rm -rf $DEST/$target/images/intel-corei7-64/* mkdir -p $DEST/$target/images/intel-corei7-64 - md5sums $TMPDIR/deploy/images/intel-corei7-64 + sha256sums $TMPDIR/deploy/images/intel-corei7-64 cp -R --no-dereference --preserve=links $TMPDIR/deploy/images/intel-corei7-64/bzImage* $DEST/$target/images/intel-corei7-64 cp -R --no-dereference --preserve=links $TMPDIR/deploy/images/intel-corei7-64/*core-image-sato-sdk-intel-corei7-64*tar* $DEST/$target/images/intel-corei7-64 cp -R --no-dereference --preserve=links $TMPDIR/deploy/images/intel-corei7-64/*modules-* $DEST/$target/images/intel-corei7-64 ;; "qemux86") mkdir -p $DEST/machines/qemu/qemux86 - md5sums $TMPDIR/deploy/images/qemux86 + sha256sums $TMPDIR/deploy/images/qemux86 cp -R --no-dereference --preserve=links $TMPDIR/deploy/images/qemux86/*qemux86* $DEST/machines/qemu/qemux86 ;; "genericx86") mkdir -p $DEST/machines/genericx86 - md5sums $TMPDIR/deploy/images/genericx86 + sha256sums $TMPDIR/deploy/images/genericx86 cp -R --no-dereference --preserve=links $TMPDIR/deploy/images/genericx86/*genericx86* $DEST/machines/genericx86 ;; "qemux86-alt") mkdir -p $DEST/machines/qemu/qemux86-alt - md5sums $TMPDIR/deploy/images/qemux86 + sha256sums $TMPDIR/deploy/images/qemux86 cp -R --no-dereference --preserve=links $TMPDIR/deploy/images/qemux86/*qemux86* $DEST/machines/qemu/qemux86-alt ;; "genericx86-alt") mkdir -p $DEST/machines/genericx86-alt - md5sums $TMPDIR/deploy/images/genericx86 + sha256sums $TMPDIR/deploy/images/genericx86 cp -R --no-dereference --preserve=links $TMPDIR/deploy/images/genericx86/*genericx86* $DEST/machines/genericx86-alt ;; "poky-tiny") mkdir -p $DEST/machines/qemu/qemu-tiny - md5sums $TMPDIR/deploy/images/qemux86 + sha256sums $TMPDIR/deploy/images/qemux86 cp -R --no-dereference --preserve=links $TMPDIR/deploy/images/qemux86/*qemux86* $DEST/machines/qemu/qemu-tiny ;; "eclipse-plugin-neon") DIR=$WORKDIR/../scripts - # create md5sums only for the zip files - for x in `ls $DIR/*.zip`; do md5sum $x >> $x.md5sum; done + # create sha256sums only for the zip files + for x in `ls $DIR/*.zip`; do sha256sum $x >> $x.sha256sum; done mkdir -p $DEST/eclipse-plugin/neon - cp --no-dereference --preserve=links $DIR/org.*.zip $DIR/org.*.md5sum $DEST/eclipse-plugin/neon + cp --no-dereference --preserve=links $DIR/org.*.zip $DIR/org.*.sha256sum $DEST/eclipse-plugin/neon ;; "eclipse-plugin-oxygen") DIR=$WORKDIR/../scripts - # create md5sums only for the zip files - for x in `ls $DIR/*.zip`; do md5sum $x >> $x.md5sum; done + # create sha256sums only for the zip files + for x in `ls $DIR/*.zip`; do sha256sum $x >> $x.sha256sum; done mkdir -p $DEST/eclipse-plugin/oxygen - cp --no-dereference --preserve=links $DIR/org.*.zip $DIR/org.*.md5sum $DEST/eclipse-plugin/oxygen + cp --no-dereference --preserve=links $DIR/org.*.zip $DIR/org.*.sha256sum $DEST/eclipse-plugin/oxygen ;; esac
Signature · 1 line
2.17.1
PATCH 5/6 publish-artefacts: Improve sha256 checksum handling
In reply to Steve SakomanFrom: "Tummalapalli, Vineela" <[email protected]>
The existing checksum files were encoding full paths. This patch changes this to use just the filename which allows relocation of the directories and is more appropriate for sharing over http.
--- scripts/publish-artefacts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
scripts/publish-artefacts +8 -4
@@ -5,10 +5,14 @@ target=$3 sha256sums(){ dest=$1 - for x in `find $dest -maxdepth 5 -type f`; do - if [ ${x##*.} != sha256sum ]; then - sha256sum $x >> $x.sha256sum - fi + for x in `find -L $dest -maxdepth 5 -type f`; do + for w in $x;do + if [ ${w##*.} != sha256sum ]; then + shasum=`sha256sum $w | awk '{print $1}'` + filename=${w##*/} + echo $shasum $filename >> $w.sha256sum + fi + done done }
Signature · 1 line
2.17.1
PATCH 6/6 scripts/utils.py: Convert md5sum to sha256sum for layer tarballs
In reply to Steve SakomanFrom: Vineela <[email protected]>
--- scripts/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/utils.py +1 -1
@@ -251,7 +251,7 @@ def publishrepo(clonedir, repo, publishdir): revision = subprocess.check_output(["git", "rev-parse", "HEAD"], cwd=sharedrepo).decode('utf-8').strip() archive_name = repo + "-" + revision + ".tar.bz2" subprocess.check_call("git archive --format=tar HEAD --prefix=" + repo + "/ | bzip2 -c > " + archive_name, shell=True, cwd=sharedrepo) - subprocess.check_call("md5sum " + archive_name + " >> " + archive_name + ".md5sum", shell=True, cwd=sharedrepo) + subprocess.check_call("sha256sum " + archive_name + " >> " + archive_name + ".sha256sum", shell=True, cwd=sharedrepo) mkdir(publishdir) subprocess.check_call("rsync -av " + archive_name + "* " + publishdir, shell=True, cwd=sharedrepo)
Signature · 1 line
2.17.1