From 155f24c67998d21396889e84826b3207290618f6 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Wed, 28 Aug 2019 09:50:25 +0200
Subject: [PATCH] 2234.99.0

---
 build_library/grub.cfg              | 2 +-
 build_library/qemu_template.sh      | 2 +-
 build_library/test_image_content.sh | 1 +
 build_torcx_store                   | 4 +---
 jenkins/packages.sh                 | 4 ++--
 jenkins/sdk.sh                      | 7 ++++++-
 jenkins/toolchains.sh               | 7 ++++++-
 7 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/build_library/grub.cfg b/build_library/grub.cfg
index c229cf35cd..402e35cf5a 100644
--- a/build_library/grub.cfg
+++ b/build_library/grub.cfg
@@ -19,7 +19,7 @@ set randomize_disk_guid=""
 set oem_id=""
 
 # Anything else the OEM adds should use this variable.
-set linux_append=""
+set linux_append="systemd.unified_cgroup_hierarchy=false systemd.legacy_systemd_cgroup_controller=false"
 
 set secure_boot="0"
 
diff --git a/build_library/qemu_template.sh b/build_library/qemu_template.sh
index 3621956a53..e287f1b958 100755
--- a/build_library/qemu_template.sh
+++ b/build_library/qemu_template.sh
@@ -201,7 +201,7 @@ if [ -n "${VM_PFLASH_RO}" ] && [ -n "${VM_PFLASH_RW}" ]; then
 fi
 
 if [ -n "${IGNITION_CONFIG_FILE}" ]; then
-    set -- -fw_cfg name=opt/org.flatcar-linux/config,file="${IGNITION_CONFIG_FILE}" "$@"
+    set -- -fw_cfg name=opt/com.coreos/config,file="${IGNITION_CONFIG_FILE}" "$@"
 fi
 
 case "${VM_BOARD}" in
diff --git a/build_library/test_image_content.sh b/build_library/test_image_content.sh
index 1071465c04..5467fa9040 100644
--- a/build_library/test_image_content.sh
+++ b/build_library/test_image_content.sh
@@ -4,6 +4,7 @@
 
 GLSA_WHITELIST=(
 	201412-09 # incompatible CA certificate version numbers
+	201908-14 # polkit
 )
 
 glsa_image() {
diff --git a/build_torcx_store b/build_torcx_store
index 926182974d..cbf4c36ba4 100755
--- a/build_torcx_store
+++ b/build_torcx_store
@@ -237,14 +237,12 @@ function torcx_package() {
 # for each package will point at the last version specified.  This can handle
 # swapping default package versions for different OS releases by reordering.
 DEFAULT_IMAGES=(
-        =app-torcx/docker-1.12
-        =app-torcx/docker-18.06
+        =app-torcx/docker-19.03
 )
 
 # This list contains extra images which will be uploaded and included in the
 # generated manifest, but won't be included in the vendor store.
 EXTRA_IMAGES=(
-	=app-torcx/docker-17.03
 )
 
 mkdir -p "${BUILD_DIR}"
diff --git a/jenkins/packages.sh b/jenkins/packages.sh
index 07b6d3b6d6..fefe75f121 100644
--- a/jenkins/packages.sh
+++ b/jenkins/packages.sh
@@ -2,7 +2,7 @@
 
 # Use a ccache dir that persists across SDK recreations.
 # XXX: alternatively use a ccache dir that is usable by all jobs on a given node.
-mkdir -p ccache
+mkdir -p .cache/ccache
 
 enter() {
         local verify_key=
@@ -13,7 +13,7 @@ enter() {
         sudo ln -f "${GOOGLE_APPLICATION_CREDENTIALS}" \
             chroot/etc/portage/gangue.json
         bin/cork enter --bind-gpg-agent=false -- env \
-            CCACHE_DIR=/mnt/host/source/ccache \
+            CCACHE_DIR=/mnt/host/source/.cache/ccache \
             CCACHE_MAXSIZE=5G \
             FLATCAR_DEV_BUILDS="${DOWNLOAD_ROOT}" \
             {FETCH,RESUME}COMMAND_GS="/usr/bin/gangue get \
diff --git a/jenkins/sdk.sh b/jenkins/sdk.sh
index 2fe868bfb3..232bd6a4c4 100644
--- a/jenkins/sdk.sh
+++ b/jenkins/sdk.sh
@@ -13,8 +13,13 @@ gpg --import "${GPG_SECRET_KEY_FILE}"
 # Wipe all of catalyst.
 sudo rm -rf src/build
 
-enter sudo /mnt/host/source/src/scripts/bootstrap_sdk \
+S=/mnt/host/source/src/scripts
+enter sudo emerge -uv --jobs=2 catalyst
+enter sudo ${S}/bootstrap_sdk \
     --sign="${SIGNING_USER}" \
     --sign_digests="${SIGNING_USER}" \
     --upload_root="${UPLOAD_ROOT}" \
     --upload
+
+# Free some disk space only on success to allow debugging failures.
+sudo rm -rf src/build/catalyst/builds
diff --git a/jenkins/toolchains.sh b/jenkins/toolchains.sh
index 185cd95415..d90f2f3b7c 100644
--- a/jenkins/toolchains.sh
+++ b/jenkins/toolchains.sh
@@ -13,8 +13,13 @@ gpg --import "${GPG_SECRET_KEY_FILE}"
 # Wipe all of catalyst.
 sudo rm -rf src/build
 
-enter sudo /mnt/host/source/src/scripts/build_toolchains \
+S=/mnt/host/source/src/scripts
+enter sudo emerge -uv --jobs=2 catalyst
+enter sudo ${S}/build_toolchains \
     --sign="${SIGNING_USER}" \
     --sign_digests="${SIGNING_USER}" \
     --upload_root="${UPLOAD_ROOT}" \
     --upload
+
+# Free some disk space only on success to allow debugging failures.
+sudo rm -rf src/build/catalyst/builds