From ec723be9d9bc39ee7a26672978946c1dce868346 Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <knowak@microsoft.com>
Date: Tue, 4 Jul 2023 14:18:17 +0200
Subject: [PATCH] *: Drop unused pkgdb stuff

---
 build_library/vm_image_util.sh | 6 ------
 ci-automation/vms.sh           | 2 +-
 common.sh                      | 1 -
 image_to_vm.sh                 | 2 +-
 4 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh
index 22a5685522..0cf4154de3 100644
--- a/build_library/vm_image_util.sh
+++ b/build_library/vm_image_util.sh
@@ -71,7 +71,6 @@ VM_IMG_TYPE=DEFAULT
 
 # Set at runtime to the source and destination image paths
 VM_SRC_IMG=
-VM_SRC_PKGDB=
 VM_SRC_SYSEXT_IMG=
 VM_TMP_IMG=
 VM_TMP_DIR=
@@ -364,17 +363,12 @@ set_vm_paths() {
     local src_dir="${1}"; shift
     local dst_dir="${1}"; shift
     local src_name="${1}"; shift
-    local pkgdb_name="${1}"; shift
     local sysext_base_name="${1}"; shift
 
     VM_SRC_IMG="${src_dir}/${src_name}"
     if [[ ! -f "${VM_SRC_IMG}" ]]; then
         die "Source image does not exist: ${VM_SRC_IMG}"
     fi
-    VM_SRC_PKGDB="${src_dir}/${pkgdb_name}"
-    if [[ ! -f "${VM_SRC_PKGDB}" ]]; then
-        die "Source package database does not exist: ${VM_SRC_PKGDB}"
-    fi
     VM_SRC_SYSEXT_IMG="${src_dir}/${sysext_base_name}"
     if [[ ! -f "${VM_SRC_SYSEXT_IMG}" ]]; then
         die "Sysext base image does not exist: ${VM_SRC_SYSEXT_IMG}"
diff --git a/ci-automation/vms.sh b/ci-automation/vms.sh
index f3e8e42dac..1a64b7fda8 100644
--- a/ci-automation/vms.sh
+++ b/ci-automation/vms.sh
@@ -105,7 +105,7 @@ function _vm_build_impl() {
     local images_in="images-in/"
     local file
     rm -rf "${images_in}"
-    for file in flatcar_production_image.bin.bz2 flatcar_production_image_pkgdb.tar.xz flatcar_production_image_sysext.squashfs version.txt; do
+    for file in flatcar_production_image.bin.bz2 flatcar_production_image_sysext.squashfs version.txt; do
         copy_from_buildcache "images/${arch}/${vernum}/${file}" "${images_in}"
     done
     lbunzip2 "${images_in}/flatcar_production_image.bin.bz2"
diff --git a/common.sh b/common.sh
index cb7a35b1ee..0ca5346878 100644
--- a/common.sh
+++ b/common.sh
@@ -425,7 +425,6 @@ BUILD_DIR=
 # Standard filenames
 FLATCAR_DEVELOPER_CONTAINER_NAME="flatcar_developer_container.bin"
 FLATCAR_PRODUCTION_IMAGE_NAME="flatcar_production_image.bin"
-FLATCAR_PRODUCTION_IMAGE_PKGDB_NAME="flatcar_production_image_pkgdb.tar.xz"
 FLATCAR_PRODUCTION_IMAGE_SYSEXT_BASE="flatcar_production_image_sysext.squashfs"
 
 # -----------------------------------------------------------------------------
diff --git a/image_to_vm.sh b/image_to_vm.sh
index 91e489b0c3..2a6c144766 100755
--- a/image_to_vm.sh
+++ b/image_to_vm.sh
@@ -105,7 +105,7 @@ if [ -f "${FLAGS_from}/version.txt" ]; then
     FLATCAR_VERSION_STRING="${FLATCAR_VERSION}"
 fi
 
-set_vm_paths "${FLAGS_from}" "${FLAGS_to}" "${FLATCAR_PRODUCTION_IMAGE_NAME}" "${FLATCAR_PRODUCTION_IMAGE_PKGDB_NAME}" "${FLATCAR_PRODUCTION_IMAGE_SYSEXT_BASE}"
+set_vm_paths "${FLAGS_from}" "${FLAGS_to}" "${FLATCAR_PRODUCTION_IMAGE_NAME}" "${FLATCAR_PRODUCTION_IMAGE_SYSEXT_BASE}"
 
 # Make sure things are cleaned up on failure
 trap vm_cleanup EXIT