Fixup TABs; Update to 2.02.60

SVN-Revision: 19685

diff --git a/utils/lvm2/Makefile b/utils/lvm2/Makefile
index 4aedf4f1f4c3eff9ec0c97b4b469c7984422898a..e2abe4273b75a446e531861fd8590c8db245393a 100644 (file)
--- a/utils/lvm2/Makefile
+++ b/utils/lvm2/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009 Stefan Monnier
+# Copyright (C) 2009, 2010 Stefan Monnier
 #
 # This is free software, licensed under the GNU General Public License v3+.
 # See /LICENSE for more information.
@@ -7,14 +7,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=LVM2
-PKG_VERSION:=2.02.44
+PKG_VERSION:=2.02.60
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=ftp://sources.redhat.com/pub/lvm2/
-PKG_MD5SUM:=4ed7b99903a6fc5165b7b0b8def42486
+PKG_MD5SUM:=33e0e0f4b4582d495ff619696c634b2a
 # 2.02.43 = fc34655706a2aa116b92328b24fad619
 # 2.02.44 = 4ed7b99903a6fc5165b7b0b8def42486
+# 2.02.53 = f9ae3579bf15467b7f1d7aea8b9ed9b3
+# 2.02.60 = 33e0e0f4b4582d495ff619696c634b2a
 
 # OpenWRT normally expects the tarball to expand into
 # $(PKG_NAME)-$(PKG_VERSION), and this magic incantation seems to make it
@@ -80,29 +82,29 @@ endef
 CONFIGURE_ARGS += --disable-o_direct
 
 define Build/InstallDev
-       mkdir -p $(1)/usr/include
-       $(INSTALL_DATA) $(PKG_BUILD_DIR)/include/libdevmapper.h $(1)/usr/include/
-       mkdir -p $(1)/usr/lib
-       $(CP) $(PKG_BUILD_DIR)/libdm/ioctl/libdevmapper.{a,so} $(1)/usr/lib/
-       mkdir -p $(1)/usr/lib/pkgconfig
-       $(CP) $(PKG_BUILD_DIR)/libdm/libdevmapper.pc $(1)/usr/lib/pkgconfig/
+       mkdir -p $(1)/usr/include
+       $(INSTALL_DATA) $(PKG_BUILD_DIR)/include/libdevmapper.h $(1)/usr/include/
+       mkdir -p $(1)/usr/lib
+       $(CP) $(PKG_BUILD_DIR)/libdm/ioctl/libdevmapper.so $(1)/usr/lib/
+       mkdir -p $(1)/usr/lib/pkgconfig
+       $(CP) $(PKG_BUILD_DIR)/libdm/libdevmapper.pc $(1)/usr/lib/pkgconfig/
 endef
 
 define Package/libdevmapper/install
-       $(INSTALL_DIR) $(1)/usr/lib
-       $(INSTALL_DATA) $(PKG_BUILD_DIR)/libdm/libdevmapper.so.* $(1)/usr/lib/
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(INSTALL_DATA) $(PKG_BUILD_DIR)/libdm/libdevmapper.so.* $(1)/usr/lib/
 endef
 
 # This rule only installs the `lvm' executable.  Debian also installs
 # a whole bunch of symlinks so that instead of `lvm <foo>' you can directly
 # run `<foo>'.
 define Package/lvm2/install
-       $(INSTALL_DIR) $(1)/sbin
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/lvm $(1)/sbin/
-       $(INSTALL_DIR) $(1)/etc/lvm
-       $(INSTALL_DATA) $(PKG_BUILD_DIR)/doc/example.conf $(1)/etc/lvm/lvm.conf
-       $(INSTALL_DIR) $(1)/etc/init.d
-       $(INSTALL_BIN) ./files/lvm2.init $(1)/etc/init.d/lvm2
+       $(INSTALL_DIR) $(1)/sbin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/lvm $(1)/sbin/
+       $(INSTALL_DIR) $(1)/etc/lvm
+       $(INSTALL_DATA) $(PKG_BUILD_DIR)/doc/example.conf $(1)/etc/lvm/lvm.conf
+       $(INSTALL_DIR) $(1)/etc/init.d
+       $(INSTALL_BIN) ./files/lvm2.init $(1)/etc/init.d/lvm2
 endef
 
 define Package/lvm2/conffiles

