projects / platform / core / system / upgrade-tools.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 007bcdf)
Drop DELTA_FS image generation
authorKarol Lewandowski <k.lewandowsk@samsung.com>
Thu, 21 Jul 2022 12:48:20 +0000 (14:48 +0200)
committerKarol Lewandowski <k.lewandowsk@samsung.com>
Thu, 21 Jul 2022 12:48:20 +0000 (14:48 +0200)
This commit changes all occurences of DELTA_FS with DELTA_IMAGE.
DELTA_FS is considered legacy and should not be used unless necessary.

Change-Id: I17dccac5ec532af2db0bb2e385c9871763956b38

mk_delta/artik530_710/cfg/delta.cfg patch | blob | history
mk_delta/rpi3/cfg/delta.cfg patch | blob | history
mk_delta/rpi4/cfg/delta.cfg patch | blob | history
mk_delta/tw1/cfg/delta.cfg patch | blob | history
mk_delta/tw2/cfg/delta.cfg patch | blob | history
mk_delta/tw3/cfg/delta.cfg patch | blob | history

diff --git a/mk_delta/artik530_710/cfg/delta.cfg b/mk_delta/artik530_710/cfg/delta.cfg
index 2eee482..55dd5b6 100644 (file)
--- a/mk_delta/artik530_710/cfg/delta.cfg
+++ b/mk_delta/artik530_710/cfg/delta.cfg
@@ -1,6 +1,6 @@
 # Configuration for generation of delta
 # Filesystem label, bin name (in tar), delta name, update type, blk dev, blk offset
 
-rootfs                         rootfs.img                              rootfs.img/                             DELTA_FS        /dev/mmcblk0p3                                  0
+rootfs                         rootfs.img                              rootfs.img                              DELTA_IMAGE:AT_BOOT_FOTA        /dev/mmcblk0p3                                  0
 ramdisk                                ramdisk.img                             ramdisk.img                             FULL_IMAGE:BEFORE_BOOT_FOTA             /tmp/boot/ramdisk.img                   0
 ramdisk-recovery       ramdisk-recovery.img    ramdisk-recovery.img    FULL_IMAGE:BEFORE_BOOT_FOTA             /tmp/boot/ramdisk-recovery.img  0
diff --git a/mk_delta/rpi3/cfg/delta.cfg b/mk_delta/rpi3/cfg/delta.cfg
index 1228590..cab40a7 100644 (file)
--- a/mk_delta/rpi3/cfg/delta.cfg
+++ b/mk_delta/rpi3/cfg/delta.cfg
@@ -1,8 +1,8 @@
 # Configuration for generation of delta
 # Filesystem label, bin name (in tar), delta name, update type, blk dev, blk offset
 BOOT                   boot.img                boot.img                FULL_IMAGE:BEFORE_BOOT_FOTA             /dev/mmcblk0p1  0
-hal                    hal.img                 hal.img/                DELTA_FS      /dev/mmcblk0p10 0
+hal                    hal.img                 hal.img                 DELTA_IMAGE:AT_BOOT_FOTA                /dev/mmcblk0p10 0
 modules                        modules.img             modules.img             FULL_IMAGE:BEFORE_BOOT_FOTA             /dev/mmcblk0p6  0
-rootfs                 rootfs.img              rootfs.img/             DELTA_FS        /dev/mmcblk0p2  0
-ramdisk                        ramdisk.img             ramdisk.img             FULL_IMAGE:AT_BOOT_FOTA /dev/mmcblk0p7  0
+rootfs                 rootfs.img              rootfs.img              DELTA_IMAGE:AT_BOOT_FOTA                /dev/mmcblk0p2  0
+ramdisk                        ramdisk.img             ramdisk.img             FULL_IMAGE:AT_BOOT_FOTA                 /dev/mmcblk0p7  0
 ramdisk-recovery       ramdisk-recovery.img    ramdisk-recovery.img    FULL_IMAGE:BEFORE_BOOT_FOTA             /dev/mmcblk0p8  0
