summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2017-10-19 13:58:57 +0200
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2017-11-29 17:45:32 +0100
commit9700c3cdf02877e46b486a21f04b3dc2b49a01fd (patch)
treef0aa650a8bb8d25ea794db5441a9bbed44606824
parent2770e2587fbf46ee0a373559938aa44b9b4ad106 (diff)
kernel recipes: automatically update to latest -next through override
This can be used e.g. for a CI setup to do nightly builds of latest and greatest. To use HEAD of xxx-next instead of the pinned version one would add in local.conf: MACHINEOVERRIDES =. "use-head-next:" Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
-rw-r--r--recipes-kernel/linux/linux-toradex-mainline_4.9.bb24
-rw-r--r--recipes-kernel/linux/linux-toradex_3.10.40.bb2
-rw-r--r--recipes-kernel/linux/linux-toradex_git.bb2
3 files changed, 18 insertions, 10 deletions
diff --git a/recipes-kernel/linux/linux-toradex-mainline_4.9.bb b/recipes-kernel/linux/linux-toradex-mainline_4.9.bb
index 5220bb3..00ad0ab 100644
--- a/recipes-kernel/linux/linux-toradex-mainline_4.9.bb
+++ b/recipes-kernel/linux/linux-toradex-mainline_4.9.bb
@@ -12,16 +12,12 @@ include conf/tdx_version.conf
LINUX_VERSION ?= "4.9.52"
-# For CI use one could limit LINUX_VERSION e.g. as done in linux-yocto-dev
-#LINUX_VERSION ?= "4.9"
-
LOCALVERSION = "-${PR}"
PR = "${TDX_VER_INT}"
PV = "${LINUX_VERSION}"
S = "${WORKDIR}/linux-${PV}"
-SRC_URI = " \
- https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${PV}.tar.xz \
+TK1-PATCHES = " \
file://0001-toradex_apalis_tk1_t30-customize-defconfig.patch \
file://0001-apalis-tk1-remove-spurious-new-lines.patch \
file://0002-apalis-tk1-temp-alert-pull-up.patch \
@@ -37,15 +33,23 @@ SRC_URI = " \
file://0001-tegra_defconfig-snapd-squashfs-configuration.patch \
file://0001-ARM-tegra-apalis-tk1-support-v1.2-hardware-revision.patch \
"
+SRC_URI = " \
+ https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${PV}.tar.xz \
+ ${TK1-PATCHES} \
+"
SRC_URI[md5sum] = "3752317fdacdb9b341ae3e500481eb3a"
SRC_URI[sha256sum] = "ffdd034f1bf32fa41d1a66a347388c0dc4c3cff6f578a1e29d88b20fbae1048a"
# For CI use one could use the following instead (plus patches still of course)
-#SRCREV = "${AUTOREV}"
-#PV = "${LINUX_VERSION}+git${SRCPV}"
-#S = "${WORKDIR}/git"
-#SRCBRANCH = "linux-4.9.y"
-#SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git;protocol=git;branch=${SRCBRANCH}"
+LINUX_VERSION_use-head-next ?= "4.9"
+SRCREV_use-head-next = "${AUTOREV}"
+PV_use-head-next = "${LINUX_VERSION}+git${SRCPV}"
+S_use-head-next = "${WORKDIR}/git"
+SRCBRANCH_use-head-next = "linux-4.9.y"
+SRC_URI_use-head-next = " \
+ git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git;protocol=git;branch=${SRCBRANCH} \
+ ${TK1-PATCHES} \
+"
COMPATIBLE_MACHINE = "(apalis-tk1-mainline|apalis-t30-mainline)"
KERNEL_EXTRA_ARGS = " LOADADDR=0x80008000 "
diff --git a/recipes-kernel/linux/linux-toradex_3.10.40.bb b/recipes-kernel/linux/linux-toradex_3.10.40.bb
index 511e038..a3cddaa 100644
--- a/recipes-kernel/linux/linux-toradex_3.10.40.bb
+++ b/recipes-kernel/linux/linux-toradex_3.10.40.bb
@@ -14,10 +14,12 @@ LOCALVERSION = "-${PR}"
PR = "${TDX_VER_INT}"
SRCREV = "e9636255d1a151de8903e952f64ed779e832f613"
+SRCREV_use-head-next = "${AUTOREV}"
PV = "${LINUX_VERSION}+gitr${SRCPV}"
S = "${WORKDIR}/git"
SRCBRANCH = "toradex_tk1_l4t_r21.5"
+SRCBRANCH_use-head-next = "toradex_tk1_l4t_r21.5-next"
SRC_URI = "git://git.toradex.com/linux-toradex.git;protocol=git;branch=${SRCBRANCH}"
COMPATIBLE_MACHINE = "apalis-tk1"
diff --git a/recipes-kernel/linux/linux-toradex_git.bb b/recipes-kernel/linux/linux-toradex_git.bb
index 33e6fdb..7c488c9 100644
--- a/recipes-kernel/linux/linux-toradex_git.bb
+++ b/recipes-kernel/linux/linux-toradex_git.bb
@@ -8,10 +8,12 @@ LOCALVERSION = "-${PR}"
PR = "${TDX_VER_INT}"
SRCREV = "7753763827bb50f4645622e83c47e192e0ba0194"
+SRCREV_use-head-next = "${AUTOREV}"
PV = "${LINUX_VERSION}+gitr${SRCPV}"
S = "${WORKDIR}/git"
SRCBRANCH = "tegra"
+SRCBRANCH_use-head-next = "tegra-next"
SRC_URI = "git://git.toradex.com/linux-toradex.git;protocol=git;branch=${SRCBRANCH}"
COMPATIBLE_MACHINE = "(apalis-t30|colibri-pxa|colibri-t20|colibri-t30)"