| 1 |
commit: 6a995cbf618cc337615794215a77a29abdab28d2 |
| 2 |
Author: SuNova <sunova <AT> tutanota <DOT> com> |
| 3 |
AuthorDate: Tue Aug 11 14:05:59 2020 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 19 10:15:50 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a995cbf |
| 7 |
|
| 8 |
media-sound/bluez-alsa: Copy config file to alsa datadir to preserve it |
| 9 |
|
| 10 |
Signed-off-by: sunova <sunova <AT> tutanota.com> |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/17079 |
| 12 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 13 |
|
| 14 |
.../{bluez-alsa-2.1.0.ebuild => bluez-alsa-2.1.0-r1.ebuild} | 4 ++++ |
| 15 |
media-sound/bluez-alsa/bluez-alsa-9999.ebuild | 4 ++++ |
| 16 |
media-sound/bluez-alsa/files/bluealsa-init.d | 2 +- |
| 17 |
3 files changed, 9 insertions(+), 1 deletion(-) |
| 18 |
|
| 19 |
diff --git a/media-sound/bluez-alsa/bluez-alsa-2.1.0.ebuild b/media-sound/bluez-alsa/bluez-alsa-2.1.0-r1.ebuild |
| 20 |
similarity index 92% |
| 21 |
rename from media-sound/bluez-alsa/bluez-alsa-2.1.0.ebuild |
| 22 |
rename to media-sound/bluez-alsa/bluez-alsa-2.1.0-r1.ebuild |
| 23 |
index c0b3a72b1ab..e81144df9d1 100644 |
| 24 |
--- a/media-sound/bluez-alsa/bluez-alsa-2.1.0.ebuild |
| 25 |
+++ b/media-sound/bluez-alsa/bluez-alsa-2.1.0-r1.ebuild |
| 26 |
@@ -71,6 +71,10 @@ multilib_src_install_all() { |
| 27 |
newinitd "${FILESDIR}"/bluealsa-init.d bluealsa |
| 28 |
newconfd "${FILESDIR}"/bluealsa-conf.d-2 bluealsa |
| 29 |
systemd_dounit "${FILESDIR}"/bluealsa.service |
| 30 |
+ |
| 31 |
+ # Add config file to alsa datadir as well to preserve changes in /etc |
| 32 |
+ insinto "/usr/share/alsa/alsa.conf.d/" |
| 33 |
+ doins "src/asound/20-bluealsa.conf" |
| 34 |
} |
| 35 |
|
| 36 |
pkg_postinst() { |
| 37 |
|
| 38 |
diff --git a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild |
| 39 |
index fc03fb3b79e..a399d0042c6 100644 |
| 40 |
--- a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild |
| 41 |
+++ b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild |
| 42 |
@@ -67,6 +67,10 @@ multilib_src_install_all() { |
| 43 |
newinitd "${FILESDIR}"/bluealsa-init.d bluealsa |
| 44 |
newconfd "${FILESDIR}"/bluealsa-conf.d-2 bluealsa |
| 45 |
systemd_dounit "${FILESDIR}"/bluealsa.service |
| 46 |
+ |
| 47 |
+ # Add config file to alsa datadir as well to preserve changes in /etc |
| 48 |
+ insinto "/usr/share/alsa/alsa.conf.d/" |
| 49 |
+ doins "src/asound/20-bluealsa.conf" |
| 50 |
} |
| 51 |
|
| 52 |
pkg_postinst() { |
| 53 |
|
| 54 |
diff --git a/media-sound/bluez-alsa/files/bluealsa-init.d b/media-sound/bluez-alsa/files/bluealsa-init.d |
| 55 |
index 9b6a3178b63..087b35386eb 100644 |
| 56 |
--- a/media-sound/bluez-alsa/files/bluealsa-init.d |
| 57 |
+++ b/media-sound/bluez-alsa/files/bluealsa-init.d |
| 58 |
@@ -1,5 +1,5 @@ |
| 59 |
#!/sbin/openrc-run |
| 60 |
-# Copyright 1999-2017 Gentoo Foundation |
| 61 |
+# Copyright 1999-2020 Gentoo Authors |
| 62 |
# Distributed under the terms of the GNU General Public License v2 |
| 63 |
|
| 64 |
pidfile="/var/run/bluealsa.pid" |
Archives