strip progress-linux distro hacks
progress-linux, as discussed in MR #142 ([1]) is a little known distro, which appears to be little more than a personal project of the original author of live-build. given that, the expense of maintaining all of these old hacks for it cannot be justified. it is not known whether or not live-build is even used with respect to it since the author abandoned live-build some years ago. also, at least one past change in live-build possibly broke progress-linux compatibility anyway, which would have required progress-linux users of live-build to use a custom progress-linux config, or a progress-linux fork of live-build, and there is no knowing how much of the hacks in this "upstream" codebase any user of progress-linux currently relies upon. and again, progress-linux appears to just be a personal project of Daniel's, with afaik very little userbase. (Daniel seems to be the only developer working on the project which speaks to how small it is). [1]: https://salsa.debian.org/live-team/live-build/-/merge_requests/142 Gbp-Dch: Short
This commit is contained in:
Lyndon Brown
Luca Boccassi
parent
d6a80d3d4d
commit
945a166f75
|
|
@ -53,17 +53,7 @@ New_configuration ()
|
|||
|
||||
# Image: Archive Areas
|
||||
LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-$(Get_configuration config/build Archive-Areas)}"
|
||||
|
||||
case "${LB_MODE}" in
|
||||
progress-linux)
|
||||
LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-main contrib non-free}"
|
||||
;;
|
||||
|
||||
*)
|
||||
LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-main}"
|
||||
;;
|
||||
esac
|
||||
|
||||
LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-main}"
|
||||
export LB_ARCHIVE_AREAS
|
||||
|
||||
# Image: Archive Areas
|
||||
|
|
@ -87,14 +77,14 @@ Set_config_defaults ()
|
|||
# Setting system type
|
||||
LB_SYSTEM="${LB_SYSTEM:-live}"
|
||||
|
||||
# Setting mode (currently: debian, progress-linux)
|
||||
# Setting mode (currently: debian)
|
||||
if [ $(which lsb_release) ]
|
||||
then
|
||||
local _DISTRIBUTOR
|
||||
_DISTRIBUTOR="$(lsb_release -is | tr "[A-Z]" "[a-z]")"
|
||||
|
||||
case "${_DISTRIBUTOR}" in
|
||||
debian|progress-linux)
|
||||
debian)
|
||||
LB_MODE="${LB_MODE:-${_DISTRIBUTOR}}"
|
||||
;;
|
||||
|
||||
|
|
@ -103,50 +93,16 @@ Set_config_defaults ()
|
|||
;;
|
||||
esac
|
||||
else
|
||||
if [ -e /etc/progress-linux_version ]
|
||||
then
|
||||
LB_MODE="${LB_MODE:-progress-linux}"
|
||||
else
|
||||
LB_MODE="${LB_MODE:-debian}"
|
||||
fi
|
||||
LB_MODE="${LB_MODE:-debian}"
|
||||
fi
|
||||
|
||||
# Setting distribution name
|
||||
case "${LB_MODE}" in
|
||||
progress-linux)
|
||||
LB_DISTRIBUTION="${LB_DISTRIBUTION:-cairon}"
|
||||
LB_DERIVATIVE="true"
|
||||
LB_DERIVATIVE_IS_BASED_ON="debian"
|
||||
;;
|
||||
|
||||
*)
|
||||
LB_DISTRIBUTION="${LB_DISTRIBUTION:-buster}"
|
||||
LB_DERIVATIVE="false"
|
||||
;;
|
||||
esac
|
||||
LB_DERIVATIVE="false"
|
||||
LB_DISTRIBUTION="${LB_DISTRIBUTION:-buster}"
|
||||
LB_DISTRIBUTION_CHROOT="${LB_DISTRIBUTION_CHROOT:-${LB_DISTRIBUTION}}"
|
||||
LB_DISTRIBUTION_BINARY="${LB_DISTRIBUTION_BINARY:-${LB_DISTRIBUTION_CHROOT}}"
|
||||
|
||||
|
||||
case "${LB_MODE}" in
|
||||
progress-linux)
|
||||
case "${LB_DISTRIBUTION}" in
|
||||
baureo|baureo-backports)
|
||||
LB_PARENT_DISTRIBUTION="${LB_PARENT_DISTRIBUTION:-wheezy}"
|
||||
;;
|
||||
|
||||
cairon|cairon-backports)
|
||||
LB_PARENT_DISTRIBUTION="${LB_PARENT_DISTRIBUTION:-sid}"
|
||||
;;
|
||||
esac
|
||||
|
||||
LB_BACKPORTS="${LB_BACKPORTS:-true}"
|
||||
;;
|
||||
|
||||
*)
|
||||
LB_BACKPORTS="${LB_BACKPORTS:-false}"
|
||||
;;
|
||||
esac
|
||||
LB_BACKPORTS="${LB_BACKPORTS:-false}"
|
||||
if [ -n "$LB_PARENT_DISTRIBUTION" ]; then
|
||||
LB_PARENT_DISTRIBUTION_CHROOT="${LB_PARENT_DISTRIBUTION_CHROOT:-${LB_PARENT_DISTRIBUTION}}"
|
||||
LB_PARENT_DISTRIBUTION_BINARY="${LB_PARENT_DISTRIBUTION_BINARY:-${LB_PARENT_DISTRIBUTION}}"
|
||||
|
|
@ -186,30 +142,10 @@ Set_config_defaults ()
|
|||
|
||||
XZ_OPTIONS="${XZ_OPTIONS:--6}"
|
||||
|
||||
# Setting apt recommends
|
||||
case "${LB_MODE}" in
|
||||
progress-linux)
|
||||
LB_APT_RECOMMENDS="${LB_APT_RECOMMENDS:-false}"
|
||||
;;
|
||||
|
||||
*)
|
||||
LB_APT_RECOMMENDS="${LB_APT_RECOMMENDS:-true}"
|
||||
;;
|
||||
esac
|
||||
|
||||
# Setting apt secure
|
||||
# Setting apt settings
|
||||
LB_APT_RECOMMENDS="${LB_APT_RECOMMENDS:-true}"
|
||||
LB_APT_SECURE="${LB_APT_SECURE:-true}"
|
||||
|
||||
# Setting apt source
|
||||
case "${LB_MODE}" in
|
||||
progress-linux)
|
||||
LB_APT_SOURCE_ARCHIVES="${LB_APT_SOURCE_ARCHIVES:-false}"
|
||||
;;
|
||||
|
||||
*)
|
||||
LB_APT_SOURCE_ARCHIVES="${LB_APT_SOURCE_ARCHIVES:-true}"
|
||||
;;
|
||||
esac
|
||||
LB_APT_SOURCE_ARCHIVES="${LB_APT_SOURCE_ARCHIVES:-true}"
|
||||
|
||||
# Setting cache option
|
||||
LB_CACHE="${LB_CACHE:-true}"
|
||||
|
|
@ -242,29 +178,13 @@ Set_config_defaults ()
|
|||
LB_INITRAMFS_COMPRESSION="${LB_INITRAMFS_COMPRESSION:-gzip}"
|
||||
|
||||
# Setting initsystem
|
||||
case "${LB_MODE}" in
|
||||
progress-linux)
|
||||
case "${LB_DISTRIBUTION}" in
|
||||
cairon*)
|
||||
LB_INITSYSTEM="${LB_INITSYSTEM:-systemd}"
|
||||
;;
|
||||
|
||||
*)
|
||||
LB_INITSYSTEM="${LB_INITSYSTEM:-sysvinit}"
|
||||
;;
|
||||
esac
|
||||
case "${LB_SYSTEM}" in
|
||||
live)
|
||||
LB_INITSYSTEM="${LB_INITSYSTEM:-systemd}"
|
||||
;;
|
||||
|
||||
*)
|
||||
case "${LB_SYSTEM}" in
|
||||
live)
|
||||
LB_INITSYSTEM="${LB_INITSYSTEM:-systemd}"
|
||||
;;
|
||||
|
||||
normal)
|
||||
LB_INITSYSTEM="${LB_INITSYSTEM:-none}"
|
||||
;;
|
||||
esac
|
||||
normal)
|
||||
LB_INITSYSTEM="${LB_INITSYSTEM:-none}"
|
||||
;;
|
||||
esac
|
||||
|
||||
|
|
@ -308,11 +228,6 @@ Set_config_defaults ()
|
|||
LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://deb.debian.org/debian/}"
|
||||
LB_PARENT_MIRROR_BOOTSTRAP="${LB_PARENT_MIRROR_BOOTSTRAP:-${LB_MIRROR_BOOTSTRAP}}"
|
||||
;;
|
||||
|
||||
progress-linux)
|
||||
LB_PARENT_MIRROR_BOOTSTRAP="${LB_PARENT_MIRROR_BOOTSTRAP:-http://deb.debian.org/debian/}"
|
||||
LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://cdn.archive.progress-linux.org/packages/}"
|
||||
;;
|
||||
esac
|
||||
|
||||
LB_PARENT_MIRROR_CHROOT="${LB_PARENT_MIRROR_CHROOT:-${LB_PARENT_MIRROR_BOOTSTRAP}}"
|
||||
|
|
@ -324,11 +239,6 @@ Set_config_defaults ()
|
|||
LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY:-http://security.debian.org/}"
|
||||
LB_PARENT_MIRROR_CHROOT_SECURITY="${LB_PARENT_MIRROR_CHROOT_SECURITY:-${LB_MIRROR_CHROOT_SECURITY}}"
|
||||
;;
|
||||
|
||||
progress-linux)
|
||||
LB_PARENT_MIRROR_CHROOT_SECURITY="${LB_PARENT_MIRROR_CHROOT_SECURITY:-http://security.debian.org/}"
|
||||
LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY:-${LB_MIRROR_CHROOT}}"
|
||||
;;
|
||||
esac
|
||||
|
||||
# Setting mirror which ends up in the image
|
||||
|
|
@ -337,11 +247,6 @@ Set_config_defaults ()
|
|||
LB_MIRROR_BINARY="${LB_MIRROR_BINARY:-http://deb.debian.org/debian/}"
|
||||
LB_PARENT_MIRROR_BINARY="${LB_PARENT_MIRROR_BINARY:-${LB_MIRROR_BINARY}}"
|
||||
;;
|
||||
|
||||
progress-linux)
|
||||
LB_PARENT_MIRROR_BINARY="${LB_PARENT_MIRROR_BINARY:-http://deb.debian.org/debian/}"
|
||||
LB_MIRROR_BINARY="${LB_MIRROR_BINARY:-${LB_MIRROR_CHROOT}}"
|
||||
;;
|
||||
esac
|
||||
|
||||
# Setting security mirror which ends up in the image
|
||||
|
|
@ -350,24 +255,10 @@ Set_config_defaults ()
|
|||
LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY:-http://security.debian.org/}"
|
||||
LB_PARENT_MIRROR_BINARY_SECURITY="${LB_PARENT_MIRROR_BINARY_SECURITY:-${LB_MIRROR_BINARY_SECURITY}}"
|
||||
;;
|
||||
|
||||
progress-linux)
|
||||
LB_PARENT_MIRROR_BINARY_SECURITY="${LB_PARENT_MIRROR_BINARY_SECURITY:-http://security.debian.org/}"
|
||||
LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY:-${LB_MIRROR_CHROOT}}"
|
||||
;;
|
||||
esac
|
||||
|
||||
case "${LB_MODE}" in
|
||||
progress-linux)
|
||||
LB_PARENT_MIRROR_DEBIAN_INSTALLER="${LB_PARENT_MIRROR_DEBIAN_INSTALLER:-${LB_MIRROR_CHROOT}}"
|
||||
LB_MIRROR_DEBIAN_INSTALLER="${LB_MIRROR_DEBIAN_INSTALLER:-${LB_MIRROR_CHROOT}}"
|
||||
;;
|
||||
|
||||
*)
|
||||
LB_MIRROR_DEBIAN_INSTALLER="${LB_MIRROR_DEBIAN_INSTALLER:-${LB_MIRROR_CHROOT}}"
|
||||
LB_PARENT_MIRROR_DEBIAN_INSTALLER="${LB_PARENT_MIRROR_DEBIAN_INSTALLER:-${LB_PARENT_MIRROR_CHROOT}}"
|
||||
;;
|
||||
esac
|
||||
LB_MIRROR_DEBIAN_INSTALLER="${LB_MIRROR_DEBIAN_INSTALLER:-${LB_MIRROR_CHROOT}}"
|
||||
LB_PARENT_MIRROR_DEBIAN_INSTALLER="${LB_PARENT_MIRROR_DEBIAN_INSTALLER:-${LB_PARENT_MIRROR_CHROOT}}"
|
||||
|
||||
## config/chroot
|
||||
|
||||
|
|
@ -410,42 +301,15 @@ Set_config_defaults ()
|
|||
;;
|
||||
|
||||
ia64)
|
||||
case "${LB_MODE}" in
|
||||
progress-linux)
|
||||
Echo_error "Architecture ${LB_ARCHITECTURES} not supported in the ${LB_MODE} mode."
|
||||
exit 1
|
||||
;;
|
||||
|
||||
*)
|
||||
LB_LINUX_FLAVOURS_WITH_ARCH="${LB_LINUX_FLAVOURS_WITH_ARCH:-itanium}"
|
||||
;;
|
||||
esac
|
||||
LB_LINUX_FLAVOURS_WITH_ARCH="${LB_LINUX_FLAVOURS_WITH_ARCH:-itanium}"
|
||||
;;
|
||||
|
||||
powerpc)
|
||||
case "${LB_MODE}" in
|
||||
progress-linux)
|
||||
Echo_error "Architecture ${LB_ARCHITECTURES} not supported in the ${LB_MODE} mode."
|
||||
exit 1
|
||||
;;
|
||||
|
||||
*)
|
||||
LB_LINUX_FLAVOURS_WITH_ARCH="${LB_LINUX_FLAVOURS_WITH_ARCH:-powerpc64 powerpc}"
|
||||
;;
|
||||
esac
|
||||
LB_LINUX_FLAVOURS_WITH_ARCH="${LB_LINUX_FLAVOURS_WITH_ARCH:-powerpc64 powerpc}"
|
||||
;;
|
||||
|
||||
s390x)
|
||||
case "${LB_MODE}" in
|
||||
progress-linux)
|
||||
Echo_error "Architecture ${LB_ARCHITECTURES} not supported in the ${LB_MODE} mode."
|
||||
exit 1
|
||||
;;
|
||||
|
||||
*)
|
||||
LB_LINUX_FLAVOURS_WITH_ARCH="${LB_LINUX_FLAVOURS_WITH_ARCH:-s390x}"
|
||||
;;
|
||||
esac
|
||||
LB_LINUX_FLAVOURS_WITH_ARCH="${LB_LINUX_FLAVOURS_WITH_ARCH:-s390x}"
|
||||
;;
|
||||
|
||||
*)
|
||||
|
|
@ -504,15 +368,7 @@ Set_config_defaults ()
|
|||
esac
|
||||
|
||||
# Setting apt indices
|
||||
case "${LB_MODE}" in
|
||||
progress-linux)
|
||||
LB_APT_INDICES="${LB_APT_INDICES:-false}"
|
||||
;;
|
||||
|
||||
*)
|
||||
LB_APT_INDICES="${LB_APT_INDICES:-true}"
|
||||
;;
|
||||
esac
|
||||
LB_APT_INDICES="${LB_APT_INDICES:-true}"
|
||||
|
||||
# Setting bootloader
|
||||
if [ -z "${LB_BOOTLOADERS}" ]
|
||||
|
|
@ -564,7 +420,7 @@ Set_config_defaults ()
|
|||
|
||||
# Setting debian-installer-gui
|
||||
case "${LB_MODE}" in
|
||||
debian|progress-linux)
|
||||
debian)
|
||||
LB_DEBIAN_INSTALLER_GUI="${LB_DEBIAN_INSTALLER_GUI:-true}"
|
||||
;;
|
||||
|
||||
|
|
@ -638,35 +494,19 @@ Set_config_defaults ()
|
|||
debian)
|
||||
LB_ISO_APPLICATION="${LB_ISO_APPLICATION:-Debian Live}"
|
||||
;;
|
||||
|
||||
progress-linux)
|
||||
LB_ISO_APPLICATION="${LB_ISO_APPLICATION:-Progress Linux}"
|
||||
;;
|
||||
esac
|
||||
|
||||
# Set iso preparer
|
||||
LB_ISO_PREPARER="${LB_ISO_PREPARER:-live-build \$VERSION; https://salsa.debian.org/live-team/live-build}"
|
||||
|
||||
# Set iso publisher
|
||||
case "${LB_MODE}" in
|
||||
progress-linux)
|
||||
LB_ISO_PUBLISHER="${LB_ISO_PUBLISHER:-Progress Linux; http://www.progress-linux.org/; progress-project@lists.progress-linux.org}"
|
||||
;;
|
||||
|
||||
*)
|
||||
LB_ISO_PUBLISHER="${LB_ISO_PUBLISHER:-Debian Live project; https://wiki.debian.org/DebianLive; debian-live@lists.debian.org}"
|
||||
;;
|
||||
esac
|
||||
LB_ISO_PUBLISHER="${LB_ISO_PUBLISHER:-Debian Live project; https://wiki.debian.org/DebianLive; debian-live@lists.debian.org}"
|
||||
|
||||
# Setting hdd options
|
||||
case "${LB_MODE}" in
|
||||
debian)
|
||||
LB_HDD_LABEL="${LB_HDD_LABEL:-DEBIAN_LIVE}"
|
||||
;;
|
||||
|
||||
progress-linux)
|
||||
LB_HDD_LABEL="${LB_HDD_LABEL:-PROGRESS_$(echo ${LB_DISTRIBUTION} | tr "[a-z]" "[A-Z]")}"
|
||||
;;
|
||||
esac
|
||||
|
||||
# Setting hdd size
|
||||
|
|
@ -677,10 +517,6 @@ Set_config_defaults ()
|
|||
debian)
|
||||
LB_ISO_VOLUME="${LB_ISO_VOLUME:-Debian ${LB_DISTRIBUTION} \$(date +%Y%m%d-%H:%M)}"
|
||||
;;
|
||||
|
||||
progress-linux)
|
||||
LB_ISO_VOLUME="${LB_ISO_VOLUME:-Progress ${LB_DISTRIBUTION}}"
|
||||
;;
|
||||
esac
|
||||
|
||||
# Setting memtest option
|
||||
|
|
@ -690,50 +526,34 @@ Set_config_defaults ()
|
|||
fi
|
||||
|
||||
# Setting loadlin option
|
||||
case "${LB_MODE}" in
|
||||
progress-linux)
|
||||
|
||||
case "${LB_ARCHITECTURES}" in
|
||||
amd64|i386)
|
||||
if [ "${LB_DEBIAN_INSTALLER}" != "none" ]
|
||||
then
|
||||
LB_LOADLIN="${LB_LOADLIN:-true}"
|
||||
else
|
||||
LB_LOADLIN="${LB_LOADLIN:-false}"
|
||||
fi
|
||||
;;
|
||||
|
||||
*)
|
||||
case "${LB_ARCHITECTURES}" in
|
||||
amd64|i386)
|
||||
if [ "${LB_DEBIAN_INSTALLER}" != "none" ]
|
||||
then
|
||||
LB_LOADLIN="${LB_LOADLIN:-true}"
|
||||
else
|
||||
LB_LOADLIN="${LB_LOADLIN:-false}"
|
||||
fi
|
||||
;;
|
||||
|
||||
*)
|
||||
LB_LOADLIN="${LB_LOADLIN:-false}"
|
||||
;;
|
||||
esac
|
||||
LB_LOADLIN="${LB_LOADLIN:-false}"
|
||||
;;
|
||||
esac
|
||||
|
||||
# Setting win32-loader option
|
||||
case "${LB_MODE}" in
|
||||
progress-linux)
|
||||
|
||||
case "${LB_ARCHITECTURES}" in
|
||||
amd64|i386)
|
||||
if [ "${LB_DEBIAN_INSTALLER}" != "none" ]
|
||||
then
|
||||
LB_WIN32_LOADER="${LB_WIN32_LOADER:-true}"
|
||||
else
|
||||
LB_WIN32_LOADER="${LB_WIN32_LOADER:-false}"
|
||||
fi
|
||||
;;
|
||||
|
||||
*)
|
||||
case "${LB_ARCHITECTURES}" in
|
||||
amd64|i386)
|
||||
if [ "${LB_DEBIAN_INSTALLER}" != "none" ]
|
||||
then
|
||||
LB_WIN32_LOADER="${LB_WIN32_LOADER:-true}"
|
||||
else
|
||||
LB_WIN32_LOADER="${LB_WIN32_LOADER:-false}"
|
||||
fi
|
||||
;;
|
||||
|
||||
*)
|
||||
LB_WIN32_LOADER="${LB_WIN32_LOADER:-false}"
|
||||
;;
|
||||
esac
|
||||
LB_WIN32_LOADER="${LB_WIN32_LOADER:-false}"
|
||||
;;
|
||||
esac
|
||||
|
||||
|
|
@ -741,15 +561,7 @@ Set_config_defaults ()
|
|||
LB_NET_ROOT_FILESYSTEM="${LB_NET_ROOT_FILESYSTEM:-nfs}"
|
||||
|
||||
# Setting netboot server path
|
||||
case "${LB_MODE}" in
|
||||
progress-linux)
|
||||
LB_NET_ROOT_PATH="${LB_NET_ROOT_PATH:-/srv/progress-linux}"
|
||||
;;
|
||||
|
||||
*)
|
||||
LB_NET_ROOT_PATH="${LB_NET_ROOT_PATH:-/srv/${LB_MODE}-live}"
|
||||
;;
|
||||
esac
|
||||
LB_NET_ROOT_PATH="${LB_NET_ROOT_PATH:-/srv/${LB_MODE}-live}"
|
||||
|
||||
# Setting netboot server address
|
||||
LB_NET_ROOT_SERVER="${LB_NET_ROOT_SERVER:-192.168.1.1}"
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@ Create_apt_sources_list ()
|
|||
# Set security repo
|
||||
if [ "${LB_SECURITY}" = "true" ]; then
|
||||
case "${LB_MODE}" in
|
||||
debian|progress-linux)
|
||||
debian)
|
||||
case "${PARENT_DISTRIBUTION}" in
|
||||
sid)
|
||||
# do nothing
|
||||
|
|
@ -87,14 +87,9 @@ Create_apt_sources_list ()
|
|||
;;
|
||||
esac
|
||||
|
||||
if [ "${LB_MODE}" = progress-linux ]; then
|
||||
echo "deb ${MIRROR_SECURITY} ${_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> "${LIST_FILE}"
|
||||
echo "deb-src ${MIRROR_SECURITY} ${_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> "${LIST_FILE}"
|
||||
else
|
||||
if [ "${LB_DERIVATIVE}" = "true" ]; then
|
||||
echo "deb ${MIRROR_SECURITY} ${_DISTRIBUTION}/updates ${LB_ARCHIVE_AREAS}" >> "${LIST_FILE}"
|
||||
echo "deb-src ${MIRROR_SECURITY} ${_DISTRIBUTION}/updates ${LB_ARCHIVE_AREAS}" >> "${LIST_FILE}"
|
||||
fi
|
||||
if [ "${LB_DERIVATIVE}" = "true" ]; then
|
||||
echo "deb ${MIRROR_SECURITY} ${_DISTRIBUTION}/updates ${LB_ARCHIVE_AREAS}" >> "${LIST_FILE}"
|
||||
echo "deb-src ${MIRROR_SECURITY} ${_DISTRIBUTION}/updates ${LB_ARCHIVE_AREAS}" >> "${LIST_FILE}"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
|
|
|||
|
|
@ -164,7 +164,7 @@
|
|||
.br
|
||||
[\fB\-\-mirror\-debian\-installer\fR \fIURL\fR]
|
||||
.br
|
||||
[\fB\-\-mode\fR debian|progress-linux]
|
||||
[\fB\-\-mode\fR debian]
|
||||
.br
|
||||
[\fB\-\-net\-cow\-filesystem\fR nfs|cfs]
|
||||
.br
|
||||
|
|
@ -405,7 +405,7 @@ sets the location of the debian package mirror that will be used to fetch the pa
|
|||
sets the location of the debian security package mirror that will be used to fetch the packages of the derivative in order to build the live system. By default, this points to http://security.debian.org/.
|
||||
.IP "\fB\-\-mirror\-debian\-installer\fR \fIURL\fR" 4
|
||||
sets the location of the mirror that will be used to fetch the debian installer images of the derivative. By default, this points to the same mirror used to build the live system, i.e. the value of \-\-mirror\-chroot.
|
||||
.IP "\fB\-\-mode\fR debian|progress-linux" 4
|
||||
.IP "\fB\-\-mode\fR debian" 4
|
||||
defines a global mode to load project specific defaults. By default this is set to debian.
|
||||
.IP "\fB\-\-net\-cow\-filesystem\fR nfs|cfs" 4
|
||||
defines the filesystem type for the copy\-on\-write layer and defaults to nfs.
|
||||
|
|
|
|||
|
|
@ -37,15 +37,7 @@ Acquire_lockfile
|
|||
|
||||
for CHECKSUM in ${LB_CHECKSUMS}
|
||||
do
|
||||
case "${LB_MODE}" in
|
||||
progress-linux)
|
||||
CHECKSUMS="$(echo ${CHECKSUM} | tr [a-z] [A-Z])SUMS"
|
||||
;;
|
||||
|
||||
*)
|
||||
CHECKSUMS="${CHECKSUM}sum.txt"
|
||||
;;
|
||||
esac
|
||||
CHECKSUMS="${CHECKSUM}sum.txt"
|
||||
|
||||
Echo_message "Begin creating binary ${CHECKSUMS}..."
|
||||
|
||||
|
|
|
|||
|
|
@ -60,12 +60,6 @@ case "${LB_MODE}" in
|
|||
TRACE="project/trace/ftp-master.debian.org"
|
||||
;;
|
||||
|
||||
progress-linux)
|
||||
TITLE="Progress Linux"
|
||||
STRING="${VERSION} (${DISTRIBUTION}) - ${ARCHITECTURE}"
|
||||
TRACE="project/trace/archive-master.progress-linux.org"
|
||||
;;
|
||||
|
||||
*)
|
||||
TITLE="Debian GNU/Linux"
|
||||
STRING="Snapshot ${ARCHITECTURE}"
|
||||
|
|
|
|||
|
|
@ -133,19 +133,9 @@ do
|
|||
;;
|
||||
|
||||
syslinux)
|
||||
case "${LB_MODE}" in
|
||||
progress-linux)
|
||||
XORRISO_OPTIONS="${XORRISO_OPTIONS} -b boot/boot.bin -c boot/boot.cat"
|
||||
XORRISO_EXCLUDE="boot/boot.bin"
|
||||
;;
|
||||
|
||||
*)
|
||||
XORRISO_OPTIONS="${XORRISO_OPTIONS} -b isolinux/isolinux.bin -c isolinux/boot.cat"
|
||||
XORRISO_EXCLUDE="isolinux/isolinux.bin"
|
||||
;;
|
||||
esac
|
||||
|
||||
XORRISO_OPTIONS="${XORRISO_OPTIONS} -b isolinux/isolinux.bin -c isolinux/boot.cat"
|
||||
XORRISO_OPTIONS="${XORRISO_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
|
||||
XORRISO_EXCLUDE="isolinux/isolinux.bin"
|
||||
;;
|
||||
|
||||
grub-efi)
|
||||
|
|
|
|||
|
|
@ -32,17 +32,8 @@ Check_stagefile
|
|||
# Acquire lock file
|
||||
Acquire_lockfile
|
||||
|
||||
case "${LB_MODE}" in
|
||||
progress-linux)
|
||||
DISTS="installer/dists"
|
||||
POOL="installer/pool"
|
||||
;;
|
||||
|
||||
*)
|
||||
DISTS="dists"
|
||||
POOL="pool"
|
||||
;;
|
||||
esac
|
||||
DISTS="dists"
|
||||
POOL="pool"
|
||||
|
||||
if ls config/package-lists/*.list > /dev/null 2>&1 || \
|
||||
ls config/package-lists/*.list.binary > /dev/null 2>&1
|
||||
|
|
|
|||
|
|
@ -51,16 +51,7 @@ esac
|
|||
case "${LIVE_IMAGE_TYPE}" in
|
||||
iso*)
|
||||
_BOOTLOADER="isolinux"
|
||||
|
||||
case "${LB_MODE}" in
|
||||
progress-linux)
|
||||
_TARGET="binary/boot"
|
||||
;;
|
||||
|
||||
*)
|
||||
_TARGET="binary/isolinux"
|
||||
;;
|
||||
esac
|
||||
_TARGET="binary/isolinux"
|
||||
;;
|
||||
|
||||
netboot)
|
||||
|
|
@ -71,21 +62,12 @@ case "${LIVE_IMAGE_TYPE}" in
|
|||
hdd*|*)
|
||||
case ${LB_BINARY_FILESYSTEM} in
|
||||
fat*|ntfs)
|
||||
_BOOTLOADER=syslinux
|
||||
|
||||
case "${LB_MODE}" in
|
||||
progress-linux)
|
||||
_TARGET="binary/boot"
|
||||
;;
|
||||
|
||||
*)
|
||||
_TARGET="binary/syslinux"
|
||||
;;
|
||||
esac
|
||||
_BOOTLOADER="syslinux"
|
||||
_TARGET="binary/syslinux"
|
||||
;;
|
||||
|
||||
ext[234]|btrfs)
|
||||
_BOOTLOADER=extlinux
|
||||
_BOOTLOADER="extlinux"
|
||||
_TARGET="binary/boot/extlinux"
|
||||
;;
|
||||
*)
|
||||
|
|
@ -232,15 +214,7 @@ _LIVE_BOOT_VERSION="$(chroot chroot apt-cache policy live-boot | awk '/Installed
|
|||
_LIVE_CONFIG_VERSION="$(chroot chroot apt-cache policy live-config | awk '/Installed: / { print $2 }')"
|
||||
_LIVE_TOOLS_VERSION="$(chroot chroot apt-cache policy live-tools | awk '/Installed: / { print $2 }')"
|
||||
|
||||
case "${LB_MODE}" in
|
||||
progress-linux)
|
||||
_PROJECT="Progress Linux"
|
||||
;;
|
||||
|
||||
*)
|
||||
_PROJECT="Debian GNU/Linux"
|
||||
;;
|
||||
esac
|
||||
_PROJECT="Debian GNU/Linux"
|
||||
|
||||
for _FILE in "${_TARGET}"/*.cfg ${_TARGET}/*.svg
|
||||
do
|
||||
|
|
@ -314,18 +288,6 @@ if [ -e binary/boot/grub/live-theme/theme.txt ]; then
|
|||
binary/boot/grub/live-theme/theme.txt
|
||||
fi
|
||||
|
||||
case "${LB_MODE}" in
|
||||
progress-linux)
|
||||
for _FILE in "${_TARGET}/isolinux.bin" "${_TARGET}/isolinux.cfg" "${_TARGET}/syslinux.cfg"
|
||||
do
|
||||
if [ -e "${_FILE}" ]
|
||||
then
|
||||
mv "${_FILE}" "${_TARGET}/$(echo ${_FILE} | sed -e 's|.*linux|boot|')"
|
||||
fi
|
||||
done
|
||||
;;
|
||||
esac
|
||||
|
||||
case "${LB_BUILD_WITH_CHROOT}" in
|
||||
true)
|
||||
# Saving cache
|
||||
|
|
|
|||
|
|
@ -37,15 +37,7 @@ Check_stagefile
|
|||
# Acquire lock file
|
||||
Acquire_lockfile
|
||||
|
||||
case "${LB_MODE}" in
|
||||
progress-linux)
|
||||
RUN_LABEL="Run Progress Linux"
|
||||
;;
|
||||
|
||||
*)
|
||||
RUN_LABEL="Run Debian GNU/Linux"
|
||||
;;
|
||||
esac
|
||||
RUN_LABEL="Run Debian GNU/Linux"
|
||||
|
||||
case "${LB_ARCHITECTURES}" in
|
||||
amd64|i386)
|
||||
|
|
|
|||
|
|
@ -142,68 +142,6 @@ case "${1}" in
|
|||
esac
|
||||
fi
|
||||
|
||||
case "${LB_MODE}" in
|
||||
progress-linux)
|
||||
if [ ! -e chroot/etc/apt/preferences.d/progress-linux.pref ]
|
||||
then
|
||||
_DISTRIBUTION="$(echo ${LB_DISTRIBUTION_BINARY} | sed -e 's|-backports||')"
|
||||
|
||||
_ENABLE_DISTRIBUTIONS="${_DISTRIBUTION}"
|
||||
_DISABLE_DISTRIBUTIONS=""
|
||||
|
||||
if [ "${LB_SECURITY}" = "true" ]
|
||||
then
|
||||
_ENABLE_DISTRIBUTIONS="${_ENABLE_DISTRIBUTIONS} ${_DISTRIBUTION}-security"
|
||||
fi
|
||||
|
||||
if [ "${LB_UPDATES}" = "true" ]
|
||||
then
|
||||
_ENABLE_DISTRIBUTIONS="${_ENABLE_DISTRIBUTIONS} ${_DISTRIBUTION}-updates"
|
||||
fi
|
||||
|
||||
case "${LB_DISTRIBUTION_BINARY}" in
|
||||
*-backports)
|
||||
if [ "${LB_BACKPORTS}" = "true" ]
|
||||
then
|
||||
_ENABLE_DISTRIBUTIONS="${_ENABLE_DISTRIBUTIONS} ${_DISTRIBUTION}-backports"
|
||||
fi
|
||||
;;
|
||||
|
||||
*)
|
||||
if [ "${LB_BACKPORTS}" = "true" ]
|
||||
then
|
||||
_DISABLE_DISTRIBUTIONS="${_DISABLE_DISTRIBUTIONS} ${_DISTRIBUTION}-backports"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
for _DISTRIBUTION in ${_ENABLE_DISTRIBUTIONS}
|
||||
do
|
||||
|
||||
cat >> chroot/etc/apt/preferences.d/progress-linux.pref << EOF
|
||||
|
||||
Package: *
|
||||
Pin: release n=${_DISTRIBUTION}
|
||||
Pin-Priority: 999
|
||||
EOF
|
||||
|
||||
done
|
||||
|
||||
for _DISTRIBUTION in ${_DISABLE_DISTRIBUTIONS}
|
||||
do
|
||||
|
||||
cat >> chroot/etc/apt/preferences.d/progress-linux.pref << EOF
|
||||
|
||||
#Package: *
|
||||
#Pin: release n=${_DISTRIBUTION}
|
||||
#Pin-Priority: 999
|
||||
EOF
|
||||
|
||||
done
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
# Creating stage file
|
||||
Create_stagefile
|
||||
;;
|
||||
|
|
|
|||
|
|
@ -54,20 +54,9 @@ Check_package host /usr/bin/wget wget
|
|||
FIRMWARE_PACKAGES=""
|
||||
|
||||
# Manually add firmware-linux/non-free meta package
|
||||
if echo ${LB_PARENT_ARCHIVE_AREAS} | grep -qs "non-free"
|
||||
if [ "${LB_DERIVATIVE}" = "false" ] && echo ${LB_PARENT_ARCHIVE_AREAS} | grep -qs "non-free"
|
||||
then
|
||||
if [ "${LB_DERIVATIVE}" != "true" ]
|
||||
then
|
||||
FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux"
|
||||
else
|
||||
case "${LB_DERIVATIVE_IS_BASED_ON}" in
|
||||
debian)
|
||||
FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux"
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux"
|
||||
fi
|
||||
|
||||
Firmware_List_From_Contents "${LB_PARENT_MIRROR_CHROOT}" "${LB_PARENT_DISTRIBUTION_CHROOT}" "${LB_PARENT_ARCHIVE_AREAS}"
|
||||
|
|
|
|||
|
|
@ -95,7 +95,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
|
|||
\t [--mirror-chroot URL]\n\
|
||||
\t [--mirror-chroot-security URL]\n\
|
||||
\t [--mirror-debian-installer URL]\n\
|
||||
\t [--mode debian|progress-linux]\n\
|
||||
\t [--mode debian]\n\
|
||||
\t [--net-cow-filesystem nfs|cfs]\n\
|
||||
\t [--net-cow-mountoptions OPTIONS]\n\
|
||||
\t [--net-cow-path PATH]\n\
|
||||
|
|
|
|||
|
|
@ -263,14 +263,6 @@ case "${LB_DERIVATIVE}" in
|
|||
else
|
||||
URL="${LB_PARENT_MIRROR_DEBIAN_INSTALLER}/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURES}/current/images"
|
||||
fi
|
||||
|
||||
if [ "${LB_MODE}" = "progress-linux" ]
|
||||
then
|
||||
# FIXME: normal derivatives probably don't rebuild d-i,
|
||||
# but progress-linux does.
|
||||
URL="${LB_MIRROR_DEBIAN_INSTALLER}/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURES}/current/images"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
mkdir -p "${DESTDIR_DI}"
|
||||
|
|
@ -346,20 +338,9 @@ then
|
|||
FIRMWARE_PACKAGES=""
|
||||
|
||||
# Manually add firmware-linux/non-free meta package
|
||||
if echo ${LB_PARENT_ARCHIVE_AREAS} | grep -qs "non-free"
|
||||
if [ "${LB_DERIVATIVE}" = "false" ] && echo ${LB_PARENT_ARCHIVE_AREAS} | grep -qs "non-free"
|
||||
then
|
||||
if [ "${LB_DERIVATIVE}" != "true" ]
|
||||
then
|
||||
FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux"
|
||||
else
|
||||
case "${LB_DERIVATIVE_IS_BASED_ON}" in
|
||||
debian)
|
||||
FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux"
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux"
|
||||
fi
|
||||
|
||||
Firmware_List_From_Contents "${LB_PARENT_MIRROR_CHROOT}" "${LB_PARENT_DISTRIBUTION_CHROOT}" "${LB_PARENT_ARCHIVE_AREAS}"
|
||||
|
|
@ -857,22 +838,6 @@ then
|
|||
fi
|
||||
fi
|
||||
|
||||
case "${LB_MODE}" in
|
||||
progress-linux)
|
||||
mv binary/install binary/installer
|
||||
|
||||
rm -f binary/debian
|
||||
|
||||
for _DIRECTORY in dists pool project firmware
|
||||
do
|
||||
if [ -e "binary/${_DIRECTORY}" ]
|
||||
then
|
||||
mv binary/"${_DIRECTORY}" binary/installer
|
||||
fi
|
||||
done
|
||||
;;
|
||||
esac
|
||||
|
||||
# Saving cache
|
||||
Save_package_cache binary
|
||||
|
||||
|
|
|
|||
|
|
@ -40,15 +40,7 @@ if ls config/preseed/*.cfg > /dev/null 2>&1 || \
|
|||
ls config/preseed/*.cfg.installer > /dev/null 2>&1 || \
|
||||
ls chroot/root/packages.installer > /dev/null 2>&1
|
||||
then
|
||||
case "${LB_MODE}" in
|
||||
progress-linux)
|
||||
_DIRECTORY="binary/installer"
|
||||
;;
|
||||
|
||||
*)
|
||||
_DIRECTORY="binary/install"
|
||||
;;
|
||||
esac
|
||||
_DIRECTORY="binary/install"
|
||||
|
||||
rm -f "${_DIRECTORY}/preseed.cfg"
|
||||
|
||||
|
|
|
|||
|
|
@ -44,15 +44,7 @@ do
|
|||
|
||||
for CHECKSUM in ${LB_CHECKSUMS}
|
||||
do
|
||||
case "${LB_MODE}" in
|
||||
progress-linux)
|
||||
CHECKSUMS="$(echo ${CHECKSUM} | tr [a-z] [A-Z])SUMS"
|
||||
;;
|
||||
|
||||
*)
|
||||
CHECKSUMS="${CHECKSUM}sum.txt"
|
||||
;;
|
||||
esac
|
||||
CHECKSUMS="${CHECKSUM}sum.txt"
|
||||
|
||||
Echo_message "Begin creating source ${CHECKSUMS}..."
|
||||
|
||||
|
|
|
|||
|
|
@ -103,37 +103,6 @@ then
|
|||
echo "${LB_TASKSEL}" >> source-selection.txt
|
||||
fi
|
||||
|
||||
# apt-get source does not respect pinning
|
||||
# building images with backports included but not enabled
|
||||
# will result in apt-get source download stuff from backports
|
||||
# where available. workaround: disable backports
|
||||
case "${LB_MODE}" in
|
||||
progress-linux)
|
||||
case "${LB_DISTRIBUTION_BINARY}" in
|
||||
*-backports)
|
||||
|
||||
;;
|
||||
|
||||
*)
|
||||
if grep -qs "${LB_DISTRIBUTION_BINARY}-backports" chroot/etc/apt/sources.list.d/progress-linux.list
|
||||
then
|
||||
cp chroot/etc/apt/sources.list.d/progress-linux.list chroot/etc/apt/sources.list.d/progress-linux.list.orig
|
||||
|
||||
while read -r _LINE
|
||||
do
|
||||
if echo "${_LINE}" | grep -qs ${LB_DISTRIBUTION_BINARY}-backports
|
||||
then
|
||||
sed -i -e "s|${_LINE}|#${_LINE}|" chroot/etc/apt/sources.list.d/progress-linux.list
|
||||
fi
|
||||
done < chroot/etc/apt/sources.list.d/progress-linux.list.orig
|
||||
|
||||
Apt chroot update
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
|
||||
# Make a clean directory to download the packages to.
|
||||
# We need to set the ownership to user `_apt` to give write access to the apt user,
|
||||
# otherwise we get a lot of warnings from apt about downloading as root.
|
||||
|
|
@ -202,14 +171,6 @@ done
|
|||
|
||||
rmdir --ignore-fail-on-non-empty chroot/source.pkgs
|
||||
|
||||
# Reverting apt sources again
|
||||
if [ -e chroot/etc/apt/sources.list.d/progress-linux.list.orig ]
|
||||
then
|
||||
mv chroot/etc/apt/sources.list.d/progress-linux.list.orig chroot/etc/apt/sources.list.d/progress-linux.list
|
||||
|
||||
Apt chroot update
|
||||
fi
|
||||
|
||||
# Creating stage file
|
||||
Create_stagefile
|
||||
Create_stagefile "source"
|
||||
|
|
|
|||
|
|
@ -60,12 +60,6 @@ case "${LB_MODE}" in
|
|||
TRACE="project/trace/ftp-master.debian.org"
|
||||
;;
|
||||
|
||||
progress-linux)
|
||||
TITLE="Progress Linux"
|
||||
STRING="${VERSION} (${DISTRIBUTION}) - ${ARCHITECTURE}"
|
||||
TRACE="project/trace/archive-master.progress-linux.org"
|
||||
;;
|
||||
|
||||
*)
|
||||
TITLE="Debian GNU/Linux"
|
||||
STRING="Snapshot ${ARCHITECTURE}"
|
||||
|
|
|
|||
Loading…
Reference in New Issue