Changes - SailfishOS Open Build Service

Changes of Revision 5

[-] [+]	Changed	_service:gitpkg:sdk-setup.changes
@@ -5,6 +5,8 @@ - sdk-manage: Add a --status to --sdk to allow QtC to verify that all is well - sdk-manage: Add/remove /home/src<N> mountpoints using sdk-manage --srcdir --add/--remove 1 - mb2: Verify the target dependencies when qmake is run +- sdk-enginelan: Correct enginelan to support dual ethernet +- systemd: Setup new shared folder mounts * Wed May 29 2013 David Greaves <david@dgreaves.com> - 0.35-1 - sdk-utils: Run specify on yaml, not spec
[-] [+]	Changed	_service:gitpkg:sdk-setup.spec ^
@@ -6,6 +6,11 @@ Name: sdk-setup # >> macros +%define systemd_post() \ +# Initial installation \ +/bin/systemctl -f preset %{?} >/dev/null 2>&1 \|\| : \ +%{nil} + # << macros Summary: SDK setup packages for Mer SDK @@ -17,6 +22,7 @@ URL: https://github.com/mer-tools/sdk-setup Source0: sdk-setup.tgz Source100: sdk-setup.yaml +BuildRequires: systemd %description Scripts, configurations and utilities to build Mer SDK and variants @@ -92,6 +98,9 @@ cp --no-dereference systemd/ %{buildroot}/%{_unitdir}/ cp src/sdk-info %{buildroot}%{_bindir}/ cp src/sdk-setup-enginelan %{buildroot}%{_bindir}/ +# This should really be %%{_unitdir}/default.target but systemd owns that :/ +mkdir -p %{buildroot}/%{_sysconfdir}/systemd/system/ +ln -sf %{_unitdir}/multi-user.target %{buildroot}/%{_sysconfdir}/systemd/system/default.target echo "This file tells ssu this is a virtualbox SDK installation" > %{buildroot}/%{_sysconfdir}/mer-sdk-vbox # sdk-sb2-config @@ -120,6 +129,7 @@ %preun -n sdk-vm %systemd_preun home-mersdk.mount %systemd_preun etc-mersdk-share.mount +%systemd_preun etc-ssh-authorized_keys.mount %systemd_preun host_targets.mount %systemd_preun information.service %systemd_preun sdk-enginelan.service @@ -130,6 +140,7 @@ %post -n sdk-vm %systemd_post home-mersdk.mount %systemd_post etc-mersdk-share.mount +%systemd_post etc-ssh-authorized_keys.mount %systemd_post host_targets.mount %systemd_post information.service %systemd_post sdk-enginelan.service @@ -161,7 +172,8 @@ %{_unitdir}/host_targets.mount %{_unitdir}/home-mersdk.mount %{_unitdir}/etc-mersdk-share.mount -%{_unitdir}/default.target +%{_unitdir}/etc-ssh-authorized_keys.mount +%config %{_sysconfdir}/systemd/system/default.target %{_sysconfdir}/mer-sdk-vbox # >> files sdk-vm # << files sdk-vm
[-] [+]	Changed	_service ^
@@ -2,7 +2,7 @@ <services> <service name="gitpkg"> <param name="repo">lbt/sdk-setup</param> - <param name="tag">b484c6d0b447dbd3cb7451d2e6a4e899ff0f3e46</param> + <param name="tag">0f098b152441d2af441441cebfe34ecf73f64bb3</param> <param name="service">github</param> </service> </services>
[-] [+]	Changed	_service:gitpkg:sdk-setup.yaml ^
@@ -9,7 +9,8 @@ URL: https://github.com/mer-tools/sdk-setup Sources: - sdk-setup.tgz -BuildRequires: systemd +PkgBR: + - systemd Configure: none Builder: none SetupOptions: -q -n src @@ -50,7 +51,8 @@ - '%{_unitdir}/host_targets.mount' - '%{_unitdir}/home-mersdk.mount' - '%{_unitdir}/etc-mersdk-share.mount' - - '%{_unitdir}/default.target' + - '%{_unitdir}/etc-ssh-authorized_keys.mount' + - '%config %{_sysconfdir}/systemd/system/default.target' - '%{_sysconfdir}/mer-sdk-vbox' - Name: sdk-sb2-config AsWholeName: true