summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-multimedia/alsa/alsa-utils-alsaconf_1.0.28.bb17
-rw-r--r--meta/recipes-multimedia/alsa/alsa-utils-scripts_1.0.29.bb21
-rw-r--r--meta/recipes-multimedia/alsa/alsa-utils_1.0.29.bb (renamed from meta/recipes-multimedia/alsa/alsa-utils_1.0.28.bb)9
3 files changed, 25 insertions, 22 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-utils-alsaconf_1.0.28.bb b/meta/recipes-multimedia/alsa/alsa-utils-alsaconf_1.0.28.bb
deleted file mode 100644
index 2d49cc5622..0000000000
--- a/meta/recipes-multimedia/alsa/alsa-utils-alsaconf_1.0.28.bb
+++ /dev/null
@@ -1,17 +0,0 @@
1require alsa-utils_${PV}.bb
2
3SUMMARY = "Shell script that creates ALSA configuration files"
4
5FILESEXTRAPATHS_prepend := "${THISDIR}/alsa-utils:"
6
7PACKAGES = "${PN}"
8RDEPENDS_${PN} += "bash"
9
10FILES_${PN} = "${sbindir}/alsaconf"
11
12S = "${WORKDIR}/alsa-utils-${PV}"
13
14do_install() {
15 install -d ${D}${sbindir}
16 install -m 0755 ${B}/alsaconf/alsaconf ${D}${sbindir}/
17}
diff --git a/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.0.29.bb b/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.0.29.bb
new file mode 100644
index 0000000000..a98f9b90ba
--- /dev/null
+++ b/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.0.29.bb
@@ -0,0 +1,21 @@
1require alsa-utils_${PV}.bb
2
3SUMMARY = "Shell scripts that show help info and create ALSA configuration files"
4PROVIDES = "alsa-utils-alsaconf"
5
6FILESEXTRAPATHS_prepend := "${THISDIR}/alsa-utils:"
7
8PACKAGES = "${PN}"
9RDEPENDS_${PN} += "bash"
10
11FILES_${PN} = "${sbindir}/alsaconf \
12 ${sbindir}/alsa-info.sh \
13 "
14
15S = "${WORKDIR}/alsa-utils-${PV}"
16
17do_install() {
18 install -d ${D}${sbindir}
19 install -m 0755 ${B}/alsaconf/alsaconf ${D}${sbindir}/
20 install -m 0755 ${S}/alsa-info/alsa-info.sh ${D}${sbindir}/
21}
diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.0.28.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.0.29.bb
index 506698edcd..65cae0b928 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils_1.0.28.bb
+++ b/meta/recipes-multimedia/alsa/alsa-utils_1.0.29.bb
@@ -16,8 +16,8 @@ SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
16 file://alsa-utils-aplay-interrupt-signal-handling.patch \ 16 file://alsa-utils-aplay-interrupt-signal-handling.patch \
17 " 17 "
18 18
19SRC_URI[md5sum] = "361552d5b1cacd0a1e7ba09e69990211" 19SRC_URI[md5sum] = "6b289bf874c4c9a63f4b3973093dd404"
20SRC_URI[sha256sum] = "f3ff4c89b0125a7797b1b13cd094cc92276e655458274967386e812d03642acc" 20SRC_URI[sha256sum] = "5160058f3e14483ced5de919dd473f93932059454530a9b7ef97dcabd6833e9b"
21 21
22# lazy hack. needs proper fixing in gettext.m4, see 22# lazy hack. needs proper fixing in gettext.m4, see
23# http://bugs.openembedded.org/show_bug.cgi?id=2348 23# http://bugs.openembedded.org/show_bug.cgi?id=2348
@@ -25,8 +25,6 @@ SRC_URI[sha256sum] = "f3ff4c89b0125a7797b1b13cd094cc92276e655458274967386e812d03
25# 25#
26EXTRA_OECONF_append_libc-uclibc = " --disable-nls" 26EXTRA_OECONF_append_libc-uclibc = " --disable-nls"
27 27
28PR = "r1"
29
30inherit autotools gettext pkgconfig 28inherit autotools gettext pkgconfig
31 29
32# This are all packages that we need to make. Also, the now empty alsa-utils 30# This are all packages that we need to make. Also, the now empty alsa-utils
@@ -86,8 +84,9 @@ do_install() {
86 autotools_do_install 84 autotools_do_install
87 85
88 # We don't ship this here because it requires a dependency on bash. 86 # We don't ship this here because it requires a dependency on bash.
89 # See alsa-utils-alsaconf_${PV}.bb 87 # See alsa-utils-scripts_${PV}.bb
90 rm ${D}${sbindir}/alsaconf 88 rm ${D}${sbindir}/alsaconf
89 rm ${D}${sbindir}/alsa-info.sh
91 90
92 if ${@bb.utils.contains('PACKAGECONFIG', 'udev', 'false', 'true', d)}; then 91 if ${@bb.utils.contains('PACKAGECONFIG', 'udev', 'false', 'true', d)}; then
93 # This is where alsa-utils will install its rules if we don't tell it anything else. 92 # This is where alsa-utils will install its rules if we don't tell it anything else.