From d4b35a0272489786f7933642a3fca527f4eb45f4 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 2 Jul 2022 21:53:09 -0400 Subject: [PATCH] zbm-build.sh: don't upgrade packages when installing custom software In cases where the `zfs` package has been updated since the container image was built, this would trigger an upgrade of `zfs`; however, the container does not include Linux headers by default, so the rebuild will fail. Instead, skip the package upgrade. In the worst case, adding new packages fails and the container image must be rebuilt. --- releng/docker/zbm-build.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/releng/docker/zbm-build.sh b/releng/docker/zbm-build.sh index 800a1a4..6bd0f39 100755 --- a/releng/docker/zbm-build.sh +++ b/releng/docker/zbm-build.sh @@ -123,12 +123,11 @@ if [ -z "${ZBMTAG}" ]; then fi if [ "${#PACKAGES[@]}" -gt 0 ]; then - # Trigger an upgrade to make sure the package is installable + # Trigger a sync and upgrade to make sure the package is installable xbps-install -Syu xbps - xbps-install -Syu # Install all requested packages - xbps-install -y "${PACKAGES[@]}" + xbps-install -Sy "${PACKAGES[@]}" fi # shellcheck disable=SC2010