[ptxdist] [PATCH 1/3] quota: Update to 4.04

[ptxdist] [PATCH 1/3] quota: Update to 4.04

[Sascha Hauer]

Update version to 4.04 which is the latest upstream release currently.
This also disables all possible autoconf options we do not want to leak
in accidently.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 rules/quota-tools.make | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/rules/quota-tools.make b/rules/quota-tools.make
index ac8f70c91..e8822bc61 100644
--- a/rules/quota-tools.make
+++ b/rules/quota-tools.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_QUOTA_TOOLS) += quota-tools
 #
 # Paths and names
 #
-QUOTA_TOOLS_VERSION	:= 3.17
-QUOTA_TOOLS_MD5		:= cb3e98a039c0cf98e7c1ad4b50a5bda7
+QUOTA_TOOLS_VERSION	:= 4.04
+QUOTA_TOOLS_MD5		:= f46f3b0b5141f032f25684005dac49d3
 QUOTA_TOOLS		:= quota-tools
 QUOTA_TOOLS_SUFFIX	:= tar.gz
 QUOTA_TOOLS_PACKAGE	:= quota-$(QUOTA_TOOLS_VERSION).${QUOTA_TOOLS_SUFFIX}
@@ -31,6 +31,13 @@ QUOTA_TOOLS_LICENSE	:= GPL-2.0-only
 #
 QUOTA_TOOLS_CONF_TOOL	:= autoconf
 
+QUOTA_TOOLS_AUTOCONF := $(CROSS_AUTOCONF_USR) \
+			--disable-ldapmail \
+			--disable-netlink \
+			--disable-nls \
+			--disable-libwrap \
+			--disable-rpc
+
 # ----------------------------------------------------------------------------
 # Compile
 # ----------------------------------------------------------------------------
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 2/3] quota: directory should be quota-version

[Sascha Hauer]

Patch dir and builddir should be same as tarball name, thus
quota-$(QUOTA_TOOLS_VERSION).

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 rules/quota-tools.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/quota-tools.make b/rules/quota-tools.make
index e8822bc61..57c00a383 100644
--- a/rules/quota-tools.make
+++ b/rules/quota-tools.make
@@ -18,7 +18,7 @@ PACKAGES-$(PTXCONF_QUOTA_TOOLS) += quota-tools
 #
 QUOTA_TOOLS_VERSION	:= 4.04
 QUOTA_TOOLS_MD5		:= f46f3b0b5141f032f25684005dac49d3
-QUOTA_TOOLS		:= quota-tools
+QUOTA_TOOLS		:= quota-$(QUOTA_TOOLS_VERSION)
 QUOTA_TOOLS_SUFFIX	:= tar.gz
 QUOTA_TOOLS_PACKAGE	:= quota-$(QUOTA_TOOLS_VERSION).${QUOTA_TOOLS_SUFFIX}
 QUOTA_TOOLS_URL		:= $(call ptx/mirror, SF, linuxquota/$(QUOTA_TOOLS_PACKAGE))
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 3/3] quota: e2fsprogs are not always needed

[Sascha Hauer]

e2fsprogs are only needed when the quotacheck tool is built with extfs
support. Add a new option for this and select e2fsprogs only when
necessary.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 rules/quota-tools.in   | 13 ++++++++++---
 rules/quota-tools.make |  3 ++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/rules/quota-tools.in b/rules/quota-tools.in
index 04b816208..818fc703c 100644
--- a/rules/quota-tools.in
+++ b/rules/quota-tools.in
@@ -3,9 +3,9 @@
 menuconfig QUOTA_TOOLS
 	tristate
 	prompt "quota tools                   "
-	select E2FSPROGS
-	select E2FSPROGS_LIBEXT2FS
-	select E2FSPROGS_LIBCOM_ERR
+	select E2FSPROGS if QUOTA_TOOLS_QUOTACHECK_EXT2
+	select E2FSPROGS_LIBEXT2FS if QUOTA_TOOLS_QUOTACHECK_EXT2
+	select E2FSPROGS_LIBCOM_ERR if QUOTA_TOOLS_QUOTACHECK_EXT2
 	help
 	  Tools and patches for the Linux Diskquota system as part of the
 	  Linux kernel (http://sourceforge.net/projects/linuxquota)
@@ -60,6 +60,13 @@ config QUOTA_TOOLS_QUOTACHECK
 	help
 	  scan a filesystem for disk usage, create, check and repair quota files
 
+config QUOTA_TOOLS_QUOTACHECK_EXT2
+	bool
+	prompt "Enable extfs support for quotacheck"
+	depends on QUOTA_TOOLS_QUOTACHECK
+	help
+	  Enable this option to get direct extfs support in quotacheck
+
 config QUOTA_TOOLS_CONVERTQUOTA
 	bool
 	prompt "install convertquota"
diff --git a/rules/quota-tools.make b/rules/quota-tools.make
index 57c00a383..976ba6765 100644
--- a/rules/quota-tools.make
+++ b/rules/quota-tools.make
@@ -36,7 +36,8 @@ QUOTA_TOOLS_AUTOCONF := $(CROSS_AUTOCONF_USR) \
 			--disable-netlink \
 			--disable-nls \
 			--disable-libwrap \
-			--disable-rpc
+			--disable-rpc \
+			--$(call ptx/endis, PTXCONF_QUOTA_TOOLS_QUOTACHECK_EXT2)-ext2direct
 
 # ----------------------------------------------------------------------------
 # Compile
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de