]> code.ossystems Code Review - openembedded-core.git/commitdiff
allarch.bbclass: Exclude package_do_shlibs from do_package signature
authorKhem Raj <raj.khem@gmail.com>
Sun, 29 Apr 2018 19:15:14 +0000 (12:15 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 9 May 2018 09:47:27 +0000 (10:47 +0100)
shlibs is largely useless for allarch, the particular usecase where it
fails is when DISTRO_FEATURE is changing due to libc being different e.g.

Variable package_do_shlibs value changed:
-DISTRO_FEATURES{ldconfig} = Set
+DISTRO_FEATURES{ldconfig} = Unset

musl -> glibc or other way around 'ldconfig' gets added or deleted to
DISTRO_FEATURE set, neither this distro feature nor the shlibs processing
during packaging is of interest to allarch packages which are largely
arch independent scripts

Signed-off-by: Khem Raj <raj.khem@gmail.com>
meta/classes/allarch.bbclass

index 51ba509cd0a28342e7b448df46f5c9c7d9aa73a9..1eebe0bf2e7f44dc5a90e8a36db37e81785fb875 100644 (file)
@@ -45,6 +45,7 @@ python () {
         # These multilib values shouldn't change allarch packages so exclude them
         d.appendVarFlag("emit_pkgdata", "vardepsexclude", " MULTILIB_VARIANTS")
         d.appendVarFlag("write_specfile", "vardepsexclude", " MULTILIBS")
+        d.appendVarFlag("do_package", "vardepsexclude", " package_do_shlibs")
     elif bb.data.inherits_class('packagegroup', d) and not bb.data.inherits_class('nativesdk', d):
         bb.error("Please ensure recipe %s sets PACKAGE_ARCH before inherit packagegroup" % d.getVar("FILE"))
 }