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

xbps-src: cleanup version/revision mess.

Browse source
This commit is contained in:
Juan RP 2011-07-18 16:25:18 +02:00
parent ac7c66d00a
commit 07db31cb54
15 changed files with 80 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

14
xbps-src/shutils/tmpl_funcs.sh.in
View file

@ -30,7 +30,7 @@ info_tmpl()
{
local i=
for f in $(echo $XBPS_COMMONVARSDIR/*.sh); do
for f in $XBPS_COMMONVARSDIR/*.sh; do
[ -r ${f} ] && . ${f}
done
@ -101,7 +101,7 @@ reset_tmpl_vars()
noarch subpackages sourcepkg gtk_iconcache_dirs \
abi_depends api_depends triggers openrc_services \
replaces system_accounts system_groups provides \
build_wrksrc create_wrksrc broken_as_needed \
build_wrksrc create_wrksrc broken_as_needed pkgver \
ignore_vdeps_dir noverifyrdeps conflicts dkms_modules \
gconf_entries gconf_schemas stow_copy stow_copy_files \
pre_remove post_remove post_stow do_build do_install \
@ -126,7 +126,7 @@ setup_tmpl()
[ -n "$DESTDIR" ] && return 0
fi
for f in $(echo $XBPS_COMMONVARSDIR/*.sh); do
for f in $XBPS_COMMONVARSDIR/*.sh; do
[ -r ${f} ] && . ${f}
done
@ -293,7 +293,7 @@ remove_tmpl_wrksrc()
return 0
fi
msg_normal "Cleaning '${sourcepkg}' build directory...\n"
msg_normal "$pkgver: cleaning build directory...\n"
rm -rf $lwrksrc
return $?
}
@ -302,6 +302,12 @@ set_tmpl_common_vars()
{
[ -z "$pkgname" ] && return 1
if [ -n "$revision" ]; then
pkgver="${pkgname}-${version}_${revision}"
else
pkgver="${pkgname}-${version}"
fi
. $XBPS_SHUTILSDIR/install_files.sh
if [ -n "$BOOTSTRAP_PKG_REBUILD" ]; then