* [patch 1/2] [PATCH 2/6] dmapi: build: use new autoconf constructs
2012-10-30 21:01 [patch 0/2] dmapi: build system revamp Ben Myers
@ 2012-10-30 21:01 ` Ben Myers
2012-10-30 21:01 ` [patch 2/2] [PATCH 6/6] dmapi: Update .gitignore Ben Myers
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Ben Myers @ 2012-10-30 21:01 UTC (permalink / raw)
To: xfs; +Cc: Jan Engelhardt, Rich Johnston
[-- Attachment #1: build-use-new-autoconf-constructs-2.patch --]
[-- Type: text/plain, Size: 1013 bytes --]
From: Jan Engelhardt <jengelh@inai.de>
Looks like AC_CONFIG_FILES existed since 2.14 already.
Signed-off-by: Jan Engelhardt <jengelh@inai.de>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Ben Myers <bpm@sgi.com>
---
v2: slight modification for dmapi -bpm
configure.ac | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
Index: dmapi/configure.ac
===================================================================
--- dmapi.orig/configure.ac
+++ dmapi/configure.ac
@@ -1,7 +1,9 @@
-AC_INIT(include/dmapi.h)
+AC_INIT([dmapi], [2.2.10])
+
AC_PREREQ(2.50)
AC_CONFIG_AUX_DIR([.])
AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_SRCDIR([include/dmapi.h])
AC_PREFIX_DEFAULT(/usr)
AC_PROG_LIBTOOL
@@ -22,4 +24,5 @@ AC_PACKAGE_NEED_XFS_HANDLE_H
AC_MANUAL_FORMAT
AC_MULTILIB($enable_lib64)
-AC_OUTPUT(include/builddefs)
+AC_CONFIG_FILES([include/builddefs])
+AC_OUTPUT
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 6+ messages in thread* [patch 2/2] [PATCH 6/6] dmapi: Update .gitignore
2012-10-30 21:01 [patch 0/2] dmapi: build system revamp Ben Myers
2012-10-30 21:01 ` [patch 1/2] [PATCH 2/6] dmapi: build: use new autoconf constructs Ben Myers
@ 2012-10-30 21:01 ` Ben Myers
2012-10-31 10:21 ` [patch 0/2] dmapi: build system revamp Christoph Hellwig
2012-10-31 17:00 ` Ben Myers
3 siblings, 0 replies; 6+ messages in thread
From: Ben Myers @ 2012-10-30 21:01 UTC (permalink / raw)
To: xfs; +Cc: Jan Engelhardt, Rich Johnston
[-- Attachment #1: update-.gitignore.patch --]
[-- Type: text/plain, Size: 1323 bytes --]
Root entries to where they only can occur.
Reported-by: Jan Engelhardt <jengelh@inai.de>
Signed-off-by: Ben Myers <bpm@sgi.com>
---
.gitignore | 82 ++++++++++++++++++++++++++++++------------------------------
1 files changed, 41 insertions(+), 41 deletions(-)
Index: dmapi/.gitignore
===================================================================
--- dmapi.orig/.gitignore
+++ dmapi/.gitignore
@@ -2,38 +2,45 @@
*.o
# build system
-.census
-Logs/
-include/builddefs
-install-sh
+/.census
+/Logs/
+/include/builddefs
+/install-sh
# magic diretory symlinks
-include/xfs
+/include/xfs
# Makepgs
-build/src-manifest
-build/dmapi-*.tar.gz
-doc/CHANGES.gz
+/build/src-manifest
+/build/dmapi-*.tar.gz
+/doc/CHANGES.gz
dmapi-*
# autoconf generated files
-aclocal.m4
-autom4te.cache/
-config.guess
-config.log
-config.status
-config.sub
-configure
+/aclocal.m4
+/autom4te.cache/
+/config.guess
+/config.log
+/config.status
+/config.sub
+/configure
# libtool
-libtool
-ltmain.sh
+/libtool
+/ltmain.sh
*.lo
*.la
.libs
# quilt stuff
-.pc/
-patches/
+/.pc/
+/patches/
# binaries
+
+# m4
+/m4/libtool.m4
+/m4/ltoptions.m4
+/m4/ltsugar.m4
+/m4/ltversion.m4
+/m4/lt~obsolete.m4
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [patch 0/2] dmapi: build system revamp
2012-10-30 21:01 [patch 0/2] dmapi: build system revamp Ben Myers
2012-10-30 21:01 ` [patch 1/2] [PATCH 2/6] dmapi: build: use new autoconf constructs Ben Myers
2012-10-30 21:01 ` [patch 2/2] [PATCH 6/6] dmapi: Update .gitignore Ben Myers
@ 2012-10-31 10:21 ` Christoph Hellwig
2012-10-31 13:59 ` Ben Myers
2012-10-31 17:00 ` Ben Myers
3 siblings, 1 reply; 6+ messages in thread
From: Christoph Hellwig @ 2012-10-31 10:21 UTC (permalink / raw)
To: Ben Myers; +Cc: Jan Engelhardt, Rich Johnston, xfs
On Tue, Oct 30, 2012 at 04:01:52PM -0500, Ben Myers wrote:
> Hi,
>
> Here are Jan Engelhardt's patches originally posted here
> http://oss.sgi.com/archives/xfs/2012-05/msg00323.html
> as they apply to dmapi.
>
> Patch 2 applied without much modification, patch 3 was not necessary for dmapi,
> and patch 6 did not apply at all so I implemented that.
All the patches in this and the related series look good to me.
but can you please remove the [PATCH N/N] already in the quilt series?
Right now we have one [patch n/n] generated by quilt and then another
mismatching one, which I think would even land in the git commit log.
Reviewed-by: Christoph Hellwig <hch@lst.de>
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [patch 0/2] dmapi: build system revamp
2012-10-31 10:21 ` [patch 0/2] dmapi: build system revamp Christoph Hellwig
@ 2012-10-31 13:59 ` Ben Myers
0 siblings, 0 replies; 6+ messages in thread
From: Ben Myers @ 2012-10-31 13:59 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: Jan Engelhardt, Rich Johnston, xfs
Hey Christoph,
On Wed, Oct 31, 2012 at 06:21:53AM -0400, Christoph Hellwig wrote:
> On Tue, Oct 30, 2012 at 04:01:52PM -0500, Ben Myers wrote:
> > Hi,
> >
> > Here are Jan Engelhardt's patches originally posted here
> > http://oss.sgi.com/archives/xfs/2012-05/msg00323.html
> > as they apply to dmapi.
> >
> > Patch 2 applied without much modification, patch 3 was not necessary for dmapi,
> > and patch 6 did not apply at all so I implemented that.
>
> All the patches in this and the related series look good to me.
> but can you please remove the [PATCH N/N] already in the quilt series?
>
> Right now we have one [patch n/n] generated by quilt and then another
> mismatching one, which I think would even land in the git commit log.
Aha. I will clean up the extra [patch n/n]. I didn't expect it would do that.
> Reviewed-by: Christoph Hellwig <hch@lst.de>
Thanks for the review!
-Ben
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [patch 0/2] dmapi: build system revamp
2012-10-30 21:01 [patch 0/2] dmapi: build system revamp Ben Myers
` (2 preceding siblings ...)
2012-10-31 10:21 ` [patch 0/2] dmapi: build system revamp Christoph Hellwig
@ 2012-10-31 17:00 ` Ben Myers
3 siblings, 0 replies; 6+ messages in thread
From: Ben Myers @ 2012-10-31 17:00 UTC (permalink / raw)
To: xfs; +Cc: Jan Engelhardt, Rich Johnston
On Tue, Oct 30, 2012 at 04:01:52PM -0500, Ben Myers wrote:
> Here are Jan Engelhardt's patches originally posted here
> http://oss.sgi.com/archives/xfs/2012-05/msg00323.html
> as they apply to dmapi.
>
> Patch 2 applied without much modification, patch 3 was not necessary for dmapi,
> and patch 6 did not apply at all so I implemented that.
These two patches are committed to git://oss.sgi.com/xfs/cmds/dmapi.git, master branch.
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 6+ messages in thread