diff options
| author | Kunhoon Baik <knhoon.baik@samsung.com> | 2016-03-10 23:33:11 +0900 |
|---|---|---|
| committer | Kunhoon Baik <knhoon.baik@samsung.com> | 2016-03-10 23:40:27 +0900 |
| commit | 026fde0f01a4d4df8dceb32579d130738b14d7a3 (patch) | |
| tree | 832be4b3dbc55842075ef27444324fcdea5d3053 | |
| parent | 3568f5fb91fc190a6cf8db5790392d8a6a1beff9 (diff) | |
| download | system-plugin-submit/tizen/20160310.071522.tar.gz system-plugin-submit/tizen/20160310.071522.tar.bz2 system-plugin-submit/tizen/20160310.071522.zip | |
Temporary For Wearable Circle Target "initrd"submit/tizen/20160311.020339submit/tizen/20160310.071522accepted/tizen/wearable/20160311.145208accepted/tizen/tv/20160311.144435accepted/tizen/mobile/20160311.142755accepted/tizen/ivi/20160311.145849accepted/tizen/common/20160311.201702accepted/tizen/common/20160311.201311
This patch is so ugly because it assumes several dependencies.
Best Approach is to provide own initrd for circle target.
Until the initrd issue will be solved, this patch will be kept.
Change-Id: I450a9facb3b3e0545b73bd7e0e62860392d1b5e1
| -rw-r--r-- | etc/fstab_initrd | 6 | ||||
| -rw-r--r-- | packaging/system-plugin.spec | 12 |
2 files changed, 18 insertions, 0 deletions
diff --git a/etc/fstab_initrd b/etc/fstab_initrd new file mode 100644 index 0000000..7056f20 --- /dev/null +++ b/etc/fstab_initrd @@ -0,0 +1,6 @@ +# In case of using MCD initrd, / and /opt is already mounted by initrd +# Thus, this patch is temporary files for wearable. +# Basically, initrd should consider this issue. +# <file system> <mount point> <type> <options> <dump> <pass> +/dev/root / ext4 defaults,noatime 0 1 +PARTLABEL=user /opt/usr ext4 defaults,noatime 0 2 diff --git a/packaging/system-plugin.spec b/packaging/system-plugin.spec index 2de499d..d245eff 100644 --- a/packaging/system-plugin.spec +++ b/packaging/system-plugin.spec @@ -75,6 +75,9 @@ mkdir -p %{buildroot}%{_unitdir}/basic.target.wants ln -s ../resize2fs@.service %{buildroot}%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\\x2dlabel-system\\x2ddata.service ln -s ../resize2fs@.service %{buildroot}%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\\x2dlabel-user.service ln -s ../resize2fs@.service %{buildroot}%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\\x2dlabel-rootfs.service +# ugly temporary patch for initrd wearable +ln -s ../resize2fs@.service %{buildroot}%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\\x2dpartlabel-user.service + ln -s ../tizen-system-env.service %{buildroot}%{_unitdir}/basic.target.wants/tizen-system-env.service mkdir -p %{buildroot}%{_prefix}/lib/udev/rules.d/ @@ -84,6 +87,8 @@ install -m 644 rules/51-system-plugin-spreadtrum.rules %{buildroot}%{_prefix}/li # fstab mkdir -p %{buildroot}%{_sysconfdir} install -m 644 etc/fstab %{buildroot}%{_sysconfdir} +# ugly temporary patch for initrd wearable +install -m 644 etc/fstab_initrd %{buildroot}%{_sysconfdir} %post systemctl daemon-reload @@ -116,6 +121,13 @@ systemctl daemon-reload %files circle %manifest %{name}.manifest /initrd +%{_sysconfdir}/fstab_initrd +%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dpartlabel-user.service + +# ugly temporary patch for initrd wearable +%post circle +rm %{_sysconfdir}/fstab +mv %{_sysconfdir}/fstab_initrd %{_sysconfdir}/fstab %files spreadtrum %manifest %{name}.manifest |