packaging: move firmware file to data directory

Move firmare file to data directory from /lib/firmware/brcm/.

Change-Id: I5d37d3fda035bc271fb62ef0c8f8b2926828fbf1
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>

diff --git a/packaging/initrd-flash.spec b/packaging/initrd-flash.spec
index 9bfc980..d6dc741 100644 (file)
--- a/packaging/initrd-flash.spec
+++ b/packaging/initrd-flash.spec
@@ -52,11 +52,11 @@ cp ./scripts/41-flash.list %{buildroot}%{_datadir}/initrd-recovery/initrd.list.d
 
 cp ./data/partition_* %{buildroot}%{_datadir}/
 
-mkdir -p %{buildroot}%{_libdir}/firmware/brcm
-cp ./data/brcmfmac* %{buildroot}%{_libdir}/firmware/brcm
-cp ./data/LICENCE.broadcom_bcm43xx %{buildroot}%{_libdir}/firmware/brcm
-cp ./data/hostapd.conf %{buildroot}%{_libdir}/firmware/brcm
-cp ./data/dnsmasq.conf %{buildroot}%{_libdir}/firmware/brcm
+mkdir -p %{buildroot}%{_datadir}/firmware/brcm
+cp ./data/brcmfmac* %{buildroot}%{_datadir}/firmware/brcm
+cp ./data/LICENCE.broadcom_bcm43xx %{buildroot}%{_datadir}/firmware/brcm
+cp ./data/hostapd.conf %{buildroot}%{_datadir}/firmware/brcm
+cp ./data/dnsmasq.conf %{buildroot}%{_datadir}/firmware/brcm
 
 %post
 
@@ -71,10 +71,10 @@ mv %{_datadir}/partition_rpi3.info %{_datadir}/partition.info
 %attr(700,root,root) %{_bindir}/flash-manager
 %attr(700,root,root) %{init_script_dir}/*.sh
 %attr(700,root,root) %{_datadir}/initrd-recovery/initrd.list.d/*.list
-%attr(700,root,root) %{_libdir}/firmware/brcm/brcmfmac*
-%attr(700,root,root) %{_libdir}/firmware/brcm/LICENCE.broadcom_bcm43xx
-%attr(700,root,root) %{_libdir}/firmware/brcm/hostapd.conf
-%attr(700,root,root) %{_libdir}/firmware/brcm/dnsmasq.conf
 
 %files -n fm-data-rpi3
 %attr(700,root,root) %{_datadir}/partition_rpi3.info
+%attr(700,root,root) %{_datadir}/firmware/brcm/brcmfmac*
+%attr(700,root,root) %{_datadir}/firmware/brcm/LICENCE.broadcom_bcm43xx
+%attr(700,root,root) %{_datadir}/firmware/brcm/hostapd.conf
+%attr(700,root,root) %{_datadir}/firmware/brcm/dnsmasq.conf

diff --git a/scripts/41-flash.list b/scripts/41-flash.list
index 3f165d1..66a2c69 100755 (executable)
--- a/scripts/41-flash.list
+++ b/scripts/41-flash.list
@@ -2,6 +2,13 @@
 MVWITHLIBS="
 /usr/lib/initrd-recovery/flash/flash-init.sh
 /bin/flash-manager
+/usr/share/firmware/brcm/brcmfmac43430-sdio.bin
+/usr/share/firmware/brcm/brcmfmac43455-sdio.bin
+/usr/share/firmware/brcm/brcmfmac43430-sdio.txt
+/usr/share/firmware/brcm/brcmfmac43455-sdio.txt
+/usr/share/firmware/brcm/LICENCE.broadcom_bcm43xx
+/usr/share/firmware/brcm/hostapd.conf
+/usr/share/firmware/brcm/dnsmasq.conf
 "
 
 WITHLIBS="
@@ -29,11 +36,4 @@ SYMLINKS="
 
 VERBATIMS="
 /usr/share/partition.info
-/usr/lib/firmware/brcm/brcmfmac43430-sdio.bin
-/usr/lib/firmware/brcm/brcmfmac43455-sdio.bin
-/usr/lib/firmware/brcm/brcmfmac43430-sdio.txt
-/usr/lib/firmware/brcm/brcmfmac43455-sdio.txt
-/usr/lib/firmware/brcm/LICENCE.broadcom_bcm43xx
-/usr/lib/firmware/brcm/hostapd.conf
-/usr/lib/firmware/brcm/dnsmasq.conf
 "