On Mon, May 23, 2011 at 09:33:08AM -0400, Jon Ringle wrote: > 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
applied. Michael > > Signed-off-by: Jon Ringle <[email protected]> > --- > .../0001-attr-make-attr-DESTDIR-aware.patch | 40 ------------------- > ...-buildmacros-use-correct-libtool-commands.patch | 42 > ++++++++++++++++++++ > .../0002-fix-install-with-domain-user.patch | 30 ++++++++++++++ > patches/attr-2.4.44/series | 5 ++- > 4 files changed, 76 insertions(+), 41 deletions(-) > delete mode 100644 > patches/attr-2.4.44/0001-attr-make-attr-DESTDIR-aware.patch > create mode 100644 > patches/attr-2.4.44/0001-buildmacros-use-correct-libtool-commands.patch > create mode 100644 > patches/attr-2.4.44/0002-fix-install-with-domain-user.patch > > diff --git a/patches/attr-2.4.44/0001-attr-make-attr-DESTDIR-aware.patch > b/patches/attr-2.4.44/0001-attr-make-attr-DESTDIR-aware.patch > deleted file mode 100644 > index ac6fe1f..0000000 > --- a/patches/attr-2.4.44/0001-attr-make-attr-DESTDIR-aware.patch > +++ /dev/null > @@ -1,40 +0,0 @@ > -From ab16f079fc3c0014da5c7455d47eda24dad192c4 Mon Sep 17 00:00:00 2001 > -From: Robert Schwebel <[email protected]> > -Date: Fri, 8 Jan 2010 17:22:45 +0100 > -Subject: [PATCH] buildmacros: use correct libtool commands > - > -Signed-off-by: Robert Schwebel <[email protected]> > -[mkl: remove broken DESTDIR support] > -Signed-off-by: Marc Kleine-Budde <[email protected]> > -[mol: install .la not .lai for static libs] > -Signed-off-by: Michael Olbrich <[email protected]> > ---- > - include/buildmacros | 6 +++--- > - 1 file changed, 3 insertions(+), 3 deletions(-) > - > -Index: b/include/buildmacros > -=================================================================== > ---- 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 \ > diff --git > a/patches/attr-2.4.44/0001-buildmacros-use-correct-libtool-commands.patch > b/patches/attr-2.4.44/0001-buildmacros-use-correct-libtool-commands.patch > new file mode 100644 > index 0000000..9e263b7 > --- /dev/null > +++ b/patches/attr-2.4.44/0001-buildmacros-use-correct-libtool-commands.patch > @@ -0,0 +1,42 @@ > +From: Robert Schwebel <[email protected]> > +Date: Fri, 8 Jan 2010 17:22:45 +0100 > +Subject: [PATCH] buildmacros: use correct libtool commands > + > +Signed-off-by: Robert Schwebel <[email protected]> > +[mkl: remove broken DESTDIR support] > +Signed-off-by: Marc Kleine-Budde <[email protected]> > +[mol: install .la not .lai for static libs] > +Signed-off-by: Michael Olbrich <[email protected]> > +--- > + 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.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 0000000..7693f5b > --- /dev/null > +++ b/patches/attr-2.4.44/0002-fix-install-with-domain-user.patch > @@ -0,0 +1,30 @@ > +From: Jon Ringle <[email protected]> > +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 <[email protected]> > +--- > + 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 5e93a07..08fedac 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 > -- > 1.7.0.4 > > > -- > ptxdist mailing list > [email protected] > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | -- ptxdist mailing list [email protected]
