diff options
author | Joshua Lock <josh@linux.intel.com> | 2012-02-11 00:32:39 (GMT) |
---|---|---|
committer | Darren Hart <dvhart@linux.intel.com> | 2012-02-11 01:27:27 (GMT) |
commit | 1ca68394faf33416f2aabee27323da7510ad6609 (patch) | |
tree | 41627f6764322393bd2c180228e113ac8ae3044d /meta-sys940x/recipes-core | |
parent | 188881dbcac925021729109a4e5d969874ecb717 (diff) | |
download | meta-intel-1ca68394faf33416f2aabee27323da7510ad6609.tar.gz |
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>
Diffstat (limited to 'meta-sys940x/recipes-core')
-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/interfaces | 10 | ||||
-rw-r--r-- | meta-sys940x/recipes-core/netbase/netbase_4.47.bbappend | 2 |
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 4218f5d..754a5d9 100644 --- a/meta-sys940x/recipes-core/netbase/files/interfaces +++ b/meta-sys940x/recipes-core/netbase/files/sys940x-noemgd/interfaces | |||
@@ -1,5 +1,5 @@ | |||
1 | # /etc/network/interfaces -- configuration file for ifup(8), ifdown(8) | 1 | # /etc/network/interfaces -- configuration file for ifup(8), ifdown(8) |
2 | 2 | ||
3 | # The loopback interface | 3 | # The loopback interface |
4 | auto lo | 4 | auto lo |
5 | iface lo inet loopback | 5 | 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 0000000..754a5d9 --- /dev/null +++ b/meta-sys940x/recipes-core/netbase/files/sys940x/interfaces | |||
@@ -0,0 +1,10 @@ | |||
1 | # /etc/network/interfaces -- configuration file for ifup(8), ifdown(8) | ||
2 | |||
3 | # The loopback interface | ||
4 | auto lo | ||
5 | iface lo inet loopback | ||
6 | |||
7 | # Wired or wireless interfaces | ||
8 | auto eth0 | ||
9 | iface eth0 inet dhcp | ||
10 | 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 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" |
2 | RDEPENDS_${PN} += "genmac" | 2 | RDEPENDS_${PN} += "genmac" |
3 | PRINC := "${@int(PRINC) + 1}" | 3 | PRINC := "${@int(PRINC) + 2}" |