Update partition info file

To support dtb files, all dtbs are included. In addition, to specify
the board, now partition file has the name of the board as prefix.

Change-Id: I1278108ac90ce2d6b5e3f93c05fd1b9048f3abe8
Signed-off-by: Dongwoo Lee <dwoo08.lee@samsung.com>

diff --git a/data/partition_rpi3.info b/data/partition_rpi3.info
new file mode 100644 (file)
index 0000000..8acd369
--- /dev/null
+++ b/data/partition_rpi3.info
@@ -0,0 +1,12 @@
+p:/dev/mmcblk0p1:boot.img:x
+p:/dev/mmcblk0p2:rootfs.img:x
+p:/dev/mmcblk0p3:system-data.img:x
+p:/dev/mmcblk0p5:user.img:x
+p:/dev/mmcblk0p6:modules.img:x
+p:/dev/mmcblk0p7:ramdisk.img:x
+p:/dev/mmcblk0p8:ramdisk-recovery.img:x
+f:/dev/mmcblk0p1:Image:/
+f:/dev/mmcblk0p1:bcm2710-rpi-3-b-plus.dtb:/
+f:/dev/mmcblk0p1:bcm2710-rpi-cm3.dtb:/
+f:/dev/mmcblk0p1:bcm2710-rpi-3-b.dtb:/
+f:/dev/mmcblk0p1:bcm2837-rpi-3-b.dtb:/

diff --git a/packaging/initrd-flash.spec b/packaging/initrd-flash.spec
index d36b5ceb68a4a75fe2ebdcf9874653aa5f66e137..2f76d45b7169cd0504d056fc835cd6363433fc3c 100644 (file)
--- a/packaging/initrd-flash.spec
+++ b/packaging/initrd-flash.spec
@@ -47,10 +47,13 @@ cp ./scripts/flash-init.sh %{buildroot}%{init_script_dir}/flash-init.sh
 mkdir -p %{buildroot}%{_datadir}/initrd-recovery/initrd.list.d
 cp ./scripts/41-flash.list %{buildroot}%{_datadir}/initrd-recovery/initrd.list.d
 
-cp ./partition.info %{buildroot}%{_datadir}/partition.info
+cp ./data/partition_* %{buildroot}%{_datadir}/
 
 %post
 
+%post -n fm-data-rpi3
+mv %{_datadir}/partition_rpi3.info %{_datadir}/partition.info
+
 %postun
 
 %files
@@ -61,4 +64,4 @@ cp ./partition.info %{buildroot}%{_datadir}/partition.info
 %attr(700,root,root) %{_datadir}/initrd-recovery/initrd.list.d/*.list
 
 %files -n fm-data-rpi3
-%attr(700,root,root) %{_datadir}/partition.info
+%attr(700,root,root) %{_datadir}/partition_rpi3.info

diff --git a/partition.info b/partition.info
deleted file mode 100644 (file)
index 6ad1cb6..0000000
--- a/partition.info
+++ /dev/null
@@ -1,8 +0,0 @@
-p:/dev/mmcblk0p1:boot.img:x
-p:/dev/mmcblk0p2:rootfs.img:x
-p:/dev/mmcblk0p3:system-data.img:x
-p:/dev/mmcblk0p5:user.img:x
-p:/dev/mmcblk0p6:modules.img:x
-p:/dev/mmcblk0p7:ramdisk.img:x
-p:/dev/mmcblk0p8:ramdisk-recovery.img:x
-f:/dev/mmcblk0p1:Image:/