diff --git a/utils/lvm2/patches/100-readline-link.patch b/utils/lvm2/patches/100-readline-link.patch
index 584baa506fd4ab8060a921244b3b530dd9b7fe6e..6b5a81ff1cf6b61397f7366f160110a77c2c1040 100644 (file)
--- a/utils/lvm2/patches/100-readline-link.patch
+++ b/utils/lvm2/patches/100-readline-link.patch
@@ -1,38 +1,38 @@
 === modified file 'LVM2.2.02.43/make.tmpl.in'
 --- LVM2.2.02.43/make.tmpl.in  2009-01-16 15:02:27 +0000
 +++ LVM2.2.02.43/make.tmpl.in  2009-01-16 15:02:45 +0000
-@@ -84,11 +84,9 @@
+@@ -89,11 +89,9 @@
  endif
-
- LDFLAGS += -L$(top_srcdir)/libdm -L$(top_srcdir)/lib
--CLDFLAGS += -L$(top_srcdir)/libdm -L$(top_srcdir)/lib
-
+ 
+ LDFLAGS += -L$(top_builddir)/libdm -L$(top_builddir)/lib
+-CLDFLAGS += -L$(top_builddir)/libdm -L$(top_builddir)/lib
+ 
  ifeq ("@DMEVENTD@", "yes")
-   LDFLAGS += -L$(top_srcdir)/daemons/dmeventd
--  CLDFLAGS += -L$(top_srcdir)/daemons/dmeventd
+   LDFLAGS += -L$(top_builddir)/daemons/dmeventd
+-  CLDFLAGS += -L$(top_builddir)/daemons/dmeventd
  endif
-
+ 
  ifeq ("@DM_COMPAT@", "yes")
 @@ -202,18 +200,18 @@
  ifeq ("@LIB_SUFFIX@","so")
  $(LIB_SHARED): $(OBJECTS) $(LDDEPS)
-       $(CC) -shared -Wl,-soname,$(notdir $@).$(LIB_VERSION) \
--      $(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
-+      $(CFLAGS) $(CLDFLAGS) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@
+       $(CC) -shared -Wl,-soname,$(notdir $@).$(LIB_VERSION) \
+-      $(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
++      $(CFLAGS) $(CLDFLAGS) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@
  endif
-
+ 
  ifeq ("@LIB_SUFFIX@","dylib")
  $(LIB_SHARED): $(OBJECTS) $(LDDEPS)
-       $(CC) -dynamiclib -dylib_current_version,$(LIB_VERSION) \
--      $(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
-+      $(CFLAGS) $(CLDFLAGS) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@
+       $(CC) -dynamiclib -dylib_current_version,$(LIB_VERSION) \
+-      $(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
++      $(CFLAGS) $(CLDFLAGS) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@
  endif
-
+ 
  %.so: %.a
-       $(CC) -shared -Wl,-soname,$(notdir $@).$(LIB_VERSION) \
--      $(CFLAGS) $(CLDFLAGS) $(LIBS) -o $@ \
-+      $(CFLAGS) $(CLDFLAGS) $(LDFLAGS) $(LIBS) -o $@ \
-       @CLDWHOLEARCHIVE@ $< @CLDNOWHOLEARCHIVE@
-
+       $(CC) -shared -Wl,-soname,$(notdir $@).$(LIB_VERSION) \
+-      $(CFLAGS) $(CLDFLAGS) $(LIBS) -o $@ \
++      $(CFLAGS) $(CLDFLAGS) $(LDFLAGS) $(LIBS) -o $@ \
+       @CLDWHOLEARCHIVE@ $< @CLDNOWHOLEARCHIVE@
+ 
  $(LIB_STATIC): $(OBJECTS)