summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2014-08-31 16:52:27 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2014-08-31 16:52:27 +0000
commit6b595db76f2034eb2f80d2bc7993d22145235ffc (patch)
treecc4158e13e955789dc03f9a558a4513e65cb813c
parente4fa63673d6265a27e8ba3ead578b4bcd98731c5 (diff)
Get rid of the 'nocreate' feature, unused for 6 years and stop
building the xetcXX.tgz set
-rw-r--r--distrib/sets/genlists12
-rw-r--r--distrib/sets/makeflist5
-rw-r--r--distrib/sets/makelocatedb6
-rw-r--r--distrib/sets/maketars6
-rw-r--r--distrib/sets/nocreate0
5 files changed, 6 insertions, 23 deletions
diff --git a/distrib/sets/genlists b/distrib/sets/genlists
deleted file mode 100644
index 3e9a4a675..000000000
--- a/distrib/sets/genlists
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-# $OpenBSD: genlists,v 1.1 2006/11/27 11:25:45 matthieu Exp $
-
-arch=$1
-lists="xbase xetc xserv xshare xfont"
-
-l=""
-for list in $lists
-do
- grep "$arch:$list" nocreate > /dev/null 2>&1 || l="$l $list"
-done
-echo $l
diff --git a/distrib/sets/makeflist b/distrib/sets/makeflist
index a7835a036..8a86e9fba 100644
--- a/distrib/sets/makeflist
+++ b/distrib/sets/makeflist
@@ -1,11 +1,10 @@
#!/bin/sh
-# $OpenBSD: makeflist,v 1.2 2014/05/03 15:18:26 todd Exp $
+# $OpenBSD: makeflist,v 1.3 2014/08/31 16:52:26 matthieu Exp $
arch=$MACHINE
listsdir=`pwd`/lists
-lists=`sh ./genlists $arch`
-for setname in $lists
+for setname in xbase xetc xfont xserv xshare
do
sh ./gensetlist $setname
done | sort
diff --git a/distrib/sets/makelocatedb b/distrib/sets/makelocatedb
index 77cfece5a..b25e73ce8 100644
--- a/distrib/sets/makelocatedb
+++ b/distrib/sets/makelocatedb
@@ -1,5 +1,5 @@
#!/bin/sh
-# $OpenBSD: makelocatedb,v 1.2 2014/07/12 19:14:55 espie Exp $
+# $OpenBSD: makelocatedb,v 1.3 2014/08/31 16:52:26 matthieu Exp $
# xy
RELEASE=$1
@@ -12,9 +12,7 @@ fi
pwd=`pwd`
listsdir=`pwd`/lists
-lists=`sh ./genlists ${MACHINE}`
-
-for setname in $lists; do
+for setname in xbase xetc xfont xserv xshare; do
(cd $pwd; sh gensetlist $setname) | \
sed -e "s,^\.,${setname}${RELEASE}:,"
done | sort | /usr/libexec/locate.mklocatedb
diff --git a/distrib/sets/maketars b/distrib/sets/maketars
index 2ea52498d..3beaa77fb 100644
--- a/distrib/sets/maketars
+++ b/distrib/sets/maketars
@@ -1,5 +1,5 @@
#!/bin/sh
-# $OpenBSD: maketars,v 1.5 2014/05/03 15:18:26 todd Exp $
+# $OpenBSD: maketars,v 1.6 2014/08/31 16:52:26 matthieu Exp $
# xy
RELEASE=$1
@@ -29,11 +29,9 @@ trap 'rm -f $TMP1 $TMP2; rmdir $TMPDIR' 0 1 15
TMP1=$TMPDIR/one
TMP2=$TMPDIR/two
-lists=`sh ./genlists $arch`
-
cd $DESTDIR
-for setname in $lists; do
+for setname in xbase xfont xserv xshare; do
echo -n "${setname}: "
(cd $pwd; sh gensetlist $setname) | sort > $TMP1
sed -n '/^\.\/usr\/X11R6\/lib\/lib.*\.so\..*/{p;}' $TMP1 > $TMP2
diff --git a/distrib/sets/nocreate b/distrib/sets/nocreate
deleted file mode 100644
index e69de29bb..000000000
--- a/distrib/sets/nocreate
+++ /dev/null