Added Debian 12 Bookworm. (#4740)

* Added Debian 12 Bookworm.

* Link identical

* Make minimal truly minimal again

Move netplan.io to CLI image only

* Add netplan.io to Bullseye standard CLI

Co-authored-by: Konstantin Litvinov <klitvinov@piesoft.us>
Co-authored-by: Igor <igor@armbian.com>
This commit is contained in:
Konstantin Litvinov
2023-01-26 12:04:17 +03:00
committed by GitHub
parent a7bd7f5dbb
commit 8398dd1116
26 changed files with 192 additions and 21 deletions

View File

@@ -0,0 +1 @@
../../bullseye/debootstrap/components

View File

@@ -0,0 +1 @@
../../bullseye/debootstrap/config_desktop

View File

@@ -0,0 +1,36 @@
apt-utils
btrfs-progs
bzip2
ca-certificates
console-setup
cpio
cron
dbus
dbus-user-session
debsums
dmsetup
fdisk
gnupg
haveged
ifupdown
init
initramfs-tools
iputils-ping
isc-dhcp-client
kmod
less
libpam-systemd
linux-base
locales
logrotate
netbase
netcat-openbsd
rsync
rsyslog
sudo
systemd
tzdata
ucf
udev
whiptail
wireless-regdb

View File

@@ -0,0 +1,35 @@
apt-file
automake
bison
bridge-utils
build-essential
ca-certificates
command-not-found
console-setup
expect
fbset
flex
gnupg2
hping3
html2text
initramfs-tools
iptables
iw
keyboard-configuration
libnl-3-dev
libnl-genl-3-dev
libssl-dev
libwrap0-dev
linux-base
man-db
nfs-common
python3-distutils
python3-lib2to3
rng-tools
selinux-policy-default
sudo
unattended-upgrades
unicode-data
vnstat
wireless-regdb
wpasupplicant

View File

@@ -0,0 +1,39 @@
alsa-utils
aptitude
avahi-autoipd
bash-completion
dosfstools
dkms
ethtool
evtest
f2fs-tools
f3
git
haveged
hdparm
i2c-tools
ifenslave
iotop
iperf3
iputils-arping
libdigest-sha-perl
libfuse2
libnss-myhostname
libpam-systemd
libproc-processtable-perl
netplan.io
nfs-common
ntfs-3g
pciutils
plymouth
plymouth-themes
pv
qrencode
rfkill
screen
software-properties-common
stress
sunxi-tools
unzip
vim
vlan

View File

@@ -0,0 +1,25 @@
automake
bison
bridge-utils
build-essential
ca-certificates
console-setup
expect
fbset
flex
fonts-ubuntu
html2text
initramfs-tools
iptables
iw
keyboard-configuration
libnl-3-dev
libnl-genl-3-dev
libssl-dev
libwrap0-dev
linux-base
sudo
unattended-upgrades
unicode-data
wireless-regdb
wpasupplicant

View File

@@ -0,0 +1,33 @@
alsa-utils
aptitude
avahi-autoipd
bash-completion
dosfstools
ethtool
evtest
f2fs-tools
f3
git
haveged
hdparm
ifenslave
iotop
iperf3
iputils-arping
libdigest-sha-perl
libfuse2
libnss-myhostname
libpam-systemd
libproc-processtable-perl
ntfs-3g
pciutils
pv
qrencode
rfkill
screen
software-properties-common
stress
sunxi-tools
unzip
vim
vlan

View File

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

View File

@@ -0,0 +1 @@
../../bullseye/main/packages.additional

View File

@@ -0,0 +1 @@
../../bullseye/main/packages.uninstall

View File

@@ -24,6 +24,7 @@ libssl-dev
libwrap0-dev libwrap0-dev
linux-base linux-base
man-db man-db
netplan.io
networkd-dispatcher networkd-dispatcher
nfs-common nfs-common
python3-distutils python3-distutils

View File

@@ -10,7 +10,6 @@ ncurses-term
openssh-server openssh-server
parted parted
psmisc psmisc
python3-apt
smartmontools smartmontools
sysfsutils sysfsutils
toilet toilet

View File

@@ -1,4 +1,3 @@
cracklib-runtime
curl curl
htop htop
i2c-tools i2c-tools
@@ -9,7 +8,6 @@ mc
mmc-utils mmc-utils
nano nano
net-tools net-tools
netplan.io
network-manager network-manager
network-manager-openvpn network-manager-openvpn
resolvconf resolvconf

1
config/desktop/bookworm Symbolic link
View File

@@ -0,0 +1 @@
bullseye

View File

@@ -29,8 +29,6 @@ gnome-settings-daemon-common
gnome-shell gnome-shell
gnome-shell-common gnome-shell-common
gnome-shell-extension-appindicator gnome-shell-extension-appindicator
gnome-shell-extension-desktop-icons
gnome-shell-extension-trash
inputattach inputattach
libasound2 libasound2
libasound2-plugins libasound2-plugins

View File

@@ -13,7 +13,6 @@ gdebi
gist gist
gnome-keyring gnome-keyring
gnome-disk-utility gnome-disk-utility
gnome-orca
gnome-packagekit gnome-packagekit
gnome-terminal gnome-terminal
gtk2-engines gtk2-engines
@@ -49,8 +48,6 @@ mate-equake-applet
mate-icon-theme mate-icon-theme
mate-indicator-applet mate-indicator-applet
mate-indicator-applet-common mate-indicator-applet-common
mate-media
mate-media-common
mate-menu mate-menu
mate-menus mate-menus
mate-netbook mate-netbook

View File

@@ -4,5 +4,4 @@ purple-discord
purple-lurch purple-lurch
purple-mm-sms purple-mm-sms
purple-rocketchat purple-rocketchat
telegram-purple
telegram-desktop telegram-desktop

View File

@@ -0,0 +1 @@
Debian 12 Bookworm

View File

@@ -0,0 +1 @@
csc

View File

@@ -1 +1 @@
Debian 12 Sid Debian 13 Sid

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" | "lunar") "bullseye" | "bookworm" | "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 "
;; ;;
*) *)

