Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvy Foster <joyfulgirl@archlinux.us>2015-03-20 19:19:57 -0500
committerAllan McRae <allan@archlinux.org>2015-03-26 14:44:10 +1000
commitbf3aec8c327528521b06befc8e9b6f55dd4fa07c (patch)
treeda241e3560b14a86a5645f8e599040b31647b985
parentb520c6312ff0ffec864576b5218f1638fae1e18b (diff)
Add makepkg option --packagelist
makepkg --packagelist prints the name of each package that would normally be produced, minus $PKGEXT, and exits. Implements FS#42150 Signed-off-by: Ivy Foster <joyfulgirl@archlinux.us> Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--doc/makepkg.8.txt3
-rw-r--r--scripts/makepkg.sh.in28
2 files changed, 28 insertions, 3 deletions
diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt
index 31a2ef73..41df30ed 100644
--- a/doc/makepkg.8.txt
+++ b/doc/makepkg.8.txt
@@ -203,6 +203,9 @@ Options
(Passed to pacman) Prevent pacman from displaying a progress bar;
useful if you are redirecting makepkg output to file.
+*\--packagelist*::
+ List the packages that would be produced without building. Listed
+ package names do not include PKGEXT.
Additional Features
-------------------
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index eb1edd04..2e6a0cc2 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -2834,6 +2834,21 @@ run_split_packaging() {
pkgname=${pkgname_backup[@]}
}
+print_all_package_names() {
+ local version=$(get_full_version)
+ local architecture pkg opts a
+ for pkg in ${pkgname[@]}; do
+ pkgbuild_get_attribute "$pkg" 'arch' 1 architecture
+ pkgbuild_get_attribute "$pkg" 'options' 1 opts
+ for a in ${architecture[@]}; do
+ printf "%s-%s-%s\n" "$pkg" "$version" "$a"
+ if in_opt_array "debug" ${opts[@]} && in_opt_array "strip" ${opts[@]}; then
+ printf "%s-%s-%s-%s\n" "$pkg" "@DEBUGSUFFIX@" "$version" "$a"
+ fi
+ done
+ done
+}
+
# Canonicalize a directory path if it exists
canonicalize_path() {
local path="$1";
@@ -2893,6 +2908,7 @@ usage() {
printf -- "$(gettext " --nocheck Do not run the %s function in the %s")\n" "check()" "$BUILDSCRIPT"
printf -- "$(gettext " --noprepare Do not run the %s function in the %s")\n" "prepare()" "$BUILDSCRIPT"
printf -- "$(gettext " --nosign Do not create a signature for the package")\n"
+ printf -- "$(gettext " --packagelist Only list packages that would be produced, without PKGEXT")\n"
printf -- "$(gettext " --pkg <list> Only build listed packages from a split package")\n"
printf -- "$(gettext " --sign Sign the resulting package with %s")\n" "gpg"
printf -- "$(gettext " --skipchecksums Do not verify checksums of the source files")\n"
@@ -2938,9 +2954,9 @@ ARGLIST=("$@")
OPT_SHORT="AcCdefFghiLmop:rRsSV"
OPT_LONG=('allsource' 'check' 'clean' 'cleanbuild' 'config:' 'force' 'geninteg'
'help' 'holdver' 'ignorearch' 'install' 'key:' 'log' 'noarchive' 'nobuild'
- 'nocolor' 'nocheck' 'nodeps' 'noextract' 'noprepare' 'nosign' 'pkg:' 'repackage'
- 'rmdeps' 'sign' 'skipchecksums' 'skipinteg' 'skippgpcheck' 'source' 'syncdeps'
- 'verifysource' 'version')
+ 'nocolor' 'nocheck' 'nodeps' 'noextract' 'noprepare' 'nosign' 'packagelist'
+ 'pkg:' 'repackage' 'rmdeps' 'sign' 'skipchecksums' 'skipinteg'
+ 'skippgpcheck' 'source' 'syncdeps' 'verifysource' 'version')
# Pacman Options
OPT_LONG+=('asdeps' 'noconfirm' 'needed' 'noprogressbar')
@@ -2983,6 +2999,7 @@ while true; do
-o|--nobuild) NOBUILD=1 ;;
-p) shift; BUILDFILE=$1 ;;
--pkg) shift; IFS=, read -ra p <<<"$1"; PKGLIST+=("${p[@]}"); unset p ;;
+ --packagelist) PACKAGELIST=1 IGNOREARCH=1;;
-r|--rmdeps) RMDEPS=1 ;;
-R|--repackage) REPKG=1 ;;
--sign) SIGNPKG='y' ;;
@@ -3264,6 +3281,11 @@ if { [[ -z $SIGNPKG ]] && check_buildenv "sign" "y"; } || [[ $SIGNPKG == 'y' ]];
fi
fi
+if (( PACKAGELIST )); then
+ print_all_package_names
+ exit 0
+fi
+
if (( ! PKGVERFUNC )); then
check_build_status
fi