diff --git a/meta-digi-arm/recipes-kernel/linux/linux-del.inc b/meta-digi-arm/recipes-kernel/linux/linux-del.inc index a80d7cb40..a96abc959 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-del.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-del.inc @@ -12,6 +12,7 @@ inherit kernel # Put a local version until we have a true SRCREV to point to LOCALVERSION ?= "+del" +SCMVERSION ?= "y" kernel_conf_variable() { CONF_SED_SCRIPT="$CONF_SED_SCRIPT /CONFIG_$1[ =]/d;" @@ -45,7 +46,9 @@ do_configure_prepend() { } do_deploy_append() { + cd ${DEPLOYDIR} ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGE_SYMLINK_NAME} + cd - } # install nedded headers for imx-test compilation diff --git a/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14.bb b/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14.bb index 1330b9eb0..c097d8737 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-del_2.6.35.14.bb @@ -4,20 +4,29 @@ include linux-del.inc PR = "${DISTRO}.${INC_PR}.0" -# Uncomment to build the from sources (internal use only) -# KERNEL_BUILD_SRC ?= "1" +# Uncomment to build from internal GIT repository +# KERNEL_USE_INTERNAL_REPO ?= "1" -SRCREV = "d615e9350f4d14e8a0177ff4a3da8639046657eb" +SRCREV_external = "c3f3fa8f819f83e77fc0e0c339f12a6fe2a52fef" +SRCREV_internal = "d615e9350f4d14e8a0177ff4a3da8639046657eb" +SRCREV = "${@base_conditional('KERNEL_USE_INTERNAL_REPO', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}" -# Checksums for 'linux-2.6-${SRCREV_SHORT}.tar.gz' tarballs -TARBALL_MD5 = "7cdc5187de9b416cfd4a619cd4c83742" -TARBALL_SHA256 = "5071dfc96c7340ca4e4b3f9c54771e146f3a4b46cb30c3c92c33c7a4d8ead7de" +LOCALVERSION_mx5 = "mx5" +LOCALVERSION_mxs = "mxs" +LOCALVERSION_cpx2_mxs = "mxs+gateways" -SRCREV_SHORT = "${@'${SRCREV}'[:7]}" - -LOCALVERSION_mx5 = "mx5+${SRCREV_SHORT}" -LOCALVERSION_mxs = "mxs+${SRCREV_SHORT}" -LOCALVERSION_cpx2_mxs = "mxs+gateways+${SRCREV_SHORT}" +SRC_URI_external = "git://github.com/dgii/yocto-linux.git;protocol=git" +SRC_URI_internal = "${DIGI_LOG_GIT}linux-2.6.git;protocol=git" +SRC_URI = "${@base_conditional('KERNEL_USE_INTERNAL_REPO', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)}" +SRC_URI += " \ + file://defconfig \ + ${KERNEL_CFG_FRAGS} \ +" +SRC_URI_append_cpx2 = " \ + file://cpx2-Remove-incorrect-pin-configurations.patch \ + file://cpx2e-Setup-mmc0-for-the-wireless-interface.patch \ +" +S = "${WORKDIR}/git" KERNEL_CFG_FRAGS ?= "" KERNEL_CFG_FRAGS_append_mx5 = "file://config-sahara-module.cfg file://config-camera-module.cfg" @@ -32,28 +41,6 @@ KERNEL_CFG_FRAGS_append_ccardimx28js = " ${@base_contains('MACHINE_FEATURES', 'e KERNEL_CFG_FRAGS_append_ccardimx28js = " ${@base_contains('DISTRO_FEATURES', 'x11', 'file://config-fb.cfg file://config-touch.cfg', '', d)}" KERNEL_CFG_FRAGS_append_ccardimx28js = " ${@base_contains('MACHINE_FEATURES', 'alsa', 'file://config-sound.cfg', '', d)}" -SRC_URI_tarball = " \ - ${DIGI_MIRROR}/linux-2.6-${SRCREV_SHORT}.tar.gz;md5sum=${TARBALL_MD5};sha256sum=${TARBALL_SHA256} \ - " - -SRC_URI_git = " \ - ${DIGI_LOG_GIT}linux-2.6.git;protocol=git;branch=refs/heads/master \ - " - -SRC_URI = "${@base_conditional('KERNEL_BUILD_SRC', '1' , '${SRC_URI_git}', '${SRC_URI_tarball}', d)}" -SRC_URI += " \ - file://defconfig \ - ${KERNEL_CFG_FRAGS} \ - " - -SRC_URI_append_cpx2 = " \ - file://cpx2-Remove-incorrect-pin-configurations.patch \ - file://cpx2e-Setup-mmc0-for-the-wireless-interface.patch \ - " - -S = "${@base_conditional('KERNEL_BUILD_SRC', '1' , '${WORKDIR}/git', '${WORKDIR}/linux-2.6-${SRCREV_SHORT}', d)}" -SCMVERSION = "${@base_conditional('KERNEL_BUILD_SRC', '1' , '1', '0', d)}" - FILES_kernel-image += "/boot/config*" COMPATIBLE_MACHINE = "(mxs|mx5)"