From 0101b95d7ee0505406ac511a2389725cd8771a42 Mon Sep 17 00:00:00 2001 From: Alexey Shvetsov Date: Wed, 22 Jun 2011 17:48:57 +0400 Subject: Update ocfs2 --- sys-fs/ocfs2-tools/ChangeLog | 11 --- sys-fs/ocfs2-tools/Manifest | 19 +---- sys-fs/ocfs2-tools/files/1.4.4-cpg.patch | 31 +++++++ sys-fs/ocfs2-tools/files/1.4.4-gcc45.patch | 21 +++++ sys-fs/ocfs2-tools/files/INSTALL.GENTOO | 103 ----------------------- sys-fs/ocfs2-tools/files/gcc45-ftbfs.patch | 21 ----- sys-fs/ocfs2-tools/files/ocfs2.conf | 20 ----- sys-fs/ocfs2-tools/files/ocfs2.init | 126 ---------------------------- sys-fs/ocfs2-tools/ocfs2-tools-1.4.4.ebuild | 87 ++++++++----------- 9 files changed, 91 insertions(+), 348 deletions(-) delete mode 100644 sys-fs/ocfs2-tools/ChangeLog create mode 100644 sys-fs/ocfs2-tools/files/1.4.4-cpg.patch create mode 100644 sys-fs/ocfs2-tools/files/1.4.4-gcc45.patch delete mode 100644 sys-fs/ocfs2-tools/files/INSTALL.GENTOO delete mode 100644 sys-fs/ocfs2-tools/files/gcc45-ftbfs.patch delete mode 100644 sys-fs/ocfs2-tools/files/ocfs2.conf delete mode 100644 sys-fs/ocfs2-tools/files/ocfs2.init diff --git a/sys-fs/ocfs2-tools/ChangeLog b/sys-fs/ocfs2-tools/ChangeLog deleted file mode 100644 index 98dbc5038..000000000 --- a/sys-fs/ocfs2-tools/ChangeLog +++ /dev/null @@ -1,11 +0,0 @@ -# ChangeLog for sys-fs/ocfs2-tools -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - - 07 Mar 2011; Justin Lecher ocfs2-tools-1.4.4.ebuild, - +metadata.xml: - QA things - - 07 Mar 2011; Justin Lecher ocfs2-tools-1.4.4.ebuild: - Correct Slots for gtk 3 introduction to tree - diff --git a/sys-fs/ocfs2-tools/Manifest b/sys-fs/ocfs2-tools/Manifest index 1aee99ca3..1faaa8a65 100644 --- a/sys-fs/ocfs2-tools/Manifest +++ b/sys-fs/ocfs2-tools/Manifest @@ -1,18 +1,5 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -AUX INSTALL.GENTOO 3672 RMD160 a817d6776be70f0ae773e24c224cecaf969b8993 SHA1 19e4bf7d2c0b246e1869f75cc0fb6a77b722033a SHA256 e1d415009a5cfbd021b24278c2c90485123c8159e68f88965acfbdaba75baedd -AUX gcc45-ftbfs.patch 807 RMD160 6e90024195735b7daa93a71f07ee80cd3e1677ed SHA1 fdbb4b1a9aeefd1151f926913d301fd178a6cb7f SHA256 416893dcab5d3aa92a1c9dc1b4c83201ef914c159533c1f1f0a37f35cf2c347d -AUX ocfs2.conf 917 RMD160 168922889cfb017e903634fb51116d1812e0a0f6 SHA1 a61a1a0247c340b09a7279b664e9a02f49ba7f5f SHA256 36f2d2b229773bffed94cb75029cd752e900e99762b95adbf3f11df9952e824b -AUX ocfs2.init 4214 RMD160 da27d35e471b712ca793f4d1ddfb96a036e6516b SHA1 6afef117ba3e0643fcd1855eaad215300f9040ba SHA256 32f725401ffd34fd015371fa7c50985c6a7a9251eac6cc47621b8ec5af2b59b8 +AUX 1.4.4-cpg.patch 1169 RMD160 0f9789a2ead38a85d89697f08d205485221f5b80 SHA1 32fe66ee4022de42184d42cc6ca4c287991dac83 SHA256 0c07fb434687edb7d70d49c014c22a1985a844d07f1dd9760551f8257c611f2d +AUX 1.4.4-gcc45.patch 807 RMD160 6e90024195735b7daa93a71f07ee80cd3e1677ed SHA1 fdbb4b1a9aeefd1151f926913d301fd178a6cb7f SHA256 416893dcab5d3aa92a1c9dc1b4c83201ef914c159533c1f1f0a37f35cf2c347d DIST ocfs2-tools-1.4.4.tar.gz 713145 RMD160 353733c6a7e17b1aba17d9d22546311eec4a02f6 SHA1 fd36df819a0677c5de8d7d59c804fb6cfa862d82 SHA256 fcfcce1057830c1975d57effc25cc78f3099be0c9e35ea92a9b9dbb185946530 -EBUILD ocfs2-tools-1.4.4.ebuild 1748 RMD160 5731c1383fed20666e3602e93bbdbdfdf506e152 SHA1 46502f8225af651cbfae49eec719d6e53f38b78f SHA256 27d66519332e357698fa3ea6ac1f13b97b20fb7ff94bf913cb30b991580342c0 -MISC ChangeLog 343 RMD160 bfeabe2b0e383fc842beffd703365a9186991147 SHA1 0684d438483ded06bc1eee5e72164d9fd604435d SHA256 a2338846f4381099e00ba0a174dab015d6b8d2d94d150fd0a94adac85c30ba44 +EBUILD ocfs2-tools-1.4.4.ebuild 1229 RMD160 c2a48b37f190d839c340f1ccab2f4719984fa8f5 SHA1 1789c6aeee6fd860d8442ba0e5279bba710ed7e8 SHA256 7fb6bd2f3c4b8e7a650b0757233610381d32e151fcda8cc54489938a0a78f654 MISC metadata.xml 215 RMD160 bc9c07aa91f2f175542244e4e4522a73558210a1 SHA1 facb283386de1c0b6b938cdcd4dde04d1694298b SHA256 13f32353652adbd3d934d41381cfc2cacc9e1127c508cebc73806cc1026ee80c ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) - -iEYEARECAAYFAk10vOUACgkQgAnW8HDreRad1gCfTk6gz4bfcPuVLjztpivBzjyt -poAAoJZJb9y+UfoZkdAjiwkDM9Ob+LcZ -=ZWQC ------END PGP SIGNATURE----- diff --git a/sys-fs/ocfs2-tools/files/1.4.4-cpg.patch b/sys-fs/ocfs2-tools/files/1.4.4-cpg.patch new file mode 100644 index 000000000..4832bf7b2 --- /dev/null +++ b/sys-fs/ocfs2-tools/files/1.4.4-cpg.patch @@ -0,0 +1,31 @@ +--- ocfs2-tools-1.4.4-buggy/configure 2010-10-04 18:10:31.327238001 +0200 ++++ ocfs2-tools-1.4.4/configure 2010-10-05 10:27:52.607238001 +0200 +@@ -5534,7 +5534,12 @@ + echo $ECHO_N "checking for cpg_initialize in -lcpg... $ECHO_C" >&6 + while test "x$TRY_PATH" != "x"; do + TRY="`echo $TRY_PATH | cut -f1 -d:`" +- TRY_PATH="`echo $TRY_PATH | cut -f2- -d:`" ++ NEW_TRY_PATH="`echo $TRY_PATH | cut -f2- -d:`" ++ if test "x$NEW_TRY_PATH" != "x$TRY_PATH"; then ++ TRY_PATH="$NEW_TRY_PATH" ++ else ++ TRY_PATH="" ++ fi + + if test "x$TRY" != "x"; then + TRY="-L${TRY}/${cpg_package}" +@@ -5680,7 +5685,13 @@ + echo $ECHO_N "checking for saCkptInitialize in -lSaCkpt... $ECHO_C" >&6 + while test "x$TRY_PATH" != "x"; do + TRY="`echo $TRY_PATH | cut -f1 -d:`" +- TRY_PATH="`echo $TRY_PATH | cut -f2- -d:`" ++ NEW_TRY_PATH="`echo $TRY_PATH | cut -f2- -d:`" ++ if test "x$NEW_TRY_PATH" != "x$TRY_PATH"; then ++ TRY_PATH="$NEW_TRY_PATH" ++ else ++ TRY_PATH="" ++ fi ++ + + if test "x$TRY" != "x"; then + TRY="-L${TRY}/openais" diff --git a/sys-fs/ocfs2-tools/files/1.4.4-gcc45.patch b/sys-fs/ocfs2-tools/files/1.4.4-gcc45.patch new file mode 100644 index 000000000..0db24f49e --- /dev/null +++ b/sys-fs/ocfs2-tools/files/1.4.4-gcc45.patch @@ -0,0 +1,21 @@ +diff -urN ocfs2-tools-1.4.3.orig//mount.ocfs2/mount.ocfs2.c ocfs2-tools-1.4.3/mount.ocfs2/mount.ocfs2.c +--- ocfs2-tools-1.4.3.orig//mount.ocfs2/mount.ocfs2.c 2009-04-14 00:10:40.000000000 +0200 ++++ ocfs2-tools-1.4.3/mount.ocfs2/mount.ocfs2.c 2010-03-24 07:23:45.000000000 +0100 +@@ -261,7 +261,7 @@ + char *extra = NULL; + int dev_ro = 0; + char *hbstr = NULL; +- char stackstr[strlen(OCFS2_CLUSTER_STACK_ARG) + OCFS2_STACK_LABEL_LEN + 1] = ""; ++ char stackstr[strlen(OCFS2_CLUSTER_STACK_ARG) + OCFS2_STACK_LABEL_LEN + 1]; + ocfs2_filesys *fs = NULL; + struct o2cb_cluster_desc cluster; + struct o2cb_region_desc desc; +@@ -269,6 +269,8 @@ + int hb_started = 0; + struct stat statbuf; + ++ stackstr[0] = '\0'; ++ + initialize_ocfs_error_table(); + initialize_o2dl_error_table(); + initialize_o2cb_error_table(); diff --git a/sys-fs/ocfs2-tools/files/INSTALL.GENTOO b/sys-fs/ocfs2-tools/files/INSTALL.GENTOO deleted file mode 100644 index e05485c68..000000000 --- a/sys-fs/ocfs2-tools/files/INSTALL.GENTOO +++ /dev/null @@ -1,103 +0,0 @@ -Installing, configuring and running OCFS2 on Gentoo Linux - - -INSTALLING -========== -Step 1 - Inserting modules --------------------------- -Add 'ocfs2', 'configfs' to your /etc/modules.autoload.d/kernel-2.6 file: -# echo "ocfs2" >> /etc/modules.autoload.d/kernel-2.6 -# echo "configfs" >> /etc/modules.d/autoload.d/kernel-2.6 -# update-modules - -Step 2 - Mounting the pseudo-filesystems ----------------------------------------- -add mountpoints for configfs and dlmfs to /etc/fstab -# echo "none /sys/kernel/config configfs defaults 0 0" >> /etc/fstab -# echo "none /dlm ocfs2_dlmfs defaults 0 0" >> /etc/fstab - -Step 3 - Addding ocfs2 to default runlevel ------------------------------------------- -# rc-update add ocfs2 default - - -CONFIGURING -=========== -Step 1 - Edit your cluster.conf -------------------------------- -Edit /etc/ocfs2/cluster.conf and add your nodes. One node can be a member -of many cluster, so repeat the config for each node/cluster pair. In the case of -a multicluster node, "ip_port" must be different for every cluster. -You can also use ocfs2console for this task, if you compiled with USE=X. - -Step 2 - Copy config to other nodes ------------------------------------ -Make sure that every node in cluster(s) has an identical config file. - -Step 3 - Update /etc/conf.d/ocfs2 ---------------------------------- -Add names of cluster(s) in which this node belongs to the OCFS2_CLUSTERS list. - -Also, if you're running firewall on your nodes, make sure you've read -"Firewall restrictions" below. - -RUNNING -======= - -Notes about adding nodes while online -------------------------- -*DON'T* add nodes to /etc/ocfs2/cluster.conf while the cluster is online. -Use /sbin/o2cb_ctl instead, e.g.: - -# /sbin/o2cb_ctl -C -n -t node -a number= \ - -a ip_address= -a ip_port= -a cluster= - -If the complete cluster is down, you may add nodes to /etc/ocfs2/cluster.conf, -but make sure you end up with *SAME* cluster.conf on every node. - -For a complete reference, check files in this directory -as well as http://oss.oracle.com/projects/ocfs2 -You have been warned. - -Also, if you're running a firewall on your nodes, make sure you've read the -following section. - -Firewall restrictions ---------------------- -Logically, allow all nodes to connect to each other via specified port(s). -If you used 7777 as a port for communication, issue: - -# iptables -I INPUT 1 -m state --state ESTABLISHED,RELATED -j ACCEPT -# iptables -N OCFS2_NODES -# iptables -A OCFS2_NODES -s -j ACCEPT -(repeat former command for every node) -# iptables -A OCFS2_NODES -j DROP -# iptables -A INPUT -p tcp --dport 7777 -m state --state NEW -j OCFS2_NODES -# /etc/init.d/iptables save - -You should do this on every node. - -KNOWN BUGS -========== -1. Init script does not have all the funtionality of the o2cb script ----------------------------------------------------------------- -I know that, but o2cb script doesn't use "depend" and therefore its start -can't be controlled inside runlevels. I had to rewrite major portions of it -to make it Gentoo-friendly. o2cb is still available, and if you need -additional functionality from /etc/init.d/ocfs2, file a bug report (see -"Reporting Bugs" below). - -2. Booting off the ocfs2 cluster doesn't work ---------------------------------------------- -... or at least, isn't tested. If someone wants to play with it, I'd be -happy to incorporate any ideas or experiences. - -REPORTING BUGS -============== -Open a bug at http://bugs.gentoo.org and add laza@yu.net into the CC list. -If the problem is within my powers, I'll fix it, if not, I'll -escalate it to ocfs2 developers. - ---- -05. Aug 2005. -Lazar Obradovic diff --git a/sys-fs/ocfs2-tools/files/gcc45-ftbfs.patch b/sys-fs/ocfs2-tools/files/gcc45-ftbfs.patch deleted file mode 100644 index 0db24f49e..000000000 --- a/sys-fs/ocfs2-tools/files/gcc45-ftbfs.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -urN ocfs2-tools-1.4.3.orig//mount.ocfs2/mount.ocfs2.c ocfs2-tools-1.4.3/mount.ocfs2/mount.ocfs2.c ---- ocfs2-tools-1.4.3.orig//mount.ocfs2/mount.ocfs2.c 2009-04-14 00:10:40.000000000 +0200 -+++ ocfs2-tools-1.4.3/mount.ocfs2/mount.ocfs2.c 2010-03-24 07:23:45.000000000 +0100 -@@ -261,7 +261,7 @@ - char *extra = NULL; - int dev_ro = 0; - char *hbstr = NULL; -- char stackstr[strlen(OCFS2_CLUSTER_STACK_ARG) + OCFS2_STACK_LABEL_LEN + 1] = ""; -+ char stackstr[strlen(OCFS2_CLUSTER_STACK_ARG) + OCFS2_STACK_LABEL_LEN + 1]; - ocfs2_filesys *fs = NULL; - struct o2cb_cluster_desc cluster; - struct o2cb_region_desc desc; -@@ -269,6 +269,8 @@ - int hb_started = 0; - struct stat statbuf; - -+ stackstr[0] = '\0'; -+ - initialize_ocfs_error_table(); - initialize_o2dl_error_table(); - initialize_o2cb_error_table(); diff --git a/sys-fs/ocfs2-tools/files/ocfs2.conf b/sys-fs/ocfs2-tools/files/ocfs2.conf deleted file mode 100644 index 5217769a4..000000000 --- a/sys-fs/ocfs2-tools/files/ocfs2.conf +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/ocfs2-tools/files/ocfs2.conf,v 1.1 2006/07/20 05:13:14 dberkholz Exp $ - -# Put your cluster names here, separated by space, ie. -# OCFS2_CLUSTER="cluster1 admincluster cluster2" -OCFS2_CLUSTER="ocfs2" - -# Some heartbeat tweaks to prevent self-fencing quite so much during heavy load. -# http://oss.oracle.com/projects/ocfs2/dist/documentation/ocfs2_faq.html - -# How long to wait before a node is considered dead from lack of network activity. -OCFS2_IDLE_TIMEOUT_MS="30000" -# How often we should attempt to send heartbeats. -OCFS2_KEEPALIVE_DELAY_MS="2000" -OCFS2_RECONNECT_DELAY_MS="2000" -# How often we should attempt to send heartbeats. -# How many interations before a node is considered dead from lack of IO activity. -# (dead_threshold - 1) * 2s -OCFS2_DEAD_THRESHOLD="31" diff --git a/sys-fs/ocfs2-tools/files/ocfs2.init b/sys-fs/ocfs2-tools/files/ocfs2.init deleted file mode 100644 index f454d4495..000000000 --- a/sys-fs/ocfs2-tools/files/ocfs2.init +++ /dev/null @@ -1,126 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/ocfs2-tools/files/ocfs2.init,v 1.1 2006/07/20 05:13:14 dberkholz Exp $ - -depend() { - need net localmount - before netmount -} - -check_modules_config() { - local MODULES=$1 - local CONFIGS=$2 - local MODULE - local retval=0 - - for MODULE in ${MODULES}; do - if ! ls -1 /sys/module | egrep -q "^${MODULE}$"; then - retval=1 - fi - done - if [ ${retval} -eq 1 ] && [ -e /proc/config.gz ]; then - retval=0 - for MODULE in ${CONFIGS}; do - if ! gzip -dc /proc/config.gz | egrep -q "^CONFIG_${MODULE}=y$"; then - retval=1 - fi - done - fi - return ${retval} -} - -check_modules() { - check_modules_config "ocfs2_dlmfs ocfs2 ocfs2_dlm ocfs2_nodemanager" "OCFS2_FS OCFS2_FS_O2CB" && check_modules_config configfs CONFIGFS_FS && return 0 - if ! egrep -q '\s*ocfs2\s*$' /proc/filesystems || ! egrep -q '\s*ocfs2_dlmfs\s*$' /proc/filesystems; then - ewarn "One or more required modules are not loaded." - ewarn "Make sure you have " - ewarn " - placed ocfs, dlmfs and configfs into /etc/modules.autoload.d/kernel-2.6 or built directly into the kernel." - ewarn "For a (in)complete documentation, read /usr/share/doc/ocfs-/INSTALL.GENTOO.bz2" - fi - return 1 -} - -check_pseudofs() { - local retval=0 - local HASMOUNT="mount -l -t" - if [ -z "`${HASMOUNT} configfs`" ] ; then - retval=1 - fi - if [ -z "`${HASMOUNT} ocfs2_dlmfs`" ] ; then - retval=1 - fi - - if [ ${retval} -eq 1 ]; then - ewarn "One or more pseudo-filesystes are not mounted." - ewarn "Make sure you have following lines in your /etc/fstab:" - ewarn "none /sys/kernel/config configfs defaults 0 0" - ewarn "none /dlm ocfs2_dlmfs defaults 0 0" - ewarn "For a (in)complete documentation, read /usr/share/doc/ocfs-/INSTALL.GENTOO.bz2" - fi - return ${retval} -} - - - -start() { - check_modules || return $? - check_pseudofs || return $? - - einfo "Starting OCFS2 cluster" - for cluster in ${OCFS2_CLUSTER}; do - ebegin " - ${cluster}" - /sbin/o2cb_ctl -H -n ${cluster} -t cluster -a online=yes >/dev/null 2>&1 - eend $? - - # Some heartbeat tweaks to prevent self-fencing quite so much during heavy load. - # http://oss.oracle.com/projects/ocfs2/dist/documentation/ocfs2_faq.html - - # How long to wait before a node is considered dead from lack of network activity. - echo $OCFS2_IDLE_TIMEOUT_MS > /sys/kernel/config/cluster/${cluster}/idle_timeout_ms - # How often we should attempt to send heartbeats. - echo $OCFS2_KEEPALIVE_DELAY_MS > /sys/kernel/config/cluster/${cluster}/keepalive_delay_ms - echo $OCFS2_RECONNECT_DELAY_MS > /sys/kernel/config/cluster/${cluster}/reconnect_delay_ms - # How many interations before a node is considered dead from lack of IO activity. - # (dead_threshold - 1) * 2s - echo $OCFS2_DEAD_THRESHOLD > /sys/kernel/config/cluster/${cluster}/heartbeat/dead_threshold - done - sleep 2 -} - -stop() { - # Shamelesly stolen from netmount - local ret - ebegin "Unmounting OCFS2 filesystems" - [ -z "$(umount -art ocfs2 2>&1)" ] - ret=$? - eend ${ret} "Failed to simply unmount filesystems" - [ ${ret} -eq 0 ] && return 0 - - declare -a siglist=( "TERM" "KILL" "KILL" ) - local retry=0 - local remaining="go" - - while [ -n "${remaining}" -a ${retry} -lt 3 ] - do - remaining="$(awk '$3 ~ /'ocfs2'/ { if ($2 != "/") print $2 }' /proc/mounts | sort -r)" - IFS=$'\n' - set -- ${remaining//\\040/ } - unset IFS - [ -z "${remaining}" ] && break - - ebegin $'\t'"Unmounting ocfs2 filesystems (retry #$((retry+1)))" - /bin/fuser -k -${siglist[$((retry++))]} -m "$@" &>/dev/null - sleep 5 - umount "$@" &>/dev/null - eend $? $'\t'"Failed to unmount filesystems" - done - - - einfo "Stopping OCFS2 cluster" - for cluster in ${OCFS_CLUSTERS}; do - ebegin " - ${cluster}" - /sbin/o2cb_ctl -H -n ${cluster} -t cluster -a online=no >/dev/null 2>&1 - eend $? - done -} diff --git a/sys-fs/ocfs2-tools/ocfs2-tools-1.4.4.ebuild b/sys-fs/ocfs2-tools/ocfs2-tools-1.4.4.ebuild index 150093fa5..26aaeaf4a 100644 --- a/sys-fs/ocfs2-tools/ocfs2-tools-1.4.4.ebuild +++ b/sys-fs/ocfs2-tools/ocfs2-tools-1.4.4.ebuild @@ -1,73 +1,58 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="3" - -PYTHON_DEPEND="2" - -inherit eutils python - -PV_MAJOR="${PV%%.*}" -PV_MINOR="${PV#*.}" -PV_MINOR="${PV_MINOR%%.*}" +EAPI=3 +PYTHON_DEPEND="gtk? 2" +inherit python base versionator DESCRIPTION="Support programs for the Oracle Cluster Filesystem 2" HOMEPAGE="http://oss.oracle.com/projects/ocfs2-tools/" -SRC_URI="http://oss.oracle.com/projects/ocfs2-tools/dist/files/source/v${PV_MAJOR}.${PV_MINOR}/${P}.tar.gz" +SRC_URI="http://oss.oracle.com/projects/${PN}/dist/files/source/v$(get_version_component_range 1-2)/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~x86 ~amd64" -IUSE="X" +KEYWORDS="~amd64 ~x86" +IUSE="debug gtk" -# (#142216) build system's broke, always requires glib for debugfs utility RDEPEND=" - dev-libs/glib:2 - sys-cluster/openais - sys-cluster/dlm-lib + sys-apps/util-linux sys-cluster/cman-lib + || ( sys-cluster/corosync sys-cluster/openais ) sys-fs/e2fsprogs - X? ( - x11-libs/gtk+:2 - dev-python/pygtk:2 - )" + sys-libs/ncurses + sys-libs/readline + sys-process/psmisc + gtk? ( + dev-python/pygtk + ) +" +# 99% of deps this thing has is automagic +# specialy cluster things corosync/pacemaker DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}/${PV}-gcc45.patch" + "${FILESDIR}/${PV}-cpg.patch" +) + +DOCS=( + "${S}/documentation/samples/cluster.conf" + "${S}/documentation/users_guide.txt" +) + +MAKEOPTS+=" -j1" + pkg_setup() { python_set_active_version 2 -} - -src_prepare() { - epatch "${FILESDIR}/gcc45-ftbfs.patch" + python_pkg_setup } src_configure() { - #local myconf="--enable-dynamic-fsck --enable-dynamic-ctl" - econf \ - $(use_enable X ocfs2console) \ - ${myconf} -} - -src_install() { - emake DESTDIR="${D}" install || die "Failed to install" - - dodoc \ - COPYING CREDITS MAINTAINERS README README.O2CB debugfs.ocfs2/README \ - documentation/users_guide.txt documentation/samples/cluster.conf \ - documentation/ocfs2_faq.txt "${FILESDIR}"/INSTALL.GENTOO \ - vendor/common/o2cb.init vendor/common/o2cb.sysconfig - - # Move programs not needed before /usr is mounted to /usr/sbin/ - newinitd "${FILESDIR}"/ocfs2.init ocfs2 - newconfd "${FILESDIR}"/ocfs2.conf ocfs2 - - insinto /etc/ocfs2 - newins "${S}"/documentation/samples/cluster.conf cluster.conf -} - -pkg_postinst() { - elog "Read ${ROOT}usr/share/doc/${P}/INSTALL.GENTOO* for instructions" - elog "about how to install, configure and run ocfs2." + $(use_enable debug debug) \ + $(use_enable debug debugexe) \ + $(use_enable gtk ocfs2console) \ + --enable-dynamic-fsck \ + --enable-dynamic-ctl } -- cgit v1.2.3-65-gdbad