do locatedb as part of the build process

"works for me" deraadt@
This commit is contained in:
espie 2014-07-09 19:23:28 +00:00
parent e48fc1fea5
commit 79df76e379
5 changed files with 60 additions and 8 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.121 2014/04/22 10:21:56 reyk Exp $
# $OpenBSD: Makefile,v 1.122 2014/07/09 19:23:28 espie Exp $
#
# For more information on building in tricky environments, please see
@ -60,6 +60,7 @@ beforeinstall:
afterinstall:
.ifndef NOMAN
cd ${.CURDIR}/share/man && exec ${MAKE} makedb
cd ${.CURDIR}/distrib/sets && exec ${MAKE} makedb
.endif
.ifdef DESTDIR

8
distrib/sets/Makefile Normal file
View File

@ -0,0 +1,8 @@
# $OpenBSD: Makefile,v 1.1 2014/07/09 19:23:28 espie Exp $
DB = /usr/lib/locate/src.db
makedb:
/bin/sh ${.CURDIR}/makelocatedb ${OSrev} >${DESTDIR}${DB}
.PHONY: makedb

43
distrib/sets/makelocatedb Normal file
View File

@ -0,0 +1,43 @@
#!/bin/sh
# $OpenBSD: makelocatedb,v 1.1 2014/07/09 19:23:28 espie Exp $
#
# Copyright (c) 2001 Theo de Raadt
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
RELEASE=$1
if [ "X${RELEASE}" = "X" ]; then
echo "Usage: `basename $0` <OSREVISION>"
exit 1
fi
arch=`machine`
lists=`pwd`/lists
for i in base comp etc game man; do
cat ${lists}/$i/mi ${lists}/$i/md.${arch} | \
sed -e "s,^\.,$i${RELEASE}:,"
done | sort | /usr/libexec/locate.mklocatedb
exit 0

View File

@ -1,5 +1,5 @@
#!/bin/sh
# $OpenBSD: maketars,v 1.22 2014/07/09 17:30:09 espie Exp $
# $OpenBSD: maketars,v 1.23 2014/07/09 19:23:28 espie Exp $
#
# Copyright (c) 2001 Theo de Raadt
# All rights reserved.
@ -63,9 +63,4 @@ for i in base comp etc game man; do
done
rm -f $TMP $TMP2
for i in base comp etc game man; do
cat ${lists}/$i/mi ${lists}/$i/md.${arch} | \
sed -e "s,^\.,$i${RELEASE}:,"
done | sort | /usr/libexec/locate.mklocatedb > $tardir/src${RELEASE}.db
exit 0

View File

@ -1,4 +1,4 @@
# $OpenBSD: 4.4BSD.dist,v 1.247 2014/04/22 10:24:29 reyk Exp $
# $OpenBSD: 4.4BSD.dist,v 1.248 2014/07/09 19:23:28 espie Exp $
/set type=dir uname=root gname=wheel mode=0755
# .
@ -353,6 +353,11 @@ debug gname=bin uname=root mode=0755
# ./usr/lib/debug
..
# ./usr/lib/locate
locate gname=bin uname=root mode=0755
# ./usr/lib/locate
..
# ./usr/lib/pkgconfig
pkgconfig gname=bin uname=root mode=0755
# ./usr/lib/pkgconfig