diff options
author | 2015-08-08 13:49:04 -0700 | |
---|---|---|
committer | 2015-08-08 17:38:18 -0700 | |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /sys-cluster/drbd-kernel | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'sys-cluster/drbd-kernel')
8 files changed, 244 insertions, 0 deletions
diff --git a/sys-cluster/drbd-kernel/Manifest b/sys-cluster/drbd-kernel/Manifest new file mode 100644 index 000000000000..8527f3b3339f --- /dev/null +++ b/sys-cluster/drbd-kernel/Manifest @@ -0,0 +1,3 @@ +DIST drbd-8.0.16.tar.gz 322758 SHA256 3bdb662663d308da9d871cc66ddc9e807a10ad5ab510a33b62877231150bc059 +DIST drbd-8.3.6.tar.gz 457469 SHA256 ea1220705845df6f6490624698904f28854fe74caf047a5d01454b9abd892ce3 +DIST drbd-8.3.8.1.tar.gz 482582 SHA256 2b7e8a3895e89824d41d7dce8d55d127baba857c509bc2477925b0aecaf5689b SHA512 c43c6d065328058db66f708d47ce082603b766deb1530c57aa736a42b4908f780ede41f76395ca45c2691ef1dfd142147a4c98a7bcdb26ba7de73b149d8f9f5f WHIRLPOOL af4f6a1a8a7d51626d508e834e1465c079bd386f24ecdd3495221bafc3f9c766d6d583934995b88372bbed8e1e7bd3d19186c4eab40c123c5c700fc3de7742e9 diff --git a/sys-cluster/drbd-kernel/drbd-kernel-8.0.16.ebuild b/sys-cluster/drbd-kernel/drbd-kernel-8.0.16.ebuild new file mode 100644 index 000000000000..2ad9f5fa86c2 --- /dev/null +++ b/sys-cluster/drbd-kernel/drbd-kernel-8.0.16.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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 new file mode 100644 index 000000000000..6f348cd8c13d --- /dev/null +++ b/sys-cluster/drbd-kernel/drbd-kernel-8.3.6.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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 new file mode 100644 index 000000000000..7c0ccb89556f --- /dev/null +++ b/sys-cluster/drbd-kernel/drbd-kernel-8.3.8.1.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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 new file mode 100644 index 000000000000..c7b4f814077e --- /dev/null +++ b/sys-cluster/drbd-kernel/files/drbd-8.0.16-kernel-2.6.30-compile-fix.patch @@ -0,0 +1,12 @@ +--- 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 new file mode 100644 index 000000000000..beb07fbdaeb9 --- /dev/null +++ b/sys-cluster/drbd-kernel/files/drbd-kernel-8.0.0-scripts.adjust_drbd_config_h.sh.patch @@ -0,0 +1,23 @@ +--- 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 new file mode 100644 index 000000000000..893f9c2e21fe --- /dev/null +++ b/sys-cluster/drbd-kernel/files/drbd-kernel-8.3.6-linux-2.6.32.patch @@ -0,0 +1,46 @@ +--- 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 new file mode 100644 index 000000000000..348e6c4de815 --- /dev/null +++ b/sys-cluster/drbd-kernel/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>cluster</herd> +</pkgmetadata> |