Misc bugfixes

PATCH Superseded Paul Eggleton 1 participant 3 messages Mar 20, 2014

lore

Share & tools

lore

Paul Eggleton

author

2014-03-20 19:20 UTC #1 lore raw

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

In reply to 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(-)

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

Paul Eggleton

author

2014-03-20 19:20 UTC #2 lore raw

PATCH v2 2/2 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

Paul Eggleton

author

2014-03-20 19:20 UTC #0 lore raw

v2 cover Misc bugfixes

Since v1, drop the python fix; this will be fixed and sent out in another series.

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 (2):
classes/kernel: move module postinst commands to kernel-base
x264: add perlnative to inherit

 meta/classes/kernel.bbclass              | 7 +++++--
 meta/recipes-multimedia/x264/x264_git.bb | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

Signature · 1 line

1.8.5.3