From fde6fca179d381aa5e422b96faeba1ddbf55a1a3 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Wed, 19 Aug 2020 16:44:41 +1000 Subject: [PATCH] common: disable creation of noarch packages. --- common/hooks/do-pkg/00-gen-pkg.sh | 6 ++---- common/hooks/post-install/06-strip-and-debug-pkgs.sh | 2 +- common/hooks/post-pkg/00-register-pkg.sh | 6 ++---- common/hooks/pre-pkg/04-generate-runtime-deps.sh | 2 +- common/hooks/pre-pkg/05-prepare-32bit.sh | 9 +-------- common/hooks/pre-pkg/06-shlib-provides.sh | 2 +- common/xbps-src/shutils/common.sh | 11 +++++------ common/xbps-src/shutils/pkgtarget.sh | 2 +- 8 files changed, 14 insertions(+), 26 deletions(-) diff --git a/common/hooks/do-pkg/00-gen-pkg.sh b/common/hooks/do-pkg/00-gen-pkg.sh index e6285b6e4ff..b06ba3692bb 100644 --- a/common/hooks/do-pkg/00-gen-pkg.sh +++ b/common/hooks/do-pkg/00-gen-pkg.sh @@ -99,14 +99,12 @@ hook() { local arch= binpkg= repo= _pkgver= _desc= _pkgn= _pkgv= _provides= \ _replaces= _reverts= f= found_dbg_subpkg= - if [ "${archs// /}" = "noarch" ]; then - arch=noarch - elif [ -n "$XBPS_TARGET_MACHINE" ]; then + if [ -n "$XBPS_TARGET_MACHINE" ]; then arch=$XBPS_TARGET_MACHINE else arch=$XBPS_MACHINE fi - if [ "${archs// /}" != "noarch" -a -z "$XBPS_CROSS_BUILD" -a -n "$XBPS_ARCH" -a "$XBPS_ARCH" != "$XBPS_TARGET_MACHINE" ]; then + if [ -z "$XBPS_CROSS_BUILD" -a -n "$XBPS_ARCH" -a "$XBPS_ARCH" != "$XBPS_TARGET_MACHINE" ]; then arch=${XBPS_ARCH} fi diff --git a/common/hooks/post-install/06-strip-and-debug-pkgs.sh b/common/hooks/post-install/06-strip-and-debug-pkgs.sh index 44d8a51fe93..84b8569f37f 100644 --- a/common/hooks/post-install/06-strip-and-debug-pkgs.sh +++ b/common/hooks/post-install/06-strip-and-debug-pkgs.sh @@ -59,7 +59,7 @@ create_debug_pkg() { hook() { local fname= x= f= _soname= STRIPCMD= - if [ -n "$nostrip" -o "${archs// /}" = "noarch" ]; then + if [ -n "$nostrip" -o "$noarch" ]; then return 0 fi diff --git a/common/hooks/post-pkg/00-register-pkg.sh b/common/hooks/post-pkg/00-register-pkg.sh index 5dc28c999c9..ce641cfc850 100644 --- a/common/hooks/post-pkg/00-register-pkg.sh +++ b/common/hooks/post-pkg/00-register-pkg.sh @@ -13,14 +13,12 @@ registerpkg() { hook() { local arch= binpkg= pkgdir= - if [ "${archs// /}" = "noarch" ]; then - arch=noarch - elif [ -n "$XBPS_TARGET_MACHINE" ]; then + if [ -n "$XBPS_TARGET_MACHINE" ]; then arch=$XBPS_TARGET_MACHINE else arch=$XBPS_MACHINE fi - if [ "${archs// /}" != "noarch" -a -z "$XBPS_CROSS_BUILD" -a -n "$XBPS_ARCH" -a "$XBPS_ARCH" != "$XBPS_TARGET_MACHINE" ]; then + if [ -z "$XBPS_CROSS_BUILD" -a -n "$XBPS_ARCH" -a "$XBPS_ARCH" != "$XBPS_TARGET_MACHINE" ]; then arch=${XBPS_ARCH} fi if [ -n "$repository" ]; then diff --git a/common/hooks/pre-pkg/04-generate-runtime-deps.sh b/common/hooks/pre-pkg/04-generate-runtime-deps.sh index 6e45b7dd3c3..9845d6937bf 100644 --- a/common/hooks/pre-pkg/04-generate-runtime-deps.sh +++ b/common/hooks/pre-pkg/04-generate-runtime-deps.sh @@ -56,7 +56,7 @@ hook() { mapshlibs=$XBPS_COMMONDIR/shlibs - if [ "${archs// /}" = "noarch" -o -n "$noverifyrdeps" ]; then + if [ "$noarch" -o -n "$noverifyrdeps" ]; then store_pkgdestdir_rundeps return 0 fi diff --git a/common/hooks/pre-pkg/05-prepare-32bit.sh b/common/hooks/pre-pkg/05-prepare-32bit.sh index fd6fdf88217..f860c8f9926 100644 --- a/common/hooks/pre-pkg/05-prepare-32bit.sh +++ b/common/hooks/pre-pkg/05-prepare-32bit.sh @@ -21,7 +21,7 @@ hook() { return fi # Ignore noarch pkgs. - if [ "${archs// /}" = "noarch" ]; then + if [ "$noarch" ]; then return fi if [ -z "$lib32mode" ]; then @@ -106,13 +106,6 @@ hook() { printf "${pkgn}-32bit${pkgv} " >> ${destdir32}/rdeps continue fi - # If dependency is noarch do not change it to 32bit. - _arch=$($XBPS_QUERY_CMD -R --property=architecture "$f") - if [ "${_arch}" = "noarch" ]; then - echo " RDEP: $f -> ${pkgn}${pkgv} (noarch)" - printf "${pkgn}${pkgv} " >> ${destdir32}/rdeps - continue - fi # If dependency does not have "shlib-provides" do not # change it to 32bit. for x in ${subpackages}; do diff --git a/common/hooks/pre-pkg/06-shlib-provides.sh b/common/hooks/pre-pkg/06-shlib-provides.sh index cdc94de3bc9..e1dff9e562b 100644 --- a/common/hooks/pre-pkg/06-shlib-provides.sh +++ b/common/hooks/pre-pkg/06-shlib-provides.sh @@ -45,7 +45,7 @@ collect_sonames() { hook() { local _destdir32=${XBPS_DESTDIR}/${pkgname}-32bit-${version} - if [ -z "$shlib_provides" -a "${archs// /}" = "noarch" -o -n "$noshlibprovides" ]; then + if [ -z "$shlib_provides" -a "$noarch" -o -n "$noshlibprovides" ]; then return 0 fi diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh index e8bcf577c6b..c8c3147c37d 100644 --- a/common/xbps-src/shutils/common.sh +++ b/common/xbps-src/shutils/common.sh @@ -395,6 +395,10 @@ setup_pkg() { source_file ${XBPS_SRCPKGDIR}/${basepkg}/template fi + if [ "${archs// /}" = "noarch" ]; then + export noarch=yes + export archs= + fi # Check if required vars weren't set. _vars="pkgname version short_desc revision homepage license" @@ -457,12 +461,7 @@ setup_pkg() { fi makejobs="-j$XBPS_MAKEJOBS" - # strip whitespaces to make " noarch " valid too. - if [ "${archs// /}" = "noarch" ]; then - arch="noarch" - else - arch="$XBPS_TARGET_MACHINE" - fi + arch="$XBPS_TARGET_MACHINE" if [ -n "$XBPS_BINPKG_EXISTS" ]; then local _binpkgver="$($XBPS_QUERY_XCMD -R -ppkgver $pkgver 2>/dev/null)" if [ "$_binpkgver" = "$pkgver" ]; then diff --git a/common/xbps-src/shutils/pkgtarget.sh b/common/xbps-src/shutils/pkgtarget.sh index 090ec5c1a3e..fa70816fe24 100644 --- a/common/xbps-src/shutils/pkgtarget.sh +++ b/common/xbps-src/shutils/pkgtarget.sh @@ -3,7 +3,7 @@ check_pkg_arch() { local cross="$1" _arch f match nonegation - if [ -n "$archs" -a "${archs// /}" != "noarch" ]; then + if [ -n "$archs" ]; then if [ -n "$cross" ]; then _arch="$XBPS_TARGET_MACHINE" elif [ -n "$XBPS_ARCH" ]; then