build: makefile and package tweaks for in-tree deb builds.

Also bumped the build version number, tagged, and uploaded
3.0.4 to the Debian archives.

Signed-off-by: Nathan Scott <nathans@debian.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/Makefile b/Makefile
index db718d29855abfc9371ce061973f0710ebc5ca2d..8a7ef4d7208332373aad7898fc2526dc7e0f68b0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,9 +9,7 @@ ifeq ($(HAVE_BUILDDEFS), yes)
 include $(TOPDIR)/include/builddefs
 endif
 
-CONFIGURE = aclocal.m4 configure config.guess config.sub configure install-sh \
-           ltmain.sh m4/libtool.m4 m4/ltoptions.m4 m4/ltsugar.m4 \
-           m4/ltversion.m4 m4/lt~obsolete.m4
+CONFIGURE = aclocal.m4 configure config.guess config.sub install-sh ltmain.sh
 LSRCFILES = configure.in Makepkgs release.sh README VERSION $(CONFIGURE)
 
 LDIRT = config.log .dep config.status config.cache confdefs.h conftest* \

diff --git a/Makepkgs b/Makepkgs
index d5583b44a87891e5acf15f43fdd209c03f1679f0..6e61a253982af7e75ee46f95b6b8c9f227909e49 100755 (executable)
--- a/Makepkgs
+++ b/Makepkgs
@@ -5,7 +5,15 @@
 #
 LOGDIR=Logs
 
-type=rpm
+#
+# If we're on a Debian or Debian-derived system generate deb packages by
+# default, else rpm packages.
+#
+if [ -f /etc/debian_version ] ; then
+    type=debian
+else
+    type=rpm
+fi
 verbose=false
 
 MAKE=${MAKE:-make}
