[PATCH 1/3] rename configure.in to configure.ac

[PATCH 1/3] rename configure.in to configure.ac

[Mike Frysinger]

Newer autotools warn and start to error with the older name.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 configure.in => configure.ac | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename configure.in => configure.ac (100%)

diff --git a/configure.in b/configure.ac
similarity index 100%
rename from configure.in
rename to configure.ac
-- 
1.7.12

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

[PATCH 2/3] respect DESTDIR when installing

[Mike Frysinger]

This makes the `make install DESTDIR=...` form work.  It keeps support
for all previous forms too (like DIST_ROOT).

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 include/install-sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/install-sh b/include/install-sh
index 18c051f..c952a71 100755
--- a/include/install-sh
+++ b/include/install-sh
@@ -85,6 +85,8 @@ REAL_UID=$OWNER
 INSTALL=true
 MANIFEST=:
 
+: ${DIST_ROOT:=${DESTDIR}}
+
 [ -n "$DIST_MANIFEST" -a -z "$DIST_ROOT" ] && INSTALL=false
 [ -n "$DIST_MANIFEST" ] && MANIFEST="_manifest"
 
-- 
1.7.12

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH 2/3] respect DESTDIR when installing

[Christoph Hellwig]

Looks good.  I guess this is for xfstests as it should be working for
the real tools?

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH 2/3] respect DESTDIR when installing

[Mike Frysinger]

[-- Attachment #1.1: Type: Text/Plain, Size: 239 bytes --]

On Tuesday 25 September 2012 05:41:39 Christoph Hellwig wrote:
> Looks good.  I guess this is for xfstests as it should be working for
> the real tools?

hmm, these don't appear to have been merged.  is there something i should do ?
-mike

[-- Attachment #1.2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[-- Attachment #2: Type: text/plain, Size: 121 bytes --]

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH 2/3] respect DESTDIR when installing

[Christoph Hellwig]

On Fri, Oct 19, 2012 at 12:21:58AM -0400, Mike Frysinger wrote:
> On Tuesday 25 September 2012 05:41:39 Christoph Hellwig wrote:
> > Looks good.  I guess this is for xfstests as it should be working for
> > the real tools?
> 
> hmm, these don't appear to have been merged.  is there something i should do ?

No, but I stopped applying patches to the kernel.org repos, with the SGI
people pickingup the slack using the oss.sgi.com repos.

Ben, any chance you could re-review the series and apply it?

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH 2/3] respect DESTDIR when installing

[Rich Johnston]

On 10/23/2012 07:25 AM, Christoph Hellwig wrote:
> On Fri, Oct 19, 2012 at 12:21:58AM -0400, Mike Frysinger wrote:
>> On Tuesday 25 September 2012 05:41:39 Christoph Hellwig wrote:
>>> Looks good.  I guess this is for xfstests as it should be working for
>>> the real tools?
>>
>> hmm, these don't appear to have been merged.  is there something i should do ?
>
> No, but I stopped applying patches to the kernel.org repos, with the SGI
> people pickingup the slack using the oss.sgi.com repos.
>
> Ben, any chance you could re-review the series and apply it?
>
> _______________________________________________
> xfs mailing list
> xfs@oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs
>
Mike/Christoph,

I am in the process of going through patchworks and cleaning up the 
list.  I will make sure to include this.

Thanks
--Rich

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH 2/3] respect DESTDIR when installing

[Ben Myers]

Hey Mike,

On Mon, Sep 24, 2012 at 07:39:37PM -0400, Mike Frysinger wrote:
> This makes the `make install DESTDIR=...` form work.  It keeps support
> for all previous forms too (like DIST_ROOT).

This doesn't seem to work for me.  I do a make install DESTDIR=/some/odd/path
and it all still goes into /usr.  What sort of system did you try this on?
Maybe it just doesn't like opensuse 12.2?

Regards,
	Ben

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH 2/3] respect DESTDIR when installing

[Mike Frysinger]

[-- Attachment #1.1: Type: Text/Plain, Size: 858 bytes --]

On Wednesday 24 October 2012 16:51:40 Ben Myers wrote:
> Hey Mike,
> 
> On Mon, Sep 24, 2012 at 07:39:37PM -0400, Mike Frysinger wrote:
> > This makes the `make install DESTDIR=...` form work.  It keeps support
> > for all previous forms too (like DIST_ROOT).
> 
> This doesn't seem to work for me.  I do a make install
> DESTDIR=/some/odd/path and it all still goes into /usr.  What sort of
> system did you try this on? Maybe it just doesn't like opensuse 12.2?

the `make` output makes it look like it's going into / and such, but it isn't.  
the install-sh script rewrites the path silently behind the scenes.

alternatively, maybe you didn't rebuild autotools after applying the patch ?  
the code will copy include/install-sh to the top level, and then everything 
executes that rather than the original in the include/ subdir.
-mike

[-- Attachment #1.2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[-- Attachment #2: Type: text/plain, Size: 121 bytes --]

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH 2/3] respect DESTDIR when installing

[Ben Myers]

On Wed, Oct 24, 2012 at 05:07:36PM -0400, Mike Frysinger wrote:
> On Wednesday 24 October 2012 16:51:40 Ben Myers wrote:
> > On Mon, Sep 24, 2012 at 07:39:37PM -0400, Mike Frysinger wrote:
> > > This makes the `make install DESTDIR=...` form work.  It keeps support
> > > for all previous forms too (like DIST_ROOT).
> > 
> > This doesn't seem to work for me.  I do a make install
> > DESTDIR=/some/odd/path and it all still goes into /usr.  What sort of
> > system did you try this on? Maybe it just doesn't like opensuse 12.2?
> 
> the `make` output makes it look like it's going into / and such, but it isn't.  
> the install-sh script rewrites the path silently behind the scenes.
> 
> alternatively, maybe you didn't rebuild autotools after applying the patch ?  
> the code will copy include/install-sh to the top level, and then everything 
> executes that rather than the original in the include/ subdir.

Thanks Mike, works great. 

-Ben

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

[PATCH 3/3] install shared libs with +x bits

[Mike Frysinger]

These are shared libs w/executable code, so make sure they have +x bits
set on them.  Some kernels will proactively disallow executable mmaps if
the files lack +x bits.  It's also the right thing to do.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 include/buildmacros | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/buildmacros b/include/buildmacros
index 31c7eb0..7a01880 100644
--- a/include/buildmacros
+++ b/include/buildmacros
@@ -58,7 +58,7 @@ ifeq ($(ENABLE_SHARED),yes)
 INSTALL_LTLIB = \
 	cd $(TOPDIR)/$(LIBNAME)/.libs; \
 	../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
-	../$(INSTALL) -m 644 -T so_dot_version $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
+	../$(INSTALL) -m 755 -T so_dot_version $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
 	../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_ROOT_LIB_DIR)
 endif
 
