aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2012-02-10 16:32:39 -0800
committerDarren Hart <dvhart@linux.intel.com>2012-02-10 17:27:27 -0800
commit1ca68394faf33416f2aabee27323da7510ad6609 (patch)
tree41627f6764322393bd2c180228e113ac8ae3044d
parent188881dbcac925021729109a4e5d969874ecb717 (diff)
downloadmeta-intel-1ca68394faf33416f2aabee27323da7510ad6609.tar.gz
meta-intel-1ca68394faf33416f2aabee27323da7510ad6609.tar.bz2
meta-intel-1ca68394faf33416f2aabee27323da7510ad6609.zip
netbase: put sys940x specific interfaces file in MACHINE directory
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 <josh@linux.intel.com> Signed-off-by: Darren Hart <dvhart@linux.intel.com>
-rw-r--r--meta-sys940x/recipes-core/netbase/files/sys940x-noemgd/interfaces (renamed from meta-sys940x/recipes-core/netbase/files/interfaces)2
-rw-r--r--meta-sys940x/recipes-core/netbase/files/sys940x/interfaces10
-rw-r--r--meta-sys940x/recipes-core/netbase/netbase_4.47.bbappend2
3 files changed, 12 insertions, 2 deletions
diff --git a/meta-sys940x/recipes-core/netbase/files/interfaces b/meta-sys940x/recipes-core/netbase/files/sys940x-noemgd/interfaces
index 4218f5db..754a5d9d 100644
--- a/meta-sys940x/recipes-core/netbase/files/interfaces
+++ b/meta-sys940x/recipes-core/netbase/files/sys940x-noemgd/interfaces
@@ -1,5 +1,5 @@
# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
-
+
# The loopback interface
auto lo
iface lo inet loopback
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 00000000..754a5d9d
--- /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 6d3f6940..e01e0b6a 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}"