From a6988b188f24e16ed0a1b7c5ab9da58e9bfb5bc3 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 15 Jun 2011 20:38:36 +0200 Subject: Renaming repositories option to archives for consistency with debian-policy terminology. In order to be consistent with terminology used in debian-policy, we've always tried to use the same names for the same things. The repository option is one of the last things that were too late in squeeze release cycle to be renamed in time. --- scripts/build/lb_chroot_sources | 20 ++++++++++---------- scripts/build/lb_config | 24 ++++++++++++------------ 2 files changed, 22 insertions(+), 22 deletions(-) (limited to 'scripts/build') diff --git a/scripts/build/lb_chroot_sources b/scripts/build/lb_chroot_sources index 75e73333b..352f3e9f9 100755 --- a/scripts/build/lb_chroot_sources +++ b/scripts/build/lb_chroot_sources @@ -217,10 +217,10 @@ EOF done fi - # Configure third-party repositories - if [ -n "${LB_REPOSITORIES}" ] + # Configure third-party archives + if [ -n "${LB_ARCHIVES}" ] then - for REPOSITORY in ${LB_REPOSITORIES} + for REPOSITORY in ${LB_ARCHIVES} do # ubuntu workaround to allow using live.debian.net if [ "${LB_MODE}" = "ubuntu" ] && [ "${REPOSITORY}" = "live.debian.net" ] @@ -230,9 +230,9 @@ EOF _DISTRIBUTION="${LB_PARENT_DISTRIBUTION}" fi - for PLACE in config/repositories "${LB_BASE}/repositories" + for PLACE in config/archives "${LB_BASE}/archives" do - # Prefer repositories from the config tree + # Prefer archives from the config tree # over the global ones. if ! ls "${PLACE}/${REPOSITORY}"* > /dev/null 2>&1 then @@ -731,17 +731,17 @@ EOF fi fi - # Configure third-party repositories - if [ -n "${LB_REPOSITORIES}" ] + # Configure third-party archives + if [ -n "${LB_ARCHIVES}" ] then - for REPOSITORY in ${LB_REPOSITORIES} + for REPOSITORY in ${LB_ARCHIVES} do # Removing sources.list entries (chroot) rm -f "chroot/etc/apt/sources.list.d/${REPOSITORY}.list" - for PLACE in config/repositories "${LB_BASE}/repositories" + for PLACE in config/archives "${LB_BASE}/archives" do - # Prefer repositories from the config tree + # Prefer archives from the config tree # over the global ones. if ! ls "${PLACE}/${REPOSITORY}"* > /dev/null 2>&1 then diff --git a/scripts/build/lb_config b/scripts/build/lb_config index d8813b523..f4148a59e 100755 --- a/scripts/build/lb_config +++ b/scripts/build/lb_config @@ -124,9 +124,9 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\ \t [--net-tarball true|false]\n\ \t [-p|--package-lists LIST|\"LISTS\"]\n\ \t [--quiet]\n\ -\t [-r|--repositories REPOSITORY|\"REPOSITORIES\"]\n\ \t [--root-command sudo]\n\ \t [--use-fakeroot true|false]\n\ +\t [--archives ARCHIVE|\"ARCHIVES\"]\n\ \t [--archive-areas ARCHIVE_AREA|\"ARCHIVE_AREAS\"]\n\ \t [--parent-archive-areas ARCHIVE_AREA|\"ARCHIVE_AREAS\"]\n\ \t [--security true|false]\n\ @@ -151,13 +151,13 @@ Local_arguments () 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:,initramfs-compression:,initsystem:,fdisk:,losetup:,mode:,repositories:,root-command:,use-fakeroot:,tasksel:,includes:, + initramfs:,initramfs-compression:,initsystem:,fdisk:,losetup:,mode:,root-command:,use-fakeroot:,tasksel:,includes:, templates:,architectures:,bootstrap-flavour:,bootstrap-keyring:,clean, distribution:,parent-distribution:,parent-debian-installer-distribution:,parent-mirror-bootstrap:,parent-mirror-chroot:,parent-mirror-chroot-security:,parent-mirror-chroot-volatile:,parent-mirror-chroot-backports:,parent-mirror-binary:, parent-mirror-binary-security:,parent-mirror-binary-volatile:,parent-mirror-binary-backports:,parent-mirror-debian-installer:, mirror-bootstrap:,mirror-chroot:,mirror-chroot-security:,mirror-chroot-volatile:,mirror-chroot-backports:,mirror-binary:, mirror-binary-security:,mirror-binary-volatile:,mirror-binary-backports:,mirror-debian-installer:, - archive-areas:,parent-archive-areas:,chroot-filesystem:,exposed-root:,virtual-root-size:, + archives:,archive-areas:,parent-archive-areas:,chroot-filesystem:,exposed-root:,virtual-root-size:, gzip-options:,hooks:,interactive:,keyring-packages:,linux-flavours:,linux-packages:, package-lists:,tasks:,security:,volatile:,backports:,binary-filesystem:,binary-images:, apt-indices:,bootappend-install:,bootappend-live:,bootloader:,checksums:,compression:,build-with-chroot:, @@ -340,11 +340,6 @@ Local_arguments () shift 2 ;; - -r|--repositories) - LB_REPOSITORIES="${2}" - shift 2 - ;; - --root-command) LB_ROOT_COMMAND="${2}" shift 2 @@ -501,6 +496,11 @@ Local_arguments () shift 2 ;; + --archives) + LB_ARCHIVES="${2}" + shift 2 + ;; + --archive-areas) LB_ARCHIVE_AREAS="${2}" shift 2 @@ -1134,6 +1134,10 @@ LB_MIRROR_BINARY_BACKPORTS="${LB_MIRROR_BINARY_BACKPORTS}" # (Default: ${LB_MIRROR_BOOTSTRAP}) LB_MIRROR_DEBIAN_INSTALLER="${LB_MIRROR_DEBIAN_INSTALLER}" +# \$LB_ARCHIVES: enable available third-party archives +# (Default: empty) +LB_ARCHIVES="${LB_ARCHIVES}" + # \$LB_ARCHIVE_AREAS: select archive areas to use # (Default: ${LB_ARCHIVE_AREAS}) LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS}" @@ -1193,10 +1197,6 @@ LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS}" # (Default: autodetected) LB_LINUX_PACKAGES="${LB_LINUX_PACKAGES}" -# \$LB_REPOSITORIES: enable available third-party repositories -# (Default: empty) -LB_REPOSITORIES="${LB_REPOSITORIES}" - # \$LB_PACKAGE_LISTS: set package list to install # (Default: ${LB_PACKAGE_LISTS}) LB_PACKAGE_LISTS="${LB_PACKAGE_LISTS}" -- cgit v1.2.3