Accepting request 838213 from devel:kubic

- Update to version 2.5 
  - tmp.conf now part of filesystem package for Factory
- Include tmp.conf for SUSE MicroOS

OBS-URL: https://build.opensuse.org/request/show/838213
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/microos-tools?expand=0&rev=11

microos-tools-2.4.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e4315e295786375fc854009b37fb73f3e4d68cef8e05c8f8c9e5590defad32b8
-size 75256

microos-tools-2.5.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:03143b70e4c746fb569bf0962710d64f52200603b4a8e6b06592b93285f6fe44
+size 75172

microos-tools.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Sep 28 09:13:15 UTC 2020 - Thorsten Kukuk <kukuk@suse.com>
+
+- Update to version 2.5 
+  - tmp.conf now part of filesystem package for Factory
+- Include tmp.conf for SUSE MicroOS
+
 -------------------------------------------------------------------
 Tue Aug 18 14:33:56 UTC 2020 - Thorsten Kukuk <kukuk@suse.com>
 

microos-tools.spec

@@ -17,7 +17,7 @@
 
 
 Name:           microos-tools
-Version:        2.4
+Version:        2.5
 Release:        0
 Summary:        Files and Scripts for openSUSE MicroOS
 License:        GPL-2.0-or-later
@@ -25,6 +25,7 @@ Group:          Development/Tools/Other
 URL:            https://github.com/kubic-project/microos-tools
 Source:         microos-tools-%{version}.tar.xz
 Source1:        tmp.mount
+Source2:        tmp.conf
 Source99:       microos-tools-rpmlintrc
 BuildRequires:  distribution-release
 BuildRequires:  pkgconfig
@@ -34,7 +35,7 @@ Requires:       read-only-root-fs
 Conflicts:      systemd-coredump
 
 %description
-Files, scripts and directories for openSUSE Kubic.
+Files, scripts and directories for openSUSE MicroOS.
 
 %prep
 %setup -q
@@ -79,13 +80,9 @@ install -m 0644 %{SOURCE1} %{buildroot}/%{_unitdir}/
 %{_unitdir}/setup-systemd-proxy-env.service
 %dir %{_unitdir}/sysinit.target.wants
 %{_unitdir}/sysinit.target.wants/MicroOS-firstboot.service
-%if 0%{?suse_version} <= 1500
-%{_unitdir}/tmp.mount
-%endif
 %dir %{_unitdir}/salt-minion.service.d
 %{_unitdir}/salt-minion.service.d/TMPDIR.conf
 %{_tmpfilesdir}/salt-minion-tmpdir.conf
-%{_tmpfilesdir}/tmp.conf
 %{_sysctldir}/30-corefiles.conf
 %{_libexecdir}/MicroOS-firstboot
 %{_sbindir}/setup-systemd-proxy-env
@@ -95,5 +92,9 @@ install -m 0644 %{SOURCE1} %{buildroot}/%{_unitdir}/
 %{_systemdgeneratordir}/selinux-autorelabel-generator
 %config %{_sysconfdir}/profile.d/ssh-locale-check.sh
 %{_bindir}/locale-check
+%if 0%{?suse_version} <= 1500
+%{_unitdir}/tmp.mount
+%{_tmpfilesdir}/tmp.conf
+%endif
 
 %changelog

tmp.conf

@@ -0,0 +1,11 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+# See tmpfiles.d(5) for details
+
+# Clear tmp directories separately, to make them easier to override
+d /tmp 1777 root root 10d