From 0afb9be6aa326f69ecb3756f06aaaf1cb8150713 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Sat, 18 Aug 2018 11:19:25 -0400 Subject: [PATCH] Drop subset tarball and replace it with "configure --enable-subset" There's no point creating two separate tarfiles. It's not clear anyone was actually using the subset tarball --- and if they are, they can replace it by the full source distribution and using the --enable-subset option. Signed-off-by: Theodore Ts'o --- Makefile.in | 12 ++++++++---- README.subset | 15 --------------- configure | 19 +++++++++++++++++++ configure.ac | 15 +++++++++++++++ e2fsprogs.lsm | 1 - util/gen-tarball.in | 9 +-------- util/subset.exclude | 36 ------------------------------------ 7 files changed, 43 insertions(+), 64 deletions(-) delete mode 100644 README.subset delete mode 100644 util/subset.exclude diff --git a/Makefile.in b/Makefile.in index 0d0745c..745e859 100644 --- a/Makefile.in +++ b/Makefile.in @@ -13,9 +13,13 @@ INSTALL = @INSTALL@ @DEBUGFS_CMT@DEBUGFS_DIR= debugfs @UUID_CMT@UUID_LIB_SUBDIR= lib/uuid @BLKID_CMT@BLKID_LIB_SUBDIR= lib/blkid -SUPPORT_LIB_SUBDIR= lib/support +@ALL_CMT@SUPPORT_LIB_SUBDIR= lib/support +@ALL_CMT@E2P_LIB_SUBDIR= lib/e2p +@ALL_CMT@EXT2FS_LIB_SUBDIR= lib/ext2fs + +LIB_SUBDIRS=lib/et lib/ss $(E2P_LIB_SUBDIR) $(UUID_LIB_SUBDIR) \ + $(BLKID_LIB_SUBDIR) $(SUPPORT_LIB_SUBDIR) $(EXT2FS_LIB_SUBDIR) intl -LIB_SUBDIRS=lib/et lib/ss lib/e2p $(UUID_LIB_SUBDIR) $(BLKID_LIB_SUBDIR) $(SUPPORT_LIB_SUBDIR) lib/ext2fs intl PROG_SUBDIRS=e2fsck $(DEBUGFS_DIR) misc $(RESIZE_DIR) tests/progs po SUBDIRS=util $(LIB_SUBDIRS) $(PROG_SUBDIRS) tests @@ -26,8 +30,8 @@ TAR=tar all:: subs $(MAKE) libs - $(MAKE) progs - $(MAKE) docs +@ALL_CMT@ $(MAKE) progs +@ALL_CMT@ $(MAKE) docs subs: $(DEP_SUBSTITUTE) @for i in $(SUBS) ; do if test -d `dirname $$i` ; \ diff --git a/README.subset b/README.subset deleted file mode 100644 index 70ed4b2..0000000 --- a/README.subset +++ /dev/null @@ -1,15 +0,0 @@ -This distribution contains a subset of the e2fsprogs package; it -contains the base libraries (ss, et, uuid, blkid) which may be used by -other non-ext2-related applications. - -This may be useful for non-Linux operating systems that need these -libraries for GNOME, but who do not need the ext2/ext3 filesystem -utilities. - -The full e2fsprogs distributions can be found at the e2fsprogs web -page, which is: - - http://e2fsprogs.sourceforge.net - -In case of bugs in these libraries, please contact Ted Ts'o at -tytso@mit.edu or tytso@alum.mit.edu. diff --git a/configure b/configure index a18b631..b9ce7b9 100755 --- a/configure +++ b/configure @@ -741,6 +741,7 @@ DEFRAG_CMT RESIZER_CMT IMAGER_CMT DEBUGFS_CMT +ALL_CMT BLKID_CMT DEPPROFILED_LIBBLKID PROFILED_LIBBLKID @@ -868,6 +869,7 @@ enable_blkid_debug enable_testio_debug enable_libuuid enable_libblkid +enable_subset enable_backtrace enable_debugfs enable_imager @@ -1542,6 +1544,7 @@ Optional Features: --disable-testio-debug disable the use of the test I/O manager for debugging --enable-libuuid build and use private uuid library --enable-libblkid build and use private blkid library + --enable-subset enable subset-only build --disable-backtrace disable use backtrace --disable-debugfs disable support of debugfs program --disable-imager disable support of e2image program @@ -5640,6 +5643,22 @@ fi +ALL_CMT= +# Check whether --enable-subset was given. +if test "${enable_subset+set}" = set; then : + enableval=$enable_subset; if test "$enableval" = "no" +then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling subset-only build" >&5 +$as_echo "Disabling subset-only build" >&6; } +else + ALL_CMT=# + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling subset-only-build" >&5 +$as_echo "Enabling subset-only-build" >&6; } +fi + +fi + + # Check whether --enable-backtrace was given. if test "${enable_backtrace+set}" = set; then : diff --git a/configure.ac b/configure.ac index 81173d0..f365cfa 100644 --- a/configure.ac +++ b/configure.ac @@ -565,6 +565,21 @@ AC_SUBST(PROFILED_LIBBLKID) AC_SUBST(DEPPROFILED_LIBBLKID) AC_SUBST(BLKID_CMT) dnl +dnl handle --enable-subset +dnl +ALL_CMT= +AC_ARG_ENABLE([subset], +[ --enable-subset enable subset-only build], +if test "$enableval" = "no" +then + AC_MSG_RESULT([Disabling subset-only build]) +else + ALL_CMT=# + AC_MSG_RESULT([Enabling subset-only-build]) +fi +,) +AC_SUBST(ALL_CMT) +dnl dnl handle --disable-backtrace dnl AH_TEMPLATE([DISABLE_BACKTRACE], [Define to 1 to disable use of backtrace]) diff --git a/e2fsprogs.lsm b/e2fsprogs.lsm index 40788ce..0513f48 100644 --- a/e2fsprogs.lsm +++ b/e2fsprogs.lsm @@ -9,7 +9,6 @@ Author: tytso@mit.edu (Theodore Tso) Maintained-by: tytso@mit.edu (Theodore Tso) Primary-site: ftp.kernel.org /pub/linux/kernel/people/tytso/e2fsprogs 7396kB e2fsprogs-1.44.3.tar.gz - 700kB e2fsprogs-libs-1.44.3.tar.gz 1kB e2fsprogs-1.44.3.lsm Alternate-site: download.sourceforge.net /pub/sourceforge/e2fsprogs Platforms: linux 1.2.x/1.3.x/2.0.x/2.1.x/2.2.x/2.3.x/2.4.x/2.5.x/2.6.x/3.x/4.x diff --git a/util/gen-tarball.in b/util/gen-tarball.in index 763b0f5..997bd93 100644 --- a/util/gen-tarball.in +++ b/util/gen-tarball.in @@ -22,17 +22,10 @@ case $1 in debian|ubuntu) SRCROOT="e2fsprogs-$deb_pkgver" tarout="e2fsprogs_@E2FSPROGS_PKGVER@.orig.tar.gz" - list=all - ;; - subset) - SRCROOT="e2fsprogs-libs-$base_ver" - tarout="$SRCROOT.tar.gz" - list=subset ;; all|*) SRCROOT="e2fsprogs-$base_ver" tarout="$SRCROOT.tar.gz" - list=all ;; esac @@ -46,7 +39,7 @@ fi -o -name changed-files -o -name .#\* -o -name \*.tar.gz \ -o -name autom4te.cache \) \ -print) > $exclude -sed -e "s;^;$base_e2fsprogs/;" < $srcdir/$list.exclude >> $exclude +sed -e "s;^;$base_e2fsprogs/;" < $srcdir/all.exclude >> $exclude (cd $top_srcdir/.. ; \ tar -c -f - -X $exclude --sort=name --owner=0 --group=0 \ diff --git a/util/subset.exclude b/util/subset.exclude deleted file mode 100644 index 81108d2..0000000 --- a/util/subset.exclude +++ /dev/null @@ -1,36 +0,0 @@ -.git -.hg -.hgignore -.pc -patches -build -build[^/]* -rpm.log -TODO -powerquest -.exclude-subset -po/stamp-cat-id -po/cat-id-tbl.c -Meta -e2fsck -ext2ed -debugfs -misc -tests -resize -contrib -po -include -debian -lib/e2p -lib/evms -lib/ext2fs -lib/support -ABOUT-NLS -README -INSTALL -INSTALL.dllbin -INSTALL.elfbin -RELEASE-NOTES -e2fsprogs.lsm -e2fsprogs.spec -- 1.8.3.1