Commit 4840c451 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

Merge branch 'lvm-bump' of git://git.busybox.net/~tpetazzoni/git/buildroot

parents a7b50b94 b0629253

package/lvm2/lvm2.mk

+9 −7
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 


LVM2_BASEVER=2.02

LVM2_DMVER=1.02

LVM2_PATCH=47

LVM2_PATCH=50

LVM2_VERSION=$(LVM2_BASEVER).$(LVM2_PATCH)

LVM2_SOURCE:=LVM2.$(LVM2_VERSION).tgz

LVM2_SITE:=ftp://sources.redhat.com/pub/lvm2
@@ -81,17 +81,19 @@ $(LVM2_DIR)/.configured: $(LVM2_DIR)/.unpacked 
$(LVM2_DIR)/.built: $(LVM2_DIR)/.configured

	$(MAKE1) CC=$(TARGET_CC) RANLIB=$(TARGET_RANLIB) AR=$(TARGET_AR) -C $(LVM2_DIR) DESTDIR=$(STAGING_DIR)

	$(MAKE1) -C $(LVM2_DIR) DESTDIR=$(STAGING_DIR) install

	# Fixup write permissions so that the files can be overwritten

	# several times in the $(TARGET_DIR)

	chmod 755 $(STAGING_DIR)/sbin/lvm

	chmod 755 $(STAGING_DIR)/sbin/dmsetup

	chmod 644 $(STAGING_DIR)/lib/$(LVM2_LIB)

	touch $(LVM2_DIR)/.built





$(LVM2_TARGET_SBINS): $(LVM2_DIR)/.built

	for binary in $(LVM2_SBIN); do echo $$binary; cp -a $(STAGING_DIR)/sbin/$$binary $(TARGET_DIR)/sbin; done



$(LVM2_TARGET_DMSETUP_SBINS): $(LVM2_DIR)/.built

	for binary in $(LVM2_DMSETUP_SBIN); do echo $$binary; cp -a $(STAGING_DIR)/sbin/$$binary $(TARGET_DIR)/sbin; done

$(LVM2_TARGET_SBINS) $(LVM2_TARGET_DMSETUP_SBINS): $(LVM2_DIR)/.built

	cp -a $(STAGING_DIR)/sbin/$(notdir $@) $@



$(LVM2_TARGET_LIBS): $(LVM2_DIR)/.built

	for lib in $(LVM2_LIB); do echo $$lib; cp -a $(STAGING_DIR)/lib/$$lib $(TARGET_DIR)/lib; done

	cp -a $(STAGING_DIR)/lib/$(notdir $@) $@





ifeq ($(BR2_PACKAGE_LVM2_DMSETUP_ONLY),y)