Update install directory to support architecture difference

Some install directory can be differ from each architecture. So
use the install directory with packaging macro by configure file
setup of cmake.

Note: install init flie to libexec instead of libdir.

Change-Id: I479e631a47bfff55f14209eaa60928c7a96acd8b
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7c33f4a80106d681bb9766e879c68dbec8f9a9c6..6b4f625c3308ffb2fdbaad65868f1e17ce658530 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,3 +13,10 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src)
 TARGET_LINK_LIBRARIES(flash-manager "${CMAKE_THREAD_LIBS_INIT}" blkid usbgx)
 
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin)
+
+INSTALL(FILES scripts/flash-init.sh DESTINATION ${INITRD_FLASH_LIBEXEC_DIR})
+
+CONFIGURE_FILE(scripts/41-flash.list.in
+               scripts/41-flash.list
+               @ONLY)
+INSTALL(FILES scripts/41-flash.list DESTINATION ${INITRD_RECOVERY_INSTALL_DROPIN_DIR})

diff --git a/packaging/initrd-flash.spec b/packaging/initrd-flash.spec
index cb32b6bf631359ea8a31de26caa2d19399f310ce..c991b352f2f0f36e594f6668f1d60a7ddcf63ba0 100644 (file)
--- a/packaging/initrd-flash.spec
+++ b/packaging/initrd-flash.spec
@@ -1,6 +1,6 @@
 Name:       initrd-flash
 Summary:    Advanced flash-manager, package for building ramdisk-recovery.img
-Version:    0.0.1
+Version:    0.0.2
 Release:    0
 Group:      System/Utilities
 License:    Apache-2.0
@@ -31,12 +31,17 @@ Provides:   fm-data
 %description -n fm-data-rpi3
 Provide flash-manager with partition table for flashing image and files of Raspberry Pi 3 board
 
+%define init_script_dir %{_libdir}/initrd-recovery/flash
+%define initrd_recovery_install_dropin_dir %{_datadir}/initrd-recovery/initrd.list.d
+
 %prep
 %setup -q
 
 %build
 
-%cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
+%cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+        -DINITRD_FLASH_LIBEXEC_DIR=%{init_script_dir} \
+        -DINITRD_RECOVERY_INSTALL_DROPIN_DIR=%{initrd_recovery_install_dropin_dir}
 
 make %{?jobs:-j%jobs}
 
@@ -44,14 +49,6 @@ make %{?jobs:-j%jobs}
 
 %make_install
 
-%define init_script_dir %{_libdir}/initrd-recovery/flash
-
-mkdir -p %{buildroot}%{init_script_dir}
-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 ./data/partition_* %{buildroot}%{_datadir}/
 
 mkdir -p %{buildroot}%{_datadir}/firmware/brcm
@@ -72,7 +69,7 @@ mv %{_datadir}/partition_rpi3.info %{_datadir}/partition.info
 %license LICENSE
 %attr(775,root,root) %{_bindir}/flash-manager
 %attr(775,root,root) %{init_script_dir}/*.sh
-%{_datadir}/initrd-recovery/initrd.list.d/*.list
+%{initrd_recovery_install_dropin_dir}/*.list
 
 %files -n fm-data-rpi3
 %{_datadir}/partition_rpi3.info

diff --git a/scripts/41-flash.list b/scripts/41-flash.list
deleted file mode 100755 (executable)
index 450babe..0000000
--- a/scripts/41-flash.list
+++ /dev/null
@@ -1,37 +0,0 @@
-# ---- Target contents ----------------------------------------------------- #
-MVWITHLIBS="
-/usr/lib/initrd-recovery/flash/flash-init.sh
-/usr/bin/flash-manager
-/usr/share/firmware/brcm/*
-"
-
-WITHLIBS="
-/usr/bin/bash
-/usr/sbin/blkid
-/usr/bin/cp
-/usr/bin/echo
-/usr/bin/mkdir
-/usr/bin/mount
-/usr/bin/sync
-/usr/bin/umount
-/usr/sbin/ip
-/usr/sbin/ifconfig
-/usr/bin/grep
-/usr/bin/kmod
-/usr/sbin/insmod
-/usr/bin/find
-/usr/bin/hostapd
-/usr/bin/dnsmasq
-/usr/bin/ln
-/usr/bin/sed
-"
-
-# LinkFileName:Target
-SYMLINKS="
-/bin/sh:bash
-/sbin/flash-init:/usr/lib/initrd-recovery/flash/flash-init.sh
-"
-
-VERBATIMS="
-/usr/share/partition.info
-"

diff --git a/scripts/41-flash.list.in b/scripts/41-flash.list.in
new file mode 100755 (executable)
index 0000000..45c23b5
--- /dev/null
+++ b/scripts/41-flash.list.in
@@ -0,0 +1,37 @@
+# ---- Target contents ----------------------------------------------------- #
+MVWITHLIBS="
+@INITRD_FLASH_LIBEXEC_DIR@/flash-init.sh
+/usr/bin/flash-manager
+/usr/share/firmware/brcm/*
+"
+
+WITHLIBS="
+/usr/bin/bash
+/usr/sbin/blkid
+/usr/bin/cp
+/usr/bin/echo
+/usr/bin/mkdir
+/usr/bin/mount
+/usr/bin/sync
+/usr/bin/umount
+/usr/sbin/ip
+/usr/sbin/ifconfig
+/usr/bin/grep
+/usr/bin/kmod
+/usr/sbin/insmod
+/usr/bin/find
+/usr/bin/hostapd
+/usr/bin/dnsmasq
+/usr/bin/ln
+/usr/bin/sed
+"
+
+# LinkFileName:Target
+SYMLINKS="
+/bin/sh:bash
+/sbin/flash-init:@INITRD_FLASH_LIBEXEC_DIR@/flash-init.sh
+"
+
+VERBATIMS="
+/usr/share/partition.info
+"