Skip to contentSkip to conversation

xfsdump: build system revamp

PATCH In review Ben Myers 2 participants 5 messages Oct 30, 2012 – Oct 31, 2012

lore
Share & tools
lore
author
#1 lore raw

PATCH 2/6 xfsdump: build: use new autoconf constructs

From: Jan Engelhardt <[email protected]>

Looks like AC_CONFIG_FILES existed since 2.14 already.

---
v2: minor changes to apply to xfsdump -bpm

 configure.ac |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
configure.ac +4 -2
Index: xfsdump/configure.ac
===================================================================
@@ -1,7 +1,8 @@
-AC_INIT(common/main.c)
+AC_INIT([xfsdump], [3.1.0])
 AC_PREREQ(2.50)
 AC_CONFIG_AUX_DIR([.])
 AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_SRCDIR([common/main.c])
 AC_CONFIG_HEADER(include/config.h)
 AC_PREFIX_DEFAULT(/usr)
 
@@ -83,4 +84,5 @@ AC_PACKAGE_NEED_ATTRGET_LIBATTR
 
 AC_MANUAL_FORMAT
 
-AC_OUTPUT(include/builddefs)
+AC_CONFIG_FILES([include/builddefs])
+AC_OUTPUT

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

author
#2 lore raw

PATCH 6/6 xfsdump: Update .gitignore

In reply to Ben Myers

Root entries to where they only can occur.

---
 .gitignore |   82 ++++++++++++++++++++++++++++++------------------------------
 1 files changed, 41 insertions(+), 41 deletions(-)
.gitignore +112 -112
Index: xfsdump/.gitignore
===================================================================
@@ -4,138 +4,138 @@
 
 # build system
 .census
-include/config.h
-include/builddefs
-install-sh
+/include/config.h
+/include/builddefs
+/install-sh
 
 # packaging
-doc/CHANGES.gz
+/doc/CHANGES.gz
 xfsdump-*
 xfsdump_*
 
 # autoconf generated files
-aclocal.m4
-m4/libtool.m4
-m4/ltoptions.m4
-m4/ltsugar.m4
-m4/ltversion.m4
-m4/lt~obsolete.m4
-autom4te.cache/
-config.guess
-config.log
-config.status
-config.sub
-configure
+/aclocal.m4
+/m4/libtool.m4
+/m4/ltoptions.m4
+/m4/ltsugar.m4
+/m4/ltversion.m4
+/m4/lt~obsolete.m4
+/autom4te.cache/
+/config.guess
+/config.log
+/config.status
+/config.sub
+/configure
 
 # libtool
-libtool
-ltmain.sh
+/libtool
+/ltmain.sh
 *.lo
 *.la
 .libs
 .ltdep
 
 # gettext
