alsa-utils: replace hard-coded alsa-utils with PN
PATCH 1/1 alsa-utils: replace hard-coded alsa-utils with PN
From: Ming Liu <[email protected]>
This is mandatory to support multilib build, and also to avoid being redundant with plenty of hard-coded alsa-utils references.
--- meta/recipes-multimedia/alsa/alsa-utils_1.1.8.bb | 96 ++++++++++++------------ 1 file changed, 48 insertions(+), 48 deletions(-)
meta/recipes-multimedia/alsa/alsa-utils_1.1.8.bb +48 -48
@@ -20,7 +20,7 @@ PACKAGECONFIG[udev] = "--with-udev-rules-dir=`pkg-config --variable=udevdir udev PACKAGECONFIG[manpages] = "--enable-xmlto, --disable-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" # alsa-utils specified in SRC_URI due to alsa-utils-scripts recipe -SRC_URI = "https://www.alsa-project.org/files/pub/utils/alsa-utils-${PV}.tar.bz2" +SRC_URI = "https://www.alsa-project.org/files/pub/utils/${BPN}-${PV}.tar.bz2" SRC_URI[md5sum] = "54d6f9b483144823d0fc0c26e8cea028" SRC_URI[sha256sum] = "fd9bf528922b3829a91913b89a1858c58a0b24271a7b5f529923aa9ea12fa4cf"
@@ -36,59 +36,59 @@ inherit autotools gettext pkgconfig manpages # ipk depends on them. ALSA_UTILS_PKGS = "\ - ${@bb.utils.contains('PACKAGECONFIG', 'bat', 'alsa-utils-alsabat', '', d)} \ - alsa-utils-alsamixer \ - alsa-utils-alsatplg \ - alsa-utils-midi \ - alsa-utils-aplay \ - alsa-utils-amixer \ - alsa-utils-aconnect \ - alsa-utils-iecset \ - alsa-utils-speakertest \ - alsa-utils-aseqnet \ - alsa-utils-aseqdump \ - alsa-utils-alsactl \ - alsa-utils-alsaloop \ - alsa-utils-alsaucm \ + ${@bb.utils.contains('PACKAGECONFIG', 'bat', '${PN}-alsabat', '', d)} \ + ${PN}-alsamixer \ + ${PN}-alsatplg \ + ${PN}-midi \ + ${PN}-aplay \ + ${PN}-amixer \ + ${PN}-aconnect \ + ${PN}-iecset \ + ${PN}-speakertest \ + ${PN}-aseqnet \ + ${PN}-aseqdump \ + ${PN}-alsactl \ + ${PN}-alsaloop \ + ${PN}-alsaucm \ " PACKAGES += "${ALSA_UTILS_PKGS}" RDEPENDS_${PN} += "${ALSA_UTILS_PKGS}" FILES_${PN} = "" -FILES_alsa-utils-alsabat = "${bindir}/alsabat" -FILES_alsa-utils-alsatplg = "${bindir}/alsatplg" -FILES_alsa-utils-aplay = "${bindir}/aplay ${bindir}/arecord ${bindir}/axfer" -FILES_alsa-utils-amixer = "${bindir}/amixer" -FILES_alsa-utils-alsamixer = "${bindir}/alsamixer" -FILES_alsa-utils-speakertest = "${bindir}/speaker-test ${datadir}/sounds/alsa/ ${datadir}/alsa/speaker-test/" -FILES_alsa-utils-midi = "${bindir}/aplaymidi ${bindir}/arecordmidi ${bindir}/amidi" -FILES_alsa-utils-aconnect = "${bindir}/aconnect" -FILES_alsa-utils-aseqnet = "${bindir}/aseqnet" -FILES_alsa-utils-iecset = "${bindir}/iecset" -FILES_alsa-utils-alsactl = "${sbindir}/alsactl */udev/rules.d/90-alsa-restore.rules */*/udev/rules.d/90-alsa-restore.rules ${systemd_unitdir} ${localstatedir}/lib/alsa ${datadir}/alsa/init/" -FILES_alsa-utils-aseqdump = "${bindir}/aseqdump" -FILES_alsa-utils-alsaloop = "${bindir}/alsaloop" -FILES_alsa-utils-alsaucm = "${bindir}/alsaucm */udev/rules.d/89-alsa-ucm.rules */*/udev/rules.d/89-alsa-ucm.rules" - -SUMMARY_alsa-utils-alsabat = "Command-line sound tester for ALSA sound card driver" -SUMMARY_alsa-utils-alsatplg = "Converts topology text files into binary format for kernel" -SUMMARY_alsa-utils-aplay = "Play (and record) sound files using ALSA" -SUMMARY_alsa-utils-amixer = "Command-line control for ALSA mixer and settings" -SUMMARY_alsa-utils-alsamixer = "ncurses-based control for ALSA mixer and settings" -SUMMARY_alsa-utils-speakertest = "ALSA surround speaker test utility" -SUMMARY_alsa-utils-midi = "Miscellaneous MIDI utilities for ALSA" -SUMMARY_alsa-utils-aconnect = "ALSA sequencer connection manager" -SUMMARY_alsa-utils-aseqnet = "Network client/server for ALSA sequencer" -SUMMARY_alsa-utils-iecset = "ALSA utility for setting/showing IEC958 (S/PDIF) status bits" -SUMMARY_alsa-utils-alsactl = "Saves/restores ALSA-settings in /etc/asound.state" -SUMMARY_alsa-utils-aseqdump = "Shows the events received at an ALSA sequencer port" -SUMMARY_alsa-utils-alsaloop = "ALSA PCM loopback utility" -SUMMARY_alsa-utils-alsaucm = "ALSA Use Case Manager" - -RRECOMMENDS_alsa-utils-alsactl = "alsa-states" - -ALLOW_EMPTY_alsa-utils = "1" +FILES_${PN}-alsabat = "${bindir}/alsabat" +FILES_${PN}-alsatplg = "${bindir}/alsatplg" +FILES_${PN}-aplay = "${bindir}/aplay ${bindir}/arecord ${bindir}/axfer" +FILES_${PN}-amixer = "${bindir}/amixer" +FILES_${PN}-alsamixer = "${bindir}/alsamixer" +FILES_${PN}-speakertest = "${bindir}/speaker-test ${datadir}/sounds/alsa/ ${datadir}/alsa/speaker-test/" +FILES_${PN}-midi = "${bindir}/aplaymidi ${bindir}/arecordmidi ${bindir}/amidi" +FILES_${PN}-aconnect = "${bindir}/aconnect" +FILES_${PN}-aseqnet = "${bindir}/aseqnet" +FILES_${PN}-iecset = "${bindir}/iecset" +FILES_${PN}-alsactl = "${sbindir}/alsactl */udev/rules.d/90-alsa-restore.rules */*/udev/rules.d/90-alsa-restore.rules ${systemd_unitdir} ${localstatedir}/lib/alsa ${datadir}/alsa/init/" +FILES_${PN}-aseqdump = "${bindir}/aseqdump" +FILES_${PN}-alsaloop = "${bindir}/alsaloop" +FILES_${PN}-alsaucm = "${bindir}/alsaucm */udev/rules.d/89-alsa-ucm.rules */*/udev/rules.d/89-alsa-ucm.rules" + +SUMMARY_${PN}-alsabat = "Command-line sound tester for ALSA sound card driver" +SUMMARY_${PN}-alsatplg = "Converts topology text files into binary format for kernel" +SUMMARY_${PN}-aplay = "Play (and record) sound files using ALSA" +SUMMARY_${PN}-amixer = "Command-line control for ALSA mixer and settings" +SUMMARY_${PN}-alsamixer = "ncurses-based control for ALSA mixer and settings" +SUMMARY_${PN}-speakertest = "ALSA surround speaker test utility" +SUMMARY_${PN}-midi = "Miscellaneous MIDI utilities for ALSA" +SUMMARY_${PN}-aconnect = "ALSA sequencer connection manager" +SUMMARY_${PN}-aseqnet = "Network client/server for ALSA sequencer" +SUMMARY_${PN}-iecset = "ALSA utility for setting/showing IEC958 (S/PDIF) status bits" +SUMMARY_${PN}-alsactl = "Saves/restores ALSA-settings in /etc/asound.state" +SUMMARY_${PN}-aseqdump = "Shows the events received at an ALSA sequencer port" +SUMMARY_${PN}-alsaloop = "ALSA PCM loopback utility" +SUMMARY_${PN}-alsaucm = "ALSA Use Case Manager" + +RRECOMMENDS_${PN}-alsactl = "alsa-states" + +ALLOW_EMPTY_${PN} = "1" do_install() { autotools_do_install
Signature · 1 line
2.7.4
Quoted 6 lines · On Sat, 2019-05-18 at 23:07 +0200, [email protected] wrote:
From: Ming Liu <[email protected]>
This is mandatory to support multilib build, and also to avoid being redundant with plenty of hard-coded alsa-utils references.
Signed-off-by Ming Liu <[email protected]>
Doesn't this break the alsa-utils-scripts recipe?
Cheers,
Richard
Hi, Richard:
you are right, it will break alsa-utils-scripts, will send a V2 soon.
//Ming Liu
Richard Purdie <[email protected]> 於 2019年5月20日 週一 下午1:55寫道:
Quoted 17 lines · On Sat, 2019-05-18 at 23:07 +0200, [email protected] wrote:
Quoted 6 lines
From: Ming Liu <[email protected]>
This is mandatory to support multilib build, and also to avoid being redundant with plenty of hard-coded alsa-utils references.
Signed-off-by Ming Liu <[email protected]>Doesn't this break the alsa-utils-scripts recipe?
Cheers,
Richard