From e8deba3b87784ca14c9afc908046f36a3ad7578c Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Wed, 23 Sep 2015 00:02:12 +1000 Subject: makepkg: remove ability to build individual packages Signed-off-by: Allan McRae --- doc/makepkg.8.txt | 4 ---- scripts/makepkg.sh.in | 8 -------- 2 files changed, 12 deletions(-) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index 4323fd33..faf3e19f 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -156,10 +156,6 @@ Options such as a chroot or remote builder. It will also satisfy requirements of the GPL when distributing binary packages. -*\--pkg* :: - Only build listed packages from a split package. Multiple packages should - be comma separated in the list. This option can be specified multiple times. - *\--check*:: Run the check() function in the PKGBUILD, overriding the setting in linkman:makepkg.conf[5]. diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 793d42c6..6ededa38 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -76,7 +76,6 @@ NOBUILD=0 NODEPS=0 NOEXTRACT=0 PKGFUNC=0 -PKGLIST=() PKGVERFUNC=0 PREPAREFUNC=0 REPKG=0 @@ -1718,7 +1717,6 @@ usage() { 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 Only build listed packages from a split package")\n" printf -- "$(gettext " --printsrcinfo Print the generated SRCINFO and exit")\n" printf -- "$(gettext " --sign Sign the resulting package with %s")\n" "gpg" printf -- "$(gettext " --skipchecksums Do not verify checksums of the source files")\n" @@ -1808,7 +1806,6 @@ while true; do --nosign) SIGNPKG='n' ;; -o|--nobuild) NOBUILD=1 ;; -p) shift; BUILDFILE=$1 ;; - --pkg) shift; IFS=, read -ra p <<<"$1"; PKGLIST+=("${p[@]}"); unset p ;; --packagelist) PACKAGELIST=1 IGNOREARCH=1;; --printsrcinfo) PRINTSRCINFO=1 ;; -r|--rmdeps) RMDEPS=1 ;; @@ -2060,11 +2057,6 @@ elif [[ $SPLITPKG -eq 0 ]] && have_function package_${pkgname}; then SPLITPKG=1 fi -if [[ -n "${PKGLIST[@]}" ]]; then - unset pkgname - pkgname=("${PKGLIST[@]}") -fi - # check if gpg signature is to be created and if signing key is valid if { [[ -z $SIGNPKG ]] && check_buildenv "sign" "y"; } || [[ $SIGNPKG == 'y' ]]; then SIGNPKG='y' -- cgit v1.2.3-24-g4f1b