-po/xfsdump.pot
-po/*.mo
+/po/xfsdump.pot
+/po/*.mo
 
 # cscope stuff
 cscope.*
 
 # quilt stuff
-.pc/
-patches/
+/.pc/
+/patches/
 
 # binaries
-dump/xfsdump
-invutil/xfsinvutil
-restore/xfsrestore
+/dump/xfsdump
+/invutil/xfsinvutil
+/restore/xfsrestore
 
 # @%#% symlinked sourced files
-dump/arch_xlate.[ch]
-dump/cldmgr.[ch]
-dump/content.h
-dump/content_common.[ch]
-dump/content_inode.h
-dump/dlog.[ch]
-dump/drive.[ch]
-dump/drive_minrmt.c
-dump/drive_scsitape.c
-dump/drive_simple.c
-dump/exit.h
-dump/fs.[ch]
-dump/getdents.[ch]
-dump/global.[ch]
-dump/hsmapi.[ch]
-dump/inv_api.c
-dump/inv_core.c
-dump/inv_files.c
-dump/inv_fstab.c
-dump/inv_idx.c
-dump/inv_mgr.c
-dump/inv_priv.h
-dump/inv_stobj.c
-dump/inventory.h
-dump/lock.[ch]
-dump/main.c
-dump/media.h
-dump/mlog.[ch]
-dump/openutil.[ch]
-dump/path.[ch]
-dump/qlock.[ch]
-dump/rec_hdr.h
-dump/ring.[ch]
-dump/sproc.[ch]
-dump/stream.[ch]
-dump/timeutil.[ch]
-dump/ts_mtio.h
-dump/types.h
-dump/util.[ch]
-
-invutil/global.h
-invutil/inv_files.c
-invutil/inv_priv.h
-invutil/inventory.h
-invutil/mlog.h
-invutil/timeutil.[ch]
-invutil/types.h
-invutil/util.h
-
-restore/arch_xlate.[ch]
-restore/cldmgr.[ch]
-restore/content.h
-restore/content_inode.h
-restore/dlog.[ch]
-restore/drive.[ch]
-restore/drive_minrmt.c
-restore/drive_scsitape.c
-restore/drive_simple.c
-restore/exit.h
-restore/fs.[ch]
-restore/getdents.[ch]
-restore/global.[ch]
-restore/hsmapi.[ch]
-restore/inv_api.c
-restore/inv_core.c
-restore/inv_files.c
-restore/inv_fstab.c
-restore/inv_idx.c
-restore/inv_mgr.c
-restore/inv_priv.h
-restore/inv_stobj.c
-restore/inventory.h
-restore/lock.[ch]
-restore/main.c
-restore/media.h
-restore/mlog.[ch]
-restore/openutil.[ch]
-restore/path.[ch]
-restore/qlock.[ch]
-restore/rec_hdr.h
-restore/ring.[ch]
-restore/sproc.[ch]
-restore/stream.[ch]
-restore/timeutil.[ch]
-restore/ts_mtio.h
-restore/types.h
-restore/util.[ch]
+/dump/arch_xlate.[ch]
+/dump/cldmgr.[ch]
+/dump/content.h
+/dump/content_common.[ch]
+/dump/content_inode.h
+/dump/dlog.[ch]
+/dump/drive.[ch]
+/dump/drive_minrmt.c
+/dump/drive_scsitape.c
+/dump/drive_simple.c
+/dump/exit.h
+/dump/fs.[ch]
+/dump/getdents.[ch]
+/dump/global.[ch]
+/dump/hsmapi.[ch]
+/dump/inv_api.c
+/dump/inv_core.c
+/dump/inv_files.c
+/dump/inv_fstab.c
+/dump/inv_idx.c
+/dump/inv_mgr.c
+/dump/inv_priv.h
+/dump/inv_stobj.c
+/dump/inventory.h
+/dump/lock.[ch]
+/dump/main.c
+/dump/media.h
+/dump/mlog.[ch]
+/dump/openutil.[ch]
+/dump/path.[ch]
+/dump/qlock.[ch]
+/dump/rec_hdr.h
+/dump/ring.[ch]
+/dump/sproc.[ch]
+/dump/stream.[ch]
+/dump/timeutil.[ch]
+/dump/ts_mtio.h
+/dump/types.h
+/dump/util.[ch]
+
+/invutil/global.h
+/invutil/inv_files.c
+/invutil/inv_priv.h
+/invutil/inventory.h
+/invutil/mlog.h
+/invutil/timeutil.[ch]
+/invutil/types.h
+/invutil/util.h
+
+/restore/arch_xlate.[ch]
+/restore/cldmgr.[ch]
+/restore/content.h
+/restore/content_inode.h
+/restore/dlog.[ch]
+/restore/drive.[ch]
+/restore/drive_minrmt.c
+/restore/drive_scsitape.c
+/restore/drive_simple.c
+/restore/exit.h
+/restore/fs.[ch]
+/restore/getdents.[ch]
+/restore/global.[ch]
+/restore/hsmapi.[ch]
+/restore/inv_api.c
+/restore/inv_core.c
+/restore/inv_files.c
+/restore/inv_fstab.c
+/restore/inv_idx.c
+/restore/inv_mgr.c
+/restore/inv_priv.h
+/restore/inv_stobj.c
+/restore/inventory.h
+/restore/lock.[ch]
+/restore/main.c
+/restore/media.h
+/restore/mlog.[ch]
+/restore/openutil.[ch]
+/restore/path.[ch]
+/restore/qlock.[ch]
+/restore/rec_hdr.h
+/restore/ring.[ch]
+/restore/sproc.[ch]
+/restore/stream.[ch]
+/restore/timeutil.[ch]
+/restore/ts_mtio.h
+/restore/types.h
+/restore/util.[ch]

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

author
#4 lore raw
In reply to Ben Myers
Quoted 6 lines · Ben Myers

Here are Jan Engelhardt's patches originally posted here
http://oss.sgi.com/archives/xfs/2012-05/msg00323.html
as they apply to xfsdump.

Patch 2 applied without much modification, patch 3 was not necessary for xfsdump, and patch 6 did not apply at all so I implemented that.

These two have been committed to git://oss.sgi.com/xfs/cmds/xfsdump.git, master branch.

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs