diff --git a/common/environment/setup-subpkg/subpkg.sh b/common/environment/setup-subpkg/subpkg.sh index 05d3a3e42c..6bf748fdc3 100644 --- a/common/environment/setup-subpkg/subpkg.sh +++ b/common/environment/setup-subpkg/subpkg.sh @@ -43,6 +43,3 @@ unset -v binfmts # xbps-triggers: register-shell unset -v register_shell - -# deprecated -unset -v noarch diff --git a/common/xbps-src/libexec/xbps-src-doinstall.sh b/common/xbps-src/libexec/xbps-src-doinstall.sh index 6328008826..b3d5d7276f 100755 --- a/common/xbps-src/libexec/xbps-src-doinstall.sh +++ b/common/xbps-src/libexec/xbps-src-doinstall.sh @@ -53,10 +53,6 @@ if [ ! -f $XBPS_SUBPKG_INSTALL_DONE ]; then ${PKGNAME}_package pkgname=$PKGNAME - if [ -n "$noarch" ]; then - archs=noarch - unset noarch - fi source_file $XBPS_COMMONDIR/environment/build-style/${build_style}.sh diff --git a/common/xbps-src/libexec/xbps-src-dopkg.sh b/common/xbps-src/libexec/xbps-src-dopkg.sh index ac4c0ca419..f367634e08 100755 --- a/common/xbps-src/libexec/xbps-src-dopkg.sh +++ b/common/xbps-src/libexec/xbps-src-dopkg.sh @@ -34,11 +34,6 @@ if [ "$sourcepkg" != "$PKGNAME" ]; then ${PKGNAME}_package pkgname=$PKGNAME - if [ -n "$noarch" ]; then - archs=noarch - unset noarch - msg_warn "deprecated property 'noarch'. Use archs=noarch instead!\n" - fi fi if [ -s $XBPS_MASTERDIR/.xbps_chroot_init ]; then diff --git a/common/xbps-src/libexec/xbps-src-prepkg.sh b/common/xbps-src/libexec/xbps-src-prepkg.sh index 44b2de947d..4be45fd0a1 100755 --- a/common/xbps-src/libexec/xbps-src-prepkg.sh +++ b/common/xbps-src/libexec/xbps-src-prepkg.sh @@ -40,10 +40,6 @@ if [ "$sourcepkg" != "$PKGNAME" ]; then ${PKGNAME}_package pkgname=$PKGNAME - if [ -n "$noarch" ]; then - archs=noarch - unset noarch - fi fi source_file $XBPS_COMMONDIR/environment/build-style/${build_style}.sh diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh index b16d12a857..ddccfd3fa6 100644 --- a/common/xbps-src/shutils/common.sh +++ b/common/xbps-src/shutils/common.sh @@ -359,11 +359,6 @@ setup_pkg() { 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.