summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2011-06-11 11:37:37 +0200
committerDaniel Baumann <daniel@debian.org>2011-06-11 11:37:37 +0200
commitb3ad2f412a5b37c172fc44ecd8982ef30e14205c (patch)
tree8bc7d847683bfd60fbc395966b5003291a881d3e /scripts
parentcf8f6cee930a2f1a19415a3ba8ca395310162c42 (diff)
downloadvyos-live-build-b3ad2f412a5b37c172fc44ecd8982ef30e14205c.tar.gz
vyos-live-build-b3ad2f412a5b37c172fc44ecd8982ef30e14205c.zip
Dropping handling of --packages in order to simply things handle packages scheduled for installation through package lists only.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build/lb_chroot1
-rwxr-xr-xscripts/build/lb_chroot_packages47
-rwxr-xr-xscripts/build/lb_config12
3 files changed, 1 insertions, 59 deletions
diff --git a/scripts/build/lb_chroot b/scripts/build/lb_chroot
index 8e5753522..5b880a26c 100755
--- a/scripts/build/lb_chroot
+++ b/scripts/build/lb_chroot
@@ -57,7 +57,6 @@ lb chroot_preseed ${*}
lb chroot_local-preseed ${*}
lb chroot_packagelists ${*}
lb chroot_local-packagelists ${*}
-lb chroot_packages ${*}
lb chroot_local-packages ${*}
lb chroot_install-packages ${*}
lb chroot_tasks ${*}
diff --git a/scripts/build/lb_chroot_packages b/scripts/build/lb_chroot_packages
deleted file mode 100755
index 174a9aab5..000000000
--- a/scripts/build/lb_chroot_packages
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-
-## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org>
-##
-## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-## This is free software, and you are welcome to redistribute it
-## under certain conditions; see COPYING for details.
-
-
-set -e
-
-# Including common functions
-. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'queue install of packages into chroot')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-Echo_message "Begin queueing installation of packages..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_packages
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if [ -n "${LB_PACKAGES}" ] && [ "${LB_PACKAGES}" != "none" ]
-then
- echo ${LB_PACKAGES} >> chroot/root/chroot_packages
-
- # Creating stage file
- Create_stagefile .stage/chroot_packages
-fi
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index ecab5a0f9..300b091cf 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -123,7 +123,6 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--net-cow-server IP|HOSTNAME]\n\
\t [--net-tarball true|false]\n\
\t [-p|--package-lists LIST|\"LISTS\"]\n\
-\t [--packages PACKAGE|\"PACKAGES\"]\n\
\t [--quiet]\n\
\t [-r|--repositories REPOSITORY|\"REPOSITORIES\"]\n\
\t [--root-command sudo]\n\
@@ -158,7 +157,7 @@ Local_arguments ()
mirror-binary-security:,mirror-binary-volatile:,mirror-binary-backports:,mirror-debian-installer:,
archive-areas:,parent-archive-areas:,chroot-filesystem:,exposed-root:,virtual-root-size:,
gzip-options:,hooks:,interactive:,keyring-packages:,language:,linux-flavours:,linux-packages:,
- packages:,package-lists:,tasks:,security:,volatile:,backports:,binary-filesystem:,binary-images:,
+ package-lists:,tasks:,security:,volatile:,backports:,binary-filesystem:,binary-images:,
apt-indices:,bootappend-install:,bootappend-live:,bootloader:,checksums:,compression:,build-with-chroot:,
debian-installer:,debian-installer-distribution:,debian-installer-preseedfile:,debian-installer-gui:,
grub-splash:,hostname:,isohybrid-options:,iso-application:,iso-preparer:,iso-publisher:,
@@ -556,11 +555,6 @@ Local_arguments ()
shift 2
;;
- --packages)
- LB_PACKAGES="${2}"
- shift 2
- ;;
-
-p|--package-lists)
LB_PACKAGE_LISTS="${2}"
shift 2
@@ -1190,10 +1184,6 @@ LB_LINUX_PACKAGES="${LB_LINUX_PACKAGES}"
# (Default: empty)
LB_REPOSITORIES="${LB_REPOSITORIES}"
-# \$LB_PACKAGES: set packages to install
-# (Default: empty)
-LB_PACKAGES="${LB_PACKAGES}"
-
# \$LB_PACKAGE_LISTS: set package list to install
# (Default: ${LB_PACKAGE_LISTS})
LB_PACKAGE_LISTS="${LB_PACKAGE_LISTS}"