From 7317c8055cf3af8912a66badb3074f0a60f75ec2 Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Fri, 26 Apr 2013 14:05:07 +0100 Subject: alsa-utils: Move alsaconf to its own recipe 18575b082a4042376fd1575465e69562dea04ddc added bash as a dependency of alsa-utils-alsaconf so that the script interpreter will be available at run time. However, this has the undesirable side effect of making bash be a build dependency for alsa-utils and, for those folks who don't need alsaconf but do want some other part of alsa-utils, this cure is worse than the original disease. Fix this by moving alsaconf to a separate recipe so that the bash dependency only applies when alsaconf is specifically requested. Signed-off-by: Phil Blundell Signed-off-by: Saul Wold --- .../alsa/alsa-utils-alsaconf_1.0.26.bb | 17 +++++++++++++++++ meta/recipes-multimedia/alsa/alsa-utils_1.0.26.bb | 12 ++++++++---- 2 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 meta/recipes-multimedia/alsa/alsa-utils-alsaconf_1.0.26.bb (limited to 'meta/recipes-multimedia') diff --git a/meta/recipes-multimedia/alsa/alsa-utils-alsaconf_1.0.26.bb b/meta/recipes-multimedia/alsa/alsa-utils-alsaconf_1.0.26.bb new file mode 100644 index 0000000000..a3fa1d076b --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-utils-alsaconf_1.0.26.bb @@ -0,0 +1,17 @@ +require alsa-utils_${PV}.bb + +THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" +FILESPATH =. "${@base_set_filespath(["${THISDIR}/alsa-utils"], d)}:" + +PACKAGES = "${PN}" +RDEPENDS_${PN} += "bash" + +DESCRIPTION_${PN} = "a bash script that creates ALSA configuration files" +FILES_${PN} = "${sbindir}/alsaconf" + +S = "${WORKDIR}/alsa-utils-${PV}" + +do_install() { + install -d ${D}${sbindir} + install -m 0755 ${S}/alsaconf/alsaconf ${D}${sbindir}/ +} diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.0.26.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.0.26.bb index d566d94d05..e0bf75532c 100644 --- a/meta/recipes-multimedia/alsa/alsa-utils_1.0.26.bb +++ b/meta/recipes-multimedia/alsa/alsa-utils_1.0.26.bb @@ -39,7 +39,6 @@ ALSA_UTILS_PKGS = "\ alsa-utils-speakertest \ alsa-utils-aseqnet \ alsa-utils-aseqdump \ - alsa-utils-alsaconf \ alsa-utils-alsactl \ alsa-utils-alsaloop \ alsa-utils-alsaucm \ @@ -47,7 +46,6 @@ ALSA_UTILS_PKGS = "\ PACKAGES += "${ALSA_UTILS_PKGS}" RDEPENDS_${PN} += "${ALSA_UTILS_PKGS}" -RDEPENDS_alsa-utils-alsaconf += "bash" FILES_${PN} = "" FILES_alsa-utils-aplay = "${bindir}/aplay ${bindir}/arecord" @@ -60,7 +58,6 @@ FILES_alsa-utils-aseqnet = "${bindir}/aseqnet" FILES_alsa-utils-iecset = "${bindir}/iecset" FILES_alsa-utils-alsactl = "${sbindir}/alsactl */udev/rules.d ${systemd_unitdir} ${localstatedir}/lib/alsa ${datadir}/alsa/init/" FILES_alsa-utils-aseqdump = "${bindir}/aseqdump" -FILES_alsa-utils-alsaconf = "${sbindir}/alsaconf" FILES_alsa-utils-alsaloop = "${bindir}/alsaloop" FILES_alsa-utils-alsaucm = "${bindir}/alsaucm" @@ -73,9 +70,16 @@ DESCRIPTION_alsa-utils-midi = "miscalleanous MIDI utilities for ALSA" DESCRIPTION_alsa-utils-aconnect = "ALSA sequencer connection manager" DESCRIPTION_alsa-utils-aseqnet = "network client/server on ALSA sequencer" DESCRIPTION_alsa-utils-alsactl = "saves/restores ALSA-settings in /etc/asound.state" -DESCRIPTION_alsa-utils-alsaconf = "a bash script that creates ALSA configuration files" DESCRIPTION_alsa-utils-alsaucm = "ALSA Use Case Manager" RRECOMMENDS_alsa-utils-alsactl = "alsa-states" ALLOW_EMPTY_alsa-utils = "1" + +do_install() { + autotools_do_install + + # We don't ship this here because it requires a dependency on bash. + # See alsa-utils-alsaconf_${PV}.bb + rm ${D}${sbindir}/alsaconf +} -- cgit 1.2.3-korg