summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2014-08-27 01:04:06 +0200
committerDaniel Baumann <mail@daniel-baumann.ch>2014-08-27 01:04:06 +0200
commitc699485f27c21f9e8c88ace5a1bb77308e24ed4a (patch)
tree3efa350039a114719fe04b7aa7eef01479b303f5
parenta5e456979b47b6e9c550e892b406558d98050e40 (diff)
downloadvyos-live-build-debian/2.0.12-2.tar.gz
vyos-live-build-debian/2.0.12-2.zip
Enabling squeeze-lts repository.debian/2.0.12-2
-rwxr-xr-xfunctions/defaults.sh10
-rwxr-xr-xscripts/build/lb_chroot_sources20
-rwxr-xr-xscripts/build/lb_config12
3 files changed, 41 insertions, 1 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 6f8c26faf..e317a2cc9 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -800,6 +800,16 @@ Set_defaults ()
LB_SECURITY="${LB_SECURITY:-true}"
+ case "${LB_DISTRIBUTION}" in
+ squeeze)
+ LB_LTS="${LB_LTS:-true}"
+ ;;
+
+ *)
+ LB_LTS="${LB_LTS:-false}"
+ ;;
+ esac
+
# Setting volatile updates option
if [ "${LB_MIRROR_CHROOT_VOLATILE}" = "none" ] || [ "${LB_MIRROR_BINARY_VOLATILE}" = "none" ]
then
diff --git a/scripts/build/lb_chroot_sources b/scripts/build/lb_chroot_sources
index 2bb05ec60..bb63d73f1 100755
--- a/scripts/build/lb_chroot_sources
+++ b/scripts/build/lb_chroot_sources
@@ -84,6 +84,16 @@ EOF
esac
fi
+ if [ "${LB_LTS}" = "true" ]
+ then
+ echo "deb ${LB_MIRROR_CHROOT} ${LB_DISTRIBUTION}-lts ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+
+ if [ "${LB_SOURCE}" = "true" ]
+ then
+ echo "deb-src ${LB_MIRROR_CHROOT} ${LB_DISTRIBUTION}-lts ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ fi
+ fi
+
if [ "${LB_VOLATILE}" = "true" ]
then
case "${LB_MODE}" in
@@ -538,6 +548,16 @@ EOF
esac
fi
+ if [ "${LB_LTS}" = "true" ]
+ then
+ echo "deb ${LB_MIRROR_BINARY} ${LB_DISTRIBUTION}-lts ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+
+ if [ "${LB_SOURCE}" = "true" ]
+ then
+ echo "deb-src ${LB_MIRROR_BINARY} ${LB_DISTRIBUTION}-lts ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+ fi
+ fi
+
if [ "${LB_VOLATILE}" = "true" ]
then
case "${LB_MODE}" in
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index ac6beb0f3..1747589e2 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -119,6 +119,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--use-fakeroot true|false]\n\
\t [--archive-areas ARCHIVE_AREA|\"ARCHIVE_AREAS\"]\n\
\t [--security true|false]\n\
+\t [--lts true|false]\n\
\t [--source true|false]\n\
\t [-s|--source-images iso|net|tar|usb-hdd]\n\
\t [--symlinks true|false]\n\
@@ -147,7 +148,7 @@ Local_arguments ()
distribution:,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:,chroot-filesystem:,exposed-root:,virtual-root-size:,
gzip-options:,hooks:,interactive:,keyring-packages:,language:,linux-flavours:,linux-packages:,
- packages:,packages-lists:,tasks:,security:,volatile:,backports:,symlinks:,sysvinit:,binary-filesystem:,binary-images:,
+ packages:,packages-lists:,tasks:,security:,lts:,volatile:,backports:,symlinks:,sysvinit:,binary-filesystem:,binary-images:,
binary-indices:,bootappend-install:,bootappend-live:,bootloader:,checksums:,build-with-chroot:,
debian-installer:,debian-installer-distribution:,debian-installer-preseedfile:,debian-installer-gui:,
encryption:,grub-splash:,hostname:,isohybrid-options:,iso-application:,iso-preparer:,iso-publisher:,
@@ -517,6 +518,11 @@ Local_arguments ()
shift 2
;;
+ --lts)
+ LB_LTS="${2}"
+ shift 2
+ ;;
+
--volatile)
LB_VOLATILE="${2}"
shift 2
@@ -1119,6 +1125,10 @@ LB_TASKS="${LB_TASKS}"
# (Default: ${LB_SECURITY})
LB_SECURITY="${LB_SECURITY}"
+# \$LB_LTS: enable lts updates
+# (Default: ${LB_LTS})
+LB_LTS="${LB_LTS}"
+
# \$LB_VOLATILE: enable volatile updates
# (Default: ${LB_VOLATILE})
LB_VOLATILE="${LB_VOLATILE}"