From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/drbd-utils/
Date: Wed, 17 Mar 2021 02:13:12 +0000 (UTC) [thread overview]
Message-ID: <1615947185.de1f26b3bd4f5cee5c8fe7ed5e04046dfd8471f5.sam@gentoo> (raw)
commit: de1f26b3bd4f5cee5c8fe7ed5e04046dfd8471f5
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 17 02:09:46 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Mar 17 02:13:05 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de1f26b3
sys-cluster/drbd-utils: fix systemd unit libdir
Closes: https://bugs.gentoo.org/698304
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../{drbd-utils-9.15.1.ebuild => drbd-utils-9.15.1-r1.ebuild} | 3 +++
1 file changed, 3 insertions(+)
diff --git a/sys-cluster/drbd-utils/drbd-utils-9.15.1.ebuild b/sys-cluster/drbd-utils/drbd-utils-9.15.1-r1.ebuild
similarity index 97%
rename from sys-cluster/drbd-utils/drbd-utils-9.15.1.ebuild
rename to sys-cluster/drbd-utils/drbd-utils-9.15.1-r1.ebuild
index adb7a23c4af..f8a1b38d22f 100644
--- a/sys-cluster/drbd-utils/drbd-utils-9.15.1.ebuild
+++ b/sys-cluster/drbd-utils/drbd-utils-9.15.1-r1.ebuild
@@ -34,12 +34,15 @@ src_prepare() {
-i user/*/Makefile.in || die
# respect multilib
+ # bug #698304
sed -i -e "s:/lib/:/$(get_libdir)/:g" \
Makefile.in scripts/{Makefile.in,global_common.conf,drbd.conf.example} || die
sed -e "s:@prefix@/lib:@prefix@/$(get_libdir):" \
-e "s:(DESTDIR)/lib:(DESTDIR)/$(get_libdir):" \
-i user/*/Makefile.in || die
+ sed -i -e "s/lib/$(get_libdir)/" scripts/drbd.service || die
+
# correct install paths (really correct this time)
sed -i -e "s:\$(sysconfdir)/bash_completion.d:$(get_bashcompdir):" \
scripts/Makefile.in || die
next reply other threads:[~2021-03-17 2:13 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-17 2:13 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-01-08 12:03 [gentoo-commits] repo/gentoo:master commit in: sys-cluster/drbd-utils/ Sam James
2024-01-01 1:51 Sam James
2024-01-01 0:12 Sam James
2024-01-01 0:12 Sam James
2023-09-17 13:05 Arthur Zamarin
2023-06-15 22:03 Sam James
2023-06-13 18:05 Sam James
2023-06-13 18:03 Sam James
2023-06-13 17:29 Sam James
2021-09-06 14:13 Alexys Jacob
2021-03-08 10:25 Sam James
2021-03-06 15:37 Thomas Deutschmann
2021-02-18 18:57 David Seifert
2020-11-26 20:25 Aaron Bauman
2018-02-06 15:10 Thomas Deutschmann
2016-03-23 23:25 Zac Medico
2015-09-21 8:31 Alexys Jacob
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1615947185.de1f26b3bd4f5cee5c8fe7ed5e04046dfd8471f5.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox