From 87df4e002f6e5ad5499bbeaf22877bbfc08efdd7 Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Thu, 9 Nov 2017 14:59:06 +0000 Subject: beaglebone-yocto: rename beaglebone machine to beaglebone-yocto The beaglebone BSP provided in this layer is a reference implementation usingonly mainline components available in core Yocto Project layers, whereas Texas Instruments maintain a full-featured BSP in the meta-ti layer. Rename the reference machine to prevent namespace collisions with the version maintained by the SoC vendor. [YOCTO #12326] (From meta-yocto rev: e32882938eca7f50548deab84dab78b4aef31b95) Signed-off-by: Joshua Lock Signed-off-by: Richard Purdie --- meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.10.bbappend | 9 +++++---- meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.12.bbappend | 9 +++++---- meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.4.bbappend | 9 +++++---- meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.9.bbappend | 9 +++++---- 4 files changed, 20 insertions(+), 16 deletions(-) (limited to 'meta-yocto-bsp/recipes-kernel/linux') diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.10.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.10.bbappend index e1f359c9e8..346a1c7935 100644 --- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.10.bbappend +++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.10.bbappend @@ -4,23 +4,24 @@ KBRANCH_genericx86-64 = "standard/base" KMACHINE_genericx86 ?= "common-pc" KMACHINE_genericx86-64 ?= "common-pc-64" KBRANCH_edgerouter = "standard/edgerouter" -KBRANCH_beaglebone = "standard/beaglebone" +KBRANCH_beaglebone-yocto = "standard/beaglebone" +KMACHINE_beaglebone-yocto = "beaglebone" KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb" SRCREV_machine_genericx86 ?= "c1d8c4408b8aedd88eeb6ccc89ce834dd41b3f09" SRCREV_machine_genericx86-64 ?= "c1d8c4408b8aedd88eeb6ccc89ce834dd41b3f09" SRCREV_machine_edgerouter ?= "c1d8c4408b8aedd88eeb6ccc89ce834dd41b3f09" -SRCREV_machine_beaglebone ?= "c1d8c4408b8aedd88eeb6ccc89ce834dd41b3f09" +SRCREV_machine_beaglebone-yocto ?= "c1d8c4408b8aedd88eeb6ccc89ce834dd41b3f09" SRCREV_machine_mpc8315e-rdb ?= "c388fdfc9a1e06b22ca3533a023f4d67a6fc1e9b" COMPATIBLE_MACHINE_genericx86 = "genericx86" COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" COMPATIBLE_MACHINE_edgerouter = "edgerouter" -COMPATIBLE_MACHINE_beaglebone = "beaglebone" +COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto" COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" LINUX_VERSION_genericx86 = "4.10.17" LINUX_VERSION_genericx86-64 = "4.10.17" LINUX_VERSION_edgerouter = "4.10.17" -LINUX_VERSION_beaglebone = "4.10.17" +LINUX_VERSION_beaglebone-yocto = "4.10.17" LINUX_VERSION_mpc8315e-rdb = "4.10.17" diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.12.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.12.bbappend index 06ea8f89c3..2609129e3c 100644 --- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.12.bbappend +++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.12.bbappend @@ -4,24 +4,25 @@ KBRANCH_genericx86-64 = "standard/base" KMACHINE_genericx86 ?= "common-pc" KMACHINE_genericx86-64 ?= "common-pc-64" KBRANCH_edgerouter = "standard/edgerouter" -KBRANCH_beaglebone = "standard/beaglebone" +KBRANCH_beaglebone-yocto = "standard/beaglebone" +KMACHINE_beaglebone-yocto = "beaglebone" KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb" SRCREV_machine_genericx86 ?= "16de0149674ed12d983b77a453852ac2e64584b4" SRCREV_machine_genericx86-64 ?= "16de0149674ed12d983b77a453852ac2e64584b4" SRCREV_machine_edgerouter ?= "16de0149674ed12d983b77a453852ac2e64584b4" -SRCREV_machine_beaglebone ?= "16de0149674ed12d983b77a453852ac2e64584b4" +SRCREV_machine_beaglebone-yocto ?= "16de0149674ed12d983b77a453852ac2e64584b4" SRCREV_machine_mpc8315e-rdb ?= "8c360c7c3eebeb9251ddd8e9cde39908677f5850" COMPATIBLE_MACHINE_genericx86 = "genericx86" COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" COMPATIBLE_MACHINE_edgerouter = "edgerouter" -COMPATIBLE_MACHINE_beaglebone = "beaglebone" +COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto" COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" LINUX_VERSION_genericx86 = "4.12.12" LINUX_VERSION_genericx86-64 = "4.12.12" LINUX_VERSION_edgerouter = "4.12.12" -LINUX_VERSION_beaglebone = "4.12.12" +LINUX_VERSION_beaglebone-yocto = "4.12.12" LINUX_VERSION_mpc8315e-rdb = "4.12.12" diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.4.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.4.bbappend index 427af4c4cf..5725c879df 100644 --- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.4.bbappend +++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.4.bbappend @@ -4,23 +4,24 @@ KBRANCH_genericx86-64 = "standard/base" KMACHINE_genericx86 ?= "common-pc" KMACHINE_genericx86-64 ?= "common-pc-64" KBRANCH_edgerouter = "standard/edgerouter" -KBRANCH_beaglebone = "standard/beaglebone" +KBRANCH_beaglebone-yocto = "standard/beaglebone" +KMACHINE_beaglebone-yocto = "beaglebone" KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb" SRCREV_machine_genericx86 ?= "b71c7b786aed26c0a1e4eca66f1d874ec017d699" SRCREV_machine_genericx86-64 ?= "b71c7b786aed26c0a1e4eca66f1d874ec017d699" SRCREV_machine_edgerouter ?= "b71c7b786aed26c0a1e4eca66f1d874ec017d699" -SRCREV_machine_beaglebone ?= "b71c7b786aed26c0a1e4eca66f1d874ec017d699" +SRCREV_machine_beaglebone-yocto ?= "b71c7b786aed26c0a1e4eca66f1d874ec017d699" SRCREV_machine_mpc8315e-rdb ?= "b4daa4e9d68862e559d726b0b66b7be605889b9e" COMPATIBLE_MACHINE_genericx86 = "genericx86" COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" COMPATIBLE_MACHINE_edgerouter = "edgerouter" -COMPATIBLE_MACHINE_beaglebone = "beaglebone" +COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto" COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" LINUX_VERSION_genericx86 = "4.4.87" LINUX_VERSION_genericx86-64 = "4.4.87" LINUX_VERSION_edgerouter = "4.4.87" -LINUX_VERSION_beaglebone = "4.4.87" +LINUX_VERSION_beaglebone-yocto = "4.4.87" LINUX_VERSION_mpc8315e-rdb = "4.4.87" diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.9.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.9.bbappend index b3b5cd546c..63538de735 100644 --- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.9.bbappend +++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.9.bbappend @@ -4,23 +4,24 @@ KBRANCH_genericx86-64 = "standard/base" KMACHINE_genericx86 ?= "common-pc" KMACHINE_genericx86-64 ?= "common-pc-64" KBRANCH_edgerouter = "standard/edgerouter" -KBRANCH_beaglebone = "standard/beaglebone" +KBRANCH_beaglebone-yocto = "standard/beaglebone" +KMACHINE_beaglebone-yocto = "beaglebone" KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb" SRCREV_machine_genericx86 ?= "480ee599fb8df712c10dcf4b7aa6398b79f7d404" SRCREV_machine_genericx86-64 ?= "480ee599fb8df712c10dcf4b7aa6398b79f7d404" SRCREV_machine_edgerouter ?= "480ee599fb8df712c10dcf4b7aa6398b79f7d404" -SRCREV_machine_beaglebone ?= "480ee599fb8df712c10dcf4b7aa6398b79f7d404" +SRCREV_machine_beaglebone-yocto ?= "480ee599fb8df712c10dcf4b7aa6398b79f7d404" SRCREV_machine_mpc8315e-rdb ?= "88a703b15a7564704c3dc5d3c1237e0859897655" COMPATIBLE_MACHINE_genericx86 = "genericx86" COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" COMPATIBLE_MACHINE_edgerouter = "edgerouter" -COMPATIBLE_MACHINE_beaglebone = "beaglebone" +COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto" COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" LINUX_VERSION_genericx86 = "4.9.49" LINUX_VERSION_genericx86-64 = "4.9.49" LINUX_VERSION_edgerouter = "4.9.49" -LINUX_VERSION_beaglebone = "4.9.49" +LINUX_VERSION_beaglebone-yocto = "4.9.49" LINUX_VERSION_mpc8315e-rdb = "4.9.49" -- cgit v1.2.3-54-g00ecf