moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

Provide FILESDIR to template files and use it in some pkgs.

Browse source 
This always points to ${XBPS_TEMPLATESDIR}/${pkgname}/files.

--HG--
extra : convert_revision : ef23025694cb95d508d511ab52bf67c66ead9d61
This commit is contained in:
Juan RP 2009-03-08 01:31:24 +01:00
parent 67d700ac77
commit 33edcb122b
4 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
shutils/tmpl_funcs.sh
View file

@ -71,7 +71,7 @@ reset_tmpl_vars()
install_priority noarch subpackages sourcepkg \ install_priority noarch subpackages sourcepkg \
abi_depends api_depends \ abi_depends api_depends \
XBPS_EXTRACT_DONE XBPS_CONFIGURE_DONE \ XBPS_EXTRACT_DONE XBPS_CONFIGURE_DONE \
XBPS_BUILD_DONE XBPS_INSTALL_DONE" XBPS_BUILD_DONE XBPS_INSTALL_DONE FILESDIR"
for v in ${TMPL_VARS}; do for v in ${TMPL_VARS}; do
eval unset "$v" eval unset "$v"
@ -190,6 +190,8 @@ prepare_tmpl()
XBPS_BUILD_DONE="$wrksrc/.xbps_build_done" XBPS_BUILD_DONE="$wrksrc/.xbps_build_done"
XBPS_INSTALL_DONE="$wrksrc/.xbps_install_done" XBPS_INSTALL_DONE="$wrksrc/.xbps_install_done"
FILESDIR=${XBPS_TEMPLATESDIR}/${pkgname}/files
if [ -z "$in_chroot" ]; then if [ -z "$in_chroot" ]; then
export PATH="$XBPS_MASTERDIR/bin:$XBPS_MASTERDIR/sbin" export PATH="$XBPS_MASTERDIR/bin:$XBPS_MASTERDIR/sbin"
export PATH="$PATH:$XBPS_MASTERDIR/usr/bin:$XBPS_MASTERDIR/usr/sbin" export PATH="$PATH:$XBPS_MASTERDIR/usr/bin:$XBPS_MASTERDIR/usr/sbin"

7
templates/initscripts/template
View file

@ -32,15 +32,14 @@ Add_dependency full dhcpcd
do_install() do_install()
{ {
local destdir=$XBPS_DESTDIR/$pkgname-$version local destdir=$XBPS_DESTDIR/$pkgname-$version
local filesdir=$XBPS_TEMPLATESDIR/$pkgname/files
install -d ${destdir}/etc/rc.d install -d ${destdir}/etc/rc.d
install -d ${destdir}/etc/rc.conf.d install -d ${destdir}/etc/rc.conf.d
install -d ${destdir}/etc/defaults install -d ${destdir}/etc/defaults
for f in inittab rc.*; do for f in inittab rc.*; do
install -m755 ${filesdir}/${f} ${destdir}/etc install -m755 ${FILESDIR}/${f} ${destdir}/etc
done done
install -m644 ${filesdir}/defaults/rc.conf ${destdir}/etc/defaults install -m644 ${FILESDIR}/defaults/rc.conf ${destdir}/etc/defaults
install -m755 ${filesdir}/rc.d/* ${destdir}/etc/rc.d install -m755 ${FILESDIR}/rc.d/* ${destdir}/etc/rc.d
} }

3
templates/minilogd/template
View file

@ -15,11 +15,10 @@ Add_dependency run glibc
do_install() do_install()
{ {
local destdir=$XBPS_DESTDIR/$pkgname-$version local destdir=$XBPS_DESTDIR/$pkgname-$version
local filesdir=$XBPS_TEMPLATESDIR/$pkgname/files
install -d ${destdir}/sbin install -d ${destdir}/sbin
cd ${filesdir} cd ${FILESDIR}
gcc ${CFLAGS} minilogd.c -o minilogd gcc ${CFLAGS} minilogd.c -o minilogd
chmod 755 minilogd chmod 755 minilogd
mv minilogd ${destdir}/sbin mv minilogd ${destdir}/sbin

3
templates/sysklogd/template
View file

@ -27,7 +27,6 @@ Add_dependency full glibc
post_install() post_install()
{ {
local destdir=$XBPS_DESTDIR/$pkgname-$version local destdir=$XBPS_DESTDIR/$pkgname-$version
local filesdir=$XBPS_TEMPLATESDIR/$pkgname/files
# Create a default syslog.conf. # Create a default syslog.conf.
install -d ${destdir}/etc/rc.d install -d ${destdir}/etc/rc.d
@ -42,5 +41,5 @@ post_install()
) > $destdir/etc/syslog.conf ) > $destdir/etc/syslog.conf
# Install the rc.d scripts. # Install the rc.d scripts.
install -m755 ${filesdir}/* ${destdir}/etc/rc.d install -m755 ${FILESDIR}/* ${destdir}/etc/rc.d
} }