Commit 279a149d authored by Daniel Baumann's avatar Daniel Baumann
Browse files

Dropping automagics for ubuntu.

Future live-build versions will still allow to use casper,
but its configuration will be done differently by a custom
config tree, rather than embedded and maintenance intensive
code in live-build itself.
parent f93e83e3
maverick
\ No newline at end of file
netcfg
ethdetect
pcmcia-cs-udeb
wireless-tools-udeb
netcfg
ethdetect
pcmcia-cs-udeb
wireless-tools-udeb
netcfg
ethdetect
pcmcia-cs-udeb
wireless-tools-udeb
netcfg
ethdetect
pcmcia-cs-udeb
wireless-tools-udeb
choose-mirror
netcfg
ethdetect
pcmcia-cs-udeb
wireless-tools-udeb
netcfg
ethdetect
pcmcia-cs-udeb
wireless-tools-udeb
netcfg
ethdetect
pcmcia-cs-udeb
wireless-tools-udeb
netcfg
ethdetect
pcmcia-cs-udeb
wireless-tools-udeb
netcfg
ethdetect
pcmcia-cs-udeb
wireless-tools-udeb
choose-mirror
netcfg
ethdetect
wireless-tools-udeb
netcfg
ethdetect
pcmcia-cs-udeb
wireless-tools-udeb
netcfg
ethdetect
pcmcia-cs-udeb
wireless-tools-udeb
......@@ -58,10 +58,6 @@ New_configuration ()
LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-main contrib non-free}"
;;
ubuntu)
LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-main restricted}"
;;
*)
LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-main}"
;;
......@@ -96,13 +92,13 @@ Set_defaults ()
# Setting system type
LB_SYSTEM="${LB_SYSTEM:-live}"
# Setting mode (currently: debian, progress-linux, and ubuntu)
# Setting mode (currently: debian, progress-linux)
if [ -x /usr/bin/lsb_release ]
then
_DISTRIBUTOR="$(lsb_release -is | tr "[A-Z]" "[a-z]")"
case "${_DISTRIBUTOR}" in
debian|progress-linux|ubuntu)
debian|progress-linux)
LB_MODE="${LB_MODE:-${_DISTRIBUTOR}}"
;;
......@@ -114,9 +110,6 @@ Set_defaults ()
if [ -e /etc/progress-linux_version ]
then
LB_MODE="${LB_MODE:-progress-linux}"
elif [ -e /etc/ubuntu_version ]
then
LB_MODE="${LB_MODE:-ubuntu}"
else
LB_MODE="${LB_MODE:-debian}"
fi
......@@ -130,11 +123,6 @@ Set_defaults ()
LB_DERIVATIVE_IS_BASED_ON="debian"
;;
ubuntu)
LB_DISTRIBUTION="${LB_DISTRIBUTION:-quantal}"
LB_DERIVATIVE="false"
;;
*)
LB_DISTRIBUTION="${LB_DISTRIBUTION:-stretch}"
LB_DERIVATIVE="false"
......@@ -246,14 +234,6 @@ Set_defaults ()
# Setting initsystem
case "${LB_MODE}" in
ubuntu)
case "${LB_INITRAMFS}" in
live-boot)
LB_INITSYSTEM="${LB_INITSYSTEM:-upstart}"
;;
esac
;;
progress-linux)
case "${LB_DISTRIBUTION}" in
cairon*)
......@@ -354,20 +334,6 @@ Set_defaults ()
LB_PARENT_MIRROR_BOOTSTRAP="${LB_PARENT_MIRROR_BOOTSTRAP:-http://ftp.debian.org/debian/}"
LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://cdn.archive.progress-linux.org/packages/}"
;;
ubuntu)
case "${LB_ARCHITECTURES}" in
amd64|i386)
LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://archive.ubuntu.com/ubuntu/}"
;;
*)
LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://ports.ubuntu.com/ubuntu-ports/}"
;;
esac
LB_PARENT_MIRROR_BOOTSTRAP="${LB_PARENT_MIRROR_BOOTSTRAP:-${LB_MIRROR_BOOTSTRAP}}"
;;
esac
LB_PARENT_MIRROR_CHROOT="${LB_PARENT_MIRROR_CHROOT:-${LB_PARENT_MIRROR_BOOTSTRAP}}"
......@@ -384,20 +350,6 @@ Set_defaults ()
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}}"
;;
ubuntu)
case "${LB_ARCHITECTURES}" in
amd64|i386)
LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY:-http://security.ubuntu.com/ubuntu/}"
;;
*)
LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY:-http://ports.ubuntu.com/ubuntu-ports/}"
;;
esac
LB_PARENT_MIRROR_CHROOT_SECURITY="${LB_PARENT_MIRROR_CHROOT_SECURITY:-${LB_MIRROR_CHROOT_SECURITY}}"
;;
esac
# Setting mirror which ends up in the image
......@@ -411,20 +363,6 @@ Set_defaults ()
LB_PARENT_MIRROR_BINARY="${LB_PARENT_MIRROR_BINARY:-http://ftp.debian.org/debian/}"
LB_MIRROR_BINARY="${LB_MIRROR_BINARY:-${LB_MIRROR_CHROOT}}"
;;
ubuntu)
case "${LB_ARCHITECTURES}" in
amd64|i386)
LB_MIRROR_BINARY="${LB_MIRROR_BINARY:-http://archive.ubuntu.com/ubuntu/}"
;;
*)
LB_MIRROR_BINARY="${LB_MIRROR_BINARY:-http://ports.ubuntu.com/ubuntu-ports/}"
;;
esac
LB_PARENT_MIRROR_BINARY="${LB_PARENT_MIRROR_BINARY:-${LB_MIRROR_BINARY}}"
;;
esac
# Setting security mirror which ends up in the image
......@@ -438,20 +376,6 @@ Set_defaults ()
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}}"
;;
ubuntu)
case "${LB_ARCHITECTURES}" in
amd64|i386)
LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY:-http://security.ubuntu.com/ubuntu/}"
;;
*)
LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY:-http://ports.ubuntu.com/ubuntu-ports/}"
;;
esac
LB_PARENT_MIRROR_BINARY_SECURITY="${LB_PARENT_MIRROR_BINARY_SECURITY:-${LB_MIRROR_BINARY_SECURITY}}"
;;
esac
case "${LB_MODE}" in
......@@ -478,67 +402,28 @@ Set_defaults ()
LB_INTERACTIVE="${LB_INTERACTIVE:-false}"
# Setting keyring packages
case "${LB_MODE}" in
ubuntu)
LB_KEYRING_PACKAGES="${LB_KEYRING_PACKAGES:-ubuntu-keyring}"
;;
*)
LB_KEYRING_PACKAGES="${LB_KEYRING_PACKAGES:-debian-archive-keyring}"
;;
esac
LB_KEYRING_PACKAGES="${LB_KEYRING_PACKAGES:-debian-archive-keyring}"
# Setting linux flavour string
case "${LB_ARCHITECTURES}" in
arm64)
case "${LB_MODE}" in
ubuntu)
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic}"
;;
*)
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-arm64}"
;;
esac
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-arm64}"
;;
armel)
case "${LB_MODE}" in
ubuntu)
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-omap}"
;;
*)
# armel will have special images: one rootfs image and many additional kernel images.
# therefore we default to all available armel flavours
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-ixp4xx kirkwood orion5x versatile}"
;;
esac
# armel will have special images: one rootfs image and many additional kernel images.
# therefore we default to all available armel flavours
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-ixp4xx kirkwood orion5x versatile}"
;;
armhf)
case "${LB_MODE}" in
ubuntu)
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic}"
;;
*)
# armhf will have special images: one rootfs image and many additional kernel images.
# therefore we default to all available armhf flavours
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-armmp armmp-lpae}"
;;
esac
# armhf will have special images: one rootfs image and many additional kernel images.
# therefore we default to all available armhf flavours
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-armmp armmp-lpae}"
;;
amd64)
case "${LB_MODE}" in
ubuntu)
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic}"
;;
*)
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-amd64}"
;;
esac
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-amd64}"
;;
i386)
......@@ -547,18 +432,6 @@ Set_defaults ()
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-686-pae}"
;;
ubuntu)
case "${LB_DISTRIBUTION}" in
precise)
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic-pae}"
;;
*)
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic}"
;;
esac
;;
*)
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-586}"
;;
......@@ -585,10 +458,6 @@ Set_defaults ()
exit 1
;;
ubuntu)
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-powerpc-smp powerpc64-smp e500 powerpc-e500mc}"
;;
*)
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-powerpc64 powerpc}"
;;
......@@ -597,7 +466,7 @@ Set_defaults ()
s390x)
case "${LB_MODE}" in
progress-linux|ubuntu)
progress-linux)
Echo_error "Architecture ${LB_ARCHITECTURES} not supported in the ${LB_MODE} mode."
exit 1
;;
......@@ -615,15 +484,7 @@ Set_defaults ()
esac
# Set linux packages
case "${LB_MODE}" in
ubuntu)
LB_LINUX_PACKAGES="${LB_LINUX_PACKAGES:-linux}"
;;
*)
LB_LINUX_PACKAGES="${LB_LINUX_PACKAGES:-linux-image}"
;;
esac
LB_LINUX_PACKAGES="${LB_LINUX_PACKAGES:-linux-image}"
# Setting security updates option
case "${LB_PARENT_DISTRIBUTION}" in
......@@ -757,20 +618,7 @@ Set_defaults ()
;;
hdd*)
case "${LB_MODE}" in
ubuntu)
if [ "${LB_DEBIAN_INSTALLER}" = "live" ]
then
_LB_BOOTAPPEND_PRESEED="file=/cdrom/install/${LB_DEBIAN_INSTALLER_PRESEEDFILE}"
else
_LB_BOOTAPPEND_PRESEED="file=/hd-media/install/${LB_DEBIAN_INSTALLER_PRESEEDFILE}"
fi
;;
*)
_LB_BOOTAPPEND_PRESEED="file=/hd-media/install/${LB_DEBIAN_INSTALLER_PRESEEDFILE}"
;;
esac
_LB_BOOTAPPEND_PRESEED="file=/hd-media/install/${LB_DEBIAN_INSTALLER_PRESEEDFILE}"
;;
netboot)
......@@ -806,10 +654,6 @@ Set_defaults ()
progress-linux)
LB_ISO_APPLICATION="${LB_ISO_APPLICATION:-Progress Linux}"
;;
ubuntu)
LB_ISO_APPLICATION="${LB_ISO_APPLICATION:-Ubuntu Live}"
;;
esac
# Set iso preparer
......@@ -835,10 +679,6 @@ Set_defaults ()
progress-linux)
LB_HDD_LABEL="${LB_HDD_LABEL:-PROGRESS_$(echo ${LB_DISTRIBUTION} | tr "[a-z]" "[A-Z]")}"
;;
ubuntu)
LB_HDD_LABEL="${LB_HDD_LABEL:-UBUNTU}"
;;
esac
# Setting hdd size
......@@ -853,10 +693,6 @@ Set_defaults ()
progress-linux)
LB_ISO_VOLUME="${LB_ISO_VOLUME:-Progress ${LB_DISTRIBUTION}}"
;;
ubuntu)
LB_ISO_VOLUME="${LB_ISO_VOLUME:-Ubuntu ${LB_DISTRIBUTION} \$(date +%Y%m%d-%H:%M)}"
;;
esac
# Setting memtest option
......@@ -864,7 +700,7 @@ Set_defaults ()
# Setting loadlin option
case "${LB_MODE}" in
progress-linux|ubuntu)
progress-linux)
;;
......@@ -888,7 +724,7 @@ Set_defaults ()
# Setting win32-loader option
case "${LB_MODE}" in
progress-linux|ubuntu)
progress-linux)
;;
......@@ -934,17 +770,8 @@ Set_defaults ()
LB_NET_TARBALL="${LB_NET_TARBALL:-true}"
# Setting firmware option
case "${LB_MODE}" in
ubuntu)
LB_FIRMWARE_CHROOT="${LB_FIRMWARE_CHROOT:-false}"
LB_FIRMWARE_BINARY="${LB_FIRMWARE_BINARY:-false}"
;;
*)
LB_FIRMWARE_CHROOT="${LB_FIRMWARE_CHROOT:-true}"
LB_FIRMWARE_BINARY="${LB_FIRMWARE_BINARY:-true}"
;;
esac
LB_FIRMWARE_CHROOT="${LB_FIRMWARE_CHROOT:-true}"
LB_FIRMWARE_BINARY="${LB_FIRMWARE_BINARY:-true}"
# Setting swap file
LB_SWAP_FILE_SIZE="${LB_SWAP_FILE_SIZE:-512}"
......
......@@ -16,9 +16,3 @@ RELEASE_sid="unstable"
# Progress Linux releases
RELEASE_baureo="2"
RELEASE_cairon="3"
# Ubuntu releases
RELEASE_lucid="10.04" # LTS: 2015-04-01
RELEASE_precise="12.04" # LTS: 2017-04-01
RELEASE_quantal="12.10" # 2014-04-01
RELEASE_raring="13.04" # 2014-10-01
......@@ -60,12 +60,6 @@ case "${LB_MODE}" in
TRACE="project/trace/ftp-master.debian.org"
;;
ubuntu)
TITLE="Ubuntu"
STRING="Build ${ARCHITECTURE}"
TRACE=""
;;
progress-linux)
TITLE="Progress Linux"
STRING="${VERSION} (${DISTRIBUTION}) - ${ARCHITECTURE}"
......
......@@ -137,11 +137,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
# Move image
mv chroot/filesystem.${LB_CHROOT_FILESYSTEM} binary/${INITFS}
case "${LB_MODE}" in
ubuntu)
du -B 1 -s chroot/chroot | cut -f1 > binary/${INITFS}/filesystem.size
;;
esac
du -B 1 -s chroot/chroot | cut -f1 > binary/${INITFS}/filesystem.size
if [ -e chroot/chroot.cache ]
then
......@@ -348,10 +344,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
esac
fi
if [ "${LB_MODE}" != "ubuntu" ]
then
MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -comp xz"
fi
MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -comp xz"
case "${LB_BUILD_WITH_CHROOT}" in
true)
......@@ -367,11 +360,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
rm -f chroot/chroot/excludes
case "${LB_MODE}" in
ubuntu)
du -B 1 -s chroot/chroot | cut -f1 > binary/${INITFS}/filesystem.size
;;
esac
du -B 1 -s chroot/chroot | cut -f1 > binary/${INITFS}/filesystem.size
# Move image
mv chroot/filesystem.squashfs binary/${INITFS}
......@@ -432,11 +421,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
mksquashfs chroot binary/${INITFS}/filesystem.squashfs ${MKSQUASHFS_OPTIONS}
case "${LB_MODE}" in
ubuntu)
du -B 1 -s chroot | cut -f1 > binary/${INITFS}/filesystem.size
;;
esac
du -B 1 -s chroot | cut -f1 > binary/${INITFS}/filesystem.size
;;
esac
......
......@@ -48,10 +48,6 @@ case "${LB_MODE}" in
RUN_LABEL="Run Progress Linux"
;;
ubuntu)
RUN_LABEL="Run Ubuntu"
;;
*)
RUN_LABEL="Run Debian GNU/Linux"
;;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment