[PATCH 3/3] jasperforest: retire linux-yocto-3.0
tom.zanussi@...
From: Tom Zanussi <tom.zanussi@...>
With the move to linux-yocto-3.4, linux-yocto-3.0 support can be
removed.
Signed-off-by: Tom Zanussi <tom.zanussi@...>
---
meta-jasperforest/conf/machine/jasperforest.conf | 3 ++-
.../linux/linux-yocto-rt_3.0.bbappend | 8 --------
.../recipes-kernel/linux/linux-yocto_3.0.bbappend | 9 ---------
3 files changed, 2 insertions(+), 18 deletions(-)
delete mode 100644 meta-jasperforest/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend
delete mode 100644 meta-jasperforest/recipes-kernel/linux/linux-yocto_3.0.bbappend
diff --git a/meta-jasperforest/conf/machine/jasperforest.conf b/meta-jasperforest/conf/machine/jasperforest.conf
index d661f7b..9a47b9a 100644
--- a/meta-jasperforest/conf/machine/jasperforest.conf
+++ b/meta-jasperforest/conf/machine/jasperforest.conf
@@ -4,7 +4,8 @@
#@DESCRIPTION: Machine configuration for Jasper Forest Picket Post
# systems i.e. Xeon C5500/C3500 + Intel 3420 chipset (Ibex Peak)
-PREFERRED_VERSION_linux-yocto ?= "3.4%"
+PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-rt"
+PREFERRED_VERSION_linux-yocto-rt ?= "3.2%"
require conf/machine/include/tune-x86_64.inc
require conf/machine/include/ia32-base.inc
diff --git a/meta-jasperforest/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend b/meta-jasperforest/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend
deleted file mode 100644
index 1ddc78f..0000000
--- a/meta-jasperforest/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend
+++ /dev/null
@@ -1,8 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-COMPATIBLE_MACHINE_jasperforest = "jasperforest"
-KMACHINE_jasperforest = "jasperforest"
-
-# Update the following to use a different BSP branch or meta SRCREV
-#KBRANCH_jasperforest = "yocto/standard/preempt-rt/base"
-#SRCREV_machine_pn-linux-yocto-rt_jasperforest ?= ${AUTOREV}
-#SRCREV_meta_pn-linux-yocto-rt_jasperforest ?= ${AUTOREV}
diff --git a/meta-jasperforest/recipes-kernel/linux/linux-yocto_3.0.bbappend b/meta-jasperforest/recipes-kernel/linux/linux-yocto_3.0.bbappend
deleted file mode 100644
index 1cc7f56..0000000
--- a/meta-jasperforest/recipes-kernel/linux/linux-yocto_3.0.bbappend
+++ /dev/null
@@ -1,9 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-COMPATIBLE_MACHINE_jasperforest = "jasperforest"
-
-KMACHINE_jasperforest = "jasperforest"
-KBRANCH_jasperforest = "yocto/standard/common-pc-64/jasperforest"
-
-SRCREV_machine_pn-linux-yocto_jasperforest ?= "fc10a49bed173ade9c6c076241a448639fe50aa8"
-SRCREV_meta_pn-linux-yocto_jasperforest ?= "59314a3523e360796419d76d78c6f7d8c5ef2593"
--
1.7.0.4
With the move to linux-yocto-3.4, linux-yocto-3.0 support can be
removed.
Signed-off-by: Tom Zanussi <tom.zanussi@...>
---
meta-jasperforest/conf/machine/jasperforest.conf | 3 ++-
.../linux/linux-yocto-rt_3.0.bbappend | 8 --------
.../recipes-kernel/linux/linux-yocto_3.0.bbappend | 9 ---------
3 files changed, 2 insertions(+), 18 deletions(-)
delete mode 100644 meta-jasperforest/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend
delete mode 100644 meta-jasperforest/recipes-kernel/linux/linux-yocto_3.0.bbappend
diff --git a/meta-jasperforest/conf/machine/jasperforest.conf b/meta-jasperforest/conf/machine/jasperforest.conf
index d661f7b..9a47b9a 100644
--- a/meta-jasperforest/conf/machine/jasperforest.conf
+++ b/meta-jasperforest/conf/machine/jasperforest.conf
@@ -4,7 +4,8 @@
#@DESCRIPTION: Machine configuration for Jasper Forest Picket Post
# systems i.e. Xeon C5500/C3500 + Intel 3420 chipset (Ibex Peak)
-PREFERRED_VERSION_linux-yocto ?= "3.4%"
+PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-rt"
+PREFERRED_VERSION_linux-yocto-rt ?= "3.2%"
require conf/machine/include/tune-x86_64.inc
require conf/machine/include/ia32-base.inc
diff --git a/meta-jasperforest/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend b/meta-jasperforest/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend
deleted file mode 100644
index 1ddc78f..0000000
--- a/meta-jasperforest/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend
+++ /dev/null
@@ -1,8 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-COMPATIBLE_MACHINE_jasperforest = "jasperforest"
-KMACHINE_jasperforest = "jasperforest"
-
-# Update the following to use a different BSP branch or meta SRCREV
-#KBRANCH_jasperforest = "yocto/standard/preempt-rt/base"
-#SRCREV_machine_pn-linux-yocto-rt_jasperforest ?= ${AUTOREV}
-#SRCREV_meta_pn-linux-yocto-rt_jasperforest ?= ${AUTOREV}
diff --git a/meta-jasperforest/recipes-kernel/linux/linux-yocto_3.0.bbappend b/meta-jasperforest/recipes-kernel/linux/linux-yocto_3.0.bbappend
deleted file mode 100644
index 1cc7f56..0000000
--- a/meta-jasperforest/recipes-kernel/linux/linux-yocto_3.0.bbappend
+++ /dev/null
@@ -1,9 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-COMPATIBLE_MACHINE_jasperforest = "jasperforest"
-
-KMACHINE_jasperforest = "jasperforest"
-KBRANCH_jasperforest = "yocto/standard/common-pc-64/jasperforest"
-
-SRCREV_machine_pn-linux-yocto_jasperforest ?= "fc10a49bed173ade9c6c076241a448639fe50aa8"
-SRCREV_meta_pn-linux-yocto_jasperforest ?= "59314a3523e360796419d76d78c6f7d8c5ef2593"
--
1.7.0.4