diff options
| -rw-r--r-- | meta/classes/sanity.bbclass | 2 | ||||
| -rw-r--r-- | meta/lib/oeqa/selftest/signing.py | 8 | ||||
| -rw-r--r-- | meta/recipes-core/images/build-appliance-image_15.0.0.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/ruby/ruby.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/ruby/ruby_2.4.4.bb (renamed from meta/recipes-devtools/ruby/ruby_2.4.3.bb) | 6 | ||||
| -rw-r--r-- | meta/recipes-extended/byacc/byacc.inc | 4 | ||||
| -rw-r--r-- | meta/recipes-support/libmpc/libmpc_1.0.3.bb | 2 | ||||
| -rwxr-xr-x | scripts/sstate-diff-machines.sh | 2 | ||||
| -rwxr-xr-x | scripts/sstate-sysroot-cruft.sh | 2 | ||||
| -rwxr-xr-x | scripts/test-dependencies.sh | 4 |
10 files changed, 15 insertions, 19 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index a11b581a08..68fd4409b5 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -816,7 +816,7 @@ def check_sanity_everybuild(status, d): machinevalid = True if d.getVar('MACHINE', True): if not check_conf_exists("conf/machine/${MACHINE}.conf", d): - status.addresult('Please set a valid MACHINE in your local.conf or environment\n') + status.addresult('MACHINE=%s is invalid. Please set a valid MACHINE in your local.conf, environment or other configuration file.\n' % (d.getVar('MACHINE', True))) machinevalid = False else: status.addresult(check_sanity_validmachine(d)) diff --git a/meta/lib/oeqa/selftest/signing.py b/meta/lib/oeqa/selftest/signing.py index 02e5f5ad29..9f501a5ea0 100644 --- a/meta/lib/oeqa/selftest/signing.py +++ b/meta/lib/oeqa/selftest/signing.py @@ -104,13 +104,7 @@ class Signing(oeSelfTest): self.add_command_to_tearDown('bitbake -c clean %s' % test_recipe) self.add_command_to_tearDown('rm -rf %s' % sstatedir) - # Determine the pub key signature - ret = runCmd('gpg --homedir %s --list-keys' % self.gpg_dir) - pub_key = re.search(r'^pub\s+\S+/(\S+)\s+', ret.output, re.M) - self.assertIsNotNone(pub_key, 'Failed to determine the public key signature.') - pub_key = pub_key.group(1) - - feature = 'SSTATE_SIG_KEY ?= "%s"\n' % pub_key + feature = 'SSTATE_SIG_KEY ?= "testuser"\n' feature += 'SSTATE_SIG_PASSPHRASE ?= "test123"\n' feature += 'SSTATE_VERIFY_SIG ?= "1"\n' feature += 'GPG_PATH = "%s"\n' % self.gpg_dir diff --git a/meta/recipes-core/images/build-appliance-image_15.0.0.bb b/meta/recipes-core/images/build-appliance-image_15.0.0.bb index 9e579a0590..82f2e733d5 100644 --- a/meta/recipes-core/images/build-appliance-image_15.0.0.bb +++ b/meta/recipes-core/images/build-appliance-image_15.0.0.bb @@ -22,7 +22,7 @@ IMAGE_FSTYPES = "vmdk" inherit core-image module-base -SRCREV ?= "a3765887d3efa4c464ef7a00450f218ae2b15eb2" +SRCREV ?= "f627c9a573c709488e71ac1c6d75eafa03718f10" SRC_URI = "git://git.yoctoproject.org/poky;branch=morty \ file://Yocto_Build_Appliance.vmx \ file://Yocto_Build_Appliance.vmxf \ diff --git a/meta/recipes-devtools/ruby/ruby.inc b/meta/recipes-devtools/ruby/ruby.inc index d71989889e..9a52a6965f 100644 --- a/meta/recipes-devtools/ruby/ruby.inc +++ b/meta/recipes-devtools/ruby/ruby.inc @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "\ file://LEGAL;md5=daf349ad59dd19bd8c919171bff3c5d6 \ " -DEPENDS = "ruby-native zlib openssl tcl libyaml db gdbm readline" +DEPENDS = "ruby-native zlib openssl tcl libyaml gdbm readline" DEPENDS_class-native = "openssl-native libyaml-native" SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}" diff --git a/meta/recipes-devtools/ruby/ruby_2.4.3.bb b/meta/recipes-devtools/ruby/ruby_2.4.4.bb index 668bc96901..c6faea0fa0 100644 --- a/meta/recipes-devtools/ruby/ruby_2.4.3.bb +++ b/meta/recipes-devtools/ruby/ruby_2.4.4.bb @@ -8,8 +8,8 @@ SRC_URI += " \ file://ruby-CVE-2017-9229.patch \ " -SRC_URI[md5sum] = "a00e0d49b454f4c0e528e7852d642925" -SRC_URI[sha256sum] = "fd0375582c92045aa7d31854e724471fb469e11a4b08ff334d39052ccaaa3a98" +SRC_URI[md5sum] = "d50e00ccc1c9cf450f837b92d3ed3e88" +SRC_URI[sha256sum] = "254f1c1a79e4cc814d1e7320bc5bdd995dc57e08727d30a767664619a9c8ae5a" # it's unknown to configure script, but then passed to extconf.rb # maybe it's not really needed as we're hardcoding the result with @@ -20,7 +20,7 @@ PACKAGECONFIG ??= "" PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" PACKAGECONFIG[valgrind] = "--with-valgrind=yes, --with-valgrind=no, valgrind" -PACKAGECONFIG[gpm] = "--with-gmp=yes, --with-gmp=no, gmp" +PACKAGECONFIG[gmp] = "--with-gmp=yes, --with-gmp=no, gmp" PACKAGECONFIG[ipv6] = ",--enable-wide-getaddrinfo," EXTRA_AUTORECONF += "--exclude=aclocal" diff --git a/meta/recipes-extended/byacc/byacc.inc b/meta/recipes-extended/byacc/byacc.inc index 1cf5ee0a60..503719c4be 100644 --- a/meta/recipes-extended/byacc/byacc.inc +++ b/meta/recipes-extended/byacc/byacc.inc @@ -5,8 +5,8 @@ programming language." SECTION = "devel" LICENSE = "PD" -SRC_URI = "https://invisible-mirror.net/archives/${BPN}/${BP}.tgz \ - file://byacc-open.patch" +SRC_URI = "https://downloads.yoctoproject.org/mirror/sources/byacc-${PV}.tgz \ + file://byacc-open.patch " EXTRA_OECONF += "--program-transform-name='s,^,b,'" diff --git a/meta/recipes-support/libmpc/libmpc_1.0.3.bb b/meta/recipes-support/libmpc/libmpc_1.0.3.bb index 4f1f5242fb..58813244ef 100644 --- a/meta/recipes-support/libmpc/libmpc_1.0.3.bb +++ b/meta/recipes-support/libmpc/libmpc_1.0.3.bb @@ -3,7 +3,7 @@ require libmpc.inc DEPENDS = "gmp mpfr" LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=e6a600fd5e1d9cbde2d983680233ad02" -SRC_URI = "http://www.multiprecision.org/mpc/download/mpc-${PV}.tar.gz" +SRC_URI = "https://ftp.gnu.org/gnu/mpc/mpc-${PV}.tar.gz" SRC_URI[md5sum] = "d6a1d5f8ddea3abd2cc3e98f58352d26" SRC_URI[sha256sum] = "617decc6ea09889fb08ede330917a00b16809b8db88c29c31bfbb49cbf88ecc3" diff --git a/scripts/sstate-diff-machines.sh b/scripts/sstate-diff-machines.sh index 056aa0a04c..27c6a33006 100755 --- a/scripts/sstate-diff-machines.sh +++ b/scripts/sstate-diff-machines.sh @@ -118,7 +118,7 @@ for M in ${machines}; do cp -ra ${tmpdir}/stamps/* ${OUTPUT}/${M} find ${OUTPUT}/${M} -name \*sigdata\* | sed "s#${OUTPUT}/${M}/##g" | sort > ${OUTPUT}/${M}/list M_UNDERSCORE=`echo ${M} | sed 's/-/_/g'` - sed "s/${M_UNDERSCORE}/MACHINE/g; s/${M}/MACHINE/g" ${OUTPUT}/${M}/list | sort > ${OUTPUT}/${M}/list.M + sed "s/^${M_UNDERSCORE}-/MACHINE/g" ${OUTPUT}/${M}/list | sort > ${OUTPUT}/${M}/list.M find ${tmpdir}/stamps/ -name \*sigdata\* | xargs rm -f else printf "ERROR: no sigdata files were generated for MACHINE $M in ${tmpdir}/stamps\n"; diff --git a/scripts/sstate-sysroot-cruft.sh b/scripts/sstate-sysroot-cruft.sh index b6166aa1b2..d9917f5152 100755 --- a/scripts/sstate-sysroot-cruft.sh +++ b/scripts/sstate-sysroot-cruft.sh @@ -105,7 +105,9 @@ WHITELIST="${WHITELIST} \ # generated by php WHITELIST="${WHITELIST} \ + .*/usr/lib/php5/php/.channels \ .*/usr/lib/php5/php/.channels/.* \ + .*/usr/lib/php5/php/.registry \ .*/usr/lib/php5/php/.registry/.* \ .*/usr/lib/php5/php/.depdb \ .*/usr/lib/php5/php/.depdblock \ diff --git a/scripts/test-dependencies.sh b/scripts/test-dependencies.sh index 0b94de8608..3fb74e1762 100755 --- a/scripts/test-dependencies.sh +++ b/scripts/test-dependencies.sh @@ -163,7 +163,7 @@ build_every_recipe() { fi if [ "${TYPE}" != "2" ] ; then echo "!!!Removing tmpdir \"$tmpdir\"!!!" - rm -rf $tmpdir/deploy $tmpdir/pkgdata $tmpdir/sstate-control $tmpdir/stamps $tmpdir/sysroots $tmpdir/work $tmpdir/work-shared 2>/dev/null + rm -rf $tmpdir/deploy $tmpdir/pkgdata $tmpdir/sstate-control $tmpdir/stamps $tmpdir/sysroots* $tmpdir/work $tmpdir/work-shared 2>/dev/null fi i=1 count=`cat $recipes ${OUTPUT1}/failed-recipes.log | sort -u | wc -l` @@ -185,7 +185,7 @@ build_every_recipe() { mv ${OUTPUTB}/${recipe}.log ${OUTPUTB}/ok/ fi if [ "${TYPE}" != "2" ] ; then - rm -rf $tmpdir/deploy $tmpdir/pkgdata $tmpdir/sstate-control $tmpdir/stamps $tmpdir/sysroots $tmpdir/work $tmpdir/work-shared 2>/dev/null + rm -rf $tmpdir/deploy $tmpdir/pkgdata $tmpdir/sstate-control $tmpdir/stamps $tmpdir/sysroots* $tmpdir/work $tmpdir/work-shared 2>/dev/null fi i=`expr $i + 1` done |