From: Michael Prokop <mika@grml.org>
Date: Wed, 17 Aug 2022 10:14:29 +0000 (+0200)
Subject: SW: switch from bsdmainutils to bsdextrautils + bsdutils in GRML_SMALL + GRML_FULL
X-Git-Tag: v0.41.0~2
X-Git-Url: http://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=b2ab7010c11162fe1488e083e2e512e9aeb8982f

SW: switch from bsdmainutils to bsdextrautils + bsdutils in GRML_SMALL + GRML_FULL

The bsdmainutils package is a transitional package (at least) since
Debian/bullseye. It depends on bsdutils, debianutils, bsdextrautils +
ncal. We want bsdutils (e.g. for logger) and bsdextrautils (e.g. for
hexdump), so let's depend on those. The debianutils package is a
required and essential package in Debian anyway, so no need to
explicitly depend on it. We don't necessarily need ncal, so at least
until someone asks for it, let's not depend on it.

FTR, not modifying /etc/grml/fai/config/scripts/DEBORPHAN/10-whitelist
yet, to give people building ISOs with grml-live based on Debian
releases older than bullseye the option to still use it as-is.
---

diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index a2be00a..04733ba 100644
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -9,7 +9,8 @@ grml-terminalserver
 apt
 aptitude
 binfmt-support
-bsdmainutils
+bsdextrautils
+bsdutils
 dctrl-tools
 devscripts
 dos2unix
diff --git a/etc/grml/fai/config/package_config/GRML_SMALL b/etc/grml/fai/config/package_config/GRML_SMALL
index 3ae5e55..6b4002a 100644
--- a/etc/grml/fai/config/package_config/GRML_SMALL
+++ b/etc/grml/fai/config/package_config/GRML_SMALL
@@ -6,7 +6,8 @@ attr
 bash
 binutils
 bridge-utils
-bsdmainutils
+bsdextrautils
+bsdutils
 btrfs-progs
 buffer
 chntpw
diff --git a/etc/grml/fai/config/scripts/DEBORPHAN/10-whitelist b/etc/grml/fai/config/scripts/DEBORPHAN/10-whitelist
index 4a7d807..ec97fc4 100755
--- a/etc/grml/fai/config/scripts/DEBORPHAN/10-whitelist
+++ b/etc/grml/fai/config/scripts/DEBORPHAN/10-whitelist
@@ -25,8 +25,6 @@ fi
 
 # workaround for bsdmainutils transitional package, we can drop this as soon as the
 # bsdextrautils + ncal packages are available in all our supported Debian releases
-# (FTR: the transitional bsdmainutils package currently depends on
-# bsdextrautils bsdutils calendar debianutils ncal)
 if [[ -r "${target}/usr/share/doc/bsdmainutils" ]] && [ -x "${target}/usr/bin/deborphan" ] ; then
   echo "Adding bsdmainutils to deborphan whitelist"
   # workaround for https://bugs.debian.org/929273 ("fseek on /var/lib/deborphan/keep: Invalid argument")