mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-10 06:26:57 +02:00
lvm2: upgraded to latest upstream stable
Upgraded sys-fs/lvm2 to version 2.02.88 on amd64, arm, x86. We want a newer version that installs udev rules into /lib/ all the time. BUG=chromium-os:27772 TEST=`emerge-amd64-generic lvm2` worked and installed rules into /lib/udev/rules.d/ TEST=`emerge-arm-generic lvm2` worked and installed rules into /lib/udev/rules.d/ TEST=`emerge-x86-generic lvm2` worked and installed rules into /lib/udev/rules.d/ Change-Id: Iecf6b5f94c12c36f514aea2b485e524f92798040 Reviewed-on: https://gerrit.chromium.org/gerrit/19117 Reviewed-by: Sonny Rao <sonnyrao@chromium.org> Tested-by: Mike Frysinger <vapier@chromium.org> Commit-Ready: Mike Frysinger <vapier@chromium.org>
This commit is contained in:
Mike Frysinger
Gerrit
parent
a330480b4c
commit
82c2be9a8e
@ -1,13 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install postinst prepare setup test unpack
|
||||
DEPEND=!!sys-fs/device-mapper clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) >=sys-fs/udev-151-r4 dev-util/pkgconfig >=sys-devel/binutils-2.20.1-r1 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
|
||||
DESCRIPTION=User-land utilities for LVM2 (device-mapper) software.
|
||||
EAPI=2
|
||||
HOMEPAGE=http://sources.redhat.com/lvm2/
|
||||
IUSE=readline +static clvm cman +lvm1 selinux
|
||||
KEYWORDS=alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 s390 sh sparc x86
|
||||
LICENSE=GPL-2
|
||||
RDEPEND=!!sys-fs/device-mapper clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) >=sys-fs/udev-151-r4 !<sys-apps/openrc-0.4 !!sys-fs/lvm-user !!sys-fs/clvm >=sys-apps/util-linux-2.16 !<sys-fs/cryptsetup-1.1.2
|
||||
SLOT=0
|
||||
SRC_URI=ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.73.tgz ftp://sources.redhat.com/pub/lvm2/old/LVM2.2.02.73.tgz
|
||||
_eclasses_=autotools 63332a15502113ca711ccccb3889a109 eutils 33ef77a15337022e05342d2c772a7a5a libtool 0fd90d183673bf1107465ec45849d1ea linux-info cc184ad3383ffb6ffbaa82f53608e77f multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 6526ac6fc9aedf391efb91fcd75ace68 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed
|
||||
_md5_=96a84250221ba00d68103a2997b71765
|
||||
13
sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/lvm2-2.02.88
vendored
Normal file
13
sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/lvm2-2.02.88
vendored
Normal file
@ -0,0 +1,13 @@
|
||||
DEFINED_PHASES=compile configure install postinst prepare setup test unpack
|
||||
DEPEND=!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) >=sys-fs/udev-151-r4 dev-util/pkgconfig >=sys-devel/binutils-2.20.1-r1 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
|
||||
DESCRIPTION=User-land utilities for LVM2 (device-mapper) software.
|
||||
EAPI=3
|
||||
HOMEPAGE=http://sources.redhat.com/lvm2/
|
||||
IUSE=readline +static +static-libs clvm cman +lvm1 selinux
|
||||
KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-linux
|
||||
LICENSE=GPL-2
|
||||
RDEPEND=!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) >=sys-fs/udev-151-r4 !<sys-apps/openrc-0.4 !!sys-fs/lvm-user !!sys-fs/clvm >=sys-apps/util-linux-2.16 !<sys-fs/cryptsetup-1.1.2
|
||||
SLOT=0
|
||||
SRC_URI=ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.88.tgz ftp://sources.redhat.com/pub/lvm2/old/LVM2.2.02.88.tgz
|
||||
_eclasses_=autotools 63332a15502113ca711ccccb3889a109 eutils 33ef77a15337022e05342d2c772a7a5a libtool 0fd90d183673bf1107465ec45849d1ea linux-info cc184ad3383ffb6ffbaa82f53608e77f multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 6526ac6fc9aedf391efb91fcd75ace68 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed
|
||||
_md5_=29e3a8cc6dbda28eac2cec6008c380c7
|
||||
File diff suppressed because it is too large
Load Diff
@ -1 +1 @@
|
||||
DIST LVM2.2.02.73.tgz 937803 RMD160 c06b4c6c64ad37f063f1d8902f227e3de790c438 SHA1 297feef08dced7d64bff9f5f8a47c1916fcb2afa SHA256 9e8295d3ef36b5f56e213f8cb9ac9981cfa02fb2c95fe6879d6012d6128a8fc8
|
||||
DIST LVM2.2.02.88.tgz 1029151 RMD160 a5918c6dfef8300b8ad9ab53e913ab487a051436 SHA1 05a4fb09cb5e3d680ad1b268c941968853fb1979 SHA256 a129d1d3949524da7d6d2a67218254baea02df06a6744faa5808a4182b2fb432
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#!/sbin/runscript
|
||||
# Copyright 1999-2005 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/clvmd.rc-2.02.39,v 1.1 2009/05/19 00:08:35 robbat2 Exp $
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/clvmd.rc-2.02.39,v 1.2 2010/05/01 21:26:32 robbat2 Exp $
|
||||
|
||||
[ -x /usr/sbin/clvmd ] && CLVMD_BIN="/usr/sbin/clvmd" || CLVMD_BIN="/sbin/clvmd"
|
||||
|
||||
@ -14,8 +14,7 @@ VGDISPLAY="/sbin/vgdisplay"
|
||||
CLVMD_PIDFILE="/var/run/clvmd.pid"
|
||||
|
||||
depend() {
|
||||
use dns logger
|
||||
use net
|
||||
use net dns logger dmeventd
|
||||
need cman
|
||||
}
|
||||
|
||||
|
||||
28
sdk_container/src/third_party/portage-stable/sys-fs/lvm2/files/device-mapper.rc-1.02.51-r2
vendored
Normal file
28
sdk_container/src/third_party/portage-stable/sys-fs/lvm2/files/device-mapper.rc-1.02.51-r2
vendored
Normal file
@ -0,0 +1,28 @@
|
||||
#!/sbin/runscript
|
||||
# Copyright 1999-2008 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/device-mapper.rc-1.02.51-r2,v 1.2 2010/05/01 21:26:33 robbat2 Exp $
|
||||
|
||||
depend() {
|
||||
# necessary for services when using baselayout-2
|
||||
# but conflict for baselayout-1
|
||||
if [ -e /etc/init.d/root ] ; then
|
||||
before checkfs fsck
|
||||
after modules
|
||||
fi
|
||||
after dmeventd
|
||||
}
|
||||
|
||||
start() {
|
||||
if [ ! -e /etc/init.d/root ] ; then
|
||||
eerror "The ${SVCNAME} init script is written for baselayout-2"
|
||||
eerror "Please do not use it with baselayout-1"
|
||||
return 1
|
||||
fi
|
||||
|
||||
local f=/lib/rcscripts/addons/dm-start.sh
|
||||
if [ -r "$f" ]; then
|
||||
( . "$f" )
|
||||
fi
|
||||
}
|
||||
|
||||
11
sdk_container/src/third_party/portage-stable/sys-fs/lvm2/files/lvm2-2.02.70-locale-muck.patch
vendored
Normal file
11
sdk_container/src/third_party/portage-stable/sys-fs/lvm2/files/lvm2-2.02.70-locale-muck.patch
vendored
Normal file
@ -0,0 +1,11 @@
|
||||
--- make.tmpl.in.orig 2010-08-04 10:10:17.000000000 +0300
|
||||
+++ make.tmpl.in 2010-08-04 10:10:33.000000000 +0300
|
||||
@@ -360,7 +360,7 @@
|
||||
( cat $(srcdir)/.exported_symbols; \
|
||||
if test x$(EXPORTED_HEADER) != x; then \
|
||||
$(CC) -E -P $(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 \
|
||||
) > $@
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
Index: LVM2.2.02.73/tools/Makefile.in
|
||||
===================================================================
|
||||
--- LVM2.2.02.73.orig/tools/Makefile.in
|
||||
+++ LVM2.2.02.73/tools/Makefile.in
|
||||
@@ -149,8 +149,8 @@ liblvm2cmd-static.a: $(top_builddir)/lib
|
||||
|
||||
liblvm2cmd.$(LIB_SUFFIX): liblvm2cmd.a $(LDDEPS)
|
||||
$(CC) -shared -Wl,-soname,$@.$(LIB_VERSION) \
|
||||
- $(CFLAGS) $(CLDFLAGS) -o $@ $(LVMLIBS) $(LIBS) \
|
||||
- @CLDWHOLEARCHIVE@ liblvm2cmd.a @CLDNOWHOLEARCHIVE@
|
||||
+ $(CFLAGS) $(CLDFLAGS) -o $@ \
|
||||
+ @CLDWHOLEARCHIVE@ liblvm2cmd.a @CLDNOWHOLEARCHIVE@ $(LVMLIBS) $(LIBS)
|
||||
|
||||
liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION): liblvm2cmd.$(LIB_SUFFIX)
|
||||
$(LN_S) -f $< $@
|
||||
17
sdk_container/src/third_party/portage-stable/sys-fs/lvm2/files/lvm2-2.02.88-respect-cc.patch
vendored
Normal file
17
sdk_container/src/third_party/portage-stable/sys-fs/lvm2/files/lvm2-2.02.88-respect-cc.patch
vendored
Normal file
@ -0,0 +1,17 @@
|
||||
GNU make always defaults CC to "cc", so using "?=" with the CC variable
|
||||
will never override the internal make value. since @CC@ comes from the
|
||||
configure script, and that respects the $CC env var, don't bother trying
|
||||
to handle it in make too. it's not like we do this with any other build
|
||||
variable after all.
|
||||
|
||||
--- a/make.tmpl.in
|
||||
+++ b/make.tmpl.in
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
@SET_MAKE@
|
||||
|
||||
-CC ?= @CC@
|
||||
+CC = @CC@
|
||||
RANLIB = @RANLIB@
|
||||
INSTALL = @INSTALL@
|
||||
MKDIR_P = @MKDIR_P@
|
||||
@ -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
|
||||
12
sdk_container/src/third_party/portage-stable/sys-fs/lvm2/files/lvm2-2.02.92-locale-muck.patch
vendored
Normal file
12
sdk_container/src/third_party/portage-stable/sys-fs/lvm2/files/lvm2-2.02.92-locale-muck.patch
vendored
Normal file
@ -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 \
|
||||
) > $@
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
# Copyright 1999-2010 Gentoo Foundation
|
||||
# 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.73-r1.ebuild,v 1.7 2010/11/25 15:32:02 ranger Exp $
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.88.ebuild,v 1.11 2012/02/25 15:17:50 ssuominen Exp $
|
||||
|
||||
EAPI=2
|
||||
EAPI=3
|
||||
inherit eutils multilib toolchain-funcs autotools linux-info
|
||||
|
||||
DESCRIPTION="User-land utilities for LVM2 (device-mapper) software."
|
||||
@ -12,11 +12,12 @@ SRC_URI="ftp://sources.redhat.com/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 s390 sh sparc x86"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-linux"
|
||||
|
||||
IUSE="readline +static clvm cman +lvm1 selinux"
|
||||
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"
|
||||
@ -46,7 +47,7 @@ pkg_setup() {
|
||||
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 the filename!"
|
||||
elog "you must append .static to the filename!"
|
||||
fi
|
||||
}
|
||||
|
||||
@ -83,8 +84,13 @@ src_prepare() {
|
||||
epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch
|
||||
# bug 332905
|
||||
epatch "${FILESDIR}"/${PN}-2.02.72-dynamic-static-ldflags.patch
|
||||
# bug 361429 - merged upstream in .85
|
||||
#epatch "${FILESDIR}"/${PN}-2.02.84-udev-pkgconfig.patch
|
||||
|
||||
epatch "${FILESDIR}"/${PN}-2.02.73-asneeded.patch
|
||||
# Merged upstream
|
||||
#epatch "${FILESDIR}"/${PN}-2.02.73-asneeded.patch
|
||||
|
||||
epatch "${FILESDIR}"/${PN}-2.02.88-respect-cc.patch
|
||||
|
||||
eautoreconf
|
||||
}
|
||||
@ -151,17 +157,18 @@ src_configure() {
|
||||
fi
|
||||
|
||||
myconf="${myconf}
|
||||
--sbindir=/sbin
|
||||
--with-staticdir=/sbin
|
||||
--with-dmeventd-path=/sbin/dmeventd"
|
||||
econf $(use_enable readline) \
|
||||
$(use_enable selinux) \
|
||||
--enable-pkgconfig \
|
||||
--libdir=/$(get_libdir) \
|
||||
--with-usrlibdir=/usr/$(get_libdir) \
|
||||
--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=/$(get_libdir)/udev/rules.d/ \
|
||||
--with-udevdir="${EPREFIX}/lib/udev/rules.d/" \
|
||||
${myconf} \
|
||||
CLDFLAGS="${LDFLAGS}" || die
|
||||
}
|
||||
@ -179,36 +186,7 @@ src_compile() {
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die "Failed to emake install"
|
||||
|
||||
# All of this was change by upstream, and if we don't get any problems, we
|
||||
# can probably drop it in .65
|
||||
#X## Revamp all of our library handling for bug #316571
|
||||
#X## Upstream build script puts a lot of this stuff into /usr/lib regardless of
|
||||
#X## libdir variable.
|
||||
#X#dodir /$(get_libdir)
|
||||
#X## .so -> /$(get_libdir)
|
||||
#X#mv -f "${D}"/usr/lib/lib*.so* "${D}"/$(get_libdir)
|
||||
#X#[[ "$(get_libdir)" != "lib" ]] && \
|
||||
#X# mv "${D}"/usr/$(get_libdir)/lib*.so* "${D}"/$(get_libdir)
|
||||
#X## .a -> /usr/$(get_libdir)
|
||||
#X#[[ "$(get_libdir)" != "lib" ]] && \
|
||||
#X# mv -f "${D}"/usr/lib/lib*.a "${D}"/usr/$(get_libdir)
|
||||
#X## The upstream symlinks are borked. lets rebuild them instead.
|
||||
#X#find "${D}"/{usr,}/{lib,$(get_libdir)} -type l \
|
||||
#X# | xargs rm -f 2>/dev/null
|
||||
#X#for i in "${D}"/$(get_libdir)/*.so.* ; do
|
||||
#X# b="${i//*\/}" o="${b/.so.*/.so}"
|
||||
#X# ln -s "${b}" "${D}/$(get_libdir)/${o}"
|
||||
#X#done
|
||||
#X## Now enable building properly
|
||||
#X#for i in \
|
||||
#X# libdevmapper-event{,-lvm2{,mirror,snapshot}} \
|
||||
#X# libdevmapper \
|
||||
#X# liblvm2{format1,snapshot,cmd,app} \
|
||||
#X# ; do
|
||||
#X# gen_usr_ldscript ${i}.so || die
|
||||
#X#done
|
||||
|
||||
dodoc README VERSION WHATS_NEW doc/*.{conf,c,txt}
|
||||
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
|
||||
@ -221,8 +199,10 @@ src_install() {
|
||||
fi
|
||||
|
||||
# move shared libs to /lib(64)
|
||||
dolib.a libdm/ioctl/libdevmapper.a || die "dolib.a libdevmapper.a"
|
||||
#gen_usr_ldscript libdevmapper.so
|
||||
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
|
||||
@ -238,21 +218,26 @@ src_install() {
|
||||
newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper || die
|
||||
|
||||
newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd || die
|
||||
dolib.a daemons/dmeventd/libdevmapper-event.a \
|
||||
|| die "dolib.a libdevmapper-event.a"
|
||||
#gen_usr_ldscript libdevmapper-event.so
|
||||
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 "${D}"/etc/init.d/*
|
||||
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 use them"
|
||||
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."
|
||||
}
|
||||
@ -261,7 +246,7 @@ 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 using baselayout-1 still."
|
||||
elog "Do NOT add it if you are still using baselayout-1."
|
||||
}
|
||||
|
||||
src_test() {
|
||||
@ -1,24 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>no-herd</herd>
|
||||
<maintainer>
|
||||
<email>robbat2@gentoo.org</email>
|
||||
<name>Robin H. Johnson</name>
|
||||
</maintainer>
|
||||
<maintainer>
|
||||
<email>cardoe@gentoo.org</email>
|
||||
<name>Doug Goldstein</name>
|
||||
</maintainer>
|
||||
<maintainer>
|
||||
<email>agk@redhat.com</email>
|
||||
<name>Alasdair Kergon</name>
|
||||
<description>Upstream Maintainer (please CC on bugs)</description>
|
||||
</maintainer>
|
||||
<use>
|
||||
<flag name='clvm'>Allow users to build clustered lvm2</flag>
|
||||
<flag name='cman'>Cman support for clustered lvm</flag>
|
||||
<flag name='lvm1'>Allow users to build lvm2 with lvm1 support</flag>
|
||||
<flag name='nolvmstatic'>Allow users to build lvm2 dynamically</flag>
|
||||
</use>
|
||||
</pkgmetadata>
|
||||
Loading…
Reference in New Issue
Block a user