* [PATCH] netbase: put sys940x specific interfaces file in MACHINE directory
@ 2012-02-11 0:32 josh
2012-02-11 0:40 ` Joshua Lock
2012-02-11 1:25 ` Darren Hart
0 siblings, 2 replies; 3+ messages in thread
From: josh @ 2012-02-11 0:32 UTC (permalink / raw)
To: yocto; +Cc: Darren Hart
From: Joshua Lock <josh@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 <josh@linux.intel.com>
CC: Darren Hart <dvhart@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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] netbase: put sys940x specific interfaces file in MACHINE directory
2012-02-11 0:32 [PATCH] netbase: put sys940x specific interfaces file in MACHINE directory josh
@ 2012-02-11 0:40 ` Joshua Lock
2012-02-11 1:25 ` Darren Hart
1 sibling, 0 replies; 3+ messages in thread
From: Joshua Lock @ 2012-02-11 0:40 UTC (permalink / raw)
To: yocto; +Cc: Darren Hart
On 10/02/12 16:32, josh@linux.intel.com wrote:
> From: Joshua Lock<josh@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.
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
--
Joshua Lock
Yocto Project "Johannes factotum"
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] netbase: put sys940x specific interfaces file in MACHINE directory
2012-02-11 0:32 [PATCH] netbase: put sys940x specific interfaces file in MACHINE directory josh
2012-02-11 0:40 ` Joshua Lock
@ 2012-02-11 1:25 ` Darren Hart
1 sibling, 0 replies; 3+ messages in thread
From: Darren Hart @ 2012-02-11 1:25 UTC (permalink / raw)
To: josh; +Cc: yocto
On 02/10/2012 04:32 PM, josh@linux.intel.com wrote:
> From: Joshua Lock <josh@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 <josh@linux.intel.com>
> CC: Darren Hart <dvhart@linux.intel.com>
Thanks Josh, applied. Will push next time I'm connected.
--
Darren
> ---
> 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}"
--
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-02-11 4:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-11 0:32 [PATCH] netbase: put sys940x specific interfaces file in MACHINE directory josh
2012-02-11 0:40 ` Joshua Lock
2012-02-11 1:25 ` Darren Hart
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.