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

Add next Ubuntu 23.04 / Lunar lobster (#4625)

Browse Source
This commit is contained in:
Igor Pečovnik
2022-12-30 20:59:35 +01:00
committed by GitHub
parent 6d20fa48ac
commit ff6c515e3f
13 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/cli/lunar Symbolic link
View File

@@ -0,0 +1 @@
kinetic

1
config/desktop/lunar Symbolic link
View File

@@ -0,0 +1 @@
kinetic

1
config/distributions/lunar/name Normal file
View File

@@ -0,0 +1 @@
Ubuntu lunar 23.04

1
config/distributions/lunar/support Normal file
View File

@@ -0,0 +1 @@
csc

2
config/sources/arm64.conf
View File

@@ -36,7 +36,7 @@ fi
if [ "$(uname -m)" = "aarch64" ]; then if [ "$(uname -m)" = "aarch64" ]; then
case "$(lsb_release -sc)" in case "$(lsb_release -sc)" in
"bullseye" | "focal" | "hirsute" | "impish" | "jammy") "bullseye" | "focal" | "hirsute" | "impish" | "jammy" | "lunar")
PKG_PREFIX="qemu-x86_64-static -L /usr/x86_64-linux-gnu " PKG_PREFIX="qemu-x86_64-static -L /usr/x86_64-linux-gnu "
;; ;;
*) *)

2
config/sources/families/bcm2711.conf
View File

@@ -68,7 +68,7 @@ extension_prepare_config__prepare_rpi_flash_kernel() {
display_alert "Preparing bcm2711" "${RELEASE}, distro kernel?: ${RASPI_DISTRO_KERNEL}" "info" display_alert "Preparing bcm2711" "${RELEASE}, distro kernel?: ${RASPI_DISTRO_KERNEL}" "info"
export RASPI_DISTRO_KERNEL="${RASPI_DISTRO_KERNEL:-no}" # Include a distro-built kernel? export RASPI_DISTRO_KERNEL="${RASPI_DISTRO_KERNEL:-no}" # Include a distro-built kernel?
export SERIALCON="${RASPI_SERIALCON:-tty1}" # HDMI etc, not serial. most people don't have UART on rpi export SERIALCON="${RASPI_SERIALCON:-tty1}" # HDMI etc, not serial. most people don't have UART on rpi
local usable_releases="jammy|kinetic" local usable_releases="jammy|kinetic|lunar"
if [[ "$RELEASE" =~ ^(${usable_releases})$ ]]; then if [[ "$RELEASE" =~ ^(${usable_releases})$ ]]; then
export FK__EXTRA_PACKAGES="rpi-eeprom linux-firmware linux-firmware-raspi libraspberrypi-bin cloud-initramfs-growroot" export FK__EXTRA_PACKAGES="rpi-eeprom linux-firmware linux-firmware-raspi libraspberrypi-bin cloud-initramfs-growroot"

2
lib/functions/cli/utils-cli.sh
View File

@@ -99,7 +99,7 @@ function handle_docker() {
codename=$(cat /etc/os-release | grep VERSION_CODENAME | cut -d"=" -f2) codename=$(cat /etc/os-release | grep VERSION_CODENAME | cut -d"=" -f2)
codeid=$(cat /etc/os-release | grep ^NAME | cut -d"=" -f2 | awk '{print tolower($0)}' | tr -d '"' | awk '{print $1}') codeid=$(cat /etc/os-release | grep ^NAME | cut -d"=" -f2 | awk '{print tolower($0)}' | tr -d '"' | awk '{print $1}')
[[ "${codename}" == "debbie" ]] && codename="buster" && codeid="debian" [[ "${codename}" == "debbie" ]] && codename="buster" && codeid="debian"
[[ "${codename}" == "ulyana" || "${codename}" == "jammy" || "${codename}" == "kinetic" ]] && codename="focal" && codeid="ubuntu" [[ "${codename}" == "ulyana" || "${codename}" == "jammy" || "${codename}" == "kinetic" || "${codename}" == "lunar" ]] && codename="focal" && codeid="ubuntu"
# different binaries for some. TBD. Need to check for all others # different binaries for some. TBD. Need to check for all others
[[ "${codename}" =~ focal|hirsute ]] && DOCKER_BINARY="docker containerd docker.io" [[ "${codename}" =~ focal|hirsute ]] && DOCKER_BINARY="docker containerd docker.io"

2
lib/functions/configuration/main-config.sh
View File

@@ -221,7 +221,7 @@ POST_FAMILY_CONFIG
[[ -z $ATFPATCHDIR ]] && ATFPATCHDIR="atf-$LINUXFAMILY" [[ -z $ATFPATCHDIR ]] && ATFPATCHDIR="atf-$LINUXFAMILY"
[[ -z $KERNELPATCHDIR ]] && KERNELPATCHDIR="$LINUXFAMILY-$BRANCH" [[ -z $KERNELPATCHDIR ]] && KERNELPATCHDIR="$LINUXFAMILY-$BRANCH"
if [[ "$RELEASE" =~ ^(focal|jammy|kinetic)$ ]]; then if [[ "$RELEASE" =~ ^(focal|jammy|kinetic|lunar)$ ]]; then
DISTRIBUTION="Ubuntu" DISTRIBUTION="Ubuntu"
else else
DISTRIBUTION="Debian" DISTRIBUTION="Debian"

7
lib/functions/extras/buildpkg.sh
View File

@@ -13,18 +13,20 @@ create_chroot() {
apt_mirror['focal']="$UBUNTU_MIRROR" apt_mirror['focal']="$UBUNTU_MIRROR"
apt_mirror['jammy']="$UBUNTU_MIRROR" apt_mirror['jammy']="$UBUNTU_MIRROR"
apt_mirror['kinetic']="$UBUNTU_MIRROR" apt_mirror['kinetic']="$UBUNTU_MIRROR"
apt_mirror['lunar']="$UBUNTU_MIRROR"
components['buster']='main,contrib' components['buster']='main,contrib'
components['bullseye']='main,contrib' components['bullseye']='main,contrib'
components['sid']='main,contrib' components['sid']='main,contrib'
components['focal']='main,universe,multiverse' components['focal']='main,universe,multiverse'
components['jammy']='main,universe,multiverse' components['jammy']='main,universe,multiverse'
components['lunar']='main,universe,multiverse'
components['kinetic']='main,universe,multiverse' components['kinetic']='main,universe,multiverse'
display_alert "Creating build chroot" "$release/$arch" "info" display_alert "Creating build chroot" "$release/$arch" "info"
local includes="ccache,locales,git,ca-certificates,libfile-fcntllock-perl,rsync,python3,distcc,apt-utils" local includes="ccache,locales,git,ca-certificates,libfile-fcntllock-perl,rsync,python3,distcc,apt-utils"
# perhaps a temporally workaround # perhaps a temporally workaround
case $release in case $release in
bullseye | focal | jammy | sid | kinetic) bullseye | focal | jammy | sid | kinetic | lunar)
includes=${includes}",perl-openssl-defaults,libnet-ssleay-perl" includes=${includes}",perl-openssl-defaults,libnet-ssleay-perl"
;; ;;
esac esac
@@ -120,6 +122,7 @@ chroot_prepare_distccd() {
gcc_version['sid']='10.2' gcc_version['sid']='10.2'
gcc_version['jammy']='12' gcc_version['jammy']='12'
gcc_version['kinetic']='12' gcc_version['kinetic']='12'
gcc_version['lunar']='12'
gcc_type['armhf']='arm-linux-gnueabihf-' gcc_type['armhf']='arm-linux-gnueabihf-'
gcc_type['arm64']='aarch64-linux-gnu-' gcc_type['arm64']='aarch64-linux-gnu-'
rm -f "${dest}"/cmdlist rm -f "${dest}"/cmdlist
@@ -153,7 +156,7 @@ chroot_build_packages() {
target_arch="${ARCH}" target_arch="${ARCH}"
else else
# only make packages for recent releases. There are no changes on older # only make packages for recent releases. There are no changes on older
target_release="bullseye focal jammy sid" target_release="bullseye focal jammy lunar sid"
target_arch="armhf arm64 amd64" target_arch="armhf arm64 amd64"
fi fi

4
lib/functions/host/prepare-host.sh
View File

@@ -68,7 +68,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|impish|hirsute|jammy|kinetic|ulyana|ulyssa|vanessa|bullseye|uma|una)$ ]]; then if [[ $HOSTRELEASE =~ ^(focal|impish|hirsute|jammy|kinetic|lunar|ulyana|ulyssa|vanessa|bullseye|uma|una)$ ]]; 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
@@ -83,7 +83,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 || "buster bullseye focal impish hirsute jammy kinetic debbie tricia ulyana ulyssa vanessa uma una" != *"$HOSTRELEASE"* ]]; then if [[ -z $HOSTRELEASE || "buster bullseye focal impish hirsute jammy lunar kinetic debbie tricia ulyana ulyssa vanessa uma una" != *"$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"

2
lib/functions/image/partitioning.sh
View File

@@ -28,7 +28,7 @@ prepare_partitions() {
# parttype[nfs] is empty # parttype[nfs] is empty
# metadata_csum and 64bit may need to be disabled explicitly when migrating to newer supported host OS releases # metadata_csum and 64bit may need to be disabled explicitly when migrating to newer supported host OS releases
if [[ $HOSTRELEASE =~ buster|bullseye|focal|jammy|kinetic|sid ]]; then if [[ $HOSTRELEASE =~ buster|bullseye|focal|jammy|kinetic|lunar|sid ]]; then
mkopts[ext4]="-q -m 2 -O ^64bit,^metadata_csum" mkopts[ext4]="-q -m 2 -O ^64bit,^metadata_csum"
fi fi
# mkopts[fat] is empty # mkopts[fat] is empty

6
lib/functions/rootfs/distro-specific.sh
View File

@@ -13,7 +13,7 @@ install_distribution_specific() {
case $RELEASE in case $RELEASE in
focal | jammy | kinetic ) focal | jammy | kinetic | lunar )
# by using default lz4 initrd compression leads to corruption, go back to proven method # by using default lz4 initrd compression leads to corruption, go back to proven method
sed -i "s/^COMPRESS=.*/COMPRESS=gzip/" "${SDCARD}"/etc/initramfs-tools/initramfs.conf sed -i "s/^COMPRESS=.*/COMPRESS=gzip/" "${SDCARD}"/etc/initramfs-tools/initramfs.conf
@@ -88,7 +88,7 @@ install_distribution_specific() {
# create_sources_list <release> <basedir> # create_sources_list <release> <basedir>
# #
# <release>: bullseye|focal|jammy|kinetic|sid # <release>: bullseye|focal|jammy|kinetic|lunar|sid
# <basedir>: path to root directory # <basedir>: path to root directory
# #
create_sources_list() { create_sources_list() {
@@ -136,7 +136,7 @@ create_sources_list() {
EOF EOF
;; ;;
focal | jammy | kinetic) focal | jammy | kinetic | lunar)
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

2
tools/repository/repo
View File

@@ -40,7 +40,7 @@ publishing() {
IFS=', ' read -r -a DISTROS <<< "$5" IFS=', ' read -r -a DISTROS <<< "$5"
local errors=0 local errors=0
# publish all, update selected # publish all, update selected
local distributions=("jessy" "xenial" "stretch" "bionic" "buster" "bullseye" "focal" "hirsute" "impish" "jammy" "kinetic" "sid") local distributions=("jessy" "xenial" "stretch" "bionic" "buster" "bullseye" "focal" "hirsute" "impish" "jammy" "lunar" "kinetic" "sid")
for release in "${distributions[@]}"; do for release in "${distributions[@]}"; do
local forceoverwrite="" local forceoverwrite=""