[gentoo-commits] gentoo-x86 commit in sys-apps/systemd: systemd-215-r3.ebuild systemd-9999.ebuild ChangeLog - gentoo-commits

From:	"Mike Gilbert (floppym)" <floppym@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] gentoo-x86 commit in sys-apps/systemd: systemd-215-r3.ebuild systemd-9999.ebuild ChangeLog
Date:	Sun, 27 Jul 2014 15:00:59
Message-Id:	`20140727150052.96E972004E@flycatcher.gentoo.org`

1

floppym     14/07/27 15:00:52

2

3

  Modified:             systemd-215-r3.ebuild systemd-9999.ebuild ChangeLog

4

  Log:

5

  Don't install /etc/systemd/system/network-online.target.wants, bug 518318 by poncho.

6

7

  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

8

9

Revision  Changes    Path

10

1.2                  sys-apps/systemd/systemd-215-r3.ebuild

11

12

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-215-r3.ebuild?rev=1.2&view=markup

13

plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-215-r3.ebuild?rev=1.2&content-type=text/plain

14

diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-215-r3.ebuild?r1=1.1&r2=1.2

15

16

Index: systemd-215-r3.ebuild

17

===================================================================

18

RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-215-r3.ebuild,v

19

retrieving revision 1.1

20

retrieving revision 1.2

21

diff -u -r1.1 -r1.2

22

--- systemd-215-r3.ebuild	25 Jul 2014 10:26:48 -0000	1.1

23

+++ systemd-215-r3.ebuild	27 Jul 2014 15:00:52 -0000	1.2

24

@@ -1,6 +1,6 @@

25

 # Copyright 1999-2014 Gentoo Foundation

26

 # Distributed under the terms of the GNU General Public License v2

27

-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-215-r3.ebuild,v 1.1 2014/07/25 10:26:48 pacho Exp $

28

+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-215-r3.ebuild,v 1.2 2014/07/27 15:00:52 floppym Exp $

29

30

 EAPI=5

31

32

@@ -312,11 +312,6 @@

33

34

 	if multilib_is_native_abi; then

35

 		emake "${mymakeopts[@]}" install

36

-		# Even with --enable-networkd, it's not right to have this running by default

37

-		# when it's unconfigured.

38

-		rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service

39

-		rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service

40

-		rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-timesyncd.service

41

 	else

42

 		mymakeopts+=(

43

 			install-libLTLIBRARIES

44

@@ -360,6 +355,13 @@

45

46

 	# Symlink /etc/sysctl.conf for easy migration.

47

 	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf

48

+

49

+	# If we install these symlinks, there is no way for the sysadmin to remove them

50

+	# permanently.

51

+	rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service

52

+	rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service

53

+	rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-timesyncd.service

54

+	rm -rf "${D}"/etc/systemd/system/network-online.target.wants

55

}

56

57

 migrate_locale() {

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

62

63

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?rev=1.129&view=markup

64

plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?rev=1.129&content-type=text/plain

65

diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?r1=1.128&r2=1.129

66

67

Index: systemd-9999.ebuild

68

===================================================================

69

RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v

70

retrieving revision 1.128

71

retrieving revision 1.129

72

diff -u -r1.128 -r1.129

73

--- systemd-9999.ebuild	21 Jul 2014 17:52:42 -0000	1.128

74

+++ systemd-9999.ebuild	27 Jul 2014 15:00:52 -0000	1.129

75

@@ -1,6 +1,6 @@

76

 # Copyright 1999-2014 Gentoo Foundation

77

 # Distributed under the terms of the GNU General Public License v2

78

-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.128 2014/07/21 17:52:42 floppym Exp $

79

+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.129 2014/07/27 15:00:52 floppym Exp $

80

81

 EAPI=5

82

83

@@ -324,11 +324,6 @@

84

85

 	if multilib_is_native_abi; then

86

 		emake "${mymakeopts[@]}" install

87

-		# Even with --enable-networkd, it's not right to have this running by default

88

-		# when it's unconfigured.

89

-		rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service

90

-		rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service

91

-		rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-timesyncd.service

92

 	else

93

 		mymakeopts+=(

94

 			install-libLTLIBRARIES

95

@@ -366,6 +361,13 @@

96

97

 	# Symlink /etc/sysctl.conf for easy migration.

98

 	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf

99

+

100

+	# If we install these symlinks, there is no way for the sysadmin to remove them

101

+	# permanently.

102

+	rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service

103

+	rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service

104

+	rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-timesyncd.service

105

+	rm -rf "${D}"/etc/systemd/system/network-online.target.wants

106

}

107

108

 migrate_locale() {

1.293                sys-apps/systemd/ChangeLog

113

114

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.293&view=markup

115

plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.293&content-type=text/plain

116

diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?r1=1.292&r2=1.293

117

118

Index: ChangeLog

119

===================================================================

120

RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v

121

retrieving revision 1.292

122

retrieving revision 1.293

123

diff -u -r1.292 -r1.293

124

--- ChangeLog	25 Jul 2014 10:26:48 -0000	1.292

125

+++ ChangeLog	27 Jul 2014 15:00:52 -0000	1.293

126

@@ -1,6 +1,11 @@

127

 # ChangeLog for sys-apps/systemd

128

 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2

129

-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.292 2014/07/25 10:26:48 pacho Exp $

130

+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.293 2014/07/27 15:00:52 floppym Exp $

131

+

132

+  27 Jul 2014; Mike Gilbert <floppym@g.o> systemd-215-r3.ebuild,

133

+  systemd-9999.ebuild:

134

+  Don't install /etc/systemd/system/network-online.target.wants, bug 518318 by

135

+  poncho.

136

137

 *systemd-215-r3 (25 Jul 2014)

1	floppym 14/07/27 15:00:52
2
3	Modified: systemd-215-r3.ebuild systemd-9999.ebuild ChangeLog
4	Log:
5	Don't install /etc/systemd/system/network-online.target.wants, bug 518318 by poncho.
6
7	(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
8
9	Revision Changes Path
10	1.2 sys-apps/systemd/systemd-215-r3.ebuild
11
12	file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-215-r3.ebuild?rev=1.2&view=markup
13	plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-215-r3.ebuild?rev=1.2&content-type=text/plain
14	diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-215-r3.ebuild?r1=1.1&r2=1.2
15
16	Index: systemd-215-r3.ebuild
17	===================================================================
18	RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-215-r3.ebuild,v
19	retrieving revision 1.1
20	retrieving revision 1.2
21	diff -u -r1.1 -r1.2
22	--- systemd-215-r3.ebuild 25 Jul 2014 10:26:48 -0000 1.1
23	+++ systemd-215-r3.ebuild 27 Jul 2014 15:00:52 -0000 1.2
24	@@ -1,6 +1,6 @@
25	# Copyright 1999-2014 Gentoo Foundation
26	# Distributed under the terms of the GNU General Public License v2
27	-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-215-r3.ebuild,v 1.1 2014/07/25 10:26:48 pacho Exp $
28	+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-215-r3.ebuild,v 1.2 2014/07/27 15:00:52 floppym Exp $
29
30	EAPI=5
31
32	@@ -312,11 +312,6 @@
33
34	if multilib_is_native_abi; then
35	emake "${mymakeopts[@]}" install
36	- # Even with --enable-networkd, it's not right to have this running by default
37	- # when it's unconfigured.
38	- rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service
39	- rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service
40	- rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-timesyncd.service
41	else
42	mymakeopts+=(
43	install-libLTLIBRARIES
44	@@ -360,6 +355,13 @@
45
46	# Symlink /etc/sysctl.conf for easy migration.
47	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
48	+
49	+ # If we install these symlinks, there is no way for the sysadmin to remove them
50	+ # permanently.
51	+ rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service
52	+ rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service
53	+ rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-timesyncd.service
54	+ rm -rf "${D}"/etc/systemd/system/network-online.target.wants
55	}
56
57	migrate_locale() {
58
59
60
61	1.129 sys-apps/systemd/systemd-9999.ebuild
62
63	file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?rev=1.129&view=markup
64	plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?rev=1.129&content-type=text/plain
65	diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?r1=1.128&r2=1.129
66
67	Index: systemd-9999.ebuild
68	===================================================================
69	RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v
70	retrieving revision 1.128
71	retrieving revision 1.129
72	diff -u -r1.128 -r1.129
73	--- systemd-9999.ebuild 21 Jul 2014 17:52:42 -0000 1.128
74	+++ systemd-9999.ebuild 27 Jul 2014 15:00:52 -0000 1.129
75	@@ -1,6 +1,6 @@
76	# Copyright 1999-2014 Gentoo Foundation
77	# Distributed under the terms of the GNU General Public License v2
78	-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.128 2014/07/21 17:52:42 floppym Exp $
79	+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.129 2014/07/27 15:00:52 floppym Exp $
80
81	EAPI=5
82
83	@@ -324,11 +324,6 @@
84
85	if multilib_is_native_abi; then
86	emake "${mymakeopts[@]}" install
87	- # Even with --enable-networkd, it's not right to have this running by default
88	- # when it's unconfigured.
89	- rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service
90	- rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service
91	- rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-timesyncd.service
92	else
93	mymakeopts+=(
94	install-libLTLIBRARIES
95	@@ -366,6 +361,13 @@
96
97	# Symlink /etc/sysctl.conf for easy migration.
98	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
99	+
100	+ # If we install these symlinks, there is no way for the sysadmin to remove them
101	+ # permanently.
102	+ rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service
103	+ rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service
104	+ rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-timesyncd.service
105	+ rm -rf "${D}"/etc/systemd/system/network-online.target.wants
106	}
107
108	migrate_locale() {
109
110
111
112	1.293 sys-apps/systemd/ChangeLog
113
114	file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.293&view=markup
115	plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.293&content-type=text/plain
116	diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?r1=1.292&r2=1.293
117
118	Index: ChangeLog
119	===================================================================
120	RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v
121	retrieving revision 1.292
122	retrieving revision 1.293
123	diff -u -r1.292 -r1.293
124	--- ChangeLog 25 Jul 2014 10:26:48 -0000 1.292
125	+++ ChangeLog 27 Jul 2014 15:00:52 -0000 1.293
126	@@ -1,6 +1,11 @@
127	# ChangeLog for sys-apps/systemd
128	# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
129	-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.292 2014/07/25 10:26:48 pacho Exp $
130	+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.293 2014/07/27 15:00:52 floppym Exp $
131	+
132	+ 27 Jul 2014; Mike Gilbert <floppym@g.o> systemd-215-r3.ebuild,
133	+ systemd-9999.ebuild:
134	+ Don't install /etc/systemd/system/network-online.target.wants, bug 518318 by
135	+ poncho.
136
137	*systemd-215-r3 (25 Jul 2014)

Gentoo Archives: gentoo-commits