diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-08-27 14:33:57 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-08-27 14:33:57 +0200 |
| commit | fda74e43074d51b5aabcb898dba623c2d82a5b50 (patch) | |
| tree | 2d22e66da236a88fe8b9e52e874f14bc19b28c1d | |
| parent | df1cea54c56ecd4ea99e2d9d5d3cb3ce075b150a (diff) | |
| download | vyos-live-build-fda74e43074d51b5aabcb898dba623c2d82a5b50.tar.gz vyos-live-build-fda74e43074d51b5aabcb898dba623c2d82a5b50.zip | |
Removing bootstrap-include and bootstrap-exclude options.
| -rwxr-xr-x | functions/defaults.sh | 11 | ||||
| -rwxr-xr-x | scripts/build/lb_bootstrap_cdebootstrap | 10 | ||||
| -rwxr-xr-x | scripts/build/lb_bootstrap_debootstrap | 10 | ||||
| -rwxr-xr-x | scripts/build/lb_config | 8 |
4 files changed, 0 insertions, 39 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index f51acbb7c..9649db7b4 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -377,17 +377,6 @@ Set_defaults () fi fi - # Include packages on base - case "${LB_MODE}" in - ubuntu|kubuntu) - LB_BOOTSTRAP_INCLUDE="${LB_BOOTSTRAP_INCLUDE:-gnupg}" - ;; - - esac - - # Exclude packages on base - # LB_BOOTSTRAP_EXCLUDE - # Setting bootstrap keyring # LB_BOOTSTRAP_KEYRING diff --git a/scripts/build/lb_bootstrap_cdebootstrap b/scripts/build/lb_bootstrap_cdebootstrap index 0e75765a8..dc3c1c725 100755 --- a/scripts/build/lb_bootstrap_cdebootstrap +++ b/scripts/build/lb_bootstrap_cdebootstrap @@ -61,16 +61,6 @@ then CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --arch=${LB_ARCHITECTURES}" fi -if [ -n "${LB_BOOTSTRAP_INCLUDE}" ] -then - CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --include=$(echo ${LB_BOOTSTRAP_INCLUDE} | sed 's| *|,|g')" -fi - -if [ -n "${LB_BOOTSTRAP_EXCLUDE}" ] -then - CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --exclude=$(echo ${LB_BOOTSTRAP_EXCLUDE} | sed 's| *|,|g')" -fi - if [ -n "${LB_BOOTSTRAP_KEYRING}" ] then CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --keyring=${LB_BOOTSTRAP_KEYRING}" diff --git a/scripts/build/lb_bootstrap_debootstrap b/scripts/build/lb_bootstrap_debootstrap index 5e9caf249..901b90797 100755 --- a/scripts/build/lb_bootstrap_debootstrap +++ b/scripts/build/lb_bootstrap_debootstrap @@ -67,16 +67,6 @@ then DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --components=$(echo ${LB_ARCHIVE_AREAS} | sed -e 's| |,|g')" fi -if [ -n "${LB_BOOTSTRAP_INCLUDE}" ] -then - DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --include=$(echo ${LB_BOOTSTRAP_INCLUDE} | sed 's| *|,|g')" -fi - -if [ -n "${LB_BOOTSTRAP_EXCLUDE}" ] -then - DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --exclude=$(echo ${LB_BOOTSTRAP_EXCLUDE} | sed 's| *|,|g')" -fi - case "${LB_USE_FAKEROOT}" in true) DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=fakechroot" diff --git a/scripts/build/lb_config b/scripts/build/lb_config index 58f98a1e3..c22dc39d2 100755 --- a/scripts/build/lb_config +++ b/scripts/build/lb_config @@ -1093,14 +1093,6 @@ cat > config/bootstrap << EOF # (Default: autodetected) LB_ARCHITECTURES="${LB_ARCHITECTURES}" -# \$LB_BOOTSTRAP_INCLUDE: include packages on base -# (Default: empty) -LB_BOOTSTRAP_INCLUDE="${LB_BOOTSTRAP_INCLUDE}" - -# \$LB_BOOTSTRAP_EXCLUDE: exclude packages on base -# (Default: empty) -LB_BOOTSTRAP_EXCLUDE="${LB_BOOTSTRAP_EXCLUDE}" - # \$LB_BOOTSTRAP_KEYRING: set distribution keyring # (Default: empty) LB_BOOTSTRAP_KEYRING="${LB_BOOTSTRAP_KEYRING}" |