diff --git a/config/cli/bookworm/debootstrap/components b/config/cli/bookworm/debootstrap/components new file mode 120000 index 0000000000..7b63520a0d --- /dev/null +++ b/config/cli/bookworm/debootstrap/components @@ -0,0 +1 @@ +../../bullseye/debootstrap/components \ No newline at end of file diff --git a/config/cli/bookworm/debootstrap/config_desktop b/config/cli/bookworm/debootstrap/config_desktop new file mode 120000 index 0000000000..119211b30c --- /dev/null +++ b/config/cli/bookworm/debootstrap/config_desktop @@ -0,0 +1 @@ +../../bullseye/debootstrap/config_desktop \ No newline at end of file diff --git a/config/cli/bookworm/debootstrap/packages b/config/cli/bookworm/debootstrap/packages new file mode 100644 index 0000000000..a14321270c --- /dev/null +++ b/config/cli/bookworm/debootstrap/packages @@ -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 diff --git a/config/cli/bookworm/main/config_cli_standard/packages b/config/cli/bookworm/main/config_cli_standard/packages new file mode 100644 index 0000000000..e33544b1ec --- /dev/null +++ b/config/cli/bookworm/main/config_cli_standard/packages @@ -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 diff --git a/config/cli/bookworm/main/config_cli_standard/packages.additional b/config/cli/bookworm/main/config_cli_standard/packages.additional new file mode 100644 index 0000000000..671abb47d0 --- /dev/null +++ b/config/cli/bookworm/main/config_cli_standard/packages.additional @@ -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 diff --git a/config/cli/bookworm/main/config_desktop/packages b/config/cli/bookworm/main/config_desktop/packages new file mode 100644 index 0000000000..2a0471bb30 --- /dev/null +++ b/config/cli/bookworm/main/config_desktop/packages @@ -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 diff --git a/config/cli/bookworm/main/config_desktop/packages.additional b/config/cli/bookworm/main/config_desktop/packages.additional new file mode 100644 index 0000000000..14551cdb79 --- /dev/null +++ b/config/cli/bookworm/main/config_desktop/packages.additional @@ -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 diff --git a/config/cli/bookworm/main/packages b/config/cli/bookworm/main/packages new file mode 120000 index 0000000000..174ae2db03 --- /dev/null +++ b/config/cli/bookworm/main/packages @@ -0,0 +1 @@ +../../bullseye/main/packages \ No newline at end of file diff --git a/config/cli/bookworm/main/packages.additional b/config/cli/bookworm/main/packages.additional new file mode 120000 index 0000000000..7d54165b04 --- /dev/null +++ b/config/cli/bookworm/main/packages.additional @@ -0,0 +1 @@ +../../bullseye/main/packages.additional \ No newline at end of file diff --git a/config/cli/bookworm/main/packages.uninstall b/config/cli/bookworm/main/packages.uninstall new file mode 120000 index 0000000000..c8d5996ba1 --- /dev/null +++ b/config/cli/bookworm/main/packages.uninstall @@ -0,0 +1 @@ +../../bullseye/main/packages.uninstall \ No newline at end of file diff --git a/config/cli/bullseye/main/config_cli_standard/packages b/config/cli/bullseye/main/config_cli_standard/packages index 12122e6584..0948feff0d 100644 --- a/config/cli/bullseye/main/config_cli_standard/packages +++ b/config/cli/bullseye/main/config_cli_standard/packages @@ -24,6 +24,7 @@ libssl-dev libwrap0-dev linux-base man-db +netplan.io networkd-dispatcher nfs-common python3-distutils diff --git a/config/cli/bullseye/main/packages b/config/cli/bullseye/main/packages index c03d917d15..dd10a9a86c 100644 --- a/config/cli/bullseye/main/packages +++ b/config/cli/bullseye/main/packages @@ -10,7 +10,6 @@ ncurses-term openssh-server parted psmisc -python3-apt smartmontools sysfsutils toilet diff --git a/config/cli/bullseye/main/packages.additional b/config/cli/bullseye/main/packages.additional index 83f52bf879..261c9a08c7 100644 --- a/config/cli/bullseye/main/packages.additional +++ b/config/cli/bullseye/main/packages.additional @@ -1,4 +1,3 @@ -cracklib-runtime curl htop i2c-tools @@ -9,7 +8,6 @@ mc mmc-utils nano net-tools -netplan.io network-manager network-manager-openvpn resolvconf diff --git a/config/desktop/bookworm b/config/desktop/bookworm new file mode 120000 index 0000000000..91bf492f1d --- /dev/null +++ b/config/desktop/bookworm @@ -0,0 +1 @@ +bullseye \ No newline at end of file diff --git a/config/desktop/bullseye/environments/gnome/config_base/packages b/config/desktop/bullseye/environments/gnome/config_base/packages index 7e53d3fbea..1e05e994de 100644 --- a/config/desktop/bullseye/environments/gnome/config_base/packages +++ b/config/desktop/bullseye/environments/gnome/config_base/packages @@ -29,8 +29,6 @@ gnome-settings-daemon-common gnome-shell gnome-shell-common gnome-shell-extension-appindicator -gnome-shell-extension-desktop-icons -gnome-shell-extension-trash inputattach libasound2 libasound2-plugins diff --git a/config/desktop/bullseye/environments/mate/config_base/packages b/config/desktop/bullseye/environments/mate/config_base/packages index a838da3c40..dced82a809 100644 --- a/config/desktop/bullseye/environments/mate/config_base/packages +++ b/config/desktop/bullseye/environments/mate/config_base/packages @@ -13,7 +13,6 @@ gdebi gist gnome-keyring gnome-disk-utility -gnome-orca gnome-packagekit gnome-terminal gtk2-engines @@ -49,8 +48,6 @@ mate-equake-applet mate-icon-theme mate-indicator-applet mate-indicator-applet-common -mate-media -mate-media-common mate-menu mate-menus mate-netbook diff --git a/config/desktop/buster/appgroups/chat/packages b/config/desktop/buster/appgroups/chat/packages index 73c1b12ff7..1836dcdc34 100644 --- a/config/desktop/buster/appgroups/chat/packages +++ b/config/desktop/buster/appgroups/chat/packages @@ -4,5 +4,4 @@ purple-discord purple-lurch purple-mm-sms purple-rocketchat -telegram-purple telegram-desktop diff --git a/config/distributions/bookworm/name b/config/distributions/bookworm/name new file mode 100644 index 0000000000..15078e253e --- /dev/null +++ b/config/distributions/bookworm/name @@ -0,0 +1 @@ +Debian 12 Bookworm diff --git a/config/distributions/bookworm/support b/config/distributions/bookworm/support new file mode 100644 index 0000000000..03cd470150 --- /dev/null +++ b/config/distributions/bookworm/support @@ -0,0 +1 @@ +csc diff --git a/config/distributions/sid/name b/config/distributions/sid/name index faba7461af..66ecbcea40 100644 --- a/config/distributions/sid/name +++ b/config/distributions/sid/name @@ -1 +1 @@ -Debian 12 Sid +Debian 13 Sid diff --git a/config/sources/arm64.conf b/config/sources/arm64.conf index de41a5ed5d..2ea84019be 100644 --- a/config/sources/arm64.conf +++ b/config/sources/arm64.conf @@ -36,7 +36,7 @@ fi if [ "$(uname -m)" = "aarch64" ]; then 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 " ;; *) diff --git a/lib/functions/extras/buildpkg.sh b/lib/functions/extras/buildpkg.sh index e5d6eed981..a26e85711f 100644 --- a/lib/functions/extras/buildpkg.sh +++ b/lib/functions/extras/buildpkg.sh @@ -10,12 +10,14 @@ create_chroot() { qemu_binary['arm64']='qemu-aarch64-static' apt_mirror['buster']="$DEBIAN_MIRROR" apt_mirror['bullseye']="$DEBIAN_MIRROR" + apt_mirror['bookworm']="$DEBIAN_MIRROR" apt_mirror['focal']="$UBUNTU_MIRROR" apt_mirror['jammy']="$UBUNTU_MIRROR" apt_mirror['kinetic']="$UBUNTU_MIRROR" - apt_mirror['lunar']="$UBUNTU_MIRROR" + apt_mirror['lunar']="$UBUNTU_MIRROR" components['buster']='main,contrib' components['bullseye']='main,contrib' + components['bookworm']='main,contrib' components['sid']='main,contrib' components['focal']='main,universe,multiverse' components['jammy']='main,universe,multiverse' @@ -26,7 +28,7 @@ create_chroot() { # perhaps a temporally workaround case $release in - bullseye | focal | jammy | sid | kinetic | lunar) + bullseye | bookworm | sid | focal | jammy | kinetic | lunar) includes=${includes}",perl-openssl-defaults,libnet-ssleay-perl" ;; esac @@ -97,7 +99,7 @@ create_chroot() { -q -y --no-install-recommends debhelper devscripts"' case $release in - bullseye | focal | hirsute | sid) + bullseye | bookworm | sid | focal | hirsute ) eval 'LC_ALL=C LANG=C chroot "${target_dir}" \ /bin/bash -c "apt-get install python-is-python3"' ;; @@ -116,10 +118,11 @@ chroot_prepare_distccd() { declare -A gcc_version gcc_type gcc_version['buster']='8.3' gcc_version['bullseye']='9.2' + gcc_version['bookworm']='10.2' + gcc_version['sid']='10.2' gcc_version['bionic']='5.4' gcc_version['focal']='9.2' gcc_version['hirsute']='10.2' - gcc_version['sid']='10.2' gcc_version['jammy']='12' gcc_version['kinetic']='12' gcc_version['lunar']='12' @@ -156,7 +159,7 @@ chroot_build_packages() { target_arch="${ARCH}" else # 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" fi diff --git a/lib/functions/host/prepare-host.sh b/lib/functions/host/prepare-host.sh index 023921a2f3..7a2a83db54 100644 --- a/lib/functions/host/prepare-host.sh +++ b/lib/functions/host/prepare-host.sh @@ -68,7 +68,7 @@ prepare_host() { fi # 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" ln -fs /usr/bin/python2.7 /usr/bin/python2 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 # 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 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" diff --git a/lib/functions/image/partitioning.sh b/lib/functions/image/partitioning.sh index be3fc91079..b7111e7b49 100644 --- a/lib/functions/image/partitioning.sh +++ b/lib/functions/image/partitioning.sh @@ -28,7 +28,7 @@ prepare_partitions() { # parttype[nfs] is empty # 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" fi # mkopts[fat] is empty diff --git a/lib/functions/rootfs/distro-specific.sh b/lib/functions/rootfs/distro-specific.sh index 5cb8f2265b..3a3c84bae0 100644 --- a/lib/functions/rootfs/distro-specific.sh +++ b/lib/functions/rootfs/distro-specific.sh @@ -88,7 +88,7 @@ install_distribution_specific() { # create_sources_list # -# : bullseye|focal|jammy|kinetic|lunar|sid +# : bullseye|bookworm|sid|focal|jammy|kinetic|lunar # : path to root directory # create_sources_list() { diff --git a/tools/repository/repo b/tools/repository/repo index 5c561912c5..b432a15206 100755 --- a/tools/repository/repo +++ b/tools/repository/repo @@ -40,7 +40,7 @@ publishing() { IFS=', ' read -r -a DISTROS <<< "$5" local errors=0 # 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 local forceoverwrite=""