Skip to content

Commit

Permalink
Add bookworm support
Browse files Browse the repository at this point in the history
  • Loading branch information
fepitre committed Dec 19, 2021
1 parent 553af19 commit b4d7ce6
Show file tree
Hide file tree
Showing 16 changed files with 65 additions and 5 deletions.
6 changes: 2 additions & 4 deletions Makefile.builder
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
ifneq (,$(findstring $(DIST),wheezy jessie stretch buster bullseye))
ifneq (,$(findstring $(DIST),buster bullseye bookworm))
DEBIAN_PLUGIN_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
DISTRIBUTION := debian
BUILDER_MAKEFILE = $(DEBIAN_PLUGIN_DIR)Makefile.debian
TEMPLATE_SCRIPTS = $(DEBIAN_PLUGIN_DIR)template_debian
DIST_TAG := $(strip $(subst wheezy, deb7, $(DIST)))
DIST_TAG := $(strip $(subst jessie, deb8, $(DIST_TAG)))
DIST_TAG := $(strip $(subst stretch, deb9, $(DIST_TAG)))
DIST_TAG := $(strip $(subst buster, deb10, $(DIST_TAG)))
DIST_TAG := $(strip $(subst bullseye, deb11, $(DIST_TAG)))
DIST_TAG := $(strip $(subst bookworm, deb12, $(DIST_TAG)))
endif
ifneq (,$(findstring $(DIST),trusty xenial bionic focal))
DEBIAN_PLUGIN_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
Expand Down
1 change: 1 addition & 0 deletions keys/bookworm-debian-archive-keyring.gpg
19 changes: 19 additions & 0 deletions template_debian/02_install_groups_bookworm.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#!/bin/bash -e
# vim: set ts=4 sw=4 sts=4 et :

if [ "$VERBOSE" -ge 2 -o "$DEBUG" == "1" ]; then
set -x
fi

source "${SCRIPTSDIR}/vars.sh"
source "${SCRIPTSDIR}/distribution.sh"

##### "=========================================================================
debug " Installing custom packages and customizing ${DIST}"
##### "=========================================================================

#### '--------------------------------------------------------------------------
info ' Adding contrib, non-free and Debian security to repository.'
#### '--------------------------------------------------------------------------
updateDebianSourceList
aptUpdate
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
org.gnome.Terminal.desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
org.gnome.Terminal.desktop
org.gnome.Nautilus.desktop
firefox-esr.desktop
thunderbird.desktop
yelp.desktop
3 changes: 3 additions & 0 deletions template_debian/appmenus_bookworm/whitelisted-appmenus.list
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
org.gnome.Terminal.desktop
org.gnome.Nautilus.desktop
firefox-esr.desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
debian-xterm.desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
evolution.desktop
gimp.desktop
yelp.desktop
iceweasel.desktop
eog.desktop
rhythmbox.desktop
gnome-system-log.desktop
org.gnome.Terminal.desktop
gnome-calculator.desktop
org.gnome.Cheese.desktop
org.gnome.Nautilus.desktop
org.gnome.gedit.desktop
shotwell.desktop
org.gnome.Totem.desktop
libreoffice-startcenter.desktop
session-properties.desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
gdebi.desktop
gpk-application.desktop
gnome-printers-panel.desktop
tracker-preferences.desktop
gnome-system-log.desktop
org.gnome.Terminal.desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
debian-xterm.desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
debian-xterm.desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
debian-xterm.desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
xfce4-terminal.desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
xfce4-terminal.desktop
Thunar.desktop
firefox-esr.desktop
xfce-settings-manager.desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
xfce4-terminal.desktop
xfce-settings-manager.desktop
2 changes: 1 addition & 1 deletion template_debian/distribution.sh
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ function updateDebianSourceList() {
fi

# Add Debian security repositories
if [ "${DEBIANVERSION}" != "bullseye" ]; then
if [ "${DEBIANVERSION}" == "buster" ] || [ "${DEBIANVERSION}" == "stretch" ]; then
security_suffix="/updates"
else
security_suffix="-security"
Expand Down

0 comments on commit b4d7ce6

Please sign in to comment.