From a7e16da2ce7ed37acff93fdf63da02f49c61cd6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Wed, 14 Jul 2021 08:45:30 +0200 Subject: [PATCH] Add Ubuntu Impish (#3006) --- config/cli/impish/debootstrap | 1 + config/cli/impish/main/config_cli_standard | 1 + config/cli/impish/main/config_desktop | 1 + config/cli/impish/main/packages | 1 + config/cli/impish/main/packages.additional | 2 ++ config/desktop/impish | 1 + config/distributions/impish/name | 1 + config/distributions/impish/support | 1 + lib/chroot-buildpackages.sh | 2 ++ lib/configuration.sh | 2 +- lib/debootstrap.sh | 2 +- lib/distributions.sh | 2 +- 12 files changed, 14 insertions(+), 3 deletions(-) create mode 120000 config/cli/impish/debootstrap create mode 120000 config/cli/impish/main/config_cli_standard create mode 120000 config/cli/impish/main/config_desktop create mode 120000 config/cli/impish/main/packages create mode 100644 config/cli/impish/main/packages.additional create mode 120000 config/desktop/impish create mode 100644 config/distributions/impish/name create mode 100644 config/distributions/impish/support diff --git a/config/cli/impish/debootstrap b/config/cli/impish/debootstrap new file mode 120000 index 0000000000..70a5776e21 --- /dev/null +++ b/config/cli/impish/debootstrap @@ -0,0 +1 @@ +../focal/debootstrap \ No newline at end of file diff --git a/config/cli/impish/main/config_cli_standard b/config/cli/impish/main/config_cli_standard new file mode 120000 index 0000000000..c7fe3c166c --- /dev/null +++ b/config/cli/impish/main/config_cli_standard @@ -0,0 +1 @@ +../../focal/main/config_cli_standard \ No newline at end of file diff --git a/config/cli/impish/main/config_desktop b/config/cli/impish/main/config_desktop new file mode 120000 index 0000000000..e22162e48b --- /dev/null +++ b/config/cli/impish/main/config_desktop @@ -0,0 +1 @@ +../../focal/main/config_desktop \ No newline at end of file diff --git a/config/cli/impish/main/packages b/config/cli/impish/main/packages new file mode 120000 index 0000000000..fa38623603 --- /dev/null +++ b/config/cli/impish/main/packages @@ -0,0 +1 @@ +../../focal/main/packages \ No newline at end of file diff --git a/config/cli/impish/main/packages.additional b/config/cli/impish/main/packages.additional new file mode 100644 index 0000000000..5e2ed03ba3 --- /dev/null +++ b/config/cli/impish/main/packages.additional @@ -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 diff --git a/config/desktop/impish b/config/desktop/impish new file mode 120000 index 0000000000..1e3f06ddfb --- /dev/null +++ b/config/desktop/impish @@ -0,0 +1 @@ +hirsute \ No newline at end of file diff --git a/config/distributions/impish/name b/config/distributions/impish/name new file mode 100644 index 0000000000..893d22a73a --- /dev/null +++ b/config/distributions/impish/name @@ -0,0 +1 @@ +Ubuntu Impish 21.10 diff --git a/config/distributions/impish/support b/config/distributions/impish/support new file mode 100644 index 0000000000..03cd470150 --- /dev/null +++ b/config/distributions/impish/support @@ -0,0 +1 @@ +csc diff --git a/lib/chroot-buildpackages.sh b/lib/chroot-buildpackages.sh index 7b8c25eb34..c38c70a099 100644 --- a/lib/chroot-buildpackages.sh +++ b/lib/chroot-buildpackages.sh @@ -37,6 +37,7 @@ create_chroot() apt_mirror['bionic']="$UBUNTU_MIRROR" apt_mirror['focal']="$UBUNTU_MIRROR" apt_mirror['hirsute']="$UBUNTU_MIRROR" + apt_mirror['impish']="$UBUNTU_MIRROR" components['stretch']='main,contrib' components['buster']='main,contrib' components['bullseye']='main,contrib' @@ -45,6 +46,7 @@ create_chroot() components['bionic']='main,universe,multiverse' components['focal']='main,universe,multiverse' components['hirsute']='main,universe,multiverse' + components['impish']='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 diff --git a/lib/configuration.sh b/lib/configuration.sh index 18e3b8689e..bf42bb885d 100644 --- a/lib/configuration.sh +++ b/lib/configuration.sh @@ -361,7 +361,7 @@ BOOTCONFIG_VAR_NAME=BOOTCONFIG_${BRANCH^^} [[ -z $ATFPATCHDIR ]] && ATFPATCHDIR="atf-$LINUXFAMILY" [[ -z $KERNELPATCHDIR ]] && KERNELPATCHDIR="$LINUXFAMILY-$BRANCH" -if [[ "$RELEASE" =~ ^(xenial|bionic|focal|hirsute)$ ]]; then +if [[ "$RELEASE" =~ ^(xenial|bionic|focal|hirsute|impish)$ ]]; then DISTRIBUTION="Ubuntu" else DISTRIBUTION="Debian" diff --git a/lib/debootstrap.sh b/lib/debootstrap.sh index 777678bac9..0c41c3266e 100644 --- a/lib/debootstrap.sh +++ b/lib/debootstrap.sh @@ -421,7 +421,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|sid ]]; then + if [[ $HOSTRELEASE =~ bionic|buster|bullseye|cosmic|focal|hirsute|impish|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}))" diff --git a/lib/distributions.sh b/lib/distributions.sh index 67db2e779a..03319b7677 100644 --- a/lib/distributions.sh +++ b/lib/distributions.sh @@ -607,7 +607,7 @@ install_distribution_specific() sed '/security/ d' -i "${SDCARD}"/etc/apt/sources.list ;; - bionic|focal|hirsute) + bionic|focal|hirsute|impish) # 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