From cb44c128e01f9408ba5bf9dbf6ce9dc8bb2c184e Mon Sep 17 00:00:00 2001 From: Lyndon Brown Date: Mon, 6 Apr 2020 18:35:24 +0100 Subject: [PATCH] config: address fixme these options are not internal, they are user controllable Gbp-Dch: Short --- scripts/build/config | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/scripts/build/config b/scripts/build/config index 9106f022b..eb7fd745c 100755 --- a/scripts/build/config +++ b/scripts/build/config @@ -1033,6 +1033,21 @@ LB_SYSTEM="${LB_SYSTEM}" # \$LIVE_IMAGE_NAME: set base name of the image LIVE_IMAGE_NAME="${LIVE_IMAGE_NAME}" +# \$APT_OPTIONS: set options to use with apt +APT_OPTIONS="${APT_OPTIONS}" + +# \$APTITUDE_OPTIONS: set options to use with aptitude +APTITUDE_OPTIONS="${APTITUDE_OPTIONS}" + +# \$DEBOOTSTRAP_OPTIONS: set options to use with debootstrap +DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS}" + +# \$DEBOOTSTRAP_SCRIPT: set script to use with debootstrap +DEBOOTSTRAP_SCRIPT="${DEBOOTSTRAP_SCRIPT}" + +# \$GZIP_OPTIONS: set options to use with gzip +GZIP_OPTIONS="${GZIP_OPTIONS}" + # live-build options # \$_BREAKPOINTS: enable breakpoints @@ -1058,13 +1073,6 @@ LIVE_IMAGE_NAME="${LIVE_IMAGE_NAME}" # \$_VERBOSE: enable verbose # If set here, overrides the command line option #_VERBOSE="${_VERBOSE}" - -# Internal stuff (FIXME) -APT_OPTIONS="${APT_OPTIONS}" -APTITUDE_OPTIONS="${APTITUDE_OPTIONS}" -DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS}" -DEBOOTSTRAP_SCRIPT="${DEBOOTSTRAP_SCRIPT}" -GZIP_OPTIONS="${GZIP_OPTIONS}" EOF # Creating lb_bootstrap_* configuration