[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/ - gentoo-commits

From:	Mike Gilbert <floppym@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/
Date:	Sun, 31 Jul 2016 00:46:14
Message-Id:	`1469925962.95351937678850ab86d4bd0f8819a80c594578d0.floppym@gentoo`

1

commit:     95351937678850ab86d4bd0f8819a80c594578d0

2

Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>

3

AuthorDate: Sun Jul 31 00:44:01 2016 +0000

4

Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>

5

CommitDate: Sun Jul 31 00:46:02 2016 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95351937

7

8

sys-apps/systemd: skip DEVPTS_MULTIPLE_INSTANCES check for Linux >= 4.7

9

10

Thanks to novns in #gentoo-systemd.

11

12

 sys-apps/systemd/systemd-226-r2.ebuild | 3 ++-

13

 sys-apps/systemd/systemd-228-r1.ebuild | 3 ++-

14

 sys-apps/systemd/systemd-229.ebuild    | 3 ++-

15

 sys-apps/systemd/systemd-230-r2.ebuild | 3 ++-

16

 sys-apps/systemd/systemd-231.ebuild    | 3 ++-

17

 sys-apps/systemd/systemd-9999.ebuild   | 3 ++-

18

 6 files changed, 12 insertions(+), 6 deletions(-)

19

20

diff --git a/sys-apps/systemd/systemd-226-r2.ebuild b/sys-apps/systemd/systemd-226-r2.ebuild

21

index 0667f52..02ffcf5 100644

22

--- a/sys-apps/systemd/systemd-226-r2.ebuild

23

+++ b/sys-apps/systemd/systemd-226-r2.ebuild

24

@@ -96,7 +96,7 @@ DEPEND="${COMMON_DEPEND}

25

26

 pkg_pretend() {

27

 	local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS

28

-		~DEVPTS_MULTIPLE_INSTANCES ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE

29

+		~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE

30

 		~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SECCOMP ~SIGNALFD ~SYSFS

31

 		~TIMERFD ~TMPFS_XATTR ~UNIX

32

 		~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED

33

@@ -104,6 +104,7 @@ pkg_pretend() {

34

35

 	use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"

36

 	kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"

37

+	kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"

38

39

 	if linux_config_exists; then

40

 		local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)

41

42

diff --git a/sys-apps/systemd/systemd-228-r1.ebuild b/sys-apps/systemd/systemd-228-r1.ebuild

43

index 35265a0..d64cd19 100644

44

--- a/sys-apps/systemd/systemd-228-r1.ebuild

45

+++ b/sys-apps/systemd/systemd-228-r1.ebuild

46

@@ -96,7 +96,7 @@ DEPEND="${COMMON_DEPEND}

47

48

 pkg_pretend() {

49

 	local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS

50

-		~DEVPTS_MULTIPLE_INSTANCES ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE

51

+		~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE

52

 		~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SECCOMP ~SIGNALFD ~SYSFS

53

 		~TIMERFD ~TMPFS_XATTR ~UNIX

54

 		~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED

55

@@ -104,6 +104,7 @@ pkg_pretend() {

56

57

 	use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"

58

 	kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"

59

+	kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"

60

61

 	if linux_config_exists; then

62

 		local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)

63

64

diff --git a/sys-apps/systemd/systemd-229.ebuild b/sys-apps/systemd/systemd-229.ebuild

65

index 580e12e..de87dcc 100644

66

--- a/sys-apps/systemd/systemd-229.ebuild

67

+++ b/sys-apps/systemd/systemd-229.ebuild

68

@@ -100,7 +100,7 @@ DEPEND="${COMMON_DEPEND}

69

70

 pkg_pretend() {

71

 	local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS

72

-		~DEVPTS_MULTIPLE_INSTANCES ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE

73

+		~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE

74

 		~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SECCOMP ~SIGNALFD ~SYSFS

75

 		~TIMERFD ~TMPFS_XATTR ~UNIX

76

 		~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED

77

@@ -108,6 +108,7 @@ pkg_pretend() {

78

79

 	use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"

80

 	kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"

81

+	kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"

82

83

 	if linux_config_exists; then

84

 		local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)

85

86

diff --git a/sys-apps/systemd/systemd-230-r2.ebuild b/sys-apps/systemd/systemd-230-r2.ebuild

87

index ba272c4..97cfdce 100644

88

--- a/sys-apps/systemd/systemd-230-r2.ebuild

89

+++ b/sys-apps/systemd/systemd-230-r2.ebuild

90

@@ -106,7 +106,7 @@ python_check_deps() {

91

92

 pkg_pretend() {

93

 	local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS

94

-		~DEVPTS_MULTIPLE_INSTANCES ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE

95

+		~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE

96

 		~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SECCOMP ~SIGNALFD ~SYSFS

97

 		~TIMERFD ~TMPFS_XATTR ~UNIX

98

 		~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED

99

@@ -114,6 +114,7 @@ pkg_pretend() {

100

101

 	use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"

102

 	kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"

103

+	kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"

104

105

 	if linux_config_exists; then

106

 		local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)

107

108

diff --git a/sys-apps/systemd/systemd-231.ebuild b/sys-apps/systemd/systemd-231.ebuild

109

index b4f2613..26e4eff 100644

110

--- a/sys-apps/systemd/systemd-231.ebuild

111

+++ b/sys-apps/systemd/systemd-231.ebuild

112

@@ -105,7 +105,7 @@ python_check_deps() {

113

114

 pkg_pretend() {

115

 	local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS

116

-		~DEVPTS_MULTIPLE_INSTANCES ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE

117

+		~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE

118

 		~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SECCOMP ~SIGNALFD ~SYSFS

119

 		~TIMERFD ~TMPFS_XATTR ~UNIX

120

 		~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED

121

@@ -113,6 +113,7 @@ pkg_pretend() {

122

123

 	use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"

124

 	kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"

125

+	kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"

126

127

 	if linux_config_exists; then

128

 		local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)

129

130

diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild

131

index b4f2613..26e4eff 100644

132

--- a/sys-apps/systemd/systemd-9999.ebuild

133

+++ b/sys-apps/systemd/systemd-9999.ebuild

134

@@ -105,7 +105,7 @@ python_check_deps() {

135

136

 pkg_pretend() {

137

 	local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS

138

-		~DEVPTS_MULTIPLE_INSTANCES ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE

139

+		~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE

140

 		~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SECCOMP ~SIGNALFD ~SYSFS

141

 		~TIMERFD ~TMPFS_XATTR ~UNIX

142

 		~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED

143

@@ -113,6 +113,7 @@ pkg_pretend() {

144

145

 	use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"

146

 	kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"

147

+	kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"

148

149

 	if linux_config_exists; then

150

 		local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)

1	commit: 95351937678850ab86d4bd0f8819a80c594578d0
2	Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3	AuthorDate: Sun Jul 31 00:44:01 2016 +0000
4	Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5	CommitDate: Sun Jul 31 00:46:02 2016 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95351937
7
8	sys-apps/systemd: skip DEVPTS_MULTIPLE_INSTANCES check for Linux >= 4.7
9
10	Thanks to novns in #gentoo-systemd.
11
12	sys-apps/systemd/systemd-226-r2.ebuild \| 3 ++-
13	sys-apps/systemd/systemd-228-r1.ebuild \| 3 ++-
14	sys-apps/systemd/systemd-229.ebuild \| 3 ++-
15	sys-apps/systemd/systemd-230-r2.ebuild \| 3 ++-
16	sys-apps/systemd/systemd-231.ebuild \| 3 ++-
17	sys-apps/systemd/systemd-9999.ebuild \| 3 ++-
18	6 files changed, 12 insertions(+), 6 deletions(-)
19
20	diff --git a/sys-apps/systemd/systemd-226-r2.ebuild b/sys-apps/systemd/systemd-226-r2.ebuild
21	index 0667f52..02ffcf5 100644
22	--- a/sys-apps/systemd/systemd-226-r2.ebuild
23	+++ b/sys-apps/systemd/systemd-226-r2.ebuild
24	@@ -96,7 +96,7 @@ DEPEND="${COMMON_DEPEND}
25
26	pkg_pretend() {
27	local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
28	- ~DEVPTS_MULTIPLE_INSTANCES ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE
29	+ ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE
30	~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SECCOMP ~SIGNALFD ~SYSFS
31	~TIMERFD ~TMPFS_XATTR ~UNIX
32	~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
33	@@ -104,6 +104,7 @@ pkg_pretend() {
34
35	use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
36	kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
37	+ kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
38
39	if linux_config_exists; then
40	local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
41
42	diff --git a/sys-apps/systemd/systemd-228-r1.ebuild b/sys-apps/systemd/systemd-228-r1.ebuild
43	index 35265a0..d64cd19 100644
44	--- a/sys-apps/systemd/systemd-228-r1.ebuild
45	+++ b/sys-apps/systemd/systemd-228-r1.ebuild
46	@@ -96,7 +96,7 @@ DEPEND="${COMMON_DEPEND}
47
48	pkg_pretend() {
49	local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
50	- ~DEVPTS_MULTIPLE_INSTANCES ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE
51	+ ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE
52	~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SECCOMP ~SIGNALFD ~SYSFS
53	~TIMERFD ~TMPFS_XATTR ~UNIX
54	~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
55	@@ -104,6 +104,7 @@ pkg_pretend() {
56
57	use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
58	kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
59	+ kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
60
61	if linux_config_exists; then
62	local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
63
64	diff --git a/sys-apps/systemd/systemd-229.ebuild b/sys-apps/systemd/systemd-229.ebuild
65	index 580e12e..de87dcc 100644
66	--- a/sys-apps/systemd/systemd-229.ebuild
67	+++ b/sys-apps/systemd/systemd-229.ebuild
68	@@ -100,7 +100,7 @@ DEPEND="${COMMON_DEPEND}
69
70	pkg_pretend() {
71	local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
72	- ~DEVPTS_MULTIPLE_INSTANCES ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE
73	+ ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE
74	~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SECCOMP ~SIGNALFD ~SYSFS
75	~TIMERFD ~TMPFS_XATTR ~UNIX
76	~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
77	@@ -108,6 +108,7 @@ pkg_pretend() {
78
79	use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
80	kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
81	+ kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
82
83	if linux_config_exists; then
84	local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
85
86	diff --git a/sys-apps/systemd/systemd-230-r2.ebuild b/sys-apps/systemd/systemd-230-r2.ebuild
87	index ba272c4..97cfdce 100644
88	--- a/sys-apps/systemd/systemd-230-r2.ebuild
89	+++ b/sys-apps/systemd/systemd-230-r2.ebuild
90	@@ -106,7 +106,7 @@ python_check_deps() {
91
92	pkg_pretend() {
93	local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
94	- ~DEVPTS_MULTIPLE_INSTANCES ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE
95	+ ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE
96	~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SECCOMP ~SIGNALFD ~SYSFS
97	~TIMERFD ~TMPFS_XATTR ~UNIX
98	~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
99	@@ -114,6 +114,7 @@ pkg_pretend() {
100
101	use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
102	kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
103	+ kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
104
105	if linux_config_exists; then
106	local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
107
108	diff --git a/sys-apps/systemd/systemd-231.ebuild b/sys-apps/systemd/systemd-231.ebuild
109	index b4f2613..26e4eff 100644
110	--- a/sys-apps/systemd/systemd-231.ebuild
111	+++ b/sys-apps/systemd/systemd-231.ebuild
112	@@ -105,7 +105,7 @@ python_check_deps() {
113
114	pkg_pretend() {
115	local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
116	- ~DEVPTS_MULTIPLE_INSTANCES ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE
117	+ ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE
118	~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SECCOMP ~SIGNALFD ~SYSFS
119	~TIMERFD ~TMPFS_XATTR ~UNIX
120	~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
121	@@ -113,6 +113,7 @@ pkg_pretend() {
122
123	use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
124	kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
125	+ kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
126
127	if linux_config_exists; then
128	local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
129
130	diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
131	index b4f2613..26e4eff 100644
132	--- a/sys-apps/systemd/systemd-9999.ebuild
133	+++ b/sys-apps/systemd/systemd-9999.ebuild
134	@@ -105,7 +105,7 @@ python_check_deps() {
135
136	pkg_pretend() {
137	local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
138	- ~DEVPTS_MULTIPLE_INSTANCES ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE
139	+ ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE
140	~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SECCOMP ~SIGNALFD ~SYSFS
141	~TIMERFD ~TMPFS_XATTR ~UNIX
142	~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
143	@@ -113,6 +113,7 @@ pkg_pretend() {
144
145	use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
146	kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
147	+ kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
148
149	if linux_config_exists; then
150	local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)

Gentoo Archives: gentoo-commits