diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2009-08-02 10:00:41 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2009-08-02 10:00:41 +0200 |
| commit | 4840c451d93afb59725900b1d6ca84645113b897 (patch) | |
| tree | 4f0fd94609f22d99dd6a64725429b97d6561b3c7 | |
| parent | a7b50b94bf0cca530cfbc13ce70788f83ed1ada2 (diff) | |
| parent | b0629253765226375fd1bf7e296ef1174cf9c620 (diff) | |
Merge branch 'lvm-bump' of git://git.busybox.net/~tpetazzoni/git/buildroot
| -rw-r--r-- | package/lvm2/lvm2.mk | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk index 0cefaba8a..3727e3636 100644 --- a/package/lvm2/lvm2.mk +++ b/package/lvm2/lvm2.mk @@ -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) |