diff --git a/mk_delta/rpi4/cfg/delta.cfg b/mk_delta/rpi4/cfg/delta.cfg
index 1228590..09380e1 100644 (file)
--- a/mk_delta/rpi4/cfg/delta.cfg
+++ b/mk_delta/rpi4/cfg/delta.cfg
@@ -1,8 +1,8 @@
 # Configuration for generation of delta
 # Filesystem label, bin name (in tar), delta name, update type, blk dev, blk offset
 BOOT                   boot.img                boot.img                FULL_IMAGE:BEFORE_BOOT_FOTA             /dev/mmcblk0p1  0
-hal                    hal.img                 hal.img/                DELTA_FS      /dev/mmcblk0p10 0
+hal                    hal.img                 hal.img                 DELTA_IMAGE:AT_BOOT_FOTA                /dev/mmcblk0p10 0
 modules                        modules.img             modules.img             FULL_IMAGE:BEFORE_BOOT_FOTA             /dev/mmcblk0p6  0
-rootfs                 rootfs.img              rootfs.img/             DELTA_FS        /dev/mmcblk0p2  0
-ramdisk                        ramdisk.img             ramdisk.img             FULL_IMAGE:AT_BOOT_FOTA /dev/mmcblk0p7  0
+rootfs                 rootfs.img              rootfs.img              DELTA_IMAGE:AT_BOOT_FOTA                /dev/mmcblk0p2  0
+ramdisk                        ramdisk.img             ramdisk.img             FULL_IMAGE:AT_BOOT_FOTA                 /dev/mmcblk0p7  0
 ramdisk-recovery       ramdisk-recovery.img    ramdisk-recovery.img    FULL_IMAGE:BEFORE_BOOT_FOTA             /dev/mmcblk0p8  0
diff --git a/mk_delta/tw1/cfg/delta.cfg b/mk_delta/tw1/cfg/delta.cfg
index 8eb9ac6..e8b6ad5 100755 (executable)
--- a/mk_delta/tw1/cfg/delta.cfg
+++ b/mk_delta/tw1/cfg/delta.cfg
@@ -1,8 +1,8 @@
 # Configuration for generation of delta
 # Partition Name (in PIT), bin name (in tar), delta name, update type, blk dev, blk offset
 
-rootfs         rootfs.img              rootfs.img/             DELTA_FS        /dev/mmcblk0p13         0
-boot           zImage                  delta.boot              FULL_IMAGE:AT_BOOT_FOTA /dev/mmcblk0p6          0
-recovery       zImage-recovery         zImage-recovery         FULL_IMAGE:BEFORE_BOOT_FOTA             /dev/mmcblk0p7          0
-ramdisk1       ramdisk.img             ramdisk.img             FULL_IMAGE:AT_BOOT_FOTA /dev/mmcblk0p8          0
-ramdisk2       ramdisk-recovery.img    ramdisk-recovery.img    FULL_IMAGE:BEFORE_BOOT_FOTA             /dev/mmcblk0p4          0
+rootfs         rootfs.img              rootfs.img              DELTA_IMAGE:AT_BOOT_FOTA        /dev/mmcblk0p13         0
+boot           zImage                  delta.boot              FULL_IMAGE:AT_BOOT_FOTA         /dev/mmcblk0p6          0
+recovery       zImage-recovery         zImage-recovery         FULL_IMAGE:BEFORE_BOOT_FOTA     /dev/mmcblk0p7          0
+ramdisk1       ramdisk.img             ramdisk.img             FULL_IMAGE:AT_BOOT_FOTA         /dev/mmcblk0p8          0
+ramdisk2       ramdisk-recovery.img    ramdisk-recovery.img    FULL_IMAGE:BEFORE_BOOT_FOTA     /dev/mmcblk0p4          0
diff --git a/mk_delta/tw2/cfg/delta.cfg b/mk_delta/tw2/cfg/delta.cfg
index a69bb53..00849c8 100755 (executable)
--- a/mk_delta/tw2/cfg/delta.cfg
+++ b/mk_delta/tw2/cfg/delta.cfg
@@ -1,8 +1,8 @@
 # Configuration for generation of delta
 # Partition Name (in PIT), bin name (in tar), delta name, update type, blk dev, blk offset
 
