diff options
Diffstat (limited to 'scripts/build')
| -rwxr-xr-x | scripts/build/lb_chroot_apt | 17 | ||||
| -rwxr-xr-x | scripts/build/lb_config | 11 |
2 files changed, 1 insertions, 27 deletions
diff --git a/scripts/build/lb_chroot_apt b/scripts/build/lb_chroot_apt index da3b03663..1fea99ae5 100755 --- a/scripts/build/lb_chroot_apt +++ b/scripts/build/lb_chroot_apt @@ -54,17 +54,6 @@ case "${1}" in echo "Acquire::http::Proxy \"${LB_APT_HTTP_PROXY}\";" > chroot/etc/apt/apt.conf.d/00http-proxy fi - # Configuring apt pdiffs - case "${LB_APT_PDIFFS}" in - true) - echo "Acquire::PDiffs \"true\";" > chroot/etc/apt/apt.conf.d/00pdiffs - ;; - - false) - echo "Acquire::PDiffs \"false\";" > chroot/etc/apt/apt.conf.d/00pdiffs - ;; - esac - # Configuring apt pipeline if [ -n "${LB_APT_PIPELINE}" ] then @@ -163,12 +152,6 @@ case "${1}" in # Deconfiguring aptitude http proxy rm -f chroot/etc/apt/apt.conf.d/00http-proxy - # Deconfiguring aptitude pdiffs - if [ "${LB_APT_PDIFFS}" = "true" ] - then - rm -f chroot/etc/apt/apt.conf.d/00pdiffs - fi - # Deconfiguring aptitude pipeline rm -f chroot/etc/apt/apt.conf.d/00pipeline diff --git a/scripts/build/lb_config b/scripts/build/lb_config index 52cb81138..ffddc8039 100755 --- a/scripts/build/lb_config +++ b/scripts/build/lb_config @@ -33,7 +33,6 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\ \t [--apt-ftp-proxy URL]\n\ \t [--apt-http-proxy URL]\n\ \t [--apt-indices true|false|none]\n\ -\t [--apt-pdiffs true|false]\n\ \t [--apt-options OPTION|\"OPTIONS\"]\n\ \t [--aptitude-options OPTION|\"OPTIONS\"]\n\ \t [--apt-pipeline DEPTH]\n\ @@ -136,7 +135,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\ Local_arguments () { - LONG_OPTIONS="apt:,apt-ftp-proxy:,apt-http-proxy:,apt-pdiffs:,apt-options:,aptitute-options:, + LONG_OPTIONS="apt:,apt-ftp-proxy:,apt-http-proxy:,apt-options:,aptitute-options:, apt-pipeline:,apt-recommends:,apt-secure:,bootstrap:,cache:,cache-indices:,cache-packages:, cache-stages:,debconf-frontend:,debconf-nowarnings:,debconf-priority:,dump, initramfs:,fdisk:,losetup:,mode:,repositories:,root-command:,use-fakeroot:,tasksel:,includes:, @@ -230,10 +229,6 @@ Local_arguments () shift 2 ;; - --apt-pdiffs) - LB_APT_PDIFFS="${2}" - shift 2 - ;; --apt-options) APT_OPTIONS="${2}" shift 2 @@ -829,10 +824,6 @@ LB_APT_FTP_PROXY="${LB_APT_FTP_PROXY}" # (Default: autodetected or empty) LB_APT_HTTP_PROXY="${LB_APT_HTTP_PROXY}" -# \$LB_APT_PDIFFS: set apt/aptitude pdiff indices -# (Default: ${LB_APT_PDIFFS}) -LB_APT_PDIFFS="${LB_APT_PDIFFS}" - # \$LB_APT_PIPELINE: set apt/aptitude pipeline depth # (Default: ${LB_APT_PIPELINE}) LB_APT_PIPELINE="${LB_APT_PIPELINE}" |