diff options
| author | Jon Ringle <jon@ringle.org> | 2011-05-23 10:33:30 -0400 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-05-23 22:08:40 +0200 |
| commit | 941883e5e9d39478d9c7e86a948b5a91eb5f27d1 (patch) | |
| tree | 8e5826d4ec1fb30e86c28ed743f9edfff8cf27b9 | |
| parent | b4861919f473b42d6dd76da39fcd235c5733863e (diff) | |
| download | ptxdist-941883e5e9d39478d9c7e86a948b5a91eb5f27d1.tar.gz ptxdist-941883e5e9d39478d9c7e86a948b5a91eb5f27d1.tar.xz | |
acl: fix install with user\domain
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.
regenerate patch series with git-ptx-patches
Signed-off-by: Jon Ringle <jon@ringle.org>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
5 files changed, 39 insertions, 9 deletions
diff --git a/patches/acl-2.2.49/0001-builddefs-save-C-and-CPPFLAGS-from-configure-and-use.patch b/patches/acl-2.2.49/0001-builddefs-save-C-and-CPPFLAGS-from-configure-and-use.patch index 0c5b5e4b1..c48cea0da 100644 --- a/patches/acl-2.2.49/0001-builddefs-save-C-and-CPPFLAGS-from-configure-and-use.patch +++ b/patches/acl-2.2.49/0001-builddefs-save-C-and-CPPFLAGS-from-configure-and-use.patch @@ -1,7 +1,6 @@ -From 79dcf140337b1315997913b7e783f81401021027 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde <mkl@pengutronix.de> Date: Fri, 8 Jan 2010 20:10:08 +0100 -Subject: [PATCH 1/3] builddefs: save C and CPPFLAGS from configure and use them +Subject: [PATCH] builddefs: save C and CPPFLAGS from configure and use them Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> --- @@ -31,5 +30,5 @@ index d054a56..2fd0001 100644 include $(TOPDIR)/include/buildmacros -- -1.6.6 +1.7.0.4 diff --git a/patches/acl-2.2.49/0002-buildmacros-add-tag-CC-to-libtool-invocation.patch b/patches/acl-2.2.49/0002-buildmacros-add-tag-CC-to-libtool-invocation.patch index b7f4c3301..f33f06499 100644 --- a/patches/acl-2.2.49/0002-buildmacros-add-tag-CC-to-libtool-invocation.patch +++ b/patches/acl-2.2.49/0002-buildmacros-add-tag-CC-to-libtool-invocation.patch @@ -1,7 +1,6 @@ -From 2a34087f67293e07587ace33e177f5b2f6af3dbd Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde <mkl@pengutronix.de> Date: Fri, 8 Jan 2010 20:10:56 +0100 -Subject: [PATCH 2/3] buildmacros: add --tag=CC to libtool invocation +Subject: [PATCH] buildmacros: add --tag=CC to libtool invocation Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> --- @@ -26,5 +25,5 @@ index ab89182..71ce471 100644 ifeq ($(ENABLE_SHARED),yes) LTLDFLAGS += -rpath $(PKG_LIB_DIR) -- -1.6.6 +1.7.0.4 diff --git a/patches/acl-2.2.49/0003-buildmacros-fix-installation-of-static-libs.patch b/patches/acl-2.2.49/0003-buildmacros-fix-installation-of-static-libs.patch index c2b910969..ac35a16fe 100644 --- a/patches/acl-2.2.49/0003-buildmacros-fix-installation-of-static-libs.patch +++ b/patches/acl-2.2.49/0003-buildmacros-fix-installation-of-static-libs.patch @@ -1,7 +1,6 @@ -From 7822e78df7402f7dc8e352f03fa9d36511918809 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde <mkl@pengutronix.de> Date: Wed, 13 Jan 2010 15:33:11 +0100 -Subject: [PATCH 3/3] buildmacros: fix installation of static libs +Subject: [PATCH] buildmacros: fix installation of static libs Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> --- @@ -22,5 +21,5 @@ index 71ce471..d9b0734 100644 INSTALL_MAN = \ @for d in $(MAN_PAGES); do \ -- -1.6.6 +1.7.0.4 diff --git a/patches/acl-2.2.49/0004-buildmacros-fix-install-with-user-domain.patch b/patches/acl-2.2.49/0004-buildmacros-fix-install-with-user-domain.patch new file mode 100644 index 000000000..5c05ca7ff --- /dev/null +++ b/patches/acl-2.2.49/0004-buildmacros-fix-install-with-user-domain.patch @@ -0,0 +1,30 @@ +From: Jon Ringle <jon@ringle.org> +Date: Mon, 23 May 2011 10:30:59 -0400 +Subject: [PATCH] buildmacros: fix install with user\domain + +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/acl-2.2.49/series b/patches/acl-2.2.49/series index 86b0fdf9c..8d3b58944 100644 --- a/patches/acl-2.2.49/series +++ b/patches/acl-2.2.49/series @@ -1,3 +1,6 @@ +# generated by git-ptx-patches 0001-builddefs-save-C-and-CPPFLAGS-from-configure-and-use.patch 0002-buildmacros-add-tag-CC-to-libtool-invocation.patch 0003-buildmacros-fix-installation-of-static-libs.patch +0004-buildmacros-fix-install-with-user-domain.patch +# 2eab836d9981c83ac12078b434b28788 - git-ptx-patches magic |