updates for debian boot floppies - we now generate an extra little package

for Debian which has a minimized mkfs only.

diff --git a/Makefile b/Makefile
index 0b7cf24e4a5da578adfe334294851e147e788b06..e00ee9de790ba89703fa122d58e623128727b864 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,7 @@ CONFIGURE = configure include/builddefs include/platform_defs.h
 LSRCFILES = configure configure.in Makepkgs install-sh README VERSION
 
 LDIRT = config.log config.status config.cache confdefs.h conftest* \
-       Logs/* built .census install.* install-dev.* *.gz
+       Logs/* built bfbuilt .census .bfcensus install.* install-dev.* *.gz
 
 SUBDIRS = include libxfs libhandle libdisk \
        bmap db freeze fsck growfs logprint mkfile mkfs repair rtcp \

diff --git a/debian/Makefile b/debian/Makefile
index 85264f88bcf26571e021668082467ab568e8beff..54b049b200d8a44513eee53ed6eebd6ec1888706 100644 (file)
--- a/debian/Makefile
+++ b/debian/Makefile
@@ -35,6 +35,10 @@ include $(TOPDIR)/include/builddefs
 
 LSRCFILES = changelog control copyright rules
 DEV_DOC_DIR = $(PKG_DOC_DIR)/../xfslibs-dev
+BOOT_DOC_DIR = $(PKG_DOC_DIR)/../xfsprogs-bf
+BOOT_MAN_DIR = $(PKG_MAN_DIR)/man8
+BOOT_MKFS_BIN = $(TOPDIR)/mkfs/mkfs.xfs-xfsprogs-bf
+BOOT_MKFS_MAN = $(TOPDIR)/man/man8/mkfs.xfs.8.gz
 
 default:
 
@@ -53,3 +57,15 @@ ifeq ($(PKG_DISTRIBUTION), debian)
        $(INSTALL) -m 644 copyright $(DEV_DOC_DIR)
        $(INSTALL) -m 644 changelog $(DEV_DOC_DIR)/changelog.Debian
 endif
+
+install-boot: default
+ifeq ($(PKG_DISTRIBUTION), debian)
+       $(INSTALL) -m 755 -d $(PKG_DOC_DIR)
+       $(INSTALL) -m 755 -d $(PKG_SBIN_DIR)
+       $(INSTALL) -m 755 -d $(BOOT_DOC_DIR)
+       $(INSTALL) -m 755 -d $(BOOT_MAN_DIR)
+       $(INSTALL) -m 644 copyright $(BOOT_DOC_DIR)
+       $(INSTALL) -m 644 changelog $(BOOT_DOC_DIR)/changelog.Debian
+       $(INSTALL) -m 755 $(BOOT_MKFS_BIN) $(PKG_SBIN_DIR)/mkfs.xfs
+       $(INSTALL) -m 644 $(BOOT_MKFS_MAN) $(BOOT_MAN_DIR)/mkfs.xfs.8.gz
+endif

diff --git a/debian/changelog b/debian/changelog
index 7f81c06a05a7450c07cfd570f78942dda7bce551..3719ee8c3f20ad5ba01d98605b0aa91d1a70e711 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
 xfsprogs (1.3.7-0) unstable; urgency=low
 
   * New upstream release
-  * Make libuuid link strategy a build time option (closes: #111426)
   * Change to libhandle licensing (was GPL, now LGPL-2.1)
+  * Create a boot-floppies package with smaller mkfs.xfs (closes: #111426)
 
  -- Nathan Scott <nathans@debian.org>  Mon, 10 Sep 2001 10:52:04 +1000
 

diff --git a/debian/control b/debian/control
index 996b4bf15578dbf17cd91856e80002b457c58eb7..c4809aecc63b54918ded89296aa6d263ba2075f1 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -32,3 +32,16 @@ Description: XFS filesystem-specific static libraries and headers.
  xfslibs-dev contains the libraries and header files needed to
  develop XFS filesystem-specific programs.
  
+Package: xfsprogs-bf
+Section: devel
+Priority: extra
+Depends: ${shlibs:Depends}
+Conflicts: e2fsprogs, xfsprogs
+Architecture: any
+Description: A stripped-down versions of xfsprogs, for boot-floppies
+ This package is an xfsprogs package built for a reduced size, so that
+ it can help to save space on installation boot-floppies.
+ .
+ Don't attempt to install this package, it has no support for a couple of
+ features you surely want.  Anyway it should refuse to install.
+

diff --git a/debian/rules b/debian/rules
index 012d4c56151bf1d597ba55475241640dba6b3081..789c101c01a37f4f297d631a227c8b405cff2cb6 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -2,17 +2,21 @@
 
 package = xfsprogs
 develop = xfslibs-dev
+bootpkg = xfsprogs-bf
 
 dirtmp = debian/tmp
 dirdev = debian/$(develop)
+dirbfs = debian/$(bootpkg)
 pkgtmp = DIST_ROOT=`pwd`/$(dirtmp); export DIST_ROOT;
 pkgdev = DIST_ROOT=`pwd`/$(dirdev); export DIST_ROOT;
+pkgbfs = DIST_ROOT=`pwd`/$(dirbfs); export DIST_ROOT;
 stdenv = @GZIP=-q; export GZIP;
 
 options = DEBUG=-DNDEBUG; DISTRIBUTION=debian; export DEBUG DISTRIBUTION;
+bfsopts = $(options) OPTIMIZER=-Os; export OPTIMIZER;
 checkdir = test -f debian/rules
 
-build: built
+build: bfbuilt built
 built: config
        @echo "== dpkg-buildpackage: build" 1>&2
        $(MAKE) default
@@ -26,12 +30,30 @@ config: .census
        $(options) ./configure
        touch .census
 
+bfbuilt: bfconfig
+       @echo "== dpkg-buildpackage: bootfloppies build" 1>&2
+       for dir in libxfs libdisk mkfs; \
+       do \
+               $(MAKE) -C $$dir; \
+       done
+       mv mkfs/mkfs.xfs mkfs/mkfs.xfs-$(bootpkg)
+       $(MAKE) distclean
+       touch bfbuilt
+
+bfconfig: .bfcensus
+.bfcensus:
+       @echo "== dpkg-buildpackage: bootfloppies configure" 1>&2
+       $(checkdir)
+       autoconf
+       $(bfsopts) ./configure --enable-shared-uuid=yes
+       touch .bfcensus
+
 clean:
        @echo "== dpkg-buildpackage: clean" 1>&2
        $(checkdir)
-       -rm -f built .census
+       -rm -f bfbuilt built .bfcensus .census mkfs/mkfs.xfs-$(bootpkg)
        $(MAKE) distclean
-       -rm -rf $(dirtmp) $(dirdev) debian/*substvars debian/files*
+       -rm -rf $(dirtmp) $(dirdev) $(dirbfs) debian/*substvars debian/files*
 
 binary-indep:
 
@@ -43,18 +65,21 @@ binary-indep:
 binary-arch: checkroot built
        @echo "== dpkg-buildpackage: binary-arch" 1>&2
        $(checkdir)
-       -rm -rf $(dirtmp) $(dirdev)
+       -rm -rf $(dirtmp) $(dirdev) $(dirbfs)
        $(pkgtmp) $(MAKE) -C . install
        $(pkgdev) $(MAKE) -C . install-dev
+       $(pkgbfs) $(MAKE) -C debian install-boot
        $(pkgtmp) $(MAKE) -C build src-manifest
        @echo "== dpkg-buildpackage: debstd" 1>&2
        $(stdenv) debstd -m | grep -v 'Dangling symlink'
        dpkg-gencontrol -isp -p$(package) -P$(dirtmp)
        dpkg-gencontrol -isp -p$(develop) -P$(dirdev)
-       chown -R root.root $(dirtmp) $(dirdev)
-       chmod -R go=rX $(dirtmp) $(dirdev)
+       dpkg-gencontrol -isp -p$(bootpkg) -P$(dirbfs)
+       chown -R root.root $(dirtmp) $(dirdev) $(dirbfs)
+       chmod -R go=rX $(dirtmp) $(dirdev) $(dirbfs)
        dpkg --build $(dirtmp) .. 
        dpkg --build $(dirdev) ..
+       dpkg --build $(dirbfs) ..
 
 binary: binary-indep binary-arch