From 1f660fd4b00076baa867a75fdf766e8fe2c75b9d Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Fri, 27 Mar 2015 17:09:38 +0100 Subject: [PATCH] netbase/init-ifupdown: seperate both overrides and remove the appends of netbase for master and dizzy * historical netbase in edison was not split and files were in netbase Fixes: SYS#1142 --- .../init-ifupdown}/sysmobts-v1/interfaces | 0 .../init-ifupdown}/sysmobts-v2/interfaces | 0 .../init-ifupdown}/sysmocom-bsc/interfaces | 0 .../netbase => init-ifupdown/init-ifupdown}/sysmocom-idu/init | 0 .../init-ifupdown}/sysmocom-idu/interfaces | 0 .../netbase => init-ifupdown/init-ifupdown}/sysmocom-odu/init | 0 .../init-ifupdown}/sysmocom-odu/interfaces | 0 .../{netbase => init-ifupdown}/init-ifupdown_sysmocom.inc | 4 ++-- recipes-bsp/netbase/netbase_sysmocom.inc | 2 +- yocto-dizzy/netbase_5.3.bbappend | 1 - yocto-dora/init-ifupdown_1.0.bbappend | 2 +- yocto-master/netbase_5.1.bbappend | 1 - 12 files changed, 4 insertions(+), 6 deletions(-) rename recipes-bsp/{netbase/netbase => init-ifupdown/init-ifupdown}/sysmobts-v1/interfaces (100%) rename recipes-bsp/{netbase/netbase => init-ifupdown/init-ifupdown}/sysmobts-v2/interfaces (100%) rename recipes-bsp/{netbase/netbase => init-ifupdown/init-ifupdown}/sysmocom-bsc/interfaces (100%) rename recipes-bsp/{netbase/netbase => init-ifupdown/init-ifupdown}/sysmocom-idu/init (100%) rename recipes-bsp/{netbase/netbase => init-ifupdown/init-ifupdown}/sysmocom-idu/interfaces (100%) rename recipes-bsp/{netbase/netbase => init-ifupdown/init-ifupdown}/sysmocom-odu/init (100%) rename recipes-bsp/{netbase/netbase => init-ifupdown/init-ifupdown}/sysmocom-odu/interfaces (100%) rename recipes-bsp/{netbase => init-ifupdown}/init-ifupdown_sysmocom.inc (68%) delete mode 100644 yocto-dizzy/netbase_5.3.bbappend delete mode 100644 yocto-master/netbase_5.1.bbappend diff --git a/recipes-bsp/netbase/netbase/sysmobts-v1/interfaces b/recipes-bsp/init-ifupdown/init-ifupdown/sysmobts-v1/interfaces similarity index 100% rename from recipes-bsp/netbase/netbase/sysmobts-v1/interfaces rename to recipes-bsp/init-ifupdown/init-ifupdown/sysmobts-v1/interfaces diff --git a/recipes-bsp/netbase/netbase/sysmobts-v2/interfaces b/recipes-bsp/init-ifupdown/init-ifupdown/sysmobts-v2/interfaces similarity index 100% rename from recipes-bsp/netbase/netbase/sysmobts-v2/interfaces rename to recipes-bsp/init-ifupdown/init-ifupdown/sysmobts-v2/interfaces diff --git a/recipes-bsp/netbase/netbase/sysmocom-bsc/interfaces b/recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-bsc/interfaces similarity index 100% rename from recipes-bsp/netbase/netbase/sysmocom-bsc/interfaces rename to recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-bsc/interfaces diff --git a/recipes-bsp/netbase/netbase/sysmocom-idu/init b/recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-idu/init similarity index 100% rename from recipes-bsp/netbase/netbase/sysmocom-idu/init rename to recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-idu/init diff --git a/recipes-bsp/netbase/netbase/sysmocom-idu/interfaces b/recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-idu/interfaces similarity index 100% rename from recipes-bsp/netbase/netbase/sysmocom-idu/interfaces rename to recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-idu/interfaces diff --git a/recipes-bsp/netbase/netbase/sysmocom-odu/init b/recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-odu/init similarity index 100% rename from recipes-bsp/netbase/netbase/sysmocom-odu/init rename to recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-odu/init diff --git a/recipes-bsp/netbase/netbase/sysmocom-odu/interfaces b/recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-odu/interfaces similarity index 100% rename from recipes-bsp/netbase/netbase/sysmocom-odu/interfaces rename to recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-odu/interfaces diff --git a/recipes-bsp/netbase/init-ifupdown_sysmocom.inc b/recipes-bsp/init-ifupdown/init-ifupdown_sysmocom.inc similarity index 68% rename from recipes-bsp/netbase/init-ifupdown_sysmocom.inc rename to recipes-bsp/init-ifupdown/init-ifupdown_sysmocom.inc index 3850bb5..7ecf300 100644 --- a/recipes-bsp/netbase/init-ifupdown_sysmocom.inc +++ b/recipes-bsp/init-ifupdown/init-ifupdown_sysmocom.inc @@ -1,6 +1,6 @@ SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" -FILESEXTRAPATHS_prepend := "${SYSMOCOM}/netbase-${PV}:${SYSMOCOM}/netbase:" -PRINC = "9" +FILESEXTRAPATHS_prepend := "${SYSMOCOM}/init-ifupdown-${PV}:${SYSMOCOM}/init-ifupdown:" +PRINC = "10" # systemd does not look at /etc/rcS.d for the script. Make sure # there is a symlink available diff --git a/recipes-bsp/netbase/netbase_sysmocom.inc b/recipes-bsp/netbase/netbase_sysmocom.inc index 6f603eb..2bdc67b 100644 --- a/recipes-bsp/netbase/netbase_sysmocom.inc +++ b/recipes-bsp/netbase/netbase_sysmocom.inc @@ -1,6 +1,6 @@ SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" FILESEXTRAPATHS_prepend := "${SYSMOCOM}/${PN}-${PV}:${SYSMOCOM}/${PN}:" -PRINC = "20" +PRINC = "21" # bug in poky meta/classes/base.bbclass diff --git a/yocto-dizzy/netbase_5.3.bbappend b/yocto-dizzy/netbase_5.3.bbappend deleted file mode 100644 index 5e3605f..0000000 --- a/yocto-dizzy/netbase_5.3.bbappend +++ /dev/null @@ -1 +0,0 @@ -require recipes-bsp/netbase/${PN}_sysmocom.inc diff --git a/yocto-dora/init-ifupdown_1.0.bbappend b/yocto-dora/init-ifupdown_1.0.bbappend index 5e3605f..486a6a7 100644 --- a/yocto-dora/init-ifupdown_1.0.bbappend +++ b/yocto-dora/init-ifupdown_1.0.bbappend @@ -1 +1 @@ -require recipes-bsp/netbase/${PN}_sysmocom.inc +require recipes-bsp/init-ifupdown/${PN}_sysmocom.inc diff --git a/yocto-master/netbase_5.1.bbappend b/yocto-master/netbase_5.1.bbappend deleted file mode 100644 index 5e3605f..0000000 --- a/yocto-master/netbase_5.1.bbappend +++ /dev/null @@ -1 +0,0 @@ -require recipes-bsp/netbase/${PN}_sysmocom.inc