spring cleaning for xenocara/ .. tedu unused Release arg and sync with base functionality

This commit is contained in:
todd 2014-05-03 15:18:26 +00:00
parent 3c36191c1a
commit 34928339f3
4 changed files with 15 additions and 16 deletions

View File

@ -1,5 +1,5 @@
#!/bin/sh -x #!/bin/sh -x
# $OpenBSD: checkflist,v 1.1.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 # Copyright (c) 2001 Theo de Raadt
# All rights reserved. # All rights reserved.
@ -29,12 +29,15 @@ if [ "X${DESTDIR}" = "X" ]; then
exit 1 exit 1
fi fi
Release=$1 diffarg=""
if [ "$1" = "-u" ]; then
diffarg="-u"
shift
fi
TMP=`mktemp /tmp/_xckr.XXXXXXXXXX` || exit 1
trap 'rm -f $TMP' 0 1 15
TMP=`mktemp -d /tmp/_xckr.XXXXXXXXXX` || exit 1 sh makeflist > $TMP
trap 'rm -rf $TMP' 0 1 15
sh makeflist $Release > $TMP/_CHECK
( cd $DESTDIR ; find . \( -type d -o -type f -o -type l \) ) | \ ( 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 -

View File

@ -1,11 +1,10 @@
#!/bin/sh #!/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 arch=$MACHINE
listsdir=`pwd`/lists listsdir=`pwd`/lists
setname=$1 setname=$1
Release=$2
if [ "$setname" = "xfont" ]; then if [ "$setname" = "xfont" ]; then
arch=x11r7 arch=x11r7

View File

@ -1,12 +1,11 @@
#!/bin/sh #!/bin/sh
# $OpenBSD: makeflist,v 1.1.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 arch=$MACHINE
Release=$1
listsdir=`pwd`/lists listsdir=`pwd`/lists
lists=`sh ./genlists $arch` lists=`sh ./genlists $arch`
for setname in $lists for setname in $lists
do do
sh ./gensetlist $setname $Release sh ./gensetlist $setname
done | sort done | sort

View File

@ -1,10 +1,8 @@
#!/bin/sh #!/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 # xy
RELEASE=$1 RELEASE=$1
Release=$2
# x.y
if [ "X${RELEASE}" = "X" ]; then if [ "X${RELEASE}" = "X" ]; then
echo "Usage: `basename $0` <OSREVISION>" echo "Usage: `basename $0` <OSREVISION>"
@ -37,7 +35,7 @@ cd $DESTDIR
for setname in $lists; do for setname in $lists; do
echo -n "${setname}: " 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 -n '/^\.\/usr\/X11R6\/lib\/lib.*\.so\..*/{p;}' $TMP1 > $TMP2
sed '/^\.\/usr\/X11R6\/lib\/lib.*\.so\..*/d' $TMP1 >> $TMP2 sed '/^\.\/usr\/X11R6\/lib\/lib.*\.so\..*/d' $TMP1 >> $TMP2
pax -w -d < $TMP2 | gzip -9 > ${tardir}/${setname}${RELEASE}.tgz pax -w -d < $TMP2 | gzip -9 > ${tardir}/${setname}${RELEASE}.tgz