summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2019-09-13 10:03:00 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2019-09-19 18:46:04 +0200
commit6a17f08cbc43ab4f50cf7b3f800c83ffa621c18b (patch)
treec1753a8e5485fe854af6ce90b9cd42f4f6b3077a
parent19680760c9a9f3c76b2c6fbbf38d8a34dc64e1ed (diff)
downloadptxdist-6a17f08cbc43ab4f50cf7b3f800c83ffa621c18b.tar.gz
ptxdist-6a17f08cbc43ab4f50cf7b3f800c83ffa621c18b.tar.xz
attr: version bump 2.4.47 -> 2.4.48
The build-system was moderniced. None of the patches are needed now. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--patches/attr-2.4.47/0001-fix-install-with-domain-user-or-domain-user.patch229
-rw-r--r--patches/attr-2.4.47/0002-build-translations-only-if-gettext-is-enabled.patch32
-rw-r--r--patches/attr-2.4.47/series5
-rw-r--r--rules/attr.in6
-rw-r--r--rules/attr.make29
-rw-r--r--rules/host-attr.make24
6 files changed, 17 insertions, 308 deletions
diff --git a/patches/attr-2.4.47/0001-fix-install-with-domain-user-or-domain-user.patch b/patches/attr-2.4.47/0001-fix-install-with-domain-user-or-domain-user.patch
deleted file mode 100644
index 5e12725d1..000000000
--- a/patches/attr-2.4.47/0001-fix-install-with-domain-user-or-domain-user.patch
+++ /dev/null
@@ -1,229 +0,0 @@
-From: Jon Ringle <jon@ringle.org>
-Date: Mon, 23 May 2011 09:27:46 -0400
-Subject: [PATCH] fix install with domain\user or "domain user"
-
-If current user is domain\user the \ gets interpreted as an escape char
-resulting in user not found. This also breaks if the user or group contains a
-space.
-
-Enclose "$(PKG_USER)" and "$(PKG_GROUP)" in quotes to fix.
-
-Signed-off-by: Jon Ringle <jon@ringle.org>
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
----
- include/buildmacros | 2 +-
- include/install-sh | 26 +++++++++++++-------------
- install-sh | 26 +++++++++++++-------------
- 3 files changed, 27 insertions(+), 27 deletions(-)
-
-diff --git a/include/buildmacros b/include/buildmacros
-index 9e81bb83d609..939f39b80087 100644
---- a/include/buildmacros
-+++ b/include/buildmacros
-@@ -40,7 +40,7 @@ OBJECTS = $(ASFILES:.s=.o) \
- $(LFILES:.l=.o) \
- $(YFILES:%.y=%.tab.o)
-
--INSTALL = $(TOPDIR)/include/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
-+INSTALL = $(TOPDIR)/include/install-sh -o "$(PKG_USER)" -g "$(PKG_GROUP)"
-
- IMAGES_DIR = $(TOPDIR)/all-images
- DIST_DIR = $(TOPDIR)/dist
-diff --git a/include/install-sh b/include/install-sh
-index fb4997a3b013..3c70b31a3b2c 100755
---- a/include/install-sh
-+++ b/include/install-sh
-@@ -56,7 +56,7 @@ _chown ()
- {
- _st=255
- if [ $# -eq 3 ] ; then
-- chown $1:$2 $3
-+ chown "$1":"$2" $3
- _st=$?
- if [ $_st -ne 0 ] ; then
- if [ $REAL_UID != '0' ] ; then
-@@ -115,7 +115,7 @@ fi
-
- [ -n "$DIST_ROOT" -a $REAL_UID -ne 0 ] && CHOWN=true
-
--while getopts "Dcm:d:S:o:g:T:" c $*
-+while getopts "Dcm:d:S:o:g:T:" c "$@"
- do
- case $c in
- c)
-@@ -168,10 +168,10 @@ then
- fi
- if [ $status -eq 0 ]
- then
-- $CHOWN $OWNER $GROUP $dir
-+ $CHOWN "$OWNER" "$GROUP" $dir
- status=$?
- fi
-- $MANIFEST d $DIRMODE $OWNER $GROUP ${dir#$DIST_ROOT}
-+ $MANIFEST d $DIRMODE "$OWNER" "$GROUP" ${dir#$DIST_ROOT}
- elif $Sflag
- then
- #
-@@ -217,7 +217,7 @@ then
- install_name=$target/$solib
- $CP $solib $install_name
- status=$?
-- $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$solib ${install_name#$DIST_ROOT}
-+ $MANIFEST f $FILEMODE "$OWNER" "$GROUP" $HERE/$solib ${install_name#$DIST_ROOT}
- break
- fi
- done
-@@ -268,7 +268,7 @@ then
- install_name=$target/$old_library
- $CP $old_library $install_name
- status=$?
-- $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$old_library ${install_name#$DIST_ROOT}
-+ $MANIFEST f $FILEMODE "$OWNER" "$GROUP" $HERE/$old_library ${install_name#$DIST_ROOT}
- ;;
- *)
- echo "$prog: -T $lt_install invalid"
-@@ -281,7 +281,7 @@ then
- if [ $status -eq 0 ]
- then
- $CHMOD $FILEMODE $install_name
-- $CHOWN $OWNER $GROUP $install_name
-+ $CHOWN "$OWNER" "$GROUP" $install_name
- fi
- ;;
- esac
-@@ -310,19 +310,19 @@ else
- status=$?
- if [ $status -eq 0 ]
- then
-- $CHOWN $OWNER $GROUP $dir/$f
-+ $CHOWN "$OWNER" "$GROUP" $dir/$f
- status=$?
- fi
-- $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$f ${dir#$DIST_ROOT}/$f
-+ $MANIFEST f $FILEMODE "$OWNER" "$GROUP" $HERE/$f ${dir#$DIST_ROOT}/$f
- else
- $CHMOD $FILEMODE $dir
- status=$?
- if [ $status -eq 0 ]
- then
-- $CHOWN $OWNER $GROUP $dir
-+ $CHOWN "$OWNER" "$GROUP" $dir
- status=$?
- fi
-- $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$dir ${dir#$DIST_ROOT}
-+ $MANIFEST f $FILEMODE "$OWNER" "$GROUP" $HERE/$dir ${dir#$DIST_ROOT}
- fi
- fi
- else
-@@ -352,10 +352,10 @@ else
- status=$?
- if [ $status -eq 0 ]
- then
-- $CHOWN $OWNER $GROUP $dir/$f
-+ $CHOWN "$OWNER" "$GROUP" $dir/$f
- status=$?
- fi
-- $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$f ${dir#$DIST_ROOT}/$f
-+ $MANIFEST f $FILEMODE "$OWNER" "$GROUP" $HERE/$f ${dir#$DIST_ROOT}/$f
- fi
- [ $status -ne 0 ] && break
- done
-diff --git a/install-sh b/install-sh
-index fb4997a3b013..3c70b31a3b2c 100755
---- a/install-sh
-+++ b/install-sh
-@@ -56,7 +56,7 @@ _chown ()
- {
- _st=255
- if [ $# -eq 3 ] ; then
-- chown $1:$2 $3
-+ chown "$1":"$2" $3
- _st=$?
- if [ $_st -ne 0 ] ; then
- if [ $REAL_UID != '0' ] ; then
-@@ -115,7 +115,7 @@ fi
-
- [ -n "$DIST_ROOT" -a $REAL_UID -ne 0 ] && CHOWN=true
-
--while getopts "Dcm:d:S:o:g:T:" c $*
-+while getopts "Dcm:d:S:o:g:T:" c "$@"
- do
- case $c in
- c)
-@@ -168,10 +168,10 @@ then
- fi
- if [ $status -eq 0 ]
- then
-- $CHOWN $OWNER $GROUP $dir
-+ $CHOWN "$OWNER" "$GROUP" $dir
- status=$?
- fi
-- $MANIFEST d $DIRMODE $OWNER $GROUP ${dir#$DIST_ROOT}
-+ $MANIFEST d $DIRMODE "$OWNER" "$GROUP" ${dir#$DIST_ROOT}
- elif $Sflag
- then
- #
-@@ -217,7 +217,7 @@ then
- install_name=$target/$solib
- $CP $solib $install_name
- status=$?
-- $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$solib ${install_name#$DIST_ROOT}
-+ $MANIFEST f $FILEMODE "$OWNER" "$GROUP" $HERE/$solib ${install_name#$DIST_ROOT}
- break
- fi
- done
-@@ -268,7 +268,7 @@ then
- install_name=$target/$old_library
- $CP $old_library $install_name
- status=$?
-- $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$old_library ${install_name#$DIST_ROOT}
-+ $MANIFEST f $FILEMODE "$OWNER" "$GROUP" $HERE/$old_library ${install_name#$DIST_ROOT}
- ;;
- *)
- echo "$prog: -T $lt_install invalid"
-@@ -281,7 +281,7 @@ then
- if [ $status -eq 0 ]
- then
- $CHMOD $FILEMODE $install_name
-- $CHOWN $OWNER $GROUP $install_name
-+ $CHOWN "$OWNER" "$GROUP" $install_name
- fi
- ;;
- esac
-@@ -310,19 +310,19 @@ else
- status=$?
- if [ $status -eq 0 ]
- then
-- $CHOWN $OWNER $GROUP $dir/$f
-+ $CHOWN "$OWNER" "$GROUP" $dir/$f
- status=$?
- fi
-- $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$f ${dir#$DIST_ROOT}/$f
-+ $MANIFEST f $FILEMODE "$OWNER" "$GROUP" $HERE/$f ${dir#$DIST_ROOT}/$f
- else
- $CHMOD $FILEMODE $dir
- status=$?
- if [ $status -eq 0 ]
- then
-- $CHOWN $OWNER $GROUP $dir
-+ $CHOWN "$OWNER" "$GROUP" $dir
- status=$?
- fi
-- $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$dir ${dir#$DIST_ROOT}
-+ $MANIFEST f $FILEMODE "$OWNER" "$GROUP" $HERE/$dir ${dir#$DIST_ROOT}
- fi
- fi
- else
-@@ -352,10 +352,10 @@ else
- status=$?
- if [ $status -eq 0 ]
- then
-- $CHOWN $OWNER $GROUP $dir/$f
-+ $CHOWN "$OWNER" "$GROUP" $dir/$f
- status=$?
- fi
-- $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$f ${dir#$DIST_ROOT}/$f
-+ $MANIFEST f $FILEMODE "$OWNER" "$GROUP" $HERE/$f ${dir#$DIST_ROOT}/$f
- fi
- [ $status -ne 0 ] && break
- done
diff --git a/patches/attr-2.4.47/0002-build-translations-only-if-gettext-is-enabled.patch b/patches/attr-2.4.47/0002-build-translations-only-if-gettext-is-enabled.patch
deleted file mode 100644
index af062437a..000000000
--- a/patches/attr-2.4.47/0002-build-translations-only-if-gettext-is-enabled.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Philipp Zabel <p.zabel@pengutronix.de>
-Date: Thu, 13 Jul 2017 11:25:35 +0200
-Subject: [PATCH] build translations only if gettext is enabled
-
-Otherwise the Makefile will keep trying to call $(MSGFMT) -o ... with
-MSGFMT not set, causing build errors:
-
- bash: o: command not found
- ../include/buildrules:66: recipe for target 'de.mo' failed
- make[3]: [de.mo] Error 127 (ignored)
-
-Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
----
- Makefile | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 4443fe092f37..896186e1e073 100644
---- a/Makefile
-+++ b/Makefile
-@@ -36,7 +36,10 @@ LDIRT = config.log .dep config.status config.cache confdefs.h conftest* \
- Logs/* built .census install.* install-dev.* install-lib.* *.gz
-
- LIB_SUBDIRS = include libmisc libattr
--TOOL_SUBDIRS = attr getfattr setfattr examples test m4 man doc po debian package
-+TOOL_SUBDIRS = attr getfattr setfattr examples test m4 man doc debian package
-+ifeq ($(GETTEXT_ENABLE), yes)
-+ TOOL_SUBDIRS += po
-+endif
-
- SUBDIRS = $(LIB_SUBDIRS) $(TOOL_SUBDIRS)
-
diff --git a/patches/attr-2.4.47/series b/patches/attr-2.4.47/series
deleted file mode 100644
index 2dc7b2624..000000000
--- a/patches/attr-2.4.47/series
+++ /dev/null
@@ -1,5 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-fix-install-with-domain-user-or-domain-user.patch
-0002-build-translations-only-if-gettext-is-enabled.patch
-# 871964aae99308a74a3b9e9146294e20 - git-ptx-patches magic
diff --git a/rules/attr.in b/rules/attr.in
index 8365d1d5a..773a22893 100644
--- a/rules/attr.in
+++ b/rules/attr.in
@@ -2,7 +2,6 @@
menuconfig ATTR
tristate
- select HOST_GETTEXT if ATTR_GETTEXT
prompt "attr "
help
Utilities for manipulating filesystem extended attributes
@@ -22,9 +21,4 @@ config ATTR_TOOLS
comment "BusyBox' setfattr is selected!"
depends on BUSYBOX_SETFATTR
-config ATTR_GETTEXT
- bool
- depends on ATTR
- prompt "gettext support"
-
endif
diff --git a/rules/attr.make b/rules/attr.make
index b2a198bb5..03e1bccab 100644
--- a/rules/attr.make
+++ b/rules/attr.make
@@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_ATTR) += attr
#
# Paths and names
#
-ATTR_VERSION := 2.4.47
-ATTR_MD5 := 84f58dec00b60f2dc8fd1c9709291cc7
+ATTR_VERSION := 2.4.48
+ATTR_MD5 := bc1e5cb5c96d99b24886f1f527d3bb3d
ATTR := attr-$(ATTR_VERSION)
ATTR_SUFFIX := tar.gz
-ATTR_SOURCE := $(SRCDIR)/$(ATTR).src.$(ATTR_SUFFIX)
+ATTR_SOURCE := $(SRCDIR)/$(ATTR).$(ATTR_SUFFIX)
ATTR_DIR := $(BUILDDIR)/$(ATTR)
ATTR_LICENSE := GPL-2.0-only AND LGPL-2.0-only
ATTR_LICENSE_FILES := \
@@ -26,31 +26,22 @@ ATTR_LICENSE_FILES := \
file://doc/COPYING.LGPL;md5=b8d31f339300bc239d73461d68e77b9c
ATTR_URL := \
- http://download.savannah.gnu.org/releases/attr/$(ATTR).src.$(ATTR_SUFFIX) \
- http://mirrors.zerg.biz/nongnu/attr/$(ATTR).src.$(ATTR_SUFFIX)
+ http://download.savannah.gnu.org/releases/attr/$(ATTR).$(ATTR_SUFFIX) \
+ http://mirrors.zerg.biz/nongnu/attr/$(ATTR).$(ATTR_SUFFIX)
# ----------------------------------------------------------------------------
# Prepare
# ----------------------------------------------------------------------------
-ATTR_CONF_ENV := \
- $(CROSS_ENV) \
- CONFIG_SHELL=bash
-
-ATTR_INSTALL_OPT := \
- DIST_ROOT=$(ATTR_PKGDIR) \
- install \
- install-lib \
- install-dev
-
#
# autoconf
#
-ATTR_AUTOCONF := \
+ATTR_CONF_TOOL := autoconf
+ATTR_CONF_OPT := \
$(CROSS_AUTOCONF_USR) \
- --libexecdir=/usr/lib \
- --enable-shared \
- --$(call ptx/endis, PTXCONF_ATTR_GETTEXT)-gettext
+ --disable-nls \
+ --disable-rpath \
+ --disable-debug
# ----------------------------------------------------------------------------
# Target-Install
diff --git a/rules/host-attr.make b/rules/host-attr.make
index b0d86a446..5d4447b08 100644
--- a/rules/host-attr.make
+++ b/rules/host-attr.make
@@ -16,23 +16,13 @@ HOST_PACKAGES-$(PTXCONF_HOST_ATTR) += host-attr
# Prepare
# ----------------------------------------------------------------------------
-HOST_ATTR_CONF_ENV := \
- $(HOST_ENV) \
- ac_cv_path_MSGFMT=: \
- ac_cv_path_MSGMERGE=: \
- ac_cv_path_XGETTEXT=: \
- CONFIG_SHELL=bash
-
-# no ':=' here
-HOST_ATTR_INSTALL_OPT = \
- DIST_ROOT=$(HOST_ATTR_PKGDIR) \
- install \
- install-lib \
- install-dev
-
-HOST_ATTR_AUTOCONF := \
+# autoconf
+#
+HOST_ATTR_CONF_TOOL := autoconf
+HOST_ATTR_CONF_OPT := \
$(HOST_AUTOCONF) \
- --libexecdir=/lib \
- --enable-shared
+ --disable-nls \
+ --disable-rpath \
+ --disable-debug
# vim: syntax=make