Patchwork [for,dylan] kernel.bbclass: Correct post(inst|rm) package association

login
register
mail settings
Submitter Franklin Cooper Jr.
Date Sept. 24, 2013, 5:58 p.m.
Message ID <1380045500-10798-1-git-send-email-fcooper@ti.com>
Download mbox | patch
Permalink /patch/58883/
State New
Headers show

Comments

Franklin Cooper Jr. - Sept. 24, 2013, 5:58 p.m.
From: Darren Hart <dvhart@linux.intel.com>

Fixes [YOCTO #4991]

The kernel image is installed as part of the kernel-image package, but
the symlink creation/removal via alternatives is being done in
pkg_post(inst|rm)_kernel-base.

Move the postinst alternatives logic into the kernel-image functions.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/classes/kernel.bbclass |   29 +++++++++++++----------------
 1 files changed, 13 insertions(+), 16 deletions(-)
Denys Dmytriyenko - Oct. 4, 2013, 6:41 p.m.
Ping. Is Dylan still alive?


On Tue, Sep 24, 2013 at 12:58:20PM -0500, Franklin S. Cooper Jr wrote:
> From: Darren Hart <dvhart@linux.intel.com>
> 
> Fixes [YOCTO #4991]
> 
> The kernel image is installed as part of the kernel-image package, but
> the symlink creation/removal via alternatives is being done in
> pkg_post(inst|rm)_kernel-base.
> 
> Move the postinst alternatives logic into the kernel-image functions.
> 
> Signed-off-by: Darren Hart <dvhart@linux.intel.com>
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
>  meta/classes/kernel.bbclass |   29 +++++++++++++----------------
>  1 files changed, 13 insertions(+), 16 deletions(-)
> 
> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
> index 3320747..c417038 100644
> --- a/meta/classes/kernel.bbclass
> +++ b/meta/classes/kernel.bbclass
> @@ -237,14 +237,6 @@ do_savedefconfig() {
>  do_savedefconfig[nostamp] = "1"
>  addtask savedefconfig after do_configure
>  
> -pkg_postinst_kernel-base () {
> -	update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true
> -}
> -
> -pkg_postrm_kernel-base () {
> -	update-alternatives --remove ${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE}-${KERNEL_VERSION} || true
> -}
> -
>  inherit cml1
>  
>  EXPORT_FUNCTIONS do_compile do_install do_configure
> @@ -272,14 +264,19 @@ ALLOW_EMPTY_kernel-modules = "1"
>  DESCRIPTION_kernel-modules = "Kernel modules meta package"
>  
>  pkg_postinst_kernel-image () {
> -if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then
> -	mkdir -p $D/lib/modules/${KERNEL_VERSION}
> -fi
> -if [ -n "$D" ]; then
> -	depmodwrapper -a -b $D ${KERNEL_VERSION}
> -else
> -	depmod -a ${KERNEL_VERSION}
> -fi
> +	update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true
> +	if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then
> +		mkdir -p $D/lib/modules/${KERNEL_VERSION}
> +	fi
> +	if [ -n "$D" ]; then
> +		depmodwrapper -a -b $D ${KERNEL_VERSION}
> +	else
> +		depmod -a ${KERNEL_VERSION}
> +	fi
> +}
> +
> +pkg_postrm_kernel-image () {
> +	update-alternatives --remove ${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE}-${KERNEL_VERSION} || true
>  }
>  
>  PACKAGESPLITFUNCS_prepend = "split_kernel_packages "
> -- 
> 1.7.0.4
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
Paul Eggleton - Oct. 4, 2013, 10:56 p.m.
Hi Denys,

On Friday 04 October 2013 14:41:16 Denys Dmytriyenko wrote:
> Ping. Is Dylan still alive?

It is yes. I pushed a paule/dylan-next poky-contrib branch the other day 
including this fix but haven't had a chance to run it through the autobuilder 
yet (been busy with 1.5 work). Will try to get it done next week.

Cheers,
Paul
Paul Eggleton - Oct. 11, 2013, 9:33 a.m.
On Friday 04 October 2013 23:56:18 Paul Eggleton wrote:
> On Friday 04 October 2013 14:41:16 Denys Dmytriyenko wrote:
> > Ping. Is Dylan still alive?
> 
> It is yes. I pushed a paule/dylan-next poky-contrib branch the other day
> including this fix but haven't had a chance to run it through the
> autobuilder yet (been busy with 1.5 work). Will try to get it done next
> week.

FYI the patch has now been merged to the dylan branch along with a few other 
fixes.

Cheers,
Paul
Denys Dmytriyenko - Oct. 11, 2013, 7:42 p.m.
On Fri, Oct 11, 2013 at 10:33:03AM +0100, Paul Eggleton wrote:
> On Friday 04 October 2013 23:56:18 Paul Eggleton wrote:
> > On Friday 04 October 2013 14:41:16 Denys Dmytriyenko wrote:
> > > Ping. Is Dylan still alive?
> > 
> > It is yes. I pushed a paule/dylan-next poky-contrib branch the other day
> > including this fix but haven't had a chance to run it through the
> > autobuilder yet (been busy with 1.5 work). Will try to get it done next
> > week.
> 
> FYI the patch has now been merged to the dylan branch along with a few other 
> fixes.

Thanks, Paul!

Patch

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 3320747..c417038 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -237,14 +237,6 @@  do_savedefconfig() {
 do_savedefconfig[nostamp] = "1"
 addtask savedefconfig after do_configure
 
-pkg_postinst_kernel-base () {
-	update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true
-}
-
-pkg_postrm_kernel-base () {
-	update-alternatives --remove ${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE}-${KERNEL_VERSION} || true
-}
-
 inherit cml1
 
 EXPORT_FUNCTIONS do_compile do_install do_configure
@@ -272,14 +264,19 @@  ALLOW_EMPTY_kernel-modules = "1"
 DESCRIPTION_kernel-modules = "Kernel modules meta package"
 
 pkg_postinst_kernel-image () {
-if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then
-	mkdir -p $D/lib/modules/${KERNEL_VERSION}
-fi
-if [ -n "$D" ]; then
-	depmodwrapper -a -b $D ${KERNEL_VERSION}
-else
-	depmod -a ${KERNEL_VERSION}
-fi
+	update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true
+	if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then
+		mkdir -p $D/lib/modules/${KERNEL_VERSION}
+	fi
+	if [ -n "$D" ]; then
+		depmodwrapper -a -b $D ${KERNEL_VERSION}
+	else
+		depmod -a ${KERNEL_VERSION}
+	fi
+}
+
+pkg_postrm_kernel-image () {
+	update-alternatives --remove ${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE}-${KERNEL_VERSION} || true
 }
 
 PACKAGESPLITFUNCS_prepend = "split_kernel_packages "