From 3454bc99242a1a0069ccdb61d9598dc2fe6a9aa5 Mon Sep 17 00:00:00 2001 From: Gleb Mazovetskiy Date: Wed, 25 Aug 2021 16:16:59 +0100 Subject: [PATCH] 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. Signed-off-by: Gleb Mazovetskiy Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/alsa-utils/alsa-utils.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/alsa-utils/alsa-utils.mk b/package/alsa-utils/alsa-utils.mk index 2658c827a0..427280c1e6 100644 --- a/package/alsa-utils/alsa-utils.mk +++ b/package/alsa-utils/alsa-utils.mk @@ -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 -- 2.30.2