From 2f8db31405fac68eea6f7257d58529243815033b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 30 Apr 2018 21:33:31 +0100 Subject: gentoo resync : 30.04.2018 --- sys-cluster/drbd-kernel/Manifest | 10 ----- sys-cluster/drbd-kernel/drbd-kernel-8.0.16.ebuild | 52 ---------------------- sys-cluster/drbd-kernel/drbd-kernel-8.3.6.ebuild | 50 --------------------- sys-cluster/drbd-kernel/drbd-kernel-8.3.8.1.ebuild | 50 --------------------- .../drbd-8.0.16-kernel-2.6.30-compile-fix.patch | 12 ----- ...nel-8.0.0-scripts.adjust_drbd_config_h.sh.patch | 23 ---------- .../files/drbd-kernel-8.3.6-linux-2.6.32.patch | 46 ------------------- sys-cluster/drbd-kernel/metadata.xml | 8 ---- 8 files changed, 251 deletions(-) delete mode 100644 sys-cluster/drbd-kernel/Manifest delete mode 100644 sys-cluster/drbd-kernel/drbd-kernel-8.0.16.ebuild delete mode 100644 sys-cluster/drbd-kernel/drbd-kernel-8.3.6.ebuild delete mode 100644 sys-cluster/drbd-kernel/drbd-kernel-8.3.8.1.ebuild delete mode 100644 sys-cluster/drbd-kernel/files/drbd-8.0.16-kernel-2.6.30-compile-fix.patch delete mode 100644 sys-cluster/drbd-kernel/files/drbd-kernel-8.0.0-scripts.adjust_drbd_config_h.sh.patch delete mode 100644 sys-cluster/drbd-kernel/files/drbd-kernel-8.3.6-linux-2.6.32.patch delete mode 100644 sys-cluster/drbd-kernel/metadata.xml (limited to 'sys-cluster/drbd-kernel') diff --git a/sys-cluster/drbd-kernel/Manifest b/sys-cluster/drbd-kernel/Manifest deleted file mode 100644 index 66019b64b9b1..000000000000 --- a/sys-cluster/drbd-kernel/Manifest +++ /dev/null @@ -1,10 +0,0 @@ -AUX drbd-8.0.16-kernel-2.6.30-compile-fix.patch 394 BLAKE2B a04d33337ec1759bfa2aeb5d5d8a61ddfc4e74d35dfa27170810bfdc9aab65fba919e21a89fb908312f4252a8fd270993d68e296adf394b1f51c4a8d880f645b SHA512 ccdbee8ed89a06746914bcbb5b5120ddc32c7e671fe13f1c337fa86aef2d2bc2994efbbe3ac5030c325a164f5331d9cf30d9c1e7ffc9c46c06aadbd3705afcc7 -AUX drbd-kernel-8.0.0-scripts.adjust_drbd_config_h.sh.patch 679 BLAKE2B d2c4a0dc18b2377434aceeee110e1175b15fa2e57590e53a7bfb072694e3f027e60ef5aaa2875ecbb32742bc7245c99bdb442b23a6df2b058ee471e69f35da6c SHA512 872df2e12dc9a47785c37dd6a82e060e5af751f90b23962f2164c609f6e0ae64b9b9dfbc3e52f7b60422ab3c9069bf17aea20a9b1ad3042f300356d2084d7a31 -AUX drbd-kernel-8.3.6-linux-2.6.32.patch 1243 BLAKE2B 58eae23c20bc81e246527245cd2286c7f3530780fc75a25e971e72b9253ac4f0788549b1c7b3dfb06694775b37d251fb1bf88d2a75fb7a0b32c211ed608e827b SHA512 f41f4c6e5e9ce9a0425c813a384b8b86d8fc92730eac8a08be10dcc8eb1c912057923929cbf044d9807f292c1ae908bade7868ea636afd3ba4237fb5aae502de -DIST drbd-8.0.16.tar.gz 322758 BLAKE2B 472207843ac2f437a4fe1baeab84265e8bf871e12fba56f9957145a4d93d5a376e0637175d1810c3cf0c64eaf53161f5c33b24fc40d5a83f3147476aaedd19fe SHA512 1b325e3789032656a1f7286b51ac9e90f709c53f8ff35c10ca9bb2e27b1cf822813485e0a49d55c62e7966bc975040b42a6d0ac8fa066a16afa2605e9df87a17 -DIST drbd-8.3.6.tar.gz 457469 BLAKE2B 4ddafea7e0523f85f3aa02d01a981e6b5056fd84204b6afff82f1eaaba5c9273cdb5639be423c555b3896e226454eb71dc098ac29c34a9dab0b6a9532133cfcb SHA512 0e817d514b60891c70532511b99d7cddf24e3fa261b605bc920ad7ab2d4530682f84b78eb0a2ed9c25a8458a43496e8de61addade63b8f6e252a36b6b1d50cef -DIST drbd-8.3.8.1.tar.gz 482582 BLAKE2B 5967de376fed1085ffda4dadd8a6ddd8407cae07d54e9963d459cd7c387eaae4757c790fd33c887e03fc5f2e5cabc52490ec989fd2bb58eac32609135edfe1a4 SHA512 c43c6d065328058db66f708d47ce082603b766deb1530c57aa736a42b4908f780ede41f76395ca45c2691ef1dfd142147a4c98a7bcdb26ba7de73b149d8f9f5f -EBUILD drbd-kernel-8.0.16.ebuild 1298 BLAKE2B f43ee135969ce6fc0b478fbe00ecc243b40b940a6984b258a21ec61821163b35eb43fe3de1c65ee218eb27ae0715dea464b7c4bf9d0f0a21f16e777c99119013 SHA512 90030164bf8e2061e4a8fddc2a77bae3ca9a4aecac6f2aed69182cbcb767f1e6f5ba48329dd32aabb0b486b75f1a08852df0f7accb2947135172238c6b6ce944 -EBUILD drbd-kernel-8.3.6.ebuild 1176 BLAKE2B 4ba1fed3541c02b3ac6cb813a6aa7ab8ac9bab55537ca7754818d6811b5ac4324bbfe77cf8aaaac1780d4cd8f91ec6672e46f51a0caeb0462ce2f82910684341 SHA512 e3e7215d2ba88cc360873f47710228f364d038e7de11221dcd8a6b4ac14ac784c13a3697768c3d9286f7e62205593164a51be6faa84fb6258c9737fbe39a4411 -EBUILD drbd-kernel-8.3.8.1.ebuild 1391 BLAKE2B b44904d2c82ede3478dc91de2b56462ac8b7386d8c68d063c65fd983269ed089ce07cf22d9d1059bfe788453f3f0034321ec81365bf476dca886cdcdd41a51d0 SHA512 88db68a055e22bb464885ca82a53dec55168a5698fd6cc623430517c60da49621a53dff2e64ee80814d136f4f4f21938592f68df7a21eee409af572658642d89 -MISC metadata.xml 253 BLAKE2B 2fbd23e1eeca2d6a1474e03aeaa1ad81f16f00141d906ca087f01b67a69e065cac2b3600c2da212ca9fdaf4765788a58ec12b6cd6a45323e5b524dbdb1ce0a77 SHA512 0894860713279dc39bbe7ce3491002710b62c4476198984a0deb6328cb0012c19d7a5546299960bbe600ee240e62a603dd4c4fa04325a753cc0b7c4044c30aba diff --git a/sys-cluster/drbd-kernel/drbd-kernel-8.0.16.ebuild b/sys-cluster/drbd-kernel/drbd-kernel-8.0.16.ebuild deleted file mode 100644 index c7940d8f75ab..000000000000 --- a/sys-cluster/drbd-kernel/drbd-kernel-8.0.16.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit eutils versionator linux-mod - -LICENSE="GPL-2" -KEYWORDS="amd64 x86" - -MY_PN="${PN/-kernel/}" -MY_P="${MY_PN}-${PV}" -MY_MAJ_PV="$(get_version_component_range 1-2 ${PV})" - -HOMEPAGE="http://www.drbd.org" -DESCRIPTION="mirror/replicate block-devices across a network-connection" -SRC_URI="http://oss.linbit.com/drbd/${MY_MAJ_PV}/${MY_PN}-${PV}.tar.gz" - -IUSE="" - -DEPEND="virtual/linux-sources" -RDEPEND="" -SLOT="0" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if ! kernel_is -ge 2 6; then - die "Unsupported kernel, drbd-8.0.x needs kernel 2.6.x ." - fi - - MODULE_NAMES="drbd(block:${S}/drbd)" - BUILD_TARGETS="default" - CONFIG_CHECK="CONNECTOR" - CONNECTOR_ERROR="You must enable \"CONNECTOR - unified userspace <-> kernelspace linker\" in your kernel configuration, because drbd needs it." - linux-mod_pkg_setup - BUILD_PARAMS="-j1 KDIR=${KERNEL_DIR} O=${KBUILD_OUTPUT}" -} - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/${PN}-8.0.0-scripts.adjust_drbd_config_h.sh.patch || die - epatch "${FILESDIR}"/${MY_P}-kernel-2.6.30-compile-fix.patch || die -} - -pkg_postinst() { - linux-mod_pkg_postinst - - einfo "" - einfo "Please remember to re-emerge drbd when you upgrade your kernel!" - einfo "" -} diff --git a/sys-cluster/drbd-kernel/drbd-kernel-8.3.6.ebuild b/sys-cluster/drbd-kernel/drbd-kernel-8.3.6.ebuild deleted file mode 100644 index a204c0f4fc5a..000000000000 --- a/sys-cluster/drbd-kernel/drbd-kernel-8.3.6.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="2" - -inherit eutils versionator linux-mod - -LICENSE="GPL-2" -KEYWORDS="~amd64 x86" - -MY_PN="${PN/-kernel/}" -MY_P="${MY_PN}-${PV}" -MY_MAJ_PV="$(get_version_component_range 1-2 ${PV})" - -HOMEPAGE="http://www.drbd.org" -DESCRIPTION="mirror/replicate block-devices across a network-connection" -SRC_URI="http://oss.linbit.com/drbd/${MY_MAJ_PV}/${MY_PN}-${PV}.tar.gz" - -IUSE="" - -DEPEND="virtual/linux-sources" -RDEPEND="" -SLOT="0" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - epatch "${FILESDIR}"/${P}-linux-2.6.32.patch -} - -pkg_setup() { - if ! kernel_is -ge 2 6; then - die "Unsupported kernel, drbd-${PV} needs kernel 2.6.x ." - fi - - MODULE_NAMES="drbd(block:${S}/drbd)" - BUILD_TARGETS="default" - CONFIG_CHECK="CONNECTOR" - CONNECTOR_ERROR="You must enable \"CONNECTOR - unified userspace <-> kernelspace linker\" in your kernel configuration, because drbd needs it." - linux-mod_pkg_setup - BUILD_PARAMS="-j1 KDIR=${KV_DIR} O=${KV_OUT_DIR}" -} - -pkg_postinst() { - linux-mod_pkg_postinst - - einfo "" - einfo "Please remember to re-emerge drbd when you upgrade your kernel!" - einfo "" -} diff --git a/sys-cluster/drbd-kernel/drbd-kernel-8.3.8.1.ebuild b/sys-cluster/drbd-kernel/drbd-kernel-8.3.8.1.ebuild deleted file mode 100644 index 8c2a7bc6cdbb..000000000000 --- a/sys-cluster/drbd-kernel/drbd-kernel-8.3.8.1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="2" - -inherit eutils versionator linux-mod - -LICENSE="GPL-2" -KEYWORDS="amd64 x86" - -MY_PN=${PN/-kernel/} -MY_P=${MY_PN}-${PV} -MY_MAJ_PV=$(get_version_component_range 1-2 ${PV}) - -HOMEPAGE="http://www.drbd.org" -DESCRIPTION="mirror/replicate block-devices across a network-connection" -SRC_URI="http://oss.linbit.com/drbd/${MY_MAJ_PV}/${MY_PN}-${PV}.tar.gz" - -IUSE="" -DEPEND="virtual/linux-sources" -RDEPEND="" -SLOT="0" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - if ! kernel_is -ge 2 6; then - die "Unsupported kernel, drbd-${PV} needs kernel 2.6.x ." - elif [ ${KV_PATCH} -ge 33 ]; then - ewarn "Your kernel (${KV_FULL}) is too new to use this package." - ewarn "The DRBD module has been merged into kernel >= 2.6.33." - ewarn "Please compile the DRBD module from your current kernel." - die "${PN} is obsolete with kernel >= 2.6.33." - fi - - MODULE_NAMES="drbd(block:${S}/drbd)" - BUILD_TARGETS="default" - CONFIG_CHECK="CONNECTOR" - CONNECTOR_ERROR="You must enable \"CONNECTOR - unified userspace <-> kernelspace linker\" in your kernel configuration, because drbd needs it." - linux-mod_pkg_setup - BUILD_PARAMS="-j1 KDIR=${KV_DIR} O=${KV_OUT_DIR}" -} - -pkg_postinst() { - linux-mod_pkg_postinst - - einfo "" - einfo "Please remember to re-emerge drbd-kernel when you upgrade your kernel!" - einfo "" -} diff --git a/sys-cluster/drbd-kernel/files/drbd-8.0.16-kernel-2.6.30-compile-fix.patch b/sys-cluster/drbd-kernel/files/drbd-8.0.16-kernel-2.6.30-compile-fix.patch deleted file mode 100644 index c7b4f814077e..000000000000 --- a/sys-cluster/drbd-kernel/files/drbd-8.0.16-kernel-2.6.30-compile-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- drbd-8.0.16/drbd/drbd_main.c.orig 2009-08-04 17:55:52.000000000 +0300 -+++ drbd-8.0.16/drbd/drbd_main.c 2009-08-04 17:56:35.000000000 +0300 -@@ -2770,7 +2770,9 @@ - } - - drbd_proc->proc_fops = &drbd_proc_fops; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30) - drbd_proc->owner = THIS_MODULE; -+#endif - #else - # error "Currently drbd depends on the proc file system (CONFIG_PROC_FS)" - #endif diff --git a/sys-cluster/drbd-kernel/files/drbd-kernel-8.0.0-scripts.adjust_drbd_config_h.sh.patch b/sys-cluster/drbd-kernel/files/drbd-kernel-8.0.0-scripts.adjust_drbd_config_h.sh.patch deleted file mode 100644 index beb07fbdaeb9..000000000000 --- a/sys-cluster/drbd-kernel/files/drbd-kernel-8.0.0-scripts.adjust_drbd_config_h.sh.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- drbd-8.0.0/scripts/adjust_drbd_config_h.sh.orig 2007-02-05 01:20:58.000000000 +0100 -+++ drbd-8.0.0/scripts/adjust_drbd_config_h.sh 2007-02-05 01:21:28.000000000 +0100 -@@ -26,19 +26,7 @@ - pushd $KDIR - - KDIR=${KDIR%/} --if test -z "$O"; then -- ## just in case... -- ## detect if $KDIR points to something which is actually $O ... -- X=$( make help | sed -ne '/ -C .* O=.* help$/p' | tr -s ' ' ) -- if [[ -n $X ]]; then -- KDIR=${X##* -C }; KDIR=${KDIR%% *}; KDIR=$(cd $KDIR && pwd) -- O=${X##* O=}; O=${O%% *}; O=$(cd $KDIR && cd $O && pwd) -- else -- O=$KDIR; -- fi --else -- O=${O%/} --fi -+O=$KDIR; - - # some paranoia: check that all files are where we expect them - ls > /dev/null \ diff --git a/sys-cluster/drbd-kernel/files/drbd-kernel-8.3.6-linux-2.6.32.patch b/sys-cluster/drbd-kernel/files/drbd-kernel-8.3.6-linux-2.6.32.patch deleted file mode 100644 index 893f9c2e21fe..000000000000 --- a/sys-cluster/drbd-kernel/files/drbd-kernel-8.3.6-linux-2.6.32.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- drbd-8.3.6/drbd/drbd_req.c -+++ drbd-8.3.6/drbd/drbd_req.c -@@ -55,13 +55,21 @@ - __disk_stat_inc(mdev->vdisk, ios[rw]); - __disk_stat_add(mdev->vdisk, sectors[rw], bio_sectors(bio)); - disk_round_stats(mdev->vdisk); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32) -+ mdev->vdisk->in_flight[rw]++; -+#else - mdev->vdisk->in_flight++; -+#endif - #else - cpu = part_stat_lock(); - part_stat_inc(cpu, &mdev->vdisk->part0, ios[rw]); - part_stat_add(cpu, &mdev->vdisk->part0, sectors[rw], bio_sectors(bio)); - part_stat_unlock(); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32) -+ mdev->vdisk->part0.in_flight[rw]++; -+#else - mdev->vdisk->part0.in_flight++; -+#endif - #endif - } - -@@ -77,13 +85,21 @@ - #ifdef __disk_stat_add - __disk_stat_add(mdev->vdisk, ticks[rw], duration); - disk_round_stats(mdev->vdisk); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32) -+ mdev->vdisk->in_flight[rw]--; -+#else - mdev->vdisk->in_flight--; -+#endif - #else - cpu = part_stat_lock(); - part_stat_add(cpu, &mdev->vdisk->part0, ticks[rw], duration); - part_round_stats(cpu, &mdev->vdisk->part0); - part_stat_unlock(); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32) -+ mdev->vdisk->part0.in_flight[rw]--; -+#else - mdev->vdisk->part0.in_flight--; -+#endif - #endif - } - diff --git a/sys-cluster/drbd-kernel/metadata.xml b/sys-cluster/drbd-kernel/metadata.xml deleted file mode 100644 index 4a09d7ba8d61..000000000000 --- a/sys-cluster/drbd-kernel/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - cluster@gentoo.org - Gentoo Cluster Project - - -- cgit v1.2.3