diff --git a/utils/lvm2/Makefile b/utils/lvm2/Makefile index 51a959d11..4a81f10f3 100644 --- a/utils/lvm2/Makefile +++ b/utils/lvm2/Makefile @@ -1,6 +1,6 @@ # -# Copyright (C) 2009, 2010 Stefan Monnier -# Copyright (C) 2011 OpenWrt.org +# Copyright (C) 2009-2010 Stefan Monnier +# Copyright (C) 2011-2012 OpenWrt.org # # This is free software, licensed under the GNU General Public License v3+. # See /LICENSE for more information. @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=LVM2 -PKG_VERSION:=2.02.91 +PKG_VERSION:=2.02.95 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tgz PKG_SOURCE_URL:=ftp://sources.redhat.com/pub/lvm2 -PKG_MD5SUM:=03ed8dc20c3a65079aedcedc0ec33192 +PKG_MD5SUM:=bd470a802046c807603618a443732ea7 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME).$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk @@ -25,7 +25,6 @@ define Package/libdevmapper TITLE:=The Linux Kernel Device Mapper userspace library URL:=http://sourceware.org/dm/ DEPENDS:=+kmod-dm - MAINTAINER:=Luka Perkov endef define Package/libdevmapper/description @@ -40,7 +39,6 @@ define Package/lvm2 TITLE:=The Linux Logical Volume Manager URL:=http://sourceware.org/lvm2/ DEPENDS:=+libdevmapper +libreadline +libncurses - MAINTAINER:=Luka Perkov endef define Package/lvm2/description diff --git a/utils/lvm2/patches/000-compile.patch b/utils/lvm2/patches/000-compile.patch new file mode 100644 index 000000000..ec22983a7 --- /dev/null +++ b/utils/lvm2/patches/000-compile.patch @@ -0,0 +1,11 @@ +--- a/make.tmpl.in ++++ b/make.tmpl.in +@@ -17,7 +17,7 @@ SHELL = /bin/sh + + @SET_MAKE@ + +-CC ?= @CC@ ++CC = @CC@ + RANLIB = @RANLIB@ + INSTALL = @INSTALL@ + MKDIR_P = @MKDIR_P@ diff --git a/utils/lvm2/patches/100-cross_compile.patch b/utils/lvm2/patches/100-cross_compile.patch deleted file mode 100644 index cd75666d1..000000000 --- a/utils/lvm2/patches/100-cross_compile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- LVM2.2.02.84/make.tmpl.in 2011-04-11 16:00:37.430840340 +0200 -+++ LVM2.2.02.84/make.tmpl.in 2011-04-11 16:00:54.399401160 +0200 -@@ -17,7 +17,7 @@ - - @SET_MAKE@ - --CC ?= @CC@ -+CC = @CC@ - RANLIB = @RANLIB@ - INSTALL = @INSTALL@ - MKDIR_P = @MKDIR_P@