|
@@ -158,7 +158,7 @@ get_package_list_hash()
|
|
|
|
|
|
# create_sources_list <release> <basedir>
|
|
# create_sources_list <release> <basedir>
|
|
#
|
|
#
|
|
-# <release>: buster|bullseye|bookworm|bionic|focal|jammy|hirsute|sid
|
|
|
|
|
|
+# <release>: buster|bullseye|bookworm|bionic|focal|jammy|noble|hirsute|sid
|
|
# <basedir>: path to root directory
|
|
# <basedir>: path to root directory
|
|
#
|
|
#
|
|
create_sources_list()
|
|
create_sources_list()
|
|
@@ -227,7 +227,7 @@ create_sources_list()
|
|
EOF
|
|
EOF
|
|
;;
|
|
;;
|
|
|
|
|
|
- xenial|bionic|focal|hirsute|impish|jammy)
|
|
|
|
|
|
+ xenial|bionic|focal|hirsute|impish|jammy|noble)
|
|
cat <<-EOF > "${basedir}"/etc/apt/sources.list
|
|
cat <<-EOF > "${basedir}"/etc/apt/sources.list
|
|
deb http://${UBUNTU_MIRROR} $release main restricted universe multiverse
|
|
deb http://${UBUNTU_MIRROR} $release main restricted universe multiverse
|
|
#deb-src http://${UBUNTU_MIRROR} $release main restricted universe multiverse
|
|
#deb-src http://${UBUNTU_MIRROR} $release main restricted universe multiverse
|
|
@@ -874,13 +874,13 @@ function distro_menu ()
|
|
[[ -z "${DISTRIB_TYPE_LEGACY}" ]] && DISTRIB_TYPE="buster bionic focal"
|
|
[[ -z "${DISTRIB_TYPE_LEGACY}" ]] && DISTRIB_TYPE="buster bionic focal"
|
|
elif [[ "${BRANCH}" == "current" ]]; then
|
|
elif [[ "${BRANCH}" == "current" ]]; then
|
|
DISTRIB_TYPE="${DISTRIB_TYPE_CURRENT}"
|
|
DISTRIB_TYPE="${DISTRIB_TYPE_CURRENT}"
|
|
- [[ -z "${DISTRIB_TYPE_CURRENT}" ]] && DISTRIB_TYPE="bullseye bookworm focal jammy"
|
|
|
|
|
|
+ [[ -z "${DISTRIB_TYPE_CURRENT}" ]] && DISTRIB_TYPE="bullseye bookworm focal jammy noble"
|
|
elif [[ "${BRANCH}" == "next" ]]; then
|
|
elif [[ "${BRANCH}" == "next" ]]; then
|
|
if [[ -n "${DISTRIB_TYPE_NEXT}" ]]; then
|
|
if [[ -n "${DISTRIB_TYPE_NEXT}" ]]; then
|
|
DISTRIB_TYPE="${DISTRIB_TYPE_NEXT}"
|
|
DISTRIB_TYPE="${DISTRIB_TYPE_NEXT}"
|
|
else
|
|
else
|
|
DISTRIB_TYPE="${DISTRIB_TYPE_CURRENT}"
|
|
DISTRIB_TYPE="${DISTRIB_TYPE_CURRENT}"
|
|
- [[ -z "${DISTRIB_TYPE_CURRENT}" ]] && DISTRIB_TYPE="bullseye bookworm focal jammy"
|
|
|
|
|
|
+ [[ -z "${DISTRIB_TYPE_CURRENT}" ]] && DISTRIB_TYPE="bullseye bookworm focal jammy noble"
|
|
fi
|
|
fi
|
|
fi
|
|
fi
|
|
|
|
|
|
@@ -941,7 +941,7 @@ addtorepo()
|
|
# parameter "delete" remove incoming directory if publishing is succesful
|
|
# parameter "delete" remove incoming directory if publishing is succesful
|
|
# function: cycle trough distributions
|
|
# function: cycle trough distributions
|
|
|
|
|
|
- local distributions=("stretch" "bionic" "buster" "bullseye" "bookworm" "focal" "hirsute" "jammy" "sid")
|
|
|
|
|
|
+ local distributions=("stretch" "bionic" "buster" "bullseye" "bookworm" "focal" "hirsute" "jammy" "noble" "sid")
|
|
#local distributions=($(grep -rw config/distributions/*/ -e 'supported' | cut -d"/" -f3))
|
|
#local distributions=($(grep -rw config/distributions/*/ -e 'supported' | cut -d"/" -f3))
|
|
local errors=0
|
|
local errors=0
|
|
|
|
|
|
@@ -1071,7 +1071,7 @@ repo-manipulate()
|
|
# "update" search for new files in output/debs* to add them to repository
|
|
# "update" search for new files in output/debs* to add them to repository
|
|
# "purge" leave only last 5 versions
|
|
# "purge" leave only last 5 versions
|
|
|
|
|
|
- local DISTROS=("stretch" "bionic" "buster" "bullseye" "bookworm" "focal" "hirsute" "jammy" "sid")
|
|
|
|
|
|
+ local DISTROS=("stretch" "bionic" "buster" "bullseye" "bookworm" "focal" "hirsute" "jammy" "noble" "sid")
|
|
#local DISTROS=($(grep -rw config/distributions/*/ -e 'supported' | cut -d"/" -f3))
|
|
#local DISTROS=($(grep -rw config/distributions/*/ -e 'supported' | cut -d"/" -f3))
|
|
|
|
|
|
case $@ in
|
|
case $@ in
|
|
@@ -1445,7 +1445,7 @@ prepare_host()
|
|
fi
|
|
fi
|
|
|
|
|
|
# Add support for Ubuntu 20.04, 21.04 and Mint 20.x
|
|
# Add support for Ubuntu 20.04, 21.04 and Mint 20.x
|
|
- if [[ $HOSTRELEASE =~ ^(focal|hirsute|jammy|ulyana|ulyssa|bullseye|bookworm|uma)$ ]]; then
|
|
|
|
|
|
+ if [[ $HOSTRELEASE =~ ^(focal|hirsute|jammy|noble|noble|ulyana|ulyssa|bullseye|bookworm|uma)$ ]]; then
|
|
hostdeps+=" python2 python3"
|
|
hostdeps+=" python2 python3"
|
|
ln -fs /usr/bin/python2.7 /usr/bin/python2
|
|
ln -fs /usr/bin/python2.7 /usr/bin/python2
|
|
ln -fs /usr/bin/python2.7 /usr/bin/python
|
|
ln -fs /usr/bin/python2.7 /usr/bin/python
|
|
@@ -1460,7 +1460,7 @@ prepare_host()
|
|
#
|
|
#
|
|
# NO_HOST_RELEASE_CHECK overrides the check for a supported host system
|
|
# 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 discussion
|
|
# Disable host OS check at your own risk. Any issues reported with unsupported releases will be closed without discussion
|
|
- if [[ -z $HOSTRELEASE || "focal jammy" != *"$HOSTRELEASE"* ]]; then
|
|
|
|
|
|
+ if [[ -z $HOSTRELEASE || "focal jammy noble" != *"$HOSTRELEASE"* ]]; then
|
|
if [[ $NO_HOST_RELEASE_CHECK == yes ]]; then
|
|
if [[ $NO_HOST_RELEASE_CHECK == yes ]]; then
|
|
display_alert "You are running on an unsupported system" "${HOSTRELEASE:-(unknown)}" "wrn"
|
|
display_alert "You are running on an unsupported system" "${HOSTRELEASE:-(unknown)}" "wrn"
|
|
display_alert "Do not report any errors, warnings or other issues encountered beyond this point" "" "wrn"
|
|
display_alert "Do not report any errors, warnings or other issues encountered beyond this point" "" "wrn"
|
|
@@ -1913,7 +1913,7 @@ install_docker() {
|
|
buster|bullseye|bookworm)
|
|
buster|bullseye|bookworm)
|
|
distributor_id="debian"
|
|
distributor_id="debian"
|
|
;;
|
|
;;
|
|
- xenial|bionic|focal|jammy)
|
|
|
|
|
|
+ xenial|bionic|focal|jammy|noble)
|
|
distributor_id="ubuntu"
|
|
distributor_id="ubuntu"
|
|
;;
|
|
;;
|
|
esac
|
|
esac
|