diff options
| -rwxr-xr-x | functions/defaults.sh | 34 | ||||
| -rwxr-xr-x | scripts/build/chroot_archives | 20 | ||||
| -rwxr-xr-x | scripts/build/config | 48 |
3 files changed, 14 insertions, 88 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index 66b9eec57..7ac98a9eb 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -456,23 +456,6 @@ Set_defaults () ;; esac - # Setting backports mirror to fetch packages from - case "${LB_MODE}" in - debian) - LB_MIRROR_CHROOT_BACKPORTS="${LB_MIRROR_CHROOT_BACKPORTS:-http://backports.debian.org/debian-backports/}" - LB_PARENT_MIRROR_CHROOT_BACKPORTS="${LB_PARENT_MIRROR_CHROOT_BACKPORTS:-${LB_MIRROR_CHROOT_BACKPORTS}}" - ;; - - progress-linux) - LB_MIRROR_CHROOT_BACKPORTS="${LB_MIRROR_CHROOT_BACKPORTS:-${LB_MIRROR_CHROOT}}" - ;; - - *) - LB_PARENT_MIRROR_CHROOT_BACKPORTS="${LB_PARENT_MIRROR_CHROOT_BACKPORTS:-none}" - LB_MIRROR_CHROOT_BACKPORTS="${LB_MIRROR_CHROOT_BACKPORTS:-none}" - ;; - esac - # Setting mirror which ends up in the image case "${LB_MODE}" in debian) @@ -568,23 +551,6 @@ Set_defaults () ;; esac - # Setting backports mirror which ends up in the image - case "${LB_MODE}" in - debian) - LB_MIRROR_BINARY_BACKPORTS="${LB_MIRROR_BINARY_BACKPORTS:-http://http.debian.net/debian-backports/}" - LB_PARENT_MIRROR_BINARY_BACKPORTS="${LB_PARENT_MIRROR_BINARY_BACKPORTS:-${LB_MIRROR_BINARY_BACKPORTS}}" - ;; - - progress-linux) - LB_MIRROR_BINARY_BACKPORTS="${LB_MIRROR_BINARY_BACKPORTS:-${LB_MIRROR_BINARY}}" - ;; - - *) - LB_PARENT_MIRROR_BINARY_BACKPORTS="${LB_PARENT_MIRROR_BINARY_BACKPORTS:-none}" - LB_MIRROR_BINARY_BACKPORTS="${LB_MIRROR_BINARY_BACKPORTS:-none}" - ;; - esac - case "${LB_MODE}" in progress-linux) LB_PARENT_MIRROR_DEBIAN_INSTALLER="${LB_PARENT_MIRROR_DEBIAN_INSTALLER:-${LB_MIRROR_CHROOT}}" diff --git a/scripts/build/chroot_archives b/scripts/build/chroot_archives index 795f48b87..018330540 100755 --- a/scripts/build/chroot_archives +++ b/scripts/build/chroot_archives @@ -168,23 +168,23 @@ EOF debian) if [ "${LB_PARENT_DISTRIBUTION}" != "sid" ] then - echo "deb ${LB_PARENT_MIRROR_CHROOT_BACKPORTS} ${LB_PARENT_DISTRIBUTION}-backports ${LIVE_IMAGE_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} + echo "deb ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION}-backports ${LIVE_IMAGE_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ] then - echo "deb-src ${LB_PARENT_MIRROR_CHROOT_BACKPORTS} ${LB_PARENT_DISTRIBUTION}-backports ${LIVE_IMAGE_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} + echo "deb-src ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION}-backports ${LIVE_IMAGE_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} fi fi ;; esac - if [ "${LB_DERIVATIVE}" = "true" ] && [ "${LB_MIRROR_CHROOT_BACKPORTS}" != "none" ] + if [ "${LB_DERIVATIVE}" = "true" ] then - echo "deb ${LB_MIRROR_CHROOT_BACKPORTS} ${_DISTRIBUTION}-backports ${LIVE_IMAGE_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list + echo "deb ${LB_MIRROR_CHROOT} ${_DISTRIBUTION}-backports ${LIVE_IMAGE_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ] then - echo "deb-src ${LB_MIRROR_CHROOT_BACKPORTS} ${_DISTRIBUTION}-backports ${LIVE_IMAGE_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list + echo "deb-src ${LB_MIRROR_CHROOT} ${_DISTRIBUTION}-backports ${LIVE_IMAGE_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list fi fi fi @@ -732,23 +732,23 @@ EOF debian) if [ "${LB_PARENT_DISTRIBUTION}" != "sid" ] then - echo "deb ${LB_PARENT_MIRROR_BINARY_BACKPORTS} ${LB_PARENT_DISTRIBUTION}-backports ${LIVE_IMAGE_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} + echo "deb ${LB_PARENT_MIRROR_BINARY} ${LB_PARENT_DISTRIBUTION}-backports ${LIVE_IMAGE_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ] then - echo "deb-src ${LB_PARENT_MIRROR_BINARY_BACKPORTS} ${LB_PARENT_DISTRIBUTION}-backports ${LIVE_IMAGE_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} + echo "deb-src ${LB_PARENT_MIRROR_BINARY} ${LB_PARENT_DISTRIBUTION}-backports ${LIVE_IMAGE_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} fi fi ;; esac - if [ "${LB_DERIVATIVE}" = "true" ] && [ "${LB_MIRROR_BINARY_BACKPORTS}" != "none" ] + if [ "${LB_DERIVATIVE}" = "true" ] then - echo "deb ${LB_MIRROR_BINARY_BACKPORTS} ${_DISTRIBUTION}-backports ${LIVE_IMAGE_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list + echo "deb ${LB_MIRROR_BINARY} ${_DISTRIBUTION}-backports ${LIVE_IMAGE_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ] then - echo "deb-src ${LB_MIRROR_BINARY_BACKPORTS} ${_DISTRIBUTION}-backports ${LIVE_IMAGE_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list + echo "deb-src ${LB_MIRROR_BINARY} ${_DISTRIBUTION}-backports ${LIVE_IMAGE_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list fi fi fi diff --git a/scripts/build/config b/scripts/build/config index 551c959d4..117a4e6cf 100755 --- a/scripts/build/config +++ b/scripts/build/config @@ -85,21 +85,17 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\ \t [--parent-mirror-chroot URL]\n\ \t [--parent-mirror-chroot-security URL]\n\ \t [--parent-mirror-chroot-updates URL]\n\ -\t [--parent-mirror-chroot-backports URL]\n\ \t [--parent-mirror-binary URL]\n\ \t [--parent-mirror-binary-security URL]\n\ \t [--parent-mirror-binary-updates URL]\n\ -\t [--parent-mirror-binary-backports URL]\n\ \t [--parent-mirror-debian-installer URL]\n\ \t [--mirror-bootstrap URL]\n\ \t [--mirror-chroot URL]\n\ \t [--mirror-chroot-security URL]\n\ \t [--mirror-chroot-updates URL]\n\ -\t [--mirror-chroot-backports URL]\n\ \t [--mirror-binary URL]\n\ \t [--mirror-binary-security URL]\n\ \t [--mirror-binary-updates URL]\n\ -\t [--mirror-binary-backports URL]\n\ \t [--mirror-debian-installer URL]\n\ \t [--mode debian|emdebian|ubuntu]\n\ \t [--system live|normal]\n\ @@ -143,10 +139,10 @@ Local_arguments () cache-stages:,debconf-frontend:,debconf-priority:,dump, initramfs:,initramfs-compression:,initsystem:,fdisk:,losetup:,mode:,system:,tasksel:, templates:,architectures:,clean, - distribution:,parent-distribution:,parent-debian-installer-distribution:,parent-mirror-bootstrap:,parent-mirror-chroot:,parent-mirror-chroot-security:,parent-mirror-chroot-updates:,parent-mirror-chroot-backports:,parent-mirror-binary:, - parent-mirror-binary-security:,parent-mirror-binary-updates:,parent-mirror-binary-backports:,parent-mirror-debian-installer:, - mirror-bootstrap:,mirror-chroot:,mirror-chroot-security:,mirror-chroot-updates:,mirror-chroot-backports:,mirror-binary:, - mirror-binary-security:,mirror-binary-updates:,mirror-binary-backports:,mirror-debian-installer:, + distribution:,parent-distribution:,parent-debian-installer-distribution:,parent-mirror-bootstrap:,parent-mirror-chroot:,parent-mirror-chroot-security:,parent-mirror-chroot-updates:,parent-mirror-binary:, + parent-mirror-binary-security:,parent-mirror-binary-updates:,parent-mirror-debian-installer:, + mirror-bootstrap:,mirror-chroot:,mirror-chroot-security:,mirror-chroot-updates:,mirror-binary:, + mirror-binary-security:,mirror-binary-updates:,mirror-debian-installer:, archives:,archive-areas:,parent-archive-areas:,chroot-filesystem:,exposed-root:, gzip-options:,hooks:,image-name:,interactive:,keyring-packages:,linux-flavours:,linux-packages:, security:,updates:,backports:,binary-filesystem:,binary-images:, @@ -392,11 +388,6 @@ Local_arguments () shift 2 ;; - --parent-mirror-chroot-backports) - LB_PARENT_MIRROR_CHROOT_BACKPORTS="${2}" - shift 2 - ;; - --parent-mirror-binary) LB_PARENT_MIRROR_BINARY="${2}" shift 2 @@ -412,11 +403,6 @@ Local_arguments () shift 2 ;; - --parent-mirror-binary-backports) - LB_PARENT_MIRROR_BINARY_BACKPORTS="${2}" - shift 2 - ;; - --parent-mirror-debian-installer) LB_PARENT_MIRROR_DEBIAN_INSTALLER="${2}" shift 2 @@ -442,11 +428,6 @@ Local_arguments () shift 2 ;; - --mirror-chroot-backports) - LB_MIRROR_CHROOT_BACKPORTS="${2}" - shift 2 - ;; - --mirror-binary) LB_MIRROR_BINARY="${2}" shift 2 @@ -462,11 +443,6 @@ Local_arguments () shift 2 ;; - --mirror-binary-backports) - LB_MIRROR_BINARY_BACKPORTS="${2}" - shift 2 - ;; - --mirror-debian-installer) LB_MIRROR_DEBIAN_INSTALLER="${2}" shift 2 @@ -1121,10 +1097,6 @@ LB_PARENT_MIRROR_CHROOT_SECURITY="${LB_PARENT_MIRROR_CHROOT_SECURITY}" # (Default: ${LB_PARENT_MIRROR_CHROOT_UPDATES}) LB_PARENT_MIRROR_CHROOT_UPDATES="${LB_PARENT_MIRROR_CHROOT_UPDATES}" -# \$LB_PARENT_MIRROR_CHROOT_BACKPORTS: set backports parent mirror to fetch packages from -# (Default: ${LB_PARENT_MIRROR_CHROOT_BACKPORTS}) -LB_PARENT_MIRROR_CHROOT_BACKPORTS="${LB_PARENT_MIRROR_CHROOT_BACKPORTS}" - # \$LB_PARENT_MIRROR_BINARY: set parent mirror which ends up in the image # (Default: ${LB_PARENT_MIRROR_BINARY}) LB_PARENT_MIRROR_BINARY="${LB_PARENT_MIRROR_BINARY}" @@ -1137,10 +1109,6 @@ LB_PARENT_MIRROR_BINARY_SECURITY="${LB_PARENT_MIRROR_BINARY_SECURITY}" # (Default: ${LB_PARENT_MIRROR_BINARY_UPDATES}) LB_PARENT_MIRROR_BINARY_UPDATES="${LB_PARENT_MIRROR_BINARY_UPDATES}" -# \$LB_PARENT_MIRROR_BINARY_BACKPORTS: set backports parent mirror which ends up in the image -# (Default: ${LB_PARENT_MIRROR_BINARY_BACKPORTS}) -LB_PARENT_MIRROR_BINARY_BACKPORTS="${LB_PARENT_MIRROR_BINARY_BACKPORTS}" - # \$LB_PARENT_MIRROR_DEBIAN_INSTALLER: set debian-installer parent mirror # (Default: ${LB_PARENT_MIRROR_BOOTSTRAP}) LB_PARENT_MIRROR_DEBIAN_INSTALLER="${LB_PARENT_MIRROR_DEBIAN_INSTALLER}" @@ -1161,10 +1129,6 @@ LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY}" # (Default: ${LB_MIRROR_CHROOT_UPDATES}) LB_MIRROR_CHROOT_UPDATES="${LB_MIRROR_CHROOT_UPDATES}" -# \$LB_MIRROR_CHROOT_BACKPORTS: set backports mirror to fetch packages from -# (Default: ${LB_MIRROR_CHROOT_BACKPORTS}) -LB_MIRROR_CHROOT_BACKPORTS="${LB_MIRROR_CHROOT_BACKPORTS}" - # \$LB_MIRROR_BINARY: set mirror which ends up in the image # (Default: ${LB_MIRROR_BINARY}) LB_MIRROR_BINARY="${LB_MIRROR_BINARY}" @@ -1177,10 +1141,6 @@ LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY}" # (Default: ${LB_MIRROR_BINARY_UPDATES}) LB_MIRROR_BINARY_UPDATES="${LB_MIRROR_BINARY_UPDATES}" -# \$LB_MIRROR_BINARY_BACKPORTS: set backports mirror which ends up in the image -# (Default: ${LB_MIRROR_BINARY_BACKPORTS}) -LB_MIRROR_BINARY_BACKPORTS="${LB_MIRROR_BINARY_BACKPORTS}" - # \$LB_MIRROR_DEBIAN_INSTALLER: set debian-installer mirror # (Default: ${LB_MIRROR_BOOTSTRAP}) LB_MIRROR_DEBIAN_INSTALLER="${LB_MIRROR_DEBIAN_INSTALLER}" |