From 029a14e09e64a75743e56e82f906842bc6690368 Mon Sep 17 00:00:00 2001 From: Hyotaek Shim Date: Wed, 18 Oct 2017 14:50:57 +0900 Subject: [PATCH 01/16] Add depedency where tizen-system-env.service starts after /opt is mounted Change-Id: Id8337c16b4dfadbfc3875dfef7ecd93f4d8cfe1c Signed-off-by: Hyotaek Shim (cherry picked from commit f5b5f950674c97f4ef5fdf96adb6d745fc31f3c8) --- units/tizen-system-env.service | 1 + 1 file changed, 1 insertion(+) diff --git a/units/tizen-system-env.service b/units/tizen-system-env.service index 29a3cc2..38b0c08 100644 --- a/units/tizen-system-env.service +++ b/units/tizen-system-env.service @@ -2,6 +2,7 @@ Description=Generate environment from /etc/profile.d DefaultDependencies=no Before=basic.target +RequiresMountsFor=/opt [Service] Type=oneshot -- 2.7.4 From b92b3c2f49788e699439e40f2c5729cfd7230411 Mon Sep 17 00:00:00 2001 From: INSUN PYO Date: Thu, 19 Oct 2017 11:52:00 +0000 Subject: [PATCH 02/16] Add profile-iot-headless and config-udev-sdbd. Signed-off-by: INSUN PYO Change-Id: Ibb2d1ecbda4e96d86d393c4b48f742a56887618a (cherry picked from commit 06006b092875b93fa61f42b6f0c7c857df99be92) --- packaging/system-plugin.spec | 48 ++++++++++++++++++++++++++++++++++++-------- rules/99-sdb-extcon.rules | 2 ++ 2 files changed, 42 insertions(+), 8 deletions(-) create mode 100644 rules/99-sdb-extcon.rules diff --git a/packaging/system-plugin.spec b/packaging/system-plugin.spec index a84736b..cc9e3b6 100644 --- a/packaging/system-plugin.spec +++ b/packaging/system-plugin.spec @@ -157,20 +157,36 @@ BuildArch: noarch %description profile-iot This package provides system configuration files for IoT profiles. -%package -n feature-liblazymount +%package profile-iot-headless +Summary: System configuration files for IoT headless profiles +Requires: %{name} = %{version}-%{release} +BuildArch: noarch + +%description profile-iot-headless +This package provides system configuration files for IoT headless profiles. + +%package config-udev-sdbd +Summary: System configuration files to trigger sdb with udev rule +Requires: %{name} = %{version}-%{release} +BuildArch: noarch + +%description config-udev-sdbd +This package provides configuration files to trigger sdb with udev rule. + +%package feature-liblazymount Summary: Library for lazy mount feature Requires(post): /usr/bin/vconftool Requires: vconf -%description -n feature-liblazymount +%description feature-liblazymount Library for lazy mount feature. It supports some interface functions. -%package -n feature-liblazymount-devel +%package feature-liblazymount-devel Summary: Development library for lazy mount feature Requires: vconf Requires: feature-liblazymount = %{version} -%description -n feature-liblazymount-devel +%description feature-liblazymount-devel Development library for lazy mount feature.It supports some interface functions. %prep @@ -265,6 +281,11 @@ mkdir -p %{buildroot}%{_prefix}/lib/udev/rules.d/ install -m 644 rules/99-sdb-switch.rules %{buildroot}%{_prefix}/lib/udev/rules.d/ mkdir -p %{buildroot}%{_sysconfdir}/profile.d install -m 755 scripts/headless_env.sh %{buildroot}%{_sysconfdir}/profile.d + +# config-udev-sdbd +mkdir -p %{buildroot}%{_prefix}/lib/udev/rules.d/ +install -m 644 rules/99-sdb-extcon.rules %{buildroot}%{_prefix}/lib/udev/rules.d/ + %clean rm -rf %{buildroot} @@ -482,7 +503,18 @@ ln -s /sbin/init.wrapper /sbin/init ## platform/upstream/e2fsprogs #rm -f %{_sbindir}/e4crypt -%files -n feature-liblazymount +%files profile-iot-headless +%manifest %{name}.manifest +%license LICENSE.Apache-2.0 +%{_sysconfdir}/profile.d/headless_env.sh + +%files config-udev-sdbd +%manifest %{name}.manifest +%license LICENSE.Apache-2.0 +%{_bindir}/sdb-mode.sh +%{_prefix}/lib/udev/rules.d/99-sdb-extcon.rules + +%files feature-liblazymount #%defattr(-,root,root,-) #%{_libdir}/liblazymount.so.* #%manifest liblazymount.manifest @@ -497,11 +529,11 @@ ln -s /sbin/init.wrapper /sbin/init #%{_unitdir_user}/wait-user-mount.service #%endif -%post -n feature-liblazymount +%post feature-liblazymount #/sbin/ldconfig #systemctl daemon-reload -%files -n feature-liblazymount-devel +%files feature-liblazymount-devel #%defattr(-,root,root,-) #%manifest liblazymount.manifest #%license LICENSE.Apache-2.0 @@ -512,4 +544,4 @@ ln -s /sbin/init.wrapper /sbin/init #%{_bindir}/test_lazymount #%endif -%postun -n feature-liblazymount -p /sbin/ldconfig +%postun feature-liblazymount -p /sbin/ldconfig diff --git a/rules/99-sdb-extcon.rules b/rules/99-sdb-extcon.rules new file mode 100644 index 0000000..8cae499 --- /dev/null +++ b/rules/99-sdb-extcon.rules @@ -0,0 +1,2 @@ +SUBSYSTEM=="extcon", ATTR{state}=="USB=1", RUN+="/usr/bin/sdb-mode.sh --on" +SUBSYSTEM=="extcon", ATTR{state}=="USB=0", RUN+="/usr/bin/sdb-mode.sh --off" -- 2.7.4 From d22b7faa2a1104471f8312fa96517e209ba8e23e Mon Sep 17 00:00:00 2001 From: Hyotaek Shim Date: Tue, 26 Dec 2017 18:17:26 +0900 Subject: [PATCH 03/16] Clean up /etc/fstab configuration files Change-Id: I0d0278bb69a39dc82b4245d58df340ed8783acb3 Signed-off-by: Hyotaek Shim --- etc/fstab_2part | 3 --- etc/{fstab_lazymnt => fstab_2parts} | 0 etc/{fstab => fstab_3parts} | 0 etc/fstab_initrd | 7 ------- etc/fstab_initrd_lazymnt | 6 ------ packaging/system-plugin.spec | 42 ++++++++++++++++--------------------- 6 files changed, 18 insertions(+), 40 deletions(-) delete mode 100644 etc/fstab_2part rename etc/{fstab_lazymnt => fstab_2parts} (100%) rename etc/{fstab => fstab_3parts} (100%) delete mode 100644 etc/fstab_initrd delete mode 100644 etc/fstab_initrd_lazymnt diff --git a/etc/fstab_2part b/etc/fstab_2part deleted file mode 100644 index 2f335c7..0000000 --- a/etc/fstab_2part +++ /dev/null @@ -1,3 +0,0 @@ -# -/dev/root / ext4 defaults,noatime,ro 0 1 -LABEL=system-data /opt ext4 defaults,noatime 0 2 diff --git a/etc/fstab_lazymnt b/etc/fstab_2parts similarity index 100% rename from etc/fstab_lazymnt rename to etc/fstab_2parts diff --git a/etc/fstab b/etc/fstab_3parts similarity index 100% rename from etc/fstab rename to etc/fstab_3parts diff --git a/etc/fstab_initrd b/etc/fstab_initrd deleted file mode 100644 index 5d9d47b..0000000 --- a/etc/fstab_initrd +++ /dev/null @@ -1,7 +0,0 @@ -# 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. -# -/dev/root / ext4 defaults,noatime,ro 0 1 -PARTLABEL=system-data /opt ext4 defaults,noatime 0 2 -PARTLABEL=user /opt/usr ext4 defaults,noatime 0 2 diff --git a/etc/fstab_initrd_lazymnt b/etc/fstab_initrd_lazymnt deleted file mode 100644 index ef71810..0000000 --- a/etc/fstab_initrd_lazymnt +++ /dev/null @@ -1,6 +0,0 @@ -# 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. -# -/dev/root / ext4 defaults,noatime,ro 0 1 -PARTLABEL=system-data /opt ext4 defaults,noatime 0 2 diff --git a/packaging/system-plugin.spec b/packaging/system-plugin.spec index cc9e3b6..2ed93a8 100644 --- a/packaging/system-plugin.spec +++ b/packaging/system-plugin.spec @@ -243,13 +243,9 @@ install -m 644 rules/60-evdev.hwdb %{buildroot}%{_prefix}/lib/udev/hwdb.d/ # 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} +install -m 644 etc/fstab_3parts %{buildroot}%{_sysconfdir} # lazymnt -install -m 644 etc/fstab_lazymnt %{buildroot}%{_sysconfdir} -install -m 644 etc/fstab_initrd_lazymnt %{buildroot}%{_sysconfdir} -install -m 644 etc/fstab_2part %{buildroot}%{_sysconfdir} +install -m 644 etc/fstab_2parts %{buildroot}%{_sysconfdir} %if %{temp_wait_mount} mkdir -p %{buildroot}%{_unitdir_user}/basic.target.wants install -m 644 units/wait-user-mount.service %{buildroot}%{_unitdir_user} @@ -305,11 +301,12 @@ systemctl daemon-reload %{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dlabel-system\x2ddata.service %{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dlabel-user.service %{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dlabel-rootfs.service -%{_sysconfdir}/fstab +%{_sysconfdir}/fstab_3parts %{_prefix}/lib/udev/hwdb.d/60-evdev.hwdb %post u3 %{_prefix}/bin/udevadm hwdb --update +mv %{_sysconfdir}/fstab_3parts %{_sysconfdir}/fstab %files rpi3 %manifest %{name}.manifest @@ -317,11 +314,12 @@ systemctl daemon-reload %{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dlabel-system\x2ddata.service %{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dlabel-user.service %{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dlabel-rootfs.service -%{_sysconfdir}/fstab +%{_sysconfdir}/fstab_3parts %{_prefix}/lib/udev/hwdb.d/60-evdev.hwdb %post rpi3 %{_prefix}/bin/udevadm hwdb --update +mv %{_sysconfdir}/fstab_3parts %{_sysconfdir}/fstab %files iot %manifest %{name}.manifest @@ -329,13 +327,12 @@ systemctl daemon-reload %{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dlabel-system\x2ddata.service %{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dlabel-user.service %{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dlabel-rootfs.service -%{_sysconfdir}/fstab_2part +%{_sysconfdir}/fstab_2parts %{_prefix}/lib/udev/hwdb.d/60-evdev.hwdb %post iot %{_prefix}/bin/udevadm hwdb --update -rm %{_sysconfdir}/fstab -mv %{_sysconfdir}/fstab_2part %{_sysconfdir}/fstab +mv %{_sysconfdir}/fstab_2parts %{_sysconfdir}/fstab %posttrans iot # platform/upstream/dbus @@ -353,7 +350,7 @@ rm -f %{_sbindir}/e4crypt %{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dlabel-system\x2ddata.service %{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dlabel-user.service %{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dlabel-rootfs.service -%{_sysconfdir}/fstab_lazymnt +%{_sysconfdir}/fstab_2parts %{_unitdir}/graphical.target.wants/tizen-fstrim-user.timer %{_unitdir}/tizen-fstrim-user.timer %{_unitdir}/tizen-fstrim-user.service @@ -369,7 +366,7 @@ rm -f %{_sbindir}/e4crypt %license LICENSE.Apache-2.0 /initrd /csa -%{_sysconfdir}/fstab_initrd +%{_sysconfdir}/fstab_3parts %{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dpartlabel-user.service %{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dpartlabel-system\x2ddata.service %{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dpartlabel-rootfs.service @@ -378,15 +375,12 @@ rm -f %{_sbindir}/e4crypt # ugly temporary patch for initrd wearable %post circle -rm %{_sysconfdir}/fstab -mv %{_sysconfdir}/fstab_initrd %{_sysconfdir}/fstab +mv %{_sysconfdir}/fstab_3parts %{_sysconfdir}/fstab # fstab for tm1 %post spreadtrum -rm %{_sysconfdir}/fstab -mv %{_sysconfdir}/fstab_initrd_lazymnt %{_sysconfdir}/fstab +mv %{_sysconfdir}/fstab_2parts %{_sysconfdir}/fstab %post n4 -rm %{_sysconfdir}/fstab -mv %{_sysconfdir}/fstab_lazymnt %{_sysconfdir}/fstab +mv %{_sysconfdir}/fstab_2parts %{_sysconfdir}/fstab %files spreadtrum %manifest %{name}.manifest @@ -395,7 +389,7 @@ mv %{_sysconfdir}/fstab_lazymnt %{_sysconfdir}/fstab /csa %{_prefix}/lib/udev/rules.d/51-system-plugin-spreadtrum.rules %{_unitdir}/tizen-system-env.service -%{_sysconfdir}/fstab_initrd_lazymnt +%{_sysconfdir}/fstab_2parts %{_unitdir}/basic.target.wants/tizen-system-env.service %{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dpartlabel-user.service %{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dpartlabel-system\x2ddata.service @@ -473,11 +467,12 @@ ln -s /sbin/init.wrapper /sbin/init #%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dlabel-system\x2ddata.service #%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dlabel-user.service #%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dlabel-rootfs.service -#%{_sysconfdir}/fstab +#%{_sysconfdir}/fstab_3parts #%{_prefix}/lib/udev/hwdb.d/60-evdev.hwdb %post device-rpi3 #%{_prefix}/bin/udevadm hwdb --update +#mv %{_sysconfdir}/fstab_3parts %{_sysconfdir}/fstab %files profile-iot #%manifest %{name}.manifest @@ -485,13 +480,12 @@ ln -s /sbin/init.wrapper /sbin/init #%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dlabel-system\x2ddata.service #%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dlabel-user.service #%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dlabel-rootfs.service -#%{_sysconfdir}/fstab_2part +#%{_sysconfdir}/fstab_2parts #%{_prefix}/lib/udev/hwdb.d/60-evdev.hwdb %post profile-iot #%{_prefix}/bin/udevadm hwdb --update -#rm %{_sysconfdir}/fstab -#mv %{_sysconfdir}/fstab_2part %{_sysconfdir}/fstab +#mv %{_sysconfdir}/fstab_2parts %{_sysconfdir}/fstab %posttrans profile-iot ## platform/upstream/dbus -- 2.7.4 From 804e32e2d537261c4cf60e1a6959a99ad976b88e Mon Sep 17 00:00:00 2001 From: Hyotaek Shim Date: Tue, 26 Dec 2017 19:46:59 +0900 Subject: [PATCH 04/16] Remove the deprecated system-plugin-headless package Change-Id: I8d21b7c55054bfbde1ad247e0f463e7b03f60377 Signed-off-by: Hyotaek Shim --- packaging/system-plugin.spec | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/packaging/system-plugin.spec b/packaging/system-plugin.spec index 2ed93a8..83db517 100644 --- a/packaging/system-plugin.spec +++ b/packaging/system-plugin.spec @@ -7,7 +7,7 @@ Name: system-plugin Summary: Target specific system configuration files Version: 0.1 Release: 1 -Group: Base/Startup +Group: Base/Startup License: Apache-2.0 Source0: %{name}-%{version}.tar.bz2 Source1: %{name}.manifest @@ -112,14 +112,6 @@ BuildArch: noarch %description init_wrapper This package provides init.wrapper and init symlink file for init wrapper booting. -%package headless -Summary: Support headless device. -Requires: %{name} = %{version}-%{release} -BuildArch: noarch - -%description headless -This package provides the functions for headless device. - ################################################################### ###################### Newly-created RPMs ######################### ################################################################### @@ -447,12 +439,6 @@ systemctl daemon-reload rm -f /sbin/init ln -s /sbin/init.wrapper /sbin/init -%files headless -%license LICENSE.Apache-2.0 -%{_bindir}/sdb-mode.sh -%{_prefix}/lib/udev/rules.d/99-sdb-switch.rules -%{_sysconfdir}/profile.d/headless_env.sh - ################################################################### ###################### Newly-created RPMs ######################### ################################################################### -- 2.7.4 From 21d1a40fbc0969ca8d569fa3f296f96ac2162c4c Mon Sep 17 00:00:00 2001 From: Hyotaek Shim Date: Tue, 26 Dec 2017 19:54:03 +0900 Subject: [PATCH 05/16] Rename system-plugin-init_wrapper as system-plugin-feature-init_wrapper Change-Id: I647f7425c8ac16a41a8cf7e49a90889acf1d05eb Signed-off-by: Hyotaek Shim --- packaging/system-plugin.spec | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/packaging/system-plugin.spec b/packaging/system-plugin.spec index 83db517..7215a18 100644 --- a/packaging/system-plugin.spec +++ b/packaging/system-plugin.spec @@ -104,14 +104,6 @@ BuildArch: noarch %description profile_ivi This package provides ivi specific system configuration files. -%package init_wrapper -Summary: Support init.wrapper booting. -Requires: %{name} = %{version}-%{release} -BuildArch: noarch - -%description init_wrapper -This package provides init.wrapper and init symlink file for init wrapper booting. - ################################################################### ###################### Newly-created RPMs ######################### ################################################################### @@ -165,6 +157,14 @@ BuildArch: noarch %description config-udev-sdbd This package provides configuration files to trigger sdb with udev rule. +%package feature-init_wrapper +Summary: Support init.wrapper booting. +Requires: %{name} = %{version}-%{release} +BuildArch: noarch + +%description feature-init_wrapper +This package provides init.wrapper and init symlink file for init wrapper booting. + %package feature-liblazymount Summary: Library for lazy mount feature Requires(post): /usr/bin/vconftool @@ -431,14 +431,6 @@ systemctl daemon-reload %{_prefix}/lib/udev/rules.d/99-usb-ethernet.rules %{_bindir}/usb_net_init.sh -%files init_wrapper -%license LICENSE.Apache-2.0 -%{_sbindir}/init.wrapper - -%posttrans init_wrapper -rm -f /sbin/init -ln -s /sbin/init.wrapper /sbin/init - ################################################################### ###################### Newly-created RPMs ######################### ################################################################### @@ -494,6 +486,14 @@ ln -s /sbin/init.wrapper /sbin/init %{_bindir}/sdb-mode.sh %{_prefix}/lib/udev/rules.d/99-sdb-extcon.rules +%files feature-init_wrapper +%license LICENSE.Apache-2.0 +%{_sbindir}/init.wrapper + +%posttrans feature-init_wrapper +rm -f /sbin/init +ln -s /sbin/init.wrapper /sbin/init + %files feature-liblazymount #%defattr(-,root,root,-) #%{_libdir}/liblazymount.so.* -- 2.7.4 From 669bf276adb4f42b93e2cd9689d6a155fb672c0c Mon Sep 17 00:00:00 2001 From: Hyotaek Shim Date: Tue, 2 Jan 2018 15:41:23 +0900 Subject: [PATCH 06/16] Rename system-plugin-spreadtrum as system-plugin-device-spreadtrum Change-Id: I9a8684dfd5263d1d0295eb5deb55772e5417d96a Signed-off-by: Hyotaek Shim --- packaging/system-plugin.spec | 62 ++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/packaging/system-plugin.spec b/packaging/system-plugin.spec index 7215a18..8fbb905 100644 --- a/packaging/system-plugin.spec +++ b/packaging/system-plugin.spec @@ -64,14 +64,6 @@ BuildArch: noarch %description exynos This package provides Exynos specific system configuration files. -%package spreadtrum -Summary: Spreadtrum specific system configuration files -Requires: %{name} = %{version}-%{release} -BuildArch: noarch - -%description spreadtrum -This package provides Spreadtrum specific system configuration files. - %package circle Summary: Circle specific system configuration files Requires: %{name} = %{version}-%{release} @@ -108,6 +100,14 @@ This package provides ivi specific system configuration files. ###################### Newly-created RPMs ######################### ################################################################### +%package device-spreadtrum +Summary: Spreadtrum specific system configuration files +Requires: %{name} = %{version}-%{release} +BuildArch: noarch + +%description device-spreadtrum +This package provides Spreadtrum specific system configuration files. + %package device-artik530 Summary: Artik530 Requires: %{name} = %{version}-%{release} @@ -368,32 +368,9 @@ rm -f %{_sbindir}/e4crypt # ugly temporary patch for initrd wearable %post circle mv %{_sysconfdir}/fstab_3parts %{_sysconfdir}/fstab -# fstab for tm1 -%post spreadtrum -mv %{_sysconfdir}/fstab_2parts %{_sysconfdir}/fstab %post n4 mv %{_sysconfdir}/fstab_2parts %{_sysconfdir}/fstab -%files spreadtrum -%manifest %{name}.manifest -%license LICENSE.Apache-2.0 -/initrd -/csa -%{_prefix}/lib/udev/rules.d/51-system-plugin-spreadtrum.rules -%{_unitdir}/tizen-system-env.service -%{_sysconfdir}/fstab_2parts -%{_unitdir}/basic.target.wants/tizen-system-env.service -%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dpartlabel-user.service -%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dpartlabel-system\x2ddata.service -%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dpartlabel-rootfs.service -%{_unitdir}/csa.mount -%{_unitdir}/local-fs.target.wants/csa.mount -%{_unitdir}/graphical.target.wants/tizen-fstrim-user.timer -%{_unitdir}/tizen-fstrim-user.timer -%{_unitdir}/tizen-fstrim-user.service -%{_bindir}/tizen-fstrim-on-charge.sh -%{_datadir}/fixed_multiuser/fixed-multi-user.sh - %files -n liblazymount %defattr(-,root,root,-) %{_libdir}/liblazymount.so.* @@ -435,6 +412,29 @@ systemctl daemon-reload ###################### Newly-created RPMs ######################### ################################################################### +%files device-spreadtrum +%manifest %{name}.manifest +%license LICENSE.Apache-2.0 +/initrd +/csa +%{_prefix}/lib/udev/rules.d/51-system-plugin-spreadtrum.rules +%{_unitdir}/tizen-system-env.service +%{_sysconfdir}/fstab_2parts +%{_unitdir}/basic.target.wants/tizen-system-env.service +%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dpartlabel-user.service +%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dpartlabel-system\x2ddata.service +%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dpartlabel-rootfs.service +%{_unitdir}/csa.mount +%{_unitdir}/local-fs.target.wants/csa.mount +%{_unitdir}/graphical.target.wants/tizen-fstrim-user.timer +%{_unitdir}/tizen-fstrim-user.timer +%{_unitdir}/tizen-fstrim-user.service +%{_bindir}/tizen-fstrim-on-charge.sh +%{_datadir}/fixed_multiuser/fixed-multi-user.sh + +%post device-spreadtrum +mv %{_sysconfdir}/fstab_2parts %{_sysconfdir}/fstab + %files device-artik530 %files device-artik710 -- 2.7.4 From 6e63df8734e17eafe7d9074ab00efb6994bc3cb3 Mon Sep 17 00:00:00 2001 From: Hyotaek Shim Date: Tue, 2 Jan 2018 17:26:24 +0900 Subject: [PATCH 07/16] Remove the unused system-plugin-profile_ivi.rpm Change-Id: I14267d23917143b0ee69f4e20b2027fee4de8d5e Signed-off-by: Hyotaek Shim --- packaging/system-plugin.spec | 17 ----------------- rules/99-usb-ethernet.rules | 6 ------ scripts/usb_net_init.sh | 9 --------- 3 files changed, 32 deletions(-) delete mode 100644 rules/99-usb-ethernet.rules delete mode 100644 scripts/usb_net_init.sh diff --git a/packaging/system-plugin.spec b/packaging/system-plugin.spec index 8fbb905..ea6736e 100644 --- a/packaging/system-plugin.spec +++ b/packaging/system-plugin.spec @@ -88,14 +88,6 @@ Requires: liblazymount = %{version} %description -n liblazymount-devel Development library for lazy mount feature.It supports some interface functions. -%package profile_ivi -Summary: ivi specific system configuration files -Requires: %{name} = %{version}-%{release} -BuildArch: noarch - -%description profile_ivi -This package provides ivi specific system configuration files. - ################################################################### ###################### Newly-created RPMs ######################### ################################################################### @@ -228,7 +220,6 @@ ln -s ../tizen-system-env.service %{buildroot}%{_unitdir}/basic.target.wants/tiz mkdir -p %{buildroot}%{_prefix}/lib/udev/rules.d/ install -m 644 rules/51-system-plugin-exynos.rules %{buildroot}%{_prefix}/lib/udev/rules.d/ install -m 644 rules/51-system-plugin-spreadtrum.rules %{buildroot}%{_prefix}/lib/udev/rules.d/ -install -m 644 rules/99-usb-ethernet.rules %{buildroot}%{_prefix}/lib/udev/rules.d/ mkdir -p %{buildroot}%{_prefix}/lib/udev/hwdb.d/ install -m 644 rules/60-evdev.hwdb %{buildroot}%{_prefix}/lib/udev/hwdb.d/ @@ -252,9 +243,6 @@ install -m 644 units/tizen-fstrim-user.service %{buildroot}%{_unitdir} mkdir -p %{buildroot}%{_bindir} install -m 755 scripts/tizen-fstrim-on-charge.sh %{buildroot}%{_bindir} -# ivi -install -m 755 scripts/usb_net_init.sh %{buildroot}%{_bindir} - # fixed-multi-user install -m 775 -D scripts/fixed-multi-user.sh %{buildroot}%{_datadir}/fixed_multiuser/fixed-multi-user.sh @@ -403,11 +391,6 @@ systemctl daemon-reload %postun -n liblazymount -p /sbin/ldconfig -%files profile_ivi -%license LICENSE.Apache-2.0 -%{_prefix}/lib/udev/rules.d/99-usb-ethernet.rules -%{_bindir}/usb_net_init.sh - ################################################################### ###################### Newly-created RPMs ######################### ################################################################### diff --git a/rules/99-usb-ethernet.rules b/rules/99-usb-ethernet.rules deleted file mode 100644 index 6c0307d..0000000 --- a/rules/99-usb-ethernet.rules +++ /dev/null @@ -1,6 +0,0 @@ -# USB ETHERNET -SUBSYSTEM!="net", GOTO="usb_ethernet_end" - -ACTION=="add", ATTRS{idVendor}=="0bda", ATTRS{idProduct}=="8152", RUN+="/usr/bin/usb_net_init.sh %k" - -LABEL="usb_ethernet_end" diff --git a/scripts/usb_net_init.sh b/scripts/usb_net_init.sh deleted file mode 100644 index ab245b1..0000000 --- a/scripts/usb_net_init.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -PATH=/bin:/usr/bin:/sbin:/usr/sbin -interface=$1 - -/sbin/ifconfig ${interface} down -/sbin/ifconfig ${interface} 192.20.16.11 -/sbin/ifconfig ${interface} up - -- 2.7.4 From ed7f5205fc687a3d36333de8ef1d7d2b87812750 Mon Sep 17 00:00:00 2001 From: Hyotaek Shim Date: Wed, 3 Jan 2018 15:00:43 +0900 Subject: [PATCH 08/16] Rename system-plugin-circle as system-plugin-device-circle Change-Id: Ib397e53a9f9a3c048b7c83758cc964f262a803d1 Signed-off-by: Hyotaek Shim --- packaging/system-plugin.spec | 46 ++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/packaging/system-plugin.spec b/packaging/system-plugin.spec index ea6736e..649e00c 100644 --- a/packaging/system-plugin.spec +++ b/packaging/system-plugin.spec @@ -64,14 +64,6 @@ BuildArch: noarch %description exynos This package provides Exynos specific system configuration files. -%package circle -Summary: Circle specific system configuration files -Requires: %{name} = %{version}-%{release} -BuildArch: noarch - -%description circle -This package provides Circle specific system configuration files. - %package -n liblazymount Summary: Library for lazy mount feature Requires(post): /usr/bin/vconftool @@ -100,6 +92,14 @@ BuildArch: noarch %description device-spreadtrum This package provides Spreadtrum specific system configuration files. +%package device-circle +Summary: Circle specific system configuration files +Requires: %{name} = %{version}-%{release} +BuildArch: noarch + +%description device-circle +This package provides Circle specific system configuration files. + %package device-artik530 Summary: Artik530 Requires: %{name} = %{version}-%{release} @@ -341,21 +341,6 @@ rm -f %{_sbindir}/e4crypt %license LICENSE.Apache-2.0 %{_prefix}/lib/udev/rules.d/51-system-plugin-exynos.rules -%files circle -%manifest %{name}.manifest -%license LICENSE.Apache-2.0 -/initrd -/csa -%{_sysconfdir}/fstab_3parts -%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dpartlabel-user.service -%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dpartlabel-system\x2ddata.service -%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dpartlabel-rootfs.service -%{_unitdir}/csa.mount -%{_unitdir}/local-fs.target.wants/csa.mount - -# ugly temporary patch for initrd wearable -%post circle -mv %{_sysconfdir}/fstab_3parts %{_sysconfdir}/fstab %post n4 mv %{_sysconfdir}/fstab_2parts %{_sysconfdir}/fstab @@ -418,6 +403,21 @@ systemctl daemon-reload %post device-spreadtrum mv %{_sysconfdir}/fstab_2parts %{_sysconfdir}/fstab +%files device-circle +%manifest %{name}.manifest +%license LICENSE.Apache-2.0 +/initrd +/csa +%{_sysconfdir}/fstab_3parts +%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dpartlabel-user.service +%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dpartlabel-system\x2ddata.service +%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dpartlabel-rootfs.service +%{_unitdir}/csa.mount +%{_unitdir}/local-fs.target.wants/csa.mount + +%post device-circle +mv %{_sysconfdir}/fstab_3parts %{_sysconfdir}/fstab + %files device-artik530 %files device-artik710 -- 2.7.4 From d7c6f5ee86a9fa90b7707118ed8ed6e0144753b4 Mon Sep 17 00:00:00 2001 From: Hyotaek Shim Date: Thu, 4 Jan 2018 15:56:39 +0900 Subject: [PATCH 09/16] Add config-partition rpms and remove system-plugin-iot rpms Change-Id: I36251000378a04983c4817e7858bfe2e7635f204 Signed-off-by: Hyotaek Shim --- packaging/system-plugin.spec | 173 ++++++++++++++++++++++--------------------- 1 file changed, 90 insertions(+), 83 deletions(-) diff --git a/packaging/system-plugin.spec b/packaging/system-plugin.spec index 649e00c..0cf382a 100644 --- a/packaging/system-plugin.spec +++ b/packaging/system-plugin.spec @@ -38,15 +38,6 @@ BuildArch: noarch %description rpi3 This package provides RPi3 specific system configuration files. -%package iot -Summary: IoT specific system configuration files -Requires: %{name} = %{version}-%{release} -Requires: dbus -BuildArch: noarch - -%description iot -This package provides IoT specific system configuration files. - %package n4 Summary: Note4 specific system configuration files Requires: %{name} = %{version}-%{release} @@ -124,15 +115,6 @@ BuildArch: noarch %description device-rpi3 This package provides system configuration files for the RPI3 device. -%package profile-iot -Summary: System configuration files for IoT profiles -Requires: %{name} = %{version}-%{release} -Requires: dbus -BuildArch: noarch - -%description profile-iot -This package provides system configuration files for IoT profiles. - %package profile-iot-headless Summary: System configuration files for IoT headless profiles Requires: %{name} = %{version}-%{release} @@ -141,14 +123,6 @@ BuildArch: noarch %description profile-iot-headless This package provides system configuration files for IoT headless profiles. -%package config-udev-sdbd -Summary: System configuration files to trigger sdb with udev rule -Requires: %{name} = %{version}-%{release} -BuildArch: noarch - -%description config-udev-sdbd -This package provides configuration files to trigger sdb with udev rule. - %package feature-init_wrapper Summary: Support init.wrapper booting. Requires: %{name} = %{version}-%{release} @@ -173,6 +147,47 @@ Requires: feature-liblazymount = %{version} %description feature-liblazymount-devel Development library for lazy mount feature.It supports some interface functions. +%package feature-image-reduction +Summary: System configuration files for reducing image size +Requires: %{name} = %{version}-%{release} +Requires: dbus +BuildArch: noarch + +%description feature-image-reduction +This package provides system configuration files for reducing image size. + +%package config-udev-sdbd +Summary: System configuration files to trigger sdb with udev rule +Requires: %{name} = %{version}-%{release} +BuildArch: noarch + +%description config-udev-sdbd +This package provides configuration files to trigger sdb with udev rule. + +%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 /etc/fstab(remount) and resize2fs@.service. + +%package config-3parts +Summary: System configuration files for storage partitions +Requires: %{name} = %{version}-%{release} +BuildArch: noarch + +%description config-3parts +This package provides configuration files for /etc/fstab(remount) and resize2fs@.service. + +%package config-3parts-lzuser +Summary: System configuration files for storage partitions +Requires: %{name} = %{version}-%{release} +BuildArch: noarch + +%description config-3parts-lzuser +This package provides configuration files for /etc/fstab(remount) and resize2fs@.service. + %prep %setup -q @@ -301,29 +316,6 @@ mv %{_sysconfdir}/fstab_3parts %{_sysconfdir}/fstab %{_prefix}/bin/udevadm hwdb --update mv %{_sysconfdir}/fstab_3parts %{_sysconfdir}/fstab -%files iot -%manifest %{name}.manifest -%license LICENSE.Apache-2.0 -%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dlabel-system\x2ddata.service -%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dlabel-user.service -%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dlabel-rootfs.service -%{_sysconfdir}/fstab_2parts -%{_prefix}/lib/udev/hwdb.d/60-evdev.hwdb - -%post iot -%{_prefix}/bin/udevadm hwdb --update -mv %{_sysconfdir}/fstab_2parts %{_sysconfdir}/fstab - -%posttrans iot -# platform/upstream/dbus -rm -f %{_bindir}/dbus-cleanup-sockets -rm -f %{_bindir}/dbus-run-session -rm -f %{_bindir}/dbus-test-tool -rm -f %{_bindir}/dbus-update-activation-environment -rm -f %{_bindir}/dbus-uuidgen -# platform/upstream/e2fsprogs -rm -f %{_sbindir}/e4crypt - %files n4 %manifest %{name}.manifest %license LICENSE.Apache-2.0 @@ -408,10 +400,6 @@ mv %{_sysconfdir}/fstab_2parts %{_sysconfdir}/fstab %license LICENSE.Apache-2.0 /initrd /csa -%{_sysconfdir}/fstab_3parts -%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dpartlabel-user.service -%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dpartlabel-system\x2ddata.service -%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dpartlabel-rootfs.service %{_unitdir}/csa.mount %{_unitdir}/local-fs.target.wants/csa.mount @@ -435,40 +423,11 @@ mv %{_sysconfdir}/fstab_3parts %{_sysconfdir}/fstab #%{_prefix}/bin/udevadm hwdb --update #mv %{_sysconfdir}/fstab_3parts %{_sysconfdir}/fstab -%files profile-iot -#%manifest %{name}.manifest -#%license LICENSE.Apache-2.0 -#%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dlabel-system\x2ddata.service -#%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dlabel-user.service -#%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dlabel-rootfs.service -#%{_sysconfdir}/fstab_2parts -#%{_prefix}/lib/udev/hwdb.d/60-evdev.hwdb - -%post profile-iot -#%{_prefix}/bin/udevadm hwdb --update -#mv %{_sysconfdir}/fstab_2parts %{_sysconfdir}/fstab - -%posttrans profile-iot -## platform/upstream/dbus -#rm -f %{_bindir}/dbus-cleanup-sockets -#rm -f %{_bindir}/dbus-run-session -#rm -f %{_bindir}/dbus-test-tool -#rm -f %{_bindir}/dbus-update-activation-environment -#rm -f %{_bindir}/dbus-uuidgen -## platform/upstream/e2fsprogs -#rm -f %{_sbindir}/e4crypt - %files profile-iot-headless %manifest %{name}.manifest %license LICENSE.Apache-2.0 %{_sysconfdir}/profile.d/headless_env.sh -%files config-udev-sdbd -%manifest %{name}.manifest -%license LICENSE.Apache-2.0 -%{_bindir}/sdb-mode.sh -%{_prefix}/lib/udev/rules.d/99-sdb-extcon.rules - %files feature-init_wrapper %license LICENSE.Apache-2.0 %{_sbindir}/init.wrapper @@ -507,4 +466,52 @@ ln -s /sbin/init.wrapper /sbin/init #%{_bindir}/test_lazymount #%endif -%postun feature-liblazymount -p /sbin/ldconfig +%postun feature-liblazymount -p /sbin/ldconfig + +%posttrans feature-image-reduction +# platform/upstream/dbus +rm -f %{_bindir}/dbus-cleanup-sockets +rm -f %{_bindir}/dbus-run-session +rm -f %{_bindir}/dbus-test-tool +rm -f %{_bindir}/dbus-update-activation-environment +rm -f %{_bindir}/dbus-uuidgen +# platform/upstream/e2fsprogs +rm -f %{_sbindir}/e4crypt + +%files config-udev-sdbd +%manifest %{name}.manifest +%license LICENSE.Apache-2.0 +%{_bindir}/sdb-mode.sh +%{_prefix}/lib/udev/rules.d/99-sdb-extcon.rules + +%files config-2parts +%manifest %{name}.manifest +%license LICENSE.Apache-2.0 +%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dlabel-rootfs.service +%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dlabel-system\x2ddata.service +%{_sysconfdir}/fstab_2parts + +%post config-2parts +mv %{_sysconfdir}/fstab_2parts %{_sysconfdir}/fstab + +%files config-3parts +%manifest %{name}.manifest +%license LICENSE.Apache-2.0 +%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dlabel-rootfs.service +%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dlabel-system\x2ddata.service +%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dlabel-user.service +%{_sysconfdir}/fstab_3parts + +%post config-3parts +mv %{_sysconfdir}/fstab_3parts %{_sysconfdir}/fstab + +%files config-3parts-lzuser +%manifest %{name}.manifest +%license LICENSE.Apache-2.0 +%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dlabel-rootfs.service +%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dlabel-system\x2ddata.service +%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dlabel-user.service +%{_sysconfdir}/fstab_2parts + +%post config-3parts-lzuser +mv %{_sysconfdir}/fstab_2parts %{_sysconfdir}/fstab -- 2.7.4 From 00cb620b4ba642ca8bdd97e898be776421d7d440 Mon Sep 17 00:00:00 2001 From: Hyotaek Shim Date: Fri, 5 Jan 2018 18:50:55 +0900 Subject: [PATCH 10/16] Reorganize the remaining existing system-plugin rpms Change-Id: I2090e4cfa2211eaf028d7ebfd83378c35fa9ba1b Signed-off-by: Hyotaek Shim --- packaging/system-plugin.spec | 286 ++++++++++++------------------------------- 1 file changed, 78 insertions(+), 208 deletions(-) diff --git a/packaging/system-plugin.spec b/packaging/system-plugin.spec index 0cf382a..7bfeeb7 100644 --- a/packaging/system-plugin.spec +++ b/packaging/system-plugin.spec @@ -1,8 +1,6 @@ #%define _unpackaged_files_terminate_build 0 #%define debug_package %{nil} -%define temp_wait_mount 1 - Name: system-plugin Summary: Target specific system configuration files Version: 0.1 @@ -21,68 +19,23 @@ BuildRequires: pkgconfig(libsystemd) %description This package provides target specific system configuration files. -%package u3 -Summary: U3/XU3 specific system configuration files -Requires: %{name} = %{version}-%{release} -Requires: %{name}-exynos = %{version}-%{release} -BuildArch: noarch - -%description u3 -This package provides U3/XU3 specific system configuration files. - -%package rpi3 -Summary: RPi3 specific system configuration files +%package device-spreadtrum +Summary: Spreadtrum specific system configuration files Requires: %{name} = %{version}-%{release} BuildArch: noarch -%description rpi3 -This package provides RPi3 specific system configuration files. +%description device-spreadtrum +This package provides Spreadtrum specific system configuration files. -%package n4 +%package device-n4 Summary: Note4 specific system configuration files Requires: %{name} = %{version}-%{release} Requires: %{name}-exynos = %{version}-%{release} BuildArch: noarch -%description n4 +%description device-n4 This package provides Note4 specific system configuration files. -%package exynos -Summary: Exynos specific system configuration files -Requires: %{name} = %{version}-%{release} -BuildArch: noarch - -%description exynos -This package provides Exynos specific system configuration files. - -%package -n liblazymount -Summary: Library for lazy mount feature -Requires(post): /usr/bin/vconftool -Requires: vconf - -%description -n liblazymount -Library for lazy mount feature. It supports some interface functions. - -%package -n liblazymount-devel -Summary: Development library for lazy mount feature -Requires: vconf -Requires: liblazymount = %{version} - -%description -n liblazymount-devel -Development library for lazy mount feature.It supports some interface functions. - -################################################################### -###################### Newly-created RPMs ######################### -################################################################### - -%package device-spreadtrum -Summary: Spreadtrum specific system configuration files -Requires: %{name} = %{version}-%{release} -BuildArch: noarch - -%description device-spreadtrum -This package provides Spreadtrum specific system configuration files. - %package device-circle Summary: Circle specific system configuration files Requires: %{name} = %{version}-%{release} @@ -91,21 +44,22 @@ BuildArch: noarch %description device-circle This package provides Circle specific system configuration files. -%package device-artik530 -Summary: Artik530 +%package device-exynos +Summary: Exynos specific system configuration files Requires: %{name} = %{version}-%{release} BuildArch: noarch -%description device-artik530 -This package provides system configuration files for the artik530 device. +%description device-exynos +This package provides Exynos specific system configuration files. -%package device-artik710 -Summary: Artik710 +%package device-u3 +Summary: U3/XU3 specific system configuration files Requires: %{name} = %{version}-%{release} +Requires: %{name}-exynos = %{version}-%{release} BuildArch: noarch -%description device-artik710 -This package provides system configuration files for the artik710 device. +%description device-u3 +This package provides U3/XU3 specific system configuration files. %package device-rpi3 Summary: RPI3 @@ -115,14 +69,6 @@ BuildArch: noarch %description device-rpi3 This package provides system configuration files for the RPI3 device. -%package profile-iot-headless -Summary: System configuration files for IoT headless profiles -Requires: %{name} = %{version}-%{release} -BuildArch: noarch - -%description profile-iot-headless -This package provides system configuration files for IoT headless profiles. - %package feature-init_wrapper Summary: Support init.wrapper booting. Requires: %{name} = %{version}-%{release} @@ -131,21 +77,21 @@ BuildArch: noarch %description feature-init_wrapper This package provides init.wrapper and init symlink file for init wrapper booting. -%package feature-liblazymount +%package feature-lazymount Summary: Library for lazy mount feature Requires(post): /usr/bin/vconftool Requires: vconf -%description feature-liblazymount +%description feature-lazymount Library for lazy mount feature. It supports some interface functions. -%package feature-liblazymount-devel +%package feature-lazymount-devel Summary: Development library for lazy mount feature Requires: vconf -Requires: feature-liblazymount = %{version} +Requires: feature-lazymount = %{version} -%description feature-liblazymount-devel -Development library for lazy mount feature.It supports some interface functions. +%description feature-lazymount-devel +Development library for lazy mount feature. It supports some interface functions. %package feature-image-reduction Summary: System configuration files for reducing image size @@ -156,6 +102,14 @@ BuildArch: noarch %description feature-image-reduction This package provides system configuration files for reducing image size. +%package config-env-headless +Summary: System configuration files for headless images +Requires: %{name} = %{version}-%{release} +BuildArch: noarch + +%description config-env-headless +This package provides system configuration files for headless images. + %package config-udev-sdbd Summary: System configuration files to trigger sdb with udev rule Requires: %{name} = %{version}-%{release} @@ -242,13 +196,7 @@ install -m 644 rules/60-evdev.hwdb %{buildroot}%{_prefix}/lib/udev/hwdb.d/ # fstab mkdir -p %{buildroot}%{_sysconfdir} install -m 644 etc/fstab_3parts %{buildroot}%{_sysconfdir} -# lazymnt install -m 644 etc/fstab_2parts %{buildroot}%{_sysconfdir} -%if %{temp_wait_mount} -mkdir -p %{buildroot}%{_unitdir_user}/basic.target.wants -install -m 644 units/wait-user-mount.service %{buildroot}%{_unitdir_user} -ln -s ../wait-user-mount.service %{buildroot}%{_unitdir_user}/basic.target.wants/wait-user-mount.service -%endif # fstrim mkdir -p %{buildroot}%{_unitdir}/graphical.target.wants @@ -290,88 +238,6 @@ systemctl daemon-reload %{_unitdir}/tizen-system-env.service %{_unitdir}/basic.target.wants/tizen-system-env.service -%files u3 -%manifest %{name}.manifest -%license LICENSE.Apache-2.0 -%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dlabel-system\x2ddata.service -%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dlabel-user.service -%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dlabel-rootfs.service -%{_sysconfdir}/fstab_3parts -%{_prefix}/lib/udev/hwdb.d/60-evdev.hwdb - -%post u3 -%{_prefix}/bin/udevadm hwdb --update -mv %{_sysconfdir}/fstab_3parts %{_sysconfdir}/fstab - -%files rpi3 -%manifest %{name}.manifest -%license LICENSE.Apache-2.0 -%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dlabel-system\x2ddata.service -%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dlabel-user.service -%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dlabel-rootfs.service -%{_sysconfdir}/fstab_3parts -%{_prefix}/lib/udev/hwdb.d/60-evdev.hwdb - -%post rpi3 -%{_prefix}/bin/udevadm hwdb --update -mv %{_sysconfdir}/fstab_3parts %{_sysconfdir}/fstab - -%files n4 -%manifest %{name}.manifest -%license LICENSE.Apache-2.0 -%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dlabel-system\x2ddata.service -%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dlabel-user.service -%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dlabel-rootfs.service -%{_sysconfdir}/fstab_2parts -%{_unitdir}/graphical.target.wants/tizen-fstrim-user.timer -%{_unitdir}/tizen-fstrim-user.timer -%{_unitdir}/tizen-fstrim-user.service -%{_bindir}/tizen-fstrim-on-charge.sh - -%files exynos -%manifest %{name}.manifest -%license LICENSE.Apache-2.0 -%{_prefix}/lib/udev/rules.d/51-system-plugin-exynos.rules - -%post n4 -mv %{_sysconfdir}/fstab_2parts %{_sysconfdir}/fstab - -%files -n liblazymount -%defattr(-,root,root,-) -%{_libdir}/liblazymount.so.* -%manifest liblazymount.manifest -%license LICENSE.Apache-2.0 -%{_unitdir}/basic.target.wants/lazy_mount.path -%{_unitdir}/lazy_mount.path -%{_unitdir}/lazy_mount.service -%{_bindir}/mount-user.sh -%if %{temp_wait_mount} -%{_bindir}/test_lazymount -%{_unitdir_user}/basic.target.wants/wait-user-mount.service -%{_unitdir_user}/wait-user-mount.service -%endif - -%post -n liblazymount -/sbin/ldconfig -systemctl daemon-reload - -%files -n liblazymount-devel -%defattr(-,root,root,-) -%manifest liblazymount.manifest -%license LICENSE.Apache-2.0 -%{_libdir}/liblazymount.so -%{_includedir}/lazymount/lazy_mount.h -%{_libdir}/pkgconfig/liblazymount.pc -%if ! %{temp_wait_mount} -%{_bindir}/test_lazymount -%endif - -%postun -n liblazymount -p /sbin/ldconfig - -################################################################### -###################### Newly-created RPMs ######################### -################################################################### - %files device-spreadtrum %manifest %{name}.manifest %license LICENSE.Apache-2.0 @@ -395,6 +261,14 @@ systemctl daemon-reload %post device-spreadtrum mv %{_sysconfdir}/fstab_2parts %{_sysconfdir}/fstab +%files device-n4 +%manifest %{name}.manifest +%license LICENSE.Apache-2.0 +%{_unitdir}/graphical.target.wants/tizen-fstrim-user.timer +%{_unitdir}/tizen-fstrim-user.timer +%{_unitdir}/tizen-fstrim-user.service +%{_bindir}/tizen-fstrim-on-charge.sh + %files device-circle %manifest %{name}.manifest %license LICENSE.Apache-2.0 @@ -406,27 +280,26 @@ mv %{_sysconfdir}/fstab_2parts %{_sysconfdir}/fstab %post device-circle mv %{_sysconfdir}/fstab_3parts %{_sysconfdir}/fstab -%files device-artik530 - -%files device-artik710 +%files device-exynos +%manifest %{name}.manifest +%license LICENSE.Apache-2.0 +%{_prefix}/lib/udev/rules.d/51-system-plugin-exynos.rules %files device-rpi3 -#%manifest %{name}.manifest -#%license LICENSE.Apache-2.0 -#%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dlabel-system\x2ddata.service -#%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dlabel-user.service -#%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dlabel-rootfs.service -#%{_sysconfdir}/fstab_3parts -#%{_prefix}/lib/udev/hwdb.d/60-evdev.hwdb +%manifest %{name}.manifest +%license LICENSE.Apache-2.0 +%{_prefix}/lib/udev/hwdb.d/60-evdev.hwdb %post device-rpi3 -#%{_prefix}/bin/udevadm hwdb --update -#mv %{_sysconfdir}/fstab_3parts %{_sysconfdir}/fstab +%{_prefix}/bin/udevadm hwdb --update -%files profile-iot-headless +%files device-u3 %manifest %{name}.manifest %license LICENSE.Apache-2.0 -%{_sysconfdir}/profile.d/headless_env.sh +%{_prefix}/lib/udev/hwdb.d/60-evdev.hwdb + +%post device-u3 +%{_prefix}/bin/udevadm hwdb --update %files feature-init_wrapper %license LICENSE.Apache-2.0 @@ -436,37 +309,29 @@ mv %{_sysconfdir}/fstab_3parts %{_sysconfdir}/fstab rm -f /sbin/init ln -s /sbin/init.wrapper /sbin/init -%files feature-liblazymount -#%defattr(-,root,root,-) -#%{_libdir}/liblazymount.so.* -#%manifest liblazymount.manifest -#%license LICENSE.Apache-2.0 -#%{_unitdir}/basic.target.wants/lazy_mount.path -#%{_unitdir}/lazy_mount.path -#%{_unitdir}/lazy_mount.service -#%{_bindir}/mount-user.sh -#%if %{temp_wait_mount} -#%{_bindir}/test_lazymount -#%{_unitdir_user}/basic.target.wants/wait-user-mount.service -#%{_unitdir_user}/wait-user-mount.service -#%endif - -%post feature-liblazymount -#/sbin/ldconfig -#systemctl daemon-reload - -%files feature-liblazymount-devel -#%defattr(-,root,root,-) -#%manifest liblazymount.manifest -#%license LICENSE.Apache-2.0 -#%{_libdir}/liblazymount.so -#%{_includedir}/lazymount/lazy_mount.h -#%{_libdir}/pkgconfig/liblazymount.pc -#%if ! %{temp_wait_mount} -#%{_bindir}/test_lazymount -#%endif - -%postun feature-liblazymount -p /sbin/ldconfig +%files feature-lazymount +%defattr(-,root,root,-) +%manifest liblazymount.manifest +%license LICENSE.Apache-2.0 +%{_libdir}/liblazymount.so.* +%{_unitdir}/basic.target.wants/lazy_mount.path +%{_unitdir}/lazy_mount.path +%{_unitdir}/lazy_mount.service +%{_bindir}/mount-user.sh + +%post feature-lazymount +/sbin/ldconfig +systemctl daemon-reload + +%postun feature-lazymount -p /sbin/ldconfig + +%files feature-lazymount-devel +%defattr(-,root,root,-) +%manifest liblazymount.manifest +%license LICENSE.Apache-2.0 +%{_libdir}/liblazymount.so +%{_includedir}/lazymount/lazy_mount.h +%{_libdir}/pkgconfig/liblazymount.pc %posttrans feature-image-reduction # platform/upstream/dbus @@ -478,6 +343,11 @@ rm -f %{_bindir}/dbus-uuidgen # platform/upstream/e2fsprogs rm -f %{_sbindir}/e4crypt +%files config-env-headless +%manifest %{name}.manifest +%license LICENSE.Apache-2.0 +%{_sysconfdir}/profile.d/headless_env.sh + %files config-udev-sdbd %manifest %{name}.manifest %license LICENSE.Apache-2.0 -- 2.7.4 From bca3c6efb37e7fbe2a86d5e39092eef236e3a77c Mon Sep 17 00:00:00 2001 From: Hyotaek Shim Date: Fri, 5 Jan 2018 22:26:04 +0900 Subject: [PATCH 11/16] Combine system-plugin-device-exynos into system-plugin-device-u3 Change-Id: I8930d6827e649776f0429b3c1821fe455ea3c5d1 Signed-off-by: Hyotaek Shim --- packaging/system-plugin.spec | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/packaging/system-plugin.spec b/packaging/system-plugin.spec index 7bfeeb7..339b34a 100644 --- a/packaging/system-plugin.spec +++ b/packaging/system-plugin.spec @@ -44,14 +44,6 @@ BuildArch: noarch %description device-circle This package provides Circle specific system configuration files. -%package device-exynos -Summary: Exynos specific system configuration files -Requires: %{name} = %{version}-%{release} -BuildArch: noarch - -%description device-exynos -This package provides Exynos specific system configuration files. - %package device-u3 Summary: U3/XU3 specific system configuration files Requires: %{name} = %{version}-%{release} @@ -280,25 +272,21 @@ mv %{_sysconfdir}/fstab_2parts %{_sysconfdir}/fstab %post device-circle mv %{_sysconfdir}/fstab_3parts %{_sysconfdir}/fstab -%files device-exynos -%manifest %{name}.manifest -%license LICENSE.Apache-2.0 -%{_prefix}/lib/udev/rules.d/51-system-plugin-exynos.rules - -%files device-rpi3 +%files device-u3 %manifest %{name}.manifest %license LICENSE.Apache-2.0 %{_prefix}/lib/udev/hwdb.d/60-evdev.hwdb +%{_prefix}/lib/udev/rules.d/51-system-plugin-exynos.rules -%post device-rpi3 +%post device-u3 %{_prefix}/bin/udevadm hwdb --update -%files device-u3 +%files device-rpi3 %manifest %{name}.manifest %license LICENSE.Apache-2.0 %{_prefix}/lib/udev/hwdb.d/60-evdev.hwdb -%post device-u3 +%post device-rpi3 %{_prefix}/bin/udevadm hwdb --update %files feature-init_wrapper -- 2.7.4 From 891e33a5d7a33297cf0869e3ddf425d411a5add9 Mon Sep 17 00:00:00 2001 From: Hyotaek Shim Date: Fri, 5 Jan 2018 22:42:05 +0900 Subject: [PATCH 12/16] Remove unused resize2fs@.service files Change-Id: I3796fde6f6eb24cef554f7b52023bc86b2663b53 Signed-off-by: Hyotaek Shim --- packaging/system-plugin.spec | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/packaging/system-plugin.spec b/packaging/system-plugin.spec index 339b34a..2f4e93e 100644 --- a/packaging/system-plugin.spec +++ b/packaging/system-plugin.spec @@ -172,10 +172,6 @@ ln -s ../resize2fs@.service %{buildroot}%{_unitdir}/basic.target.wants/resize2fs 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 -ln -s ../resize2fs@.service %{buildroot}%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\\x2dpartlabel-user.service -ln -s ../resize2fs@.service %{buildroot}%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\\x2dpartlabel-system\\x2ddata.service -ln -s ../resize2fs@.service %{buildroot}%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\\x2dpartlabel-rootfs.service - ln -s ../tizen-system-env.service %{buildroot}%{_unitdir}/basic.target.wants/tizen-system-env.service mkdir -p %{buildroot}%{_prefix}/lib/udev/rules.d/ @@ -237,11 +233,7 @@ systemctl daemon-reload /csa %{_prefix}/lib/udev/rules.d/51-system-plugin-spreadtrum.rules %{_unitdir}/tizen-system-env.service -%{_sysconfdir}/fstab_2parts %{_unitdir}/basic.target.wants/tizen-system-env.service -%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dpartlabel-user.service -%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dpartlabel-system\x2ddata.service -%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dpartlabel-rootfs.service %{_unitdir}/csa.mount %{_unitdir}/local-fs.target.wants/csa.mount %{_unitdir}/graphical.target.wants/tizen-fstrim-user.timer @@ -250,9 +242,6 @@ systemctl daemon-reload %{_bindir}/tizen-fstrim-on-charge.sh %{_datadir}/fixed_multiuser/fixed-multi-user.sh -%post device-spreadtrum -mv %{_sysconfdir}/fstab_2parts %{_sysconfdir}/fstab - %files device-n4 %manifest %{name}.manifest %license LICENSE.Apache-2.0 -- 2.7.4 From 73c2c08704309f544c9bcac2188bb0df1c8cb429 Mon Sep 17 00:00:00 2001 From: Hyotaek Shim Date: Fri, 5 Jan 2018 22:52:01 +0900 Subject: [PATCH 13/16] Remove unused %post device-circle Change-Id: Ifaa7c6eaa34c3641aa6855eee3059f6c209a6ae8 Signed-off-by: Hyotaek Shim --- packaging/system-plugin.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/packaging/system-plugin.spec b/packaging/system-plugin.spec index 2f4e93e..1b05ce4 100644 --- a/packaging/system-plugin.spec +++ b/packaging/system-plugin.spec @@ -258,9 +258,6 @@ systemctl daemon-reload %{_unitdir}/csa.mount %{_unitdir}/local-fs.target.wants/csa.mount -%post device-circle -mv %{_sysconfdir}/fstab_3parts %{_sysconfdir}/fstab - %files device-u3 %manifest %{name}.manifest %license LICENSE.Apache-2.0 -- 2.7.4 From 91b94ee60ae3eaefcb9e930740d95ec06b3da8c3 Mon Sep 17 00:00:00 2001 From: Hyotaek Shim Date: Tue, 9 Jan 2018 07:31:14 +0900 Subject: [PATCH 14/16] Fix some incorrect Requires Change-Id: I45924f7b38988c4fb5cdb6aa6eb8ea041da00fc6 Signed-off-by: Hyotaek Shim --- packaging/system-plugin.spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/packaging/system-plugin.spec b/packaging/system-plugin.spec index 1b05ce4..b4a6925 100644 --- a/packaging/system-plugin.spec +++ b/packaging/system-plugin.spec @@ -30,7 +30,6 @@ This package provides Spreadtrum specific system configuration files. %package device-n4 Summary: Note4 specific system configuration files Requires: %{name} = %{version}-%{release} -Requires: %{name}-exynos = %{version}-%{release} BuildArch: noarch %description device-n4 @@ -47,7 +46,6 @@ This package provides Circle specific system configuration files. %package device-u3 Summary: U3/XU3 specific system configuration files Requires: %{name} = %{version}-%{release} -Requires: %{name}-exynos = %{version}-%{release} BuildArch: noarch %description device-u3 @@ -80,7 +78,7 @@ Library for lazy mount feature. It supports some interface functions. %package feature-lazymount-devel Summary: Development library for lazy mount feature Requires: vconf -Requires: feature-lazymount = %{version} +Requires: %{name}-feature-lazymount = %{version} %description feature-lazymount-devel Development library for lazy mount feature. It supports some interface functions. @@ -181,7 +179,7 @@ install -m 644 rules/51-system-plugin-spreadtrum.rules %{buildroot}%{_prefix}/li mkdir -p %{buildroot}%{_prefix}/lib/udev/hwdb.d/ install -m 644 rules/60-evdev.hwdb %{buildroot}%{_prefix}/lib/udev/hwdb.d/ -# fstab +# /etc/fstab mkdir -p %{buildroot}%{_sysconfdir} install -m 644 etc/fstab_3parts %{buildroot}%{_sysconfdir} install -m 644 etc/fstab_2parts %{buildroot}%{_sysconfdir} -- 2.7.4 From 385132c8f2db70e03478645a967c6ac1e47e76d1 Mon Sep 17 00:00:00 2001 From: INSUN PYO Date: Fri, 19 Jan 2018 12:57:23 +0900 Subject: [PATCH 15/16] Remove unused 99-sdb-switch.rules Signed-off-by: INSUN PYO Change-Id: Ie211523eb3ab95c921dcd9edc15229cf24e67dfd --- packaging/system-plugin.spec | 2 -- rules/99-sdb-switch.rules | 2 -- 2 files changed, 4 deletions(-) delete mode 100644 rules/99-sdb-switch.rules diff --git a/packaging/system-plugin.spec b/packaging/system-plugin.spec index b4a6925..ccc2c80 100644 --- a/packaging/system-plugin.spec +++ b/packaging/system-plugin.spec @@ -202,8 +202,6 @@ install -m 755 scripts/init.wrapper %{buildroot}%{_sbindir} # headless mkdir -p %{buildroot}%{_sbindir} install -m 755 scripts/sdb-mode.sh %{buildroot}%{_bindir} -mkdir -p %{buildroot}%{_prefix}/lib/udev/rules.d/ -install -m 644 rules/99-sdb-switch.rules %{buildroot}%{_prefix}/lib/udev/rules.d/ mkdir -p %{buildroot}%{_sysconfdir}/profile.d install -m 755 scripts/headless_env.sh %{buildroot}%{_sysconfdir}/profile.d diff --git a/rules/99-sdb-switch.rules b/rules/99-sdb-switch.rules deleted file mode 100644 index 00804a0..0000000 --- a/rules/99-sdb-switch.rules +++ /dev/null @@ -1,2 +0,0 @@ -SUBSYSTEM=="switch", ATTR{name}=="usb_cable", ATTR{state}=="1", RUN+="/usr/bin/sdb-mode.sh --on" -SUBSYSTEM=="switch", ATTR{name}=="usb_cable", ATTR{state}=="0", RUN+="/usr/bin/sdb-mode.sh --off" -- 2.7.4 From eced9bf655520f74513e22246e8d3a75025e3857 Mon Sep 17 00:00:00 2001 From: Hyotaek Shim Date: Wed, 4 Apr 2018 19:20:01 +0900 Subject: [PATCH 16/16] Remove unused test_lazymount Change-Id: Ie83864befb6e03fe6c86374c5adb2d95da6cebab Signed-off-by: Hyotaek Shim --- Makefile.am | 16 --------- src/liblazymount/test_lazymount.c | 76 --------------------------------------- 2 files changed, 92 deletions(-) delete mode 100644 src/liblazymount/test_lazymount.c diff --git a/Makefile.am b/Makefile.am index a651e89..aa3caec 100644 --- a/Makefile.am +++ b/Makefile.am @@ -148,22 +148,6 @@ noinst_liblazymount_la_SOURCES = \ src/liblazymount/lazy_mount_interface.c # ------------------------------------------------------------------------------ -bin_PROGRAMS = \ - test_lazymount - -test_lazymount_SOURCES = \ - src/liblazymount/test_lazymount.c - -test_lazymount_CFLAGS = \ - $(AM_CFLAGS) \ - -I. -Isrc/liblazymount \ - $(LIBLAZYMOUNT_PC_CFLAGS) - -test_lazymount_LDADD = \ - -lvconf \ - -lsystemd \ - liblazymount.la - systemunit_DATA += \ units/lazy_mount.path \ units/lazy_mount.service diff --git a/src/liblazymount/test_lazymount.c b/src/liblazymount/test_lazymount.c deleted file mode 100644 index c38c4c2..0000000 --- a/src/liblazymount/test_lazymount.c +++ /dev/null @@ -1,76 +0,0 @@ -#include -#include -#include -#include -#include - -int get_input() -{ - int data; - int i = 0; - char c_data[2]; - while (1) { - data = getchar(); - if (i < 2) - c_data[i] = (char)data; - i++; - if (data == 10 || data == 13) - break; - } - if (i > 2) - return -1; - - c_data[1] = 0; - return atoi(c_data); -} - -int main(int argc, char **argv) -{ - int data; - int sl_ret; - int i = 0; - if (argc == 2 && strncmp(argv[1], "wait", 5) == 0) { - for (i = 0 ; i < 3 ; i++) { - sl_ret = wait_mount_user(); - if (sl_ret != 0) continue; - else break; - } - - if (i == 3) return -1; - sd_notify(0, "READY=1"); - return 0; - } - while (1) { - printf("Test\n"); - printf("1. get_need_ui_for_lazy_mount()\n"); - printf("2. do_mount_user()\n"); - printf("3. wait_mount_user()\n"); - printf("4. Exit to test.\n"); - printf("Select test : "); - data = get_input(); - - switch (data) { - case 1: - sl_ret = get_need_ui_for_lazy_mount(); - printf("get_need_ui_for_lazy_mount() returns %d\n", sl_ret); - break; - case 2: - printf("Doing mount user data....\n"); - sl_ret = do_mount_user(); - printf("do_mount_user() returns %d\n", sl_ret); - break; - case 3: - printf("Waiting mount user data....\n"); - sl_ret = wait_mount_user(); - printf("wait_mount_user() returns %d\n", sl_ret); - break; - case 4: - printf("exit\n"); - return 0; - default: - printf("Unknown : %d\n", data); - break; - } - } - return 0; -} -- 2.7.4