-- 
1.7.12

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH 3/3] install shared libs with +x bits

[Christoph Hellwig]

On Mon, Sep 24, 2012 at 07:39:38PM -0400, Mike Frysinger wrote:
> These are shared libs w/executable code, so make sure they have +x bits
> set on them.  Some kernels will proactively disallow executable mmaps if
> the files lack +x bits.  It's also the right thing to do.

Looks good,

Reviewed-by: Christoph Hellwig <hch@lst.de>

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH 1/3] rename configure.in to configure.ac

[Christoph Hellwig]

On Mon, Sep 24, 2012 at 07:39:36PM -0400, Mike Frysinger wrote:
> Newer autotools warn and start to error with the older name.
> 
> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
> ---
>  configure.in => configure.ac | 0
>  1 file changed, 0 insertions(+), 0 deletions(-)
>  rename configure.in => configure.ac (100%)
> 
> diff --git a/configure.in b/configure.ac
> similarity index 100%
> rename from configure.in
> rename to configure.ac

Is there a patch version that can track this now?

Otherwise looks good and should go into all of the userspace repos.

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH 1/3] rename configure.in to configure.ac

[Mike Frysinger]

[-- Attachment #1.1: Type: Text/Plain, Size: 808 bytes --]

On Tuesday 25 September 2012 05:41:13 Christoph Hellwig wrote:
> On Mon, Sep 24, 2012 at 07:39:36PM -0400, Mike Frysinger wrote:
> > Newer autotools warn and start to error with the older name.
> > 
> > Signed-off-by: Mike Frysinger <vapier@gentoo.org>
> > ---
> > 
> >  configure.in => configure.ac | 0
> >  1 file changed, 0 insertions(+), 0 deletions(-)
> >  rename configure.in => configure.ac (100%)
> > 
> > diff --git a/configure.in b/configure.ac
> > similarity index 100%
> > rename from configure.in
> > rename to configure.ac
> 
> Is there a patch version that can track this now?

`git am` should do the right thing.  patch-2.7 should also process this 
correctly (although you might want to get the latest 2.7 snapshot since it 
fixes a few bugs in the 2.7 release).
-mike

[-- Attachment #1.2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[-- Attachment #2: Type: text/plain, Size: 121 bytes --]

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH 1/3] rename configure.in to configure.ac

[Ben Myers]

On Mon, Sep 24, 2012 at 07:39:36PM -0400, Mike Frysinger wrote:
> Newer autotools warn and start to error with the older name.
> 
> Signed-off-by: Mike Frysinger <vapier@gentoo.org>

I have pulled this series into xfsdump and xfsprogs repos on oss.  xfstests has
a little hiccup that I need to sort through first:

~/xfstests # make
make: *** No rule to make target `configure.in', needed by `configure'.  Stop.

I haven't forgotten dmapi.

Thanks Mike!

-Ben

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH 1/3] rename configure.in to configure.ac

[Mike Frysinger]

[-- Attachment #1.1: Type: Text/Plain, Size: 1185 bytes --]

On Wednesday 24 October 2012 18:06:17 Ben Myers wrote:
> On Mon, Sep 24, 2012 at 07:39:36PM -0400, Mike Frysinger wrote:
> > Newer autotools warn and start to error with the older name.
> > 
> > Signed-off-by: Mike Frysinger <vapier@gentoo.org>
> 
> I have pulled this series into xfsdump and xfsprogs repos on oss.  xfstests
> has a little hiccup that I need to sort through first:
> 
> ~/xfstests # make
> make: *** No rule to make target `configure.in', needed by `configure'. 
> Stop.

yeah, i forgot to update Makefile to look for configure.ac.  i think all the 
repos will need that fix.  xfsprogs for example:
diff --git a/Makefile b/Makefile
index 80fec1e..7ef3e84 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ SRCDIR = $(PKG_NAME)-$(PKG_VERSION)
 SRCTAR = $(PKG_NAME)-$(PKG_VERSION).tar.gz
 
 CONFIGURE = aclocal.m4 configure config.guess config.sub install-sh ltmain.sh
-LSRCFILES = configure.in release.sh README VERSION $(CONFIGURE)
+LSRCFILES = configure.ac release.sh README VERSION $(CONFIGURE)
 
 LDIRT = config.log .ltdep .dep config.status config.cache confdefs.h \
 	conftest* built .census install.* install-dev.* *.gz \
-mike

[-- Attachment #1.2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[-- Attachment #2: Type: text/plain, Size: 121 bytes --]

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs