deleted file mode 100644
@@ -1,21 +0,0 @@
-#
-# CIP Core, generic profile
-#
-# Copyright (c) Siemens AG, 2022
-#
-# Authors:
-# Quirin Gylstorff <quirin.gylstorff@siemens.com>
-#
-# SPDX-License-Identifier: MIT
-#
-
-EXTRACT_PARTITIONS ?= "${IMAGE_FULLNAME}.wic.img.p4"
-
-do_compress_swupdate_rootfs () {
- for PARTITION in ${EXTRACT_PARTITIONS}; do
- if [ -e ${DEPLOY_DIR_IMAGE}/${PARTITION} ]; then
- rm -f ${DEPLOY_DIR_IMAGE}/${PARTITION}.gz
- gzip ${DEPLOY_DIR_IMAGE}/${PARTITION}
- fi
- done
-}
@@ -21,12 +21,10 @@ INITRD_IMAGE = "${INITRAMFS_RECIPE}-${DISTRO}-${MACHINE}.initrd.img"
inherit verity-img
inherit wic-img
-inherit compress_swupdate_rootfs
inherit swupdate-img
SOURCE_IMAGE_FILE = "${WIC_IMAGE_FILE}"
addtask do_verity_image after do_${SECURE_IMAGE_FSTYPE}_image
addtask do_wic_image after do_verity_image
-addtask do_compress_swupdate_rootfs after do_wic_image
-addtask do_swupdate_image after do_compress_swupdate_rootfs
+addtask do_swupdate_image after do_wic_image
@@ -24,6 +24,21 @@ do_swupdate_image() {
rm -f '${SWU_IMAGE_FILE}'
cp '${WORKDIR}/${SWU_DESCRIPTION_FILE}' '${WORKDIR}/swu/${SWU_DESCRIPTION_FILE}'
+ # Compress files if requested
+ for file in ${SWU_ADDITIONAL_FILES}; do
+ basefile=$(basename "$file" .gz)
+ if [ "$basefile" = "$file" ]; then
+ continue
+ fi
+ for uncompressed in "${WORKDIR}/$basefile" "${DEPLOY_DIR_IMAGE}/$basefile"; do
+ if [ -e "$uncompressed" ]; then
+ rm -f "$uncompressed.gz"
+ gzip "$uncompressed"
+ break
+ fi
+ done
+ done
+
# Create symlinks for files used in the update image
for file in ${SWU_ADDITIONAL_FILES}; do
if [ -e "${WORKDIR}/$file" ]; then
@@ -9,12 +9,9 @@
# SPDX-License-Identifier: MIT
#
-
inherit wic-img
-inherit compress_swupdate_rootfs
inherit swupdate-img
SOURCE_IMAGE_FILE = "${WIC_IMAGE_FILE}"
-addtask do_compress_swupdate_rootfs after do_wic_image
-addtask do_swupdate_image after do_compress_swupdate_rootfs
+addtask do_swupdate_image after do_wic_image
@@ -11,8 +11,7 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files/secure-boot:"
-EXTRACT_PARTITIONS = "${IMAGE_FULLNAME}.wic.img.p4"
-ROOTFS_PARTITION_NAME="${IMAGE_FULLNAME}.wic.img.p4.gz"
+ROOTFS_PARTITION_NAME = "${IMAGE_FULLNAME}.wic.img.p4.gz"
SRC_URI += "file://sw-description.tmpl"
TEMPLATE_FILES += "sw-description.tmpl"
@@ -11,11 +11,11 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-EXTRACT_PARTITIONS = "${IMAGE_FULLNAME}.wic.img.p4"
-ROOTFS_PARTITION_NAME="${IMAGE_FULLNAME}.wic.img.p4.gz"
+ROOTFS_PARTITION_NAME = "${IMAGE_FULLNAME}.wic.img.p4.gz"
SRC_URI += "file://sw-description.tmpl"
TEMPLATE_FILES += "sw-description.tmpl"
+
TEMPLATE_VARS += "PN ROOTFS_PARTITION_NAME KERNEL_IMAGE INITRD_IMAGE"
SWU_ADDITIONAL_FILES += "${INITRD_IMAGE} ${KERNEL_IMAGE} ${ROOTFS_PARTITION_NAME}"