Skip to content

Debian - add support for forky #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
unman wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Debian - add support for forky #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added keys/forky-debian-archive-keyring.gpg
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions pbuilderrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ LOGLEVEL=I
USECOLORS=auto

case ${DISTRIBUTION} in
buster|bullseye|bookworm|trixie|sid|experimental)
buster|bullseye|bookworm|trixie|forky|sid|experimental)
DIST_VENDOR=debian
MIRRORSITE=http://deb.debian.org/debian
;;
Expand Down Expand Up @@ -58,7 +58,7 @@ BUILDRESULT="${CHROOT_DIR}/pbuilder/results"
# components on Debian use "main contrib non-free" and on Ubuntu "main
# restricted universe multiverse"
case ${DISTRIBUTION} in
buster|bullseye|bookworm|trixie|sid|experimental)
buster|bullseye|bookworm|trixie|forky|sid|experimental)
COMPONENTS="main"
;;
focal|jammy|lunar)
Expand Down
22 changes: 22 additions & 0 deletions template_debian/02_install_groups_forky.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#!/bin/bash -e
# vim: set ts=4 sw=4 sts=4 et :

if [ "$DEBUG" == "1" ]; then
set -x
fi

# Source external scripts
# shellcheck source=template_debian/vars.sh
source "${TEMPLATE_CONTENT_DIR}/vars.sh"
# shellcheck source=template_debian/distribution.sh
source "${TEMPLATE_CONTENT_DIR}/distribution.sh"

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

#### '--------------------------------------------------------------------------
info ' Adding contrib, non-free and Debian security to repository.'
#### '--------------------------------------------------------------------------
updateDebianSourceList
aptUpdate
3 changes: 1 addition & 2 deletions template_debian/distribution.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,10 +300,9 @@ function updateDebianSourceList() {
touch "${list}"

nonfree=non-free
if [ "${DIST_CODENAME}" = "bookworm" ] || [ "${DIST_CODENAME}" = "trixie" ]; then
if [ "${DIST_CODENAME}" = "bookworm" ] || [ "${DIST_CODENAME}" = "trixie" ] || [ "${DIST_CODENAME}" = "forky" ]; then
nonfree=non-free-firmware
fi

# Add contrib and non-free component to repository
sed -i "s/${DIST_CODENAME} main$/${DEBIANVERSION} main contrib $nonfree/g" "${list}"

Expand Down
22 changes: 22 additions & 0 deletions template_debian/packages_forky.list
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
alsa-utils
apt-transport-https
cryptsetup
cups
exfat-fuse
firefox-esr
firmware-linux
git
haveged
libnotify-bin
locales
locales-all
lvm2
ncurses-term
network-manager
nftables
thunderbird
vim-nox
xdg-user-dirs
xsettingsd
gnupg
systemd-timesyncd
3 changes: 3 additions & 0 deletions template_debian/packages_forky_minimal.list
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
xterm
libfile-mimeinfo-perl
gnupg