summaryrefslogtreecommitdiff
path: root/scripts/build/config
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2013-06-25 09:10:39 +0200
committerDaniel Baumann <mail@daniel-baumann.ch>2013-06-25 09:12:03 +0200
commit613f8cfd6d04eb2dbdaee9b6b22b33c27a4db106 (patch)
treede5ebaf246537229b637cf8c0b58758c3b93912f /scripts/build/config
parent86746ac72fb9dc558e40914de9aea26ad58d19b1 (diff)
downloadvyos-live-build-613f8cfd6d04eb2dbdaee9b6b22b33c27a4db106.tar.gz
vyos-live-build-613f8cfd6d04eb2dbdaee9b6b22b33c27a4db106.zip
Dropping global archive definitions shipped in /usr/share/live/build/archives (same as with packagelists, hidden archive 'magic' is gone now in favour of explicit config tree configuration).
Diffstat (limited to 'scripts/build/config')
-rwxr-xr-xscripts/build/config12
1 files changed, 1 insertions, 11 deletions
diff --git a/scripts/build/config b/scripts/build/config
index 3e8a646eb..19a95930a 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -105,7 +105,6 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--net-cow-server IP|HOSTNAME]\n\
\t [--net-tarball true|false]\n\
\t [--quiet]\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\
@@ -139,7 +138,7 @@ Local_arguments ()
parent-mirror-binary-security:,parent-mirror-debian-installer:,
mirror-bootstrap:,mirror-chroot:,mirror-chroot-security:,mirror-binary:,
mirror-binary-security:,mirror-debian-installer:,
- archives:,archive-areas:,parent-archive-areas:,chroot-filesystem:,exposed-root:,
+ 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:,
apt-indices:,bootappend-install:,bootappend-live:,bootappend-live-failsafe:,bootloader:,checksums:,compression:,config:,zsync:,build-with-chroot:,
@@ -424,11 +423,6 @@ Local_arguments ()
shift 2
;;
- --archives)
- LB_ARCHIVES="${2}"
- shift 2
- ;;
-
--archive-areas)
LIVE_IMAGE_ARCHIVE_AREAS="${2}"
shift 2
@@ -1105,10 +1099,6 @@ LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY}"
# (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_BOOTSTRAP_QEMU_ARCHITECTURES: architectures to use foreign bootstrap
# (Default: ${LB_BOOTSTRAP_QEMU_ARCHITECTURES})
LB_BOOTSTRAP_QEMU_ARCHITECTURES="${LB_BOOTSTRAP_QEMU_ARCHITECTURES}"