[meta-lsi] [PATCH 17/22] lsi-tip: quit using the meta branch

[Daniel Dragomir]

From: Cristian Bercaru <cristian.bercaru at windriver.com>

The 'meta' kernel branch containing config fragments is not necessary
when building the kernel from the github repositories. Use defconfigs
instead for kernel configuration.

Signed-off-by: Cristian Bercaru <cristian.bercaru at windriver.com>
---
 recipes-kernel/linux/lsi-tip-rt_3.14.inc | 9 ++-------
 recipes-kernel/linux/lsi-tip-rt_4.1.inc  | 9 ++-------
 recipes-kernel/linux/lsi-tip_3.14.inc    | 9 ++-------
 recipes-kernel/linux/lsi-tip_4.1.inc     | 9 ++-------
 4 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/recipes-kernel/linux/lsi-tip-rt_3.14.inc b/recipes-kernel/linux/lsi-tip-rt_3.14.inc
index 823925e..bcfa268 100644
--- a/recipes-kernel/linux/lsi-tip-rt_3.14.inc
+++ b/recipes-kernel/linux/lsi-tip-rt_3.14.inc
@@ -4,15 +4,10 @@ require dt-${KARCH}.inc
 
 LSI_KERNEL_TAG = "tip"
 LINUX_VERSION = "3.14.39-${LSI_KERNEL_TAG}"
-
 KBRANCH = "standard/preempt-rt/axxia/base"
+KMETA = ""
 KREPO_KERNEL = "git://git@github.com/lsigithub/axxia_yocto_linux_3.14_private.git;protocol=ssh"
-KREPO_META = "git://git.yoctoproject.org/yocto-kernel-cache"
-
 SRCREV_machine ="${AUTOREV}"
-SRCREV_meta ="${AUTOREV}"
-
-SRC_URI = "${KREPO_KERNEL};branch=${KBRANCH};name=machine; \
-           ${KREPO_META};type=kmeta;name=meta;branch=yocto-3.14;destsuffix=${KMETA}"
+SRC_URI = "${KREPO_KERNEL};branch=${KBRANCH};name=machine"
 SRC_URI += "file://fit"
 SRC_URI += "file://defconfig"
diff --git a/recipes-kernel/linux/lsi-tip-rt_4.1.inc b/recipes-kernel/linux/lsi-tip-rt_4.1.inc
index f758187..c5855ab 100644
--- a/recipes-kernel/linux/lsi-tip-rt_4.1.inc
+++ b/recipes-kernel/linux/lsi-tip-rt_4.1.inc
@@ -4,15 +4,10 @@ require dt-${KARCH}.inc
 
 LSI_KERNEL_TAG = "tip"
 LINUX_VERSION = "4.1.8-${LSI_KERNEL_TAG}"
-
 KBRANCH = "standard/preempt-rt/axxia-dev/base"
+KMETA = ""
 KREPO_KERNEL = "git://git@github.com/lsigithub/axxia_yocto_linux_4.1_private.git;protocol=ssh"
-KREPO_META = "git://git.yoctoproject.org/yocto-kernel-cache"
-
 SRCREV_machine ="${AUTOREV}"
-SRCREV_meta ="${AUTOREV}"
-
-SRC_URI = "${KREPO_KERNEL};name=machine;branch=${KBRANCH}; \
-           ${KREPO_META};type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}"
+SRC_URI = "${KREPO_KERNEL};name=machine;branch=${KBRANCH}"
 SRC_URI += "file://fit"
 SRC_URI += "file://defconfig"
diff --git a/recipes-kernel/linux/lsi-tip_3.14.inc b/recipes-kernel/linux/lsi-tip_3.14.inc
index 4cd58bb..0dc4c06 100644
--- a/recipes-kernel/linux/lsi-tip_3.14.inc
+++ b/recipes-kernel/linux/lsi-tip_3.14.inc
@@ -4,15 +4,10 @@ require dt-${KARCH}.inc
 
 LSI_KERNEL_TAG = "tip"
 LINUX_VERSION = "3.14.39-${LSI_KERNEL_TAG}"
-
 KBRANCH = "standard/axxia/base"
+KMETA = ""
 KREPO_KERNEL = "git://git@github.com/lsigithub/axxia_yocto_linux_3.14_private.git;protocol=ssh"
-KREPO_META = "git://git.yoctoproject.org/yocto-kernel-cache"
-
 SRCREV_machine ="${AUTOREV}"
-SRCREV_meta ="${AUTOREV}"
-
-SRC_URI = "${KREPO_KERNEL};branch=${KBRANCH};name=machine; \
-           ${KREPO_META};type=kmeta;name=meta;branch=yocto-3.14;destsuffix=${KMETA}"
+SRC_URI = "${KREPO_KERNEL};branch=${KBRANCH};name=machine"
 SRC_URI += "file://fit"
 SRC_URI += "file://defconfig"
diff --git a/recipes-kernel/linux/lsi-tip_4.1.inc b/recipes-kernel/linux/lsi-tip_4.1.inc
index 1e60762..97f82f6 100644
--- a/recipes-kernel/linux/lsi-tip_4.1.inc
+++ b/recipes-kernel/linux/lsi-tip_4.1.inc
@@ -4,15 +4,10 @@ require dt-${KARCH}.inc
 
 LSI_KERNEL_TAG = "tip"
 LINUX_VERSION = "4.1.8-${LSI_KERNEL_TAG}"
-
 KBRANCH = "standard/axxia-dev/base"
+KMETA = ""
 KREPO_KERNEL = "git://git@github.com/lsigithub/axxia_yocto_linux_4.1_private.git;protocol=ssh"
-KREPO_META = "git://git.yoctoproject.org/yocto-kernel-cache"
-
 SRCREV_machine ="${AUTOREV}"
-SRCREV_meta ="${AUTOREV}"
-
-SRC_URI = "${KREPO_KERNEL};name=machine;branch=${KBRANCH}; \
-           ${KREPO_META};type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}"
+SRC_URI = "${KREPO_KERNEL};name=machine;branch=${KBRANCH}"
 SRC_URI += "file://fit"
 SRC_URI += "file://defconfig"
-- 
1.9.1