Skip to contentSkip to conversation

netbase: put sys940x specific interfaces file in MACHINE directory

PATCH In review [email protected] 2 participants 3 messages Feb 11, 2012

lore
Share & tools
lore

[email protected]

author
#0 lore raw

PATCH 1/1 netbase: put sys940x specific interfaces file in MACHINE directory

From: Joshua Lock <[email protected]>

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 <[email protected]>
CC Darren Hart <[email protected]>
---
 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
meta-sys940x/recipes-core/netbase/files/interfaces deleted +0 -10
deleted file mode 100644
index 4218f5d..0000000
@@ -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
meta-sys940x/recipes-core/netbase/files/sys940x-noemgd/interfaces new file +10 -0
new file mode 100644
index 0000000..4218f5d
@@ -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
meta-sys940x/recipes-core/netbase/files/sys940x/interfaces new file +10 -0
new file mode 100644
index 0000000..4218f5d
@@ -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
meta-sys940x/recipes-core/netbase/netbase_4.47.bbappend +1 -1
index 6d3f694..e01e0b6 100644
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 RDEPENDS_${PN} += "genmac"
-PRINC := "${@int(PRINC) + 1}"
+PRINC := "${@int(PRINC) + 2}"
Signature · 1 line
1.7.5.4
author
#1 lore raw
Quoted 6 lines · On 10/02/12 16:32, [email protected] wrote:

From: Joshua Lock<[email protected]>

Move the interfaces file to a MACHINE appropriate subdirectory of files so that:
a) base.bbclass appropriately marks the resultant package MACHINE specific.

Note: after writing this patch, but before submitting it, I discovered that this doesn't currently work for layers. However I've just proposed a fix to the OE-Core list which once merged, or once something like it is merged, this will behave as claimed.

You can follow the thread relating to this fix here:
http://lists.linuxtogo.org/pipermail/openembedded-core/2012-February/017682.html

Cheers,
Joshua

Signature · 3 lines
Joshua Lock
        Yocto Project "Johannes factotum"
        Intel Open Source Technology Centre
#2 lore raw
In reply to [email protected]
Quoted 11 lines · On 02/10/2012 04:32 PM, [email protected] wrote:

From: Joshua Lock <[email protected]>

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 <[email protected]>
CC Darren Hart <[email protected]>

Thanks Josh, applied. Will push next time I'm connected.

--
Darren

Quoted 67 lines
---
 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
meta-sys940x/recipes-core/netbase/files/interfaces deleted +0 -10
deleted file mode 100644
index 4218f5d..0000000
@@ -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
meta-sys940x/recipes-core/netbase/files/sys940x-noemgd/interfaces new file +10 -0
new file mode 100644
index 0000000..4218f5d
@@ -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
meta-sys940x/recipes-core/netbase/files/sys940x/interfaces new file +10 -0
new file mode 100644
index 0000000..4218f5d
@@ -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
meta-sys940x/recipes-core/netbase/netbase_4.47.bbappend +1 -1
index 6d3f694..e01e0b6 100644
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 RDEPENDS_${PN} += "genmac"
-PRINC := "${@int(PRINC) + 1}"
+PRINC := "${@int(PRINC) + 2}"
Signature · 3 lines
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel