Bug #402193: version bump. lvmetad does not compile, will be added in 2.02.93.

(Portage version: 2.2.0_alpha87/cvs/Linux x86_64)

4 files changed, 338 insertions, 1 deletions

diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog
index 410ea3a87ec3..082c1cdf181b 100644
--- a/sys-fs/lvm2/ChangeLog
+++ b/sys-fs/lvm2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/lvm2
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.257 2012/02/11 19:10:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.258 2012/02/21 06:31:40 robbat2 Exp $
+
+*lvm2-2.02.92 (21 Feb 2012)
+
+  21 Feb 2012; Robin H. Johnson <robbat2@gentoo.org>
+  +files/lvm2-2.02.92-dynamic-static-ldflags.patch,
+  +files/lvm2-2.02.92-locale-muck.patch, +lvm2-2.02.92.ebuild:
+  Bug #402193: version bump. lvmetad does not compile, will be added in 2.02.93.
 
   11 Feb 2012; Raúl Porcel <armin76@gentoo.org> lvm2-2.02.88.ebuild:
   alpha/ia64/s390/sh/sparc stable wrt #400557
diff --git a/sys-fs/lvm2/files/lvm2-2.02.92-dynamic-static-ldflags.patch b/sys-fs/lvm2/files/lvm2-2.02.92-dynamic-static-ldflags.patch
new file mode 100644
index 000000000000..de2b294ef3e4
--- /dev/null
+++ b/sys-fs/lvm2/files/lvm2-2.02.92-dynamic-static-ldflags.patch
@@ -0,0 +1,63 @@
+diff -Nuar --exclude '*.rej' --exclude '*.orig' LVM2.2.02.92.orig/configure.in LVM2.2.02.92/configure.in
+--- LVM2.2.02.92.orig/configure.in	2012-02-20 11:36:27.000000000 -0800
++++ LVM2.2.02.92/configure.in	2012-02-20 15:53:40.700124222 -0800
+@@ -32,6 +32,7 @@
+ 		COPTIMISE_FLAG="-O2"
+ 		CLDFLAGS="$CLDFLAGS -Wl,--version-script,.export.sym"
+ 		ELDFLAGS="-Wl,--export-dynamic"
++		STATIC_LDFLAGS="-Wl,--no-export-dynamic"
+ 		# FIXME Generate list and use --dynamic-list=.dlopen.sym
+ 		CLDWHOLEARCHIVE="-Wl,-whole-archive"
+ 		CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive"
+@@ -1458,6 +1459,7 @@
+ AC_SUBST(SELINUX_PC)
+ AC_SUBST(SNAPSHOTS)
+ AC_SUBST(STATICDIR)
++AC_SUBST(STATIC_LDFLAGS)
+ AC_SUBST(STATIC_LINK)
+ AC_SUBST(TESTING)
+ AC_SUBST(THIN)
+diff -Nuar --exclude '*.rej' --exclude '*.orig' LVM2.2.02.92.orig/daemons/dmeventd/Makefile.in LVM2.2.02.92/daemons/dmeventd/Makefile.in
+--- LVM2.2.02.92.orig/daemons/dmeventd/Makefile.in	2012-02-20 15:48:04.861683196 -0800
++++ LVM2.2.02.92/daemons/dmeventd/Makefile.in	2012-02-20 15:52:50.732314588 -0800
+@@ -65,7 +65,7 @@
+ 	$(DL_LIBS) $(LVMLIBS) $(LIBS) -rdynamic
+ 
+ dmeventd.static: $(LIB_STATIC) dmeventd.o $(interfacebuilddir)/libdevmapper.a
+-	$(CC) $(CFLAGS) $(LDFLAGS) $(ELDFLAGS) -static -L. -L$(interfacebuilddir) -o $@ \
++	$(CC) $(CFLAGS) $(LDFLAGS) $(ELDFLAGS) $(STATIC_LDFLAGS) -static -L. -L$(interfacebuilddir) -o $@ \
+ 	dmeventd.o $(DL_LIBS) $(LVMLIBS) $(LIBS) $(STATIC_LIBS)
+ 
+ ifeq ("@PKGCONFIG@", "yes")
+diff -Nuar --exclude '*.rej' --exclude '*.orig' LVM2.2.02.92.orig/make.tmpl.in LVM2.2.02.92/make.tmpl.in
+--- LVM2.2.02.92.orig/make.tmpl.in	2012-02-20 15:48:05.034685963 -0800
++++ LVM2.2.02.92/make.tmpl.in	2012-02-20 15:48:58.622550855 -0800
+@@ -38,6 +38,7 @@
+ ELDFLAGS += @ELDFLAGS@
+ LDDEPS += @LDDEPS@
+ LDFLAGS += @LDFLAGS@
++STATIC_LDFLAGS += @STATIC_LDFLAGS@
+ LIB_SUFFIX = @LIB_SUFFIX@
+ LVMINTERNAL_LIBS = -llvm-internal $(UDEV_LIBS) $(DL_LIBS)
+ DL_LIBS = @DL_LIBS@
+diff -Nuar --exclude '*.rej' --exclude '*.orig' LVM2.2.02.92.orig/tools/Makefile.in LVM2.2.02.92/tools/Makefile.in
+--- LVM2.2.02.92.orig/tools/Makefile.in	2011-11-14 13:30:36.000000000 -0800
++++ LVM2.2.02.92/tools/Makefile.in	2012-02-20 15:52:25.242901501 -0800
+@@ -126,7 +126,7 @@
+ 	      -o $@ dmsetup.o -ldevmapper $(LIBS)
+ 
+ dmsetup.static: dmsetup.o $(interfacebuilddir)/libdevmapper.a
+-	$(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \
++	$(CC) $(CFLAGS) $(LDFLAGS) $(STATIC_LDFLAGS) -static -L$(interfacebuilddir) \
+ 	      -o $@ dmsetup.o -ldevmapper $(STATIC_LIBS) $(LIBS)
+ 
+ all: device-mapper
+@@ -136,7 +136,7 @@
+ 		$(LVMLIBS) $(READLINE_LIBS) $(LIBS) -rdynamic
+ 
+ lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a  $(interfacebuilddir)/libdevmapper.a
+-	$(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ \
++	$(CC) $(CFLAGS) $(LDFLAGS) $(STATIC_LDFLAGS) -static -L$(interfacebuilddir) -o $@ \
+ 	      $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS)
+ 
+ liblvm2cmd.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o
diff --git a/sys-fs/lvm2/files/lvm2-2.02.92-locale-muck.patch b/sys-fs/lvm2/files/lvm2-2.02.92-locale-muck.patch
new file mode 100644
index 000000000000..be9e66d02c71
--- /dev/null
+++ b/sys-fs/lvm2/files/lvm2-2.02.92-locale-muck.patch
@@ -0,0 +1,12 @@
+diff -Nuar LVM2.2.02.92.orig/make.tmpl.in LVM2.2.02.92/make.tmpl.in
+--- LVM2.2.02.92.orig/make.tmpl.in	2012-02-20 15:46:46.008422005 -0800
++++ LVM2.2.02.92/make.tmpl.in	2012-02-20 15:47:19.639959941 -0800
+@@ -382,7 +382,7 @@
+ 	( cat $(srcdir)/.exported_symbols; \
+ 	  if test x$(EXPORTED_HEADER) != x; then \
+ 		$(CC) -E -P $(INCLUDES) $(DEFS) $(EXPORTED_HEADER) | \
+-		$(SED) -ne "/^typedef|}/!s/.*[ \*]\(\$(EXPORTED_FN_PREFIX)_[a-z0-9_]*\)(.*/\1/p"; \
++		LC_ALL=C $(SED) -ne "/^typedef|}/!s/.*[ \*]\(\$(EXPORTED_FN_PREFIX)_[a-z0-9_]*\)(.*/\1/p"; \
+ 	  fi \
+ 	) > $@
+ 
diff --git a/sys-fs/lvm2/lvm2-2.02.92.ebuild b/sys-fs/lvm2/lvm2-2.02.92.ebuild
new file mode 100644
index 000000000000..befd01b2f939
--- /dev/null
+++ b/sys-fs/lvm2/lvm2-2.02.92.ebuild
@@ -0,0 +1,255 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.92.ebuild,v 1.1 2012/02/21 06:31:40 robbat2 Exp $
+
+EAPI=3
+inherit eutils multilib toolchain-funcs autotools linux-info
+
+DESCRIPTION="User-land utilities for LVM2 (device-mapper) software."
+HOMEPAGE="http://sources.redhat.com/lvm2/"
+SRC_URI="ftp://sources.redhat.com/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
+		 ftp://sources.redhat.com/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux"
+
+IUSE="readline +static +static-libs clvm cman +lvm1 selinux"
+
+DEPEND_COMMON="!!sys-fs/device-mapper
+	readline? ( sys-libs/readline )
+	clvm? ( =sys-cluster/dlm-2*
+			cman? ( =sys-cluster/cman-2* ) )
+	>=sys-fs/udev-151-r4"
+
+RDEPEND="${DEPEND_COMMON}
+	!<sys-apps/openrc-0.4
+	!!sys-fs/lvm-user
+	!!sys-fs/clvm
+	>=sys-apps/util-linux-2.16"
+
+# Upgrading to this LVM will break older cryptsetup
+RDEPEND="${RDEPEND}
+		!<sys-fs/cryptsetup-1.1.2"
+
+DEPEND="${DEPEND_COMMON}
+		dev-util/pkgconfig
+		>=sys-devel/binutils-2.20.1-r1"
+
+S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
+
+pkg_setup() {
+	local CONFIG_CHECK="~SYSVIPC"
+	local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
+	check_extra_config
+	# 1. Genkernel no longer copies /sbin/lvm blindly.
+	# 2. There are no longer any linking deps in /usr.
+	if use static; then
+		elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with"
+		elog "their static versions. If you need the static binaries,"
+		elog "you must append .static to the filename!"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/lvm.conf-2.02.67.patch
+
+	# Should not be needed due to upstream re-arrangement of build
+	#epatch "${FILESDIR}"/${PN}-2.02.56-dmeventd.patch
+	# Should not be need with new upstream udev rules
+	#epatch "${FILESDIR}"/${PN}-2.02.56-device-mapper-export-format.patch
+
+	# Merged upstream:
+	#epatch "${FILESDIR}"/${PN}-2.02.51-as-needed.patch
+	# Merged upstream:
+	#epatch "${FILESDIR}"/${PN}-2.02.48-fix-pkgconfig.patch
+	# Merged upstream:
+	#epatch "${FILESDIR}"/${PN}-2.02.51-fix-pvcreate.patch
+	# Fixed differently upstream:
+	#epatch "${FILESDIR}"/${PN}-2.02.51-dmsetup-selinux-linking-fix-r3.patch
+
+	epatch "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
+	epatch "${FILESDIR}"/lvm2-2.02.56-lvm2create_initrd.patch
+	# bug 318513
+	epatch "${FILESDIR}"/${PN}-2.02.64-dmeventd-libs.patch
+	# bug 301331
+	epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch
+	# bug 330373
+	epatch "${FILESDIR}"/${PN}-2.02.92-locale-muck.patch
+	# --as-needed
+	epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch
+	# bug 332905
+	epatch "${FILESDIR}"/${PN}-2.02.92-dynamic-static-ldflags.patch
+	# bug 361429 - merged upstream in .85
+	#epatch "${FILESDIR}"/${PN}-2.02.84-udev-pkgconfig.patch
+
+	# Merged upstream
+	#epatch "${FILESDIR}"/${PN}-2.02.73-asneeded.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	local buildmode
+
+	myconf="${myconf} --enable-dmeventd"
+	myconf="${myconf} --enable-cmdlib"
+	myconf="${myconf} --enable-applib"
+	myconf="${myconf} --enable-fsadm"
+	#myconf="${myconf} --enable-lvmetad" # Not ready yet
+
+	# Most of this package does weird stuff.
+	# The build options are tristate, and --without is NOT supported
+	# options: 'none', 'internal', 'shared'
+	if use static ; then
+		einfo "Building static LVM, for usage inside genkernel"
+		buildmode="internal"
+		# This only causes the .static versions to become available
+		# For recent systems, there are no linkages against anything in /usr anyway.
+		# We explicitly provide the .static versions so that they can be included in
+		# initramfs environments.
+		myconf="${myconf} --enable-static_link"
+	else
+		ewarn "Building shared LVM, it will not work inside genkernel!"
+		buildmode="shared"
+	fi
+
+	# dmeventd requires mirrors to be internal, and snapshot available
+	# so we cannot disable them
+	myconf="${myconf} --with-mirrors=internal"
+	myconf="${myconf} --with-snapshots=internal"
+	myconf="${myconf} --with-thin=internal"
+
+	if use lvm1 ; then
+		myconf="${myconf} --with-lvm1=${buildmode}"
+	else
+		myconf="${myconf} --with-lvm1=none"
+	fi
+
+	# disable O_DIRECT support on hppa, breaks pv detection (#99532)
+	use hppa && myconf="${myconf} --disable-o_direct"
+
+	if use clvm; then
+		myconf="${myconf} --with-cluster=${buildmode}"
+		# 4-state! Make sure we get it right, per bug 210879
+		# Valid options are: none, cman, gulm, all
+		#
+		# 2009/02:
+		# gulm is removed now, now dual-state:
+		# cman, none
+		# all still exists, but is not needed
+		#
+		# 2009/07:
+		# TODO: add corosync and re-enable ALL
+		local clvmd=""
+		use cman && clvmd="cman"
+		#clvmd="${clvmd/cmangulm/all}"
+		[ -z "${clvmd}" ] && clvmd="none"
+		myconf="${myconf} --with-clvmd=${clvmd}"
+		myconf="${myconf} --with-pool=${buildmode}"
+	else
+		myconf="${myconf} --with-clvmd=none --with-cluster=none"
+	fi
+
+	myconf="${myconf}
+			--with-dmeventd-path=/sbin/dmeventd"
+	econf $(use_enable readline) \
+		$(use_enable selinux) \
+		--enable-pkgconfig \
+		--with-confdir="${EPREFIX}/etc" \
+		--sbindir="${EPREFIX}/sbin" \
+		--with-staticdir="${EPREFIX}/sbin" \
+		--libdir="${EPREFIX}/$(get_libdir)" \
+		--with-usrlibdir="${EPREFIX}/usr/$(get_libdir)" \
+		--enable-udev_rules \
+		--enable-udev_sync \
+		--with-udevdir="${EPREFIX}/lib/udev/rules.d/" \
+		${myconf} \
+		CLDFLAGS="${LDFLAGS}" || die
+}
+
+src_compile() {
+	einfo "Doing symlinks"
+	pushd include
+	emake || die "Failed to prepare symlinks"
+	popd
+
+	einfo "Starting main build"
+	emake || die "compile fail"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Failed to emake install"
+
+	dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{conf,c,txt}
+	insinto /$(get_libdir)/rcscripts/addons
+	newins "${FILESDIR}"/lvm2-start.sh-2.02.67-r1 lvm-start.sh || die
+	newins "${FILESDIR}"/lvm2-stop.sh-2.02.67-r1 lvm-stop.sh || die
+	newinitd "${FILESDIR}"/lvm.rc-2.02.67-r1 lvm || die
+	newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.67-r2 lvm-monitoring || die
+	newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm || die
+	if use clvm; then
+		newinitd "${FILESDIR}"/clvmd.rc-2.02.39 clvmd || die
+		newconfd "${FILESDIR}"/clvmd.confd-2.02.39 clvmd || die
+	fi
+
+	# move shared libs to /lib(64)
+	if use static-libs; then
+		dolib.a libdm/ioctl/libdevmapper.a || die "dolib.a libdevmapper.a"
+		#gen_usr_ldscript libdevmapper.so
+	fi
+
+	dosbin "${S}"/scripts/lvm2create_initrd/lvm2create_initrd
+	doman  "${S}"/scripts/lvm2create_initrd/lvm2create_initrd.8
+	newdoc "${S}"/scripts/lvm2create_initrd/README README.lvm2create_initrd
+
+	insinto /etc
+	doins "${FILESDIR}"/dmtab
+	insinto /$(get_libdir)/rcscripts/addons
+	doins "${FILESDIR}"/dm-start.sh
+
+	# Device mapper stuff
+	newinitd "${FILESDIR}"/device-mapper.rc-2.02.67-r1 device-mapper || die
+	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper || die
+
+	newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd || die
+	if use static-libs; then
+		dolib.a daemons/dmeventd/libdevmapper-event.a \
+		|| die "dolib.a libdevmapper-event.a"
+		#gen_usr_ldscript libdevmapper-event.so
+	fi
+
+	use static-libs || \
+	rm -f "${D}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
+
+	#insinto /etc/udev/rules.d/
+	#newins "${FILESDIR}"/64-device-mapper.rules-2.02.56-r3 64-device-mapper.rules || die
+
+	# do not rely on /lib -> /libXX link
+	sed -e "s-/lib/rcscripts/-/$(get_libdir)/rcscripts/-" -i "${ED}"/etc/init.d/*
+
+	elog "USE flag nocman is deprecated and replaced"
+	elog "with the cman USE flag."
+	elog ""
+	elog "USE flags clvm and cman are masked"
+	elog "by default and need to be unmasked to be used"
+	elog ""
+	elog "If you are using genkernel and root-on-LVM, rebuild the initramfs."
+}
+
+pkg_postinst() {
+	elog "lvm volumes are no longer automatically created for"
+	elog "baselayout-2 users. If you are using baselayout-2, be sure to"
+	elog "run: # rc-update add lvm boot"
+	elog "Do NOT add it if you are still using baselayout-1."
+}
+
+src_test() {
+	einfo "Testcases disabled because of device-node mucking"
+	einfo "If you want them, compile the package and see ${S}/tests"
+}