From 38b79eccf537704d383b82b45794bcdc7d0b6e26 Mon Sep 17 00:00:00 2001 From: Grazvydas Ignotas Date: Fri, 28 Nov 2014 03:54:43 +0200 Subject: [PATCH] omap3-pandora-kernel: remove postinst script from old 2.6 kernel --- recipes/linux/linux.inc | 15 ++++++++------- .../linux/omap3-pandora-kernel_2.6.27-pandora.bb | 4 ++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/recipes/linux/linux.inc b/recipes/linux/linux.inc index 3b2da6c..9931bdb 100755 --- a/recipes/linux/linux.inc +++ b/recipes/linux/linux.inc @@ -240,11 +240,12 @@ do_devicetree_image() { addtask devicetree_image after do_install before do_package do_deploy -pkg_postinst_kernel-devicetree () { - cd /${KERNEL_IMAGEDEST}; update-alternatives --install /${KERNEL_IMAGEDEST}/devicetree devicetree devicetree-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true -} - -pkg_postrm_kernel-devicetree () { - cd /${KERNEL_IMAGEDEST}; update-alternatives --remove devicetree devicetree-${KERNEL_VERSION} || true -} +# pandora uses different method for this.. +#pkg_postinst_kernel-devicetree () { +# cd /${KERNEL_IMAGEDEST}; update-alternatives --install /${KERNEL_IMAGEDEST}/devicetree devicetree devicetree-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true +#} + +#pkg_postrm_kernel-devicetree () { +# cd /${KERNEL_IMAGEDEST}; update-alternatives --remove devicetree devicetree-${KERNEL_VERSION} || true +#} diff --git a/recipes/linux/omap3-pandora-kernel_2.6.27-pandora.bb b/recipes/linux/omap3-pandora-kernel_2.6.27-pandora.bb index 4d7ff6e..809a721 100755 --- a/recipes/linux/omap3-pandora-kernel_2.6.27-pandora.bb +++ b/recipes/linux/omap3-pandora-kernel_2.6.27-pandora.bb @@ -5,7 +5,7 @@ KERNEL_IMAGETYPE = "uImage" COMPATIBLE_MACHINE = "omap3-pandora" -SRCREV = "2da1fbc0748b3629d04e32e99a67860d107e5dd5" +SRCREV = "882c74969cb0d0aa7f16bc0484b39cbc60dc78d6" SRC_URI = " \ git://git.openpandora.org/pandora-kernel.git;protocol=git;branch=pandora-27-omap1 \ @@ -13,7 +13,7 @@ SRC_URI = " \ # ------------------------------- -PV = "2.6.27-pandora+${PR}+git${SRCREV}.14" +PV = "2.6.27-pandora+${PR}+git${SRCREV}.15" SRC_URI_append = " \ file://defconfig \ -- 2.39.5