summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--manpages/en.old/lb_config.14
-rwxr-xr-xscripts/build/chroot_archives131
-rwxr-xr-xscripts/build/config12
-rw-r--r--share/archives/live-systems.org.key52
-rw-r--r--share/archives/live-systems.org.list3
5 files changed, 1 insertions, 201 deletions
diff --git a/manpages/en.old/lb_config.1 b/manpages/en.old/lb_config.1
index e1cfebff0..bdb002011 100644
--- a/manpages/en.old/lb_config.1
+++ b/manpages/en.old/lb_config.1
@@ -197,8 +197,6 @@
.br
[\fB\-\-quiet\fR]
.br
- [\fB\-\-archives\fR \fIARCHIVE\fR|\fI"ARCHIVES"\fR]
-.br
[\fB\-\-archive\-areas\fR \fIARCHIVE_AREA\fR|\fI"ARCHIVE_AREAS"\fR]
.br
[\fB\-\-parent\-archive\-areas\fR \fIPARENT_ARCHIVE_AREA\fR|\fI"PARENT_ARCHIVE_AREAS"\fR]
@@ -428,8 +426,6 @@ sets the IP or hostname that will be configured in the bootloader configuration
defines if a compressed tarball should be created. Disabling this options leads to no tarball at all, the plain binary directory is considered the output in this case. Default is true.
.IP "\fB\-\-quiet\fR" 4
reduces the verbosity of messages output by \fBlb build\fR.
-.IP "\fB\-\-archives\fR \fIARCHIVE\fR|""\fIARCHIVES\fR""" 4
-enables one of available third-party archive configurations in /usr/share/live/build/archives.
.IP "\fB\-\-archive\-areas\fR \fIARCHIVE_AREA\fR|""\fIARCHIVE_AREAS\fR""" 4
defines which package archive areas of a debian packages archive should be used for configured debian package mirrors. By default, this is set to main. Remember to check the licenses of each packages with respect to their redistributability in your juristiction when enabling contrib or non\-free with this mechanism.
.IP "\fB\-\-parent\-archive\-areas\fR \fIPARENT_ARCHIVE_AREA\fR|""\fIPARENT_ARCHIVE_AREAS\fR""" 4
diff --git a/scripts/build/chroot_archives b/scripts/build/chroot_archives
index 0277819f5..6947c9dd5 100755
--- a/scripts/build/chroot_archives
+++ b/scripts/build/chroot_archives
@@ -189,78 +189,6 @@ EOF
fi
fi
- # Configure third-party archives
- if [ -n "${LB_ARCHIVES}" ]
- then
- for REPOSITORY in ${LB_ARCHIVES}
- do
- # ubuntu workaround to allow using live-systems.org
- case "${LB_MODE}" in
- ubuntu)
- if [ "${REPOSITORY}" = "live-systems.org" ]
- then
- _DISTRIBUTION="sid"
- else
- _DISTRIBUTION="${LB_PARENT_DISTRIBUTION}"
- fi
- ;;
-
- *)
- _DISTRIBUTION="${LB_PARENT_DISTRIBUTION}"
- ;;
- esac
-
- # Prefer archives from the config tree
- # over the global ones.
- if ! ls "${_BASE}/archives/${REPOSITORY}"* > /dev/null 2>&1
- then
- continue
- fi
-
- # Adding apt sources (chroot)
- for _FILE in "${_BASE}/archives/${REPOSITORY}" "${_BASE}/archives/${REPOSITORY}.chroot"
- do
- if [ -e "${_FILE}" ]
- then
- sed -e "s|@DISTRIBUTION@|${_DISTRIBUTION}|g" \
- -e "s|@PARENT_DISTRIBUTION@|${LB_PARENT_DISTRIBUTION}|g" \
- -e "s|@ARCHIVE_AREAS@|${LIVE_IMAGE_PARENT_ARCHIVE_AREAS}|g" \
- "${_FILE}" > "chroot/etc/apt/sources.list.d/${REPOSITORY}.list"
- fi
- done
-
- # Adding apt configuration (chroot)
- for _FILE in "${_BASE}/archives/${REPOSITORY}.conf" "${_BASE}/archives/${REPOSITORY}.conf.chroot"
- do
- if [ -e "${_FILE}" ]
- then
- cp "${_FILE}" "chroot/etc/apt/conf.d/${REPOSITORY}.conf"
- fi
- done
-
- # Adding apt preferences (chroot)
- for _FILE in "${_BASE}/archives/${REPOSITORY}.pref" "${_BASE}/archives/${REPOSITORY}.pref.chroot"
- do
- if [ -e "${_FILE}" ]
- then
- cp "${_FILE}" "chroot/etc/apt/preferences.d/${REPOSITORY}.pref"
- fi
- done
-
- # Adding apt keys (chroot)
- if [ "${LB_APT_SECURE}" != false ]
- then
- for _FILE in "${_BASE}/archives/${REPOSITORY}.key" "${_BASE}/archives/${REPOSITORY}.key.chroot"
- do
- if [ -e "${_FILE}" ]
- then
- cat "${_FILE}" | Chroot chroot "apt-key add -"
- fi
- done
- fi
- done
- fi
-
# Adding local apt sources (chroot)
for FILE in config/archives/*.list config/archives/*.list.chroot
do
@@ -757,65 +685,6 @@ EOF
rm -f chroot/etc/apt/conf.d/*
rm -f chroot/etc/apt/preferences.d/*
- # Configure third-party archives
- if [ -n "${LB_ARCHIVES}" ]
- then
- for REPOSITORY in ${LB_ARCHIVES}
- do
- # Removing sources.list entries (chroot)
- rm -f "chroot/etc/apt/sources.list.d/${REPOSITORY}.list"
-
- # Prefer archives from the config tree
- # over the global ones.
- if ! ls "${_BASE}/archives/${REPOSITORY}"* > /dev/null 2>&1
- then
- continue
- fi
-
- # Adding apt sources (binary)
- for _FILE in "${_BASE}/archives/${REPOSITORY}" "${_BASE}/archives/${REPOSITORY}.binary"
- do
- if [ -e "${_FILE}" ]
- then
- sed -e "s|@DISTRIBUTION@|${LB_PARENT_DISTRIBUTION}|g" \
- -e "s|@PARENT_DISTRIBUTION@|${LB_PARENT_DISTRIBUTION}|g" \
- -e "s|@ARCHIVE_AREAS@|${LIVE_IMAGE_PARENT_ARCHIVE_AREAS}|g" \
- "${_FILE}" > "chroot/etc/apt/sources.list.d/${REPOSITORY}.list"
- fi
- done
-
- # Adding apt configuration (binary)
- for _FILE in "${_BASE}/archives/${REPOSITORY}.conf" "${_BASE}/archives/${REPOSITORY}.conf.binary"
- do
- if [ -e "${_FILE}" ]
- then
- cp "${_FILE}" "chroot/etc/apt/conf.d/${REPOSITORY}.conf"
- fi
- done
-
- # Adding apt preferences (binary)
- for _FILE in "${_BASE}/archives/${REPOSITORY}.pref" "${_BASE}/archives/${REPOSITORY}.pref.binary"
- do
- if [ -e "${_FILE}" ]
- then
- cp "${_FILE}" "chroot/etc/apt/preferences.d/${REPOSITORY}.pref"
- fi
- done
-
- # Adding apt keys (binary)
- if [ "${LB_APT_SECURE}" != false ]
- then
- for _FILE in "${_BASE}/archives/${REPOSITORY}.key" "${_BASE}/archives/${REPOSITORY}.key.binary"
- do
- if [ -e "${_FILE}" ]
- then
- cat "${_FILE}" | Chroot chroot "apt-key add -"
- fi
- done
- fi
- done
- fi
-
# Adding local apt sources (binary)
for FILE in config/archives/*.list config/archives/*.list.binary
do
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}"
diff --git a/share/archives/live-systems.org.key b/share/archives/live-systems.org.key
deleted file mode 100644
index d03e3259f..000000000
--- a/share/archives/live-systems.org.key
+++ /dev/null
@@ -1,52 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.10 (GNU/Linux)
-
-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
-=d/j+
------END PGP PUBLIC KEY BLOCK-----
diff --git a/share/archives/live-systems.org.list b/share/archives/live-systems.org.list
deleted file mode 100644
index 47e5cc0c8..000000000
--- a/share/archives/live-systems.org.list
+++ /dev/null
@@ -1,3 +0,0 @@
-# Live Systems Project
-deb http://live-systems.org/ @DISTRIBUTION@-snapshots @ARCHIVE_AREAS@
-deb-src http://live-systems.org/ @DISTRIBUTION@-snapshots @ARCHIVE_AREAS@
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-10 07:45:07 +0000