diff options
| author | Jon Ringle <jon@ringle.org> | 2011-05-23 09:33:08 -0400 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-05-23 22:08:39 +0200 |
| commit | b4861919f473b42d6dd76da39fcd235c5733863e (patch) | |
| tree | ecf75e92d1097d2114f5f98f0d2910b9d4e4bfb6 | |
| parent | e90e9c8f714e6caec99d19f0beef5f1c05b9eb2d (diff) | |
| download | ptxdist-b4861919f473b42d6dd76da39fcd235c5733863e.tar.gz ptxdist-b4861919f473b42d6dd76da39fcd235c5733863e.tar.xz | |
attr: 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.
Regenerated patch series with git-ptx-patches
Signed-off-by: Jon Ringle <jon@ringle.org>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | patches/attr-2.4.44/0001-buildmacros-use-correct-libtool-commands.patch (renamed from patches/attr-2.4.44/0001-attr-make-attr-DESTDIR-aware.patch) | 10 | ||||
| -rw-r--r-- | patches/attr-2.4.44/0002-fix-install-with-domain-user.patch | 30 | ||||
| -rw-r--r-- | patches/attr-2.4.44/series | 5 |
3 files changed, 40 insertions, 5 deletions
diff --git a/patches/attr-2.4.44/0001-attr-make-attr-DESTDIR-aware.patch b/patches/attr-2.4.44/0001-buildmacros-use-correct-libtool-commands.patch index ac6fe1ff4..9e263b7e2 100644 --- a/patches/attr-2.4.44/0001-attr-make-attr-DESTDIR-aware.patch +++ b/patches/attr-2.4.44/0001-buildmacros-use-correct-libtool-commands.patch @@ -1,4 +1,3 @@ -From ab16f079fc3c0014da5c7455d47eda24dad192c4 Mon Sep 17 00:00:00 2001 From: Robert Schwebel <r.schwebel@pengutronix.de> Date: Fri, 8 Jan 2010 17:22:45 +0100 Subject: [PATCH] buildmacros: use correct libtool commands @@ -10,10 +9,10 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- include/buildmacros | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) + 1 files changed, 3 insertions(+), 3 deletions(-) -Index: b/include/buildmacros -=================================================================== +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)) @@ -38,3 +37,6 @@ Index: b/include/buildmacros INSTALL_MAN = \ @for d in $(MAN_PAGES); do \ +-- +1.7.0.4 + diff --git a/patches/attr-2.4.44/0002-fix-install-with-domain-user.patch b/patches/attr-2.4.44/0002-fix-install-with-domain-user.patch new file mode 100644 index 000000000..7693f5b2b --- /dev/null +++ b/patches/attr-2.4.44/0002-fix-install-with-domain-user.patch @@ -0,0 +1,30 @@ +From: Jon Ringle <jon@ringle.org> +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 <jon@ringle.org> +--- + 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.44/series b/patches/attr-2.4.44/series index 5e93a0763..08fedac84 100644 --- a/patches/attr-2.4.44/series +++ b/patches/attr-2.4.44/series @@ -1 +1,4 @@ -0001-attr-make-attr-DESTDIR-aware.patch +# generated by git-ptx-patches +0001-buildmacros-use-correct-libtool-commands.patch +0002-fix-install-with-domain-user.patch +# 3ad7b27704d5f1e53da8022f1ac62c74 - git-ptx-patches magic |