From eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 Mon Sep 17 00:00:00 2001 From: Dave Cobbley Date: Tue, 14 Aug 2018 10:05:37 -0700 Subject: [Subtree] Removing import-layers directory As part of the move to subtrees, need to bring all the import layers content to the top level. Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f Signed-off-by: Dave Cobbley Signed-off-by: Brad Bishop --- .../recipes-kernel/linux/linux-yocto_4.12.bbappend | 28 ++++++++++++++++++++++ .../recipes-kernel/linux/linux-yocto_4.14.bbappend | 27 +++++++++++++++++++++ .../recipes-kernel/linux/linux-yocto_4.15.bbappend | 27 +++++++++++++++++++++ 3 files changed, 82 insertions(+) create mode 100644 poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.12.bbappend create mode 100644 poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.14.bbappend create mode 100644 poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.15.bbappend (limited to 'poky/meta-yocto-bsp/recipes-kernel') diff --git a/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.12.bbappend b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.12.bbappend new file mode 100644 index 000000000..e28360b69 --- /dev/null +++ b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.12.bbappend @@ -0,0 +1,28 @@ +KBRANCH_genericx86 = "standard/base" +KBRANCH_genericx86-64 = "standard/base" + +KMACHINE_genericx86 ?= "common-pc" +KMACHINE_genericx86-64 ?= "common-pc-64" +KBRANCH_edgerouter = "standard/edgerouter" +KBRANCH_beaglebone-yocto = "standard/beaglebone" +KMACHINE_beaglebone-yocto = "beaglebone" +KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb" + +SRCREV_machine_genericx86 ?= "97e710ef0545c19d3c10bd81a61bdca9fe543b81" +SRCREV_machine_genericx86-64 ?= "97e710ef0545c19d3c10bd81a61bdca9fe543b81" +SRCREV_machine_edgerouter ?= "97e710ef0545c19d3c10bd81a61bdca9fe543b81" +SRCREV_machine_beaglebone-yocto ?= "97e710ef0545c19d3c10bd81a61bdca9fe543b81" +SRCREV_machine_mpc8315e-rdb ?= "55fcfbee2560f57a490c5724ac5b5cb49bacb01c" + + +COMPATIBLE_MACHINE_genericx86 = "genericx86" +COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" +COMPATIBLE_MACHINE_edgerouter = "edgerouter" +COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto" +COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" + +LINUX_VERSION_genericx86 = "4.12.21" +LINUX_VERSION_genericx86-64 = "4.12.21" +LINUX_VERSION_edgerouter = "4.12.21" +LINUX_VERSION_beaglebone-yocto = "4.12.21" +LINUX_VERSION_mpc8315e-rdb = "4.12.21" diff --git a/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.14.bbappend b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.14.bbappend new file mode 100644 index 000000000..5130707dd --- /dev/null +++ b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.14.bbappend @@ -0,0 +1,27 @@ +KBRANCH_genericx86 = "v4.14/standard/base" +KBRANCH_genericx86-64 = "v4.14/standard/base" +KBRANCH_edgerouter = "v4.14/standard/edgerouter" +KBRANCH_beaglebone-yocto = "v4.14/standard/beaglebone" +KBRANCH_mpc8315e-rdb = "v4.14/standard/fsl-mpc8315e-rdb" + +KMACHINE_genericx86 ?= "common-pc" +KMACHINE_genericx86-64 ?= "common-pc-64" +KMACHINE_beaglebone-yocto ?= "beaglebone" + +SRCREV_machine_genericx86 ?= "1d50ce210b0536eb9a66d1e56ae215f92176444a" +SRCREV_machine_genericx86-64 ?= "1d50ce210b0536eb9a66d1e56ae215f92176444a" +SRCREV_machine_edgerouter ?= "f2dc94f77d19ab65a832bad6f42662c509d2ef9e" +SRCREV_machine_beaglebone-yocto ?= "6c1a02d4a9c227eca356911715a52cf92457ec16" +SRCREV_machine_mpc8315e-rdb ?= "7e9a0b017be7b685e094638f4bdaa33a7df8f7c0" + +COMPATIBLE_MACHINE_genericx86 = "genericx86" +COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" +COMPATIBLE_MACHINE_edgerouter = "edgerouter" +COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto" +COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" + +LINUX_VERSION_genericx86 = "4.14.30" +LINUX_VERSION_genericx86-64 = "4.14.30" +LINUX_VERSION_edgerouter = "4.14.30" +LINUX_VERSION_beaglebone-yocto = "4.14.30" +LINUX_VERSION_mpc8315e-rdb = "4.14.30" diff --git a/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.15.bbappend b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.15.bbappend new file mode 100644 index 000000000..c0c6ad92d --- /dev/null +++ b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.15.bbappend @@ -0,0 +1,27 @@ +KBRANCH_genericx86 = "v4.15/standard/base" +KBRANCH_genericx86-64 = "v4.15/standard/base" +KBRANCH_edgerouter = "v4.15/standard/edgerouter" +KBRANCH_beaglebone-yocto = "v4.15/standard/beaglebone" +KBRANCH_mpc8315e-rdb = "v4.15/standard/fsl-mpc8315e-rdb" + +KMACHINE_genericx86 ?= "common-pc" +KMACHINE_genericx86-64 ?= "common-pc-64" +KMACHINE_beaglebone-yocto ?= "beaglebone" + +SRCREV_machine_genericx86 ?= "f73fd8783a3e7529902366ba75aafb81c19ec3c9" +SRCREV_machine_genericx86-64 ?= "f73fd8783a3e7529902366ba75aafb81c19ec3c9" +SRCREV_machine_edgerouter ?= "f73fd8783a3e7529902366ba75aafb81c19ec3c9" +SRCREV_machine_beaglebone-yocto ?= "f73fd8783a3e7529902366ba75aafb81c19ec3c9" +SRCREV_machine_mpc8315e-rdb ?= "cc2711c4f3b83b5cd78358e7c949fdbb6076e25b" + +COMPATIBLE_MACHINE_genericx86 = "genericx86" +COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" +COMPATIBLE_MACHINE_edgerouter = "edgerouter" +COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto" +COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" + +LINUX_VERSION_genericx86 = "4.15.13" +LINUX_VERSION_genericx86-64 = "4.15.13" +LINUX_VERSION_edgerouter = "4.15.13" +LINUX_VERSION_beaglebone-yocto = "4.15.13" +LINUX_VERSION_mpc8315e-rdb = "4.15.13" -- cgit v1.2.3