mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-07 13:06:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

*: Drop unused pkgdb stuff

Browse Source
This commit is contained in:
Krzesimir Nowak 2023-07-04 14:18:17 +02:00
parent 16fee4f5b1
commit ec723be9d9
4 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build_library/vm_image_util.sh
View File

@ -71,7 +71,6 @@ VM_IMG_TYPE=DEFAULT
# Set at runtime to the source and destination image paths # Set at runtime to the source and destination image paths
VM_SRC_IMG= VM_SRC_IMG=
VM_SRC_PKGDB=
VM_SRC_SYSEXT_IMG= VM_SRC_SYSEXT_IMG=
VM_TMP_IMG= VM_TMP_IMG=
VM_TMP_DIR= VM_TMP_DIR=
@ -364,17 +363,12 @@ set_vm_paths() {
local src_dir="${1}"; shift local src_dir="${1}"; shift
local dst_dir="${1}"; shift local dst_dir="${1}"; shift
local src_name="${1}"; shift local src_name="${1}"; shift
local pkgdb_name="${1}"; shift
local sysext_base_name="${1}"; shift local sysext_base_name="${1}"; shift
VM_SRC_IMG="${src_dir}/${src_name}" VM_SRC_IMG="${src_dir}/${src_name}"
if [[ ! -f "${VM_SRC_IMG}" ]]; then if [[ ! -f "${VM_SRC_IMG}" ]]; then
die "Source image does not exist: ${VM_SRC_IMG}" die "Source image does not exist: ${VM_SRC_IMG}"
fi 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}" VM_SRC_SYSEXT_IMG="${src_dir}/${sysext_base_name}"
if [[ ! -f "${VM_SRC_SYSEXT_IMG}" ]]; then if [[ ! -f "${VM_SRC_SYSEXT_IMG}" ]]; then
die "Sysext base image does not exist: ${VM_SRC_SYSEXT_IMG}" die "Sysext base image does not exist: ${VM_SRC_SYSEXT_IMG}"

2
ci-automation/vms.sh
View File

@ -105,7 +105,7 @@ function _vm_build_impl() {
local images_in="images-in/" local images_in="images-in/"
local file local file
rm -rf "${images_in}" 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}" copy_from_buildcache "images/${arch}/${vernum}/${file}" "${images_in}"
done done
lbunzip2 "${images_in}/flatcar_production_image.bin.bz2" lbunzip2 "${images_in}/flatcar_production_image.bin.bz2"

1
common.sh
View File

@ -425,7 +425,6 @@ BUILD_DIR=
# Standard filenames # Standard filenames
FLATCAR_DEVELOPER_CONTAINER_NAME="flatcar_developer_container.bin" FLATCAR_DEVELOPER_CONTAINER_NAME="flatcar_developer_container.bin"
FLATCAR_PRODUCTION_IMAGE_NAME="flatcar_production_image.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" FLATCAR_PRODUCTION_IMAGE_SYSEXT_BASE="flatcar_production_image_sysext.squashfs"
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------

2
image_to_vm.sh
View File

@ -105,7 +105,7 @@ if [ -f "${FLAGS_from}/version.txt" ]; then
FLATCAR_VERSION_STRING="${FLATCAR_VERSION}" FLATCAR_VERSION_STRING="${FLATCAR_VERSION}"
fi 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 # Make sure things are cleaned up on failure
trap vm_cleanup EXIT trap vm_cleanup EXIT