From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: From: Robert Schwebel Date: Tue, 21 Jan 2014 07:54:53 +0100 Message-Id: <1390287293-9726-1-git-send-email-r.schwebel@pengutronix.de> In-Reply-To: <201401201150.42164.jbe@pengutronix.de> References: <201401201150.42164.jbe@pengutronix.de> Subject: [ptxdist] [PATCH] attr: re-add patches after version bump to 2.4.47 Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de Cc: Robert Schwebel Commit 373f6ce6d37610380b539dfaa9292f9682a374c0 forgot to port the patches forward. The old patch "0001-buildmacros-use-correct-libtool-commands.patch" was already applied upstream, so it could be removed. 0001-fix-install-with-domain-user.patch stays valid and is ported over. Signed-off-by: Robert Schwebel --- ...-buildmacros-use-correct-libtool-commands.patch | 42 ---------------------- .../0002-fix-install-with-domain-user.patch | 30 ---------------- patches/attr-2.4.46/series | 4 --- .../0001-fix-install-with-domain-user.patch | 27 ++++++++++++++ patches/attr-2.4.47/series | 4 +++ 5 files changed, 31 insertions(+), 76 deletions(-) delete mode 100644 patches/attr-2.4.46/0001-buildmacros-use-correct-libtool-commands.patch delete mode 100644 patches/attr-2.4.46/0002-fix-install-with-domain-user.patch delete mode 100644 patches/attr-2.4.46/series create mode 100644 patches/attr-2.4.47/0001-fix-install-with-domain-user.patch create mode 100644 patches/attr-2.4.47/series diff --git a/patches/attr-2.4.46/0001-buildmacros-use-correct-libtool-commands.patch b/patches/attr-2.4.46/0001-buildmacros-use-correct-libtool-commands.patch deleted file mode 100644 index 9e263b7..0000000 --- a/patches/attr-2.4.46/0001-buildmacros-use-correct-libtool-commands.patch +++ /dev/null @@ -1,42 +0,0 @@ -From: Robert Schwebel -Date: Fri, 8 Jan 2010 17:22:45 +0100 -Subject: [PATCH] buildmacros: use correct libtool commands - -Signed-off-by: Robert Schwebel -[mkl: remove broken DESTDIR support] -Signed-off-by: Marc Kleine-Budde -[mol: install .la not .lai for static libs] -Signed-off-by: Michael Olbrich ---- - include/buildmacros | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/include/buildmacros b/include/buildmacros -index ab89182..d9b0734 100644 ---- a/include/buildmacros -+++ b/include/buildmacros -@@ -55,10 +55,10 @@ LIBNAME = $(basename $(LTLIBRARY)) - LTOBJECTS = $(OBJECTS:.o=.lo) - LTVERSION = $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) - --LTLINK = $(LIBTOOL) --mode=link $(CC) -+LTLINK = $(LIBTOOL) --tag=CC --mode=link $(CC) - LTEXEC = $(LIBTOOL) --mode=execute - LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) --LTCOMPILE = $(LIBTOOL) --mode=compile $(CCF) -+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CCF) - - ifeq ($(ENABLE_SHARED),yes) - LTLDFLAGS += -rpath $(PKG_LIB_DIR) -@@ -99,7 +99,7 @@ endif - INSTALL_LTLIB_STATIC = \ - cd $(TOPDIR)/$(LIBNAME)/.libs; \ - ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \ -- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_DEVLIB_DIR) -+ ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).la $(PKG_DEVLIB_DIR) - - INSTALL_MAN = \ - @for d in $(MAN_PAGES); do \ --- -1.7.0.4 - diff --git a/patches/attr-2.4.46/0002-fix-install-with-domain-user.patch b/patches/attr-2.4.46/0002-fix-install-with-domain-user.patch deleted file mode 100644 index 7693f5b..0000000 --- a/patches/attr-2.4.46/0002-fix-install-with-domain-user.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Jon Ringle -Date: Mon, 23 May 2011 09:27:46 -0400 -Subject: [PATCH] fix install with domain\user - -If current user is domain\user the \ gets interpreted as an escape char -resulting in user not found. - -Enclose "$(PKG_USER)" and "$(PKG_GROUP)" in quotes to fix. - -Signed-off-by: Jon Ringle ---- - include/buildmacros | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/include/buildmacros b/include/buildmacros -index d9b0734..1eb61df 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)" - - SHELL = /bin/sh - IMAGES_DIR = $(TOPDIR)/all-images --- -1.7.0.4 - diff --git a/patches/attr-2.4.46/series b/patches/attr-2.4.46/series deleted file mode 100644 index 08fedac..0000000 --- a/patches/attr-2.4.46/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -0001-buildmacros-use-correct-libtool-commands.patch -0002-fix-install-with-domain-user.patch -# 3ad7b27704d5f1e53da8022f1ac62c74 - git-ptx-patches magic diff --git a/patches/attr-2.4.47/0001-fix-install-with-domain-user.patch b/patches/attr-2.4.47/0001-fix-install-with-domain-user.patch new file mode 100644 index 0000000..893f766 --- /dev/null +++ b/patches/attr-2.4.47/0001-fix-install-with-domain-user.patch @@ -0,0 +1,27 @@ +From: Jon Ringle +Date: Mon, 23 May 2011 09:27:46 -0400 +Subject: [PATCH] fix install with domain\user + +If current user is domain\user the \ gets interpreted as an escape char +resulting in user not found. + +Enclose "$(PKG_USER)" and "$(PKG_GROUP)" in quotes to fix. + +Signed-off-by: Jon Ringle +--- + include/buildmacros | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/buildmacros b/include/buildmacros +index 9e81bb8..939f39b 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/patches/attr-2.4.47/series b/patches/attr-2.4.47/series new file mode 100644 index 0000000..1233bd7 --- /dev/null +++ b/patches/attr-2.4.47/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-fix-install-with-domain-user.patch +# ae36b8c004e9029248eefce58523c9d6 - git-ptx-patches magic -- 1.8.5.2 -- ptxdist mailing list ptxdist@pengutronix.de