@@ -35,13 +43,27 @@ test -f fileslib.rpm && rm -f fileslib.rpm
 test ! -d $LOGDIR && mkdir $LOGDIR
 rm -rf $LOGDIR/* > /dev/null 2>&1
 
-# build Debian packages, cleans itself before starting
-SUDO=${SUDO:-sudo}
-test ! -z "$SUDO" && sudo=$SUDO
 if [ $type = debian ] ; then
-       LOGDEB=`pwd`
-       LOGDEB=../`basename $LOGDEB`.log
-       echo "== Debian build, log is $LOGDEB"; echo
+       SOURCE=`pwd`
+       PACKAGE=`basename $SOURCE`
+       LOGDEB=$SOURCE/$LOGDIR/$PACKAGE.log
+       if $verbose ; then
+               $MAKE include/builddefs 2>&1 | tee $LOGDIR/configure
+       else
+               $MAKE include/builddefs > $LOGDIR/configure 2>&1  || exit 1
+       fi
+
+       . ./VERSION
+       VERSION=${PKG_MAJOR}.${PKG_MINOR}.${PKG_REVISION}
+       export SRCLINK_ROOT="$SOURCE/build/deb/$PACKAGE-$VERSION"
+       rm -fr "$SRCLINK_ROOT"
+       mkdir -p "$SRCLINK_ROOT" || exit 1
+
+       $MAKE source-link || exit 1
+
+       cd "$SRCLINK_ROOT"
+       SUDO=${SUDO:-fakeroot}
+       test ! -z "$SUDO" && sudo=$SUDO
        if $verbose ; then
                dpkg-buildpackage -r$SUDO | tee $LOGDEB
        else
@@ -50,7 +72,6 @@ if [ $type = debian ] ; then
        exit 0
 fi
 
-# build RPM packages - manual clean before starting
 echo "== clean, log is $LOGDIR/clean"
 if $verbose ; then
        $MAKE clean 2>&1 | tee $LOGDIR/clean

diff --git a/VERSION b/VERSION
index b3a880e06428f6bb55e87308555ca8cfcf232a05..60188182694d62dedd6004de96b7df7444e211cb 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -3,5 +3,5 @@
 #
 PKG_MAJOR=3
 PKG_MINOR=0
-PKG_REVISION=3
+PKG_REVISION=4
 PKG_BUILD=1

diff --git a/build/Makefile b/build/Makefile
index 200c249dbb3fccd1390bd22902ffeb730a52bdb9..cec611502a34104f989a96142b0384f8a8f6079f 100644 (file)
--- a/build/Makefile
+++ b/build/Makefile
@@ -9,6 +9,7 @@ MANIFEST=src-manifest
 SRCTAR=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
 LDIRT = *-manifest *.gz $(TOPDIR)/$(PKG_NAME)-*
+LDIRDIRT = deb
 
 # for clean and clobber
 SUBDIRS = tar rpm

diff --git a/debian/changelog b/debian/changelog
index ebf9819ebd9a86478cfc0114ab90e3cd7c2e8820..7e556148dfe3c45275f60e3869c53cdb53ac5fe8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xfsprogs (3.0.4) unstable; urgency=low
+
+  * New bugfix release
+  * Resolve a libxfs unaligned access (closes: #517553)
+
+ -- Nathan Scott <nathans@debian.org>  Thu, 17 Sep 2009 14:32:48 +1000
+
 xfsprogs (3.0.2) unstable; urgency=low
 
   * New bugfix release

diff --git a/doc/CHANGES b/doc/CHANGES
index c7da0bde5b4ac9ef4d93a10dac4f04aafdda055c..da1d3a0c4e34974c3334427a328c27536bf57946 100644 (file)
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,3 +1,7 @@
+xfsprogs-3.0.4 (17 September 2009)
+       - Debian packaging updates.
+       - Rework Makepkgs and Makefiles to improve deb generation.
+
 xfsprogs-3.0.3 (30 August 2009)
        - Fix unaligned accesses in libxfs.
        - Various small fixes to xfs_db, xfs_repair and xfs_io.

diff --git a/include/Makefile b/include/Makefile
index 1ca5071295839f137927e6becdb5d7dc6218d5f3..d89480ed6eb6fe6ec981f3e27c2c44dfab1c7085 100644 (file)
--- a/include/Makefile
+++ b/include/Makefile
@@ -19,7 +19,7 @@ TOPDIR = ..
 include $(TOPDIR)/include/builddefs
 
 QAHFILES = libxfs.h libxlog.h \
-       bitops.h cache.h kmem.h list.h parent.h swab.h xqm.h \
+       bitops.h cache.h kmem.h list.h parent.h swab.h \
        xfs_ag.h xfs_alloc.h xfs_alloc_btree.h xfs_arch.h xfs_attr_leaf.h \
        xfs_attr_sf.h xfs_bit.h xfs_bmap.h xfs_bmap_btree.h xfs_btree.h \
        xfs_btree_trace.h xfs_buf_item.h xfs_da_btree.h xfs_dinode.h \

diff --git a/include/buildmacros b/include/buildmacros
index ec22fb63d95e5226ea106b2b6fa95f08e53b1210..b825e106c4fd9e3f5289c7bab4bac1bd69e7386b 100644 (file)
--- a/include/buildmacros
+++ b/include/buildmacros
@@ -22,6 +22,8 @@ MANDIRT = *.[1-9].gz
 PODIRT = *.tmpo *.mo
 CDIRT = $(OBJECTS) $(LTOBJECTS) $(LTCOMMAND) $(LTLIBRARY)
 DIRT = $(LDIRT) $(DEPDIRT) $(MANDIRT) $(PODIRT) $(CDIRT)
+LIBDIRT = .libs
+DIRDIRT = $(LDIRDIRT) $(LIBDIRT)
 
 OBJECTS = $(ASFILES:.s=.o) \
          $(CFILES:.c=.o) \
@@ -138,7 +140,7 @@ DIST_MAKERULE = \
 
 SOURCE_MAKERULE = \
        @test -z "$$DIR" && DIR="."; \
-       for f in $(SRCFILES) ""; do \
+       for f in $(SRCFILES) $(POTHEAD) ""; do \
            test -z "$$f" && break; \
            test -L "$$f" || $(ECHO) $$DIR/$$f; \
        done; \

diff --git a/include/buildrules b/include/buildrules
index f2a33727285ff22c8cf686fa2593fde5a65a3309..62d9a377e7180dd0632ab624a4f87e7695019adf 100644 (file)
--- a/include/buildrules
+++ b/include/buildrules
@@ -8,7 +8,7 @@ include $(TOPDIR)/include/builddefs
 
 clean clobber : $(addsuffix -clean,$(SUBDIRS))
        rm -f $(DIRT)
-       @rm -fr .libs
+       rm -fr $(DIRDIRT)
 %-clean:
        $(MAKE) -C $* clean
 
@@ -21,6 +21,17 @@ $(SUBDIRS):
        $(MAKE) -C $@
 endif
 
+source-link: 
+       @test -z "$$DIR" && DIR="."; \
+       for f in `echo $(SRCFILES) $(SUBDIRS)`; do \
+           if test -d $$f ; then \
+               mkdir $$SRCLINK_ROOT/$$DIR/$$f || exit $$?; \
+               $(MAKEF) DIR=$$DIR/$$f -C $$f $@ || exit $$?; \
+           else \
+               ln $$f $$SRCLINK_ROOT/$$DIR/$$f || exit $$?; \
+           fi; \
+       done
+
 #
 # Standard targets
 #

diff --git a/m4/Makefile b/m4/Makefile
index ab0ed48343bb5ab483c44baeb057b17e8afd4a12..825ba710cfaa36dea4bd63a0bd8394675c3abc1e 100644 (file)
--- a/m4/Makefile
+++ b/m4/Makefile
@@ -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_aiodev.m4 \
@@ -14,10 +21,14 @@ LSRCFILES = \
        package_types.m4 \
        package_utilies.m4 \
        package_uuiddev.m4 \
-       multilib.m4
+       multilib.m4 \
+       $(CONFIGURE)
 
 default:
 
 include $(BUILDRULES)
 
 install install-dev install-lib: default
+
+realclean: distclean
+       rm -f $(CONFIGURE)

diff --git a/po/Makefile b/po/Makefile
index ac7d43ff7331f2b80edf91fc222586d035f737dd..4db7d1e555ae5c2adc37e46468bc0d46fa4c62eb 100644 (file)
--- a/po/Makefile
+++ b/po/Makefile
@@ -7,7 +7,7 @@ include $(TOPDIR)/include/builddefs
 
 POTHEAD = $(PKG_NAME).pot
 LINGUAS = pl
-LSRCFILES = $(LINGUAS:%=%.po) $(POTHEAD)
+LSRCFILES = $(LINGUAS:%=%.po)
 LDIRT = $(POTHEAD)
 
 XGETTEXTFILES =        $(LOCALIZED_FILES)