* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/drbd-utils/
@ 2015-09-21 8:31 Alexys Jacob
0 siblings, 0 replies; 18+ messages in thread
From: Alexys Jacob @ 2015-09-21 8:31 UTC (permalink / raw
To: gentoo-commits
commit: 8be2371f7a2b30084023420faea135dfd6799c24
Author: Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 21 08:31:08 2015 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Mon Sep 21 08:31:08 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8be2371f
sys-cluster/drbd-utils: fix postinst typo thx to Zentoo on #513928
Package-Manager: portage-2.2.20.1
sys-cluster/drbd-utils/drbd-utils-8.9.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-cluster/drbd-utils/drbd-utils-8.9.3.ebuild b/sys-cluster/drbd-utils/drbd-utils-8.9.3.ebuild
index 8a47847..3f5a6e8 100644
--- a/sys-cluster/drbd-utils/drbd-utils-8.9.3.ebuild
+++ b/sys-cluster/drbd-utils/drbd-utils-8.9.3.ebuild
@@ -83,7 +83,7 @@ src_install() {
pkg_postinst() {
einfo
einfo "Please copy and gunzip the configuration file:"
- einfo "from /usr/share/doc/${PF}/${PN}.conf.example.bz2 to /etc/${PN/-utils/}.conf"
+ einfo "from /usr/share/doc/${PF}/${PN/-utils/}.conf.example.bz2 to /etc/${PN/-utils/}.conf"
einfo "and edit it to your needs. Helpful commands:"
einfo "man 5 drbd.conf"
einfo "man 8 drbdsetup"
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/drbd-utils/
@ 2016-03-23 23:25 Zac Medico
0 siblings, 0 replies; 18+ messages in thread
From: Zac Medico @ 2016-03-23 23:25 UTC (permalink / raw
To: gentoo-commits
commit: 3d6105245ceb3f44910c38cc5e4e5fb1ff5d2385
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 23 23:25:24 2016 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Mar 23 23:25:42 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d610524
sys-cluster/drbd-utils: version bump to 8.9.6
Package-Manager: portage-2.2.28
sys-cluster/drbd-utils/Manifest | 1 +
sys-cluster/drbd-utils/drbd-utils-8.9.6.ebuild | 95 ++++++++++++++++++++++++++
2 files changed, 96 insertions(+)
diff --git a/sys-cluster/drbd-utils/Manifest b/sys-cluster/drbd-utils/Manifest
index a800c25..7755539 100644
--- a/sys-cluster/drbd-utils/Manifest
+++ b/sys-cluster/drbd-utils/Manifest
@@ -1 +1,2 @@
DIST drbd-utils-8.9.3.tar.gz 768700 SHA256 011050578c153bf4fef86e03749304ff9f333b7af3512c5c395e0e870a0445bd SHA512 1b1cb3d1eb7f14f693e8a73b9864257e439e443ce685084c3864da4340113f18355d1e447177956ee0d8edcee35e771442b9f85b89ec5a6eb0ad717738461ca2 WHIRLPOOL f21aec707f06d361ae336d0cf1e55fa546e5f250f869c80829f806eaef7d59c12ff30d1ded39e3624b162a9bff1ffe96cb3cb1acd85ca58ca29a4998740fba85
+DIST drbd-utils-8.9.6.tar.gz 788183 SHA256 297b77c9b3f88de2e7dae459234f2753ea4fc2805282b2d276e35cf51e292913 SHA512 cbdeeb7b298bc21de0d2188566362d7a634a72df243403f4bc91d5836c757f15ee86314b1385860aecda5657be5dc6309f2481b0403012bde841dd0618188938 WHIRLPOOL 4c379ecf15e71f5a504873a5f1c889a561df35eb99488f014085611e1bf804bf7877dba6f21b9e8ebacf26391b9ce0707c1fe07ba55f9b0cd887e34e0b6e2975
diff --git a/sys-cluster/drbd-utils/drbd-utils-8.9.6.ebuild b/sys-cluster/drbd-utils/drbd-utils-8.9.6.ebuild
new file mode 100644
index 0000000..c81e9c1
--- /dev/null
+++ b/sys-cluster/drbd-utils/drbd-utils-8.9.6.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit bash-completion-r1 eutils multilib udev versionator
+
+LICENSE="GPL-2"
+
+DESCRIPTION="mirror/replicate block-devices across a network-connection"
+SRC_URI="http://oss.linbit.com/drbd/${P/_/}.tar.gz"
+HOMEPAGE="http://www.drbd.org"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="heartbeat pacemaker +udev xen"
+SLOT="0"
+
+DEPEND="heartbeat? ( sys-cluster/heartbeat )
+ pacemaker? ( sys-cluster/pacemaker )
+ udev? ( virtual/udev )
+ !!sys-cluster/drbd"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P/_/}"
+
+src_prepare() {
+ # respect LDFLAGS, #453442
+ sed -e "s/\$(CC) -o/\$(CC) \$(LDFLAGS) -o/" \
+ -e "/\$(DESTDIR)\$(localstatedir)\/lock/d" \
+ -i user/*/Makefile.in || die
+
+ # respect multilib
+ 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
+
+ # correct install paths (really correct this time)
+ sed -i -e "s:\$(sysconfdir)/bash_completion.d:$(get_bashcompdir):" \
+ scripts/Makefile.in || die
+
+ # don't participate in user survey bug 360483
+ sed -i -e '/usage-count/ s/yes/no/' scripts/global_common.conf || die
+ sed -i -e "s:\$(sysconfdir)/udev:$(get_udevdir):" scripts/Makefile.in || die
+
+ epatch "${FILESDIR}"/run-lock.patch
+
+ autoreconf
+}
+
+src_configure() {
+ econf \
+ --localstatedir=/var \
+ --without-rgmanager \
+ $(use_with udev) \
+ $(use_with xen) \
+ $(use_with pacemaker) \
+ $(use_with heartbeat) \
+ --with-bashcompletion \
+ --with-distro=gentoo
+}
+
+src_compile() {
+ # only compile the tools
+ emake OPTFLAGS="${CFLAGS}" tools
+}
+
+src_install() {
+ # only install the tools
+ emake DESTDIR="${D}" install-tools install-doc
+ dodoc README ChangeLog
+
+ # install our own init script
+ newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN/-utils/}
+
+ dodoc scripts/drbd.conf.example
+
+ dosym /usr/sbin/drbdadm /sbin/drbdadm
+}
+
+pkg_postinst() {
+ einfo
+ einfo "Please copy and gunzip the configuration file:"
+ einfo "from /usr/share/doc/${PF}/${PN/-utils/}.conf.example.bz2 to /etc/${PN/-utils/}.conf"
+ einfo "and edit it to your needs. Helpful commands:"
+ einfo "man 5 drbd.conf"
+ einfo "man 8 drbdsetup"
+ einfo "man 8 drbdadm"
+ einfo "man 8 drbddisk"
+ einfo "man 8 drbdmeta"
+ einfo
+ elog "Remember to enable drbd support in kernel."
+}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/drbd-utils/
@ 2018-02-06 15:10 Thomas Deutschmann
0 siblings, 0 replies; 18+ messages in thread
From: Thomas Deutschmann @ 2018-02-06 15:10 UTC (permalink / raw
To: gentoo-commits
commit: fae36328c9147b101967b8dc6c95312be5f5417b
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 6 13:10:36 2018 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Feb 6 15:09:17 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fae36328
sys-cluster/drbd-utils: x86 stable (bug #642526)
Package-Manager: Portage-2.3.24, Repoman-2.3.6
sys-cluster/drbd-utils/drbd-utils-8.9.6-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-cluster/drbd-utils/drbd-utils-8.9.6-r1.ebuild b/sys-cluster/drbd-utils/drbd-utils-8.9.6-r1.ebuild
index db01746928d..2f4ad204b77 100644
--- a/sys-cluster/drbd-utils/drbd-utils-8.9.6-r1.ebuild
+++ b/sys-cluster/drbd-utils/drbd-utils-8.9.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,7 +11,7 @@ DESCRIPTION="mirror/replicate block-devices across a network-connection"
SRC_URI="http://oss.linbit.com/drbd/${P/_/}.tar.gz"
HOMEPAGE="http://www.drbd.org"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="heartbeat pacemaker +udev xen"
SLOT="0"
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/drbd-utils/
@ 2020-11-26 20:25 Aaron Bauman
0 siblings, 0 replies; 18+ messages in thread
From: Aaron Bauman @ 2020-11-26 20:25 UTC (permalink / raw
To: gentoo-commits
commit: 018cc536c301c3eabb6936d77d829c9988ad0dbe
Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 26 18:18:21 2020 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 20:24:58 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=018cc536
sys-cluster/drbd-utils: drop old EAPI
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
sys-cluster/drbd-utils/Manifest | 1 -
sys-cluster/drbd-utils/drbd-utils-8.9.3.ebuild | 94 --------------------------
sys-cluster/drbd-utils/drbd-utils-8.9.6.ebuild | 94 --------------------------
3 files changed, 189 deletions(-)
diff --git a/sys-cluster/drbd-utils/Manifest b/sys-cluster/drbd-utils/Manifest
index 6a72dd46c97..051e205dae9 100644
--- a/sys-cluster/drbd-utils/Manifest
+++ b/sys-cluster/drbd-utils/Manifest
@@ -1,2 +1 @@
-DIST drbd-utils-8.9.3.tar.gz 768700 BLAKE2B 4d6989e69ecb68b3f4d68b0e807aa911e60511fc91c0ea4e7500d044262348ad00a5517505c9bb912ba392677cb4b6a64405a9821cf59f1200f8eb7b662d89ec SHA512 1b1cb3d1eb7f14f693e8a73b9864257e439e443ce685084c3864da4340113f18355d1e447177956ee0d8edcee35e771442b9f85b89ec5a6eb0ad717738461ca2
DIST drbd-utils-8.9.6.tar.gz 788183 BLAKE2B 314c3c647f7fc52f82e94853949185daf4092e8c182c5799773e5d6b3e77995d2068087a10cf33133414c5fba91498a7cd1e5d487887aea03df3e18c0426dcb4 SHA512 cbdeeb7b298bc21de0d2188566362d7a634a72df243403f4bc91d5836c757f15ee86314b1385860aecda5657be5dc6309f2481b0403012bde841dd0618188938
diff --git a/sys-cluster/drbd-utils/drbd-utils-8.9.3.ebuild b/sys-cluster/drbd-utils/drbd-utils-8.9.3.ebuild
deleted file mode 100644
index 7bb3129097f..00000000000
--- a/sys-cluster/drbd-utils/drbd-utils-8.9.3.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bash-completion-r1 eutils multilib udev versionator
-
-LICENSE="GPL-2"
-
-DESCRIPTION="mirror/replicate block-devices across a network-connection"
-SRC_URI="http://oss.linbit.com/drbd/${P/_/}.tar.gz"
-HOMEPAGE="http://www.drbd.org"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="heartbeat pacemaker +udev xen"
-SLOT="0"
-
-DEPEND="heartbeat? ( sys-cluster/heartbeat )
- pacemaker? ( sys-cluster/pacemaker )
- udev? ( virtual/udev )
- !!sys-cluster/drbd"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P/_/}"
-
-src_prepare() {
- # respect LDFLAGS, #453442
- sed -e "s/\$(CC) -o/\$(CC) \$(LDFLAGS) -o/" \
- -e "/\$(DESTDIR)\$(localstatedir)\/lock/d" \
- -i user/*/Makefile.in || die
-
- # respect multilib
- 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
-
- # correct install paths (really correct this time)
- sed -i -e "s:\$(sysconfdir)/bash_completion.d:$(get_bashcompdir):" \
- scripts/Makefile.in || die
-
- # don't participate in user survey bug 360483
- sed -i -e '/usage-count/ s/yes/no/' scripts/global_common.conf || die
- sed -i -e "s:\$(sysconfdir)/udev:$(get_udevdir):" scripts/Makefile.in || die
-
- epatch "${FILESDIR}"/run-lock.patch
-
- autoreconf
-}
-
-src_configure() {
- econf \
- --localstatedir=/var \
- --without-rgmanager \
- $(use_with udev) \
- $(use_with xen) \
- $(use_with pacemaker) \
- $(use_with heartbeat) \
- --with-bashcompletion \
- --with-distro=gentoo
-}
-
-src_compile() {
- # only compile the tools
- emake OPTFLAGS="${CFLAGS}" tools
-}
-
-src_install() {
- # only install the tools
- emake DESTDIR="${D}" install-tools
- dodoc README ChangeLog
-
- # install our own init script
- newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN/-utils/}
-
- dodoc scripts/drbd.conf.example
-
- dosym /usr/sbin/drbdadm /sbin/drbdadm
-}
-
-pkg_postinst() {
- einfo
- einfo "Please copy and gunzip the configuration file:"
- einfo "from /usr/share/doc/${PF}/${PN/-utils/}.conf.example.bz2 to /etc/${PN/-utils/}.conf"
- einfo "and edit it to your needs. Helpful commands:"
- einfo "man 5 drbd.conf"
- einfo "man 8 drbdsetup"
- einfo "man 8 drbdadm"
- einfo "man 8 drbddisk"
- einfo "man 8 drbdmeta"
- einfo
- elog "Remember to enable drbd support in kernel."
-}
diff --git a/sys-cluster/drbd-utils/drbd-utils-8.9.6.ebuild b/sys-cluster/drbd-utils/drbd-utils-8.9.6.ebuild
deleted file mode 100644
index d66c244db4a..00000000000
--- a/sys-cluster/drbd-utils/drbd-utils-8.9.6.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bash-completion-r1 eutils multilib udev versionator
-
-LICENSE="GPL-2"
-
-DESCRIPTION="mirror/replicate block-devices across a network-connection"
-SRC_URI="http://oss.linbit.com/drbd/${P/_/}.tar.gz"
-HOMEPAGE="http://www.drbd.org"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="heartbeat pacemaker +udev xen"
-SLOT="0"
-
-DEPEND="heartbeat? ( sys-cluster/heartbeat )
- pacemaker? ( sys-cluster/pacemaker )
- udev? ( virtual/udev )
- !!sys-cluster/drbd"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P/_/}"
-
-src_prepare() {
- # respect LDFLAGS, #453442
- sed -e "s/\$(CC) -o/\$(CC) \$(LDFLAGS) -o/" \
- -e "/\$(DESTDIR)\$(localstatedir)\/lock/d" \
- -i user/*/Makefile.in || die
-
- # respect multilib
- 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
-
- # correct install paths (really correct this time)
- sed -i -e "s:\$(sysconfdir)/bash_completion.d:$(get_bashcompdir):" \
- scripts/Makefile.in || die
-
- # don't participate in user survey bug 360483
- sed -i -e '/usage-count/ s/yes/no/' scripts/global_common.conf || die
- sed -i -e "s:\$(sysconfdir)/udev:$(get_udevdir):" scripts/Makefile.in || die
-
- epatch "${FILESDIR}"/run-lock.patch
-
- autoreconf
-}
-
-src_configure() {
- econf \
- --localstatedir=/var \
- --without-rgmanager \
- $(use_with udev) \
- $(use_with xen) \
- $(use_with pacemaker) \
- $(use_with heartbeat) \
- --with-bashcompletion \
- --with-distro=gentoo
-}
-
-src_compile() {
- # only compile the tools
- emake OPTFLAGS="${CFLAGS}" tools
-}
-
-src_install() {
- # only install the tools
- emake DESTDIR="${D}" install-tools install-doc
- dodoc README ChangeLog
-
- # install our own init script
- newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN/-utils/}
-
- dodoc scripts/drbd.conf.example
-
- dosym /usr/sbin/drbdadm /sbin/drbdadm
-}
-
-pkg_postinst() {
- einfo
- einfo "Please copy and gunzip the configuration file:"
- einfo "from /usr/share/doc/${PF}/${PN/-utils/}.conf.example.bz2 to /etc/${PN/-utils/}.conf"
- einfo "and edit it to your needs. Helpful commands:"
- einfo "man 5 drbd.conf"
- einfo "man 8 drbdsetup"
- einfo "man 8 drbdadm"
- einfo "man 8 drbddisk"
- einfo "man 8 drbdmeta"
- einfo
- elog "Remember to enable drbd support in kernel."
-}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/drbd-utils/
@ 2021-02-18 18:57 David Seifert
0 siblings, 0 replies; 18+ messages in thread
From: David Seifert @ 2021-02-18 18:57 UTC (permalink / raw
To: gentoo-commits
commit: cf2ae7e06fa61a59c9d7a4856f4656f53ef2684f
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Thu Feb 18 18:56:31 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Feb 18 18:56:31 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf2ae7e0
sys-cluster/drbd-utils: Remove broken symlink
Closes: https://bugs.gentoo.org/771123
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Closes: https://github.com/gentoo/gentoo/pull/19525
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sys-cluster/drbd-utils/drbd-utils-9.15.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-cluster/drbd-utils/drbd-utils-9.15.1.ebuild b/sys-cluster/drbd-utils/drbd-utils-9.15.1.ebuild
index 4b30e217430..c32a2837c94 100644
--- a/sys-cluster/drbd-utils/drbd-utils-9.15.1.ebuild
+++ b/sys-cluster/drbd-utils/drbd-utils-9.15.1.ebuild
@@ -84,7 +84,7 @@ src_install() {
# https://bugs.gentoo.org/698304
dodir lib/drbd
local i
- for i in drbd drbdadm-83 drbdadm-84 drbdsetup-83 drbdsetup-84; do
+ for i in drbdadm-83 drbdadm-84 drbdsetup-83 drbdsetup-84; do
dosym ../../lib64/drbd/"${i}" lib/drbd/"${i}"
done
}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/drbd-utils/
@ 2021-03-06 15:37 Thomas Deutschmann
0 siblings, 0 replies; 18+ messages in thread
From: Thomas Deutschmann @ 2021-03-06 15:37 UTC (permalink / raw
To: gentoo-commits
commit: 79b41e53ef90670dcb5e723237c3297b2c528377
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 6 15:32:15 2021 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Mar 6 15:36:09 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79b41e53
sys-cluster/drbd-utils: x86 stable (bug #771090)
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
sys-cluster/drbd-utils/drbd-utils-9.15.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-cluster/drbd-utils/drbd-utils-9.15.1.ebuild b/sys-cluster/drbd-utils/drbd-utils-9.15.1.ebuild
index c32a2837c94..36b77c554c7 100644
--- a/sys-cluster/drbd-utils/drbd-utils-9.15.1.ebuild
+++ b/sys-cluster/drbd-utils/drbd-utils-9.15.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.linbit.com/drbd"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
IUSE="pacemaker +udev xen"
DEPEND="
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/drbd-utils/
@ 2021-03-08 10:25 Sam James
0 siblings, 0 replies; 18+ messages in thread
From: Sam James @ 2021-03-08 10:25 UTC (permalink / raw
To: gentoo-commits
commit: ae2da20b08d0e18d896c0b07f88196a67c7816fa
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 8 10:24:48 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 8 10:24:48 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae2da20b
sys-cluster/drbd-utils: Stabilize 9.15.1 amd64, #771090
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-cluster/drbd-utils/drbd-utils-9.15.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-cluster/drbd-utils/drbd-utils-9.15.1.ebuild b/sys-cluster/drbd-utils/drbd-utils-9.15.1.ebuild
index 36b77c554c7..adb7a23c4af 100644
--- a/sys-cluster/drbd-utils/drbd-utils-9.15.1.ebuild
+++ b/sys-cluster/drbd-utils/drbd-utils-9.15.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.linbit.com/drbd"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
IUSE="pacemaker +udev xen"
DEPEND="
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/drbd-utils/
@ 2021-03-17 2:13 Sam James
0 siblings, 0 replies; 18+ messages in thread
From: Sam James @ 2021-03-17 2:13 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/drbd-utils/
@ 2021-09-06 14:13 Alexys Jacob
0 siblings, 0 replies; 18+ messages in thread
From: Alexys Jacob @ 2021-09-06 14:13 UTC (permalink / raw
To: gentoo-commits
commit: e91799a1c749140ca27b1c198c6fc9a2e8bf2209
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Tue Aug 17 14:57:37 2021 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Mon Sep 6 14:12:53 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e91799a1
sys-cluster/drbd-utils: Add missing tmpfiles_process call
* Revbump due to inheriting tmpfiles eclass which adds
virtual/tmpfiles as a RDEPEND
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Closes: https://github.com/gentoo/gentoo/pull/22014
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>
.../{drbd-utils-9.15.1-r1.ebuild => drbd-utils-9.15.1-r2.ebuild} | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/sys-cluster/drbd-utils/drbd-utils-9.15.1-r1.ebuild b/sys-cluster/drbd-utils/drbd-utils-9.15.1-r2.ebuild
similarity index 97%
rename from sys-cluster/drbd-utils/drbd-utils-9.15.1-r1.ebuild
rename to sys-cluster/drbd-utils/drbd-utils-9.15.1-r2.ebuild
index f8a1b38d22f..d080591f810 100644
--- a/sys-cluster/drbd-utils/drbd-utils-9.15.1-r1.ebuild
+++ b/sys-cluster/drbd-utils/drbd-utils-9.15.1-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit autotools bash-completion-r1 udev
+inherit autotools bash-completion-r1 tmpfiles udev
DESCRIPTION="mirror/replicate block-devices across a network-connection"
SRC_URI="https://www.linbit.com/downloads/drbd/utils/${P}.tar.gz"
@@ -93,6 +93,8 @@ src_install() {
}
pkg_postinst() {
+ tmpfiles_process drbd.conf
+
einfo
einfo "Please copy and gunzip the configuration file:"
einfo "from /usr/share/doc/${PF}/${PN/-utils/}.conf.example.bz2 to /etc/${PN/-utils/}.conf"
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/drbd-utils/
@ 2023-06-13 17:29 Sam James
0 siblings, 0 replies; 18+ messages in thread
From: Sam James @ 2023-06-13 17:29 UTC (permalink / raw
To: gentoo-commits
commit: c8cf6fd4972d4156b2de22b5b109cb22c375a56c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 13 17:28:25 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 13 17:28:25 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8cf6fd4
sys-cluster/drbd-utils: add github upstream metadata
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-cluster/drbd-utils/metadata.xml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/sys-cluster/drbd-utils/metadata.xml b/sys-cluster/drbd-utils/metadata.xml
index 7379df5988dc..f2f60d7670e3 100644
--- a/sys-cluster/drbd-utils/metadata.xml
+++ b/sys-cluster/drbd-utils/metadata.xml
@@ -13,4 +13,7 @@
The user space tools to control, configure the DRBD driver, as well as integration programs and scripts
that glues the DRBD system to cluster management software and other system components.
</longdescription>
+ <upstream>
+ <remote-id type="github">LINBIT/drbd-utils</remote-id>
+ </upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/drbd-utils/
@ 2023-06-13 18:03 Sam James
0 siblings, 0 replies; 18+ messages in thread
From: Sam James @ 2023-06-13 18:03 UTC (permalink / raw
To: gentoo-commits
commit: b21ad5efdfdcaf3c88f52d40e208a3981158aca3
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 13 18:03:24 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 13 18:03:24 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b21ad5ef
sys-cluster/drbd-utils: Stabilize 9.19.1 amd64, #908458
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-cluster/drbd-utils/drbd-utils-9.19.1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-cluster/drbd-utils/drbd-utils-9.19.1.ebuild b/sys-cluster/drbd-utils/drbd-utils-9.19.1.ebuild
index c54edf54fc3b..b13e82eacea1 100644
--- a/sys-cluster/drbd-utils/drbd-utils-9.19.1.ebuild
+++ b/sys-cluster/drbd-utils/drbd-utils-9.19.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.linbit.com/drbd"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="pacemaker +udev xen"
DEPEND="
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/drbd-utils/
@ 2023-06-13 18:05 Sam James
0 siblings, 0 replies; 18+ messages in thread
From: Sam James @ 2023-06-13 18:05 UTC (permalink / raw
To: gentoo-commits
commit: 53b2e52a2a61fd21550e0d2f2b7dfde4c8aa618e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 13 18:05:16 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 13 18:05:16 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53b2e52a
sys-cluster/drbd-utils: Stabilize 9.19.1 x86, #908458
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-cluster/drbd-utils/drbd-utils-9.19.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-cluster/drbd-utils/drbd-utils-9.19.1.ebuild b/sys-cluster/drbd-utils/drbd-utils-9.19.1.ebuild
index b13e82eacea1..e68a3085c8a4 100644
--- a/sys-cluster/drbd-utils/drbd-utils-9.19.1.ebuild
+++ b/sys-cluster/drbd-utils/drbd-utils-9.19.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.linbit.com/drbd"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="pacemaker +udev xen"
DEPEND="
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/drbd-utils/
@ 2023-06-15 22:03 Sam James
0 siblings, 0 replies; 18+ messages in thread
From: Sam James @ 2023-06-15 22:03 UTC (permalink / raw
To: gentoo-commits
commit: 0b839c19faa464dd707a569175485ae0e1ff8326
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 15 21:55:07 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 15 21:55:07 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b839c19
sys-cluster/drbd-utils: add 9.24.0
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-cluster/drbd-utils/Manifest | 1 +
sys-cluster/drbd-utils/drbd-utils-9.24.0.ebuild | 129 ++++++++++++++++++++++++
2 files changed, 130 insertions(+)
diff --git a/sys-cluster/drbd-utils/Manifest b/sys-cluster/drbd-utils/Manifest
index 86c5b2f714f3..5ccb9584d266 100644
--- a/sys-cluster/drbd-utils/Manifest
+++ b/sys-cluster/drbd-utils/Manifest
@@ -1,3 +1,4 @@
DIST drbd-utils-9.15.1.tar.gz 1229196 BLAKE2B c73cb624e4c35f2c5c001b4545c2ad806d3f13471aa25b0941d923020fe01a73405d1ed7c2ab2efe3afee0e59b8e9d401072edb788c57dc338fe3ddb4eebebf3 SHA512 bf9c46335500c0dd7afdc160221acaf8fd053afc453cb26cd76ef085c41580be5a62021ef1f1a57eac9df70d1158a008f489d1a8bb5c3329c5a187f79e4942de
DIST drbd-utils-9.19.1.tar.gz 1265184 BLAKE2B b26fd9abd6408df4ccaa46c4713ece1743386bb4727ad8206498c30189d6c119ced57ec2d528c0575c5192cf366998b5f7db99aaecf1a2ba6af028b87c4ae082 SHA512 65d8f5802c541781895c59a5f631b222746b21615049e53f77d6c36a7255c51fe5d062984174ab8578d64af104fe9d66df5ae185ba50a8c38813c12a69fceb22
DIST drbd-utils-9.23.1.tar.gz 1279916 BLAKE2B f631473d7ff2d569e2e5dc61940085f4d575baaa1e02eaba50f37b15e9b381afb9089d4e50fbd511dc7c73350a9e5552b16a1e80742151801e5068c12830a469 SHA512 8befaa20f4217fb83b127bad332a96be61ffd0cefca78b298dbede4c7f33424e8f27aeb251bb022bb4e1ade11307448cdf39d5750924fcf2711141a29e7a81f0
+DIST drbd-utils-9.24.0.tar.gz 1296591 BLAKE2B ece4773bc2e63739ae656987166423303ad32a50e27983d4e8b173d997221e5c45389aa6306b3219d5a648d2d3401720b73e9a67880225c46b9e2f28d5605b62 SHA512 20f85f3dcdb0a1a1dcf5029e4737799081bcb0c69a60e8fe077016899ef37efb5ee585a92cf30a0475970a12c1da90aaebc0fd9e33452690838a56bc75b49ec4
diff --git a/sys-cluster/drbd-utils/drbd-utils-9.24.0.ebuild b/sys-cluster/drbd-utils/drbd-utils-9.24.0.ebuild
new file mode 100644
index 000000000000..1ca0cd8e56f3
--- /dev/null
+++ b/sys-cluster/drbd-utils/drbd-utils-9.24.0.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools bash-completion-r1 linux-info tmpfiles udev
+
+DESCRIPTION="mirror/replicate block-devices across a network-connection"
+HOMEPAGE="https://www.linbit.com/drbd"
+SRC_URI="https://pkg.linbit.com/downloads/drbd/utils/${P}.tar.gz"
+S="${WORKDIR}/${P/_/}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pacemaker split-usr +udev xen"
+
+DEPEND="
+ pacemaker? ( sys-cluster/pacemaker )
+ udev? ( virtual/udev )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="sys-devel/flex"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-9.15.1-run-lock.patch
+ "${FILESDIR}"/${PN}-9.23.1-respect-flags.patch
+)
+
+pkg_setup() {
+ # verify that CONFIG_BLK_DEV_DRBD is enabled in the kernel or
+ # warn otherwise
+ linux-info_pkg_setup
+ elog "Checking for suitable kernel configuration options..."
+ if linux_config_exists; then
+ if ! linux_chkconfig_present BLK_DEV_DRBD; then
+ ewarn "CONFIG_BLK_DEV_DRBD: is not set when it should be."
+ elog "Please check to make sure these options are set correctly."
+ fi
+ else
+ ewarn "Could not check if CONFIG_BLK_DEV_DRBD is enabled in your kernel."
+ elog "Please check to make sure these options are set correctly."
+ fi
+}
+
+src_prepare() {
+ # Respect LDFLAGS, bug #453442
+ sed -e "s/\$(CC) -o/\$(CC) \$(LDFLAGS) -o/" \
+ -e "/\$(DESTDIR)\$(localstatedir)\/lock/d" \
+ -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
+
+ # Don't participate in user survey, bug #360483
+ sed -i -e '/usage-count/ s/yes/no/' scripts/global_common.conf || die
+ sed -i -e "s:\$(sysconfdir)/udev:$(get_udevdir):" scripts/Makefile.in || die
+
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ --localstatedir="${EPREFIX}"/var
+ --with-bashcompletion
+ --with-distro=gentoo
+ --with-prebuiltman
+ --without-rgmanager
+ $(use_with pacemaker)
+ $(use_with udev)
+ $(use_with xen)
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # Only compile the tools
+ emake CXXFLAGS="${CXXFLAGS}" OPTFLAGS="${CFLAGS}" tools doc
+}
+
+src_install() {
+ # Only install the tools
+ emake DESTDIR="${D}" install-tools install-doc
+
+ # Install our own init script
+ newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN/-utils/}
+
+ dodoc scripts/drbd.conf.example
+
+ keepdir /var/lib/drbd
+ rm -r "${ED}"/var/run || die
+
+ newtmpfiles scripts/drbd.tmpfiles.conf drbd.conf
+
+ # bug #698304
+ dodir /lib/drbd
+ local i
+ for i in drbdadm-83 drbdadm-84 drbdsetup-83 drbdsetup-84; do
+ dosym -r /$(get_libdir)/drbd/"${i}" /lib/drbd/"${i}"
+ done
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ tmpfiles_process drbd.conf
+
+ einfo
+ einfo "Please copy and gunzip the configuration file:"
+ einfo "from ${EROOT}/usr/share/doc/${PF}/${PN/-utils/}.conf.example.bz2 to ${EROOT}/etc/${PN/-utils/}.conf"
+ einfo "and edit it to your needs. Helpful commands:"
+ einfo "man 5 drbd.conf"
+ einfo "man 8 drbdsetup"
+ einfo "man 8 drbdadm"
+ einfo "man 8 drbddisk"
+ einfo "man 8 drbdmeta"
+ einfo
+}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/drbd-utils/
@ 2023-09-17 13:05 Arthur Zamarin
0 siblings, 0 replies; 18+ messages in thread
From: Arthur Zamarin @ 2023-09-17 13:05 UTC (permalink / raw
To: gentoo-commits
commit: 9d969817d3dfd6481861c38cf77518bbd8150428
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 17 13:05:54 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 17 13:05:54 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d969817
sys-cluster/drbd-utils: Stabilize 9.25.0 x86, #913824
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-cluster/drbd-utils/drbd-utils-9.25.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-cluster/drbd-utils/drbd-utils-9.25.0.ebuild b/sys-cluster/drbd-utils/drbd-utils-9.25.0.ebuild
index 4e4ece331e3f..5194d27e497c 100644
--- a/sys-cluster/drbd-utils/drbd-utils-9.25.0.ebuild
+++ b/sys-cluster/drbd-utils/drbd-utils-9.25.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P/_/}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="pacemaker split-usr +udev xen"
DEPEND="
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/drbd-utils/
@ 2024-01-01 0:12 Sam James
0 siblings, 0 replies; 18+ messages in thread
From: Sam James @ 2024-01-01 0:12 UTC (permalink / raw
To: gentoo-commits
commit: eef9b30fdc46e9a0b86fe32d8293564dbfc10f01
Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Sun Dec 31 20:59:38 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 1 00:12:13 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eef9b30f
sys-cluster/drbd-utils: avoid the necessity of USE=split-usr
It was added in commit 02512e1d120272ad4e035959fa4014a8df7a28fc without
any explanation. Comparing builds, it does matter, though -- because on
split-usr systems, it uses and needs the udevdir to be /lib/udev.
Upstream detects this via pkg-config automagic with no way to override
it. But the ebuild never actually depended on virtual/pkgconfig
anyway... the good news is it only uses it for two things.
The other thing it uses it for is for detecting systemd to set the
default systemd unit directory when the configure option is not passed.
We want to install it unconditionally though, which means we cannot rely
on pkg-config for this either. That means we are using it for nothing.
Instead, explicitly set PKG_CONFIG=/bin/false to ensure it gets detected
as missing/broken, which means we fall back to the default udev
directory value, which is safe for split-usr systems.
While we are at it:
- ensure the systemdunitdir setting actually does something by declaring
the init type as systemd. The openrc files come from gentoo anyway and
are overwritten after emake install.
- avoid reinstalling the tmpfiles, which was originally added in commit
85d6acdce7c5e60c5dfe768d1b3514e2c962c2ea specifically to work around
the "only on systemd" issue.
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-cluster/drbd-utils/drbd-utils-9.25.0-r1.ebuild | 134 +++++++++++++++++++++
1 file changed, 134 insertions(+)
diff --git a/sys-cluster/drbd-utils/drbd-utils-9.25.0-r1.ebuild b/sys-cluster/drbd-utils/drbd-utils-9.25.0-r1.ebuild
new file mode 100644
index 000000000000..2b24560c3430
--- /dev/null
+++ b/sys-cluster/drbd-utils/drbd-utils-9.25.0-r1.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools bash-completion-r1 linux-info tmpfiles udev
+
+DESCRIPTION="mirror/replicate block-devices across a network-connection"
+HOMEPAGE="https://www.linbit.com/drbd"
+SRC_URI="https://pkg.linbit.com/downloads/drbd/utils/${P}.tar.gz"
+S="${WORKDIR}/${P/_/}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pacemaker +udev xen"
+
+DEPEND="
+ pacemaker? ( sys-cluster/pacemaker )
+ udev? ( virtual/udev )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="sys-devel/flex"
+
+PATCHES=(
+ #"${FILESDIR}"/${PN}-9.15.1-run-lock.patch
+ "${FILESDIR}"/${PN}-9.23.1-respect-flags.patch
+ "${FILESDIR}"/${PN}-9.25.0-missing-stdint.patch
+)
+
+pkg_setup() {
+ # verify that CONFIG_BLK_DEV_DRBD is enabled in the kernel or
+ # warn otherwise
+ linux-info_pkg_setup
+ elog "Checking for suitable kernel configuration options..."
+ if linux_config_exists; then
+ if ! linux_chkconfig_present BLK_DEV_DRBD; then
+ ewarn "CONFIG_BLK_DEV_DRBD: is not set when it should be."
+ elog "Please check to make sure these options are set correctly."
+ fi
+ else
+ ewarn "Could not check if CONFIG_BLK_DEV_DRBD is enabled in your kernel."
+ elog "Please check to make sure these options are set correctly."
+ fi
+}
+
+src_prepare() {
+ # Respect LDFLAGS, bug #453442
+ sed -e "s/\$(CC) -o/\$(CC) \$(LDFLAGS) -o/" \
+ -e "/\$(DESTDIR)\$(localstatedir)\/lock/d" \
+ -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
+
+ # Don't participate in user survey, bug #360483
+ sed -i -e '/usage-count/ s/yes/no/' scripts/global_common.conf || die
+ sed -i -e "s:\$(sysconfdir)/udev:$(get_udevdir):" scripts/Makefile.in || die
+
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ --localstatedir="${EPREFIX}"/var
+ # don't autodetect systemd/sysv; install systemd and use our own openrc
+ --with-initscripttype=systemd
+ # only used for systemdunitdir and for udevdir; the latter breaks
+ # merged-usr interop
+ PKG_CONFIG=/bin/false
+ --with-systemdunitdir="${EPREFIX}"/usr/lib/systemd/system
+ --with-bashcompletion
+ --with-distro=gentoo
+ --with-prebuiltman
+ --without-rgmanager
+ $(use_with pacemaker)
+ $(use_with udev)
+ $(use_with xen)
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # Only compile the tools
+ emake CXXFLAGS="${CXXFLAGS}" OPTFLAGS="${CFLAGS}" tools doc
+}
+
+src_install() {
+ # Only install the tools
+ emake DESTDIR="${D}" install-tools install-doc
+
+ # Install our own init script
+ newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN/-utils/}
+
+ dodoc scripts/drbd.conf.example
+
+ keepdir /var/lib/drbd
+ rm -r "${ED}"/var/run || die
+
+ # bug #698304
+ dodir /lib/drbd
+ local i
+ for i in drbdadm-83 drbdadm-84 drbdsetup-83 drbdsetup-84; do
+ dosym -r /$(get_libdir)/drbd/"${i}" /lib/drbd/"${i}"
+ done
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ tmpfiles_process drbd.conf
+
+ einfo
+ einfo "Please copy and gunzip the configuration file:"
+ einfo "from ${EROOT}/usr/share/doc/${PF}/${PN/-utils/}.conf.example.bz2 to ${EROOT}/etc/${PN/-utils/}.conf"
+ einfo "and edit it to your needs. Helpful commands:"
+ einfo "man 5 drbd.conf"
+ einfo "man 8 drbdsetup"
+ einfo "man 8 drbdadm"
+ einfo "man 8 drbddisk"
+ einfo "man 8 drbdmeta"
+ einfo
+}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/drbd-utils/
@ 2024-01-01 0:12 Sam James
0 siblings, 0 replies; 18+ messages in thread
From: Sam James @ 2024-01-01 0:12 UTC (permalink / raw
To: gentoo-commits
commit: 6fe332967f8bd8e14bb8734f7e5c714e5d0de06e
Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Sun Dec 31 22:46:33 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 1 00:12:14 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fe33296
sys-cluster/drbd-utils: suppress LTO
It fails to build:
```
x86_64-pc-linux-gnu-gcc -march=native -fstack-protector-all -O2 -pipe -fdiagnostics-color=always -frecord-gcc-switches -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3 -fstack-clash-protection -Wformat -Werror=format-security -flto -Werror=odr -Werror=lto-type-mismatch -Werror=strict-aliasing -Werror=implicit-function-declaration -Werror=implicit-int -Werror=int-conversion -Werror=incompatible-pointer-types -Wall -I../../drbd-headers -I.. -I. -I../shared -Wl,-O1 -Wl,--as-needed -Wl,--defsym=__gentoo_check_ldflags__=0 -Wl,-O1 -Wl,--as-needed -Wl,--defsym=__gentoo_check_ldflags__=0 -o drbdadm drbdadm_scanner.o drbdadm_parser.o drbdadm_postparse.o drbdadm_main.o drbdadm_adjust.o drbdadm_dump.o drbdtool_common.o drbdadm_usage_cnt.o drbd_buildtag.o registry.o config_flags.o libnla.o drbd_nla.o shared_tool.o shared_main.o shared_parser.o libgenl.o drbdadm_linux.o drbdtool_common_linux.o path_linux.o shared_linux.o
../shared/shared_main.c:60:22: error: type of ‘ifreq_list’ does not match original declaration [-Werror=lto-type-mismatch]
60 | extern struct ifreq *ifreq_list;
| ^
drbdadm_main.c:150:15: note: ‘ifreq_list’ was previously declared here
150 | struct ifreq *ifreq_list = NULL;
| ^
drbdadm_main.c:150:15: note: code may be misoptimized unless ‘-fno-strict-aliasing’ is used
lto1: some warnings being treated as errors
lto-wrapper: fatal error: x86_64-pc-linux-gnu-gcc returned 1 exit status
```
Bug: https://bugs.gentoo.org/863728
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-cluster/drbd-utils/drbd-utils-9.25.0-r1.ebuild | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/sys-cluster/drbd-utils/drbd-utils-9.25.0-r1.ebuild b/sys-cluster/drbd-utils/drbd-utils-9.25.0-r1.ebuild
index 2b24560c3430..1dde213b413e 100644
--- a/sys-cluster/drbd-utils/drbd-utils-9.25.0-r1.ebuild
+++ b/sys-cluster/drbd-utils/drbd-utils-9.25.0-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit autotools bash-completion-r1 linux-info tmpfiles udev
+inherit autotools bash-completion-r1 flag-o-matic linux-info tmpfiles udev
DESCRIPTION="mirror/replicate block-devices across a network-connection"
HOMEPAGE="https://www.linbit.com/drbd"
@@ -71,6 +71,10 @@ src_prepare() {
}
src_configure() {
+ # -Werror=lto-type-mismatch, bug #863728
+ # https://github.com/LINBIT/drbd-utils/issues/40
+ filter-lto
+
local myeconfargs=(
--localstatedir="${EPREFIX}"/var
# don't autodetect systemd/sysv; install systemd and use our own openrc
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/drbd-utils/
@ 2024-01-01 1:51 Sam James
0 siblings, 0 replies; 18+ messages in thread
From: Sam James @ 2024-01-01 1:51 UTC (permalink / raw
To: gentoo-commits
commit: 95c080801df74afe6a51020ee52a9f649834b6b2
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 1 01:19:44 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 1 01:51:01 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95c08080
sys-cluster/drbd-utils: add 9.27.0
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-cluster/drbd-utils/Manifest | 1 +
sys-cluster/drbd-utils/drbd-utils-9.27.0.ebuild | 137 ++++++++++++++++++++++++
2 files changed, 138 insertions(+)
diff --git a/sys-cluster/drbd-utils/Manifest b/sys-cluster/drbd-utils/Manifest
index 188e63acd4e9..c714c47c30b1 100644
--- a/sys-cluster/drbd-utils/Manifest
+++ b/sys-cluster/drbd-utils/Manifest
@@ -1 +1,2 @@
DIST drbd-utils-9.25.0.tar.gz 1406804 BLAKE2B 6617d2a2a947926d894c184c0c6f79262c32010b7982c85b30f1e02fec66d611f9389c1de0e8435f6ea4999626cf2763bc332f8c619b9201bb29308338f1d355 SHA512 43ed52c59ab0272a389c647240ad4e8e04cdca4c4530da9645d9fc22fda45d7c6d9bea6781a433f3993f9f717e1c1a9ea10af12b18a49ad2d22f78f458ef46f3
+DIST drbd-utils-9.27.0.tar.gz 1418879 BLAKE2B a4f505768aacf03c14c7b52815293f1ee62385e98d6fed9d83b18899a4f424ed263388076abba5692885441310a5730d1d5ae175bae4307d5ab268e9129eb31d SHA512 066849e77bac04515682f497398e3840eecdf16c866a0d67df4e8978e9278dee120d9a216ba7dcf16e1dc2cfdd7271ff775e5bee9ccd0cead8360b7e33e08f5d
diff --git a/sys-cluster/drbd-utils/drbd-utils-9.27.0.ebuild b/sys-cluster/drbd-utils/drbd-utils-9.27.0.ebuild
new file mode 100644
index 000000000000..3d8b35c868a0
--- /dev/null
+++ b/sys-cluster/drbd-utils/drbd-utils-9.27.0.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools bash-completion-r1 flag-o-matic linux-info tmpfiles udev
+
+DESCRIPTION="mirror/replicate block-devices across a network-connection"
+HOMEPAGE="https://www.linbit.com/drbd"
+SRC_URI="https://pkg.linbit.com/downloads/drbd/utils/${P}.tar.gz"
+S="${WORKDIR}/${P/_/}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pacemaker +udev xen"
+
+DEPEND="
+ sys-apps/keyutils
+ pacemaker? ( sys-cluster/pacemaker )
+ udev? ( virtual/udev )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="sys-devel/flex"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-9.23.1-respect-flags.patch
+)
+
+pkg_setup() {
+ # verify that CONFIG_BLK_DEV_DRBD is enabled in the kernel or
+ # warn otherwise
+ linux-info_pkg_setup
+ elog "Checking for suitable kernel configuration options..."
+ if linux_config_exists; then
+ if ! linux_chkconfig_present BLK_DEV_DRBD; then
+ ewarn "CONFIG_BLK_DEV_DRBD: is not set when it should be."
+ elog "Please check to make sure these options are set correctly."
+ fi
+ else
+ ewarn "Could not check if CONFIG_BLK_DEV_DRBD is enabled in your kernel."
+ elog "Please check to make sure these options are set correctly."
+ fi
+}
+
+src_prepare() {
+ # Respect LDFLAGS, bug #453442
+ sed -e "s/\$(CC) -o/\$(CC) \$(LDFLAGS) -o/" \
+ -e "/\$(DESTDIR)\$(localstatedir)\/lock/d" \
+ -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
+
+ # Don't participate in user survey, bug #360483
+ sed -i -e '/usage-count/ s/yes/no/' scripts/global_common.conf || die
+ sed -i -e "s:\$(sysconfdir)/udev:$(get_udevdir):" scripts/Makefile.in || die
+
+ default
+ eautoreconf
+}
+
+src_configure() {
+ # -Werror=lto-type-mismatch, bug #863728
+ # https://github.com/LINBIT/drbd-utils/issues/40
+ filter-lto
+
+ local myeconfargs=(
+ --localstatedir="${EPREFIX}"/var
+ # don't autodetect systemd/sysv; install systemd and use our own openrc
+ --with-initscripttype=systemd
+ # only used for systemdunitdir and for udevdir; the latter breaks
+ # merged-usr interop
+ PKG_CONFIG=/bin/false
+ --with-systemdunitdir="${EPREFIX}"/usr/lib/systemd/system
+ --with-bashcompletion
+ --with-distro=gentoo
+ --with-prebuiltman
+ --without-rgmanager
+ $(use_with pacemaker)
+ $(use_with udev)
+ $(use_with xen)
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # Only compile the tools
+ emake CXXFLAGS="${CXXFLAGS}" OPTFLAGS="${CFLAGS}" tools doc
+}
+
+src_install() {
+ # Only install the tools
+ emake DESTDIR="${D}" install-tools install-doc
+
+ # Install our own init script
+ newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN/-utils/}
+
+ dodoc scripts/drbd.conf.example
+
+ keepdir /var/lib/drbd
+ rm -r "${ED}"/var/run || die
+
+ # bug #698304
+ dodir /lib/drbd
+ local i
+ for i in drbdadm-83 drbdadm-84 drbdsetup-83 drbdsetup-84; do
+ dosym -r /$(get_libdir)/drbd/"${i}" /lib/drbd/"${i}"
+ done
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ tmpfiles_process drbd.conf
+
+ einfo
+ einfo "Please copy and gunzip the configuration file:"
+ einfo "from ${EROOT}/usr/share/doc/${PF}/${PN/-utils/}.conf.example.bz2 to ${EROOT}/etc/${PN/-utils/}.conf"
+ einfo "and edit it to your needs. Helpful commands:"
+ einfo "man 5 drbd.conf"
+ einfo "man 8 drbdsetup"
+ einfo "man 8 drbdadm"
+ einfo "man 8 drbddisk"
+ einfo "man 8 drbdmeta"
+ einfo
+}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/drbd-utils/
@ 2024-01-08 12:03 Sam James
0 siblings, 0 replies; 18+ messages in thread
From: Sam James @ 2024-01-08 12:03 UTC (permalink / raw
To: gentoo-commits
commit: da7e040faabefedf573dd6f1efa44b5b55ca2fb2
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 8 11:52:21 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 8 12:03:09 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da7e040f
sys-cluster/drbd-utils: sys-devel/flex -> app-alternatives/lex
All of these will be using app-alternatives/lex anyway as they're not unsetting
YACC or LEX, so make the dep reflect reality.
(Included both YACC and LEX out of conservatism.)
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-cluster/drbd-utils/drbd-utils-9.25.0-r1.ebuild | 4 ++--
sys-cluster/drbd-utils/drbd-utils-9.25.0.ebuild | 4 ++--
sys-cluster/drbd-utils/drbd-utils-9.27.0.ebuild | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/sys-cluster/drbd-utils/drbd-utils-9.25.0-r1.ebuild b/sys-cluster/drbd-utils/drbd-utils-9.25.0-r1.ebuild
index 1dde213b413e..192389b3f566 100644
--- a/sys-cluster/drbd-utils/drbd-utils-9.25.0-r1.ebuild
+++ b/sys-cluster/drbd-utils/drbd-utils-9.25.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -20,7 +20,7 @@ DEPEND="
udev? ( virtual/udev )
"
RDEPEND="${DEPEND}"
-BDEPEND="sys-devel/flex"
+BDEPEND="app-alternatives/lex"
PATCHES=(
#"${FILESDIR}"/${PN}-9.15.1-run-lock.patch
diff --git a/sys-cluster/drbd-utils/drbd-utils-9.25.0.ebuild b/sys-cluster/drbd-utils/drbd-utils-9.25.0.ebuild
index 5194d27e497c..180215a36f74 100644
--- a/sys-cluster/drbd-utils/drbd-utils-9.25.0.ebuild
+++ b/sys-cluster/drbd-utils/drbd-utils-9.25.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -20,7 +20,7 @@ DEPEND="
udev? ( virtual/udev )
"
RDEPEND="${DEPEND}"
-BDEPEND="sys-devel/flex"
+BDEPEND="app-alternatives/lex"
PATCHES=(
#"${FILESDIR}"/${PN}-9.15.1-run-lock.patch
diff --git a/sys-cluster/drbd-utils/drbd-utils-9.27.0.ebuild b/sys-cluster/drbd-utils/drbd-utils-9.27.0.ebuild
index 3d8b35c868a0..8e995d72178a 100644
--- a/sys-cluster/drbd-utils/drbd-utils-9.27.0.ebuild
+++ b/sys-cluster/drbd-utils/drbd-utils-9.27.0.ebuild
@@ -21,7 +21,7 @@ DEPEND="
udev? ( virtual/udev )
"
RDEPEND="${DEPEND}"
-BDEPEND="sys-devel/flex"
+BDEPEND="app-alternatives/lex"
PATCHES=(
"${FILESDIR}"/${PN}-9.23.1-respect-flags.patch
^ permalink raw reply related [flat|nested] 18+ messages in thread
end of thread, other threads:[~2024-01-08 12:03 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-11-26 20:25 [gentoo-commits] repo/gentoo:master commit in: sys-cluster/drbd-utils/ Aaron Bauman
-- strict thread matches above, loose matches on Subject: below --
2024-01-08 12:03 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-17 2:13 Sam James
2021-03-08 10:25 Sam James
2021-03-06 15:37 Thomas Deutschmann
2021-02-18 18:57 David Seifert
2018-02-06 15:10 Thomas Deutschmann
2016-03-23 23:25 Zac Medico
2015-09-21 8:31 Alexys Jacob
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox