summaryrefslogtreecommitdiff
path: root/package/lvm
diff options
context:
space:
mode:
Diffstat (limited to 'package/lvm')
-rw-r--r--package/lvm/Config.in20
-rw-r--r--package/lvm/Makefile24
-rw-r--r--package/lvm/patches/patch-Makefile_in12
-rw-r--r--package/lvm/patches/patch-doc_Makefile_in13
-rw-r--r--package/lvm/patches/patch-libdm_Makefile_in32
-rw-r--r--package/lvm/patches/patch-tools_Makefile_in28
6 files changed, 52 insertions, 77 deletions
diff --git a/package/lvm/Config.in b/package/lvm/Config.in
deleted file mode 100644
index b1e4c0175..000000000
--- a/package/lvm/Config.in
+++ /dev/null
@@ -1,20 +0,0 @@
-config ADK_COMPILE_LVM
- bool
- default n
- help
-
-config ADK_PACKAGE_LVM
- prompt "lvm............................... logical volume management"
- tristate
- select ADK_COMPILE_LVM
- select ADK_PACKAGE_DEVICE_MAPPER
- select ADK_PACKAGE_LIBNCURSES
- default n
- help
-
-config ADK_PACKAGE_DEVICE_MAPPER
- prompt "device-mapper..................... device-mapper"
- tristate
- select ADK_COMPILE_LVM
- default n
- help
diff --git a/package/lvm/Makefile b/package/lvm/Makefile
index 90c7f6405..5013b1645 100644
--- a/package/lvm/Makefile
+++ b/package/lvm/Makefile
@@ -4,40 +4,42 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= lvm
-PKG_VERSION:= 2.02.51
+PKG_VERSION:= 2.02.61
PKG_RELEASE:= 1
-PKG_MD5SUM:= 725d07794007e021bfc592b1636100c7
+PKG_MD5SUM:= 0fdac768c78d96525d47b5a3df4c67de
PKG_DESCR:= logical volume management
PKG_SECTION:= misc
-PKG_DEPENDS:= device-mapper libncurses
+PKG_DEPENDS:= libdevmapper libncurses
PKG_URL:= http://sourceware.org/lvm2/
PKG_SITES:= ftp://sources.redhat.com/pub/lvm2/
+PKG_DESCR_DM:= device-mapper utility
+PKG_DESCR_LIBDM:= device-mapper library
DISTFILES:= LVM2.${PKG_VERSION}.tgz
WRKDIST= ${WRKDIR}/LVM2.${PKG_VERSION}
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LVM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,DEVICE_MAPPER,device-mapper,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,DEVICE_MAPPER,device-mapper,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_DM},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBDEVMAPPER,libdevmapper,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_LIBDM},${PKG_SECTION}))
-CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= --with-user="" --with-group="" \
--with-optimisation="" \
--with-lvm1=none
-BUILD_STYLE:= auto
-INSTALL_STYLE:= auto
post-install:
# lvm
${INSTALL_DIR} ${IDIR_LVM}/usr/sbin
${INSTALL_BIN} ${WRKINST}/usr/sbin/lvm ${IDIR_LVM}/usr/sbin/lvm
- # device-mapper
- ${INSTALL_DIR} ${IDIR_DEVICE_MAPPER}/usr/sbin ${IDIR_DEVICE_MAPPER}/usr/lib
+ # libdevmapper
+ ${INSTALL_DIR} ${IDIR_LIBDEVMAPPER}/usr/lib
${CP} ${WRKINST}/usr/lib/libdevmapper.so* \
- ${IDIR_DEVICE_MAPPER}/usr/lib
+ ${IDIR_LIBDEVMAPPER}/usr/lib
+ chmod u+w ${IDIR_LIBDEVMAPPER}/usr/lib/*.so*
+ # device-mapper
+ ${INSTALL_DIR} ${IDIR_DEVICE_MAPPER}/usr/sbin
${INSTALL_BIN} ${WRKINST}/usr/sbin/dmsetup \
${IDIR_DEVICE_MAPPER}/usr/sbin
- chmod u+w ${IDIR_DEVICE_MAPPER}/usr/lib/*.so*
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/lvm/patches/patch-Makefile_in b/package/lvm/patches/patch-Makefile_in
index d0e22571f..fd15b0060 100644
--- a/package/lvm/patches/patch-Makefile_in
+++ b/package/lvm/patches/patch-Makefile_in
@@ -1,15 +1,15 @@
---- LVM2.2.02.51.orig/Makefile.in 2009-07-31 13:49:53.000000000 +0200
-+++ LVM2.2.02.51/Makefile.in 2009-08-22 15:24:06.000000000 +0200
-@@ -16,7 +16,7 @@ srcdir = @srcdir@
- top_srcdir = @top_srcdir@
+--- LVM2.2.02.61.orig/Makefile.in 2009-10-02 21:10:31.000000000 +0200
++++ LVM2.2.02.61/Makefile.in 2010-03-03 19:43:58.976123551 +0100
+@@ -17,7 +17,7 @@ top_srcdir = @top_srcdir@
+ top_builddir = @top_builddir@
VPATH = @srcdir@
-SUBDIRS = doc include man scripts
-+SUBDIRS = doc include
++SUBDIRS = include
ifeq ("@UDEV_RULES@", "yes")
SUBDIRS += udev
-@@ -60,7 +60,7 @@ po: tools daemons
+@@ -64,7 +64,7 @@ po: tools daemons
libdm.device-mapper: include.device-mapper
daemons.device-mapper: libdm.device-mapper
tools.device-mapper: libdm.device-mapper
diff --git a/package/lvm/patches/patch-doc_Makefile_in b/package/lvm/patches/patch-doc_Makefile_in
deleted file mode 100644
index 381e0ceea..000000000
--- a/package/lvm/patches/patch-doc_Makefile_in
+++ /dev/null
@@ -1,13 +0,0 @@
-bsd compatibility
---- LVM2.2.02.51.orig/doc/Makefile.in 2009-05-11 12:28:46.000000000 +0200
-+++ LVM2.2.02.51/doc/Makefile.in 2009-08-22 15:24:06.000000000 +0200
-@@ -23,7 +23,8 @@ include $(top_srcdir)/make.tmpl
- install_lvm2:
- @if [ ! -e $(confdir)/$(CONFDEST) ]; then \
- echo "Installing $(CONFSRC) as $(confdir)/$(CONFDEST)"; \
-- @INSTALL@ -D $(OWNER) $(GROUP) -m 644 $(CONFSRC) \
-+ @INSTALL@ -d $(confdir); \
-+ @INSTALL@ $(OWNER) $(GROUP) -m 644 $(CONFSRC) \
- $(confdir)/$(CONFDEST); \
- fi
-
diff --git a/package/lvm/patches/patch-libdm_Makefile_in b/package/lvm/patches/patch-libdm_Makefile_in
index 02d029e48..52a52a0fd 100644
--- a/package/lvm/patches/patch-libdm_Makefile_in
+++ b/package/lvm/patches/patch-libdm_Makefile_in
@@ -1,41 +1,42 @@
-always install static library
---- LVM2.2.02.51.orig/libdm/Makefile.in 2009-04-08 16:04:35.000000000 +0200
-+++ LVM2.2.02.51/libdm/Makefile.in 2009-08-22 15:37:53.000000000 +0200
-@@ -34,9 +34,9 @@ SOURCES =\
+--- LVM2.2.02.61.orig/libdm/Makefile.in 2009-10-02 21:10:36.000000000 +0200
++++ LVM2.2.02.61/libdm/Makefile.in 2010-03-08 06:27:03.000000000 +0100
+@@ -35,9 +35,7 @@ SOURCES =\
- INCLUDES = -I$(interface) -I.
+ INCLUDES = -I$(srcdir)/$(interface) -I$(srcdir)
-ifeq ("@STATIC_LINK@", "yes")
-+#ifeq ("@STATIC_LINK@", "yes")
LIB_STATIC = $(interface)/libdevmapper.a
-endif
-+#endif
ifeq ("@LIB_SUFFIX@","dylib")
LIB_SHARED = $(interface)/libdevmapper.dylib
-@@ -59,9 +59,9 @@ device-mapper: all
+@@ -60,9 +58,7 @@ device-mapper: all
INSTALL_TYPE = install_dynamic
-ifeq ("@STATIC_LINK@", "yes")
-+#ifeq ("@STATIC_LINK@", "yes")
- INSTALL_TYPE += install_static
+- INSTALL_TYPE += install_static
-endif
-+#endif
++INSTALL_TYPE += install_static
ifeq ("@PKGCONFIG@", "yes")
INSTALL_TYPE += install_pkgconfig
-@@ -72,7 +72,8 @@ install: $(INSTALL_TYPE) install_include
+@@ -73,26 +69,32 @@ install: $(INSTALL_TYPE) install_include
install_device-mapper: install
install_include:
-- $(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper.h \
+- $(INSTALL) -D $(OWNER) $(GROUP) -m 444 $(srcdir)/libdevmapper.h \
+ $(INSTALL) -d $(includedir)
-+ $(INSTALL) $(OWNER) $(GROUP) -m 444 libdevmapper.h \
++ $(INSTALL) $(OWNER) $(GROUP) -m 444 $(srcdir)/libdevmapper.h \
$(includedir)/libdevmapper.h
install_dynamic: install_@interface@
-@@ -83,15 +84,17 @@ install_static: install_@interface@_stat
++ $(INSTALL) -d $(libdir)
+ $(LN_S) -f libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION_DM) \
+ $(libdir)/libdevmapper.$(LIB_SUFFIX)
+
+ install_static: install_@interface@_static
++ $(INSTALL) -d $(libdir)
$(LN_S) -f libdevmapper.a.$(LIB_VERSION_DM) $(libdir)/libdevmapper.a
install_ioctl: ioctl/libdevmapper.$(LIB_SUFFIX)
@@ -52,6 +53,7 @@ always install static library
install_ioctl_static: ioctl/libdevmapper.a
- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
++ $(INSTALL) -d $(libdir)
+ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
$(libdir)/libdevmapper.a.$(LIB_VERSION_DM)
diff --git a/package/lvm/patches/patch-tools_Makefile_in b/package/lvm/patches/patch-tools_Makefile_in
index 5dc0235e4..ae6fcbf8f 100644
--- a/package/lvm/patches/patch-tools_Makefile_in
+++ b/package/lvm/patches/patch-tools_Makefile_in
@@ -1,24 +1,28 @@
---- LVM2.2.02.51.orig/tools/Makefile.in 2009-05-21 13:11:29.000000000 +0200
-+++ LVM2.2.02.51/tools/Makefile.in 2009-08-22 15:30:31.000000000 +0200
-@@ -160,21 +160,24 @@ cflow: lvm.cflow lvm.xref lvm.tree lvm.r
+--- LVM2.2.02.61.orig/tools/Makefile.in 2010-01-19 02:10:47.000000000 +0100
++++ LVM2.2.02.61/tools/Makefile.in 2010-03-03 19:46:06.396138753 +0100
+@@ -165,21 +165,26 @@ cflow: lvm.cflow lvm.xref lvm.tree lvm.r
endif
install_cmdlib_dynamic: liblvm2cmd.$(LIB_SUFFIX)
-- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd.$(LIB_SUFFIX) \
+- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
+ $(INSTALL) -d $(libdir)
-+ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd.$(LIB_SUFFIX) \
++ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
$(libdir)/liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION)
$(LN_S) -f liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION) $(libdir)/liblvm2cmd.$(LIB_SUFFIX)
- $(INSTALL) -D $(OWNER) $(GROUP) -m 444 lvm2cmd.h \
+- $(INSTALL) -D $(OWNER) $(GROUP) -m 444 $(srcdir)/lvm2cmd.h \
++ $(INSTALL) -d $(includedir)
++ $(INSTALL) $(OWNER) $(GROUP) -m 444 $(srcdir)/lvm2cmd.h \
$(includedir)/lvm2cmd.h
install_cmdlib_static: liblvm2cmd-static.a
-- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd-static.a \
+- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
+ $(INSTALL) -d $(libdir)
-+ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd-static.a \
++ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
$(libdir)/liblvm2cmd.a.$(LIB_VERSION)
$(LN_S) -f liblvm2cmd.a.$(LIB_VERSION) $(libdir)/liblvm2cmd.a
- $(INSTALL) -D $(OWNER) $(GROUP) -m 444 lvm2cmd.h \
+- $(INSTALL) -D $(OWNER) $(GROUP) -m 444 $(srcdir)/lvm2cmd.h \
++ $(INSTALL) -d $(includedir)
++ $(INSTALL) $(OWNER) $(GROUP) -m 444 $(srcdir)/lvm2cmd.h \
$(includedir)/lvm2cmd.h
install_tools_dynamic: lvm .commands
@@ -28,13 +32,13 @@
$(sbindir)/lvm
@echo Creating symbolic links for individual commands in $(sbindir)
@( \
-@@ -185,14 +188,17 @@ install_tools_dynamic: lvm .commands
+@@ -190,14 +195,17 @@ install_tools_dynamic: lvm .commands
)
install_tools_static: lvm.static
-- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) lvm.static \
+- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
+ $(INSTALL) -d $(sbindir)
-+ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) lvm.static \
++ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
$(staticdir)/lvm.static
install_dmsetup_dynamic: dmsetup
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-15 11:57:18 +0000