Merge remote-tracking branch 'up/master' into master-riscv64
Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
This commit is contained in:
commit
0ee5364918
GPG Key ID:
8B7F1DA0E2C9FDBB
|
|
@ -1,4 +1,4 @@
|
|||
From 86aa208e639b119007332718aa4f453af2a061d0 Mon Sep 17 00:00:00 2001
|
||||
From 0c670fec00f3d5c103d9b7415d4e0510c61ad006 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
||||
Date: Fri, 11 Mar 2016 17:06:17 -0500
|
||||
Subject: [PATCH] resolved: create /etc/resolv.conf symlink at runtime
|
||||
|
|
@ -18,10 +18,10 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1313085
|
|||
2 files changed, 4 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/resolve/resolved.c b/src/resolve/resolved.c
|
||||
index f4efddf8e5..3386e3bf67 100644
|
||||
index 2ca9fbdc72..3c8a9ff12a 100644
|
||||
--- a/src/resolve/resolved.c
|
||||
+++ b/src/resolve/resolved.c
|
||||
@@ -45,6 +45,10 @@ static int run(int argc, char *argv[]) {
|
||||
@@ -49,6 +49,10 @@ static int run(int argc, char *argv[]) {
|
||||
/* Drop privileges, but only if we have been started as root. If we are not running as root we assume most
|
||||
* privileges are already dropped. */
|
||||
if (getuid() == 0) {
|
||||
|
|
@ -33,19 +33,16 @@ index f4efddf8e5..3386e3bf67 100644
|
|||
/* Drop privileges, but keep three caps. Note that we drop those too, later on (see below) */
|
||||
r = drop_privileges(uid, gid,
|
||||
diff --git a/tmpfiles.d/etc.conf.m4 b/tmpfiles.d/etc.conf.m4
|
||||
index df8d42101c..928105ea8d 100644
|
||||
index f82e0b82ce..66a777bdb2 100644
|
||||
--- a/tmpfiles.d/etc.conf.m4
|
||||
+++ b/tmpfiles.d/etc.conf.m4
|
||||
@@ -13,9 +13,6 @@ L+ /etc/mtab - - - - ../proc/self/mounts
|
||||
@@ -12,9 +12,6 @@ L+ /etc/mtab - - - - ../proc/self/mounts
|
||||
m4_ifdef(`HAVE_SMACK_RUN_LABEL',
|
||||
t /etc/mtab - - - - security.SMACK64=_
|
||||
)m4_dnl
|
||||
-m4_ifdef(`ENABLE_RESOLVE',
|
||||
-L! /etc/resolv.conf - - - - ../run/systemd/resolve/stub-resolv.conf
|
||||
-)m4_dnl
|
||||
C /etc/nsswitch.conf - - - -
|
||||
C! /etc/nsswitch.conf - - - -
|
||||
m4_ifdef(`HAVE_PAM',
|
||||
C /etc/pam.d - - - -
|
||||
--
|
||||
2.19.2
|
||||
|
||||
C! /etc/pam.d - - - -
|
||||
|
|
|
|||
|
|
@ -0,0 +1,40 @@
|
|||
From 464a73411c13596a130a7a8f0ac00ca728e5f69e Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
||||
Date: Wed, 14 Aug 2019 15:57:42 +0200
|
||||
Subject: [PATCH] udev: use bfq as the default scheduler
|
||||
|
||||
As requested in https://bugzilla.redhat.com/show_bug.cgi?id=1738828.
|
||||
Test results are that bfq seems to behave better and more consistently on
|
||||
typical hardware. The kernel does not have a configuration option to set
|
||||
the default scheduler, and it currently needs to be set by userspace.
|
||||
|
||||
See the bug for more discussion and links.
|
||||
---
|
||||
rules/60-block-scheduler.rules | 5 +++++
|
||||
rules/meson.build | 1 +
|
||||
2 files changed, 6 insertions(+)
|
||||
create mode 100644 rules/60-block-scheduler.rules
|
||||
|
||||
diff --git a/rules/60-block-scheduler.rules b/rules/60-block-scheduler.rules
|
||||
new file mode 100644
|
||||
index 00000000000..480b941761f
|
||||
--- /dev/null
|
||||
+++ b/rules/60-block-scheduler.rules
|
||||
@@ -0,0 +1,5 @@
|
||||
+# do not edit this file, it will be overwritten on update
|
||||
+
|
||||
+ACTION=="add", SUBSYSTEM=="block", \
|
||||
+ KERNEL=="mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|sd*[!0-9]|sr*", \
|
||||
+ ATTR{queue/scheduler}="bfq"
|
||||
diff --git a/rules/meson.build b/rules/meson.build
|
||||
index b6a32ba77e2..1da958b4d46 100644
|
||||
--- a/rules/meson.build
|
||||
+++ b/rules/meson.build
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
rules = files('''
|
||||
60-block.rules
|
||||
+ 60-block-scheduler.rules
|
||||
60-cdrom_id.rules
|
||||
60-drm.rules
|
||||
60-evdev.rules
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (systemd-7a6d834.tar.gz) = 46a7119274e85e71c543bef4f0d30850bd35665813b47f6236dffc54a8c8a8402334830ce909d597bd83609dd21d35bdbaa0002bf0a831172a5d9feb4f11faf2
|
||||
SHA512 (systemd-243.tar.gz) = 56b52a297aa5ac04d9667eb3afb1598725b197de73ff72baa1aabbc2844e36fba7b7fccdf6d214ae8b5b926616b2b7e15772763aaa80ec938d74333ff9c8673e
|
||||
|
|
|
|||
57
systemd.spec
57
systemd.spec
|
|
@ -1,7 +1,7 @@
|
|||
%global commit 7a6d834c0104304f506852eddc25b22e1ce65e3b
|
||||
#global commit 9d34e79ae8ef891adf3757f9248566def70471ad
|
||||
%{?commit:%global shortcommit %(c=%{commit}; echo ${c:0:7})}
|
||||
|
||||
%global stable 1
|
||||
#global stable 1
|
||||
|
||||
# We ship a .pc file but don't want to have a dep on pkg-config. We
|
||||
# strip the automatically generated dep here and instead co-own the
|
||||
|
|
@ -14,8 +14,8 @@
|
|||
|
||||
Name: systemd
|
||||
Url: https://www.freedesktop.org/wiki/Software/systemd
|
||||
Version: 242
|
||||
Release: 4%{?commit:.git%{shortcommit}}.2.riscv64%{?dist}
|
||||
Version: 243
|
||||
Release: 1%{?commit:.git%{shortcommit}}.0.riscv64%{?dist}
|
||||
# For a breakdown of the licensing, see README
|
||||
License: LGPLv2+ and MIT and GPLv2+
|
||||
Summary: System and Service Manager
|
||||
|
|
@ -52,6 +52,9 @@ i=1; for j in 00*patch; do printf "Patch%04d: %s\n" $i $j; i=$((i+1));done|
|
|||
GIT_DIR=../../src/systemd/.git git diffab -M v233..master@{2017-06-15} -- hwdb/[67]* hwdb/parse_hwdb.py > hwdb.patch
|
||||
%endif
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1738828
|
||||
Patch0001: https://github.com/keszybz/systemd/commit/464a73411c13596a130a7a8f0ac00ca728e5f69e.patch
|
||||
|
||||
Patch0002: 0002-Revert-units-set-NoNewPrivileges-for-all-long-runnin.patch
|
||||
|
||||
Patch0998: 0998-resolved-create-etc-resolv.conf-symlink-at-runtime.patch
|
||||
|
|
@ -156,7 +159,7 @@ date, locale, maintain a list of logged-in users, system accounts,
|
|||
runtime directories and settings, and daemons to manage simple network
|
||||
configuration, network time synchronization, log forwarding, and name
|
||||
resolution.
|
||||
%if 0%{stable}
|
||||
%if 0%{?stable}
|
||||
This package was built from the %{version}-stable branch of systemd,
|
||||
commit https://github.com/systemd/systemd-stable/commit/%{shortcommit}.
|
||||
%endif
|
||||
|
|
@ -333,6 +336,7 @@ CONFIGURE_OPTS=(
|
|||
-Dsplit-bin=true
|
||||
-Db_lto=true
|
||||
-Db_ndebug=false
|
||||
-Dman=true
|
||||
-Dversion-tag=v%{version}-%{release}
|
||||
)
|
||||
|
||||
|
|
@ -357,11 +361,6 @@ install -Dm0644 -t %{buildroot}/etc/ %{SOURCE5}
|
|||
install -Dm0644 %{SOURCE6} %{buildroot}/etc/sysctl.conf
|
||||
ln -s ../sysctl.conf %{buildroot}/etc/sysctl.d/99-sysctl.conf
|
||||
|
||||
# We create all wants links manually at installation time to make sure
|
||||
# they are not owned and hence overriden by rpm after the user deleted
|
||||
# them.
|
||||
rm -r %{buildroot}%{_sysconfdir}/systemd/system/*.target.wants
|
||||
|
||||
# Make sure these directories are properly owned
|
||||
mkdir -p %{buildroot}%{system_unit_dir}/basic.target.wants
|
||||
mkdir -p %{buildroot}%{system_unit_dir}/default.target.wants
|
||||
|
|
@ -700,14 +699,40 @@ fi
|
|||
%files tests -f .file-list-tests
|
||||
|
||||
%changelog
|
||||
* Wed Jul 24 2019 David Abdurachmanov <david.abdurachmanov@sifive.com> - 242-4.git7a6d834.2.riscv64
|
||||
- Rebuild for libqrencode
|
||||
* Tue Sep 3 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 243-1
|
||||
- Update to latest release
|
||||
- Emission of Session property-changed notifications from logind is fixed
|
||||
(this was breaking the switching of sessions to and from gnome).
|
||||
- Security issue: unprivileged users were allowed to change DNS
|
||||
servers configured in systemd-resolved. Now proper polkit authorization
|
||||
is required.
|
||||
|
||||
* Mon Jul 1 2019 David Abdurachmanov <david.abdurachmanov@sifive.com> - 242-4.git7a6d834.1.riscv64
|
||||
- Rebuilt for iptables update
|
||||
* Mon Aug 26 2019 Adam Williamson <awilliam@redhat.com> - 243~rc2-2
|
||||
- Backport PR #13406 to solve PATH ordering issue (#1744059)
|
||||
|
||||
* Tue Jun 25 2019 David Abdurachmanov <david.abdurachmanov@sifive.com> - 242-4.git7a6d834.0.riscv64
|
||||
- Use %{valgrind_arches}
|
||||
* Thu Aug 22 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 243~rc2-1
|
||||
- Update to latest pre-release. Fixes #1740113, #1717712.
|
||||
- The default scheduler for disks is set to BFQ (1738828)
|
||||
- The default cgroup hierarchy is set to unified (cgroups v2) (#1732114).
|
||||
Use systemd.unified-cgroup-hierachy=0 on the kernel command line to revert.
|
||||
See https://fedoraproject.org/wiki/Changes/CGroupsV2.
|
||||
|
||||
* Wed Aug 07 2019 Adam Williamson <awilliam@redhat.com> - 243~rc1-2
|
||||
- Backport PR #1737362 so we own /etc/systemd/system again (#1737362)
|
||||
|
||||
* Tue Jul 30 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 243~rc1-1
|
||||
- Update to latest version (#1715699, #1696373, #1711065, #1718192)
|
||||
|
||||
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org>
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Sat Jul 20 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 242-6.git9d34e79
|
||||
- Ignore bad rdrand output on AMD CPUs (#1729268)
|
||||
- A bunch of backported patches from upstream: documentation, memory
|
||||
access fixups, command output tweaks (#1708996)
|
||||
|
||||
* Tue Jun 25 2019 Björn Esser <besser82@fedoraproject.org>- 242-5.git7a6d834
|
||||
- Rebuilt (libqrencode.so.4)
|
||||
|
||||
* Tue Jun 25 2019 Miro Hrončok <mhroncok@redhat.com>- 242-4.git7a6d834
|
||||
- Rebuilt for iptables update (libip4tc.so.2)
|
||||
|
|
|
|||
Loading…
Reference in New Issue