Patchwork [RFC,-,WIP,v2,06/10] init-ifupdown: convert to use conf-files

login
register
mail settings
Submitter Saul Wold
Date June 12, 2014, 5:56 a.m.
Message ID <b4bb7714ecccd51baffcc5bb98b6fb4af57b9bc6.1402552609.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/73639/
State New
Headers show

Comments

Saul Wold - June 12, 2014, 5:56 a.m.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../conf-files/conf-files}/interfaces                               | 0
 .../conf-files/conf-files}/qemuarm/interfaces                       | 0
 .../conf-files/conf-files}/qemuarmv6/interfaces                     | 0
 .../conf-files/conf-files}/qemuarmv7/interfaces                     | 0
 .../conf-files/conf-files}/qemumips/interfaces                      | 0
 .../conf-files/conf-files}/qemumips64/interfaces                    | 0
 .../conf-files/conf-files}/qemuppc/interfaces                       | 0
 .../conf-files/conf-files}/qemush4/interfaces                       | 0
 .../conf-files/conf-files}/qemux86-64/interfaces                    | 0
 .../conf-files/conf-files}/qemux86/interfaces                       | 0
 meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb                | 6 +-----
 11 files changed, 1 insertion(+), 5 deletions(-)
 rename meta/{recipes-core/init-ifupdown/init-ifupdown-1.0 => recipes-bsp/conf-files/conf-files}/interfaces (100%)
 rename meta/{recipes-core/init-ifupdown/init-ifupdown-1.0 => recipes-bsp/conf-files/conf-files}/qemuarm/interfaces (100%)
 rename meta/{recipes-core/init-ifupdown/init-ifupdown-1.0 => recipes-bsp/conf-files/conf-files}/qemuarmv6/interfaces (100%)
 rename meta/{recipes-core/init-ifupdown/init-ifupdown-1.0 => recipes-bsp/conf-files/conf-files}/qemuarmv7/interfaces (100%)
 rename meta/{recipes-core/init-ifupdown/init-ifupdown-1.0 => recipes-bsp/conf-files/conf-files}/qemumips/interfaces (100%)
 rename meta/{recipes-core/init-ifupdown/init-ifupdown-1.0 => recipes-bsp/conf-files/conf-files}/qemumips64/interfaces (100%)
 rename meta/{recipes-core/init-ifupdown/init-ifupdown-1.0 => recipes-bsp/conf-files/conf-files}/qemuppc/interfaces (100%)
 rename meta/{recipes-core/init-ifupdown/init-ifupdown-1.0 => recipes-bsp/conf-files/conf-files}/qemush4/interfaces (100%)
 rename meta/{recipes-core/init-ifupdown/init-ifupdown-1.0 => recipes-bsp/conf-files/conf-files}/qemux86-64/interfaces (100%)
 rename meta/{recipes-core/init-ifupdown/init-ifupdown-1.0 => recipes-bsp/conf-files/conf-files}/qemux86/interfaces (100%)

Patch

diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/interfaces b/meta/recipes-bsp/conf-files/conf-files/interfaces
similarity index 100%
rename from meta/recipes-core/init-ifupdown/init-ifupdown-1.0/interfaces
rename to meta/recipes-bsp/conf-files/conf-files/interfaces
diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarm/interfaces b/meta/recipes-bsp/conf-files/conf-files/qemuarm/interfaces
similarity index 100%
rename from meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarm/interfaces
rename to meta/recipes-bsp/conf-files/conf-files/qemuarm/interfaces
diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarmv6/interfaces b/meta/recipes-bsp/conf-files/conf-files/qemuarmv6/interfaces
similarity index 100%
rename from meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarmv6/interfaces
rename to meta/recipes-bsp/conf-files/conf-files/qemuarmv6/interfaces
diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarmv7/interfaces b/meta/recipes-bsp/conf-files/conf-files/qemuarmv7/interfaces
similarity index 100%
rename from meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarmv7/interfaces
rename to meta/recipes-bsp/conf-files/conf-files/qemuarmv7/interfaces
diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemumips/interfaces b/meta/recipes-bsp/conf-files/conf-files/qemumips/interfaces
similarity index 100%
rename from meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemumips/interfaces
rename to meta/recipes-bsp/conf-files/conf-files/qemumips/interfaces
diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemumips64/interfaces b/meta/recipes-bsp/conf-files/conf-files/qemumips64/interfaces
similarity index 100%
rename from meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemumips64/interfaces
rename to meta/recipes-bsp/conf-files/conf-files/qemumips64/interfaces
diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuppc/interfaces b/meta/recipes-bsp/conf-files/conf-files/qemuppc/interfaces
similarity index 100%
rename from meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuppc/interfaces
rename to meta/recipes-bsp/conf-files/conf-files/qemuppc/interfaces
diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemush4/interfaces b/meta/recipes-bsp/conf-files/conf-files/qemush4/interfaces
similarity index 100%
rename from meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemush4/interfaces
rename to meta/recipes-bsp/conf-files/conf-files/qemush4/interfaces
diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemux86-64/interfaces b/meta/recipes-bsp/conf-files/conf-files/qemux86-64/interfaces
similarity index 100%
rename from meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemux86-64/interfaces
rename to meta/recipes-bsp/conf-files/conf-files/qemux86-64/interfaces
diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemux86/interfaces b/meta/recipes-bsp/conf-files/conf-files/qemux86/interfaces
similarity index 100%
rename from meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemux86/interfaces
rename to meta/recipes-bsp/conf-files/conf-files/qemux86/interfaces
diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb b/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb
index 3d88506..ca65c79 100644
--- a/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb
+++ b/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb
@@ -6,14 +6,13 @@  LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://${WORKDIR}/copyright;md5=3dd6192d306f582dee7687da3d8748ab"
 PR = "r7"
 
-inherit update-rc.d
+inherit update-rc.d conf-files
 
 INITSCRIPT_NAME = "networking"
 INITSCRIPT_PARAMS = "start 01 2 3 4 5 . stop 80 0 6 1 ."
 
 SRC_URI = "file://copyright \
            file://init \
-           file://interfaces \
            file://nfsroot"
 
 do_install () {
@@ -23,7 +22,6 @@  do_install () {
 			${D}${sysconfdir}/network/if-down.d \
 			${D}${sysconfdir}/network/if-post-down.d
 	install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/networking
-	install -m 0644 ${WORKDIR}/interfaces ${D}${sysconfdir}/network/interfaces
 	install -m 0755 ${WORKDIR}/nfsroot ${D}${sysconfdir}/network/if-pre-up.d
 }
 
@@ -35,5 +33,3 @@  do_install_append_qemuall () {
 PACKAGE_ARCH_qemuall = "${MACHINE_ARCH}"
 RDEPENDS_${PN} = "netbase"
 RCONFLICTS_${PN} = "netbase (< 1:5.0)"
-
-CONFFILES_${PN} = "${sysconfdir}/network/interfaces"