-rootfs         rootfs.img              rootfs.img/             DELTA_FS        /dev/mmcblk0p15         0
-boot           dzImage                 delta.boot              FULL_IMAGE:AT_BOOT_FOTA /dev/mmcblk0p8          0
-recovery       dzImage-recovery        dzImage-recovery        FULL_IMAGE:BEFORE_BOOT_FOTA             /dev/mmcblk0p9          0
-ramdisk1       ramdisk.img             ramdisk.img             FULL_IMAGE:AT_BOOT_FOTA /dev/mmcblk0p5          0
-ramdisk2       ramdisk-recovery.img    ramdisk-recovery.img    FULL_IMAGE:BEFORE_BOOT_FOTA             /dev/mmcblk0p4          0
+rootfs         rootfs.img              rootfs.img              DELTA_IMAGE:AT_BOOT_FOTA        /dev/mmcblk0p15         0
+boot           dzImage                 delta.boot              FULL_IMAGE:AT_BOOT_FOTA         /dev/mmcblk0p8          0
+recovery       dzImage-recovery        dzImage-recovery        FULL_IMAGE:BEFORE_BOOT_FOTA     /dev/mmcblk0p9          0
+ramdisk1       ramdisk.img             ramdisk.img             FULL_IMAGE:AT_BOOT_FOTA         /dev/mmcblk0p5          0
+ramdisk2       ramdisk-recovery.img    ramdisk-recovery.img    FULL_IMAGE:BEFORE_BOOT_FOTA     /dev/mmcblk0p4          0
diff --git a/mk_delta/tw3/cfg/delta.cfg b/mk_delta/tw3/cfg/delta.cfg
index 34ea8dc..5521f94 100755 (executable)
--- a/mk_delta/tw3/cfg/delta.cfg
+++ b/mk_delta/tw3/cfg/delta.cfg
@@ -1,8 +1,8 @@
 # Configuration for generation of delta
 # Partition Name (in PIT), bin name (in tar), delta name, update type, blk dev, blk offset
 
-rootfs         rootfs.img              rootfs.img/             DELTA_FS        /dev/mmcblk0p18         0
-boot           dzImage                 delta.boot              FULL_IMAGE:AT_BOOT_FOTA /dev/mmcblk0p11         0
-recovery       dzImage-recovery        dzImage-recovery        FULL_IMAGE:BEFORE_BOOT_FOTA             /dev/mmcblk0p12         0
-ramdisk1       ramdisk.img             ramdisk.img             FULL_IMAGE:AT_BOOT_FOTA /dev/mmcblk0p8          0
-ramdisk2       ramdisk-recovery.img    ramdisk-recovery.img    FULL_IMAGE:BEFORE_BOOT_FOTA             /dev/mmcblk0p7          0
+rootfs         rootfs.img              rootfs.img              DELTA_IMAGE:AT_BOOT_FOTA        /dev/mmcblk0p18         0
+boot           dzImage                 delta.boot              FULL_IMAGE:AT_BOOT_FOTA         /dev/mmcblk0p11         0
+recovery       dzImage-recovery        dzImage-recovery        FULL_IMAGE:BEFORE_BOOT_FOTA     /dev/mmcblk0p12         0
+ramdisk1       ramdisk.img             ramdisk.img             FULL_IMAGE:AT_BOOT_FOTA         /dev/mmcblk0p8          0
+ramdisk2       ramdisk-recovery.img    ramdisk-recovery.img    FULL_IMAGE:BEFORE_BOOT_FOTA     /dev/mmcblk0p7          0
Domain: System / System Framework;