Attachment #131484 for bug #193249

Lines 10-20 Link Here

(-)ocfs2-tools.old/Manifest (+12 lines)
10	MD5 abbe10d054f94a7a33ebe1b9b41cf5c2 files/ocfs2.init 2981	10	MD5 abbe10d054f94a7a33ebe1b9b41cf5c2 files/ocfs2.init 2981
11	RMD160 72ad1d43c29f1e7d59b2c4b56c3f89c70bae2f50 files/ocfs2.init 2981	11	RMD160 72ad1d43c29f1e7d59b2c4b56c3f89c70bae2f50 files/ocfs2.init 2981
12	SHA256 00fc34b67e9d193819ca78abd8e74458eda1aaa322d259362f7f191ae6fcdd70 files/ocfs2.init 2981	12	SHA256 00fc34b67e9d193819ca78abd8e74458eda1aaa322d259362f7f191ae6fcdd70 files/ocfs2.init 2981
		13	AUX page-h.patch 353 RMD160 ffdc12337952a73bed2e21f9b18892e9967fc6d3 SHA1 8404f9e599d499089d50289a6c727421b4c00222 SHA256 49f28cf2af0ac23dcd30efce2482cef481ef9f929c0f90ab0aa5f9b26da0b14d
		14	MD5 0abc435c88c145c540e46a75b33415d9 files/page-h.patch 353
		15	RMD160 ffdc12337952a73bed2e21f9b18892e9967fc6d3 files/page-h.patch 353
		16	SHA256 49f28cf2af0ac23dcd30efce2482cef481ef9f929c0f90ab0aa5f9b26da0b14d files/page-h.patch 353
13	DIST ocfs2-tools-1.2.1.tar.gz 436783 RMD160 496ade1c11f507ed1e8fdfc8cd0e446f735e8b25 SHA1 3b6b9b40cfe1d441b52774776ac0a80bcbe401a9 SHA256 a53354357352eadb9efad33590c262d6a0e00ec5fb7d2248354de83719b113e9	17	DIST ocfs2-tools-1.2.1.tar.gz 436783 RMD160 496ade1c11f507ed1e8fdfc8cd0e446f735e8b25 SHA1 3b6b9b40cfe1d441b52774776ac0a80bcbe401a9 SHA256 a53354357352eadb9efad33590c262d6a0e00ec5fb7d2248354de83719b113e9
		18	DIST ocfs2-tools-1.2.6.tar.gz 481402 RMD160 e5da6d622541b07d48183aac32eaa9d0fc3c9be1 SHA1 b94d03770a1eb40b9f1cb32bbbe34570a125a713 SHA256 f06aedee74cac336c842699e207eda09b20a285c72903d207eb80fdc9d78a257
14	EBUILD ocfs2-tools-1.2.1.ebuild 2256 RMD160 fb008da188d348d2fa7228259130ac6ed384bafc SHA1 33afc430db21298271803dbc5f73859d7520698e SHA256 e04bee0acfd88c815d29b141d8e596f6e9ed44f1cc66f8e4db75689403c85578	19	EBUILD ocfs2-tools-1.2.1.ebuild 2256 RMD160 fb008da188d348d2fa7228259130ac6ed384bafc SHA1 33afc430db21298271803dbc5f73859d7520698e SHA256 e04bee0acfd88c815d29b141d8e596f6e9ed44f1cc66f8e4db75689403c85578
15	MD5 6074dbffec9ee1f4be6dcce77c6026d4 ocfs2-tools-1.2.1.ebuild 2256	20	MD5 6074dbffec9ee1f4be6dcce77c6026d4 ocfs2-tools-1.2.1.ebuild 2256
16	RMD160 fb008da188d348d2fa7228259130ac6ed384bafc ocfs2-tools-1.2.1.ebuild 2256	21	RMD160 fb008da188d348d2fa7228259130ac6ed384bafc ocfs2-tools-1.2.1.ebuild 2256
17	SHA256 e04bee0acfd88c815d29b141d8e596f6e9ed44f1cc66f8e4db75689403c85578 ocfs2-tools-1.2.1.ebuild 2256	22	SHA256 e04bee0acfd88c815d29b141d8e596f6e9ed44f1cc66f8e4db75689403c85578 ocfs2-tools-1.2.1.ebuild 2256
		23	EBUILD ocfs2-tools-1.2.6.ebuild 2324 RMD160 c1a17c7fb44aa24b0a7d58f0cb906cc6be0429db SHA1 f1be5db90cfb156a1e9bd322c8733824673be955 SHA256 9b4e0b677e0840f29730e9bb8b5c6afa8fd9acea8043518aa3e66b4f6b091f63
		24	MD5 1c9559d3b4e500450ebf6e5069f27a65 ocfs2-tools-1.2.6.ebuild 2324
		25	RMD160 c1a17c7fb44aa24b0a7d58f0cb906cc6be0429db ocfs2-tools-1.2.6.ebuild 2324
		26	SHA256 9b4e0b677e0840f29730e9bb8b5c6afa8fd9acea8043518aa3e66b4f6b091f63 ocfs2-tools-1.2.6.ebuild 2324
18	MISC ChangeLog 923 RMD160 6ca8d6f994ae386521c70ab42177add90125b372 SHA1 445ff7bae18fd370bbe2a66902da3c035bc73d80 SHA256 7c7e22c1c868f96d96f330c51c47e0e4e863c878d5460dee3f16c91bc46fba82	27	MISC ChangeLog 923 RMD160 6ca8d6f994ae386521c70ab42177add90125b372 SHA1 445ff7bae18fd370bbe2a66902da3c035bc73d80 SHA256 7c7e22c1c868f96d96f330c51c47e0e4e863c878d5460dee3f16c91bc46fba82
19	MD5 ddc110c233ba8dbd1ad8937c2853ce8a ChangeLog 923	28	MD5 ddc110c233ba8dbd1ad8937c2853ce8a ChangeLog 923
20	RMD160 6ca8d6f994ae386521c70ab42177add90125b372 ChangeLog 923	29	RMD160 6ca8d6f994ae386521c70ab42177add90125b372 ChangeLog 923
Lines 26-28 Link Here
26	MD5 b3a740e3190e7ef647cc9a7d4bbf8fb7 files/digest-ocfs2-tools-1.2.1 253	35	MD5 b3a740e3190e7ef647cc9a7d4bbf8fb7 files/digest-ocfs2-tools-1.2.1 253
27	RMD160 19ae09e483f217da3a01ba39b6a111bebee462b7 files/digest-ocfs2-tools-1.2.1 253	36	RMD160 19ae09e483f217da3a01ba39b6a111bebee462b7 files/digest-ocfs2-tools-1.2.1 253
28	SHA256 5863ff04d35586f8e36f53e745d1e538b2540f4b2778b59de0128f1891b8ca61 files/digest-ocfs2-tools-1.2.1 253	37	SHA256 5863ff04d35586f8e36f53e745d1e538b2540f4b2778b59de0128f1891b8ca61 files/digest-ocfs2-tools-1.2.1 253
		38	MD5 18da641f9dd7647a98793da7ac3e5698 files/digest-ocfs2-tools-1.2.6 253
		39	RMD160 b736e6b240d7c3371b36449f7cc11aac4333e54f files/digest-ocfs2-tools-1.2.6 253
		40	SHA256 b3d619861051a508420890efbb139af0b4a4dddd6ac65acfcd7d3e122b749df3 files/digest-ocfs2-tools-1.2.6 253

Line 0 Link Here

(-)ocfs2-tools.old/files/digest-ocfs2-tools-1.2.1 (+3 lines)
	1	MD5 62c24ae0f3016eb5c15f0dfc90fe956a ocfs2-tools-1.2.1.tar.gz 436783
	2	RMD160 496ade1c11f507ed1e8fdfc8cd0e446f735e8b25 ocfs2-tools-1.2.1.tar.gz 436783
	3	SHA256 a53354357352eadb9efad33590c262d6a0e00ec5fb7d2248354de83719b113e9 ocfs2-tools-1.2.1.tar.gz 436783

Line 0 Link Here

(-)ocfs2-tools.old/files/digest-ocfs2-tools-1.2.6 (+3 lines)
	1	MD5 4fad4ccdc105282303c74a22e3a05ff1 ocfs2-tools-1.2.6.tar.gz 481402
	2	RMD160 e5da6d622541b07d48183aac32eaa9d0fc3c9be1 ocfs2-tools-1.2.6.tar.gz 481402
	3	SHA256 f06aedee74cac336c842699e207eda09b20a285c72903d207eb80fdc9d78a257 ocfs2-tools-1.2.6.tar.gz 481402




--- ocfs2-tools-1.2.6/mount.ocfs2/mount.ocfs2.h.old	2007-09-20 22:54:21.000000000 +0200

# 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/ocfs2-tools-1.2.1.ebuild,v 1.3 2007/06/26 02:53:50 mr_bones_ Exp $

inherit eutils

PV_MAJOR="${PV%%.*}"
PV_MINOR="${PV#*.}"
PV_MINOR="${PV_MINOR%%.*}"
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"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="X"
# (#142216) build system's broke, always requires glib for debugfs utility
RDEPEND="X? (
		=x11-libs/gtk+-2*
		>=dev-lang/python-2
		>=dev-python/pygtk-2
	)
	>=dev-libs/glib-2.2.3
	sys-fs/e2fsprogs"
DEPEND="${RDEPEND}"

src_compile() {

	epatch ${FILESDIR}/page-h.patch

	local myconf="--enable-dynamic-fsck --enable-dynamic-ctl"

	econf --prefix=${ROOT} \
		$(use_enable X ocfs2console) \
		${myconf} \
		|| die "Failed to configure"

	emake -j1 || die "Failed to compile"
}

src_install() {
	make DESTDIR="${D}" install || die "Failed to install"

	doman \
		mkfs.ocfs2/mkfs.ocfs2.8 \
		ocfs2cdsl/ocfs2cdsl.8 \
		ocfs2console/ocfs2console.8 \
		ocfs2_hb_ctl/ocfs2_hb_ctl.8 \
		tunefs.ocfs2/tunefs.ocfs2.8
	dodoc \
		COPYING CREDITS MAINTAINERS README README.O2CB debugfs.ocfs2/README \
		documentation/users_guide.txt documentation/samples/cluster.conf \
		"${FILESDIR}"/INSTALL.GENTOO

	# Keep o2cb script in case someone needs it
	insinto /usr/sbin
	newins "${S}"/vendor/common/o2cb.init o2cb
	insinto /etc/default
	newins "${S}"/vendor/common/o2cb.sysconfig o2cb

	# Move programs not needed before /usr is mounted to /usr/sbin/
	mv "${D}"/sbin/ocfs2cdsl "${D}"/usr/sbin/
	mv "${D}"/sbin/ocfs2console "${D}"/usr/sbin/

	newinitd "${FILESDIR}"/ocfs2.init ocfs2
	newconfd "${FILESDIR}"/ocfs2.conf ocfs2

	insinto /etc/ocfs2
	newins "${S}"/documentation/samples/cluster.conf cluster.conf

	keepdir /config
	keepdir /dlm

	# FIXME - fix the python lib.
	# pythonians wouldn't like this probably, but I couldn't find better
	# solution.
	mv "${D}"/$(get_libdir) "${D}"/usr
}

pkg_postinst() {
	elog "Read ${ROOT}usr/share/doc/${P}/INSTALL.GENTOO.gz for instructions"
	elog "about how to install, configure and run ocfs2."
}

Return to bug 193249

Line 0 Link Here

(-)ocfs2-tools.old/ocfs2-tools-1.2.6.ebuild (+84 lines)
		1	--- ocfs2-tools-1.2.6/mount.ocfs2/mount.ocfs2.h.old 2007-09-20 22:54:21.000000000 +0200
Line 0 Link Here
		1	# Copyright 1999-2006 Gentoo Foundation
		2	# Distributed under the terms of the GNU General Public License v2
		3	# $Header: /var/cvsroot/gentoo-x86/sys-fs/ocfs2-tools/ocfs2-tools-1.2.1.ebuild,v 1.3 2007/06/26 02:53:50 mr_bones_ Exp $
		4
		5	inherit eutils
		6
		7	PV_MAJOR="${PV%%.*}"
		8	PV_MINOR="${PV#*.}"
		9	PV_MINOR="${PV_MINOR%%.*}"
		10	DESCRIPTION="Support programs for the Oracle Cluster Filesystem 2"
		11	HOMEPAGE="http://oss.oracle.com/projects/ocfs2-tools/"
		12	SRC_URI="http://oss.oracle.com/projects/ocfs2-tools/dist/files/source/v${PV_MAJOR}.${PV_MINOR}/${P}.tar.gz"
		13	LICENSE="GPL-2"
		14	SLOT="0"
		15	KEYWORDS="~amd64 ~x86"
		16	IUSE="X"
		17	# (#142216) build system's broke, always requires glib for debugfs utility
		18	RDEPEND="X? (
		19	=x11-libs/gtk+-2*
		20	>=dev-lang/python-2
		21	>=dev-python/pygtk-2
		22	)
		23	>=dev-libs/glib-2.2.3
		24	sys-fs/e2fsprogs"
		25	DEPEND="${RDEPEND}"
		26
		27	src_compile() {
		28
		29	epatch ${FILESDIR}/page-h.patch
		30
		31	local myconf="--enable-dynamic-fsck --enable-dynamic-ctl"
		32
		33	econf --prefix=${ROOT} \
		34	$(use_enable X ocfs2console) \
		35	${myconf} \
		36	\|\| die "Failed to configure"
		37
		38	emake -j1 \|\| die "Failed to compile"
		39	}
		40
		41	src_install() {
		42	make DESTDIR="${D}" install \|\| die "Failed to install"
		43
		44	doman \
		45	mkfs.ocfs2/mkfs.ocfs2.8 \
		46	ocfs2cdsl/ocfs2cdsl.8 \
		47	ocfs2console/ocfs2console.8 \
		48	ocfs2_hb_ctl/ocfs2_hb_ctl.8 \
		49	tunefs.ocfs2/tunefs.ocfs2.8
		50	dodoc \
		51	COPYING CREDITS MAINTAINERS README README.O2CB debugfs.ocfs2/README \
		52	documentation/users_guide.txt documentation/samples/cluster.conf \
		53	"${FILESDIR}"/INSTALL.GENTOO
		54
		55	# Keep o2cb script in case someone needs it
		56	insinto /usr/sbin
		57	newins "${S}"/vendor/common/o2cb.init o2cb
		58	insinto /etc/default
		59	newins "${S}"/vendor/common/o2cb.sysconfig o2cb
		60
		61	# Move programs not needed before /usr is mounted to /usr/sbin/
		62	mv "${D}"/sbin/ocfs2cdsl "${D}"/usr/sbin/
		63	mv "${D}"/sbin/ocfs2console "${D}"/usr/sbin/
		64
65	newinitd "${FILESDIR}"/ocfs2.init ocfs2
66	newconfd "${FILESDIR}"/ocfs2.conf ocfs2
67
68	insinto /etc/ocfs2
69	newins "${S}"/documentation/samples/cluster.conf cluster.conf
70
71	keepdir /config
72	keepdir /dlm
73
74	# FIXME - fix the python lib.
75	# pythonians wouldn't like this probably, but I couldn't find better
76	# solution.
77	mv "${D}"/$(get_libdir) "${D}"/usr
78	}
79
80	pkg_postinst() {
81	elog "Read ${ROOT}usr/share/doc/${P}/INSTALL.GENTOO.gz for instructions"
82	elog "about how to install, configure and run ocfs2."
83	}