[meta-lsi] [PATCH 61/86] linux-yocto: Add support for building from YOCTO and GITHUB private repo
Daniel Dragomir
daniel.dragomir at windriver.com
Wed Oct 29 08:36:09 PDT 2014
From: Paul Butler <paul.butler at windriver.com>
- Add support for building also from YOCTO repos and from the tip of
the LSI GitHub private repo depending what .inc files is included.
This choice is made by setting the LSI_SRC variable in the build's
local.conf file.
- Add FIT support files to SRC_URI for preempt-rt kernels.
Signed-off-by: Paul Butler <paul.butler at windriver.com>
---
recipes-kernel/linux/linux-yocto-rt_3.10.bbappend | 17 ++++-------------
recipes-kernel/linux/linux-yocto-rt_3.10.inc | 8 ++++++++
recipes-kernel/linux/linux-yocto-rt_3.4.bbappend | 17 ++++-------------
recipes-kernel/linux/linux-yocto-rt_3.4.inc | 8 ++++++++
recipes-kernel/linux/linux-yocto.inc | 2 ++
recipes-kernel/linux/linux-yocto_3.10.bbappend | 14 ++------------
recipes-kernel/linux/linux-yocto_3.10.inc | 8 ++++++++
recipes-kernel/linux/linux-yocto_3.4.bbappend | 16 +++-------------
recipes-kernel/linux/linux-yocto_3.4.inc | 10 ++++++++++
recipes-kernel/linux/lsi-tip-rt_3.10.inc | 11 +++++++++++
recipes-kernel/linux/lsi-tip-rt_3.4.inc | 11 +++++++++++
recipes-kernel/linux/lsi-tip_3.10.inc | 11 +++++++++++
recipes-kernel/linux/lsi-tip_3.4.inc | 11 +++++++++++
13 files changed, 93 insertions(+), 51 deletions(-)
create mode 100644 recipes-kernel/linux/linux-yocto-rt_3.10.inc
create mode 100644 recipes-kernel/linux/linux-yocto-rt_3.4.inc
create mode 100644 recipes-kernel/linux/linux-yocto_3.10.inc
create mode 100644 recipes-kernel/linux/linux-yocto_3.4.inc
create mode 100644 recipes-kernel/linux/lsi-tip-rt_3.10.inc
create mode 100644 recipes-kernel/linux/lsi-tip-rt_3.4.inc
create mode 100644 recipes-kernel/linux/lsi-tip_3.10.inc
create mode 100644 recipes-kernel/linux/lsi-tip_3.4.inc
diff --git a/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend b/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend
index b0babed..3d06e7e 100644
--- a/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend
+++ b/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend
@@ -1,21 +1,12 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/linux-3.10/${KARCH}:${THISDIR}/fit:"
-
-require linux-yocto.inc
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/linux-3.10/${KARCH}:${THISDIR}:"
LSI_KERNEL_TAG = "8.8.1.18"
-
LINUX_KERNEL_TYPE = "preempt-rt"
LINUX_VERSION = "3.10.17-${LSI_KERNEL_TAG}"
-KBRANCH = "standard/preempt-rt/lsi/base"
+require ${LSI_SRC}-rt_3.10.inc
-SRC_URI = "git://github.com/lsigithub/lsi_axxia_yocto_public_3.10.git;nocheckout=1;branch=${KBRANCH},${KMETA};name=machine,meta"
-#SRC_URI = "git:///home/pbutler/repos/lsi_axxia_yocto_public_3.10;protocol=file;nocheckout=1;branch=${KBRANCH},${KMETA};name=machine,meta"
+SRC_URI = "${KREPO};nocheckout=1;branch=${KBRANCH},${KMETA};name=machine,meta"
SRC_URI += "file://defconfig"
-
-SRCREV_machine="a1524b72b73f75c14f216802e6ba6fdb0d3e9c1f"
-SRCREV_meta="43dd30e1955545a264fda63b4f66bb8f5cd875f9"
-
-#SRCREV_machine="${AUTOREV}"
-#SRCREV_meta="${AUTOREV}"
\ No newline at end of file
+SRC_URI += "file://fit"
diff --git a/recipes-kernel/linux/linux-yocto-rt_3.10.inc b/recipes-kernel/linux/linux-yocto-rt_3.10.inc
new file mode 100644
index 0000000..e8f7ba5
--- /dev/null
+++ b/recipes-kernel/linux/linux-yocto-rt_3.10.inc
@@ -0,0 +1,8 @@
+
+require linux-yocto.inc
+
+KBRANCH = "standard/axxia/base"
+KREPO = "git://git.yoctoproject.org/linux-yocto-3.10.git"
+
+SRCREV_machine = "995e763860417d500768ccb22b312332216f95ba"
+SRCREV_meta = "d07bc7ba4ff00ddcd77db1026a63c327b81a35d8"
\ No newline at end of file
diff --git a/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend b/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend
index 8307f24..91d4fd7 100644
--- a/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend
+++ b/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend
@@ -1,21 +1,12 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/linux-3.4/${KARCH}:${THISDIR}/fit:"
-
-require linux-yocto.inc
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/linux-3.4/${KARCH}:${THISDIR}:"
LSI_KERNEL_TAG = "7.8.1.36"
-
LINUX_KERNEL_TYPE = "preempt-rt"
LINUX_VERSION = "3.4.43-${LSI_KERNEL_TAG}"
-KBRANCH = "standard/preempt-rt/lsi/base"
+require ${LSI_SRC}-rt_3.4.inc
-SRC_URI = "git://github.com/lsigithub/lsi_axxia_yocto_public.git;nocheckout=1;branch=${KBRANCH},${KMETA};name=machine,meta"
-#SRC_URI = "git:///home/pbutler/repos/lsi_axxia_yocto_public;protocol=file;nocheckout=1;branch=${KBRANCH},${KMETA};name=machine,meta"
+SRC_URI = "${KREPO};nocheckout=1;branch=${KBRANCH},${KMETA};name=machine,meta"
SRC_URI += "file://defconfig"
-
-SRCREV_machine="5931a20fcfe5bbce0a0451649d8c42005f4f71be"
-SRCREV_meta="1bab5bd090948b4cc4c4ed57c834603a3cf9f235"
-
-#SRCREV_machine="${AUTOREV}"
-#SRCREV_meta="${AUTOREV}"
\ No newline at end of file
+SRC_URI += "file://fit"
\ No newline at end of file
diff --git a/recipes-kernel/linux/linux-yocto-rt_3.4.inc b/recipes-kernel/linux/linux-yocto-rt_3.4.inc
new file mode 100644
index 0000000..9388c77
--- /dev/null
+++ b/recipes-kernel/linux/linux-yocto-rt_3.4.inc
@@ -0,0 +1,8 @@
+
+require linux-yocto.inc
+
+KBRANCH = "standard/axxia/base"
+KREPO = "git://git.yoctoproject.org/linux-yocto-3.4.git"
+
+SRCREV_machine = "e865ad95053da22bbf780fa075e59a5c40c1c089"
+SRCREV_meta = "03cd6f841fd2566b033db19eb6665228ea406adf"
diff --git a/recipes-kernel/linux/linux-yocto.inc b/recipes-kernel/linux/linux-yocto.inc
index 4514132..6184fa4 100644
--- a/recipes-kernel/linux/linux-yocto.inc
+++ b/recipes-kernel/linux/linux-yocto.inc
@@ -4,6 +4,7 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
COMPATIBLE_MACHINE = "elpaso|axm5500sim|axm5500"
+
KMACHINE = "${MACHINE}"
INSANE_SKIP_kernel-dev = "debug-files"
@@ -45,6 +46,7 @@ install_fit_images() {
install ${B}/../fit/multi.fit-${name} ${DEPLOYDIR}/multi.fit-${name}
}
+
do_deploy_append() {
if [ "${KARCH}" = "powerpc" ]
then
diff --git a/recipes-kernel/linux/linux-yocto_3.10.bbappend b/recipes-kernel/linux/linux-yocto_3.10.bbappend
index fa12eb1..0411d00 100644
--- a/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ b/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -1,22 +1,12 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/linux-3.10/${KARCH}:${THISDIR}:"
-require linux-yocto.inc
-
LSI_KERNEL_TAG = "8.8.1.18"
-
LINUX_KERNEL_TYPE = "standard"
LINUX_VERSION = "3.10.17-${LSI_KERNEL_TAG}"
-KBRANCH = "standard/lsi/base"
+require ${LSI_SRC}_3.10.inc
-SRC_URI = "git://github.com/lsigithub/lsi_axxia_yocto_public_3.10.git;nocheckout=1;branch=${KBRANCH},${KMETA};name=machine,meta"
-#SRC_URI = "git:///home/pbutler/repos/lsi_axxia_yocto_public_3.10;protocol=file;nocheckout=1;branch=${KBRANCH},${KMETA};name=machine,meta"
+SRC_URI = "${KREPO};nocheckout=1;branch=${KBRANCH},${KMETA};name=machine,meta"
SRC_URI += "file://defconfig"
SRC_URI += "file://fit"
-
-SRCREV_machine="92b92afd4d72774aad889b8ed6154a423ffaddb0"
-SRCREV_meta="43dd30e1955545a264fda63b4f66bb8f5cd875f9"
-
-#SRCREV_machine="${AUTOREV}"
-#SRCREV_meta="${AUTOREV}"
\ No newline at end of file
diff --git a/recipes-kernel/linux/linux-yocto_3.10.inc b/recipes-kernel/linux/linux-yocto_3.10.inc
new file mode 100644
index 0000000..e8f7ba5
--- /dev/null
+++ b/recipes-kernel/linux/linux-yocto_3.10.inc
@@ -0,0 +1,8 @@
+
+require linux-yocto.inc
+
+KBRANCH = "standard/axxia/base"
+KREPO = "git://git.yoctoproject.org/linux-yocto-3.10.git"
+
+SRCREV_machine = "995e763860417d500768ccb22b312332216f95ba"
+SRCREV_meta = "d07bc7ba4ff00ddcd77db1026a63c327b81a35d8"
\ No newline at end of file
diff --git a/recipes-kernel/linux/linux-yocto_3.4.bbappend b/recipes-kernel/linux/linux-yocto_3.4.bbappend
index 2e6cc9f..81df1c9 100644
--- a/recipes-kernel/linux/linux-yocto_3.4.bbappend
+++ b/recipes-kernel/linux/linux-yocto_3.4.bbappend
@@ -1,22 +1,12 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/linux-3.4/${KARCH}:${THISDIR}:"
-require linux-yocto.inc
-
LSI_KERNEL_TAG = "7.8.1.36"
-
LINUX_KERNEL_TYPE = "standard"
LINUX_VERSION = "3.4.43-${LSI_KERNEL_TAG}"
-KBRANCH = "standard/lsi/base"
+require ${LSI_SRC}_3.4.inc
-SRC_URI = "git://github.com/lsigithub/lsi_axxia_yocto_public.git;nocheckout=1;branch=${KBRANCH},${KMETA};name=machine,meta"
-#SRC_URI = "git:///home/pbutler/repos/lsi_axxia_yocto_public;protocol=file;nocheckout=1;branch=${KBRANCH},${KMETA};name=machine,meta"
+SRC_URI = "${KREPO};nocheckout=1;branch=${KBRANCH},${KMETA};name=machine,meta"
SRC_URI += "file://defconfig"
-SRC_URI += "file://fit"
-
-SRCREV_machine="db8ca45ff5d93e20bae41cdfa939040df94e4860"
-SRCREV_meta="1bab5bd090948b4cc4c4ed57c834603a3cf9f235"
-
-#SRCREV_machine="${AUTOREV}"
-#SRCREV_meta="${AUTOREV}"
\ No newline at end of file
+SRC_URI += "file://fit"
\ No newline at end of file
diff --git a/recipes-kernel/linux/linux-yocto_3.4.inc b/recipes-kernel/linux/linux-yocto_3.4.inc
new file mode 100644
index 0000000..13a3e7c
--- /dev/null
+++ b/recipes-kernel/linux/linux-yocto_3.4.inc
@@ -0,0 +1,10 @@
+
+require linux-yocto.inc
+
+LINUX_VERSION = "3.4.88-${LSI_KERNEL_TAG}"
+
+KBRANCH = "standard/axxia/base"
+KREPO = "git://git.yoctoproject.org/linux-yocto-3.4.git"
+
+SRCREV_machine = "e865ad95053da22bbf780fa075e59a5c40c1c089"
+SRCREV_meta = "03cd6f841fd2566b033db19eb6665228ea406adf"
diff --git a/recipes-kernel/linux/lsi-tip-rt_3.10.inc b/recipes-kernel/linux/lsi-tip-rt_3.10.inc
new file mode 100644
index 0000000..c637771
--- /dev/null
+++ b/recipes-kernel/linux/lsi-tip-rt_3.10.inc
@@ -0,0 +1,11 @@
+
+require linux-yocto.inc
+
+LSI_KERNEL_TAG = "tip"
+LINUX_VERSION = "3.10.38-${LSI_KERNEL_TAG}"
+
+KBRANCH = "standard/preempt-rt/lsi/base"
+KREPO = "git://git@github.com/lsigithub/lsi_axxia_yocto_3.10.git;protocol=ssh"
+
+SRCREV_machine="${AUTOREV}"
+SRCREV_meta="${AUTOREV}"
\ No newline at end of file
diff --git a/recipes-kernel/linux/lsi-tip-rt_3.4.inc b/recipes-kernel/linux/lsi-tip-rt_3.4.inc
new file mode 100644
index 0000000..d7fd7df
--- /dev/null
+++ b/recipes-kernel/linux/lsi-tip-rt_3.4.inc
@@ -0,0 +1,11 @@
+
+require linux-yocto.inc
+
+LSI_KERNEL_TAG = "tip"
+LINUX_VERSION = "3.4.88-${LSI_KERNEL_TAG}"
+
+KBRANCH = "standard/preempt-rt/lsi/base"
+KREPO = "git://git@github.com/lsigithub/lsi_axxia_yocto.git;protocol=ssh"
+
+SRCREV_machine="${AUTOREV}"
+SRCREV_meta="${AUTOREV}"
\ No newline at end of file
diff --git a/recipes-kernel/linux/lsi-tip_3.10.inc b/recipes-kernel/linux/lsi-tip_3.10.inc
new file mode 100644
index 0000000..50565cf
--- /dev/null
+++ b/recipes-kernel/linux/lsi-tip_3.10.inc
@@ -0,0 +1,11 @@
+
+require linux-yocto.inc
+
+LSI_KERNEL_TAG = "tip"
+LINUX_VERSION = "3.10.38-${LSI_KERNEL_TAG}"
+
+KBRANCH = "standard/lsi/base"
+KREPO = "git://git@github.com/lsigithub/lsi_axxia_yocto_3.10.git;protocol=ssh"
+
+SRCREV_machine="${AUTOREV}"
+SRCREV_meta="${AUTOREV}"
\ No newline at end of file
diff --git a/recipes-kernel/linux/lsi-tip_3.4.inc b/recipes-kernel/linux/lsi-tip_3.4.inc
new file mode 100644
index 0000000..392d485
--- /dev/null
+++ b/recipes-kernel/linux/lsi-tip_3.4.inc
@@ -0,0 +1,11 @@
+
+require linux-yocto.inc
+
+LSI_KERNEL_TAG = "tip"
+LINUX_VERSION = "3.4.88-${LSI_KERNEL_TAG}"
+
+KBRANCH = "standard/lsi/base"
+KREPO = "git://git@github.com/lsigithub/lsi_axxia_yocto.git;protocol=ssh"
+
+SRCREV_machine="${AUTOREV}"
+SRCREV_meta="${AUTOREV}"
\ No newline at end of file
--
1.8.1.4
More information about the meta-lsi
mailing list