From 79294342a99657da134347266160a7332dc77d77 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Mon, 11 Mar 2024 12:49:50 +0000 Subject: [PATCH] build_library: Place EXTRA_SYSEXTS in a separate file This allows it to be sourced from other scripts and used e.g. in generating an image changes summary. Signed-off-by: Jeremi Piotrowski --- build_image | 1 + build_library/extra_sysexts.sh | 3 +++ build_library/prod_image_util.sh | 4 ---- 3 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 build_library/extra_sysexts.sh diff --git a/build_image b/build_image index 1e8f2cd024..e916d0df1b 100755 --- a/build_image +++ b/build_image @@ -104,6 +104,7 @@ fi . "${BUILD_LIBRARY_DIR}/dev_container_util.sh" || exit 1 . "${BUILD_LIBRARY_DIR}/test_image_content.sh" || exit 1 . "${BUILD_LIBRARY_DIR}/vm_image_util.sh" || exit 1 +. "${BUILD_LIBRARY_DIR}/extra_sysexts.sh" || exit 1 PROD_IMAGE=0 PROD_TAR=0 diff --git a/build_library/extra_sysexts.sh b/build_library/extra_sysexts.sh new file mode 100644 index 0000000000..d2ace25536 --- /dev/null +++ b/build_library/extra_sysexts.sh @@ -0,0 +1,3 @@ +EXTRA_SYSEXTS=( + zfs:sys-fs/zfs +) diff --git a/build_library/prod_image_util.sh b/build_library/prod_image_util.sh index 02c0571d09..1251d3a4fe 100755 --- a/build_library/prod_image_util.sh +++ b/build_library/prod_image_util.sh @@ -248,10 +248,6 @@ create_prod_tar() { upload_image "${container}" } -EXTRA_SYSEXTS=( - zfs:sys-fs/zfs -) - create_prod_sysexts() { local image_name="$1" local image_sysext_base="${image_name%.bin}_sysext.squashfs"