Move unit management to separate CMakeLists

Change-Id: I04238d74cc727e2f7eb52d33745f00a4c94b015b

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cf0e5fa5434ad069f5f91137827501229d6f3a72..de458d717c5eb05b0d470460ba3f6cbff803d465 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,3 +6,4 @@ SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie")
 
 ADD_SUBDIRECTORY(src/initrd-recovery)
 ADD_SUBDIRECTORY(src/minireboot)
+ADD_SUBDIRECTORY(units)

diff --git a/packaging/initrd-recovery.spec b/packaging/initrd-recovery.spec
index b19f764253be8466f3a2c9d6e1f804ead1b33e28..2107c5d2a662e43ee39668f777c62b3787563e54 100644 (file)
--- a/packaging/initrd-recovery.spec
+++ b/packaging/initrd-recovery.spec
@@ -50,7 +50,8 @@ cp %{SOURCE1001} .
                -DINITRD_RECOVERY_LIBEXEC_DIR=%{initrd_recovery_libexec_dir} \
                -DINITRD_RECOVERY_INSTALL_DROPIN_DIR=%{initrd_recovery_install_dropin_dir} \
                -DASAN_BUILD=%{ASAN_BUILD} \
-               -DINITRD_LIB_DIR=%{_libdir}
+               -DINITRD_LIB_DIR=%{_libdir} \
+               -DUNIT_DIR=%{_unitdir}
 
 make %{?_smp_mflags}
 
@@ -61,7 +62,6 @@ make %{?_smp_mflags}
 %define inform_path /mnt/inform
 mkdir -p %{buildroot}%{inform_path}
 mkdir -p %{buildroot}%{_unitdir}/local-fs.target.wants
-install -m 644 units/mnt-inform.mount %{buildroot}%{_unitdir}
 ln -s ../mnt-inform.mount %{buildroot}%{_unitdir}/local-fs.target.wants
 
 %posttrans

diff --git a/units/CMakeLists.txt b/units/CMakeLists.txt
new file mode 100644 (file)
index 0000000..03ea9a4
--- /dev/null
+++ b/units/CMakeLists.txt
@@ -0,0 +1,3 @@
+INSTALL(FILES
+       mnt-inform.mount
+       DESTINATION ${UNIT_DIR})