From 7ee4fca59d85511050c8028bd846f1b4b54f4a3b Mon Sep 17 00:00:00 2001 From: Hyotaek Shim Date: Tue, 25 Jan 2022 16:16:12 +0900 Subject: [PATCH] Add system-plugin-emulator-config-2parts package Change-Id: I710a65e6599f02d3e846a75e8016ea688e4f30ee --- packaging/system-plugin-emulator.spec | 25 +++++++++++++++++++++---- units/no-wait.conf | 3 +++ 2 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 units/no-wait.conf diff --git a/packaging/system-plugin-emulator.spec b/packaging/system-plugin-emulator.spec index d3baee7..61d4d8b 100644 --- a/packaging/system-plugin-emulator.spec +++ b/packaging/system-plugin-emulator.spec @@ -18,6 +18,14 @@ ExclusiveArch: %{ix86} x86_64 %description System plugin files for emulator +%package config-2parts +Summary: System configuration files for storage partitions +Requires: %{name} = %{version}-%{release} +BuildArch: noarch + +%description config-2parts +This package provides configuration files for storage partitions + %prep %setup -q @@ -32,6 +40,8 @@ cp -arf filesystem/* %{buildroot} mkdir -p %{buildroot}/opt/mnt # for systemd unit +mkdir -p %{buildroot}%{_unitdir}/wait-mount@opt-usr.service.d +mkdir -p %{buildroot}%{_userunitdir}/wait-mount@opt-usr.service.d %install_service basic.target.wants emulator_preinit.target %install_service emulator_preinit.target.wants emul-setup-audio-volume.service %install_service emulator_preinit.target.wants emul-common-preinit.service @@ -39,14 +49,13 @@ mkdir -p %{buildroot}/opt/mnt %install_service emulator_preinit.target.wants mnt.mount %install_service multi-user.target.wants emulator.target %install_service local-fs.target.wants wait-mount@opt-usr.service +install -m 644 units/no-wait.conf %{buildroot}%{_unitdir}/wait-mount@opt-usr.service.d +install -m 644 units/no-wait.conf %{buildroot}%{_userunitdir}/wait-mount@opt-usr.service.d mkdir -p %{buildroot}%{_userunitdir}/basic.target.wants ln -s ../wait-mount@opt-usr.service %{buildroot}%{_userunitdir}/basic.target.wants/wait-mount@opt-usr.service -%posttrans -#run emulator_ns.preinit script after all packages have been installed. -/etc/preconf.d/emulator_ns.preinit - %files +%license LICENSE /etc/emulator/prerun /etc/emulator/prerun.d/set-model-config.sh /etc/emulator/prerun.d/generate-emulator-env.sh @@ -76,4 +85,12 @@ ln -s ../wait-mount@opt-usr.service %{buildroot}%{_userunitdir}/basic.target.wan %{_prefix}/lib/udev/rules.d/51-tizen-udev-default.rules %{_prefix}/lib/udev/rules.d/95-tizen-emulator.rules /opt/mnt + +%files config-2parts %license LICENSE +%{_unitdir}/wait-mount@opt-usr.service.d/no-wait.conf +%{_userunitdir}/wait-mount@opt-usr.service.d/no-wait.conf + +%posttrans +#run emulator_ns.preinit script after all packages have been installed. +/etc/preconf.d/emulator_ns.preinit diff --git a/units/no-wait.conf b/units/no-wait.conf new file mode 100644 index 0000000..e5d4f4b --- /dev/null +++ b/units/no-wait.conf @@ -0,0 +1,3 @@ +[Service] +ExecStart= +ExecStart=/usr/bin/true -- 2.34.1