wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-04-22 17:17:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge b75b703ea9 into 2f69057b87

Browse source
This commit is contained in:
Đoàn Trần Công Danh 2025-04-10 23:05:08 -07:00 • committed by GitHub
commit b7faea439a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 27 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/environment/setup/archive.sh
View file

@ -163,7 +163,7 @@ vsrcextract() {
local archive="$1"
shift
vextract "$sc" ${dst:+-C "$dst"} \
"${XBPS_SRCDISTDIR}/${pkgname}-${version}/$archive" "$@"
"${XBPS_SRCDISTDIR}/${sourcepkg}-${version}/$archive" "$@"
}
vtar() {

2
common/hooks/do-pkg/00-gen-pkg.sh
View file

@ -143,7 +143,7 @@ hook() {
_pkgver=${pkgname}-dbg-${version}_${revision}
_desc="${short_desc} (debug files)"
binpkg=${_pkgver}.${arch}.xbps
PKGDESTDIR="${XBPS_DESTDIR}/${XBPS_CROSS_TRIPLET}/${pkgname}-dbg-${version}"
PKGDESTDIR="${XBPS_DESTDIR}/${XBPS_CROSS_TRIPLET:+${XBPS_CROSS_TRIPLET}/}${pkgname}-dbg-${version}"
genpkg ${repo} ${arch} "${_desc}" ${_pkgver} ${binpkg} -dbg
fi
# Generate 32bit pkg.

22
common/hooks/post-install/11-pkglint-patch-orig.sh Normal file
View file

@ -0,0 +1,22 @@
# vim: set ts=4 sw=4 et:
#
# This hook executes the following tasks:
# - Looks on all packages for *.orig files generated by patch on fuzzy match
hook() {
local matches mime file f prune_expr dir
while read -r file; do
basename="${file%.orig}"
if [ -f "$basename" ]; then
if [ -z "$matches" ]; then
matches=yes
msg_red "Fuzzy patches generate those files:\n"
fi
msg_red " $file\n"
fi
done < <(find $PKGDESTDIR -type f -name '*.orig')
if [ "$matches" ]; then
msg_error "Please refresh the patches\n"
fi
}

2
common/hooks/post-pkg/00-register-pkg.sh
View file

@ -30,7 +30,7 @@ hook() {
# Register -dbg binpkg if it exists.
pkgdir=$XBPS_REPOSITORY/debug
PKGDESTDIR="${XBPS_DESTDIR}/${XBPS_CROSS_TRIPLET}/${pkgname}-dbg-${version}"
PKGDESTDIR="${XBPS_DESTDIR%/}/${XBPS_CROSS_TRIPLET:+${XBPS_CROSS_TRIPLET}/}${pkgname}-dbg-${version}"
if [ -d ${PKGDESTDIR} -a -f ${pkgdir}/${binpkg_dbg} ]; then
registerpkg ${pkgdir} ${binpkg_dbg}
fi

4
common/xbps-src/shutils/common.sh
View file

@ -539,8 +539,8 @@ setup_pkg() {
FILESDIR=$XBPS_SRCPKGDIR/$sourcepkg/files
PATCHESDIR=$XBPS_SRCPKGDIR/$sourcepkg/patches
DESTDIR=$XBPS_DESTDIR/$XBPS_CROSS_TRIPLET/${sourcepkg}-${version}
PKGDESTDIR=$XBPS_DESTDIR/$XBPS_CROSS_TRIPLET/${pkg}-${version}
DESTDIR=${XBPS_DESTDIR}/${XBPS_CROSS_TRIPLET:+${XBPS_CROSS_TRIPLET}/}/${sourcepkg}-${version}
PKGDESTDIR=${XBPS_DESTDIR}/${XBPS_CROSS_TRIPLET:+$XBPS_CROSS_TRIPLET/}${pkg}-${version}
export XBPS_ORIG_MAKEJOBS=${XBPS_ORIG_MAKEJOBS:=$XBPS_MAKEJOBS}
if [ -n "$disable_parallel_build" ]; then