From: Joshua Lock <j...@linux.intel.com>
Move the interfaces file to a MACHINE appropriate subdirectory of
files so that:
a) base.bbclass appropriately marks the resultant package MACHINE
specific.
b) builds for alternative MACHINES whilst this layer is enabled
don't get the sys940x interfaces file
Signed-off-by: Joshua Lock <j...@linux.intel.com>
CC: Darren Hart <dvh...@linux.intel.com>
---
meta-sys940x/recipes-core/netbase/files/interfaces | 10 ----------
.../netbase/files/sys940x-noemgd/interfaces | 10 ++++++++++
.../recipes-core/netbase/files/sys940x/interfaces | 10 ++++++++++
.../recipes-core/netbase/netbase_4.47.bbappend | 2 +-
4 files changed, 21 insertions(+), 11 deletions(-)
delete mode 100644 meta-sys940x/recipes-core/netbase/files/interfaces
create mode 100644
meta-sys940x/recipes-core/netbase/files/sys940x-noemgd/interfaces
create mode 100644 meta-sys940x/recipes-core/netbase/files/sys940x/interfaces
diff --git a/meta-sys940x/recipes-core/netbase/files/interfaces
b/meta-sys940x/recipes-core/netbase/files/interfaces
deleted file mode 100644
index 4218f5d..0000000
--- a/meta-sys940x/recipes-core/netbase/files/interfaces
+++ /dev/null
@@ -1,10 +0,0 @@
-# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
-
-# The loopback interface
-auto lo
-iface lo inet loopback
-
-# Wired or wireless interfaces
-auto eth0
-iface eth0 inet dhcp
- hwaddress ether RANDOM_MAC
diff --git a/meta-sys940x/recipes-core/netbase/files/sys940x-noemgd/interfaces
b/meta-sys940x/recipes-core/netbase/files/sys940x-noemgd/interfaces
new file mode 100644
index 0000000..4218f5d
--- /dev/null
+++ b/meta-sys940x/recipes-core/netbase/files/sys940x-noemgd/interfaces
@@ -0,0 +1,10 @@
+# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
+
+# The loopback interface
+auto lo
+iface lo inet loopback
+
+# Wired or wireless interfaces
+auto eth0
+iface eth0 inet dhcp
+ hwaddress ether RANDOM_MAC
diff --git a/meta-sys940x/recipes-core/netbase/files/sys940x/interfaces
b/meta-sys940x/recipes-core/netbase/files/sys940x/interfaces
new file mode 100644
index 0000000..4218f5d
--- /dev/null
+++ b/meta-sys940x/recipes-core/netbase/files/sys940x/interfaces
@@ -0,0 +1,10 @@
+# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
+
+# The loopback interface
+auto lo
+iface lo inet loopback
+
+# Wired or wireless interfaces
+auto eth0
+iface eth0 inet dhcp
+ hwaddress ether RANDOM_MAC
diff --git a/meta-sys940x/recipes-core/netbase/netbase_4.47.bbappend
b/meta-sys940x/recipes-core/netbase/netbase_4.47.bbappend
index 6d3f694..e01e0b6 100644
--- a/meta-sys940x/recipes-core/netbase/netbase_4.47.bbappend
+++ b/meta-sys940x/recipes-core/netbase/netbase_4.47.bbappend
@@ -1,3 +1,3 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
RDEPENDS_${PN} += "genmac"
-PRINC := "${@int(PRINC) + 1}"
+PRINC := "${@int(PRINC) + 2}"
--
1.7.5.4
_______________________________________________
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
