From fa4872bb1ffdaf6eb082a2a5145ab9916052eb86 Mon Sep 17 00:00:00 2001 From: "Franklin S. Cooper Jr" Date: Fri, 11 Oct 2013 17:11:45 -0500 Subject: [PATCH] Revert "linux-ti-staging_git: Mimic patch "Correct post(inst|rm) package association"" This reverts commit c9a63ed5f4d1857249115690d775bd9e4d43ce8e. Patch has been picked up in oe-core/dylan. Signed-off-by: Denys Dmytriyenko --- recipes-kernel/linux/linux-ti-staging_git.bb | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/recipes-kernel/linux/linux-ti-staging_git.bb b/recipes-kernel/linux/linux-ti-staging_git.bb index 875df821..f26b223a 100644 --- a/recipes-kernel/linux/linux-ti-staging_git.bb +++ b/recipes-kernel/linux/linux-ti-staging_git.bb @@ -35,22 +35,9 @@ SRCREV = "04faa81d0573686847c8c74f4c67c8a69c13ce9f" PV = "3.11+3.12-rc4" # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild -MACHINE_KERNEL_PR_append = "c+gitr${SRCPV}" +MACHINE_KERNEL_PR_append = "d+gitr${SRCPV}" PR = "${MACHINE_KERNEL_PR}" SRC_URI = "git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git;protocol=git;branch=${BRANCH} \ file://defconfig \ " - -# The below code mimics patch -# "kernel.bbclass: Correct post(inst|rm) package association" which is included -# in oe-core master. Once the patch has been pushed into dylan the below code -# can be removed. - -pkg_postinst_kernel-image_append () { - 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 -}