diff options
author | 2008-03-17 17:30:29 +0000 | |
---|---|---|
committer | 2008-03-17 17:30:29 +0000 | |
commit | 4756cfa70978a0091272e93cc324a56ca12bcd55 (patch) | |
tree | 245e358b9611dfe942ca3f312fa25bdab410cca0 /sys-fs | |
parent | Version bump. 1.0x.00 is scheduled to be removed soon. (diff) | |
download | historical-4756cfa70978a0091272e93cc324a56ca12bcd55.tar.gz historical-4756cfa70978a0091272e93cc324a56ca12bcd55.tar.bz2 historical-4756cfa70978a0091272e93cc324a56ca12bcd55.zip |
Version bump. 1.0x.00 is scheduled to be removed soon.
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'sys-fs')
-rw-r--r-- | sys-fs/gfs/ChangeLog | 11 | ||||
-rw-r--r-- | sys-fs/gfs/Manifest | 23 | ||||
-rwxr-xr-x | sys-fs/gfs/files/gfs-1.0x.rc (renamed from sys-fs/gfs/files/gfs.rc) | 2 | ||||
-rwxr-xr-x | sys-fs/gfs/files/gfs-2.0x.rc | 177 | ||||
-rw-r--r-- | sys-fs/gfs/gfs-1.02.00-r1.ebuild | 12 | ||||
-rw-r--r-- | sys-fs/gfs/gfs-1.03.00.ebuild | 8 | ||||
-rw-r--r-- | sys-fs/gfs/gfs-1.04.00.ebuild | 8 | ||||
-rw-r--r-- | sys-fs/gfs/gfs-2.02.00.ebuild | 79 |
8 files changed, 298 insertions, 22 deletions
diff --git a/sys-fs/gfs/ChangeLog b/sys-fs/gfs/ChangeLog index 4660e676d730..bf3e6c15439b 100644 --- a/sys-fs/gfs/ChangeLog +++ b/sys-fs/gfs/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-fs/gfs -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/gfs/ChangeLog,v 1.29 2007/05/12 13:36:42 xmerlin Exp $ +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/gfs/ChangeLog,v 1.30 2008/03/17 17:30:28 xmerlin Exp $ + +*gfs-2.02.00 (17 Mar 2008) + + 17 Mar 2008; Christian Zoffoli <xmerlin@gentoo.org> +files/gfs-1.0x.rc, + +files/gfs-2.0x.rc, -files/gfs.rc, gfs-1.02.00-r1.ebuild, + gfs-1.03.00.ebuild, gfs-1.04.00.ebuild, +gfs-2.02.00.ebuild: + Version bump. 1.0x.00 is scheduled to be removed soon. 12 May 2007; Christian Zoffoli <xmerlin@gentoo.org> gfs-1.03.00.ebuild: Stable on x86. diff --git a/sys-fs/gfs/Manifest b/sys-fs/gfs/Manifest index d13fb71e4b7d..5c273db0d78e 100644 --- a/sys-fs/gfs/Manifest +++ b/sys-fs/gfs/Manifest @@ -1,10 +1,23 @@ -AUX gfs.rc 4401 RMD160 c36c3ac6a1a39fc4ff139359f30154edf111c7a1 SHA1 18cd61f457ef5db49ba15c1ba719a8b43b3597cd SHA256 25e953e3d05c64c0fb1d5af412f40a07d2e9e7223a603f28a053a992855d0f3d +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX gfs-1.0x.rc 4406 RMD160 9e69b6f2974c65f6965f52bf66bc232ced1aa148 SHA1 338134883767d30af5e09125d46dca53d8d46ae6 SHA256 e79009c7ecc72de287508322244d0660ec3d090914827208344cced750f1bb68 +AUX gfs-2.0x.rc 4347 RMD160 fe6b502fa9dad10f1a14defd7d6cf39ba2a378f9 SHA1 6e308f8db42d6504a06d55625de3b0b0bb5a49e2 SHA256 865c3233ba19f76a63be837a5395745b685180b635a3653442e43b0f411f2af0 DIST cluster-1.02.00.tar.gz 1356451 RMD160 e9c0cdd1f5a7542c8a4ea38ccf6d057767269dc5 SHA1 d74cadb1ef21d1cfda333b20d7ef20272e0002d6 SHA256 de45885146f1481808f7a34af5e6b7e2042895a4e3844eaa6161f942345c7849 DIST cluster-1.03.00.tar.gz 1658274 RMD160 6fc16e2edba73dd1a83ecfad749b1553eca6d938 SHA1 c205d8ec034433c33f26724f7f69b0028d2a63d4 SHA256 e61c2438c7ee8d546aec9dd86ee1851c9a71f127c25ad1fb0c59eb4ed534e97b DIST cluster-1.04.00.tar.gz 1663798 RMD160 5b241f38123c9ad65faf2a9eda7aa3e2dabee839 SHA1 af3bb244a11a6a26c31b142009f6c1f771799337 SHA256 6f4b48e67383681ea6ad6e2907b56e755049816186375c4f2bcb9482da31c2c2 +DIST cluster-2.02.00.tar.gz 8316680 RMD160 3d054699b91f57d8b07d7013dd718a7662d712aa SHA1 8471618222882427ca395f098695c33d2466559c SHA256 c68a62b49780a59dcf075e57fc2aac4524dd27e63ad80c8a2f1313307bca9498 DIST gfs-1.02.00-20060713-cvs.patch.gz 16947 RMD160 0168763ffeabb7b4604415a30001c52f04b9f62d SHA1 10cb9b6a56b3b3fcef843c5f2a9f304b3998b87e SHA256 66687928c6208f1301c66118cbd38e96359e71dc8c9864753ca7e5833d1cda42 -EBUILD gfs-1.02.00-r1.ebuild 1395 RMD160 0db5f7d86115e2dd57b6a6ab4c4a2161e5eb0547 SHA1 d5bf8999ec0ecfffb64918c81bb77b770a548ccf SHA256 bff90c51236af94575c49146302c5de6d98c2cf200424df85745a68fa8dd18ec -EBUILD gfs-1.03.00.ebuild 1117 RMD160 8c7bafd2732da368e2548f8950c28b2aeff973b6 SHA1 99d5c7911573012607110e7376d97c0d1186f96d SHA256 33852d45f8f293b7daebc2f19e42b0d1f48cfd6847d7e42b59563ea37de8f5f5 -EBUILD gfs-1.04.00.ebuild 1118 RMD160 d92e5d6dfbdcad010fabd3cd68cb9716ac0bd5d0 SHA1 8ab19b5b30480a269235328813563523b4feaeb8 SHA256 bfd98967cfd3014905fd0c517ae096d67887279e0ec422b0d792c52694a4aef7 -MISC ChangeLog 4075 RMD160 d1b477fc87b05056ee5fc755b21a7606b15a96e5 SHA1 0ca056eb93fdfb768adf4cc7c07ee9d6427cc03a SHA256 644376aadc450e1616f680788484cff7af79060fe4089b310000d02a3c250039 +EBUILD gfs-1.02.00-r1.ebuild 1406 RMD160 1b7faed1faea4223bce965468539e5a5dee61b46 SHA1 dd197aa7c5613eefae21adca3cf16dfde3eaa47f SHA256 21a6ac245ff6b668209c3bb7f744ff94a37d9b05aa2b5968bfe3146a9fd94653 +EBUILD gfs-1.03.00.ebuild 1124 RMD160 2f4323d575b357b29554947334ea05ea3ab13734 SHA1 969520150fb6ad47669722a742c8cdaa91341310 SHA256 e18bb18e5f61c96acf5dcffac0c7a46bb705f57ddb0b0e86f1212a45460fbcdb +EBUILD gfs-1.04.00.ebuild 1125 RMD160 6208632ec8a1bbe6ea0886d3944b3a0db2212bb4 SHA1 0c10be46d403f50996c6df98ccf1345dc60b7ac6 SHA256 769ed1e4831bb8463fabadc0813e86c6b2bdd45b0b94e468ec63d3d87ff946c3 +EBUILD gfs-2.02.00.ebuild 2036 RMD160 3ee2a8a643ad0ffc349f26cb97afe7e2d2fcf66d SHA1 41a356443d33c5fe793c60adbf3d2ea39084b699 SHA256 106b77de01f6c441fc92be811d9394301bdc9932426ad8badca0c8c097c57609 +MISC ChangeLog 4358 RMD160 ebc651b61978bde6e98b9cb7d25e04862d5d8731 SHA1 7c061d104229dff131b9ead7315c8985d0b299c4 SHA256 9eebbf6426f16ead990208e21faa709d24d1aec295ab427f0c8948524ad70304 MISC metadata.xml 229 RMD160 4dcf17b88c5f4db2e817f473f3e8269b0bff2e6e SHA1 e6315be43241c55bdc0d12a42fa05632c5ff9b79 SHA256 49e13d2d49bef7298e3bb665ebeceeff9b0880fae5ff639cb8405993504f244f +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.7 (GNU/Linux) + +iD4DBQFH3qq9gMUyd/cdjWsRAgdYAJ9DTBGyFRMiB6cRl96lLua/o9wy5ACYrOXc +KobPX1DKsoPnqAEDRs8YBA== +=6U0y +-----END PGP SIGNATURE----- diff --git a/sys-fs/gfs/files/gfs.rc b/sys-fs/gfs/files/gfs-1.0x.rc index 601ee540b574..cf7dbccf6d3e 100755 --- a/sys-fs/gfs/files/gfs.rc +++ b/sys-fs/gfs/files/gfs-1.0x.rc @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/sys-fs/gfs/files/gfs.rc,v 1.7 2005/06/14 09:46:46 xmerlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/gfs/files/gfs-1.0x.rc,v 1.1 2008/03/17 17:30:29 xmerlin Exp $ opts="${opts} mountall" diff --git a/sys-fs/gfs/files/gfs-2.0x.rc b/sys-fs/gfs/files/gfs-2.0x.rc new file mode 100755 index 000000000000..330e288778c6 --- /dev/null +++ b/sys-fs/gfs/files/gfs-2.0x.rc @@ -0,0 +1,177 @@ +#!/sbin/runscript +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 or later +# $Header: /var/cvsroot/gentoo-x86/sys-fs/gfs/files/gfs-2.0x.rc,v 1.1 2008/03/17 17:30:29 xmerlin Exp $ + +opts="${opts} mountall" + +depend() { + local myneed="cman" + local devices="$(awk '!/^#/ && $3 == "gfs" && $4 !~ /noauto/ {print $1 }' /etc/fstab)" + + if [ -n "${devices}" ]; then + local device="" + for device in ${devices}; do + if [ -n "$(echo "${device}" | awk '$1 ~ /\/dev\/gnbd/')" ]; then + myneed="${myneed} gnbd-client" + else + if [ -n "$(echo "${device}" | awk '$1 ~ /\/dev\/vg/')" ]; then + myneed="${myneed} clvmd" + fi + fi + done + fi + + use dns logger net + need ${myneed} +} + +mount_gfs_filesystems() { + local remaining="" + remaining="$(awk '!/^#/ && $3 == "gfs" { if ($4 !~ "noauto") print $1 }' /etc/fstab)" + + if [ -n "${remaining}" ]; then + + local device="" + local remaining_verified="" + + for device in ${remaining}; do + if [ -b ${device} ]; then + remaining_verified="${remaining_verified} ${device}" + else + ewarn "Block device ${device} not found!!" + fi + done + + if [ -n "${remaining_verified}" ]; then + einfo "Mounting GFS filesystems" + device="" + for device in ${remaining_verified}; do + local target="$(awk '!/^#/ && $3 == "gfs" && $1 == device { print $2 }' device=${device} /etc/fstab)" + local mounted="$(awk '$3 == "gfs" && $1 == device { print $2 }' device=${device} /proc/mounts)" + + # mount only filesystems not already mounted + if [ -z "${mounted}" ]; then + ebegin "--> mounting ${device} on ${target}" + mount -t gfs ${device} ${target} >/dev/null + eend $? + else + einfo "--> ${device} already mounted on ${target}" + eend 0 + fi + done + else + einfo "No GFS filesystems to automount" + fi + fi +} + + +umount_gfs_filesystems() { + local sig retry + local remaining="$(awk '$3 == "gfs" { print $2 }' /proc/mounts | sort -r)" + + if [ -n "${remaining}" ] + then + sig= + retry=3 + while [ -n "${remaining}" -a "${retry}" -gt 0 ] + do + if [ "${retry}" -lt 3 ] + then + ebegin "Unmounting GFS filesystems (retry)" + umount ${remaining} &>/dev/null + eend $? "Failed to unmount GFS filesystems this retry" + else + ebegin "Unmounting GFS filesystems" + umount ${remaining} &>/dev/null + eend $? "Failed to unmount GFS filesystems" + fi + remaining="$(awk '$3 == "gfs" { if ($2 != "/") print $2 }' /proc/mounts | sort -r)" + [ -z "${remaining}" ] && break + /bin/fuser -k -m ${sig} ${remaining} &>/dev/null + sleep 5 + retry=$((${retry} -1)) + sig=-9 + done + fi +} + +load_modules() { + local module modules + modules=$1 + + for module in ${modules}; do + ebegin "Loading ${module} kernel module" + modprobe ${module} + eend $? "Failed to load ${module} kernel module" + done +} + +unload_modules() { + local module modules + modules=$1 + + for module in ${modules}; do + ebegin "Unloading ${module} kernel module" + modprobe -r ${module} + eend $? "Failed to unload ${module} kernel module" + done +} + +load_gfs_modules() { + local modules + + # detect cluster/locking manager cman+dlm or gulm ? + if [ -d /proc/cluster/config/cman ]; then + if [ ! -d /proc/cluster/lock_dlm ]; then + modules="${modules} lock_dlm" + fi + else + if [ ! -d /proc/cluster/lock_gulm ]; then + modules="${modules} lock_gulm" + fi + fi + if [ ! -f /proc/fs/gfs ]; then + modules="${modules} gfs" + fi + load_modules ${modules} +} + +unload_gfs_modules() { + if [ -f /proc/fs/gfs ]; then + modules="gfs lock_harness" + fi + if [ -d /proc/cluster/lock_dlm ]; then + modules="${modules} lock_dlm" + fi + if [ -d /proc/cluster/lock_gulm ]; then + modules="${modules} lock_gulm" + fi + unload_modules ${modules} +} + +mountall() { + mount_gfs_filesystems +} + +start() { + einfo "Starting gfs cluster:" + + if [ ! -f /etc/ntp.conf ] ; then + eerror "Please create /etc/ntp.conf" + eerror "Sample conf: /usr/share/ntp/ntp.conf" + eend 1 + fi + + load_gfs_modules + mount_gfs_filesystems +} + +stop() { + einfo "Stopping gfs cluster:" + + umount_gfs_filesystems + unload_gfs_modules +} + diff --git a/sys-fs/gfs/gfs-1.02.00-r1.ebuild b/sys-fs/gfs/gfs-1.02.00-r1.ebuild index 39ebe2464cf3..cbc1d5847ab9 100644 --- a/sys-fs/gfs/gfs-1.02.00-r1.ebuild +++ b/sys-fs/gfs/gfs-1.02.00-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/gfs/gfs-1.02.00-r1.ebuild,v 1.7 2007/07/13 05:15:33 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/gfs/gfs-1.02.00-r1.ebuild,v 1.8 2008/03/17 17:30:28 xmerlin Exp $ inherit eutils @@ -36,8 +36,8 @@ S="${WORKDIR}/${MY_P}/${PN}" src_unpack() { unpack ${A} - cd ${S} - epatch ${WORKDIR}/${PN}-${PV}-${CVS_RELEASE}-cvs.patch || die + cd "${S}" + epatch "${WORKDIR}"/${PN}-${PV}-${CVS_RELEASE}-cvs.patch || die } src_compile() { @@ -46,8 +46,8 @@ src_compile() { } src_install() { - emake DESTDIR=${D} install || die "install problem" + emake DESTDIR="${D}" install || die "install problem" keepdir /etc/cluster || die - newinitd ${FILESDIR}/${PN}.rc ${PN} || die + newinitd "${FILESDIR}"/${PN}-1.0x.rc ${PN} || die } diff --git a/sys-fs/gfs/gfs-1.03.00.ebuild b/sys-fs/gfs/gfs-1.03.00.ebuild index d499e5568506..86dcf1e16987 100644 --- a/sys-fs/gfs/gfs-1.03.00.ebuild +++ b/sys-fs/gfs/gfs-1.03.00.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/gfs/gfs-1.03.00.ebuild,v 1.6 2007/07/13 05:15:33 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/gfs/gfs-1.03.00.ebuild,v 1.7 2008/03/17 17:30:28 xmerlin Exp $ CLUSTER_RELEASE="1.03.00" MY_P="cluster-${CLUSTER_RELEASE}" @@ -35,8 +35,8 @@ src_compile() { } src_install() { - emake DESTDIR=${D} install || die "install problem" + emake DESTDIR="${D}" install || die "install problem" keepdir /etc/cluster || die - newinitd ${FILESDIR}/${PN}.rc ${PN} || die + newinitd "${FILESDIR}"/${PN}-1.0x.rc ${PN} || die } diff --git a/sys-fs/gfs/gfs-1.04.00.ebuild b/sys-fs/gfs/gfs-1.04.00.ebuild index 7c753b6a795b..79da46b4c70b 100644 --- a/sys-fs/gfs/gfs-1.04.00.ebuild +++ b/sys-fs/gfs/gfs-1.04.00.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/gfs/gfs-1.04.00.ebuild,v 1.2 2007/07/13 05:15:33 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/gfs/gfs-1.04.00.ebuild,v 1.3 2008/03/17 17:30:28 xmerlin Exp $ CLUSTER_RELEASE="1.04.00" MY_P="cluster-${CLUSTER_RELEASE}" @@ -35,8 +35,8 @@ src_compile() { } src_install() { - emake DESTDIR=${D} install || die "install problem" + emake DESTDIR="${D}" install || die "install problem" keepdir /etc/cluster || die - newinitd ${FILESDIR}/${PN}.rc ${PN} || die + newinitd "${FILESDIR}"/${PN}-1.0x.rc ${PN} || die } diff --git a/sys-fs/gfs/gfs-2.02.00.ebuild b/sys-fs/gfs/gfs-2.02.00.ebuild new file mode 100644 index 000000000000..0c08b7fd2984 --- /dev/null +++ b/sys-fs/gfs/gfs-2.02.00.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/gfs/gfs-2.02.00.ebuild,v 1.1 2008/03/17 17:30:28 xmerlin Exp $ + +inherit eutils versionator + +CLUSTER_RELEASE="${PV}" +MY_P="cluster-${CLUSTER_RELEASE}" + +MAJ_PV="$(get_major_version)" +MIN_PV="$(get_version_component_range 2).$(get_version_component_range 3)" + +DESCRIPTION="Shared-disk cluster file system" +HOMEPAGE="http://sources.redhat.com/cluster/" +SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc" + +#RDEPEND="=sys-cluster/gfs2-${CLUSTER_RELEASE}*" +RDEPEND="=sys-cluster/ccs-${CLUSTER_RELEASE}* + =sys-cluster/cman-${CLUSTER_RELEASE}* + =sys-cluster/fence-${CLUSTER_RELEASE}* + sys-fs/e2fsprogs" + +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${MY_P}/${PN}" + +src_compile() { + (cd "${WORKDIR}"/${MY_P}; + ./configure \ + --cc=$(tc-getCC) \ + --cflags="-Wall" \ + --disable_kernel_check \ + --release_major="$MAJ_PV" \ + --release_minor="$MIN_PV" \ + ) || die "configure problem" + + # gfs now depeneds on gfs2, due to common mount command. + # to avoid a dependency on gfs2, we simply build its mount command twice + # and rename it + sed -i \ + -e '/ln -sf [u]\?mount.gfs2 [u]\?mount.gfs/d' \ + Makefile + + (cd "${WORKDIR}"/${MY_P}/gfs2/mount; + emake -j1 \ + ) || die "compile problem" + + # fix -ggdb CFLAGS + #sed -i \ + # -e '/-ggdb/d' \ + # libgfs/Makefile + + # fix the manual pages have executable bit + sed -i -e ' + /\tinstall -d/s/install/& -m 0755/; t + /\tinstall/s/install/& -m 0644/' \ + man/Makefile + + emake -j1 clean all || die "compile problem" +} + +src_install() { + emake DESTDIR="${D}" install || die "install problem" + + mv "${WORKDIR}"/${MY_P}/gfs2/mount/mount.gfs2 "${D}"/sbin/mount.gfs + mv "${WORKDIR}"/${MY_P}/gfs2/mount/umount.gfs2 "${D}"/sbin/umount.gfs + + keepdir /etc/cluster || die + newinitd "${FILESDIR}"/${PN}-2.0x.rc ${PN} || die + + if use doc ; then + dodoc "${WORKDIR}"/${MY_P}/doc/*.txt || die + fi +} |