summaryrefslogtreecommitdiff
path: root/scripts/build
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/build')
-rwxr-xr-xscripts/build/lb_binary4
-rwxr-xr-xscripts/build/lb_binary_rootfs12
-rwxr-xr-xscripts/build/lb_chroot4
-rwxr-xr-xscripts/build/lb_chroot_archives (renamed from scripts/build/lb_chroot_sources)36
-rwxr-xr-xscripts/build/lb_config2
-rwxr-xr-xscripts/build/lb_source4
6 files changed, 31 insertions, 31 deletions
diff --git a/scripts/build/lb_binary b/scripts/build/lb_binary
index 738363dd8..157d50694 100755
--- a/scripts/build/lb_binary
+++ b/scripts/build/lb_binary
@@ -50,7 +50,7 @@ then
lb chroot_sysv-rc install ${*}
lb chroot_upstart install ${*}
lb chroot_apt install-binary ${*}
- lb chroot_sources install ${*}
+ lb chroot_archives install ${*}
fi
# Building root filesystem
@@ -92,7 +92,7 @@ lb binary_virtual-hdd ${*}
if [ "${LB_BUILD_WITH_CHROOT}" = "true" ]
then
# Deconfiguring chroot
- rm -f .stage/chroot_sources
+ rm -f .stage/chroot_archives
lb chroot_apt remove ${*}
lb chroot_upstart remove ${*}
lb chroot_sysv-rc remove ${*}
diff --git a/scripts/build/lb_binary_rootfs b/scripts/build/lb_binary_rootfs
index 754a7c25f..663f21212 100755
--- a/scripts/build/lb_binary_rootfs
+++ b/scripts/build/lb_binary_rootfs
@@ -145,7 +145,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
rm -f .lock
mv chroot/chroot chroot.tmp
- lb chroot_sources remove ${*}
+ lb chroot_archives remove ${*}
lb chroot_apt remove ${*}
lb chroot_hostname remove ${*}
lb chroot_resolv remove ${*}
@@ -174,7 +174,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
lb chroot_resolv install ${*}
lb chroot_hostname install ${*}
lb chroot_apt install ${*}
- lb chroot_sources install ${*}
+ lb chroot_archives install ${*}
touch .lock
else
@@ -235,7 +235,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
rm -f .lock
mv chroot/chroot chroot.tmp
- lb chroot_sources remove ${*}
+ lb chroot_archives remove ${*}
lb chroot_apt remove ${*}
lb chroot_hostname remove ${*}
lb chroot_resolv remove ${*}
@@ -264,7 +264,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
lb chroot_resolv install ${*}
lb chroot_hostname install ${*}
lb chroot_apt install ${*}
- lb chroot_sources install ${*}
+ lb chroot_archives install ${*}
touch .lock
else
@@ -380,7 +380,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
rm -f .lock
mv chroot/chroot chroot.tmp
- lb chroot_sources remove ${*}
+ lb chroot_archives remove ${*}
lb chroot_apt remove ${*}
lb chroot_hostname remove ${*}
lb chroot_resolv remove ${*}
@@ -409,7 +409,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
lb chroot_resolv install ${*}
lb chroot_hostname install ${*}
lb chroot_apt install ${*}
- lb chroot_sources install ${*}
+ lb chroot_archives install ${*}
touch .lock
else
diff --git a/scripts/build/lb_chroot b/scripts/build/lb_chroot
index d015c0425..b7c27139e 100755
--- a/scripts/build/lb_chroot
+++ b/scripts/build/lb_chroot
@@ -49,7 +49,7 @@ lb chroot_hosts install ${*}
lb chroot_resolv install ${*}
lb chroot_hostname install ${*}
lb chroot_apt install ${*}
-lb chroot_sources install ${*}
+lb chroot_archives install ${*}
# Customizing chroot
lb chroot_linux-image ${*}
@@ -80,7 +80,7 @@ lb chroot_interactive ${*}
Chroot chroot "dpkg-query -W" > binary.packages.live
# Deconfiguring chroot
-lb chroot_sources remove ${*}
+lb chroot_archives remove ${*}
lb chroot_apt remove ${*}
lb chroot_hostname remove ${*}
lb chroot_resolv remove ${*}
diff --git a/scripts/build/lb_chroot_sources b/scripts/build/lb_chroot_archives
index 352f3e9f9..a07c17be0 100755
--- a/scripts/build/lb_chroot_sources
+++ b/scripts/build/lb_chroot_archives
@@ -34,7 +34,7 @@ case "${1}" in
Echo_message "Configuring file /etc/apt/sources.list"
# Checking stage file
- Check_stagefile .stage/chroot_sources
+ Check_stagefile .stage/chroot_archives
# Checking lock file
Check_lockfile .lock
@@ -199,19 +199,19 @@ EOF
fi
# Check local sources.list
- if Find_files config/chroot_sources/*.chroot
+ if Find_files config/chroot_archives/*.chroot
then
# Deconfigure (possibly) old sources.list snipplets
- if Find_files config/chroot_sources/*.binary
+ if Find_files config/chroot_archives/*.binary
then
- for FILE in config/chroot_sources/*.binary
+ for FILE in config/chroot_archives/*.binary
do
rm -f "chroot/etc/apt/sources.list.d/$(basename ${FILE} .binary).list"
done
fi
# Configure new sources.list snipplets
- for FILE in config/chroot_sources/*.chroot
+ for FILE in config/chroot_archives/*.chroot
do
cp "${FILE}" "chroot/etc/apt/sources.list.d/$(basename ${FILE} .chroot).list"
done
@@ -467,9 +467,9 @@ EOF
fi
else # Get fresh indices
# Check local gpg keys
- if Find_files config/chroot_sources/*.chroot.gpg
+ if Find_files config/chroot_archives/*.chroot.gpg
then
- for FILE in config/chroot_sources/*.chroot.gpg
+ for FILE in config/chroot_archives/*.chroot.gpg
do
cp ${FILE} chroot/root
Chroot chroot "apt-key add /root/$(basename ${FILE})"
@@ -478,9 +478,9 @@ EOF
fi
# Check local keyring packages
- if Find_files config/chroot_sources/*.deb
+ if Find_files config/chroot_archives/*.deb
then
- for PACKAGE in config/chroot_sources/*.deb
+ for PACKAGE in config/chroot_archives/*.deb
do
cp ${PACKAGE} chroot/root
Chroot chroot "dpkg -i /root/$(basename ${PACKAGE})"
@@ -550,7 +550,7 @@ EOF
Save_cache cache/packages_chroot
# Creating stage file
- Create_stagefile .stage/chroot_sources
+ Create_stagefile .stage/chroot_archives
;;
remove)
@@ -569,7 +569,7 @@ EOF
[ ! -d chroot/root/local-packages ]
then
# Removing stage file
- rm -f .stage/chroot_sources
+ rm -f .stage/chroot_archives
exit 0
fi
@@ -779,28 +779,28 @@ EOF
fi
# Check local sources.list
- if Find_files config/chroot_sources/*.binary
+ if Find_files config/chroot_archives/*.binary
then
# Deconfigure (possibly) old sources.list snipplets
- if Find_files config/chroot_sources/*.chroot
+ if Find_files config/chroot_archives/*.chroot
then
- for FILE in config/chroot_sources/*.chroot
+ for FILE in config/chroot_archives/*.chroot
do
rm -f "chroot/etc/apt/sources.list.d/$(basename ${FILE} .chroot).list"
done
fi
# Configure new sources.list snipplets
- for FILE in config/chroot_sources/*.binary
+ for FILE in config/chroot_archives/*.binary
do
cp "${FILE}" "chroot/etc/apt/sources.list.d/$(basename ${FILE} .binary).list"
done
fi
# Check local gpg keys
- if Find_files config/chroot_sources/*.binary.gpg
+ if Find_files config/chroot_archives/*.binary.gpg
then
- for FILE in config/chroot_sources/*.binary.gpg
+ for FILE in config/chroot_archives/*.binary.gpg
do
cp ${FILE} chroot/root
Chroot chroot "apt-key add /root/$(basename ${FILE})"
@@ -833,7 +833,7 @@ EOF
fi
# Removing stage file
- rm -f .stage/chroot_sources
+ rm -f .stage/chroot_archives
;;
*)
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index f4148a59e..076fe0145 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -1149,6 +1149,7 @@ EOF
# Creating lb_chroot_* configuration
mkdir -p config/chroot_apt
+mkdir -p config/chroot_archives
mkdir -p config/chroot_local-hooks
mkdir -p config/chroot_local-includes
mkdir -p config/chroot_local-patches
@@ -1156,7 +1157,6 @@ mkdir -p config/chroot_local-packages
mkdir -p config/chroot_local-packagelists
mkdir -p config/chroot_local-preseed
mkdir -p config/chroot_local-tasklists
-mkdir -p config/chroot_sources
cat > config/chroot << EOF
# config/chroot - options for live-build(7), chroot stage
diff --git a/scripts/build/lb_source b/scripts/build/lb_source
index 92826d74b..627d046d7 100755
--- a/scripts/build/lb_source
+++ b/scripts/build/lb_source
@@ -40,7 +40,7 @@ Setup_cleanup
lb chroot_hosts install ${*}
lb chroot_resolv install ${*}
lb chroot_hostname install ${*}
-lb chroot_sources install ${*}
+lb chroot_archives install ${*}
# Preparing images
lb source_debian-live ${*}
@@ -56,7 +56,7 @@ lb source_usb ${*}
lb source_virtual-hdd ${*}
# Deconfiguring chroot
-rm -f .stage/chroot_sources
+rm -f .stage/chroot_archives
lb chroot_hostname remove ${*}
lb chroot_resolv remove ${*}
lb chroot_hosts remove ${*}
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-21 21:21:18 +0000