From 002e22f84614b2c1cf71f7e33a86dea3d16ac14c Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Tue, 1 Aug 2023 11:05:59 -0600 Subject: [PATCH] Add --configure-only option to quit after the configure run. This will be used to avoid building the entire package when we just want the 32 or 64 bit sudo_intercept.so and sudo_noexec.so. --- scripts/mkpkg | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/scripts/mkpkg b/scripts/mkpkg index d0a814d3c..29b93de77 100755 --- a/scripts/mkpkg +++ b/scripts/mkpkg @@ -17,7 +17,8 @@ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # # Build a binary package using polypkg -# Usage: mkpkg [--build-only] [--debug] [--flavor flavor] [--platform platform] [--osversion ver] +# Usage: mkpkg [--build-only] [--configure-only] [--debug] [--flavor flavor] +# [--platform platform] [--osversion ver] # # Make sure IFS is set to space, tab, newline in that order. @@ -28,11 +29,12 @@ nl=' IFS=" $nl" # Parse arguments -usage="usage: mkpkg [--build-only] [--debug] [--flavor flavor] [--platform platform] [--osversion ver]" +usage="usage: mkpkg [--build-only] [--configure-only] [--debug] [--flavor flavor] [--platform platform] [--osversion ver]" debug=0 flavor=vanilla crossbuild=false build_packages=true; +build_sudo=true; while test $# -gt 0; do case "$1" in --debug) @@ -84,6 +86,9 @@ while test $# -gt 0; do --build-only) build_packages=false ;; + --configure-only) + build_sudo=false + ;; *) # Pass unknown options to configure configure_opts="${configure_opts}${configure_opts+$tab}$1" @@ -574,9 +579,11 @@ if [ -r Makefile ]; then ${MAKE} $make_opts distclean fi ${configure} "$@" || exit $? -${MAKE} $make_opts || exit $? -if [ $build_packages = true ]; then - ${MAKE} $make_opts PPFLAGS="$PPFLAGS" PPVARS="$PPVARS" package +if [ $build_sudo = true ]; then + ${MAKE} $make_opts || exit $? + if [ $build_packages = true ]; then + ${MAKE} $make_opts PPFLAGS="$PPFLAGS" PPVARS="$PPVARS" package + fi fi exitval=$? test $debug -eq 0 && rm -rf destdir