diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2018-08-18 23:22:53 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2018-08-18 23:22:53 -0400 |
| commit | 6ac81e4526a4e1305aa5b976a3a2b7058c7509a5 (patch) | |
| tree | aa2f1d034bf10419d4e940e6bef718ce46b949b9 /util | |
| parent | 139a30928a23f8bbc7148197bbe98ed0e0565cf1 (diff) | |
| parent | 40e66e2e8be046f909dfff73b3909f15c9d0f400 (diff) | |
| download | android_external_e2fsprogs-6ac81e4526a4e1305aa5b976a3a2b7058c7509a5.tar.gz android_external_e2fsprogs-6ac81e4526a4e1305aa5b976a3a2b7058c7509a5.tar.bz2 android_external_e2fsprogs-6ac81e4526a4e1305aa5b976a3a2b7058c7509a5.zip | |
Merge branch 'maint' into next
Diffstat (limited to 'util')
| -rw-r--r-- | util/Makefile.pq | 10 | ||||
| -rw-r--r-- | util/gen-tarball.in | 34 | ||||
| -rw-r--r-- | util/subset.exclude | 36 |
3 files changed, 11 insertions, 69 deletions
diff --git a/util/Makefile.pq b/util/Makefile.pq deleted file mode 100644 index ccde1183..00000000 --- a/util/Makefile.pq +++ /dev/null @@ -1,10 +0,0 @@ -TOPSRC=.. - -!include $(TOPSRC)\powerquest\MCONFIG - -ALL:: libecho.exe - -libecho.exe: libecho.c - -clean:: - $(RM) libecho.exe diff --git a/util/gen-tarball.in b/util/gen-tarball.in index 6b90acb6..997bd935 100644 --- a/util/gen-tarball.in +++ b/util/gen-tarball.in @@ -7,7 +7,7 @@ top_srcdir=@top_srcdir@ top_dir=`cd $top_srcdir; pwd` base_ver=`echo @E2FSPROGS_VERSION@ | sed -e 's/-WIP//' -e 's/pre-//' -e 's/-PLUS//'` base_e2fsprogs=`basename $top_dir` -exclude=/tmp/exclude +exclude=/tmp/exclude$$ GZIP=gzip # @@ -21,16 +21,11 @@ deb_pkgver=`echo @E2FSPROGS_PKGVER@ | sed -e 's/~/-/g'` case $1 in debian|ubuntu) SRCROOT="e2fsprogs-$deb_pkgver" - rename_tarball="e2fsprogs_@E2FSPROGS_PKGVER@.orig.tar.gz" - list=all - ;; - subset) - SRCROOT="e2fsprogs-libs-$base_ver" - list=subset + tarout="e2fsprogs_@E2FSPROGS_PKGVER@.orig.tar.gz" ;; all|*) SRCROOT="e2fsprogs-$base_ver" - list=all + tarout="$SRCROOT.tar.gz" ;; esac @@ -38,25 +33,18 @@ if test -z "$SOURCE_DATE_EPOCH" ; then export SOURCE_DATE_EPOCH=$(cd $top_srcdir; git log -1 --pretty=%ct) fi -mv ../e2fsprogs.spec $top_srcdir/e2fsprogs.spec (cd $top_srcdir/.. ; find $base_e2fsprogs \( -name \*~ -o -name \*.orig \ -o -name CVS -o -name \*.rej -o -name Makefile.pq \ -o -name TAGS -o -name \*.old -o -name SCCS \ -o -name changed-files -o -name .#\* -o -name \*.tar.gz \ -o -name autom4te.cache \) \ - -print) | sed -e "s/^$base_e2fsprogs/$SRCROOT/" > $exclude -sed -e "s;^;$SRCROOT/;" < $srcdir/$list.exclude >> $exclude - -(cd $top_srcdir/.. ; rm -f $SRCROOT ; ln -sf $base_e2fsprogs $SRCROOT) + -print) > $exclude +sed -e "s;^;$base_e2fsprogs/;" < $srcdir/all.exclude >> $exclude (cd $top_srcdir/.. ; \ - tar -c -h -f - -X $exclude --sort=name --owner=0 --group=0 \ - --numeric-owner --mtime="@${SOURCE_DATE_EPOCH}" $SRCROOT) \ - | $GZIP -9n -c > $SRCROOT.tar.gz -$GZIP -l $SRCROOT.tar.gz - -(cd $top_srcdir/.. ; rm -f $SRCROOT) -mv $top_srcdir/e2fsprogs.spec ../e2fsprogs.spec -if test -n "$rename_tarball"; then - mv $SRCROOT.tar.gz $rename_tarball -fi + tar -c -f - -X $exclude --sort=name --owner=0 --group=0 \ + --transform "flags=r;s|^$base_e2fsprogs|$SRCROOT|" \ + --numeric-owner --mtime="@${SOURCE_DATE_EPOCH}" $base_e2fsprogs) \ + | $GZIP -9n -c > $tarout +$GZIP -ln $tarout +rm -f "$exclude" diff --git a/util/subset.exclude b/util/subset.exclude deleted file mode 100644 index 81108d2a..00000000 --- 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 |