commit systemd-default-settings for openSUSE:Factory

2 Nov 2020

Hello community,

here is the log from the commit of package systemd-default-settings for openSUSE:Factory checked in at 2020-11-02 09:37:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/systemd-default-settings (Old)
 and      /work/SRC/openSUSE:Factory/.systemd-default-settings.new.3463 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "systemd-default-settings"

Mon Nov  2 09:37:44 2020 rev:2 rq:844519 version:0.4

Changes:
--------

--- /work/SRC/openSUSE:Factory/systemd-default-settings/systemd-default-settings.changes	2020-10-15 13:47:05.141216182 +0200
+++ /work/SRC/openSUSE:Factory/.systemd-default-settings.new.3463/systemd-default-settings.changes	2020-11-02 09:37:56.149468434 +0100
@@ -1,0 +2,19 @@
+Tue Oct 27 15:00:12 UTC 2020 - Franck Bui <fbui@suse.com>
+
+- rpm file lists are now generated from the spec file.
+
+-------------------------------------------------------------------
+Mon Oct 26 14:40:56 UTC 2020 - Franck Bui <fbui@suse.com>
+
+- Make sure the release number between the main and the branding
+  packages match
+
+-------------------------------------------------------------------
+Fri Oct 23 08:09:00 UTC 2020 - Franck Bui <fbui@suse.com>
+
+- Import 0.3
+
+  d299248 List drop-in directories in SUSE.list exclusively
+  e4651a7 Disable memory accounting by default for all distros (jsc#PM-2229 jsc#PM-2230)
+
+-------------------------------------------------------------------
@@ -4 +23 @@
-- Import v0.2
+- Import 0.2

Old:
----
  systemd-default-settings-0.2.tar.gz

New:
----
  systemd-default-settings-0.4.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ systemd-default-settings.spec ++++++
--- /var/tmp/diff_new_pack.BkZtxs/_old	2020-11-02 09:37:56.853469110 +0100
+++ /var/tmp/diff_new_pack.BkZtxs/_new	2020-11-02 09:37:56.857469114 +0100
@@ -18,7 +18,7 @@
 
 Name:           systemd-default-settings
 URL:            https://github.com/openSUSE/systemd-default-settings
-Version:        0.2
+Version:        0.4
 Release:        0
 Summary:        Customization of systemd default settings for SUSE distributions
 License:        GPL-2.0-or-later
@@ -26,7 +26,7 @@
 Source0:        %{name}-%{version}.tar.gz
 BuildArch:      noarch
 BuildRequires:  systemd-rpm-macros
-Requires:       %{name}-branding = %{version}
+Requires:       %{name}-branding = %{version}-%{release}
 
 %description
 This package overrides some of the upstream default settings which are
@@ -38,9 +38,9 @@
 %package branding-SLE
 Summary:        Specific customization of systemd defaults settings for SLE
 Group:          System/Base
-Requires:       %{name} = %{version}
+Requires:       %{name} = %{version}-%{release}
 Supplements:    packageand(%{name}:branding-SLE)
-Provides:       %{name}-branding = %{version}
+Provides:       %{name}-branding = %{version}-%{release}
 Conflicts:      otherproviders(%{name}-branding)
 
 %description branding-SLE
@@ -50,9 +50,9 @@
 %package branding-openSUSE
 Summary:        Specific customization of systemd defaults settings for openSUSE
 Group:          System/Base
-Requires:       %{name} = %{version}
+Requires:       %{name} = %{version}-%{release}
 Supplements:    packageand(%{name}:branding-openSUSE)
-Provides:       %{name}-branding = %{version}
+Provides:       %{name}-branding = %{version}-%{release}
 Conflicts:      otherproviders(%{name}-branding)
 
 %description branding-openSUSE
@@ -62,7 +62,7 @@
 %package branding-upstream
 Summary:        Restore upstream systemd defaults settings
 Group:          System/Base
-Provides:       %{name}-branding = %{version}
+Provides:       %{name}-branding = %{version}-%{release}
 Conflicts:      %{name}
 Conflicts:      otherproviders(%{name}-branding)
 
@@ -75,11 +75,15 @@
 %setup -q
 
 %build
-%make_build
 
 %install
 %make_install
 
+find %{buildroot} -name \*.d -type d -printf "%%%%dir /%%P\n" >SUSE.list
+find %{buildroot} -name 20-defaults-SUSE.conf -printf "/%%P\n" >>SUSE.list
+find %{buildroot} -name 25-defaults-SLE.conf -printf "/%%P\n" >SLE.list
+find %{buildroot} -name 25-defaults-openSUSE.conf -printf "/%%P\n" >openSUSE.list
+
 %files -f SUSE.list
 %defattr(-,root,root)
 

++++++ systemd-default-settings-0.2.tar.gz -> systemd-default-settings-0.4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-default-settings-0.2/.gitignore new/systemd-default-settings-0.4/.gitignore
--- old/systemd-default-settings-0.2/.gitignore	2020-10-13 10:34:34.000000000 +0200
+++ new/systemd-default-settings-0.4/.gitignore	2020-10-27 15:56:48.000000000 +0100
@@ -1 +1 @@
-*.list
+*.tar.gz
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-default-settings-0.2/Makefile new/systemd-default-settings-0.4/Makefile
--- old/systemd-default-settings-0.2/Makefile	2020-10-13 10:34:34.000000000 +0200
+++ new/systemd-default-settings-0.4/Makefile	2020-10-27 15:56:48.000000000 +0100
@@ -1,20 +1,16 @@
-.PHONY: archive clean SUSE.list SLE.list openSUSE.list
+VERSION ?= $(shell git describe --always)
 
-all: file-lists
+.PHONY: archive clean
 
-file-lists: SUSE.list SLE.list openSUSE.list
-
-SUSE.list:
-	find usr/ -name 20-defaults-SUSE.conf -printf "/%h\n/%p\n" >$@
-
-SLE.list:
-	find usr/ -name 25-defaults-SLE.conf -printf "/%h\n/%p\n" >$@
-
-openSUSE.list:
-	find usr/ -name 25-defaults-openSUSE.conf -printf "/%h\n/%p\n" >$@
+all:
 
 install:
 	tar -c usr/ | tar -x -C${DESTDIR}/
 
+archive: systemd-default-settings-$(VERSION).tar.gz
+
+systemd-default-settings-$(VERSION).tar.gz:
+	git archive --format=tgz --prefix=systemd-default-settings-$(VERSION)/ HEAD >$@
+
 clean:
-	rm -f *.list
+	rm -f *.tar.gz
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-default-settings-0.2/usr/lib/systemd/system/user@0.service.d/20-defaults-SUSE.conf new/systemd-default-settings-0.4/usr/lib/systemd/system/user@0.service.d/20-defaults-SUSE.conf
--- old/systemd-default-settings-0.2/usr/lib/systemd/system/user@0.service.d/20-defaults-SUSE.conf	1970-01-01 01:00:00.000000000 +0100
+++ new/systemd-default-settings-0.4/usr/lib/systemd/system/user@0.service.d/20-defaults-SUSE.conf	2020-10-27 15:56:48.000000000 +0100
@@ -0,0 +1,5 @@
+[Service]
+# Delegation for privileged services is supposed to enable all or
+# listed resource controllers, which would incur performance penalties
+# to *all* running services (bsc#954765 jsc#PM-2229).
+Delegate=no
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-default-settings-0.2/usr/lib/systemd/system/user@0.service.d/25-defaults-SLE.conf new/systemd-default-settings-0.4/usr/lib/systemd/system/user@0.service.d/25-defaults-SLE.conf
--- old/systemd-default-settings-0.2/usr/lib/systemd/system/user@0.service.d/25-defaults-SLE.conf	2020-10-13 10:34:34.000000000 +0200
+++ new/systemd-default-settings-0.4/usr/lib/systemd/system/user@0.service.d/25-defaults-SLE.conf	1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-[Service]
-# Adding processes to multiple cgroup controllers causes performance
-# regressions (bsc#954765)
-Delegate=no
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-default-settings-0.2/usr/lib/systemd/system.conf.d/20-defaults-SUSE.conf new/systemd-default-settings-0.4/usr/lib/systemd/system.conf.d/20-defaults-SUSE.conf
--- old/systemd-default-settings-0.2/usr/lib/systemd/system.conf.d/20-defaults-SUSE.conf	1970-01-01 01:00:00.000000000 +0100
+++ new/systemd-default-settings-0.4/usr/lib/systemd/system.conf.d/20-defaults-SUSE.conf	2020-10-27 15:56:48.000000000 +0100
@@ -0,0 +1,5 @@
+[Manager]
+# Memory accounting incurs performance penalties. Let's keep it
+# disabled by default since the actual use case for enabling it is not
+# clear (jsc#PM-2229).
+DefaultMemoryAccounting=no
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/systemd-default-settings-0.2/usr/lib/systemd/system.conf.d/25-defaults-SLE.conf new/systemd-default-settings-0.4/usr/lib/systemd/system.conf.d/25-defaults-SLE.conf
--- old/systemd-default-settings-0.2/usr/lib/systemd/system.conf.d/25-defaults-SLE.conf	2020-10-13 10:34:34.000000000 +0200
+++ new/systemd-default-settings-0.4/usr/lib/systemd/system.conf.d/25-defaults-SLE.conf	2020-10-27 15:56:48.000000000 +0100
@@ -1,3 +1,3 @@
 [Manager]
-# Disable default TasksMax limit (SLE-10123)
+# Disable default TasksMax limit (jsc#SLE-10123)
 DefaultTasksMax=infinity

    

root

tags

participants (1)