snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Activity

common/hooks: simplify setting arch for binpkg 

setup_pkg always export XBPS_TARGET_MACHINE
This commit is contained in:
Piotr Wójcik 2021-08-23 19:11:13 +02:00 committed by Piotr
parent 2201886262
commit 7b7d385f8b
2 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/hooks/do-pkg/00-gen-pkg.sh
View File

@ -104,15 +104,7 @@ hook() {
local arch= binpkg= repo= _pkgver= _desc= _pkgn= _pkgv= _provides= \ local arch= binpkg= repo= _pkgver= _desc= _pkgn= _pkgv= _provides= \
_replaces= _reverts= f= found_dbg_subpkg= _replaces= _reverts= f= found_dbg_subpkg=
if [ -n "$XBPS_TARGET_MACHINE" ]; then arch=$XBPS_TARGET_MACHINE
arch=$XBPS_TARGET_MACHINE
else
arch=$XBPS_MACHINE
fi
if [ -z "$XBPS_CROSS_BUILD" -a -n "$XBPS_ARCH" -a "$XBPS_ARCH" != "$XBPS_TARGET_MACHINE" ]; then
arch=${XBPS_ARCH}
fi
binpkg=${pkgver}.${arch}.xbps binpkg=${pkgver}.${arch}.xbps
if [ -n "$repository" ]; then if [ -n "$repository" ]; then

9
common/hooks/post-pkg/00-register-pkg.sh
View File

@ -13,19 +13,12 @@ registerpkg() {
hook() { hook() {
local arch= binpkg= pkgdir= local arch= binpkg= pkgdir=
if [ -n "$XBPS_TARGET_MACHINE" ]; then
arch=$XBPS_TARGET_MACHINE
else
arch=$XBPS_MACHINE
fi
if [ -z "$XBPS_CROSS_BUILD" -a -n "$XBPS_ARCH" -a "$XBPS_ARCH" != "$XBPS_TARGET_MACHINE" ]; then
arch=${XBPS_ARCH}
fi
if [ -n "$repository" ]; then if [ -n "$repository" ]; then
pkgdir=$XBPS_REPOSITORY/$repository pkgdir=$XBPS_REPOSITORY/$repository
else else
pkgdir=$XBPS_REPOSITORY pkgdir=$XBPS_REPOSITORY
fi fi
arch=$XBPS_TARGET_MACHINE
binpkg=${pkgver}.${arch}.xbps binpkg=${pkgver}.${arch}.xbps
binpkg32=${pkgname}-32bit-${version}_${revision}.x86_64.xbps binpkg32=${pkgname}-32bit-${version}_${revision}.x86_64.xbps
binpkg_dbg=${pkgname}-dbg-${version}_${revision}.${arch}.xbps binpkg_dbg=${pkgname}-dbg-${version}_${revision}.${arch}.xbps