Kill $install_priority. It was a hack and it's not needed anymore.
--HG-- extra : convert_revision : 993ed90732f140166d8b7f49475debca2fba30b1
This commit is contained in:
parent
da1cfa2cf2
commit
231b3fb32d
4 changed files with 3 additions and 14 deletions
|
@ -54,8 +54,7 @@ xbps_write_metadata_pkg()
|
|||
if [ ! -f $XBPS_TEMPLATESDIR/${sourcepkg}/${subpkg}.template ]; then
|
||||
msg_error "Cannot find subpackage template!"
|
||||
fi
|
||||
unset run_depends conf_files keep_dirs noarch install_priority \
|
||||
triggers
|
||||
unset run_depends conf_files keep_dirs noarch triggers
|
||||
. $XBPS_TEMPLATESDIR/${sourcepkg}/${subpkg}.template
|
||||
pkgname=${sourcepkg}-${subpkg}
|
||||
set_tmpl_common_vars
|
||||
|
@ -82,7 +81,7 @@ xbps_write_metadata_pkg()
|
|||
xbps_write_metadata_pkg_real()
|
||||
{
|
||||
local metadir=${DESTDIR}/var/db/xbps/metadata/$pkgname
|
||||
local f i j arch dirat lnkat newlnk prioinst TMPFLIST TMPFPLIST
|
||||
local f i j arch dirat lnkat newlnk TMPFLIST TMPFPLIST
|
||||
local fpattern="s|${DESTDIR}||g;s|^\./$||g;/^$/d"
|
||||
|
||||
if [ ! -d "${DESTDIR}" ]; then
|
||||
|
@ -90,12 +89,6 @@ xbps_write_metadata_pkg_real()
|
|||
exit 1
|
||||
fi
|
||||
|
||||
if [ -n "$install_priority" ]; then
|
||||
prioinst=$install_priority
|
||||
else
|
||||
prioinst=0
|
||||
fi
|
||||
|
||||
if [ -n "$noarch" ]; then
|
||||
arch=noarch
|
||||
else
|
||||
|
@ -255,8 +248,6 @@ xbps_write_metadata_pkg_real()
|
|||
<string>$version</string>
|
||||
<key>architecture</key>
|
||||
<string>$arch</string>
|
||||
<key>priority</key>
|
||||
<integer>$prioinst</integer>
|
||||
<key>installed_size</key>
|
||||
<integer>$(du -sb ${DESTDIR}|awk '{print $1}')</integer>
|
||||
<key>maintainer</key>
|
||||
|
|
|
@ -70,7 +70,7 @@ reset_tmpl_vars()
|
|||
build_depends libtool_fixup_la_stage no_fixup_libtool \
|
||||
disable_parallel_build run_depends cross_compiler \
|
||||
only_for_archs patch_args conf_files keep_dirs \
|
||||
install_priority noarch subpackages sourcepkg \
|
||||
noarch subpackages sourcepkg \
|
||||
abi_depends api_depends triggers \
|
||||
XBPS_EXTRACT_DONE XBPS_CONFIGURE_DONE \
|
||||
XBPS_BUILD_DONE XBPS_INSTALL_DONE FILESDIR DESTDIR \
|
||||
|
|
|
@ -4,7 +4,6 @@ short_desc="GCC version ${version} shared library support"
|
|||
long_desc="${long_desc}
|
||||
|
||||
This package contains the GCC shared library."
|
||||
install_priority=50
|
||||
|
||||
do_install()
|
||||
{
|
||||
|
|
|
@ -10,7 +10,6 @@ long_desc="
|
|||
|
||||
base_chroot=yes
|
||||
noarch=yes
|
||||
install_priority=100
|
||||
|
||||
do_install()
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue