From 9e2fce0fba737e8a7bbb6aed16067f15b7ce01eb Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 18 Dec 2012 18:03:22 +0100 Subject: [PATCH] linux: Fix the symlinking of the uImage symlink in /boot/ This has been fixed in upstream of OE-Core and in newer versions of Yocto. For Edison provide our own version of the pkg_postinst and pkg_postrm routines. It is not clear yet if this conflicts with newer versions of poky but all that could happen is that the symlink is changed twice and removed twice but the command ends with a || true so this should not cause any kind of fault. --- recipes-bsp/linux/linux-sysmocom.inc | 9 +++++++++ recipes-bsp/linux/linux-sysmocom_git.bb | 2 +- recipes-bsp/linux/linux_2.6.39.bb | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/recipes-bsp/linux/linux-sysmocom.inc b/recipes-bsp/linux/linux-sysmocom.inc index b60586d..470a19a 100644 --- a/recipes-bsp/linux/linux-sysmocom.inc +++ b/recipes-bsp/linux/linux-sysmocom.inc @@ -12,3 +12,12 @@ module_autoload_mISDN_dsp = "mISDN_dsp" module_conf_mISDN_l1loop = "options mISDN_l1loop pri=1 nchannel=20" FILES_${PN} = "" + +# Remove when using a Poky/OE-Core with that includes e0bf758982843ec1981b74410616b3492c599d06 +pkg_postinst_kernel () { + update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true +} + +pkg_postrm_kernel () { + update-alternatives --remove ${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE}-${KERNEL_VERSION} || true +} diff --git a/recipes-bsp/linux/linux-sysmocom_git.bb b/recipes-bsp/linux/linux-sysmocom_git.bb index 01dacf7..f3c0dba 100644 --- a/recipes-bsp/linux/linux-sysmocom_git.bb +++ b/recipes-bsp/linux/linux-sysmocom_git.bb @@ -12,7 +12,7 @@ BTS_FIRMWARE_NAME_sysmobts-v2 = "sysmobts-v2" SRCREV = "20b5f4f07eb6719e41cc6d25fc2a73d95337421c" -PR = "r24" +PR = "r26" PV = "${LINUX_VERSION}+git${SRCPV}" SRC_URI = "git://git.sysmocom.de/sysmo-bts/linux.git;protocol=git;branch=v3.2 \ diff --git a/recipes-bsp/linux/linux_2.6.39.bb b/recipes-bsp/linux/linux_2.6.39.bb index 22478f9..fcd864d 100644 --- a/recipes-bsp/linux/linux_2.6.39.bb +++ b/recipes-bsp/linux/linux_2.6.39.bb @@ -3,7 +3,7 @@ require linux-sysmocom.inc LINUX_VERSION ?= "${PV}" -PR = "r13" +PR = "r15" SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ ftp://ftp.servus.at/linux-kernel/patch-2.6.39.4.bz2;apply=yes;name=stablepatch \ file://mISDN_loop.patch \