bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libmakepkg: Always look in SRCDEST for sources, never startdir

Browse source 
Otherwise `verify()` would have to replicate the behavior of
`get_filepath` for each source it wants to check, and test both
`$startdir` and `$SRCDEST`.
This commit is contained in:
Jan Alexander Steffens (heftig) 2025-03-19 21:17:26 +01:00
parent 34f09204fa
commit 6b1fcc6030
No known key found for this signature in database
GPG key ID: B8AC08600F108CDF
2 changed files with 9 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
doc/PKGBUILD.5.asciidoc
View file

@ -102,12 +102,12 @@ systems (see below).
*source (array)*:: *source (array)*::
An array of source files required to build the package. Source files An array of source files required to build the package. Source files
must either reside in the same directory as the PKGBUILD, or be a must either reside in `$SRCDEST` (if set, otherwise the same directory
fully-qualified URL that makepkg can use to download the file. as the PKGBUILD) or be a fully-qualified URL that makepkg can use to
To simplify the maintenance of PKGBUILDs, use the `$pkgname` and `$pkgver` download the file. To simplify the maintenance of PKGBUILDs, use the
variables when specifying the download location, if possible. `$pkgname` and `$pkgver` variables when specifying the download
Compressed files will be extracted automatically unless found in the location, if possible. Compressed files will be extracted automatically
noextract array described below. unless found in the noextract array described below.
+ +
Additional architecture-specific sources can be added by appending an Additional architecture-specific sources can be added by appending an
underscore and the architecture name e.g., 'source_x86_64=()'. There must be a underscore and the architecture name e.g., 'source_x86_64=()'. There must be a

22
scripts/libmakepkg/util/source.sh.in
View file

@ -90,28 +90,12 @@ get_filename() {
# Return the absolute filename of a source entry # Return the absolute filename of a source entry
get_filepath() { get_filepath() {
local file="$(get_filename "$1")" local file="$SRCDEST/$(get_filename "$1")"
local proto="$(get_protocol "$1")" local proto="$(get_protocol "$1")"
case $proto in case $proto in
bzr|git|hg|svn) bzr|git|hg|svn) [[ -d $file ]] || return 1 ;;
if [[ -d "$startdir/$file" ]]; then *) [[ -f $file ]] || return 1 ;;
file="$startdir/$file"
elif [[ -d "$SRCDEST/$file" ]]; then
file="$SRCDEST/$file"
else
return 1
fi
;;
*)
if [[ -f "$startdir/$file" ]]; then
file="$startdir/$file"
elif [[ -f "$SRCDEST/$file" ]]; then
file="$SRCDEST/$file"
else
return 1
fi
;;
esac esac
printf "%s\n" "$file" printf "%s\n" "$file"