From 955ee67fb9e48d28ab8d95f2df6cea1e9ef1e33b Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 11 Jul 2007 22:49:52 +0000 Subject: [PATCH] alsa: integrate alsa-states recipe into alsa-state --- packages/alsa/alsa-state.bb | 26 ++++++++++++++----- .../fic-gta01/capturehandset.state | 0 .../fic-gta01/captureheadset.state | 0 .../fic-gta01/gsmbluetooth.state | 0 .../fic-gta01/gsmhandset.state | 0 .../fic-gta01/gsmheadset.state | 0 .../fic-gta01/stereoout.state | 0 packages/alsa/alsa-states/.mtn2git_empty | 0 packages/alsa/alsa-states/dummy.state | 0 .../alsa/alsa-states/fic-gta01/.mtn2git_empty | 0 packages/alsa/alsa-states_0.0.0.bb | 14 ---------- 11 files changed, 19 insertions(+), 21 deletions(-) rename packages/alsa/{alsa-states => alsa-state}/fic-gta01/capturehandset.state (100%) rename packages/alsa/{alsa-states => alsa-state}/fic-gta01/captureheadset.state (100%) rename packages/alsa/{alsa-states => alsa-state}/fic-gta01/gsmbluetooth.state (100%) rename packages/alsa/{alsa-states => alsa-state}/fic-gta01/gsmhandset.state (100%) rename packages/alsa/{alsa-states => alsa-state}/fic-gta01/gsmheadset.state (100%) rename packages/alsa/{alsa-states => alsa-state}/fic-gta01/stereoout.state (100%) delete mode 100644 packages/alsa/alsa-states/.mtn2git_empty delete mode 100644 packages/alsa/alsa-states/dummy.state delete mode 100644 packages/alsa/alsa-states/fic-gta01/.mtn2git_empty delete mode 100644 packages/alsa/alsa-states_0.0.0.bb diff --git a/packages/alsa/alsa-state.bb b/packages/alsa/alsa-state.bb index 495329457c..35c8f5d3d3 100644 --- a/packages/alsa/alsa-state.bb +++ b/packages/alsa/alsa-state.bb @@ -9,12 +9,20 @@ DESCRIPTION = "Default ALSA configuration" LICENSE = "GPL" - +RRECOMMENDS_alsa-state = "alsa-states" PV = "0.0.4" -PR = "r1" +PR = "r2" SRC_URI = "file://asound.state \ - file://alsa-state" + file://alsa-state " + +SRC_URI_append_fic-gta01 = " \ + file://capturehandset.state \ + file://captureheadset.state \ + file://gsmbluetooth.state \ + file://gsmhandset.state \ + file://gsmheadset.state \ + file://stereoout.state" inherit update-rc.d @@ -22,13 +30,17 @@ INITSCRIPT_NAME = "alsa-state" INITSCRIPT_PARAMS = "defaults 10" do_install() { - install -d ${D}${sysconfdir}/init.d + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/alsa-state ${D}${sysconfdir}/init.d - install -m 0644 ${WORKDIR}/asound.state ${D}${sysconfdir} - install -m 0755 ${WORKDIR}/alsa-state ${D}${sysconfdir}/init.d + install -m 0644 ${WORKDIR}/*.state ${D}${sysconfdir} } -FILES_${PN} = "${sysconfdir}/*" +PACKAGES += "alsa-states" +FILES_${PN} = "${sysconfdir}/init.d" +FILES_alsa-states = "${sysconfdir}/*.state" +PACKAGE_ARCH_${PN} = "all" +PACKAGE_ARCH_alsa-states = "${MACHINE}" pkg_postinst_${PN}() { if test -z "$D" diff --git a/packages/alsa/alsa-states/fic-gta01/capturehandset.state b/packages/alsa/alsa-state/fic-gta01/capturehandset.state similarity index 100% rename from packages/alsa/alsa-states/fic-gta01/capturehandset.state rename to packages/alsa/alsa-state/fic-gta01/capturehandset.state diff --git a/packages/alsa/alsa-states/fic-gta01/captureheadset.state b/packages/alsa/alsa-state/fic-gta01/captureheadset.state similarity index 100% rename from packages/alsa/alsa-states/fic-gta01/captureheadset.state rename to packages/alsa/alsa-state/fic-gta01/captureheadset.state diff --git a/packages/alsa/alsa-states/fic-gta01/gsmbluetooth.state b/packages/alsa/alsa-state/fic-gta01/gsmbluetooth.state similarity index 100% rename from packages/alsa/alsa-states/fic-gta01/gsmbluetooth.state rename to packages/alsa/alsa-state/fic-gta01/gsmbluetooth.state diff --git a/packages/alsa/alsa-states/fic-gta01/gsmhandset.state b/packages/alsa/alsa-state/fic-gta01/gsmhandset.state similarity index 100% rename from packages/alsa/alsa-states/fic-gta01/gsmhandset.state rename to packages/alsa/alsa-state/fic-gta01/gsmhandset.state diff --git a/packages/alsa/alsa-states/fic-gta01/gsmheadset.state b/packages/alsa/alsa-state/fic-gta01/gsmheadset.state similarity index 100% rename from packages/alsa/alsa-states/fic-gta01/gsmheadset.state rename to packages/alsa/alsa-state/fic-gta01/gsmheadset.state diff --git a/packages/alsa/alsa-states/fic-gta01/stereoout.state b/packages/alsa/alsa-state/fic-gta01/stereoout.state similarity index 100% rename from packages/alsa/alsa-states/fic-gta01/stereoout.state rename to packages/alsa/alsa-state/fic-gta01/stereoout.state diff --git a/packages/alsa/alsa-states/.mtn2git_empty b/packages/alsa/alsa-states/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/alsa/alsa-states/dummy.state b/packages/alsa/alsa-states/dummy.state deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/alsa/alsa-states/fic-gta01/.mtn2git_empty b/packages/alsa/alsa-states/fic-gta01/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/alsa/alsa-states_0.0.0.bb b/packages/alsa/alsa-states_0.0.0.bb deleted file mode 100644 index 8bf8f80e21..0000000000 --- a/packages/alsa/alsa-states_0.0.0.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "Machine specific alsa state files" -SECTION = "base" -LICENSE = "MIT" -PR = "r1" - -SRC_URI = "file://*.state" - -do_install () { - install -d ${D}${sysconfdir}/alsa - install -m 0644 ${WORKDIR}/*.state ${D}${sysconfdir}/alsa -} - -ALLOW_EMPTY = "1" -FILES_${PN} += "${sysconfdir}/alsa/*" -- 2.39.5