From 066deb9d093c30796ad1ba86b5c5b4d4c73bf6d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kai=20L=C3=BCke?= <kai@kinvolk.io>
Date: Thu, 7 May 2020 15:50:58 +0200
Subject: [PATCH] build_packages: Add flag to ignore some binary packages

When the ebuild file changed but not its version nor its cross-workon
commit, the binary package would be used. Also some dependencies are not
encoded to trigger a rebuild of depending packages.
Allow to exclude some binary packages so that we can be sure that they
are rebuilt.
---
 build_packages      | 5 +++++
 jenkins/packages.sh | 1 +
 2 files changed, 6 insertions(+)

diff --git a/build_packages b/build_packages
index 1e0822459f..2aeea80033 100755
--- a/build_packages
+++ b/build_packages
@@ -18,6 +18,8 @@ DEFINE_boolean usepkg "${FLAGS_TRUE}" \
   "Use binary packages when possible."
 DEFINE_boolean usepkgonly "${FLAGS_FALSE}" \
   "Only use/download binary packages. Implies --noworkon"
+DEFINE_string usepkg_exclude "" \
+  "Exclude these binary packages."
 DEFINE_boolean getbinpkg "${FLAGS_TRUE}" \
   "Download binary packages from remote repository."
 DEFINE_string getbinpkgver "" \
@@ -154,6 +156,9 @@ if [[ "${FLAGS_usepkg}" -eq "${FLAGS_TRUE}" ]]; then
   if [[ "${FLAGS_getbinpkg}" -eq "${FLAGS_TRUE}" ]]; then
       EMERGE_FLAGS+=( --getbinpkg )
   fi
+  if [[ -n "${FLAGS_usepkg_exclude}"  ]]; then
+    EMERGE_FLAGS+=("--usepkg-exclude=${FLAGS_usepkg_exclude}")
+  fi
 fi
 
 if [[ "${FLAGS_jobs}" -ne -1 ]]; then
diff --git a/jenkins/packages.sh b/jenkins/packages.sh
index 07b6d3b6d6..8820b47b57 100644
--- a/jenkins/packages.sh
+++ b/jenkins/packages.sh
@@ -44,6 +44,7 @@ script setup_board \
 script build_packages \
     --board="${BOARD}" \
     --getbinpkgver=${RELEASE_BASE:-"${FLATCAR_VERSION}" --toolchainpkgonly} \
+    --usepkg_exclude="${BINARY_PACKAGES_TO_EXCLUDE}" \
     --skip_chroot_upgrade \
     --skip_torcx_store \
     --sign="${SIGNING_USER}" \