All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH] btrfs-progs: bump to version 3.19
@ 2015-03-11 19:49 Gustavo Zacarias
  2015-03-11 21:38 ` Peter Korsgaard
  0 siblings, 1 reply; 2+ messages in thread
From: Gustavo Zacarias @ 2015-03-11 19:49 UTC (permalink / raw)
  To: buildroot

Convert to autotools with a little help for static.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/btrfs-progs/btrfs-progs.hash |  2 +-
 package/btrfs-progs/btrfs-progs.mk   | 29 ++++++++---------------------
 2 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/package/btrfs-progs/btrfs-progs.hash b/package/btrfs-progs/btrfs-progs.hash
index 655ef5f..7917bb0 100644
--- a/package/btrfs-progs/btrfs-progs.hash
+++ b/package/btrfs-progs/btrfs-progs.hash
@@ -1,2 +1,2 @@
 # From https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/sha256sums.asc
-sha256	dd8ddb4d201e5ffd32a15ed0e1f33fbc2c8fb16383f1519a9fae136698c2dfec	btrfs-progs-v3.18.2.tar.xz
+sha256	b23965d7214ebc93937df658f18fefe020fc2fd2be4d591094ef1aae168a36c8	btrfs-progs-v3.19.tar.xz
diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk
index 768660d..0b61e5f 100644
--- a/package/btrfs-progs/btrfs-progs.mk
+++ b/package/btrfs-progs/btrfs-progs.mk
@@ -4,35 +4,22 @@
 #
 ################################################################################
 
-BTRFS_PROGS_VERSION = 3.18.2
+BTRFS_PROGS_VERSION = 3.19
 BTRFS_PROGS_SITE = https://www.kernel.org/pub/linux/kernel/people/kdave/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_MAKE_FLAGS = DISABLE_DOCUMENTATION=1 DISABLE_BACKTRACE=1
+BTRFS_PROGS_DEPENDENCIES = host-pkgconf acl attr e2fsprogs lzo util-linux zlib
+BTRFS_PROGS_CONF_OPTS = --disable-backtrace
 BTRFS_PROGS_LICENSE = GPLv2
 BTRFS_PROGS_LICENSE_FILES = COPYING
 
-
+# Doesn't autodetect static-only and tries to build both
 ifeq ($(BR2_STATIC_LIBS),y)
-BTRFS_PROGS_MAKE_TARGET = static
-BTRFS_PROGS_MAKE_INSTALL_TARGET = install-static
-ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
-# Add -lintl for libuuid
-BTRFS_PROGS_MAKE_FLAGS += lib_LIBS="-luuid -lblkid -lz -llzo2 -L. -lintl -pthread"
-endif
-else
-BTRFS_PROGS_MAKE_TARGET = all
-BTRFS_PROGS_MAKE_INSTALL_TARGET = install
-endif
-
 define BTRFS_PROGS_BUILD_CMDS
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \
-		$(BTRFS_PROGS_MAKE_FLAGS) $(BTRFS_PROGS_MAKE_TARGET)
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) static
 endef
-
 define BTRFS_PROGS_INSTALL_TARGET_CMDS
-	$(MAKE) -C $(@D) prefix=/usr DESTDIR=$(TARGET_DIR) \
-		$(BTRFS_PROGS_MAKE_FLAGS) $(BTRFS_PROGS_MAKE_INSTALL_TARGET)
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install-static
 endef
+endif
 
-$(eval $(generic-package))
+$(eval $(autotools-package))
-- 
2.0.5

^ permalink raw reply related	[flat|nested] 2+ messages in thread
* [Buildroot] [PATCH] btrfs-progs: bump to version 3.19
  2015-03-11 19:49 [Buildroot] [PATCH] btrfs-progs: bump to version 3.19 Gustavo Zacarias
@ 2015-03-11 21:38 ` Peter Korsgaard
  0 siblings, 0 replies; 2+ messages in thread
From: Peter Korsgaard @ 2015-03-11 21:38 UTC (permalink / raw)
  To: buildroot

>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:

 > Convert to autotools with a little help for static.
 > Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 > ---
 >  package/btrfs-progs/btrfs-progs.hash |  2 +-
 >  package/btrfs-progs/btrfs-progs.mk   | 29 ++++++++---------------------
 >  2 files changed, 9 insertions(+), 22 deletions(-)

 > diff --git a/package/btrfs-progs/btrfs-progs.hash b/package/btrfs-progs/btrfs-progs.hash
 > index 655ef5f..7917bb0 100644
 > --- a/package/btrfs-progs/btrfs-progs.hash
 > +++ b/package/btrfs-progs/btrfs-progs.hash
 > @@ -1,2 +1,2 @@
 >  # From https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/sha256sums.asc
 > -sha256	dd8ddb4d201e5ffd32a15ed0e1f33fbc2c8fb16383f1519a9fae136698c2dfec	btrfs-progs-v3.18.2.tar.xz
 > +sha256	b23965d7214ebc93937df658f18fefe020fc2fd2be4d591094ef1aae168a36c8	btrfs-progs-v3.19.tar.xz
 > diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk
 > index 768660d..0b61e5f 100644
 > --- a/package/btrfs-progs/btrfs-progs.mk
 > +++ b/package/btrfs-progs/btrfs-progs.mk
 > @@ -4,35 +4,22 @@
 >  #
 >  ################################################################################
 
 > -BTRFS_PROGS_VERSION = 3.18.2
 > +BTRFS_PROGS_VERSION = 3.19
 >  BTRFS_PROGS_SITE = https://www.kernel.org/pub/linux/kernel/people/kdave/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_MAKE_FLAGS = DISABLE_DOCUMENTATION=1 DISABLE_BACKTRACE=1
 > +BTRFS_PROGS_DEPENDENCIES = host-pkgconf acl attr e2fsprogs lzo util-linux zlib
 > +BTRFS_PROGS_CONF_OPTS = --disable-backtrace
 >  BTRFS_PROGS_LICENSE = GPLv2
 >  BTRFS_PROGS_LICENSE_FILES = COPYING
 
 > -
 > +# Doesn't autodetect static-only and tries to build both
 >  ifeq ($(BR2_STATIC_LIBS),y)
 > -BTRFS_PROGS_MAKE_TARGET = static
 > -BTRFS_PROGS_MAKE_INSTALL_TARGET = install-static
 > -ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
 > -# Add -lintl for libuuid
 > -BTRFS_PROGS_MAKE_FLAGS += lib_LIBS="-luuid -lblkid -lz -llzo2 -L. -lintl -pthread"
 > -endif
 > -else
 > -BTRFS_PROGS_MAKE_TARGET = all
 > -BTRFS_PROGS_MAKE_INSTALL_TARGET = install
 > -endif
 > -
 >  define BTRFS_PROGS_BUILD_CMDS
 > -	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \
 > -		$(BTRFS_PROGS_MAKE_FLAGS) $(BTRFS_PROGS_MAKE_TARGET)
 > +	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) static
 >  endef
 > -
 >  define BTRFS_PROGS_INSTALL_TARGET_CMDS
 > -	$(MAKE) -C $(@D) prefix=/usr DESTDIR=$(TARGET_DIR) \
 > -		$(BTRFS_PROGS_MAKE_FLAGS) $(BTRFS_PROGS_MAKE_INSTALL_TARGET)
 > +	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install-static

As it is just about the make target it would be simpler to just set

BTRFS_PROGS_MAKE_OPTS = static
BTRFS_PROGS_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-static

Committed with that fixed, thanks.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-03-11 21:38 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-11 19:49 [Buildroot] [PATCH] btrfs-progs: bump to version 3.19 Gustavo Zacarias
2015-03-11 21:38 ` Peter Korsgaard

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.