Skip to contentSkip to conversation

alsa-utils: fix multilib names

PATCH In review [email protected] 4 participants 7 messages May 24, 2019 – May 25, 2019

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 alsa-utils: fix multilib names

From: Ming Liu <[email protected]>

Append ${MLPREFIX} to the 'alsa-utils' names, or else it would fail with multilib build.

---
 meta/recipes-multimedia/alsa/alsa-utils_1.1.9.bb | 66 ++++++++++++------------
 1 file changed, 33 insertions(+), 33 deletions(-)
meta/recipes-multimedia/alsa/alsa-utils_1.1.9.bb +33 -33
index 03b5c8d..5976914 100644
@@ -56,39 +56,39 @@ 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_${MLPREFIX}alsa-utils-alsabat     = "${bindir}/alsabat"
+FILES_${MLPREFIX}alsa-utils-alsatplg    = "${bindir}/alsatplg"
+FILES_${MLPREFIX}alsa-utils-aplay       = "${bindir}/aplay ${bindir}/arecord ${bindir}/axfer"
+FILES_${MLPREFIX}alsa-utils-amixer      = "${bindir}/amixer"
+FILES_${MLPREFIX}alsa-utils-alsamixer   = "${bindir}/alsamixer"
+FILES_${MLPREFIX}alsa-utils-speakertest = "${bindir}/speaker-test ${datadir}/sounds/alsa/ ${datadir}/alsa/speaker-test/"
+FILES_${MLPREFIX}alsa-utils-midi        = "${bindir}/aplaymidi ${bindir}/arecordmidi ${bindir}/amidi"
+FILES_${MLPREFIX}alsa-utils-aconnect    = "${bindir}/aconnect"
+FILES_${MLPREFIX}alsa-utils-aseqnet     = "${bindir}/aseqnet"
+FILES_${MLPREFIX}alsa-utils-iecset      = "${bindir}/iecset"
+FILES_${MLPREFIX}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_${MLPREFIX}alsa-utils-aseqdump    = "${bindir}/aseqdump"
+FILES_${MLPREFIX}alsa-utils-alsaloop    = "${bindir}/alsaloop"
+FILES_${MLPREFIX}alsa-utils-alsaucm     = "${bindir}/alsaucm */udev/rules.d/89-alsa-ucm.rules */*/udev/rules.d/89-alsa-ucm.rules"
+
+SUMMARY_${MLPREFIX}alsa-utils-alsabat      = "Command-line sound tester for ALSA sound card driver"
+SUMMARY_${MLPREFIX}alsa-utils-alsatplg     = "Converts topology text files into binary format for kernel"
+SUMMARY_${MLPREFIX}alsa-utils-aplay        = "Play (and record) sound files using ALSA"
+SUMMARY_${MLPREFIX}alsa-utils-amixer       = "Command-line control for ALSA mixer and settings"
+SUMMARY_${MLPREFIX}alsa-utils-alsamixer    = "ncurses-based control for ALSA mixer and settings"
+SUMMARY_${MLPREFIX}alsa-utils-speakertest  = "ALSA surround speaker test utility"
+SUMMARY_${MLPREFIX}alsa-utils-midi         = "Miscellaneous MIDI utilities for ALSA"
+SUMMARY_${MLPREFIX}alsa-utils-aconnect     = "ALSA sequencer connection manager"
+SUMMARY_${MLPREFIX}alsa-utils-aseqnet      = "Network client/server for ALSA sequencer"
+SUMMARY_${MLPREFIX}alsa-utils-iecset       = "ALSA utility for setting/showing IEC958 (S/PDIF) status bits"
+SUMMARY_${MLPREFIX}alsa-utils-alsactl      = "Saves/restores ALSA-settings in /etc/asound.state"
+SUMMARY_${MLPREFIX}alsa-utils-aseqdump     = "Shows the events received at an ALSA sequencer port"
+SUMMARY_${MLPREFIX}alsa-utils-alsaloop     = "ALSA PCM loopback utility"
+SUMMARY_${MLPREFIX}alsa-utils-alsaucm      = "ALSA Use Case Manager"
+
+RRECOMMENDS_${MLPREFIX}alsa-utils-alsactl = "alsa-states"
+
+ALLOW_EMPTY_${MLPREFIX}alsa-utils = "1"
 
 do_install() {
 	autotools_do_install
Signature · 1 line
2.7.4
#1 lore raw

meta/recipes-multimedia/alsa/alsa-utils_1.1.9.bb PACKAGES += "${ALSA_UTILS_PKGS}" · line 74

Quoted 2 lines · On Fri, 24 May 2019 at 07:38, <[email protected]> wrote:
meta/recipes-multimedia/alsa/alsa-utils_1.1.9.bb +1 -1
-SUMMARY_alsa-utils-alsabat      = "Command-line sound tester for ALSA sound card driver"
+SUMMARY_${MLPREFIX}alsa-utils-alsabat      = "Command-line sound tester for ALSA sound card driver"

Why not replace alsa-utils-alsabat with ${PN}-alsabat?

Ross

author
#2 lore raw

Wouldn't that break the alsa-utils-scripts? Since ALSA_UTILS_PKGS is being depended by both alsa-utils and alsa-utils-scripts.

I did that in V1, but as Richard Purdie pointed out, it will break the alsa-utils-scripts build.

//Ming Liu

Burton, Ross <[email protected]> 於 2019年5月24日 週五 下午2:42寫道:

Quoted 10 lines · On Fri, 24 May 2019 at 07:38, <[email protected]> wrote:
Quoted 1 line

-SUMMARY_alsa-utils-alsabat = "Command-line sound tester for ALSA

sound card driver"

Quoted 1 line

+SUMMARY_${MLPREFIX}alsa-utils-alsabat = "Command-line sound tester

for ALSA sound card driver"

Why not replace alsa-utils-alsabat with ${PN}-alsabat?

Ross

#3 lore raw
Quoted 5 lines · Ming Liu

Wouldn't that break the alsa-utils-scripts? Since ALSA_UTILS_PKGS is being depended by both alsa-utils and alsa-utils-scripts.

I did that in V1, but as Richard Purdie pointed out, it will break the alsa-utils-scripts build.

I was about to say we should refactor these recipes and create a common inc file.

Looking at the justification in alsa-utils (avoid a bash dependency), that is a runtime issue, not a build time one. We should merge these recipes and ensure the packaging remains the same.

We can then avoid some of these problems, use PN and have a simpler recipe. These changes should be done in multiple commits, one per change as usual.

Is there any reason I'm missing not to do this?

Cheers,

Richard

#4 lore raw
Quoted 14 lines · Richard Purdie
Quoted 5 lines · Ming Liu

Wouldn't that break the alsa-utils-scripts? Since ALSA_UTILS_PKGS is being depended by both alsa-utils and alsa-utils-scripts.

I did that in V1, but as Richard Purdie pointed out, it will break the alsa-utils-scripts build.

I was about to say we should refactor these recipes and create a common inc file.

Looking at the justification in alsa-utils (avoid a bash dependency), that is a runtime issue, not a build time one. We should merge these recipes and ensure the packaging remains the same.

Quoted 5 lines

We can then avoid some of these problems, use PN and have a simpler recipe. These changes should be done in multiple commits, one per change as usual.

Is there any reason I'm missing not to do this?

I'm not sure if you already found the original commit[1] that introduced this split. The commit message is:

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.

I can't really judge if that justification makes sense. If the justification is valid, maybe there's a better solution for avoiding the build dependency on bash for those people who don't need the scripts?

[1] http://cgit.openembedded.org/openembedded-core/commit/?id=7317c8055cf3af8912a66badb3074f0a60f75ec2

Signature · 4 lines
Tanu

https://www.patreon.com/tanuk
https://liberapay.com/tanuk
#5 lore raw
Quoted 6 lines · Tanu Kaskinen

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.

Avoiding building bash seems like quite an overreaction. I'd say merge the recipes and split the packages up so that bash isn't a mandatory requirement, maybe even using PACKAGECONFIG if that is useful.

In related news I've been meaning to gut the alsa-utils recipe as that's the last recipe that actually depends on gtk2.

Ross

#6 lore raw
Quoted 2 lines · Ross

In related news I've been meaning to gut the alsa-utils recipe as that's the last recipe that actually depends on gtk2.

You mean alsa-tools, not alsa-utils, right? I won't object removing alsa-tools from OE Core.

Signature · 4 lines
Tanu

https://www.patreon.com/tanuk
https://liberapay.com/tanuk