JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

Exchange EOL Ubuntu Disco with Ubuntu Focal 20.04 LTS (development)

Browse Source
This commit is contained in:
Igor Pecovnik
2019-12-12 15:51:42 +01:00
parent da8cfe78c0
commit 6e54a48778
8 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/build-all-ng.sh
View File

@@ -277,7 +277,7 @@ function build_all()
IFS=',' read -a RELBRANCH <<< $KERNEL_TARGET
for BRANCH in "${RELBRANCH[@]}"
do
RELTARGETS=(xenial stretch buster bionic disco eoan)
RELTARGETS=(xenial stretch buster bionic eoan focal)
for RELEASE in "${RELTARGETS[@]}"
do
display_alert "BSP for ${BOARD} ${BRANCH} ${RELEASE}."

10
lib/chroot-buildpackages.sh
View File

@@ -30,18 +30,18 @@ create_chroot()
apt_mirror['buster']="$DEBIAN_MIRROR"
apt_mirror['xenial']="$UBUNTU_MIRROR"
apt_mirror['bionic']="$UBUNTU_MIRROR"
apt_mirror['disco']="$UBUNTU_MIRROR"
apt_mirror['focal']="$UBUNTU_MIRROR"
apt_mirror['eoan']="$UBUNTU_MIRROR"
components['stretch']='main,contrib'
components['buster']='main,contrib'
components['xenial']='main,universe,multiverse'
components['bionic']='main,universe,multiverse'
components['disco']='main,universe,multiverse'
components['focal']='main,universe,multiverse'
components['eoan']='main,universe,multiverse'
display_alert "Creating build chroot" "$release/$arch" "info"
local includes="ccache,locales,git,ca-certificates,devscripts,libfile-fcntllock-perl,debhelper,rsync,python3,distcc"
# perhaps a temporally workaround
[[ $release == buster || $release == disco || $release == eoan ]] && includes=$includes",perl-openssl-defaults,libnet-ssleay-perl"
[[ $release == buster || $release == focal || $release == eoan ]] && includes=$includes",perl-openssl-defaults,libnet-ssleay-perl"
if [[ $NO_APT_CACHER != yes ]]; then
local mirror_addr="http://localhost:3142/${apt_mirror[$release]}"
else
@@ -93,7 +93,7 @@ chroot_prepare_distccd()
gcc_version['buster']='8.3'
gcc_version['xenial']='5.4'
gcc_version['bionic']='5.4'
gcc_version['disco']='8.3'
gcc_version['focal']='8.3'
gcc_version['eoan']='9.2'
gcc_type['armhf']='arm-linux-gnueabihf-'
gcc_type['arm64']='aarch64-linux-gnu-'
@@ -127,7 +127,7 @@ chroot_build_packages()
target_arch="$ARCH"
else
# only make packages for recent releases. There are no changes on older
target_release="stretch bionic buster disco eoan"
target_release="stretch bionic buster focal eoan"
target_arch="armhf arm64"
fi

4
lib/configuration.sh
View File

@@ -122,7 +122,7 @@ BOOTCONFIG_VAR_NAME=BOOTCONFIG_${BRANCH^^}
[[ -z $ATFPATCHDIR ]] && ATFPATCHDIR="atf-$LINUXFAMILY"
[[ -z $KERNELPATCHDIR ]] && KERNELPATCHDIR="$LINUXFAMILY-$BRANCH"
if [[ $RELEASE == xenial || $RELEASE == bionic || $RELEASE == disco || $RELEASE == eoan ]]; then
if [[ $RELEASE == xenial || $RELEASE == bionic || $RELEASE == focal || $RELEASE == eoan ]]; then
DISTRIBUTION="Ubuntu"
else
DISTRIBUTION="Debian"
@@ -221,7 +221,7 @@ case $RELEASE in
PACKAGE_LIST_DESKTOP_RECOMMENDS+=" chromium system-config-printer-common system-config-printer"
;;
disco)
focal)
DEBOOTSTRAP_COMPONENTS="main,universe"
DEBOOTSTRAP_LIST+=" rng-tools"
[[ -z $BUILD_MINIMAL || $BUILD_MINIMAL == no ]] && PACKAGE_LIST_RELEASE="man-db kbd net-tools gnupg2 dirmngr networkd-dispatcher"

2
lib/debootstrap.sh
View File

@@ -301,7 +301,7 @@ prepare_partitions()
# parttype[nfs] is empty
# metadata_csum and 64bit may need to be disabled explicitly when migrating to newer supported host OS releases
if [[ $(lsb_release -sc) =~ bionic|buster|cosmic|disco|eoan ]]; then
if [[ $(lsb_release -sc) =~ bionic|buster|cosmic|eoan|focal ]]; then
mkopts[ext4]='-q -m 2 -O ^64bit,^metadata_csum'
elif [[ $(lsb_release -sc) == xenial ]]; then
mkopts[ext4]='-q -m 2'

2
lib/desktop.sh
View File

@@ -90,7 +90,7 @@ create_desktop_package ()
# using different icon pack. Workaround due to this bug https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=867779
if [[ ${RELEASE} == bionic || ${RELEASE} == stretch || ${RELEASE} == buster || ${RELEASE} == disco || ${RELEASE} == eoan ]]; then
if [[ ${RELEASE} == bionic || ${RELEASE} == stretch || ${RELEASE} == buster || ${RELEASE} == focal || ${RELEASE} == eoan ]]; then
sed -i 's/<property name="IconThemeName" type="string" value=".*$/<property name="IconThemeName" type="string" value="Humanity-Dark"\/>/g' \
"${destination}"/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
fi

3
lib/distributions.sh
View File

@@ -425,13 +425,12 @@ install_distribution_specific()
# remove doubled uname from motd
[[ -f $SDCARD/etc/update-motd.d/10-uname ]] && rm "${SDCARD}"/etc/update-motd.d/10-uname
# rc.local is not existing but one might need it
install_rclocal
;;
bionic|disco|eoan)
bionic|eoan|focal)
# remove doubled uname from motd
[[ -f $SDCARD/etc/update-motd.d/10-uname ]] && rm "${SDCARD}"/etc/update-motd.d/10-uname

12
lib/general.sh
View File

@@ -123,7 +123,7 @@ get_package_list_hash()
# create_sources_list <release> <basedir>
#
# <release>: stretch|buster|xenial|bionic|disco|eoan
# <release>: stretch|buster|xenial|bionic|eoan|focal
# <basedir>: path to root directory
#
create_sources_list()
@@ -149,7 +149,7 @@ create_sources_list()
EOF
;;
xenial|bionic|disco|eoan)
xenial|bionic|eoan|focal)
cat <<-EOF > $basedir/etc/apt/sources.list
deb http://${UBUNTU_MIRROR} $release main restricted universe multiverse
#deb-src http://${UBUNTU_MIRROR} $release main restricted universe multiverse
@@ -454,7 +454,7 @@ addtorepo()
# parameter "delete" remove incoming directory if publishing is succesful
# function: cycle trough distributions
local distributions=("xenial" "stretch" "bionic" "buster" "disco" "eoan")
local distributions=("xenial" "stretch" "bionic" "buster" "eoan" "focal")
local errors=0
for release in "${distributions[@]}"; do
@@ -565,7 +565,7 @@ addtorepo()
repo-manipulate() {
local DISTROS=("xenial" "stretch" "bionic" "buster" "disco" "eoan")
local DISTROS=("xenial" "stretch" "bionic" "buster" "eoan" "focal")
case $@ in
serve)
# display repository content
@@ -710,7 +710,7 @@ prepare_host()
#
# NO_HOST_RELEASE_CHECK overrides the check for a supported host system
# Disable host OS check at your own risk, any issues reported with unsupported releases will be closed without a discussion
if [[ -z $codename || "xenial bionic disco eoan" != *"$codename"* ]]; then
if [[ -z $codename || "xenial bionic eoan focal" != *"$codename"* ]]; then
if [[ $NO_HOST_RELEASE_CHECK == yes ]]; then
display_alert "You are running on an unsupported system" "${codename:-(unknown)}" "wrn"
display_alert "Do not report any errors, warnings or other issues encountered beyond this point" "" "wrn"
@@ -723,7 +723,7 @@ prepare_host()
exit_with_error "Windows subsystem for Linux is not a supported build environment"
fi
if [[ -z $codename || "disco" == "$codename" || "eoan" == "$codename" ]]; then
if [[ -z $codename || "focal" == "$codename" || "eoan" == "$codename" ]]; then
hostdeps="${hostdeps/lib32ncurses5 lib32tinfo5/lib32ncurses6 lib32tinfo6}"
fi

6
lib/main.sh
View File

@@ -280,8 +280,8 @@ distro_name['xenial']="Ubuntu Xenial 16.04 LTS"
distro_support['xenial']="eos"
distro_name['bionic']="Ubuntu Bionic 18.04 LTS"
distro_support['bionic']="supported"
distro_name['disco']="Ubuntu Disco 19.04"
distro_support['disco']="csc"
distro_name['focal']="Ubuntu Focal 20.04 LTS"
distro_support['focal']="csc"
distro_name['eoan']="Ubuntu Eoan 19.10"
distro_support['eoan']="csc"
@@ -293,8 +293,8 @@ if [[ $KERNEL_ONLY != yes && -z $RELEASE ]]; then
distro_menu "buster"
distro_menu "xenial"
distro_menu "bionic"
distro_menu "disco"
distro_menu "eoan"
distro_menu "focal"
RELEASE=$(dialog --stdout --title "Choose a release" --backtitle "$backtitle" \
--menu "Select the target OS release package base" $TTY_Y $TTY_X $((TTY_Y - 8)) "${options[@]}")