diff options
| author | Todd T. Fries <todd@cvs.openbsd.org> | 2014-05-03 15:18:27 +0000 |
|---|---|---|
| committer | Todd T. Fries <todd@cvs.openbsd.org> | 2014-05-03 15:18:27 +0000 |
| commit | f70593554da7280010548410656409ff9c5aaf97 (patch) | |
| tree | 07df7500d3addd1703e08679da8486f18f355e99 /distrib | |
| parent | 346c1640752d23d0ab38aaeb2f3a219502b6b512 (diff) | |
spring cleaning for xenocara/ .. tedu unused Release arg and sync with base functionality
Diffstat (limited to 'distrib')
| -rw-r--r-- | distrib/sets/checkflist | 17 | ||||
| -rw-r--r-- | distrib/sets/gensetlist | 3 | ||||
| -rw-r--r-- | distrib/sets/makeflist | 5 | ||||
| -rw-r--r-- | distrib/sets/maketars | 6 |
4 files changed, 15 insertions, 16 deletions
diff --git a/distrib/sets/checkflist b/distrib/sets/checkflist index 75a598d10..99eba4b8a 100644 --- a/distrib/sets/checkflist +++ b/distrib/sets/checkflist @@ -1,5 +1,5 @@ #!/bin/sh -x -# $OpenBSD: checkflist,v 1.1 2006/11/27 11:25:45 matthieu Exp $ +# $OpenBSD: checkflist,v 1.2 2014/05/03 15:18:26 todd Exp $ # # Copyright (c) 2001 Theo de Raadt # All rights reserved. @@ -29,12 +29,15 @@ if [ "X${DESTDIR}" = "X" ]; then exit 1 fi -Release=$1 - +diffarg="" +if [ "$1" = "-u" ]; then + diffarg="-u" + shift +fi -TMP=`mktemp -d /tmp/_xckr.XXXXXXXXXX` || exit 1 -trap 'rm -rf $TMP' 0 1 15 +TMP=`mktemp /tmp/_xckr.XXXXXXXXXX` || exit 1 +trap 'rm -f $TMP' 0 1 15 -sh makeflist $Release > $TMP/_CHECK +sh makeflist > $TMP ( cd $DESTDIR ; find . \( -type d -o -type f -o -type l \) ) | \ - grep -v -e '^\.$' | sort -H | diff -u $TMP/_CHECK - + grep -v -e '^\.$' | sort -H | diff $diffarg $TMP - diff --git a/distrib/sets/gensetlist b/distrib/sets/gensetlist index 418ffc57a..51f6b2204 100644 --- a/distrib/sets/gensetlist +++ b/distrib/sets/gensetlist @@ -1,11 +1,10 @@ #!/bin/sh -# $OpenBSD: gensetlist,v 1.2 2006/11/29 16:36:46 matthieu Exp $ +# $OpenBSD: gensetlist,v 1.3 2014/05/03 15:18:26 todd Exp $ arch=$MACHINE listsdir=`pwd`/lists setname=$1 -Release=$2 if [ "$setname" = "xfont" ]; then arch=x11r7 diff --git a/distrib/sets/makeflist b/distrib/sets/makeflist index bdbc826eb..a7835a036 100644 --- a/distrib/sets/makeflist +++ b/distrib/sets/makeflist @@ -1,12 +1,11 @@ #!/bin/sh -# $OpenBSD: makeflist,v 1.1 2006/11/27 11:25:45 matthieu Exp $ +# $OpenBSD: makeflist,v 1.2 2014/05/03 15:18:26 todd Exp $ arch=$MACHINE -Release=$1 listsdir=`pwd`/lists lists=`sh ./genlists $arch` for setname in $lists do - sh ./gensetlist $setname $Release + sh ./gensetlist $setname done | sort diff --git a/distrib/sets/maketars b/distrib/sets/maketars index 73402879d..2ea52498d 100644 --- a/distrib/sets/maketars +++ b/distrib/sets/maketars @@ -1,10 +1,8 @@ #!/bin/sh -# $OpenBSD: maketars,v 1.4 2008/12/24 00:15:24 todd Exp $ +# $OpenBSD: maketars,v 1.5 2014/05/03 15:18:26 todd Exp $ # xy RELEASE=$1 -Release=$2 -# x.y if [ "X${RELEASE}" = "X" ]; then echo "Usage: `basename $0` <OSREVISION>" @@ -37,7 +35,7 @@ cd $DESTDIR for setname in $lists; do echo -n "${setname}: " - (cd $pwd; sh gensetlist $setname $Release) | sort > $TMP1 + (cd $pwd; sh gensetlist $setname) | sort > $TMP1 sed -n '/^\.\/usr\/X11R6\/lib\/lib.*\.so\..*/{p;}' $TMP1 > $TMP2 sed '/^\.\/usr\/X11R6\/lib\/lib.*\.so\..*/d' $TMP1 >> $TMP2 pax -w -d < $TMP2 | gzip -9 > ${tardir}/${setname}${RELEASE}.tgz |