Modify spec file to create multiple packages

To separate delta.cfg for boot and platform image, two packages are
added:
 * upgrade-tools-generic-boot-rpi4
 * upgrade-tools-generic-platform

delta.cfg is separated into two different directories:
 * configs/rpi4/boot/delta.cfg (for boot image)
 * configs/rpi4/platform/delta.cfg (for platform image)

Change-Id: I56cc6e5d9a86a82c32cd3aa56303f44634d7b262
Signed-off-by: SangYoun Kwak <sy.kwak@samsung.com>

diff --git a/configs/rpi4/boot/delta.cfg b/configs/rpi4/boot/delta.cfg
new file mode 100644 (file)
index 0000000..ab4fe58
--- /dev/null
+++ b/configs/rpi4/boot/delta.cfg
@@ -0,0 +1,5 @@
+# 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_IMAGE:AT_BOOT_FOTA                /dev/mmcblk0p10 0
+modules                        modules.img             modules.img             FULL_IMAGE:BEFORE_BOOT_FOTA             /dev/mmcblk0p6  0

diff --git a/configs/rpi4/platform/delta.cfg b/configs/rpi4/platform/delta.cfg
new file mode 100644 (file)
index 0000000..6e24091
--- /dev/null
+++ b/configs/rpi4/platform/delta.cfg
@@ -0,0 +1,5 @@
+# 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_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/packaging/upgrade-tools-generic.spec b/packaging/upgrade-tools-generic.spec
index 96403236b2142cff13a88eb0b92295d2d7133e7f..993873f1c795d5eb645bbb7212ab3272bd68ae50 100644 (file)
--- a/packaging/upgrade-tools-generic.spec
+++ b/packaging/upgrade-tools-generic.spec
@@ -1,6 +1,9 @@
-%define install_path /%{name}
-%define mk_delta_install_path %{install_path}/mk_delta
-%define scripts_install_path %{install_path}/scripts
+%define install_path %{name}
+%define install_path_boot_rpi4 %{name}-boot-rpi4
+%define install_path_platform %{name}-platform
+%define config_path_rpi4 mk_delta/rpi4/cfg
+%define config_path_platform mk_delta/platform/cfg
+%define scripts_path scripts
 
 Name:           upgrade-tools-generic
 Version:        1.0.0
@@ -17,6 +20,17 @@ BuildRequires:  cmake
 %description
 This is a dummy package
 
+
+%package        boot-rpi4
+Summary:        Delta config for boot image of rpi4
+%description    boot-rpi4
+Delta config for boot image of rpi4
+
+%package        platform
+Summary:        Delta config for platform image
+%description    platform
+Delta config for platform image
+
 %prep
 %setup -q
 %cmake .
@@ -26,10 +40,33 @@ make %{?jobs:-j%jobs}
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}/%{mk_delta_install_path}
-mkdir -p %{buildroot}/%{scripts_install_path}
-cp -r ./rpi4 %{buildroot}/%{mk_delta_install_path}/.
-cp scripts/* %{buildroot}/%{scripts_install_path}/.
+
+# upgrade-tools-generic
+mkdir -p %{buildroot}/%{install_path}
+mkdir -p %{buildroot}/%{install_path}/%{config_path_rpi4}
+mkdir -p %{buildroot}/%{install_path}/%{scripts_path}
+cat $(find configs -name 'delta.cfg') > %{buildroot}/%{install_path}/%{config_path_rpi4}/delta.cfg
+cp scripts/* %{buildroot}/%{install_path}/%{scripts_path}/.
+
+# upgrade-tools-generic-boot-rpi4
+mkdir -p %{buildroot}/%{install_path_boot_rpi4}
+mkdir -p %{buildroot}/%{install_path_boot_rpi4}/%{config_path_rpi4}
+mkdir -p %{buildroot}/%{install_path_boot_rpi4}/%{scripts_path}
+cp ./configs/rpi4/boot/delta.cfg %{buildroot}/%{install_path_boot_rpi4}/%{config_path_rpi4}/.
+cp scripts/* %{buildroot}/%{install_path_boot_rpi4}/%{scripts_path}/.
+
+# upgrade-tools-generic-platform
+mkdir -p %{buildroot}/%{install_path_platform}
+mkdir -p %{buildroot}/%{install_path_platform}/%{config_path_platform}
+mkdir -p %{buildroot}/%{install_path_platform}/%{scripts_path}
+cp ./configs/rpi4/platform/delta.cfg %{buildroot}/%{install_path_platform}/%{config_path_platform}/.
+cp scripts/* %{buildroot}/%{install_path_platform}/%{scripts_path}/.
 
 %files
-%{install_path}/*
+/%{install_path}/*
+
+%files          boot-rpi4
+/%{install_path_boot_rpi4}/*
+
+%files          platform
+/%{install_path_platform}/*

diff --git a/rpi4/cfg/delta.cfg b/rpi4/cfg/delta.cfg
deleted file mode 100644 (file)
index 09380e1..0000000
--- a/rpi4/cfg/delta.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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_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_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