meta: remove supporting code for noarch
This commit is contained in:
@@ -43,6 +43,3 @@ unset -v binfmts
|
|||||||
|
|
||||||
# xbps-triggers: register-shell
|
# xbps-triggers: register-shell
|
||||||
unset -v register_shell
|
unset -v register_shell
|
||||||
|
|
||||||
# deprecated
|
|
||||||
unset -v noarch
|
|
||||||
|
@@ -53,10 +53,6 @@ if [ ! -f $XBPS_SUBPKG_INSTALL_DONE ]; then
|
|||||||
|
|
||||||
${PKGNAME}_package
|
${PKGNAME}_package
|
||||||
pkgname=$PKGNAME
|
pkgname=$PKGNAME
|
||||||
if [ -n "$noarch" ]; then
|
|
||||||
archs=noarch
|
|
||||||
unset noarch
|
|
||||||
fi
|
|
||||||
|
|
||||||
source_file $XBPS_COMMONDIR/environment/build-style/${build_style}.sh
|
source_file $XBPS_COMMONDIR/environment/build-style/${build_style}.sh
|
||||||
|
|
||||||
|
@@ -34,11 +34,6 @@ if [ "$sourcepkg" != "$PKGNAME" ]; then
|
|||||||
|
|
||||||
${PKGNAME}_package
|
${PKGNAME}_package
|
||||||
pkgname=$PKGNAME
|
pkgname=$PKGNAME
|
||||||
if [ -n "$noarch" ]; then
|
|
||||||
archs=noarch
|
|
||||||
unset noarch
|
|
||||||
msg_warn "deprecated property 'noarch'. Use archs=noarch instead!\n"
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -s $XBPS_MASTERDIR/.xbps_chroot_init ]; then
|
if [ -s $XBPS_MASTERDIR/.xbps_chroot_init ]; then
|
||||||
|
@@ -40,10 +40,6 @@ if [ "$sourcepkg" != "$PKGNAME" ]; then
|
|||||||
|
|
||||||
${PKGNAME}_package
|
${PKGNAME}_package
|
||||||
pkgname=$PKGNAME
|
pkgname=$PKGNAME
|
||||||
if [ -n "$noarch" ]; then
|
|
||||||
archs=noarch
|
|
||||||
unset noarch
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
source_file $XBPS_COMMONDIR/environment/build-style/${build_style}.sh
|
source_file $XBPS_COMMONDIR/environment/build-style/${build_style}.sh
|
||||||
|
@@ -359,11 +359,6 @@ setup_pkg() {
|
|||||||
unset only_for_archs
|
unset only_for_archs
|
||||||
msg_warn "deprecated property 'only_for_archs'. Use archs=\"$only_for_archs\" instead!\n"
|
msg_warn "deprecated property 'only_for_archs'. Use archs=\"$only_for_archs\" instead!\n"
|
||||||
fi
|
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.
|
# Check if required vars weren't set.
|
||||||
|
Reference in New Issue
Block a user