Prepare for system-recovery and initrd-fota integration

This commit splits one CMakeLists separate files per directory.

Change-Id: I64afe2e9a81ec2fc297102ba3c7233d539d63f37

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 632d8b2b49b009563fe064b5e315c37f0acaea64..cf0e5fa5434ad069f5f91137827501229d6f3a72 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,41 +1,8 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0)
 PROJECT(initrd-recovery)
 
-# Initrd-recovery
-INSTALL(FILES ${INITRD_RECOVERY_SRC_DIR}/init DESTINATION ${INITRD_RECOVERY_LIBEXEC_DIR})
-
-CONFIGURE_FILE(${INITRD_RECOVERY_SRC_DIR}/mkinitrd-recovery.sh.in
-               ${INITRD_RECOVERY_SRC_DIR}/mkinitrd-recovery.sh
-               @ONLY)
-INSTALL(FILES ${INITRD_RECOVERY_SRC_DIR}/mkinitrd-recovery.sh DESTINATION ${INITRD_RECOVERY_LIBEXEC_DIR})
-
-CONFIGURE_FILE(${INITRD_RECOVERY_SRC_DIR}/00-initrd-recovery.list.in
-               ${INITRD_RECOVERY_SRC_DIR}/00-initrd-recovery.list
-               @ONLY)
-INSTALL(FILES ${INITRD_RECOVERY_SRC_DIR}/00-initrd-recovery.list DESTINATION ${INITRD_RECOVERY_INSTALL_DROPIN_DIR})
-
-IF("${ARCH_BIT}" STREQUAL "64")
-
-CONFIGURE_FILE(${INITRD_RECOVERY_SRC_DIR}/00-64bit-prepare.list.in
-               ${INITRD_RECOVERY_SRC_DIR}/00-64bit-prepare.list
-               @ONLY)
-INSTALL(FILES ${INITRD_RECOVERY_SRC_DIR}/00-64bit-prepare.list DESTINATION ${INITRD_RECOVERY_INSTALL_DROPIN_DIR})
-
-ENDIF()
-
-IF("${ASAN_BUILD}" STREQUAL "1")
-
-CONFIGURE_FILE(${INITRD_RECOVERY_SRC_DIR}/00-asan-prepare.list.in
-               ${INITRD_RECOVERY_SRC_DIR}/00-asan-prepare.list
-               @ONLY)
-INSTALL(FILES ${INITRD_RECOVERY_SRC_DIR}/00-asan-prepare.list DESTINATION ${INITRD_RECOVERY_INSTALL_DROPIN_DIR})
-
-ENDIF()
-
-# Minireboot
-SET(MINIREBOOT_BINARY_NAME "minireboot")
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall -fPIE")
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie")
-AUX_SOURCE_DIRECTORY(${MINIREBOOT_SRC_DIR} MINIREBOOT_SOURCES)
-ADD_EXECUTABLE(${MINIREBOOT_BINARY_NAME} ${MINIREBOOT_SOURCES})
-INSTALL(TARGETS ${MINIREBOOT_BINARY_NAME} DESTINATION ${INITRD_RECOVERY_LIBEXEC_DIR})
+
+ADD_SUBDIRECTORY(src/initrd-recovery)
+ADD_SUBDIRECTORY(src/minireboot)

diff --git a/packaging/initrd-recovery.spec b/packaging/initrd-recovery.spec
index 23eefc500611a255afdf4263486af7e516ebd306..b19f764253be8466f3a2c9d6e1f804ead1b33e28 100644 (file)
--- a/packaging/initrd-recovery.spec
+++ b/packaging/initrd-recovery.spec
@@ -49,10 +49,8 @@ cp %{SOURCE1001} .
                -DARCH_BIT=%{ARCH_BIT} \
                -DINITRD_RECOVERY_LIBEXEC_DIR=%{initrd_recovery_libexec_dir} \
                -DINITRD_RECOVERY_INSTALL_DROPIN_DIR=%{initrd_recovery_install_dropin_dir} \
-               -DINITRD_RECOVERY_SRC_DIR=src/initrd-recovery \
                -DASAN_BUILD=%{ASAN_BUILD} \
-               -DINITRD_LIB_DIR=%{_libdir} \
-               -DMINIREBOOT_SRC_DIR=src/minireboot
+               -DINITRD_LIB_DIR=%{_libdir}
 
 make %{?_smp_mflags}
 

diff --git a/src/initrd-recovery/CMakeLists.txt b/src/initrd-recovery/CMakeLists.txt
new file mode 100644 (file)
index 0000000..1b822c3
--- /dev/null
+++ b/src/initrd-recovery/CMakeLists.txt
@@ -0,0 +1,17 @@
+INSTALL(FILES init DESTINATION ${INITRD_RECOVERY_LIBEXEC_DIR})
+
+CONFIGURE_FILE(mkinitrd-recovery.sh.in mkinitrd-recovery.sh @ONLY)
+INSTALL(FILES mkinitrd-recovery.sh DESTINATION ${INITRD_RECOVERY_LIBEXEC_DIR})
+
+CONFIGURE_FILE(00-initrd-recovery.list.in 00-initrd-recovery.list @ONLY)
+INSTALL(FILES 00-initrd-recovery.list DESTINATION ${INITRD_RECOVERY_INSTALL_DROPIN_DIR})
+
+IF("${ARCH_BIT}" STREQUAL "64")
+CONFIGURE_FILE(00-64bit-prepare.list.in 00-64bit-prepare.list @ONLY)
+INSTALL(FILES 00-64bit-prepare.list DESTINATION ${INITRD_RECOVERY_INSTALL_DROPIN_DIR})
+ENDIF()
+
+IF("${ASAN_BUILD}" STREQUAL "1")
+CONFIGURE_FILE(00-asan-prepare.list.in 00-asan-prepare.list @ONLY)
+INSTALL(FILES 00-asan-prepare.list DESTINATION ${INITRD_RECOVERY_INSTALL_DROPIN_DIR})
+ENDIF()

diff --git a/src/minireboot/CMakeLists.txt b/src/minireboot/CMakeLists.txt
new file mode 100644 (file)
index 0000000..3422dcb
--- /dev/null
+++ b/src/minireboot/CMakeLists.txt
@@ -0,0 +1,3 @@
+SET(MINIREBOOT_BINARY_NAME "minireboot")
+ADD_EXECUTABLE(${MINIREBOOT_BINARY_NAME} minireboot.c)
+INSTALL(TARGETS ${MINIREBOOT_BINARY_NAME} DESTINATION ${INITRD_RECOVERY_LIBEXEC_DIR})