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 support for next Ubuntu LTS (#3234)

Browse Source 
* Add support for next Ubuntu LTS

* Update build-cache.yml

* Update build-cache.yml

* Update build-cache.yml

* Update build-cache.yml

* Jammy repository creation

* Enable docker build support on Jammy
This commit is contained in:
Igor Pečovnik
2021-11-09 18:15:04 +01:00
committed by GitHub
parent 19340d66a1
commit 2a47ad5c78
14 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
compile.sh
View File

@@ -178,7 +178,7 @@ if [[ "${1}" == docker && -f /etc/debian_version && -z "$(command -v docker)" ]]
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}')
[[ "${codename}" == "debbie" ]] && codename="buster" && codeid="debian"
[[ "${codename}" == "ulyana" ]] && codename="focal" && codeid="ubuntu"
[[ "${codename}" == "ulyana" || "${codename}" == "jammy" ]] && codename="focal" && codeid="ubuntu"
# different binaries for some. TBD. Need to check for all others
[[ "${codename}" =~ focal|hirsute ]] && DOCKER_BINARY="docker containerd docker.io"

1
config/cli/jammy/debootstrap Symbolic link
View File

@@ -0,0 +1 @@
../focal/debootstrap

1
config/cli/jammy/main/config_cli_standard Symbolic link
View File

@@ -0,0 +1 @@
../../focal/main/config_cli_standard

1
config/cli/jammy/main/config_desktop Symbolic link
View File

@@ -0,0 +1 @@
../../focal/main/config_desktop

1
config/cli/jammy/main/packages Symbolic link
View File

@@ -0,0 +1 @@
../../focal/main/packages

2
config/cli/jammy/main/packages.additional Normal file
View File

@@ -0,0 +1,2 @@
network-manager network-manager-openvpn wireless-tools lsof htop mmc-utils wget nano sysstat net-tools
resolvconf jq libcrack2 cracklib-runtime curl mc i2c-tools

1
config/desktop/jammy Symbolic link
View File

@@ -0,0 +1 @@
hirsute

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

@@ -0,0 +1 @@
Ubuntu jammy 22.04 LTS

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

@@ -0,0 +1 @@
csc

2
lib/chroot-buildpackages.sh
View File

@@ -38,6 +38,7 @@ create_chroot()
apt_mirror['focal']="$UBUNTU_MIRROR"
apt_mirror['hirsute']="$UBUNTU_MIRROR"
apt_mirror['impish']="$UBUNTU_MIRROR"
apt_mirror['jammy']="$UBUNTU_MIRROR"
components['stretch']='main,contrib'
components['buster']='main,contrib'
components['bullseye']='main,contrib'
@@ -47,6 +48,7 @@ create_chroot()
components['focal']='main,universe,multiverse'
components['hirsute']='main,universe,multiverse'
components['impish']='main,universe,multiverse'
components['jammy']='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

2
lib/configuration.sh
View File

@@ -362,7 +362,7 @@ BOOTCONFIG_VAR_NAME=BOOTCONFIG_${BRANCH^^}
[[ -z $ATFPATCHDIR ]] && ATFPATCHDIR="atf-$LINUXFAMILY"
[[ -z $KERNELPATCHDIR ]] && KERNELPATCHDIR="$LINUXFAMILY-$BRANCH"
if [[ "$RELEASE" =~ ^(xenial|bionic|focal|hirsute|impish)$ ]]; then
if [[ "$RELEASE" =~ ^(xenial|bionic|focal|hirsute|impish|jammy)$ ]]; then
DISTRIBUTION="Ubuntu"
else
DISTRIBUTION="Debian"

2
lib/debootstrap.sh
View File

@@ -420,7 +420,7 @@ prepare_partitions()
# add -N number of inodes to keep mount from running out
# create bigger number for desktop builds
if [[ $BUILD_DESKTOP == yes ]]; then local node_number=4096; else local node_number=1024; fi
if [[ $HOSTRELEASE =~ bionic|buster|bullseye|cosmic|focal|hirsute|impish|sid ]]; then
if [[ $HOSTRELEASE =~ bionic|buster|bullseye|cosmic|focal|hirsute|impish|jammy|sid ]]; then
mkopts[ext4]="-q -m 2 -O ^64bit,^metadata_csum -N $((128*${node_number}))"
elif [[ $HOSTRELEASE == xenial ]]; then
mkopts[ext4]="-q -m 2 -N $((128*${node_number}))"

2
lib/distributions.sh
View File

@@ -605,7 +605,7 @@ install_distribution_specific()
;;
bionic|focal|hirsute|impish)
bionic|focal|hirsute|impish|jammy)
# 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

2
lib/general.sh
View File

@@ -980,7 +980,7 @@ repo-manipulate()
# "update" search for new files in output/debs* to add them to repository
# "purge" leave only last 5 versions
local DISTROS=("stretch" "bionic" "buster" "bullseye" "focal" "hirsute" "impish" "sid")
local DISTROS=("stretch" "bionic" "buster" "bullseye" "focal" "hirsute" "impish" "jammy" "sid")
#local DISTROS=($(grep -rw config/distributions/*/ -e 'supported' | cut -d"/" -f3))
case $@ in