summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd T. Fries <todd@cvs.openbsd.org>2007-03-28 20:07:24 +0000
committerTodd T. Fries <todd@cvs.openbsd.org>2007-03-28 20:07:24 +0000
commit0369909ee34ec5d5d9cf838384c59b5101c729a5 (patch)
tree665c30ab1a4e27b4a78fbc6c21c489880a5b59c0
parenta2632fd72f3c3bebea0c5b41818ae5d8cb208326 (diff)
mimic src maketars script by putting `./usr/X11R6/lib' first
looks ok matthieu@
-rw-r--r--distrib/sets/maketars13
1 files changed, 10 insertions, 3 deletions
diff --git a/distrib/sets/maketars b/distrib/sets/maketars
index 73bb0f3af..a10651e5f 100644
--- a/distrib/sets/maketars
+++ b/distrib/sets/maketars
@@ -1,5 +1,5 @@
#!/bin/sh
-# $OpenBSD: maketars,v 1.1 2006/11/27 11:25:45 matthieu Exp $
+# $OpenBSD: maketars,v 1.2 2007/03/28 20:07:23 todd Exp $
# xy
RELEASE=$1
@@ -26,14 +26,21 @@ pwd=`pwd`
listsdir=`pwd`/lists
tardir=$RELEASEDIR
+TMPDIR=`mktemp -d /tmp/_maketarsx.XXXXXXXXXX`
+trap 'rm -f $TMP1 $TMP2; rmdir $TMPDIR; exit 1' 1 15
+TMP1=$TMPDIR/one
+TMP2=$TMPDIR/two
+
lists=`sh ./genlists $arch`
cd $DESTDIR
for setname in $lists; do
echo -n "${setname}: "
- (cd $pwd; sh gensetlist $setname $Release) | sort | \
- pax -w -d | gzip -9 > ${tardir}/${setname}${RELEASE}.tgz
+ (cd $pwd; sh gensetlist $setname $Release) | sort > $TMP1
+ grep '^./usr/X11R6/lib' $TMP1 > $TMP2
+ grep -v '^./usr/X11R6/lib' $TMP1 >> $TMP2
+ pax -w -d < $TMP2 | gzip -9 > ${tardir}/${setname}${RELEASE}.tgz
echo "done."
done