add compatibility code for noarch/only_for_archs
This commit is contained in:
parent
6eb37e35b2
commit
38c457e1aa
|
@ -43,3 +43,6 @@ unset -v binfmts
|
|||
|
||||
# xbps-triggers: register-shell
|
||||
unset -v register_shell
|
||||
|
||||
# deprecated
|
||||
unset -v noarch
|
||||
|
|
|
@ -33,3 +33,6 @@ unset -f pre_build do_build post_build
|
|||
unset -f pre_check do_check post_check
|
||||
unset -f pre_install do_install post_install
|
||||
unset -f do_clean
|
||||
|
||||
# deprecated
|
||||
unset -v only_for_arch
|
||||
|
|
|
@ -347,6 +347,22 @@ setup_pkg() {
|
|||
source_file ${XBPS_SRCPKGDIR}/${basepkg}/template
|
||||
fi
|
||||
|
||||
# Backward compatibility to noarch and only_for_archs
|
||||
if [ -n "$only_for_archs" ] && [ -n "$noarch" ]; then
|
||||
msg_error "only_for_archs and noarch can't be used together\n"
|
||||
fi
|
||||
if [ -n "$only_for_archs" ]; then
|
||||
archs="$only_for_archs"
|
||||
unset only_for_archs
|
||||
msg_warn "deprecated property 'only_for_archs'. Use archs=\"$only_for_archs\" instead!\n"
|
||||
fi
|
||||
if [ -n "$noarch" ]; then
|
||||
archs=noarch
|
||||
unset noarch
|
||||
msg_warn "deprecated property 'noarch'. Use archs=noarch instead!\n"
|
||||
fi
|
||||
|
||||
|
||||
# Check if required vars weren't set.
|
||||
_vars="pkgname version short_desc revision homepage license"
|
||||
for f in ${_vars}; do
|
||||
|
|
Loading…
Reference in New Issue