Patchwork [RFC,-,WIP,v2,03/10] alsa-state: convert to use conf-files

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

Comments

Saul Wold - June 12, 2014, 5:56 a.m.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-bsp/alsa-state/alsa-state.bb                        | 9 +++------
 .../{alsa-state/alsa-state => conf-files/conf-files}/asound.conf | 0
 2 files changed, 3 insertions(+), 6 deletions(-)
 rename meta/recipes-bsp/{alsa-state/alsa-state => conf-files/conf-files}/asound.conf (100%)

Patch

diff --git a/meta/recipes-bsp/alsa-state/alsa-state.bb b/meta/recipes-bsp/alsa-state/alsa-state.bb
index 874d6bb..029967c 100644
--- a/meta/recipes-bsp/alsa-state/alsa-state.bb
+++ b/meta/recipes-bsp/alsa-state/alsa-state.bb
@@ -13,12 +13,11 @@  PV = "0.2.0"
 PR = "r5"
 
 SRC_URI = "\
-  file://asound.conf \
   file://asound.state \
   file://alsa-state-init \
 "
 
-inherit update-rc.d
+inherit update-rc.d conf-files
 
 INITSCRIPT_NAME = "alsa-state"
 INITSCRIPT_PARAMS = "start 39 S . stop 31 0 6 ."
@@ -29,17 +28,15 @@  do_install() {
     install -m 0755 ${WORKDIR}/alsa-state-init ${D}${sysconfdir}/init.d/alsa-state
 
     install -d ${D}/${localstatedir}/lib/alsa
-    install -m 0644 ${WORKDIR}/asound.conf ${D}${sysconfdir}
     install -m 0644 ${WORKDIR}/*.state ${D}${localstatedir}/lib/alsa
 }
 
 PACKAGES += "alsa-states"
 
-RRECOMMENDS_alsa-state = "alsa-states"
+RRECOMMENDS_${PN} = "alsa-states"
 
 RDEPENDS_${PN} = "alsa-utils-alsactl"
-FILES_${PN} = "${sysconfdir}/init.d ${sysconfdir}/asound.conf"
-CONFFILES_${PN} = "${sysconfdir}/asound.conf"
+FILES_${PN} = "${sysconfdir}/init.d"
 
 FILES_alsa-states = "${localstatedir}/lib/alsa/*.state"
 
diff --git a/meta/recipes-bsp/alsa-state/alsa-state/asound.conf b/meta/recipes-bsp/conf-files/conf-files/asound.conf
similarity index 100%
rename from meta/recipes-bsp/alsa-state/alsa-state/asound.conf
rename to meta/recipes-bsp/conf-files/conf-files/asound.conf