Small fixes from bitbake world
cover Small fixes from bitbake world
The following changes since commit 24b954253dd1aa626835352c4dc8d085a19aae35:
xserver-xorg: restore packaging for the DRI/DRI2/DBE extensions (2012-12-03 16:38:28 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib jansa/pull
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/pull
Enrico Scholz (1):
sstate.bbclass: fixed file-conflict check
Martin Jansa (5):
at: drop initscript dependency
packagegroup-core-basic: use VIRTUAL-RUNTIME_initscripts and
VIRTUAL-RUNTIME_init_manager
distutils: remove empty datadir/share after it's content is moved to
datadir
util-linux: use u-a for eject
sstate.bbclass: fix detection of owners matching sstate files
meta/classes/distutils.bbclass | 1 + meta/classes/sstate.bbclass | 5 ++--- meta/recipes-core/util-linux/util-linux.inc | 3 ++- meta/recipes-core/util-linux/util-linux_2.22.1.bb | 2 +- meta/recipes-extended/at/at_3.1.13.bb | 2 +- meta/recipes-extended/packagegroups/packagegroup-core-basic.bb | 8 +++++--- 6 files changed, 12 insertions(+), 9 deletions(-)
Signature · 1 line
1.8.0
PATCH 1/6 at: drop initscript dependency
* doesn't look like build dependency
* and for runtime dependency if needed we should use VIRTUAL-RUNTIME_initscripts
--- meta/recipes-extended/at/at_3.1.13.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-extended/at/at_3.1.13.bb +1 -1
@@ -4,7 +4,7 @@ the system load levels drop to a particular level." SECTION = "base" LICENSE="GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4" -DEPENDS = "flex flex-native initscripts \ +DEPENDS = "flex flex-native \ ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RDEPENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_DEPS}', '', d)}" PAM_DEPS = "libpam libpam-runtime pam-plugin-env pam-plugin-limits"
Signature · 1 line
1.8.0
Re: [PATCH 1/6] at: drop initscript dependency
Quoted 3 lines · Martin Jansa
* doesn't look like build dependency
* and for runtime dependency if needed we should use VIRTUAL-RUNTIME_initscripts
Agreed on the VIRTUAL-RUNTIME, which I think is needed for the populate-volatiles script for the /var and /run directories.
Sau!
Quoted 19 lines
Signed-off-by Martin Jansa <[email protected]>--- meta/recipes-extended/at/at_3.1.13.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)meta/recipes-extended/at/at_3.1.13.bb +1
-1@@ -4,7 +4,7 @@ the system load levels drop to a particular level." SECTION = "base" LICENSE="GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4" -DEPENDS = "flex flex-native initscripts \ +DEPENDS = "flex flex-native \ ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RDEPENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_DEPS}', '', d)}" PAM_DEPS = "libpam libpam-runtime pam-plugin-env pam-plugin-limits"
PATCH 2/6 packagegroup-core-basic: use VIRTUAL-RUNTIME_initscripts and VIRTUAL-RUNTIME_init_manager
In reply to Martin Jansa--- meta/recipes-extended/packagegroups/packagegroup-core-basic.bb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
meta/recipes-extended/packagegroups/packagegroup-core-basic.bb +5 -3
@@ -3,7 +3,7 @@ # DESCRIPTION = "Create Basic Image Tasks" -PR = "r5" +PR = "r6" LICENSE = "MIT" inherit packagegroup
@@ -90,9 +90,11 @@ RDEPENDS_packagegroup-core-dev-utils = "\ patch \ " +VIRTUAL-RUNTIME_initscripts ?= "initscripts" +VIRTUAL-RUNTIME_init_manager ?= "sysvinit" RDEPENDS_packagegroup-core-initscripts = "\ - initscripts \ - sysvinit \ + ${VIRTUAL-RUNTIME_initscripts} \ + ${VIRTUAL-RUNTIME_init_manager} \ ethtool \ mingetty \ sysklogd \
Signature · 1 line
1.8.0
PATCH 3/6 distutils: remove empty datadir/share after it's content is moved to datadir
In reply to Martin Jansa* fixes a lot of QA warnings about unpackaged /usr/share/share
--- meta/classes/distutils.bbclass | 1 + 1 file changed, 1 insertion(+)
meta/classes/distutils.bbclass +1 -0
@@ -64,6 +64,7 @@ distutils_do_install() { # if test -e ${D}${datadir}/share; then mv -f ${D}${datadir}/share/* ${D}${datadir}/ + rmdir ${D}${datadir}/share fi }
Signature · 1 line
1.8.0
PATCH 4/6 util-linux: use u-a for eject
In reply to Martin Jansa* 2.22.1 now builds eject which conflicts with eject from eject recipe in meta-oe
--- meta/recipes-core/util-linux/util-linux.inc | 3 ++- meta/recipes-core/util-linux/util-linux_2.22.1.bb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
meta/recipes-core/util-linux/util-linux.inc +2 -1
@@ -136,7 +136,7 @@ ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_${PN} = "dmesg kill more reset mkswap blockdev pivot_root" ALTERNATIVE_${PN} += "mkfs.minix hexdump last logger mesg renice wall" -ALTERNATIVE_${PN} += "setsid chrt flock hwclock utmpdump" +ALTERNATIVE_${PN} += "setsid chrt flock hwclock utmpdump eject" ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill"
@@ -147,6 +147,7 @@ ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap" ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev" ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root" ALTERNATIVE_LINK_NAME[mkfs.minix] = "${base_sbindir}/mkfs.minix" +ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" # There seems to be problem, atleast on nslu2, with these, untill they are # fixed the busybox ones have higher priority
meta/recipes-core/util-linux/util-linux_2.22.1.bb +1 -1
@@ -1,5 +1,5 @@ MAJOR_VERSION = "2.22" -PR = "r0" +PR = "r1" require util-linux.inc # note that `lscpu' is under GPLv3+
Signature · 1 line
1.8.0
PATCH 5/6 sstate.bbclass: fixed file-conflict check
In reply to Martin JansaFrom: Enrico Scholz <[email protected]>
The value of subprocess.Popen().communicate()[0] is a string. Checking for '!= None' will always match causing bogus warnings regarding already staged files.
--- meta/classes/sstate.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/sstate.bbclass +1 -1
@@ -171,7 +171,7 @@ def sstate_install(ss, d): sstate_search_cmd = "grep -rl %s %s --exclude=master.list | sed -e 's:^.*/::' -e 's:\.populate-sysroot::'" % (f, d.expand("${SSTATE_MANIFESTS}")) cmd_array = sstate_search_cmd.split(' ') search_output = subprocess.Popen(cmd_array, stdout=subprocess.PIPE).communicate()[0] - if search_output != None: + if search_output != "": match.append("Matched in %s" % search_output.rstrip()) if match: bb.warn("The recipe %s is trying to install files into a shared area when those files already exist. Those files and their manifest location are:\n %s\nPlease verify which package should provide the above files." % (d.getVar('PN', True), "\n ".join(match)))
Signature · 1 line
1.8.0
PATCH 6/6 sstate.bbclass: fix detection of owners matching sstate files
In reply to Martin Jansa* without this patch:
Python 2.7.3
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
sstate_search_cmd= "grep -rl /OE/jansa-test/shr-core/tmp-eglibc/pkgdata/armv7a-vfp-neon-oe-linux-gnueabi/runtime-reverse/vim-common /OE/jansa-test/shr-core/tmp-eglibc/sstate-control --exclude=master.list | sed -e 's:^.*/::' -e 's:\.populate-sysroot::'"cmd_array=sstate_search_cmd.split(' ')search_output=subprocess.Popen(cmd_array, stdout=subprocess.PIPE).communicate()[0]
grep: |: No such file or directory
grep: sed: No such file or directory
* Adding shell=True and using cmd string instead of array makes it work:
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
search_output=subprocess.Popen(sstate_search_cmd, shell=True, stdout=subprocess.PIPE).communicate()[0] printsearch_output
manifest-armv7a-vfp-neon-gvim.package
manifest-armv7a-vfp-neon-vim-tiny.package
manifest-armv7a-vfp-neon-vim.package
But still isn't 100% reliable, I guess it's caused by some other package being removed from sstate while grep is already running.
So sometimes grep can show error on STDERR
Quoted 1 line
Quoted 1 line
Quoted 1 line
search_output=subprocess.Popen(sstate_search_cmd, shell=True, stdout=subprocess.PIPE).communicate()[0]
grep: /OE/jansa-test/shr-core/tmp-eglibc/sstate-control/manifest-armv7a-vfp-neon-systemtap.package: No such file or directory
--- meta/classes/sstate.bbclass | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
meta/classes/sstate.bbclass +1 -2
@@ -169,8 +169,7 @@ def sstate_install(ss, d): if realmatch: match.append(f) sstate_search_cmd = "grep -rl %s %s --exclude=master.list | sed -e 's:^.*/::' -e 's:\.populate-sysroot::'" % (f, d.expand("${SSTATE_MANIFESTS}")) - cmd_array = sstate_search_cmd.split(' ') - search_output = subprocess.Popen(cmd_array, stdout=subprocess.PIPE).communicate()[0] + search_output = subprocess.Popen(sstate_search_cmd, shell=True, stdout=subprocess.PIPE).communicate()[0] if search_output != "": match.append("Matched in %s" % search_output.rstrip()) if match:
Signature · 1 line
1.8.0