From f469a1d9fb03c5ce9f7fec6a44a4a62e6199abe1245808ee9a589bea6e55bd4c Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk Date: Wed, 10 Jan 2024 13:04:57 +0000 Subject: [PATCH] - Update to version 2.21+git9: * Add man-online command * Drop support for sle15 builds * Add OBS CI workflow OBS-URL: https://build.opensuse.org/package/show/devel:microos/microos-tools?expand=0&rev=29 --- _servicedata | 2 +- microos-tmp.conf | 11 ----------- microos-tools-2.21+git5.obscpio | 3 --- microos-tools-2.21+git9.obscpio | 3 +++ microos-tools-rpmlintrc | 2 -- microos-tools.changes | 8 ++++++++ microos-tools.obsinfo | 6 +++--- microos-tools.spec | 22 ++++++---------------- tmp.mount | 25 ------------------------- 9 files changed, 21 insertions(+), 61 deletions(-) delete mode 100644 microos-tmp.conf delete mode 100644 microos-tools-2.21+git5.obscpio create mode 100644 microos-tools-2.21+git9.obscpio delete mode 100644 microos-tools-rpmlintrc delete mode 100644 tmp.mount diff --git a/_servicedata b/_servicedata index 1093d1c..1ba20e6 100644 --- a/_servicedata +++ b/_servicedata @@ -1,5 +1,5 @@ https://github.com/openSUSE/microos-tools.git - b43efacd05faccc841ae5302e3a9a5821485f31f + 70fec4cd39c7e95ebc83abb4cb85cf189803a4f5 \ No newline at end of file diff --git a/microos-tmp.conf b/microos-tmp.conf deleted file mode 100644 index 8fd7454..0000000 --- a/microos-tmp.conf +++ /dev/null @@ -1,11 +0,0 @@ -# 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 diff --git a/microos-tools-2.21+git5.obscpio b/microos-tools-2.21+git5.obscpio deleted file mode 100644 index 1fea5a6..0000000 --- a/microos-tools-2.21+git5.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2d4e1f53c41fa1b2723b126a63256ebf5105714678d8d3749f5cfab3d413f18c -size 49162 diff --git a/microos-tools-2.21+git9.obscpio b/microos-tools-2.21+git9.obscpio new file mode 100644 index 0000000..3e15895 --- /dev/null +++ b/microos-tools-2.21+git9.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3603279095c2eb68243336576dc644ca9759c7363d66bbe01d163f2bac5b28a7 +size 807436 diff --git a/microos-tools-rpmlintrc b/microos-tools-rpmlintrc deleted file mode 100644 index 33a3cad..0000000 --- a/microos-tools-rpmlintrc +++ /dev/null @@ -1,2 +0,0 @@ -addFilter('post-without-tmpfile-creation') -addFilter('tmpfile-not-in-filelist') diff --git a/microos-tools.changes b/microos-tools.changes index d3bb826..eb8810f 100644 --- a/microos-tools.changes +++ b/microos-tools.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Jan 10 12:47:49 UTC 2024 - kukuk@suse.com + +- Update to version 2.21+git9: + * Add man-online command + * Drop support for sle15 builds + * Add OBS CI workflow + ------------------------------------------------------------------- Thu Oct 12 12:11:04 UTC 2023 - Fabian Vogt diff --git a/microos-tools.obsinfo b/microos-tools.obsinfo index 28f5bb4..4fb9a31 100644 --- a/microos-tools.obsinfo +++ b/microos-tools.obsinfo @@ -1,4 +1,4 @@ name: microos-tools -version: 2.21+git5 -mtime: 1697112498 -commit: b43efacd05faccc841ae5302e3a9a5821485f31f +version: 2.21+git9 +mtime: 1704813885 +commit: 70fec4cd39c7e95ebc83abb4cb85cf189803a4f5 diff --git a/microos-tools.spec b/microos-tools.spec index 0261862..bcbd16c 100644 --- a/microos-tools.spec +++ b/microos-tools.spec @@ -1,7 +1,7 @@ # # spec file for package microos-tools # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,16 +19,13 @@ %{!?_distconfdir: %global _distconfdir %{_prefix}%{_sysconfdir}} Name: microos-tools -Version: 2.21+git5 +Version: 2.21+git9 Release: 0 Summary: Files and Scripts for openSUSE MicroOS License: GPL-2.0-or-later Group: Development/Tools/Other URL: https://github.com/openSUSE/microos-tools Source: microos-tools-%{version}.tar.xz -Source1: tmp.mount -Source2: microos-tmp.conf -Source99: microos-tools-rpmlintrc BuildRequires: automake BuildRequires: distribution-release BuildRequires: pkgconfig @@ -36,6 +33,8 @@ BuildRequires: pkgconfig(dracut) BuildRequires: pkgconfig(rpm) BuildRequires: pkgconfig(systemd) Requires: read-only-root-fs +# for man-online +Requires: mandoc-bin %description Files, scripts and directories for openSUSE MicroOS. @@ -56,10 +55,6 @@ This package contains tools to make developing of MicroOS easier. %install %make_install -%if 0%{?suse_version} <= 1500 -install -m 0644 %{SOURCE1} %{buildroot}/%{_unitdir}/ -install -m 0644 %{SOURCE2} %{buildroot}/%{_tmpfilesdir} -%endif %pre %service_add_pre setup-systemd-proxy-env.service setup-systemd-proxy-env.path printenv.service @@ -100,9 +95,6 @@ install -m 0644 %{SOURCE2} %{buildroot}/%{_tmpfilesdir} %dir %{_unitdir}/salt-minion.service.d %{_unitdir}/salt-minion.service.d/TMPDIR.conf %{_tmpfilesdir}/salt-minion-tmpdir.conf -%if %{?suse_version} <= 1500 -%dir %{_distconfdir} -%endif %dir %{_distconfdir}/tukit.conf.d %{_distconfdir}/tukit.conf.d/salt-tukit.conf %{_sbindir}/setup-systemd-proxy-env @@ -110,10 +102,8 @@ install -m 0644 %{SOURCE2} %{buildroot}/%{_tmpfilesdir} %dir %{_prefix}/lib/dracut/modules.d %{_prefix}/lib/dracut/modules.d/98selinux-microos %{_systemdgeneratordir}/selinux-autorelabel-generator -%if 0%{?suse_version} <= 1500 -%{_unitdir}/tmp.mount -%{_tmpfilesdir}/microos-tmp.conf -%endif +%{_bindir}/man-online +%{_distconfdir}/profile.d/man-online.sh %files -n microos-devel-tools %{_unitdir}/microos-ro.service diff --git a/tmp.mount b/tmp.mount deleted file mode 100644 index fcd7735..0000000 --- a/tmp.mount +++ /dev/null @@ -1,25 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1+ -# -# 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. - -[Unit] -Description=Temporary Directory (/tmp) -Documentation=https://systemd.io/TEMPORARY_DIRECTORIES -Documentation=man:file-hierarchy(7) -Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems -ConditionPathIsSymbolicLink=!/tmp -DefaultDependencies=no -Conflicts=umount.target -Before=local-fs.target umount.target -After=swap.target - -[Mount] -What=tmpfs -Where=/tmp -Type=tmpfs -Options=mode=1777,strictatime,nosuid,nodev