bitbake.conf: drop FETCHCMD, GITDIR, etc fetcher over-rides
PATCH 1/13 bitbake.conf: drop FETCHCMD, GITDIR, etc fetcher over-rides
This completes cleanup originally proposed in 2012:
http://lists.openembedded.org/pipermail/openembedded-core/2012-July/064224.html
Current versions of bitbake have "sane" default fetcher commands so it's no longer necessary for bitbake.conf to over-ride them.
--- meta/conf/bitbake.conf | 12 ------------ 1 file changed, 12 deletions(-)
meta/conf/bitbake.conf +0 -12
@@ -360,12 +360,6 @@ CACHE = "${TMPDIR}/cache${@['', '/' + str(d.getVar('MACHINE'))][bool(d.getVar('M # The persistent cache should be shared by all builds PERSISTENT_DIR = "${TOPDIR}/cache" LOG_DIR = "${TMPDIR}/log" -CO_DIR = "${DL_DIR}" -CVSDIR = "${CO_DIR}/cvs" -SVNDIR = "${CO_DIR}/svn" -GITDIR = "${CO_DIR}/git2" -BZRDIR = "${CO_DIR}/bzr" -HGDIR = "${CO_DIR}/hg" STAMPS_DIR ?= "${TMPDIR}/stamps" STAMP = "${STAMPS_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/${EXTENDPE}${PV}-${PR}"
@@ -676,12 +670,6 @@ SRC_URI[vardepsexclude] += "\ # export DEBIAN_MIRROR = "http://ftp.de.debian.org/debian/pool" # into your local.conf -FETCHCMD_svn = "/usr/bin/env svn --non-interactive --trust-server-cert" -FETCHCMD_cvs = "/usr/bin/env cvs" -FETCHCMD_wget = "/usr/bin/env wget -t 2 -T 30 --passive-ftp --no-check-certificate" -FETCHCMD_bzr = "/usr/bin/env bzr" -FETCHCMD_hg = "/usr/bin/env hg" - SRCDATE = "${DATE}" SRCREV ??= "INVALID" AUTOREV = "${@bb.fetch2.get_autorev(d)}"
Signature · 1 line
1.9.1
PATCH 2/13 tune-arm1136jf-s.inc: add hardfloat support
--- meta/conf/machine/include/tune-arm1136jf-s.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
meta/conf/machine/include/tune-arm1136jf-s.inc +4 -1
@@ -6,8 +6,11 @@ TUNEVALID[arm1136jfs] = "Enable arm1136jfs specific processor optimizations" TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'arm1136jfs', ' -mcpu=arm1136jf-s', '', d)}" MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'arm1136jfs', 'armv6:', '' ,d)}" -AVAILTUNES += "arm1136jfs" +AVAILTUNES += "arm1136jfs arm1136jfshf" ARMPKGARCH_tune-arm1136jfs = "arm1136jfs" +ARMPKGARCH_tune-arm1136jfshf = "arm1136jfs" # mcpu is used so don't use armv6 as we don't want march TUNE_FEATURES_tune-arm1136jfs = "arm arm1136jfs" +TUNE_FEATURES_tune-arm1136jfshf = "${TUNE_FEATURES_tune-arm1136jfs} callconvention-hard" PACKAGE_EXTRA_ARCHS_tune-arm1136jfs = "${PACKAGE_EXTRA_ARCHS_tune-armv6} arm1136jfs-vfp" +PACKAGE_EXTRA_ARCHS_tune-arm1136jfshf = "${PACKAGE_EXTRA_ARCHS_tune-armv6hf} arm1136jfshf-vfp"
Signature · 1 line
1.9.1
PATCH 3/13 tune-arm1176jz-s.inc: add support for arm1176jz-s CPU specific tuning
In reply to Andre McCurdy--- meta/conf/machine/include/tune-arm1176jz-s.inc | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 meta/conf/machine/include/tune-arm1176jz-s.inc
meta/conf/machine/include/tune-arm1176jz-s.inc new file +17 -0
@@ -0,0 +1,17 @@ +DEFAULTTUNE ?= "arm1176jzs" + +require conf/machine/include/arm/arch-armv6.inc + +TUNEVALID[arm1176jzs] = "Enable arm1176jzs specific processor optimizations" +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'arm1176jzs', ' -mcpu=arm1176jz-s', '', d)}" +MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'arm1176jzs', 'armv6:', '' ,d)}" + +AVAILTUNES += "arm1176jzs" +ARMPKGARCH_tune-arm1176jzs = "arm1176jzs" +TUNE_FEATURES_tune-arm1176jzs = "arm thumb arm1176jzs" +PACKAGE_EXTRA_ARCHS_tune-arm1176jzs = "${PACKAGE_EXTRA_ARCHS_tune-armv6tb-novfp} arm1176jzs arm1176jzst" + +AVAILTUNES += "arm1176jzs-be" +ARMPKGARCH_tune-arm1176jzs-be = "${ARMPKGARCH_tune-arm1176jzs}" +TUNE_FEATURES_tune-arm1176jzs-be = "${TUNE_FEATURES_tune-arm1176jzs} bigendian" +PACKAGE_EXTRA_ARCHS_tune-arm1176jzs-be = "${PACKAGE_EXTRA_ARCHS_tune-armv6tb-novfp} arm1176jzsb arm1176jzstb"
Signature · 1 line
1.9.1
Re: [PATCH 03/13] tune-arm1176jz-s.inc: add support for arm1176jz-s CPU specific tuning
Quoted 20 lines · Andre McCurdy
Signed-off-by Andre McCurdy <[email protected]>--- meta/conf/machine/include/tune-arm1176jz-s.inc | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 meta/conf/machine/include/tune-arm1176jz-s.incmeta/conf/machine/include/tune-arm1176jz-s.inc new file +7
-0@@ -0,0 +1,17 @@ +DEFAULTTUNE ?= "arm1176jzs" + +require conf/machine/include/arm/arch-armv6.inc + +TUNEVALID[arm1176jzs] = "Enable arm1176jzs specific processor optimizations" +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'arm1176jzs', ' -mcpu=arm1176jz-s', '', d)}" +MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'arm1176jzs', 'armv6:', '' ,d)}"
meta/conf/machine/include/tune-arm1176jz-s.inc line 17
Quoted 10 lines
meta/conf/machine/include/tune-arm1176jz-s.inc new file +10
-0+ +AVAILTUNES += "arm1176jzs" +ARMPKGARCH_tune-arm1176jzs = "arm1176jzs" +TUNE_FEATURES_tune-arm1176jzs = "arm thumb arm1176jzs" +PACKAGE_EXTRA_ARCHS_tune-arm1176jzs = "${PACKAGE_EXTRA_ARCHS_tune-armv6tb-novfp} arm1176jzs arm1176jzst" + +AVAILTUNES += "arm1176jzs-be" +ARMPKGARCH_tune-arm1176jzs-be = "${ARMPKGARCH_tune-arm1176jzs}" +TUNE_FEATURES_tune-arm1176jzs-be = "${TUNE_FEATURES_tune-arm1176jzs} bigendian" +PACKAGE_EXTRA_ARCHS_tune-arm1176jzs-be = "${PACKAGE_EXTRA_ARCHS_tune-armv6tb-novfp} arm1176jzsb arm1176jzstb"
There is vfp variant of arm1176jzs has well
ARM1176JZF-S, this processor includes a Vector Floating-Point (VFP)
coprocessor.
Quoted 8 lines
--
1.9.1--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
PATCH 4/13 tune-ep9312.inc: fix TUNEVALID description
In reply to Andre McCurdy--- meta/conf/machine/include/tune-ep9312.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/conf/machine/include/tune-ep9312.inc +1 -1
@@ -2,7 +2,7 @@ DEFAULTTUNE ?= "ep9312" require conf/machine/include/arm/arch-armv4.inc -TUNEVALID[ep9312] = "Enable Intel PXA27x specific processor optimizations" +TUNEVALID[ep9312] = "Enable Cirrus Logic EP9312 specific processor optimizations" TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'ep9312', ' -march=ep9312 -mcpu=ep9312', '', d)}" MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'ep9312', 'armv4:', '' ,d)}"
Signature · 1 line
1.9.1
PATCH 5/13 feature-arm-thumb.inc: fix ARM_THUMB_SUFFIX
In reply to Andre McCurdySince TUNE_FEATURES now either contains a CPU or an architecture (but not both) we can't rely on finding the architecture in TUNE_FEATURES. Use architecture specific over-rides instead.
--- meta/conf/machine/include/arm/feature-arm-thumb.inc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
meta/conf/machine/include/arm/feature-arm-thumb.inc +5 -2
@@ -1,8 +1,6 @@ TUNEVALID[thumb] = "Support Thumb instructions" -ARM_THUMB_SUFFIX = "${@bb.utils.contains_any('TUNE_FEATURES', 'armv4 armv5 armv6', 't', 't2', d)}" - # If the device supports ARM, then respect ARM_THUMB_OPT (which can be "arm" or "thumb") # If the device doesn't support ARM, then always set "thumb" even when # some recipe explicitly sets ARM_INSTRUCTION_SET to "arm"
@@ -23,6 +21,11 @@ python () { TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'thumb', ' -m${ARM_M_OPT}', '', d)}" +ARM_THUMB_SUFFIX = "t2" +ARM_THUMB_SUFFIX_armv4 = "t" +ARM_THUMB_SUFFIX_armv5 = "t" +ARM_THUMB_SUFFIX_armv6 = "t" + # Add suffix from ARM_THUMB_SUFFIX only if after all this we still set ARM_M_OPT to thumb ARMPKGSFX_THUMB .= "${@bb.utils.contains('TUNE_FEATURES', 'thumb', '${ARM_THUMB_SUFFIX}', '', d) if d.getVar('ARM_M_OPT') == 'thumb' else ''}"
Signature · 1 line
1.9.1
Re: [PATCH 05/13] feature-arm-thumb.inc: fix ARM_THUMB_SUFFIX
Quoted 4 lines · Andre McCurdy
Since
TUNE_FEATURESnow either contains a CPU or an architecture (but not both) we can't rely on finding the architecture inTUNE_FEATURES. Use architecture specific over-rides instead.
This fix hasn't been merged. Were there any concerns about it?
Quoted 33 lines
Signed-off-by Andre McCurdy <[email protected]>--- meta/conf/machine/include/arm/feature-arm-thumb.inc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)meta/conf/machine/include/arm/feature-arm-thumb.inc +5
-3@@ -1,8 +1,6 @@ TUNEVALID[thumb] = "Support Thumb instructions" -ARM_THUMB_SUFFIX = "${@bb.utils.contains_any('TUNE_FEATURES', 'armv4 armv5 armv6', 't', 't2', d)}" - # If the device supports ARM, then respect ARM_THUMB_OPT (which can be "arm" or "thumb") # If the device doesn't support ARM, then always set "thumb" even when # some recipe explicitly sets ARM_INSTRUCTION_SET to "arm"@@ -23,6 +21,11 @@ python () { TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'thumb', ' -m${ARM_M_OPT}', '', d)}" +ARM_THUMB_SUFFIX = "t2" +ARM_THUMB_SUFFIX_armv4 = "t" +ARM_THUMB_SUFFIX_armv5 = "t" +ARM_THUMB_SUFFIX_armv6 = "t" + # Add suffix from ARM_THUMB_SUFFIX only if after all this we still set ARM_M_OPT to thumb ARMPKGSFX_THUMB .= "${@bb.utils.contains('TUNE_FEATURES', 'thumb', '${ARM_THUMB_SUFFIX}', '', d) if d.getVar('ARM_M_OPT') == 'thumb' else ''}" --1.9.1
PATCH 6/13 packagegroup-core-boot: drop duplicate MACHINE_ESSENTIAL_EXTRA_RDEPENDS, etc
In reply to Andre McCurdyDefault values for MACHINE_ESSENTIAL_EXTRA_RDEPENDS and MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS are set from bitbake.conf and so don't need to be duplicated in the packagegroup-core-boot recipe.
--- meta/recipes-core/packagegroups/packagegroup-core-boot.bb | 6 ------ 1 file changed, 6 deletions(-)
meta/recipes-core/packagegroups/packagegroup-core-boot.bb +0 -6
@@ -10,12 +10,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup -# -# Set by the machine configuration with packages essential for device bootup -# -MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" -MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" - # Distro can override the following VIRTUAL-RUNTIME providers: VIRTUAL-RUNTIME_dev_manager ?= "udev" VIRTUAL-RUNTIME_keymaps ?= "keymaps"
Signature · 1 line
1.9.1
PATCH 7/13 rootfs-postcommands.bbclass: add inittab tweak to read_only_rootfs_hook()
In reply to Andre McCurdyIt's not clear that we actually need to call mount -o remount,XX from the busybox-inittab inittab at all, but as we currently do, let's respect read-only-rootfs in IMAGE_FEATURES and not remount / as rw.
--- meta/classes/rootfs-postcommands.bbclass | 5 +++++ 1 file changed, 5 insertions(+)
meta/classes/rootfs-postcommands.bbclass +5 -0
@@ -95,6 +95,11 @@ read_only_rootfs_hook () { sed -i -e '/^[#[:space:]]*\/dev\/root/{s/defaults/ro/;s/\([[:space:]]*[[:digit:]]\)\([[:space:]]*\)[[:digit:]]$/\1\20/}' ${IMAGE_ROOTFS}/etc/fstab fi + # Tweak the "mount -o remount,rw /" command in busybox-inittab inittab + if [ -f ${IMAGE_ROOTFS}/etc/inittab ]; then + sed -i 's|/bin/mount -o remount,rw /|/bin/mount -o remount,ro /|' ${IMAGE_ROOTFS}/etc/inittab + fi + # If we're using openssh and the /etc/ssh directory has no pre-generated keys, # we should configure openssh to use the configuration file /etc/ssh/sshd_config_readonly # and the keys under /var/run/ssh.
Signature · 1 line
1.9.1
PATCH 8/13 base-files: nsswitch.conf is glibc specific
In reply to Andre McCurdy--- meta/recipes-core/base-files/base-files_3.0.14.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
meta/recipes-core/base-files/base-files_3.0.14.bb +4 -1
@@ -129,7 +129,6 @@ do_install () { install -m 0644 ${WORKDIR}/shells ${D}${sysconfdir}/shells install -m 0755 ${WORKDIR}/share/dot.profile ${D}${sysconfdir}/skel/.profile install -m 0755 ${WORKDIR}/share/dot.bashrc ${D}${sysconfdir}/skel/.bashrc - install -m 0644 ${WORKDIR}/nsswitch.conf ${D}${sysconfdir}/nsswitch.conf install -m 0644 ${WORKDIR}/host.conf ${D}${sysconfdir}/host.conf install -m 0644 ${WORKDIR}/motd ${D}${sysconfdir}/motd
@@ -142,6 +141,10 @@ do_install () { fi } +do_install_append_libc-glibc () { + install -m 0644 ${WORKDIR}/nsswitch.conf ${D}${sysconfdir}/nsswitch.conf +} + DISTRO_VERSION[vardepsexclude] += "DATE" do_install_basefilesissue () { install -m 644 ${WORKDIR}/issue* ${D}${sysconfdir}
Signature · 1 line
1.9.1
PATCH 9/13 glibc: drop obsolete packaging of glibc libnsl libs
In reply to Andre McCurdyPackaging rules were left behind when libnsl was removed:
https://git.openembedded.org/openembedded-core/commit/?id=9dc9983901cec364ea57a72b9da1a0396b60663a
--- meta/recipes-core/glibc/glibc-package.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/glibc/glibc-package.inc +1 -1
@@ -14,7 +14,7 @@ RPROVIDES_glibc-extra-nss = "eglibc-extra-nss" RPROVIDES_glibc-thread-db = "eglibc-thread-db" RPROVIDES_${PN}-pcprofile = "eglibc-pcprofile" RPROVIDES_${PN}-dbg = "eglibc-dbg" -libc_baselibs = "${base_libdir}/libc.so.* ${base_libdir}/libc-*.so ${base_libdir}/libm*.so.* ${base_libdir}/libm-*.so ${base_libdir}/libmvec-*.so ${base_libdir}/ld*.so.* ${base_libdir}/ld-*.so ${base_libdir}/libpthread*.so.* ${base_libdir}/libpthread-*.so ${base_libdir}/libresolv*.so.* ${base_libdir}/libresolv-*.so ${base_libdir}/librt*.so.* ${base_libdir}/librt-*.so ${base_libdir}/libutil*.so.* ${base_libdir}/libutil-*.so ${base_libdir}/libnsl*.so.* ${base_libdir}/libnsl-*.so ${base_libdir}/libnss_files*.so.* ${base_libdir}/libnss_files-*.so ${base_libdir}/libnss_compat*.so.* ${base_libdir}/libnss_compat-*.so ${base_libdir}/libnss_dns*.so.* ${base_libdir}/libnss_dns-*.so ${base_libdir}/libdl*.so.* ${base_libdir}/libdl-*.so ${base_libdir}/libanl*.so.* ${base_libdir}/libanl-*.so ${base_libdir}/libBrokenLocale*.so.* ${base_libdir}/libBrokenLocale-*.so" +libc_baselibs = "${base_libdir}/libc.so.* ${base_libdir}/libc-*.so ${base_libdir}/libm*.so.* ${base_libdir}/libm-*.so ${base_libdir}/libmvec-*.so ${base_libdir}/ld*.so.* ${base_libdir}/ld-*.so ${base_libdir}/libpthread*.so.* ${base_libdir}/libpthread-*.so ${base_libdir}/libresolv*.so.* ${base_libdir}/libresolv-*.so ${base_libdir}/librt*.so.* ${base_libdir}/librt-*.so ${base_libdir}/libutil*.so.* ${base_libdir}/libutil-*.so ${base_libdir}/libnss_files*.so.* ${base_libdir}/libnss_files-*.so ${base_libdir}/libnss_compat*.so.* ${base_libdir}/libnss_compat-*.so ${base_libdir}/libnss_dns*.so.* ${base_libdir}/libnss_dns-*.so ${base_libdir}/libdl*.so.* ${base_libdir}/libdl-*.so ${base_libdir}/libanl*.so.* ${base_libdir}/libanl-*.so ${base_libdir}/libBrokenLocale*.so.* ${base_libdir}/libBrokenLocale-*.so" ARCH_DYNAMIC_LOADER = "" # The aarch64 ABI says the dynamic linker -must- be # /lib/ld-linux-aarch64{,_be}.so.1. With usrmerge, that may mean that
Signature · 1 line
1.9.1
Re: [PATCH 09/13] glibc: drop obsolete packaging of glibc libnsl libs
Quoted 5 lines · Andre McCurdy
Packaging rules were left behind when libnsl was removed:
https://git.openembedded.org/openembedded-core/commit/?id=9dc9983901cec364ea57a72b9da1a0396b60663a
this was due to other versions of glibc using the same header file in other toolchain layers e.g.
IIRC meta-linaro, but it might not be needed however double check please
Quoted 26 lines
Signed-off-by Andre McCurdy <[email protected]>--- meta/recipes-core/glibc/glibc-package.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)meta/recipes-core/glibc/glibc-package.inc +1
-2@@ -14,7 +14,7 @@ RPROVIDES_glibc-extra-nss = "eglibc-extra-nss" RPROVIDES_glibc-thread-db = "eglibc-thread-db" RPROVIDES_${PN}-pcprofile = "eglibc-pcprofile" RPROVIDES_${PN}-dbg = "eglibc-dbg" -libc_baselibs = "${base_libdir}/libc.so.* ${base_libdir}/libc-*.so ${base_libdir}/libm*.so.* ${base_libdir}/libm-*.so ${base_libdir}/libmvec-*.so ${base_libdir}/ld*.so.* ${base_libdir}/ld-*.so ${base_libdir}/libpthread*.so.* ${base_libdir}/libpthread-*.so ${base_libdir}/libresolv*.so.* ${base_libdir}/libresolv-*.so ${base_libdir}/librt*.so.* ${base_libdir}/librt-*.so ${base_libdir}/libutil*.so.* ${base_libdir}/libutil-*.so ${base_libdir}/libnsl*.so.* ${base_libdir}/libnsl-*.so ${base_libdir}/libnss_files*.so.* ${base_libdir}/libnss_files-*.so ${base_libdir}/libnss_compat*.so.* ${base_libdir}/libnss_compat-*.so ${base_libdir}/libnss_dns*.so.* ${base_libdir}/libnss_dns-*.so ${base_libdir}/libdl*.so.* ${base_libdir}/libdl-*.so ${base_libdir}/libanl*.so.* ${base_libdir}/libanl-*.so ${base_libdir}/libBrokenLocale*.so.* ${base_libdir}/libBrokenLocale-*.so" +libc_baselibs = "${base_libdir}/libc.so.* ${base_libdir}/libc-*.so ${base_libdir}/libm*.so.* ${base_libdir}/libm-*.so ${base_libdir}/libmvec-*.so ${base_libdir}/ld*.so.* ${base_libdir}/ld-*.so ${base_libdir}/libpthread*.so.* ${base_libdir}/libpthread-*.so ${base_libdir}/libresolv*.so.* ${base_libdir}/libresolv-*.so ${base_libdir}/librt*.so.* ${base_libdir}/librt-*.so ${base_libdir}/libutil*.so.* ${base_libdir}/libutil-*.so ${base_libdir}/libnss_files*.so.* ${base_libdir}/libnss_files-*.so ${base_libdir}/libnss_compat*.so.* ${base_libdir}/libnss_compat-*.so ${base_libdir}/libnss_dns*.so.* ${base_libdir}/libnss_dns-*.so ${base_libdir}/libdl*.so.* ${base_libdir}/libdl-*.so ${base_libdir}/libanl*.so.* ${base_libdir}/libanl-*.so ${base_libdir}/libBrokenLocale*.so.* ${base_libdir}/libBrokenLocale-*.so" ARCH_DYNAMIC_LOADER = "" # The aarch64 ABI says the dynamic linker -must- be # /lib/ld-linux-aarch64{,_be}.so.1. With usrmerge, that may mean that --1.9.1
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [PATCH 09/13] glibc: drop obsolete packaging of glibc libnsl libs
In reply to Andre McCurdyQuoted 2 lines · Andre McCurdy
Packaging rules were left behind when libnsl was removed:
...
How has this change been tested?
ERROR: glibc-2.30-r0 do_package: QA Issue: glibc: Files/directories were installed but not shipped in any package:
/lib/libnsl-2.30.so
/lib/libnsl.so.1
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
glibc: 2 installed and not shipped files. [installed-vs-shipped]
ERROR: glibc-2.30-r0 do_package: Fatal QA errors found, failing task.
cu
Adrian
Signature · 4 lines
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon SeedRe: [PATCH 09/13] glibc: drop obsolete packaging of glibc libnsl libs
Quoted 6 lines · Adrian Bunk
Quoted 2 lines · Andre McCurdy
Packaging rules were left behind when libnsl was removed:
...How has this change been tested?
Quoted 9 lines
ERROR: glibc-2.30-r0
do_package: QA Issue: glibc: Files/directories were installed but not shipped in any package:
/lib/libnsl-2.30.so
/lib/libnsl.so.1
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them withindo_install.
glibc: 2 installed and not shipped files. [installed-vs-shipped]
ERROR: glibc-2.30-r0do_package: Fatal QA errors found, failing task.
Showed up on the autobuilder too:
https://autobuilder.yoctoproject.org/typhoon/#/builders/65/builds/981/steps/8/logs/step1b
Cheers,
Richard
PATCH 10/13 update-rc.d.bbclass: support VIRTUAL-RUNTIME_init_manager == busybox
In reply to Andre McCurdy--- meta/classes/update-rc.d.bbclass | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
meta/classes/update-rc.d.bbclass +14 -3
@@ -1,6 +1,13 @@ UPDATERCPN ?= "${PN}" -DEPENDS_append_class-target = "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', ' update-rc.d initscripts', '', d)}" +def get_target_depends(d): + if bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): + return 'update-rc.d initscripts' + if d.getVar('VIRTUAL-RUNTIME_init_manager') == 'busybox': + return 'update-rc.d' + return '' + +DEPENDS_append_class-target = " ${@get_target_depends(d)}" UPDATERCD = "update-rc.d" UPDATERCD_class-cross = ""
@@ -50,7 +57,6 @@ if ${@use_updatercd(d)} && type update-rc.d >/dev/null 2>/dev/null; then fi } - def update_rc_after_parse(d): if d.getVar('INITSCRIPT_PACKAGES', False) == None: if d.getVar('INITSCRIPT_NAME', False) == None:
@@ -62,7 +68,12 @@ python __anonymous() { update_rc_after_parse(d) } -PACKAGESPLITFUNCS_prepend = "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'populate_packages_updatercd ', '', d)}" +def get_packagesplit_funcs(d): + if bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d) or d.getVar('VIRTUAL-RUNTIME_init_manager') == 'busybox': + return 'populate_packages_updatercd' + return '' + +PACKAGESPLITFUNCS_prepend = "${@get_packagesplit_funcs(d)} " PACKAGESPLITFUNCS_remove_class-nativesdk = "populate_packages_updatercd " populate_packages_updatercd[vardeps] += "updatercd_prerm updatercd_postrm updatercd_postinst"
Signature · 1 line
1.9.1
Re: [PATCH 10/13] update-rc.d.bbclass: support VIRTUAL-RUNTIME_init_manager == busybox
Quoted 11 lines · Andre McCurdy
Signed-off-by Andre McCurdy <[email protected]>--- meta/classes/update-rc.d.bbclass | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)meta/classes/update-rc.d.bbclass +0
-0
meta/classes/update-rc.d.bbclass line 9
Quoted 10 lines
meta/classes/update-rc.d.bbclass +7
-1@@ -1,6 +1,13 @@ UPDATERCPN ?= "${PN}" -DEPENDS_append_class-target = "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', ' update-rc.d initscripts', '', d)}" +def get_target_depends(d): + if bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): + return 'update-rc.d initscripts' + if d.getVar('VIRTUAL-RUNTIME_init_manager') == 'busybox': + return 'update-rc.d' + return '' +
checking init_manager seems more appropriate here than mixing DISTRO_FEAUTURE and init_manage check.
Quoted 34 lines
meta/classes/update-rc.d.bbclass +7
-3+DEPENDS_append_class-target = " ${@get_target_depends(d)}" UPDATERCD = "update-rc.d" UPDATERCD_class-cross = ""@@ -50,7 +57,6 @@ if ${@use_updatercd(d)} && type update-rc.d >/dev/null 2>/dev/null; then fi } - def update_rc_after_parse(d): if d.getVar('INITSCRIPT_PACKAGES', False) == None: if d.getVar('INITSCRIPT_NAME', False) == None:@@ -62,7 +68,12 @@ python __anonymous() { update_rc_after_parse(d) } -PACKAGESPLITFUNCS_prepend = "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'populate_packages_updatercd ', '', d)}" +def get_packagesplit_funcs(d): + if bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d) or d.getVar('VIRTUAL-RUNTIME_init_manager') == 'busybox': + return 'populate_packages_updatercd' + return '' + +PACKAGESPLITFUNCS_prepend = "${@get_packagesplit_funcs(d)} " PACKAGESPLITFUNCS_remove_class-nativesdk = "populate_packages_updatercd " populate_packages_updatercd[vardeps] += "updatercd_prerm updatercd_postrm updatercd_postinst" --1.9.1
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
PATCH 11/13 dropbear: don't create invalid symlinks if ssh, scp, etc are disabled
In reply to Andre McCurdy--- meta/recipes-core/dropbear/dropbear.inc | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
meta/recipes-core/dropbear/dropbear.inc +9 -2
@@ -70,8 +70,13 @@ do_install() { install -m 0644 ${WORKDIR}/dropbear.default ${D}${sysconfdir}/default/dropbear install -m 0755 dropbearmulti ${D}${sbindir}/ - ln -s ${sbindir}/dropbearmulti ${D}${bindir}/dbclient + for i in ${BINCOMMANDS} + do + # ssh and scp symlinks are created by update-alternatives + if [ $i = ssh ] || [ $i = scp ]; then continue; fi + ln -s ${sbindir}/dropbearmulti ${D}${bindir}/$i + done for i in ${SBINCOMMANDS} do ln -s ./dropbearmulti ${D}${sbindir}/$i
@@ -101,7 +106,7 @@ do_install() { inherit update-alternatives ALTERNATIVE_PRIORITY = "20" -ALTERNATIVE_${PN} = "scp ssh" +ALTERNATIVE_${PN} = "${@bb.utils.filter('BINCOMMANDS', 'scp ssh', d)}" ALTERNATIVE_TARGET = "${sbindir}/dropbearmulti"
@@ -113,3 +118,5 @@ pkg_postrm_append_${PN} () { rm ${sysconfdir}/dropbear/dropbear_dss_host_key fi } + +FILES_${PN} += "${bindir}"
Signature · 1 line
1.9.1
Re: [PATCH 11/13] dropbear: don't create invalid symlinks if ssh, scp, etc are disabled
Quoted 26 lines · Andre McCurdy
Signed-off-by Andre McCurdy <[email protected]>--- meta/recipes-core/dropbear/dropbear.inc | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)meta/recipes-core/dropbear/dropbear.inc +6
-1@@ -70,8 +70,13 @@ do_install() { install -m 0644 ${WORKDIR}/dropbear.default ${D}${sysconfdir}/default/dropbear install -m 0755 dropbearmulti ${D}${sbindir}/ - ln -s ${sbindir}/dropbearmulti ${D}${bindir}/dbclient + for i in ${BINCOMMANDS} + do + # ssh and scp symlinks are created by update-alternatives + if [ $i = ssh ] || [ $i = scp ]; then continue; fi + ln -s ${sbindir}/dropbearmulti ${D}${bindir}/$i + done for i in ${SBINCOMMANDS} do ln -s ./dropbearmulti ${D}${sbindir}/$i
meta/recipes-core/dropbear/dropbear.inc do_install() { · line 109
Quoted 5 lines
meta/recipes-core/dropbear/dropbear.inc +1
-1@@ -101,7 +106,7 @@ do_install() { inherit update-alternatives ALTERNATIVE_PRIORITY = "20" -ALTERNATIVE_${PN} = "scp ssh" +ALTERNATIVE_${PN} = "${@bb.utils.filter('BINCOMMANDS', 'scp ssh', d)}"
This perhaps is better done via packageconfig maybe. {S}BINCOMMANDS could be turned into packageconfig logic and
Quoted 17 lines
meta/recipes-core/dropbear/dropbear.inc +2
-1ALTERNATIVE_TARGET = "${sbindir}/dropbearmulti"@@ -113,3 +118,5 @@ pkg_postrm_append_${PN} () { rm ${sysconfdir}/dropbear/dropbear_dss_host_key fi } + +FILES_${PN} += "${bindir}" --1.9.1
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
PATCH 12/13 sqlite3: make CFLAGS consistent across native, nativesdk and target cases
In reply to Andre McCurdyThe previous simplification:
https://git.openembedded.org/openembedded-core/commit/?id=604777acfc54d285f315b622bd147ed02d55d6fd
looked OK but didn't actually work as expected. The native and nativesdk classes re-set CFLAGS after the += has been applied and so any modifications made via += are lost. Use _append instead.
--- meta/recipes-support/sqlite/sqlite3.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-support/sqlite/sqlite3.inc +2 -2
@@ -47,10 +47,10 @@ EXTRA_OECONF = " \ CFLAGS_append = " -fPIC" # pread() is in POSIX.1-2001 so any reasonable system must surely support it -CFLAGS += "-DUSE_PREAD" +CFLAGS_append = " -DUSE_PREAD" # Provide column meta-data API -CFLAGS += "-DSQLITE_ENABLE_COLUMN_METADATA" +CFLAGS_append = " -DSQLITE_ENABLE_COLUMN_METADATA" PACKAGES = "lib${BPN} lib${BPN}-dev lib${BPN}-doc ${PN}-dbg lib${BPN}-staticdev ${PN}"
Signature · 1 line
1.9.1
Re: [PATCH 12/13] sqlite3: make CFLAGS consistent across native, nativesdk and target cases
Quoted 9 lines · Andre McCurdy
The previous simplification:
https://git.openembedded.org/openembedded-core/commit/?id=604777acfc54d285f315b622bd147ed02d55d6fd
looked OK but didn't actually work as expected. The native and nativesdk classes re-set CFLAGS after the += has been applied and so any modifications made via += are lost. Use
_appendinstead.
Not a question for this patch but the original patch which attemped to unify patches for native nativesdk and target recipes. In my opinion native and nativesdk and native particularly should be compiled with default options and flags as much as possible, unless necessary is this needed in this case?
Quoted 30 lines
Signed-off-by Andre McCurdy <[email protected]>--- meta/recipes-support/sqlite/sqlite3.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)meta/recipes-support/sqlite/sqlite3.inc +2
-3@@ -47,10 +47,10 @@ EXTRA_OECONF = " \ CFLAGS_append = " -fPIC" # pread() is in POSIX.1-2001 so any reasonable system must surely support it -CFLAGS += "-DUSE_PREAD" +CFLAGS_append = " -DUSE_PREAD" # Provide column meta-data API -CFLAGS += "-DSQLITE_ENABLE_COLUMN_METADATA" +CFLAGS_append = " -DSQLITE_ENABLE_COLUMN_METADATA" PACKAGES = "lib${BPN} lib${BPN}-dev lib${BPN}-doc ${PN}-dbg lib${BPN}-staticdev ${PN}" --1.9.1
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
PATCH 13/13 sqlite3: explicitly set target endian-ness
In reply to Andre McCurdyUnless SQLITE_BYTEORDER is predefined, the code falls back to build time huristics - which are not always correct (e.g. in sqlite 3.28.0 big-endian ARM is mis-detected).
--- meta/recipes-support/sqlite/sqlite3.inc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
meta/recipes-support/sqlite/sqlite3.inc +5 -1
@@ -19,7 +19,7 @@ UPSTREAM_CHECK_REGEX = "releaselog/(?P<pver>(\d+[\.\-_]*)+)\.html" CVE_PRODUCT = "sqlite" -inherit autotools pkgconfig +inherit autotools pkgconfig siteinfo # enable those which are enabled by default in configure PACKAGECONFIG ?= "fts4 fts5 json1 rtree dyn_ext"
@@ -52,6 +52,10 @@ CFLAGS_append = " -DUSE_PREAD" # Provide column meta-data API CFLAGS_append = " -DSQLITE_ENABLE_COLUMN_METADATA" +# Unless SQLITE_BYTEORDER is predefined, the code falls back to build time +# huristics, which are not always correct +CFLAGS_append = " ${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', '-DSQLITE_BYTEORDER=1234', '-DSQLITE_BYTEORDER=4321', d)}" + PACKAGES = "lib${BPN} lib${BPN}-dev lib${BPN}-doc ${PN}-dbg lib${BPN}-staticdev ${PN}" FILES_${PN} = "${bindir}/*"
Signature · 1 line
1.9.1