View File

@@ -10,12 +10,14 @@ create_chroot() {
qemu_binary['arm64']='qemu-aarch64-static' qemu_binary['arm64']='qemu-aarch64-static'
apt_mirror['buster']="$DEBIAN_MIRROR" apt_mirror['buster']="$DEBIAN_MIRROR"
apt_mirror['bullseye']="$DEBIAN_MIRROR" apt_mirror['bullseye']="$DEBIAN_MIRROR"
apt_mirror['bookworm']="$DEBIAN_MIRROR"
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" apt_mirror['lunar']="$UBUNTU_MIRROR"
components['buster']='main,contrib' components['buster']='main,contrib'
components['bullseye']='main,contrib' components['bullseye']='main,contrib'
components['bookworm']='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'
@@ -26,7 +28,7 @@ create_chroot() {
# perhaps a temporally workaround # perhaps a temporally workaround
case $release in case $release in
bullseye | focal | jammy | sid | kinetic | lunar) bullseye | bookworm | sid | focal | jammy | kinetic | lunar)
includes=${includes}",perl-openssl-defaults,libnet-ssleay-perl" includes=${includes}",perl-openssl-defaults,libnet-ssleay-perl"
;; ;;
esac esac
@@ -97,7 +99,7 @@ create_chroot() {
-q -y --no-install-recommends debhelper devscripts"' -q -y --no-install-recommends debhelper devscripts"'
case $release in case $release in
bullseye | focal | hirsute | sid) bullseye | bookworm | sid | focal | hirsute )
eval 'LC_ALL=C LANG=C chroot "${target_dir}" \ eval 'LC_ALL=C LANG=C chroot "${target_dir}" \
/bin/bash -c "apt-get install python-is-python3"' /bin/bash -c "apt-get install python-is-python3"'
;; ;;
@@ -116,10 +118,11 @@ chroot_prepare_distccd() {
declare -A gcc_version gcc_type declare -A gcc_version gcc_type
gcc_version['buster']='8.3' gcc_version['buster']='8.3'
gcc_version['bullseye']='9.2' gcc_version['bullseye']='9.2'
gcc_version['bookworm']='10.2'
gcc_version['sid']='10.2'
gcc_version['bionic']='5.4' gcc_version['bionic']='5.4'
gcc_version['focal']='9.2' gcc_version['focal']='9.2'
gcc_version['hirsute']='10.2' gcc_version['hirsute']='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_version['lunar']='12'
@@ -156,7 +159,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 lunar sid" target_release="bullseye bookworm focal jammy lunar sid"
target_arch="armhf arm64 amd64" target_arch="armhf arm64 amd64"
fi fi

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

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|sid|focal|impish|hirsute|jammy|kinetic|lunar|ulyana|ulyssa|uma|una|vanessa|vera ]]; then if [[ $HOSTRELEASE =~ buster|bullseye|bookworm|sid|focal|impish|hirsute|jammy|kinetic|lunar|ulyana|ulyssa|uma|una|vanessa|vera ]]; 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

View File

@@ -88,7 +88,7 @@ install_distribution_specific() {
# create_sources_list <release> <basedir> # create_sources_list <release> <basedir>
# #
# <release>: bullseye|focal|jammy|kinetic|lunar|sid # <release>: bullseye|bookworm|sid|focal|jammy|kinetic|lunar
# <basedir>: path to root directory # <basedir>: path to root directory
# #
create_sources_list() { create_sources_list() {

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" "lunar" "kinetic" "sid") local distributions=("jessy" "xenial" "stretch" "bionic" "focal" "hirsute" "impish" "jammy" "lunar" "kinetic" "buster" "bullseye" "bookworm" "sid")
for release in "${distributions[@]}"; do for release in "${distributions[@]}"; do
local forceoverwrite="" local forceoverwrite=""