diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-08-30 14:51:44 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-08-30 23:20:09 +0200 |
| commit | a2d7725e4d3e2b415b2708bf80a78db71f801aec (patch) | |
| tree | bc9caea8f5618e950c5bbba9e6579baa5f354a88 /package/btrfs-progs/btrfs-progs.mk | |
| parent | 4d36f10426c1f93406eb4c43f9839bc9a2b2cd21 (diff) | |
| download | buildroot-a2d7725e4d3e2b415b2708bf80a78db71f801aec.tar.gz buildroot-a2d7725e4d3e2b415b2708bf80a78db71f801aec.zip | |
btrfs-progs: bump to version 3.16, fix static linking
The original aim of this patch was to fix static linking of
btrfs-progs. In order to implement this in the form of patches that
can potentially be upstreamed, this patch first bumps the btrfs-progs
package to the latest upstream stable version. It then:
- Reworks the existing documentation disabling patch in a form that
can potentially be upstreamed.
- Adds a patch to support static building of the btrfs-progs
binaries.
Both patches have been submitted upstream, see
http://article.gmane.org/gmane.comp.file-systems.btrfs/38145.
Fixes:
http://autobuild.buildroot.org/results/ddc/ddcc70143ce2c2882894184e4ce195a11407e027/
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/btrfs-progs/btrfs-progs.mk')
| -rw-r--r-- | package/btrfs-progs/btrfs-progs.mk | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk index 9ee44adc29..a91791bea8 100644 --- a/package/btrfs-progs/btrfs-progs.mk +++ b/package/btrfs-progs/btrfs-progs.mk @@ -4,19 +4,31 @@ # ################################################################################ -BTRFS_PROGS_VERSION = 3.14.2 +BTRFS_PROGS_VERSION = 3.16 BTRFS_PROGS_SITE = https://www.kernel.org/pub/linux/kernel/people/mason/btrfs-progs BTRFS_PROGS_SOURCE = btrfs-progs-v$(BTRFS_PROGS_VERSION).tar.xz BTRFS_PROGS_DEPENDENCIES = acl attr e2fsprogs lzo util-linux zlib BTRFS_PROGS_LICENSE = GPLv2 BTRFS_PROGS_LICENSE_FILES = COPYING +BTRFS_PROGS_MAKE_FLAGS = DISABLE_DOCUMENTATION=1 + +ifeq ($(BR2_PREFER_STATIC_LIB),y) +BTRFS_PROGS_MAKE_TARGET = static +BTRFS_PROGS_MAKE_INSTALL_TARGET = install-static +else +BTRFS_PROGS_MAKE_TARGET = all +BTRFS_PROGS_MAKE_INSTALL_TARGET = install +endif + define BTRFS_PROGS_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ + $(BTRFS_PROGS_MAKE_FLAGS) $(BTRFS_PROGS_MAKE_TARGET) endef define BTRFS_PROGS_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) prefix=/usr DESTDIR=$(TARGET_DIR) install + $(MAKE) -C $(@D) prefix=/usr DESTDIR=$(TARGET_DIR) \ + $(BTRFS_PROGS_MAKE_FLAGS) $(BTRFS_PROGS_MAKE_INSTALL_TARGET) endef $(eval $(generic-package)) |
