From bcebbf995e405985cd5fe1b99d791cf4887c4840 Mon Sep 17 00:00:00 2001 From: James Campbell Date: Fri, 2 Feb 2024 09:59:11 -0500 Subject: [PATCH] Update drbd packages --- sys-cluster/drbd-kmod/Manifest | 3 +- .../drbd-kmod/drbd-kmod-9.1.17-r1.ebuild | 57 ++++++++++ sys-cluster/drbd-utils/Manifest | 2 + .../drbd-utils/drbd-utils-9.26.0.ebuild | 101 ++++++++++++++++++ 4 files changed, 161 insertions(+), 2 deletions(-) create mode 100644 sys-cluster/drbd-kmod/drbd-kmod-9.1.17-r1.ebuild create mode 100644 sys-cluster/drbd-utils/drbd-utils-9.26.0.ebuild diff --git a/sys-cluster/drbd-kmod/Manifest b/sys-cluster/drbd-kmod/Manifest index 1208d0f..a41e8cb 100644 --- a/sys-cluster/drbd-kmod/Manifest +++ b/sys-cluster/drbd-kmod/Manifest @@ -2,5 +2,4 @@ DIST drbd-9.0.27-1.tar.gz 1133216 SHA256 e3366b94faaa9399c857cc2517dd99a8dff049f EBUILD drbd-kmod-9.0.27-r1.ebuild 846 SHA256 c58483a775790a0c22908c6072e1c7063e94b127e6ee2df34f645469c1071578 SHA512 639c53d0c9edf61a1c81dd301c2596b2b3304351649eb6d58ea1adf72b11e2212e56b7a61b4e4c4da39a5c37c819fddeb890e071b2f985f67e8757c2f3c3b1cb WHIRLPOOL bb98e94dcb5c3222e0453e6e2a9f3e29b2b9535e9062e9e795f48e0345f7623fd342c99ede999e688d5c0d49f50d30ea39f95867d6317029e32b80175042d923 EBUILD drbd-kmod-9.1.11.ebuild 967 SHA256 8dce76f7b55e711025a2b3a5ceeb5fa7ae6de472511264f1059ac810bd47888f SHA512 4e217d5111387c4a83730cad7112666958224b496fecbf9c7b130defeaf9b59270502da746dd22d8c6fb0d3b1e981fbfea264c9b3ebead60b6816a32ddb69640 WHIRLPOOL 9b92976b942ff89f32401427f04e8d0de7f93891e843a30d7762097e0374ea91f1f2a575b2e6fa7127c520f0f4d3035410b66840746889252f52d9cfe983da7f EBUILD drbd-kmod-9.1.12-r1.ebuild 1023 SHA256 3b678ea769a4ba53c81a7f9935b73c6c89314bb958a7005a3ba135ee0bb875b4 SHA512 e8ee4822f31aabcb3bac296037c8aa96a71657aa030708671b310cf621a80a57ecd7b3e72e97601bc20fd37ed6c6fc031a49e7c08b9f5db053085b600a1f00ed WHIRLPOOL 3288c6fe5f28f0303319bd052d63e4659ff189b23a9670c525e1d5d71f55845232b40e99ccd595444d234af6b771985a84a1add5c7cb2852a7565da1ce64682b -EBUILD drbd-kmod-9.1.3.ebuild 967 SHA256 8dce76f7b55e711025a2b3a5ceeb5fa7ae6de472511264f1059ac810bd47888f SHA512 4e217d5111387c4a83730cad7112666958224b496fecbf9c7b130defeaf9b59270502da746dd22d8c6fb0d3b1e981fbfea264c9b3ebead60b6816a32ddb69640 WHIRLPOOL 9b92976b942ff89f32401427f04e8d0de7f93891e843a30d7762097e0374ea91f1f2a575b2e6fa7127c520f0f4d3035410b66840746889252f52d9cfe983da7f -EBUILD drbd-kmod-9.1.8.ebuild 967 SHA256 8dce76f7b55e711025a2b3a5ceeb5fa7ae6de472511264f1059ac810bd47888f SHA512 4e217d5111387c4a83730cad7112666958224b496fecbf9c7b130defeaf9b59270502da746dd22d8c6fb0d3b1e981fbfea264c9b3ebead60b6816a32ddb69640 WHIRLPOOL 9b92976b942ff89f32401427f04e8d0de7f93891e843a30d7762097e0374ea91f1f2a575b2e6fa7127c520f0f4d3035410b66840746889252f52d9cfe983da7f +EBUILD drbd-kmod-9.1.17-r1.ebuild 1023 SHA256 3b678ea769a4ba53c81a7f9935b73c6c89314bb958a7005a3ba135ee0bb875b4 SHA512 e8ee4822f31aabcb3bac296037c8aa96a71657aa030708671b310cf621a80a57ecd7b3e72e97601bc20fd37ed6c6fc031a49e7c08b9f5db053085b600a1f00ed WHIRLPOOL 3288c6fe5f28f0303319bd052d63e4659ff189b23a9670c525e1d5d71f55845232b40e99ccd595444d234af6b771985a84a1add5c7cb2852a7565da1ce64682b diff --git a/sys-cluster/drbd-kmod/drbd-kmod-9.1.17-r1.ebuild b/sys-cluster/drbd-kmod/drbd-kmod-9.1.17-r1.ebuild new file mode 100644 index 0000000..020d601 --- /dev/null +++ b/sys-cluster/drbd-kmod/drbd-kmod-9.1.17-r1.ebuild @@ -0,0 +1,57 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools linux-mod git-r3 + +DESCRIPTION="DRBD kernel module" +HOMEPAGE="https://www.linbit.com" + +# Package name lacks the "r" for the release +MY_PN="${PN/-kmod/}" +MY_PV="${PVR/-r/-}" +#SRC_URI="https://www.linbit.com/downloads/drbd/9.0/${MY_PN}-${MY_PV}.tar.gz" +EGIT_REPO_URI="https://github.com/LINBIT/drbd.git" +#EGIT_COMMIT="${MY_PN}-${MY_PV}" +EGIT_COMMIT="27b2cdb8bef8840eae8c76a9c86e4223cef07c80" +#S="${WORKDIR}/${MY_PN}-${MY_PV}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~x86" + +DEPEND="" +RDEPEND="${DEPEND}" +BDEPEND=" + dev-util/coccinelle[python]" + +src_prepare() { + default + + convert_to_m Makefile +} + +src_compile() { + set_arch_to_kernel + get_version + + myemakeargs=( + KVER="${KV_FULL}" + KDIR="${KERNEL_DIR}" + ) + + emake "${myemakeargs[@]}" module +} + +src_install() { + set_arch_to_kernel + + myemakeargs=( + KVER="${KV_FULL}" + KDIR="${KERNEL_DIR}" + DESTDIR="${D}" + ) + + emake "${myemakeargs[@]}" install +} diff --git a/sys-cluster/drbd-utils/Manifest b/sys-cluster/drbd-utils/Manifest index 3550120..2d9b7fe 100644 --- a/sys-cluster/drbd-utils/Manifest +++ b/sys-cluster/drbd-utils/Manifest @@ -6,5 +6,7 @@ AUX drbd-utils-9.0.rc 3070 SHA256 315b5c12356871198b4509ab92b087dbe7c0177dda9e61 AUX run-lock.patch 564 SHA256 37e9485d4bf647fa11a78631965350a3dc0f0e8de1624170dd393a3da7743939 SHA512 779ad53c9f019b9dcc748177d6017ca06f1b450bf0889307c9660c574c09414964e4c5e4d6f2f3e8fc540ba14a1d489d09991b813af1581b2f6cd4ba491455ab WHIRLPOOL 3a361d18c9d83759f121ffb744158f75d8cf2c78400f646d77ac8da4b9d8433b4b0ee37dea0bdb61f21d41c1aa2cb9ba7930dfbf13a09b66ba4b48e63fed7169 DIST drbd-utils-9.12.2.tar.gz 1204980 SHA256 caedaa8545cfc94f40e63e4a29f53324732878dd0d10320989d38de1c0114dc1 SHA512 051c2b7c2b1804a70a48b7784e80e49604b910027b67f1cb6041069f94ad31468c038f505a3bc20e22b11f76e69cf5a8ae623ee1913c5dc410f146fc03da677e WHIRLPOOL 57c97916933d86603fcd13746dc0cc044541354ae218ee7367d71ec1676843fcc398218e2fa1f024ce8da0509682a6b6d89c514d313ad41b774c771f59af6070 DIST drbd-utils-9.15.1.tar.gz 1229196 SHA256 315c3e9341d8e2bef28b4047ca0a977bf7ebd8f2ac3be3639273e27c2d5f22e1 SHA512 bf9c46335500c0dd7afdc160221acaf8fd053afc453cb26cd76ef085c41580be5a62021ef1f1a57eac9df70d1158a008f489d1a8bb5c3329c5a187f79e4942de WHIRLPOOL 488ccfd98bbb328c39e4803b631e040db8b9dde2536ed3458e295c8ae9709940ecee7fc00442d35295899144aa22e1da736c77bf716d8084af8dca70676bc7d5 +DIST drbd-utils-9.26.0.tar.gz 1417392 SHA256 0f68ed4ef1f1dd315e55d1ac5c5583ad4d547e401d55bb1dc2df5e8912d2e26e SHA512 0b286b109a1e5cd938baddb2dcec5fc95c75c8a7adc46edf8a0bafc5e747168bc09718b0252f92766845bf0301635837aab690fc40d8955ac2a7c72a7c1a90d8 WHIRLPOOL 5fed70fc8a29cf4b5f58b1d9d4cb3a445337ea84daa768adeb7777ded5fb086a89c7acbd39875026f0091cf57e235847d5fbb408d35a86e0d920f78fdae7725e EBUILD drbd-utils-9.12.2.ebuild 2793 SHA256 1701643ebf118e233129edb01507a4ae3701fe6d180afd85b9874fdf926b5e1a SHA512 c9def674afa09f9d88ec2014b795450bed11878539f139e9deaffeeb8c5baacfd78f6c7c472e5d36f85e9f82dc1dc708d84815ed2da24e1c640b23e61ee53b33 WHIRLPOOL bc0b8d812466a3687acf4320edc61386581a307d0a6260cc409696b5acca19e6d5f643c371ee71d45fcfad6b415b3e72fa84afde150cec19cca5da390646363d EBUILD drbd-utils-9.15.1.ebuild 2539 SHA256 dbe7d5746f9cda6a787aafb4fc68c43544b64729ea28103acd58b4e7d21256c5 SHA512 7e1029601458fce8abbda9af8078c8939a644a901daca67c42434741fafea013da51d0388e055900c62ebefe83f1964ed1c275defa1a0fc15b6d2700874103f0 WHIRLPOOL 1a5eb3c7137076fe37fcab7fcf08881e468c91f192d5752dde05826f406f6bf1e0bd74d325df98d12a730f025d1bcaff80bcd7e6f3e80581f671ec034b2b71d9 +EBUILD drbd-utils-9.26.0.ebuild 2539 SHA256 d50a2c082778ac36845a6b7c4b1f5a3b14d6f81481a0cbbdfdf4bb4dbca42c9f SHA512 6ac28d2cacf41d726081247d011be07bf15faa3150dcef1ea8c29268833f72090d9e4d9d8151c7b8f559fcd94eccbb080b297e31c71c40f4d19c962d65ee81f0 WHIRLPOOL 8e3e9e7c4d268fef21c937736e2b3d79b8d1fd94e5a1e0a621c2fe4d51c07a7f9570fdb9a260c349d7c04e9e11c1eb5e1aef1246d4226a0d4ccf7c0c9ea10f34 diff --git a/sys-cluster/drbd-utils/drbd-utils-9.26.0.ebuild b/sys-cluster/drbd-utils/drbd-utils-9.26.0.ebuild new file mode 100644 index 0000000..a798936 --- /dev/null +++ b/sys-cluster/drbd-utils/drbd-utils-9.26.0.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit bash-completion-r1 multilib udev + +LICENSE="GPL-2" + +DESCRIPTION="mirror/replicate block-devices across a network-connection" +SRC_URI="https://pkg.linbit.com/downloads/drbd/utils/${P/_/}.tar.gz" +HOMEPAGE="https://www.linbit.com/drbd/" + +KEYWORDS="amd64 ~x86" +IUSE="bash-completion heartbeat pacemaker +udev xen" +SLOT="0" + +DEPEND="heartbeat? ( sys-cluster/heartbeat ) + pacemaker? ( sys-cluster/pacemaker ) + udev? ( virtual/udev ) + !!sys-cluster/drbd" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${PV}_run-lock.patch" +) + +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 + + eapply_user + +# rm -rf .git + + autoreconf +} + +src_configure() { + econf \ + --localstatedir=/var \ + --without-rgmanager \ + $(use_with udev) \ + $(use_with xen) \ + $(use_with pacemaker) \ + $(use_with heartbeat) \ + $(use_with bash-completion bashcompletion) \ + --with-distro=gentoo +} + +src_compile() { + # only compile the tools + emake OPTFLAGS="${CFLAGS}" tools doc +} + +src_install() { + # only install the tools + emake DESTDIR="${D}" install-tools install-doc + dodoc README.md ChangeLog + + # install our own init script + newinitd "${FILESDIR}"/${PN}-9.0.rc ${PN/-utils/} + + dodoc scripts/drbd.conf.example + + dosym ../usr/sbin/drbdadm /sbin/drbdadm + keepdir "/var/lib/drbd" +} + +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." +}