User Space Releases
Quoted 8 lines · ----- "Nathan Scott
Quoted 6 lines · ----- "Christoph Hellwig
xfsdump:
- get my configure defaults patch (just posted) in
- update the changelog and possibly any other documentation
- update the Debian packaging, possibly including the new source generation using the hardlinked package directory.
Quoted 4 lines
Quoted 1 line
Nathan, what's the time frame to get the Debian release bits done?
Will look into getting the deb packaging converted over during the next day or two at most.
Here's the conversion to new-fangled build style for xfsdump. Review? Its largely same as xfsprogs, the one slight wrinkle was the symlinked files in "common"... but thats sorted out with this patch too.
cheers.
Signature · 1 line
Nathan
.gitignore +10 -8
@@ -3,23 +3,22 @@ # build system .census -Logs/ include/config.h include/builddefs install-sh -# magic diretory symlinks -#include/disk -#include/xfs - -# Makepgs -build/src-manifest -build/xfsdump-*.tar.gz +# packaging 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
@@ -38,6 +37,9 @@ ltmain.sh po/xfsdump.pot po/*.mo +# cscope stuff +cscope.* + # quilt stuff .pc/ patches/
Makefile +46 -23
94 lines not on this page · raw message
configure.in +35 -2
@@ -17,10 +17,43 @@ AC_ARG_ENABLE(gettext, AC_SUBST(enable_gettext) AC_ARG_ENABLE(lib64, -[ --enable-lib64=[yes/no] Enable lib64 support [default=no]],, - enable_lib64=no) +[ --enable-lib64=[yes/no] Enable lib64 support [default=yes]],, + enable_lib64=yes) AC_SUBST(enable_lib64) +# +# If the user specified a libdir ending in lib64 do not append another +# 64 to the library names. +# +base_libdir=`basename "$libdir"` +case $base_libdir in +lib64) + enable_lib64=no +esac + +# +# Some important tools should be installed into the root partitions. +# +# Check whether exec_prefix=/usr: and install them to /sbin in that +# case. If the user choses a different prefix assume he just wants +# a local install for testing and not a system install. +# +case $exec_prefix:$prefix in +NONE:NONE | NONE:/usr | /usr:*) + root_sbindir='/sbin' + AC_SUBST([root_sbindir]) + + root_libdir="/${base_libdir}" + AC_SUBST([root_libdir]) +esac + +# Find localized files +LOCALIZED_FILES="" +for lfile in `find ${srcdir} -name '*.c' -type f || exit 1`; do + LOCALIZED_FILES="$LOCALIZED_FILES \$(TOPDIR)/$lfile" +done +AC_SUBST(LOCALIZED_FILES) + AC_PACKAGE_GLOBALS(xfsdump) AC_PACKAGE_UTILITIES(xfsdump) AC_MULTILIB($enable_lib64)
debian/Makefile +2 -0
@@ -6,6 +6,8 @@ TOPDIR = .. include $(TOPDIR)/include/builddefs LSRCFILES = changelog compat control copyright rules shlibs.local +LDIRDIRT = xfsdump +LDIRT = files *.log *.substvars *.debhelper default:
debian/rules +1 -3
@@ -40,8 +40,7 @@ binary-arch: checkroot built $(checkdir) -rm -rf $(dirme) $(pkgme) $(MAKE) -C . install - $(pkgme) $(MAKE) -C build src-manifest - + $(pkgme) $(MAKE) dist dh_installdocs dh_installchangelogs dh_strip
@@ -51,7 +50,6 @@ binary-arch: checkroot built dh_installdeb dh_shlibdeps dh_gencontrol - dh_md5sums dh_builddeb
doc/INSTALL +8 -16
@@ -19,21 +19,13 @@ run them. (on an RPM based system) or the uuid-dev package (on a Debian system) as some of the commands make use of the UUID library provided by these. - If you just want to spin an RPM and/or tar file, use the Makepkgs - script in the top level directory. This will configure and build - the package and leave binary and src RPMs in the build/rpm - directory. It will also leave a tar file in the build/tar - directory. + To build the package and install it manually, use the following steps: - # ./Makepkgs verbose - - If you want to build the package and install it manually, use the - following steps : - - # make configure (or run autoconf; ./configure) - # make - # su root - # make install + # make + # su root + # make install + [and optionally, for the development libraries and headers] + # make install-dev Note that there are so many "install" variants out there that we wrote our own script (see "install-sh" in the top level directory).
@@ -41,10 +33,10 @@ run them. If you wish to turn off debugging asserts in the command build and turn on the optimizer then set the shell environment variables: - OPTIMIZER=-O + OPTIMIZER=-O1 DEBUG=-DNDEBUG - before running make configure or Makepkgs. + before running make or Makepkgs. 2. How to Contribute
doc/Makefile +2 -2
@@ -6,7 +6,7 @@ TOPDIR = .. include $(TOPDIR)/include/builddefs README = README.xfsdump -LSRCFILES = INSTALL PORTING CHANGES COPYING $(README) \ +LSRCFILES = INSTALL CHANGES COPYING $(README) \ xfsdump.html xfsdump_ts.txt \ *.obj *.gif
@@ -21,7 +21,7 @@ CHANGES.gz: install: default $(INSTALL) -m 755 -d $(PKG_DOC_DIR) - $(INSTALL) -m 644 PORTING CHANGES.gz $(README) $(PKG_DOC_DIR) + $(INSTALL) -m 644 CHANGES.gz $(README) $(PKG_DOC_DIR) ifeq ($(PKG_DISTRIBUTION), debian) $(INSTALL) -S CHANGES.gz $(PKG_DOC_DIR)/changelog.gz else
dump/Makefile +8 -6
@@ -81,9 +81,11 @@ LOCALINCL = \ LTCOMMAND = xfsdump -CFILES = $(COMMON) $(INVCOMMON) $(LOCALS) -HFILES = $(LOCALINCL) $(COMMINCL) $(INVINCL) -LINKS = $(COMMINCL) $(COMMON) $(INVINCL) $(INVCOMMON) +CFILES = $(LOCALS) +LCFILES = $(COMMON) $(INVCOMMON) +HFILES = $(LOCALINCL) +LHFILES = $(COMMINCL) $(INVINCL) +LINKS = $(COMMINCL) $(COMMON) $(INVINCL) $(INVCOMMON) LDIRT = $(LINKS) LLDLIBS = $(LIBUUID) $(LIBHANDLE) $(LIBATTR) $(LIBRMT) LTDEPENDENCIES = $(LIBRMT)
@@ -95,10 +97,10 @@ default: $(LTCOMMAND) include $(BUILDRULES) install: default + $(INSTALL) -m 755 -d $(PKG_ROOT_SBIN_DIR) + $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_ROOT_SBIN_DIR) $(INSTALL) -m 755 -d $(PKG_SBIN_DIR) - $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR) - $(INSTALL) -m 755 -d $(PKG_BIN_DIR) - $(INSTALL) -S $(PKG_SBIN_DIR)/$(LTCOMMAND) $(PKG_BIN_DIR)/$(LTCOMMAND) + $(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND) $(PKG_SBIN_DIR)/$(LTCOMMAND) install-dev: $(COMMINCL) $(COMMON):
include/builddefs.in +17 -11
@@ -31,10 +31,15 @@ PKG_RELEASE = @pkg_release@ PKG_VERSION = @pkg_version@ PKG_PLATFORM = @pkg_platform@ PKG_DISTRIBUTION= @pkg_distribution@ -PKG_BIN_DIR = @bindir@ + +prefix = @prefix@ +exec_prefix = @exec_prefix@ +datarootdir = @datarootdir@ +top_builddir = @top_builddir@ + PKG_SBIN_DIR = @sbindir@ -PKG_LIB_DIR = @libdir@@libdirsuffix@ -PKG_DEVLIB_DIR = @libexecdir@@libdirsuffix@ +PKG_ROOT_SBIN_DIR = @root_sbindir@ +PKG_ROOT_LIB_DIR= @root_libdir@@libdirsuffix@ PKG_INC_DIR = @includedir@ PKG_MAN_DIR = @mandir@ PKG_DOC_DIR = @datadir@/doc/@pkg_name@
@@ -55,6 +60,7 @@ MAKEDEPEND = @makedepend@ MSGFMT = @msgfmt@ MSGMERGE = @msgmerge@ XGETTEXT = @xgettext@ +LOCALIZED_FILES = @LOCALIZED_FILES@ RPM = @rpm@ RPMBUILD = @rpmbuild@
@@ -66,14 +72,15 @@ ENABLE_GETTEXT = @enable_gettext@ HAVE_ZIPPED_MANPAGES = @have_zipped_manpages@ -LCFLAGS += -DXFS_BIG_FILES=1 -DXFS_BIG_FILESYSTEMS=1 +GCCFLAGS = -funsigned-char -fno-strict-aliasing -Wall +# -Wbitwise -Wno-transparent-union -Wno-old-initializer -Wno-decl ifeq ($(PKG_PLATFORM),linux) -PCFLAGS = -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 +PCFLAGS = -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $(GCCFLAGS) DEPENDFLAGS = -D__linux__ endif ifeq ($(PKG_PLATFORM),darwin) -PCFLAGS = -traditional-cpp +PCFLAGS = -traditional-cpp $(GCCFLAGS) DEPENDFLAGS = -D__APPLE__ endif ifeq ($(PKG_PLATFORM),irix)
@@ -82,17 +89,16 @@ DEPENDFLAGS = -D__sgi__ endif ifeq ($(PKG_PLATFORM),freebsd) PLDLIBS = -L/usr/local/lib -lintl -PCFLAGS = -I/usr/local/include +PCFLAGS = -I/usr/local/include $(GCCFLAGS) DEPENDFLAGS = -D__FreeBSD__ endif - -GCFLAGS = $(OPTIMIZER) $(DEBUG) -funsigned-char -fno-strict-aliasing -Wall \ +GCFLAGS = $(OPTIMIZER) $(DEBUG) \ -DVERSION=\"$(PKG_VERSION)\" -DLOCALEDIR=\"$(PKG_LOCALE_DIR)\" \ -DPACKAGE=\"$(PKG_NAME)\" -I$(TOPDIR)/include -# Global, Platform, Local CFLAGS -CFLAGS += $(GCFLAGS) $(PCFLAGS) $(LCFLAGS) $(CPPFLAGS) +# First, Global, Platform, Local CFLAGS +CFLAGS += $(FCFLAGS) $(GCFLAGS) $(PCFLAGS) $(LCFLAGS) include $(TOPDIR)/include/buildmacros
include/buildmacros +17 -30
83 lines not on this page · raw message
include/buildrules +36 -17
87 lines not on this page · raw message
invutil/Makefile +5 -4
@@ -39,8 +39,9 @@ CURSESINCL = \ LOCALS = invutil.c LTCOMMAND = xfsinvutil -CFILES = $(COMMON) $(INVCOMMON) $(LOCALS) -HFILES = $(COMMINCL) $(INVINCL) +CFILES = $(LOCALS) +LCFILES = $(COMMON) $(INVCOMMON) +LHFILES = $(COMMINCL) $(INVINCL) LINKS = $(COMMINCL) $(COMMON) $(INVINCL) $(INVCOMMON) LDIRT = $(LINKS) LLDLIBS = $(LIBUUID) $(LIBCURSES)
@@ -62,8 +63,8 @@ default: $(LTCOMMAND) include $(BUILDRULES) install: default - $(INSTALL) -m 755 -d $(PKG_BIN_DIR) - $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR) + $(INSTALL) -m 755 -d $(PKG_SBIN_DIR) + $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR) install-dev: $(COMMINCL) $(COMMON):
m4/Makefile +11 -1
@@ -5,6 +5,13 @@ TOPDIR = .. include $(TOPDIR)/include/builddefs +CONFIGURE = \ + libtool.m4 \ + ltoptions.m4 \ + ltsugar.m4 \ + ltversion.m4 \ + lt~obsolete.m4 + LSRCFILES = \ manual_format.m4 \ package_attrdev.m4 \
@@ -15,8 +22,11 @@ LSRCFILES = \ package_xfslibs.m4 \ multilib.m4 -default: +default: include $(BUILDRULES) install install-dev install-lib: default + +realclean: distclean + rm -f $(CONFIGURE)
po/Makefile +2 -37
@@ -7,45 +7,10 @@ include $(TOPDIR)/include/builddefs POTHEAD = $(PKG_NAME).pot LINGUAS = -LSRCFILES = $(LINGUAS:%=%.po) $(POTHEAD) +LSRCFILES = $(LINGUAS:%=%.po) LDIRT = $(POTHEAD) -# TODO - invutil/ -XGETTEXTFILES = \ - $(TOPDIR)/common/cldmgr.c \ - $(TOPDIR)/common/content_common.c \ - $(TOPDIR)/common/dlog.c \ - $(TOPDIR)/common/drive.c \ - $(TOPDIR)/common/drive_minrmt.c \ - $(TOPDIR)/common/drive_scsitape.c \ - $(TOPDIR)/common/drive_simple.c \ - $(TOPDIR)/common/fs.c \ - $(TOPDIR)/common/global.c \ - $(TOPDIR)/common/main.c \ - $(TOPDIR)/common/media.c \ - $(TOPDIR)/common/mlog.c \ - $(TOPDIR)/common/namreg.c \ - $(TOPDIR)/common/openutil.c \ - $(TOPDIR)/common/qlock.c \ - $(TOPDIR)/common/util.c \ - $(TOPDIR)/dump/content.c \ - $(TOPDIR)/dump/inomap.c \ - $(TOPDIR)/dump/var.c \ - $(TOPDIR)/inventory/inv_api.c \ - $(TOPDIR)/inventory/inv_core.c \ - $(TOPDIR)/inventory/inv_fstab.c \ - $(TOPDIR)/inventory/inv_mgr.c \ - $(TOPDIR)/inventory/inv_stobj.c \ - $(TOPDIR)/librmt/rmtioctl.c \ - $(TOPDIR)/librmt/rmtmsg.c \ - $(TOPDIR)/librmt/rmtopen.c \ - $(TOPDIR)/restore/content.c \ - $(TOPDIR)/restore/dirattr.c \ - $(TOPDIR)/restore/inomap.c \ - $(TOPDIR)/restore/namreg.c \ - $(TOPDIR)/restore/node.c \ - $(TOPDIR)/restore/tree.c \ - $(TOPDIR)/restore/win.c +XGETTEXTFILES = $(LOCALIZED_FILES) default: $(POTHEAD) $(LINGUAS:%=%.mo)
release.sh +2 -2
@@ -18,8 +18,8 @@ git-commit -a -m "${version} release" echo "Tagging git repository" git-tag v${version} -echo "Creating source tarball in build/tar/" -./Makepkgs +echo "Creating source tarball" +make dist echo "Done." echo "Please remember to push out tags using \"git push --tags\""
restore/Makefile +8 -6
@@ -91,9 +91,11 @@ LOCALINCL = \ LTCOMMAND = xfsrestore -CFILES = $(COMMON) $(INVCOMMON) $(LOCALS) -HFILES = $(LOCALINCL) $(COMMINCL) $(INVINCL) -LINKS = $(COMMINCL) $(COMMON) $(INVINCL) $(INVCOMMON) +CFILES = $(LOCALS) +LCFILES = $(COMMON) $(INVCOMMON) +HFILES = $(LOCALINCL) +LHFILES = $(COMMINCL) $(INVINCL) +LINKS = $(COMMINCL) $(COMMON) $(INVINCL) $(INVCOMMON) LDIRT = $(LINKS) LLDLIBS = $(LIBUUID) $(LIBHANDLE) $(LIBATTR) $(LIBRMT) LTDEPENDENCIES = $(LIBRMT)
@@ -107,10 +109,10 @@ default: $(LTCOMMAND) include $(BUILDRULES) install: default + $(INSTALL) -m 755 -d $(PKG_ROOT_SBIN_DIR) + $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_ROOT_SBIN_DIR) $(INSTALL) -m 755 -d $(PKG_SBIN_DIR) - $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR) - $(INSTALL) -m 755 -d $(PKG_BIN_DIR) - $(INSTALL) -S $(PKG_SBIN_DIR)/$(LTCOMMAND) $(PKG_BIN_DIR)/$(LTCOMMAND) + $(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND) $(PKG_SBIN_DIR)/$(LTCOMMAND) install-dev: $(COMMINCL) $(COMMON):
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Quoted 3 lines · Nathan Scott
Here's the conversion to new-fangled build style for xfsdump. Review? Its largely same as xfsprogs, the one slight wrinkle was the symlinked files in "common"... but thats sorted out with this patch too.
Thanks. Looks good from looking over it and trying a make dist and debian package build. A couple of think I noticed while going over the diffs between xfsprogs and xfsdump for the build system:
- in xfsdump we have po/*.mo in the gitignore file, while we list the two translations explicitly in xfsprogs. I'll fix this up and push the fix
- installation of documentation is doc/Makefile is handled slightly differently. In both cases we might be better off installing more documtnation (and probably get rid of the $(README) variable in xfsdump. I'll look into more sensible defaults for either.
- the source-link target in xfsdump now echos the mkdir command but xfsprogs doesn't. I don't care either way but it might be a good idea to make it the same in both versions
- include/builddefs.in in xfsdump now expands prefix/exec_prefix/ datarootdir/top_builddir twice. Just kill the second one
- the doc/PORTING file still exist in xfsdump and should probably be deleted. It doesn't get packaged either, btw.
- the build directory in xfsdump isn't deleted yet as it is in xfsprogs.
- the Makepkgs script isn't deleted yet as in xfsprogs build/rpm/rpm-2.rc.template
- unlike xfsprogs the m5/lt*.m4 files don't get into the generated tarball. I don't quite understand why we need them, but we should at least be consistant.
- might it be a good idea to add the LHFILES/LCFILEs handling to xfsprogs and the install-qa handling to xfsdump include/build* despite beeing unused to keep them in sync?
- probably worth updating the copyrights in either version to list the same years now they are the same
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs