| 1 |
commit: 4d19b7fc1c766527e91703f6efd2970840f6eb33 |
| 2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Feb 4 08:38:26 2018 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 13 22:14:08 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d19b7fc |
| 7 |
|
| 8 |
sys-apps/systemd: remove unused patches |
| 9 |
|
| 10 |
...wdb-and-sysv-generator-if-the-features-ar.patch | 44 ------------------- |
| 11 |
...n-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch | 50 ---------------------- |
| 12 |
sys-apps/systemd/files/gentoo-uucp-group-r0.patch | 11 ----- |
| 13 |
3 files changed, 105 deletions(-) |
| 14 |
|
| 15 |
diff --git a/sys-apps/systemd/files/235-0001-test-skip-hwdb-and-sysv-generator-if-the-features-ar.patch b/sys-apps/systemd/files/235-0001-test-skip-hwdb-and-sysv-generator-if-the-features-ar.patch |
| 16 |
deleted file mode 100644 |
| 17 |
index bd2b3364369..00000000000 |
| 18 |
--- a/sys-apps/systemd/files/235-0001-test-skip-hwdb-and-sysv-generator-if-the-features-ar.patch |
| 19 |
+++ /dev/null |
| 20 |
@@ -1,44 +0,0 @@ |
| 21 |
-From c013a410d0ec5f419ce8d53df19946795849591b Mon Sep 17 00:00:00 2001 |
| 22 |
-From: Mike Gilbert <floppym@g.o> |
| 23 |
-Date: Sun, 8 Oct 2017 09:47:05 -0400 |
| 24 |
-Subject: [PATCH] test: skip hwdb and sysv-generator if the features are |
| 25 |
- disabled |
| 26 |
- |
| 27 |
---- |
| 28 |
- test/meson.build | 16 ++++++++++------ |
| 29 |
- 1 file changed, 10 insertions(+), 6 deletions(-) |
| 30 |
- |
| 31 |
-diff --git a/test/meson.build b/test/meson.build |
| 32 |
-index 995a97177..c2df7ec22 100644 |
| 33 |
---- a/test/meson.build |
| 34 |
-+++ b/test/meson.build |
| 35 |
-@@ -163,9 +163,11 @@ endif |
| 36 |
- |
| 37 |
- ############################################################ |
| 38 |
- |
| 39 |
--sysv_generator_test_py = find_program('sysv-generator-test.py') |
| 40 |
--test('sysv-generator-test', |
| 41 |
-- sysv_generator_test_py) |
| 42 |
-+if conf.get('HAVE_SYSV_COMPAT') == 1 |
| 43 |
-+ sysv_generator_test_py = find_program('sysv-generator-test.py') |
| 44 |
-+ test('sysv-generator-test', |
| 45 |
-+ sysv_generator_test_py) |
| 46 |
-+endif |
| 47 |
- |
| 48 |
- ############################################################ |
| 49 |
- |
| 50 |
-@@ -181,6 +183,8 @@ udev_test_pl = find_program('udev-test.pl') |
| 51 |
- test('udev-test', |
| 52 |
- udev_test_pl) |
| 53 |
- |
| 54 |
--hwdb_test_sh = find_program('hwdb-test.sh') |
| 55 |
--test('hwdb-test', |
| 56 |
-- hwdb_test_sh) |
| 57 |
-+if conf.get('ENABLE_HWDB') == 1 |
| 58 |
-+ hwdb_test_sh = find_program('hwdb-test.sh') |
| 59 |
-+ test('hwdb-test', |
| 60 |
-+ hwdb_test_sh) |
| 61 |
-+endif |
| 62 |
--- |
| 63 |
-2.14.2 |
| 64 |
- |
| 65 |
|
| 66 |
diff --git a/sys-apps/systemd/files/235-0002-networkd-Don-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch b/sys-apps/systemd/files/235-0002-networkd-Don-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch |
| 67 |
deleted file mode 100644 |
| 68 |
index 9c11106f605..00000000000 |
| 69 |
--- a/sys-apps/systemd/files/235-0002-networkd-Don-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch |
| 70 |
+++ /dev/null |
| 71 |
@@ -1,50 +0,0 @@ |
| 72 |
-From 6acbbdd4da2d072112042abbce8c0a9523beed4e Mon Sep 17 00:00:00 2001 |
| 73 |
-From: Susant Sahani <145210+ssahani@××××××××××××××××××××.com> |
| 74 |
-Date: Wed, 18 Oct 2017 11:55:57 +0530 |
| 75 |
-Subject: [PATCH] networkd: Don't stop networkd if CONFIG_FIB_RULES=n in kernel |
| 76 |
- (#7030) |
| 77 |
- |
| 78 |
-If FIB Rules are not supported by the kernel then networkd fails to |
| 79 |
-start as it retuns error=-EOPNOTSUPP. |
| 80 |
-In this case just ignore and let start networkd. |
| 81 |
- |
| 82 |
-``` |
| 83 |
-sendto(5, {{len=28, type=RTM_GETRULE, flags=NLM_F_REQUEST|NLM_F_ACK|NLM_F_DUMP, seq=8, pid=0}, {family=AF_UNSPEC, dst_len=0, src_len=0, tos=0, table=RT_TABLE_UNSPEC, action=FR_ACT_TO_TBL, flags=0}}, 28, 0, {sa_family=AF_NETLINK, nl_pid=0, nl_groups=00000000}, 16) = 28 |
| 84 |
-recvmsg(5, {msg_name={sa_family=AF_NETLINK, nl_pid=0, nl_groups=00000000}, msg_namelen=128->12, msg_iov=[{iov_base=NULL, iov_len=0}], msg_iovlen=1, msg_control=[{cmsg_len=20, cmsg_level=SOL_NETLINK, cmsg_type=0x3}], msg_controllen=24, msg_flags=MSG_TRUNC}, MSG_PEEK|MSG_TRUNC) = 48 |
| 85 |
-recvmsg(5, {msg_name={sa_family=AF_NETLINK, nl_pid=0, nl_groups=00000000}, msg_namelen=128->12, msg_iov=[{iov_base={{len=48, type=NLMSG_ERROR, flags=0, seq=8, pid=8856}, {error=-EOPNOTSUPP, msg={{len=28, type=RTM_GETRULE, flags=NLM_F_REQUEST|NLM_F_ACK|NLM_F_DUMP, seq=8, pid=0}, {family=AF_UNSPEC, dst_len=0, src_len=0, tos=0, table=RT_TABLE_UNSPEC, action=FR_ACT_TO_TBL, flags=0}}}}, iov_len=7416}], msg_iovlen=1, msg_control=[{cmsg_len=20, cmsg_level=SOL_NETLINK, cmsg_type=0x3}], msg_controllen=24, msg_flags=0}, MSG_TRUNC) = 48 |
| 86 |
-``` |
| 87 |
- |
| 88 |
-``` |
| 89 |
-Oct 08 10:22:24 naomi systemd[1]: Starting Network Service... |
| 90 |
-Oct 08 10:22:24 naomi systemd-networkd[983]: Could not enumerate rules: Operation not supported |
| 91 |
-Oct 08 10:22:24 naomi systemd[1]: systemd-networkd.service: Main process exited, code=exited, status=1/FAILURE |
| 92 |
-``` |
| 93 |
- |
| 94 |
-Fixes #7027 |
| 95 |
---- |
| 96 |
- src/network/networkd-manager.c | 8 +++++++- |
| 97 |
- 1 file changed, 7 insertions(+), 1 deletion(-) |
| 98 |
- |
| 99 |
-diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c |
| 100 |
-index 71445d5dd..200d0f622 100644 |
| 101 |
---- a/src/network/networkd-manager.c |
| 102 |
-+++ b/src/network/networkd-manager.c |
| 103 |
-@@ -1454,8 +1454,14 @@ int manager_rtnl_enumerate_rules(Manager *m) { |
| 104 |
- return r; |
| 105 |
- |
| 106 |
- r = sd_netlink_call(m->rtnl, req, 0, &reply); |
| 107 |
-- if (r < 0) |
| 108 |
-+ if (r < 0) { |
| 109 |
-+ if (r == -EOPNOTSUPP) { |
| 110 |
-+ log_debug("FIB Rules are not supported by the kernel. Ignoring."); |
| 111 |
-+ return 0; |
| 112 |
-+ } |
| 113 |
-+ |
| 114 |
- return r; |
| 115 |
-+ } |
| 116 |
- |
| 117 |
- for (rule = reply; rule; rule = sd_netlink_message_next(rule)) { |
| 118 |
- int k; |
| 119 |
--- |
| 120 |
-2.15.0.rc1 |
| 121 |
- |
| 122 |
|
| 123 |
diff --git a/sys-apps/systemd/files/gentoo-uucp-group-r0.patch b/sys-apps/systemd/files/gentoo-uucp-group-r0.patch |
| 124 |
deleted file mode 100644 |
| 125 |
index 89cf552c829..00000000000 |
| 126 |
--- a/sys-apps/systemd/files/gentoo-uucp-group-r0.patch |
| 127 |
+++ /dev/null |
| 128 |
@@ -1,11 +0,0 @@ |
| 129 |
---- a/rules/50-udev-default.rules.in |
| 130 |
-+++ b/rules/50-udev-default.rules.in |
| 131 |
-@@ -22,7 +22,7 @@ |
| 132 |
- SUBSYSTEM=="tty", KERNEL=="ttysclp[0-9]*", GROUP="tty", MODE="0620" |
| 133 |
- SUBSYSTEM=="tty", KERNEL=="3270/tty[0-9]*", GROUP="tty", MODE="0620" |
| 134 |
- SUBSYSTEM=="vc", KERNEL=="vcs*|vcsa*", GROUP="tty" |
| 135 |
--KERNEL=="tty[A-Z]*[0-9]|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="dialout" |
| 136 |
-+KERNEL=="tty[A-Z]*[0-9]|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="uucp" |
| 137 |
- |
| 138 |
- SUBSYSTEM=="mem", KERNEL=="mem|kmem|port", GROUP="kmem", MODE="0640" |
| 139 |
- |
Archives