Removing bootstrap-include and bootstrap-exclude options.

This commit is contained in:
Daniel Baumann 2012-08-27 14:33:57 +02:00
parent df1cea54c5
commit fda74e4307
4 changed files with 0 additions and 39 deletions

View File

@ -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

View File

@ -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}"

View File

@ -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"

View File

@ -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}"