Skip to contentSkip to conversation

package/alsa-utils: Fix alsa-plugins compatibility

PATCH Applied Gleb Mazovetskiy 3 participants 3 messages Aug 25, 2021 – Sep 7, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/alsa-utils: Fix alsa-plugins compatibility

Previously, alsa-plugins would not work if alsa-utils was installed after it. This happened because:

1. alsa-plugins copies some files $(TARGET_DIR)/usr/share/alsa/alsa.conf.d
2. alsa-utils removes these files during installation ( rm -rf $(TARGET_DIR)/usr/share/alsa/;)

The rm -rf command was originally added as part of the fix for
https://bugs.buildroot.org/show_bug.cgi?id=1573 11 years ago.

The intention might have been to allow for unconfiguring some options and then rebuilding alsa-utils. However, this is a scenario that does not work anyway.

The simplest fix for the alsa-plugins compatibility issue appears to be to remove the rm -rf command.

---
 package/alsa-utils/alsa-utils.mk | 1 -
 1 file changed, 1 deletion(-)
package/alsa-utils/alsa-utils.mk +0 -1
index 2658c827a0..427280c1e6 100644
@@ -77,7 +77,6 @@ define ALSA_UTILS_INSTALL_TARGET_CMDS
 	fi
 	if [ -x "$(TARGET_DIR)/usr/sbin/alsactl" ]; then \
 		mkdir -p $(TARGET_DIR)/usr/share/; \
-		rm -rf $(TARGET_DIR)/usr/share/alsa/; \
 		cp -rdpf $(STAGING_DIR)/usr/share/alsa/ $(TARGET_DIR)/usr/share/alsa/; \
 	fi
 endef
Signature · 6 lines
2.30.2

_______________________________________________
buildroot mailing list
[email protected]
http://lists.busybox.net/mailman/listinfo/buildroot
#1 lore raw
Quoted 9 lines · Gleb Mazovetskiy

Previously, alsa-plugins would not work if alsa-utils was installed after it. This happened because:

1. alsa-plugins copies some files $(TARGET_DIR)/usr/share/alsa/alsa.conf.d
2. alsa-utils removes these files during installation ( rm -rf $(TARGET_DIR)/usr/share/alsa/;)

The rm -rf command was originally added as part of the fix for
https://bugs.buildroot.org/show_bug.cgi?id=1573 11 years ago.

Quoted 8 lines

The intention might have been to allow for unconfiguring some options and then rebuilding alsa-utils. However, this is a scenario that does not work anyway.

The simplest fix for the alsa-plugins compatibility issue appears to be to remove the rm -rf command.

Applied to master, thanks.

Excellent commit message!

Regards,
Arnout

Quoted 10 lines
---
 package/alsa-utils/alsa-utils.mk | 1 -
 1 file changed, 1 deletion(-)
package/alsa-utils/alsa-utils.mk +0 -0
index 2658c827a0..427280c1e6 100644

package/alsa-utils/alsa-utils.mk define ALSA_UTILS_INSTALL_TARGET_CMDS · line 82

Quoted 7 lines
package/alsa-utils/alsa-utils.mk +0 -1
@@ -77,7 +77,6 @@ define ALSA_UTILS_INSTALL_TARGET_CMDS
 	fi
 	if [ -x "$(TARGET_DIR)/usr/sbin/alsactl" ]; then \
 		mkdir -p $(TARGET_DIR)/usr/share/; \
-		rm -rf $(TARGET_DIR)/usr/share/alsa/; \
 		cp -rdpf $(STAGING_DIR)/usr/share/alsa/ $(TARGET_DIR)/usr/share/alsa/; \
 	fi
 endef

_______________________________________________
buildroot mailing list
[email protected]
http://lists.busybox.net/mailman/listinfo/buildroot

#2 lore raw
In reply to Gleb Mazovetskiy
Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gleb" == Gleb Mazovetskiy <[email protected]> writes:

Previously, alsa-plugins would not work if alsa-utils was installed after it. This happened because:

1. alsa-plugins copies some files $(TARGET_DIR)/usr/share/alsa/alsa.conf.d
2. alsa-utils removes these files during installation ( rm -rf $(TARGET_DIR)/usr/share/alsa/;)

The rm -rf command was originally added as part of the fix for
https://bugs.buildroot.org/show_bug.cgi?id=1573 11 years ago.

Quoted 8 lines

The intention might have been to allow for unconfiguring some options and then rebuilding alsa-utils. However, this is a scenario that does not work anyway.

The simplest fix for the alsa-plugins compatibility issue appears to be to remove the rm -rf command.

Committed to 2021.02.x and 2021.05.x, thanks.

Signature · 5 lines
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot