Skip to contentSkip to conversation

Misc bugfixes

PATCH Superseded Paul Eggleton 2 participants 6 messages Mar 20, 2014 – Mar 21, 2014

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Paul Eggleton

author
#0 lore raw

cover Misc bugfixes

The following changes since commit ef196434620522affc11b5b1b867386b5d14a4c3:

alsa-tools: fix build when x11 and gtk+ not available (2014-03-19 14:41:55 +0000)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib paule/fixes5
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/fixes5

Paul Eggleton (3):
classes/kernel: move module postinst commands to kernel-base
python: add python-mmap to python-multiprocessing RDEPENDS
x264: add perlnative to inherit

 meta/classes/kernel.bbclass                          | 7 +++++--
 meta/recipes-devtools/python/python-2.7-manifest.inc | 2 +-
 meta/recipes-multimedia/x264/x264_git.bb             | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)
Signature · 1 line
1.8.5.3
author
#1 lore raw

PATCH 1/3 classes/kernel: move module postinst commands to kernel-base

Since kernel-base is the package that contains the files that depmod needs to run, we should be running depmod from the kernel-base postinstall rather than kernel-image.

Fixes [YOCTO #5392].

Signed-off-by Paul Eggleton <[email protected]>
---
 meta/classes/kernel.bbclass | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
meta/classes/kernel.bbclass +5 -2
index 6953109..19b159b 100644
@@ -362,8 +362,7 @@ ALLOW_EMPTY_kernel-image = "1"
 ALLOW_EMPTY_kernel-modules = "1"
 DESCRIPTION_kernel-modules = "Kernel modules meta package"
 
-pkg_postinst_kernel-image () {
-	update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true
+pkg_postinst_kernel-base () {
 	if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then
 		mkdir -p $D/lib/modules/${KERNEL_VERSION}
 	fi

@@ -374,6 +373,10 @@ pkg_postinst_kernel-image () {
 	fi
 }
 
+pkg_postinst_kernel-image () {
+	update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true
+}
+
 pkg_postrm_kernel-image () {
 	update-alternatives --remove ${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE}-${KERNEL_VERSION} || true
 }
Signature · 1 line
1.8.5.3
#2 lore raw

Re: [PATCH 1/3] classes/kernel: move module postinst commands to kernel-base

Quoted 10 lines · Paul Eggleton

Since kernel-base is the package that contains the files that depmod needs to run, we should be running depmod from the kernel-base postinstall rather than kernel-image.

Fixes [YOCTO #5392].

Signed-off-by Paul Eggleton <[email protected]>
---
 meta/classes/kernel.bbclass | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

I think this might have triggered:

http://autobuilder.yoctoproject.org/main/builders/nightly-multilib/builds/105/steps/BuildImages_3/logs/stdio

Cheers,

Richard

author
#3 lore raw

PATCH 2/3 python: add python-mmap to python-multiprocessing RDEPENDS

In reply to Paul Eggleton

The multiprocessing module needs the mmap module. We got away with not having this for the build appliance because python-mmap was added to packagegroup-self-hosted, but this is the proper place to have it.

Signed-off-by Paul Eggleton <[email protected]>
---
 meta/recipes-devtools/python/python-2.7-manifest.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/python/python-2.7-manifest.inc +1 -1
index 49dbc0b..a557cdc 100644
@@ -151,7 +151,7 @@ RDEPENDS_${PN}-mmap="${PN}-core ${PN}-io"
 FILES_${PN}-mmap="${libdir}/python2.7/lib-dynload/mmap.so "
 
 SUMMARY_${PN}-multiprocessing="Python multiprocessing support"
-RDEPENDS_${PN}-multiprocessing="${PN}-core ${PN}-io ${PN}-lang ${PN}-pickle ${PN}-threading ${PN}-ctypes"
+RDEPENDS_${PN}-multiprocessing="${PN}-core ${PN}-io ${PN}-lang ${PN}-pickle ${PN}-threading ${PN}-ctypes ${PN}-mmap"
 FILES_${PN}-multiprocessing="${libdir}/python2.7/lib-dynload/_multiprocessing.so ${libdir}/python2.7/multiprocessing "
 
 SUMMARY_${PN}-netclient="Python Internet Protocol clients"
Signature · 1 line
1.8.5.3
author
#4 lore raw

Re: [PATCH 2/3] python: add python-mmap to python-multiprocessing RDEPENDS

Quoted 24 lines · On Thursday 20 March 2014 15:15:10 Paul Eggleton wrote:

The multiprocessing module needs the mmap module. We got away with not having this for the build appliance because python-mmap was added to packagegroup-self-hosted, but this is the proper place to have it.

Signed-off-by Paul Eggleton <[email protected]>
---
 meta/recipes-devtools/python/python-2.7-manifest.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
(quoted diff) +0 -0

b/meta/recipes-devtools/python/python-2.7-manifest.inc index 49dbc0b..a557cdc 100644

meta/recipes-devtools/python/python-2.7-manifest.inc +0 -1
@@ -151,7 +151,7 @@ RDEPENDS_${PN}-mmap="${PN}-core ${PN}-io"
 FILES_${PN}-mmap="${libdir}/python2.7/lib-dynload/mmap.so "
 
 SUMMARY_${PN}-multiprocessing="Python multiprocessing support"
-RDEPENDS_${PN}-multiprocessing="${PN}-core ${PN}-io ${PN}-lang ${PN}-pickle

${PN}-threading ${PN}-ctypes" +RDEPENDS_${PN}-multiprocessing="${PN}-core ${PN}-io ${PN}-lang ${PN}-pickle ${PN}-threading ${PN}-ctypes ${PN}-mmap" FILES_${PN}-multiprocessing="${libdir}/python2.7/lib-dynload/_multiprocessi ng.so ${libdir}/python2.7/multiprocessing "

Quoted 1 line

SUMMARY_${PN}-netclient="Python Internet Protocol clients"

So I missed completely that this file is automatically generated. I'm going to update the script and send a v2, with some additional patches to sync other changes between the script and the inc file.

Cheers,
Paul

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre
author
#5 lore raw

PATCH 3/3 x264: add perlnative to inherit

In reply to Paul Eggleton

perl is run as part of the configure process, so we should ensure that it's available.

Should fix [YOCTO #5768].

Signed-off-by Paul Eggleton <[email protected]>
---
 meta/recipes-multimedia/x264/x264_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-multimedia/x264/x264_git.bb +1 -1
index 0e305ea..d192c30 100644
@@ -18,7 +18,7 @@ PV = "r2265+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
-inherit lib_package pkgconfig
+inherit lib_package pkgconfig perlnative
 
 X264_DISABLE_ASM = ""
 X264_DISABLE_ASM_armv4 = "--disable-asm"
Signature · 1 line
1.8.5.3