Commit 0856759c authored by Guido Gunther's avatar Guido Gunther
Browse files

Don't hardcode packages that should be removed

parent 194c2f8f
Pipeline #64712 passed with stage
in 9 seconds
......@@ -266,6 +266,7 @@ sudo pureos_board="${pureos_board}" \
distro="${distro}" \
packages="${packages} ${board_packages}" \
packages_early="${packages_early}" \
packages_remove="${packages_remove}" \
uboot_type="${uboot_type}" \
patched="${patched}" \
http_proxy="${http_apt_proxy:-${http_proxy:-}}" \
......
......@@ -9,6 +9,12 @@ packages_early="
librem5-base-defaults
"
# Packages to remove at the end of the installation. Useful
# to e.g. drop recommends that got pulled in
packages_remove="
rsyslog
"
# Packages that, if installed, are patched (need to have a magic tag in their
# version number). See https://source.puri.sm/snippets/20
patched=""
......@@ -17,6 +17,7 @@
: "${fdt_file:-}"
: "${kernel_deb:-}"
: "${packages_early:-}"
: "${packages_remove:-}"
: "${patched:-}"
: "${qemu:-}"
: "${uboot_type:-}"
......@@ -264,7 +265,8 @@ function setup_journal()
# Enable systemd journal
chroot "${basedir}" mkdir -p /var/log/journal
chroot "${basedir}" systemd-tmpfiles --create --prefix /var/log/journal
chroot "${basedir}" apt-get -y remove rsyslog
# shellcheck disable=SC2086
chroot "${basedir}" apt-get -y remove ${packages_remove}
for l in daemon messages syslog kern mail user; do
chroot "${basedir}" rm -f /var/log/${l}.*
done
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment