mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-20 05:51:18 +02:00
systemd: prune broken 213 and 214 versions.
This commit is contained in:
parent
9a817ba36a
commit
0a20cace26
@ -1,169 +0,0 @@
|
|||||||
From 58a08cac31af656c25532a075a1182f6b45217a7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Michael Marineau <michael.marineau@coreos.com>
|
|
||||||
Date: Thu, 29 May 2014 10:59:42 -0700
|
|
||||||
Subject: [PATCH 1/3] shared: fix searching for configs in alternate roots
|
|
||||||
|
|
||||||
Commit 12ed81d9 changed path_strv_canonicalize_absolute's behavior to
|
|
||||||
return a directory list without the root prefix if one was given but did
|
|
||||||
not update other users of the function to the new behavior. This broke
|
|
||||||
the --root option in systemd-tmpfiles, a regression in v213.
|
|
||||||
|
|
||||||
To better reflect that path_strv_canonicalize_absolute does not return
|
|
||||||
fully resolved paths any more as canonicalize may imply it is now simply
|
|
||||||
called path_strv_cleanup.
|
|
||||||
---
|
|
||||||
src/shared/conf-files.c | 18 +++++++++++++-----
|
|
||||||
src/shared/path-lookup.c | 6 +++---
|
|
||||||
src/shared/path-util.c | 6 +++---
|
|
||||||
src/shared/path-util.h | 4 ++--
|
|
||||||
src/shared/util.c | 7 +++++--
|
|
||||||
5 files changed, 26 insertions(+), 15 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/shared/conf-files.c b/src/shared/conf-files.c
|
|
||||||
index 5201782..6f1dc7f 100644
|
|
||||||
--- a/src/shared/conf-files.c
|
|
||||||
+++ b/src/shared/conf-files.c
|
|
||||||
@@ -37,10 +37,18 @@
|
|
||||||
#include "hashmap.h"
|
|
||||||
#include "conf-files.h"
|
|
||||||
|
|
||||||
-static int files_add(Hashmap *h, const char *dirpath, const char *suffix) {
|
|
||||||
+static int files_add(Hashmap *h, const char *dirpath, const char *suffix, const char *root) {
|
|
||||||
_cleanup_closedir_ DIR *dir = NULL;
|
|
||||||
+ _cleanup_free_ char *fullpath = NULL;
|
|
||||||
|
|
||||||
- dir = opendir(dirpath);
|
|
||||||
+ if (root)
|
|
||||||
+ fullpath = strappend(root, dirpath);
|
|
||||||
+ else
|
|
||||||
+ fullpath = strdup(dirpath);
|
|
||||||
+ if (!fullpath)
|
|
||||||
+ return -ENOMEM;
|
|
||||||
+
|
|
||||||
+ dir = opendir(fullpath);
|
|
||||||
if (!dir) {
|
|
||||||
if (errno == ENOENT)
|
|
||||||
return 0;
|
|
||||||
@@ -63,7 +71,7 @@ static int files_add(Hashmap *h, const char *dirpath, const char *suffix) {
|
|
||||||
if (!dirent_is_file_with_suffix(de, suffix))
|
|
||||||
continue;
|
|
||||||
|
|
||||||
- p = strjoin(dirpath, "/", de->d_name, NULL);
|
|
||||||
+ p = strjoin(fullpath, "/", de->d_name, NULL);
|
|
||||||
if (!p)
|
|
||||||
return -ENOMEM;
|
|
||||||
|
|
||||||
@@ -100,7 +108,7 @@ static int conf_files_list_strv_internal(char ***strv, const char *suffix, const
|
|
||||||
assert(suffix);
|
|
||||||
|
|
||||||
/* This alters the dirs string array */
|
|
||||||
- if (!path_strv_canonicalize_absolute_uniq(dirs, root))
|
|
||||||
+ if (!path_strv_cleanup_uniq(dirs, root))
|
|
||||||
return -ENOMEM;
|
|
||||||
|
|
||||||
fh = hashmap_new(string_hash_func, string_compare_func);
|
|
||||||
@@ -108,7 +116,7 @@ static int conf_files_list_strv_internal(char ***strv, const char *suffix, const
|
|
||||||
return -ENOMEM;
|
|
||||||
|
|
||||||
STRV_FOREACH(p, dirs) {
|
|
||||||
- r = files_add(fh, *p, suffix);
|
|
||||||
+ r = files_add(fh, *p, suffix, root);
|
|
||||||
if (r == -ENOMEM) {
|
|
||||||
hashmap_free_free(fh);
|
|
||||||
return r;
|
|
||||||
diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c
|
|
||||||
index e072fd6..1a497f9 100644
|
|
||||||
--- a/src/shared/path-lookup.c
|
|
||||||
+++ b/src/shared/path-lookup.c
|
|
||||||
@@ -284,7 +284,7 @@ int lookup_paths_init(
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
- if (!path_strv_canonicalize_absolute_uniq(p->unit_path, root_dir))
|
|
||||||
+ if (!path_strv_cleanup_uniq(p->unit_path, root_dir))
|
|
||||||
return -ENOMEM;
|
|
||||||
|
|
||||||
if (!strv_isempty(p->unit_path)) {
|
|
||||||
@@ -338,10 +338,10 @@ int lookup_paths_init(
|
|
||||||
return -ENOMEM;
|
|
||||||
}
|
|
||||||
|
|
||||||
- if (!path_strv_canonicalize_absolute_uniq(p->sysvinit_path, root_dir))
|
|
||||||
+ if (!path_strv_cleanup_uniq(p->sysvinit_path, root_dir))
|
|
||||||
return -ENOMEM;
|
|
||||||
|
|
||||||
- if (!path_strv_canonicalize_absolute_uniq(p->sysvrcnd_path, root_dir))
|
|
||||||
+ if (!path_strv_cleanup_uniq(p->sysvrcnd_path, root_dir))
|
|
||||||
return -ENOMEM;
|
|
||||||
|
|
||||||
if (!strv_isempty(p->sysvinit_path)) {
|
|
||||||
diff --git a/src/shared/path-util.c b/src/shared/path-util.c
|
|
||||||
index 5863429..37490be 100644
|
|
||||||
--- a/src/shared/path-util.c
|
|
||||||
+++ b/src/shared/path-util.c
|
|
||||||
@@ -238,7 +238,7 @@ char **path_strv_make_absolute_cwd(char **l) {
|
|
||||||
return l;
|
|
||||||
}
|
|
||||||
|
|
||||||
-char **path_strv_canonicalize_absolute(char **l, const char *prefix) {
|
|
||||||
+char **path_strv_cleanup(char **l, const char *prefix) {
|
|
||||||
char **s;
|
|
||||||
unsigned k = 0;
|
|
||||||
bool enomem = false;
|
|
||||||
@@ -323,12 +323,12 @@ char **path_strv_canonicalize_absolute(char **l, const char *prefix) {
|
|
||||||
return l;
|
|
||||||
}
|
|
||||||
|
|
||||||
-char **path_strv_canonicalize_absolute_uniq(char **l, const char *prefix) {
|
|
||||||
+char **path_strv_cleanup_uniq(char **l, const char *prefix) {
|
|
||||||
|
|
||||||
if (strv_isempty(l))
|
|
||||||
return l;
|
|
||||||
|
|
||||||
- if (!path_strv_canonicalize_absolute(l, prefix))
|
|
||||||
+ if (!path_strv_cleanup(l, prefix))
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
return strv_uniq(l);
|
|
||||||
diff --git a/src/shared/path-util.h b/src/shared/path-util.h
|
|
||||||
index 6882d78..b523bcc 100644
|
|
||||||
--- a/src/shared/path-util.h
|
|
||||||
+++ b/src/shared/path-util.h
|
|
||||||
@@ -47,8 +47,8 @@ char* path_startswith(const char *path, const char *prefix) _pure_;
|
|
||||||
bool path_equal(const char *a, const char *b) _pure_;
|
|
||||||
|
|
||||||
char** path_strv_make_absolute_cwd(char **l);
|
|
||||||
-char** path_strv_canonicalize_absolute(char **l, const char *prefix);
|
|
||||||
-char** path_strv_canonicalize_absolute_uniq(char **l, const char *prefix);
|
|
||||||
+char** path_strv_cleanup(char **l, const char *prefix);
|
|
||||||
+char** path_strv_cleanup_uniq(char **l, const char *prefix);
|
|
||||||
|
|
||||||
int path_is_mount_point(const char *path, bool allow_symlink);
|
|
||||||
int path_is_read_only_fs(const char *path);
|
|
||||||
diff --git a/src/shared/util.c b/src/shared/util.c
|
|
||||||
index 0c27394..4170193 100644
|
|
||||||
--- a/src/shared/util.c
|
|
||||||
+++ b/src/shared/util.c
|
|
||||||
@@ -5730,14 +5730,17 @@ static int search_and_fopen_internal(const char *path, const char *mode, const c
|
|
||||||
assert(mode);
|
|
||||||
assert(_f);
|
|
||||||
|
|
||||||
- if (!path_strv_canonicalize_absolute_uniq(search, root))
|
|
||||||
+ if (!path_strv_cleanup_uniq(search, root))
|
|
||||||
return -ENOMEM;
|
|
||||||
|
|
||||||
STRV_FOREACH(i, search) {
|
|
||||||
_cleanup_free_ char *p = NULL;
|
|
||||||
FILE *f;
|
|
||||||
|
|
||||||
- p = strjoin(*i, "/", path, NULL);
|
|
||||||
+ if (root)
|
|
||||||
+ p = strjoin(root, *i, "/", path, NULL);
|
|
||||||
+ else
|
|
||||||
+ p = strjoin(*i, "/", path, NULL);
|
|
||||||
if (!p)
|
|
||||||
return -ENOMEM;
|
|
||||||
|
|
||||||
--
|
|
||||||
1.8.5.5
|
|
||||||
|
|
@ -1,38 +0,0 @@
|
|||||||
From fa51901447b24b4894da26a35a16596a90786429 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Camilo Aguilar <camilo.aguilar@gmail.com>
|
|
||||||
Date: Tue, 27 May 2014 23:05:14 -0400
|
|
||||||
Subject: [PATCH 2/3] sd-dhcp-client: Sets broadcast flag to 1
|
|
||||||
|
|
||||||
In systems running on hypervisors this flag needs to be set ON, so offers can reach
|
|
||||||
the virtual machines.
|
|
||||||
|
|
||||||
For more information please refer to this thread in CoreOS: https://github.com/coreos/bugs/issues/12
|
|
||||||
|
|
||||||
Signed-off-by: Camilo Aguilar <camilo.aguilar@gmail.com>
|
|
||||||
---
|
|
||||||
src/libsystemd-network/sd-dhcp-client.c | 9 +++++++++
|
|
||||||
1 file changed, 9 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/src/libsystemd-network/sd-dhcp-client.c b/src/libsystemd-network/sd-dhcp-client.c
|
|
||||||
index 0300a6b..8f54906 100644
|
|
||||||
--- a/src/libsystemd-network/sd-dhcp-client.c
|
|
||||||
+++ b/src/libsystemd-network/sd-dhcp-client.c
|
|
||||||
@@ -286,6 +286,15 @@ static int client_message_init(sd_dhcp_client *client, DHCPPacket **ret,
|
|
||||||
refuse to issue an DHCP lease if 'secs' is set to zero */
|
|
||||||
packet->dhcp.secs = htobe16(client->secs);
|
|
||||||
|
|
||||||
+ /* RFC2132 section 4.1
|
|
||||||
+ A client that cannot receive unicast IP datagrams until its protocol
|
|
||||||
+ software has been configured with an IP address SHOULD set the
|
|
||||||
+ BROADCAST bit in the 'flags' field to 1 in any DHCPDISCOVER or
|
|
||||||
+ DHCPREQUEST messages that client sends. The BROADCAST bit will
|
|
||||||
+ provide a hint to the DHCP server and BOOTP relay agent to broadcast
|
|
||||||
+ any messages to the client on the client's subnet. */
|
|
||||||
+ packet->dhcp.flags = htobe16(0x8000);
|
|
||||||
+
|
|
||||||
/* RFC2132 section 4.1.1:
|
|
||||||
The client MUST include its hardware address in the ’chaddr’ field, if
|
|
||||||
necessary for delivery of DHCP reply messages.
|
|
||||||
--
|
|
||||||
1.8.5.5
|
|
||||||
|
|
@ -1,33 +0,0 @@
|
|||||||
From 6a3cbd39d60bdb84f82b0a9b5a77ecb6769ee2db Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tom Gundersen <teg@jklm.no>
|
|
||||||
Date: Wed, 4 Jun 2014 21:29:08 +0200
|
|
||||||
Subject: [PATCH 3/3] networkd: link - intialize mac address
|
|
||||||
|
|
||||||
Otherwise .netwrok matching on MAC address will not work.
|
|
||||||
|
|
||||||
Based on patch by Dave Reisner, and bug originally reported by Max Pray.
|
|
||||||
|
|
||||||
Conflicts:
|
|
||||||
src/network/networkd-link.c
|
|
||||||
---
|
|
||||||
src/network/networkd-link.c | 4 ++++
|
|
||||||
1 file changed, 4 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
|
|
||||||
index 6677b94..9afb871 100644
|
|
||||||
--- a/src/network/networkd-link.c
|
|
||||||
+++ b/src/network/networkd-link.c
|
|
||||||
@@ -75,6 +75,10 @@ static int link_new(Manager *manager, sd_rtnl_message *message, Link **ret) {
|
|
||||||
if (!link->ifname)
|
|
||||||
return -ENOMEM;
|
|
||||||
|
|
||||||
+ r = sd_rtnl_message_read_ether_addr(message, IFLA_ADDRESS, &link->mac);
|
|
||||||
+ if (r < 0)
|
|
||||||
+ return r;
|
|
||||||
+
|
|
||||||
r = asprintf(&link->state_file, "/run/systemd/network/links/%"PRIu64,
|
|
||||||
link->ifindex);
|
|
||||||
if (r < 0)
|
|
||||||
--
|
|
||||||
1.8.5.5
|
|
||||||
|
|
@ -1,169 +0,0 @@
|
|||||||
From 7171a436771c02a75b6dd74b4ff9473d4d831e70 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Michael Marineau <michael.marineau@coreos.com>
|
|
||||||
Date: Thu, 29 May 2014 10:59:42 -0700
|
|
||||||
Subject: [PATCH] shared: fix searching for configs in alternate roots
|
|
||||||
|
|
||||||
Commit 12ed81d9 changed path_strv_canonicalize_absolute's behavior to
|
|
||||||
return a directory list without the root prefix if one was given but did
|
|
||||||
not update other users of the function to the new behavior. This broke
|
|
||||||
the --root option in systemd-tmpfiles, a regression in v213.
|
|
||||||
|
|
||||||
To better reflect that path_strv_canonicalize_absolute does not return
|
|
||||||
fully resolved paths any more as canonicalize may imply it is now simply
|
|
||||||
called path_strv_cleanup.
|
|
||||||
---
|
|
||||||
src/shared/conf-files.c | 18 +++++++++++++-----
|
|
||||||
src/shared/path-lookup.c | 6 +++---
|
|
||||||
src/shared/path-util.c | 6 +++---
|
|
||||||
src/shared/path-util.h | 4 ++--
|
|
||||||
src/shared/util.c | 7 +++++--
|
|
||||||
5 files changed, 26 insertions(+), 15 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/shared/conf-files.c b/src/shared/conf-files.c
|
|
||||||
index 5201782..6f1dc7f 100644
|
|
||||||
--- a/src/shared/conf-files.c
|
|
||||||
+++ b/src/shared/conf-files.c
|
|
||||||
@@ -37,10 +37,18 @@
|
|
||||||
#include "hashmap.h"
|
|
||||||
#include "conf-files.h"
|
|
||||||
|
|
||||||
-static int files_add(Hashmap *h, const char *dirpath, const char *suffix) {
|
|
||||||
+static int files_add(Hashmap *h, const char *dirpath, const char *suffix, const char *root) {
|
|
||||||
_cleanup_closedir_ DIR *dir = NULL;
|
|
||||||
+ _cleanup_free_ char *fullpath = NULL;
|
|
||||||
|
|
||||||
- dir = opendir(dirpath);
|
|
||||||
+ if (root)
|
|
||||||
+ fullpath = strappend(root, dirpath);
|
|
||||||
+ else
|
|
||||||
+ fullpath = strdup(dirpath);
|
|
||||||
+ if (!fullpath)
|
|
||||||
+ return -ENOMEM;
|
|
||||||
+
|
|
||||||
+ dir = opendir(fullpath);
|
|
||||||
if (!dir) {
|
|
||||||
if (errno == ENOENT)
|
|
||||||
return 0;
|
|
||||||
@@ -63,7 +71,7 @@ static int files_add(Hashmap *h, const char *dirpath, const char *suffix) {
|
|
||||||
if (!dirent_is_file_with_suffix(de, suffix))
|
|
||||||
continue;
|
|
||||||
|
|
||||||
- p = strjoin(dirpath, "/", de->d_name, NULL);
|
|
||||||
+ p = strjoin(fullpath, "/", de->d_name, NULL);
|
|
||||||
if (!p)
|
|
||||||
return -ENOMEM;
|
|
||||||
|
|
||||||
@@ -100,7 +108,7 @@ static int conf_files_list_strv_internal(char ***strv, const char *suffix, const
|
|
||||||
assert(suffix);
|
|
||||||
|
|
||||||
/* This alters the dirs string array */
|
|
||||||
- if (!path_strv_canonicalize_absolute_uniq(dirs, root))
|
|
||||||
+ if (!path_strv_cleanup_uniq(dirs, root))
|
|
||||||
return -ENOMEM;
|
|
||||||
|
|
||||||
fh = hashmap_new(string_hash_func, string_compare_func);
|
|
||||||
@@ -108,7 +116,7 @@ static int conf_files_list_strv_internal(char ***strv, const char *suffix, const
|
|
||||||
return -ENOMEM;
|
|
||||||
|
|
||||||
STRV_FOREACH(p, dirs) {
|
|
||||||
- r = files_add(fh, *p, suffix);
|
|
||||||
+ r = files_add(fh, *p, suffix, root);
|
|
||||||
if (r == -ENOMEM) {
|
|
||||||
hashmap_free_free(fh);
|
|
||||||
return r;
|
|
||||||
diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c
|
|
||||||
index e072fd6..1a497f9 100644
|
|
||||||
--- a/src/shared/path-lookup.c
|
|
||||||
+++ b/src/shared/path-lookup.c
|
|
||||||
@@ -284,7 +284,7 @@ int lookup_paths_init(
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
- if (!path_strv_canonicalize_absolute_uniq(p->unit_path, root_dir))
|
|
||||||
+ if (!path_strv_cleanup_uniq(p->unit_path, root_dir))
|
|
||||||
return -ENOMEM;
|
|
||||||
|
|
||||||
if (!strv_isempty(p->unit_path)) {
|
|
||||||
@@ -338,10 +338,10 @@ int lookup_paths_init(
|
|
||||||
return -ENOMEM;
|
|
||||||
}
|
|
||||||
|
|
||||||
- if (!path_strv_canonicalize_absolute_uniq(p->sysvinit_path, root_dir))
|
|
||||||
+ if (!path_strv_cleanup_uniq(p->sysvinit_path, root_dir))
|
|
||||||
return -ENOMEM;
|
|
||||||
|
|
||||||
- if (!path_strv_canonicalize_absolute_uniq(p->sysvrcnd_path, root_dir))
|
|
||||||
+ if (!path_strv_cleanup_uniq(p->sysvrcnd_path, root_dir))
|
|
||||||
return -ENOMEM;
|
|
||||||
|
|
||||||
if (!strv_isempty(p->sysvinit_path)) {
|
|
||||||
diff --git a/src/shared/path-util.c b/src/shared/path-util.c
|
|
||||||
index 5863429..37490be 100644
|
|
||||||
--- a/src/shared/path-util.c
|
|
||||||
+++ b/src/shared/path-util.c
|
|
||||||
@@ -238,7 +238,7 @@ char **path_strv_make_absolute_cwd(char **l) {
|
|
||||||
return l;
|
|
||||||
}
|
|
||||||
|
|
||||||
-char **path_strv_canonicalize_absolute(char **l, const char *prefix) {
|
|
||||||
+char **path_strv_cleanup(char **l, const char *prefix) {
|
|
||||||
char **s;
|
|
||||||
unsigned k = 0;
|
|
||||||
bool enomem = false;
|
|
||||||
@@ -323,12 +323,12 @@ char **path_strv_canonicalize_absolute(char **l, const char *prefix) {
|
|
||||||
return l;
|
|
||||||
}
|
|
||||||
|
|
||||||
-char **path_strv_canonicalize_absolute_uniq(char **l, const char *prefix) {
|
|
||||||
+char **path_strv_cleanup_uniq(char **l, const char *prefix) {
|
|
||||||
|
|
||||||
if (strv_isempty(l))
|
|
||||||
return l;
|
|
||||||
|
|
||||||
- if (!path_strv_canonicalize_absolute(l, prefix))
|
|
||||||
+ if (!path_strv_cleanup(l, prefix))
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
return strv_uniq(l);
|
|
||||||
diff --git a/src/shared/path-util.h b/src/shared/path-util.h
|
|
||||||
index 6882d78..b523bcc 100644
|
|
||||||
--- a/src/shared/path-util.h
|
|
||||||
+++ b/src/shared/path-util.h
|
|
||||||
@@ -47,8 +47,8 @@ char* path_startswith(const char *path, const char *prefix) _pure_;
|
|
||||||
bool path_equal(const char *a, const char *b) _pure_;
|
|
||||||
|
|
||||||
char** path_strv_make_absolute_cwd(char **l);
|
|
||||||
-char** path_strv_canonicalize_absolute(char **l, const char *prefix);
|
|
||||||
-char** path_strv_canonicalize_absolute_uniq(char **l, const char *prefix);
|
|
||||||
+char** path_strv_cleanup(char **l, const char *prefix);
|
|
||||||
+char** path_strv_cleanup_uniq(char **l, const char *prefix);
|
|
||||||
|
|
||||||
int path_is_mount_point(const char *path, bool allow_symlink);
|
|
||||||
int path_is_read_only_fs(const char *path);
|
|
||||||
diff --git a/src/shared/util.c b/src/shared/util.c
|
|
||||||
index 91cbf20..429a775 100644
|
|
||||||
--- a/src/shared/util.c
|
|
||||||
+++ b/src/shared/util.c
|
|
||||||
@@ -5691,14 +5691,17 @@ static int search_and_fopen_internal(const char *path, const char *mode, const c
|
|
||||||
assert(mode);
|
|
||||||
assert(_f);
|
|
||||||
|
|
||||||
- if (!path_strv_canonicalize_absolute_uniq(search, root))
|
|
||||||
+ if (!path_strv_cleanup_uniq(search, root))
|
|
||||||
return -ENOMEM;
|
|
||||||
|
|
||||||
STRV_FOREACH(i, search) {
|
|
||||||
_cleanup_free_ char *p = NULL;
|
|
||||||
FILE *f;
|
|
||||||
|
|
||||||
- p = strjoin(*i, "/", path, NULL);
|
|
||||||
+ if (root)
|
|
||||||
+ p = strjoin(root, *i, "/", path, NULL);
|
|
||||||
+ else
|
|
||||||
+ p = strjoin(*i, "/", path, NULL);
|
|
||||||
if (!p)
|
|
||||||
return -ENOMEM;
|
|
||||||
|
|
||||||
--
|
|
||||||
1.8.5.5
|
|
||||||
|
|
@ -1,515 +0,0 @@
|
|||||||
# Copyright 1999-2014 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.114 2014/06/11 15:13:06 floppym Exp $
|
|
||||||
|
|
||||||
EAPI=5
|
|
||||||
|
|
||||||
if [[ ${PV} == 9999 ]]; then
|
|
||||||
AUTOTOOLS_AUTORECONF=yes
|
|
||||||
EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${PN}
|
|
||||||
http://cgit.freedesktop.org/${PN}/${PN}/"
|
|
||||||
|
|
||||||
inherit git-r3
|
|
||||||
|
|
||||||
elif [[ ${PV} == *9999 ]]; then
|
|
||||||
AUTOTOOLS_AUTORECONF=yes
|
|
||||||
EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${PN}-stable
|
|
||||||
http://cgit.freedesktop.org/${PN}/${PN}-stable/"
|
|
||||||
EGIT_BRANCH=v${PV%%.*}-stable
|
|
||||||
|
|
||||||
inherit git-r3
|
|
||||||
fi
|
|
||||||
|
|
||||||
AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
|
|
||||||
PYTHON_COMPAT=( python{2_7,3_2,3_3} )
|
|
||||||
inherit autotools-utils bash-completion-r1 fcaps linux-info multilib \
|
|
||||||
multilib-minimal pam python-single-r1 systemd toolchain-funcs udev \
|
|
||||||
user
|
|
||||||
|
|
||||||
DESCRIPTION="System and service manager for Linux"
|
|
||||||
HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
|
|
||||||
SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz"
|
|
||||||
|
|
||||||
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
|
|
||||||
SLOT="0/2"
|
|
||||||
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
|
|
||||||
IUSE="acl audit cryptsetup doc +firmware-loader gcrypt gudev http introspection
|
|
||||||
kdbus +kmod lzma pam policykit python qrcode +seccomp selinux ssl
|
|
||||||
test xattr"
|
|
||||||
|
|
||||||
MINKV="3.10"
|
|
||||||
|
|
||||||
COMMON_DEPEND=">=sys-apps/util-linux-2.20:0=
|
|
||||||
sys-libs/libcap:0=
|
|
||||||
acl? ( sys-apps/acl:0= )
|
|
||||||
audit? ( >=sys-process/audit-2:0= )
|
|
||||||
cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
|
|
||||||
gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0= )
|
|
||||||
gudev? ( dev-libs/glib:2=[${MULTILIB_USEDEP}] )
|
|
||||||
http? (
|
|
||||||
>=net-libs/libmicrohttpd-0.9.33:0=
|
|
||||||
ssl? ( >=net-libs/gnutls-3.1.4:0= )
|
|
||||||
)
|
|
||||||
introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= )
|
|
||||||
kmod? ( >=sys-apps/kmod-15:0= )
|
|
||||||
lzma? ( app-arch/xz-utils:0=[${MULTILIB_USEDEP}] )
|
|
||||||
pam? ( virtual/pam:= )
|
|
||||||
python? ( ${PYTHON_DEPS} )
|
|
||||||
qrcode? ( media-gfx/qrencode:0= )
|
|
||||||
seccomp? ( >=sys-libs/libseccomp-2.1:0= )
|
|
||||||
selinux? ( sys-libs/libselinux:0= )
|
|
||||||
xattr? ( sys-apps/attr:0= )
|
|
||||||
abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
|
|
||||||
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
|
|
||||||
|
|
||||||
# baselayout-2.2 has /run
|
|
||||||
RDEPEND="${COMMON_DEPEND}
|
|
||||||
>=sys-apps/baselayout-2.2
|
|
||||||
|| (
|
|
||||||
>=sys-apps/util-linux-2.22
|
|
||||||
<sys-apps/sysvinit-2.88-r4
|
|
||||||
)
|
|
||||||
!sys-auth/nss-myhostname
|
|
||||||
!<sys-libs/glibc-2.14
|
|
||||||
!sys-fs/udev"
|
|
||||||
|
|
||||||
# sys-apps/daemon: the daemon only (+ build-time lib dep for tests)
|
|
||||||
PDEPEND=">=sys-apps/dbus-1.6.8-r1:0
|
|
||||||
>=sys-apps/hwids-20130717-r1[udev]
|
|
||||||
policykit? ( sys-auth/polkit )"
|
|
||||||
|
|
||||||
DEPEND="${COMMON_DEPEND}
|
|
||||||
app-arch/xz-utils:0
|
|
||||||
dev-util/gperf
|
|
||||||
>=dev-util/intltool-0.50
|
|
||||||
>=sys-devel/binutils-2.23.1
|
|
||||||
>=sys-devel/gcc-4.6
|
|
||||||
>=sys-kernel/linux-headers-${MINKV}
|
|
||||||
virtual/pkgconfig
|
|
||||||
doc? ( >=dev-util/gtk-doc-1.18 )
|
|
||||||
python? ( dev-python/lxml[${PYTHON_USEDEP}] )
|
|
||||||
test? ( >=sys-apps/dbus-1.6.8-r1:0 )"
|
|
||||||
|
|
||||||
if [[ ${PV} == *9999 ]]; then
|
|
||||||
DEPEND="${DEPEND}
|
|
||||||
app-text/docbook-xml-dtd:4.2
|
|
||||||
app-text/docbook-xml-dtd:4.5
|
|
||||||
app-text/docbook-xsl-stylesheets
|
|
||||||
dev-libs/libxslt:0
|
|
||||||
dev-libs/gobject-introspection
|
|
||||||
>=dev-libs/libgcrypt-1.4.5:0"
|
|
||||||
|
|
||||||
SRC_URI=
|
|
||||||
KEYWORDS=
|
|
||||||
fi
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
if [[ ${PV} == *9999 ]]; then
|
|
||||||
if use doc; then
|
|
||||||
gtkdocize --docdir docs/ || die
|
|
||||||
else
|
|
||||||
echo 'EXTRA_DIST =' > docs/gtk-doc.make
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
# fix regression in systemd-tmpfiles
|
|
||||||
epatch "${FILESDIR}"/213-0001-shared-fix-searching-for-configs-in-alternate-roots.patch
|
|
||||||
|
|
||||||
# fix DHCP for VMware bridged network interfaces
|
|
||||||
epatch "${FILESDIR}"/213-0002-sd-dhcp-client-Sets-broadcast-flag-to-1.patch
|
|
||||||
|
|
||||||
# fix matching interfaces by MAC address
|
|
||||||
epatch "${FILESDIR}"/213-0003-networkd-link-intialize-mac-address.patch
|
|
||||||
|
|
||||||
# Bug 463376
|
|
||||||
sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
|
|
||||||
|
|
||||||
autotools-utils_src_prepare
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_pretend() {
|
|
||||||
local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS ~DEVTMPFS ~DMIID
|
|
||||||
~EPOLL ~FANOTIFY ~FHANDLE ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS
|
|
||||||
~SECCOMP ~SIGNALFD ~SYSFS ~TIMERFD
|
|
||||||
~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2
|
|
||||||
~!GRKERNSEC_PROC"
|
|
||||||
|
|
||||||
use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
|
|
||||||
use xattr && CONFIG_CHECK+=" ~TMPFS_XATTR"
|
|
||||||
kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
|
|
||||||
use firmware-loader || CONFIG_CHECK+=" ~!FW_LOADER_USER_HELPER"
|
|
||||||
|
|
||||||
if linux_config_exists; then
|
|
||||||
local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
|
|
||||||
if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then
|
|
||||||
ewarn "It's recommended to set an empty value to the following kernel config option:"
|
|
||||||
ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ ${MERGE_TYPE} != binary ]]; then
|
|
||||||
if [[ $(gcc-major-version) -lt 4
|
|
||||||
|| ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ) ]]
|
|
||||||
then
|
|
||||||
eerror "systemd requires at least gcc 4.6 to build. Please switch the active"
|
|
||||||
eerror "gcc version using gcc-config."
|
|
||||||
die "systemd requires at least gcc 4.6"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ ${MERGE_TYPE} != buildonly ]]; then
|
|
||||||
if kernel_is -lt ${MINKV//./ }; then
|
|
||||||
ewarn "Kernel version at least ${MINKV} required"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if ! use firmware-loader && kernel_is -lt 3 8; then
|
|
||||||
ewarn "You seem to be using kernel older than 3.8. Those kernel versions"
|
|
||||||
ewarn "require systemd with USE=firmware-loader to support loading"
|
|
||||||
ewarn "firmware. Missing this flag may cause some hardware not to work."
|
|
||||||
fi
|
|
||||||
|
|
||||||
check_extra_config
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_setup() {
|
|
||||||
use python && python-single-r1_pkg_setup
|
|
||||||
}
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
# Keep using the one where the rules were installed.
|
|
||||||
MY_UDEVDIR=$(get_udevdir)
|
|
||||||
# Fix systems broken by bug #509454.
|
|
||||||
[[ ${MY_UDEVDIR} ]] || MY_UDEVDIR=/lib/udev
|
|
||||||
|
|
||||||
multilib-minimal_src_configure
|
|
||||||
}
|
|
||||||
|
|
||||||
multilib_src_configure() {
|
|
||||||
local myeconfargs=(
|
|
||||||
# disable -flto since it is an optimization flag
|
|
||||||
# and makes distcc less effective
|
|
||||||
cc_cv_CFLAGS__flto=no
|
|
||||||
|
|
||||||
--with-pamconfdir=/usr/share/pam.d
|
|
||||||
--disable-maintainer-mode
|
|
||||||
--localstatedir=/var
|
|
||||||
--with-pamlibdir=$(getpam_mod_dir)
|
|
||||||
# avoid bash-completion dep
|
|
||||||
--with-bashcompletiondir="$(get_bashcompdir)"
|
|
||||||
# make sure we get /bin:/sbin in $PATH
|
|
||||||
--enable-split-usr
|
|
||||||
# disable sysv compatibility
|
|
||||||
--with-sysvinit-path=
|
|
||||||
--with-sysvrcnd-path=
|
|
||||||
# no deps
|
|
||||||
--enable-efi
|
|
||||||
--enable-ima
|
|
||||||
# optional components/dependencies
|
|
||||||
$(use_enable acl)
|
|
||||||
$(use_enable audit)
|
|
||||||
$(use_enable cryptsetup libcryptsetup)
|
|
||||||
$(use_enable doc gtk-doc)
|
|
||||||
$(use_enable gcrypt)
|
|
||||||
$(use_enable gudev)
|
|
||||||
$(use_enable http microhttpd)
|
|
||||||
$(usex http $(use_enable ssl gnutls) --disable-gnutls)
|
|
||||||
$(use_enable introspection)
|
|
||||||
$(use_enable kdbus)
|
|
||||||
$(use_enable kmod)
|
|
||||||
$(use_enable lzma xz)
|
|
||||||
$(use_enable pam)
|
|
||||||
$(use_enable policykit polkit)
|
|
||||||
$(use_with python)
|
|
||||||
$(use_enable python python-devel)
|
|
||||||
$(use_enable qrcode qrencode)
|
|
||||||
$(use_enable seccomp)
|
|
||||||
$(use_enable selinux)
|
|
||||||
$(use_enable test tests)
|
|
||||||
$(use_enable xattr)
|
|
||||||
|
|
||||||
# not supported (avoid automagic deps in the future)
|
|
||||||
--disable-chkconfig
|
|
||||||
|
|
||||||
# hardcode a few paths to spare some deps
|
|
||||||
QUOTAON=/usr/sbin/quotaon
|
|
||||||
QUOTACHECK=/usr/sbin/quotacheck
|
|
||||||
|
|
||||||
# dbus paths
|
|
||||||
--with-dbuspolicydir="${EPREFIX}/usr/share/dbus-1/system.d"
|
|
||||||
--with-dbussessionservicedir="${EPREFIX}/usr/share/dbus-1/services"
|
|
||||||
--with-dbussystemservicedir="${EPREFIX}/usr/share/dbus-1/system-services"
|
|
||||||
--with-dbusinterfacedir="${EPREFIX}/usr/share/dbus-1/interfaces"
|
|
||||||
|
|
||||||
--with-ntp-servers="0.pool.ntp.org 1.pool.ntp.org 2.pool.ntp.org 3.pool.ntp.org"
|
|
||||||
)
|
|
||||||
|
|
||||||
if use firmware-loader; then
|
|
||||||
myeconfargs+=(
|
|
||||||
--with-firmware-path="/lib/firmware/updates:/lib/firmware"
|
|
||||||
)
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Added for testing; this is UNSUPPORTED by the Gentoo systemd team!
|
|
||||||
if [[ -n ${ROOTPREFIX+set} ]]; then
|
|
||||||
myeconfargs+=(
|
|
||||||
--with-rootprefix="${ROOTPREFIX}"
|
|
||||||
--with-rootlibdir="${ROOTPREFIX}/$(get_libdir)"
|
|
||||||
)
|
|
||||||
fi
|
|
||||||
|
|
||||||
if ! multilib_is_native_abi; then
|
|
||||||
myeconfargs+=(
|
|
||||||
ac_cv_search_cap_init=
|
|
||||||
ac_cv_header_sys_capability_h=yes
|
|
||||||
DBUS_CFLAGS=' '
|
|
||||||
DBUS_LIBS=' '
|
|
||||||
|
|
||||||
--disable-acl
|
|
||||||
--disable-audit
|
|
||||||
--disable-gcrypt
|
|
||||||
--disable-gnutls
|
|
||||||
--disable-gtk-doc
|
|
||||||
--disable-introspection
|
|
||||||
--disable-kmod
|
|
||||||
--disable-libcryptsetup
|
|
||||||
--disable-microhttpd
|
|
||||||
--disable-networkd
|
|
||||||
--disable-pam
|
|
||||||
--disable-polkit
|
|
||||||
--disable-qrencode
|
|
||||||
--disable-seccomp
|
|
||||||
--disable-selinux
|
|
||||||
--disable-timesyncd
|
|
||||||
--disable-tests
|
|
||||||
--disable-xattr
|
|
||||||
--disable-xz
|
|
||||||
--disable-python-devel
|
|
||||||
)
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Work around bug 463846.
|
|
||||||
tc-export CC
|
|
||||||
|
|
||||||
autotools-utils_src_configure
|
|
||||||
}
|
|
||||||
|
|
||||||
multilib_src_compile() {
|
|
||||||
local mymakeopts=(
|
|
||||||
udevlibexecdir="${MY_UDEVDIR}"
|
|
||||||
)
|
|
||||||
|
|
||||||
if multilib_is_native_abi; then
|
|
||||||
emake "${mymakeopts[@]}"
|
|
||||||
else
|
|
||||||
# prerequisites for gudev
|
|
||||||
use gudev && emake src/gudev/gudev{enumtypes,marshal}.{c,h}
|
|
||||||
|
|
||||||
echo 'gentoo: $(BUILT_SOURCES)' | \
|
|
||||||
emake "${mymakeopts[@]}" -f Makefile -f - gentoo
|
|
||||||
echo 'gentoo: $(lib_LTLIBRARIES) $(pkgconfiglib_DATA)' | \
|
|
||||||
emake "${mymakeopts[@]}" -f Makefile -f - gentoo
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
multilib_src_test() {
|
|
||||||
multilib_is_native_abi || continue
|
|
||||||
|
|
||||||
default
|
|
||||||
}
|
|
||||||
|
|
||||||
multilib_src_install() {
|
|
||||||
local mymakeopts=(
|
|
||||||
# automake fails with parallel libtool relinking
|
|
||||||
# https://bugs.gentoo.org/show_bug.cgi?id=491398
|
|
||||||
-j1
|
|
||||||
|
|
||||||
udevlibexecdir="${MY_UDEVDIR}"
|
|
||||||
dist_udevhwdb_DATA=
|
|
||||||
DESTDIR="${D}"
|
|
||||||
)
|
|
||||||
|
|
||||||
if multilib_is_native_abi; then
|
|
||||||
emake "${mymakeopts[@]}" install
|
|
||||||
else
|
|
||||||
mymakeopts+=(
|
|
||||||
install-libLTLIBRARIES
|
|
||||||
install-pkgconfiglibDATA
|
|
||||||
install-includeHEADERS
|
|
||||||
# safe to call unconditionally, 'installs' empty list
|
|
||||||
install-libgudev_includeHEADERS
|
|
||||||
install-pkgincludeHEADERS
|
|
||||||
)
|
|
||||||
|
|
||||||
emake "${mymakeopts[@]}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# install compat pkg-config files
|
|
||||||
local pcfiles=( src/compat-libs/libsystemd-{daemon,id128,journal,login}.pc )
|
|
||||||
emake "${mymakeopts[@]}" install-pkgconfiglibDATA \
|
|
||||||
pkgconfiglib_DATA="${pcfiles[*]}"
|
|
||||||
}
|
|
||||||
|
|
||||||
multilib_src_install_all() {
|
|
||||||
prune_libtool_files --modules
|
|
||||||
einstalldocs
|
|
||||||
|
|
||||||
# we just keep sysvinit tools, so no need for the mans
|
|
||||||
rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
|
|
||||||
|| die
|
|
||||||
rm "${D}"/usr/share/man/man1/init.1 || die
|
|
||||||
|
|
||||||
# Disable storing coredumps in journald, bug #433457
|
|
||||||
mv "${D}"/usr/lib/sysctl.d/50-coredump.conf{,.disabled} || die
|
|
||||||
|
|
||||||
systemd_dotmpfilesd "${FILESDIR}"/systemd-coreos.conf
|
|
||||||
systemd_newtmpfilesd "${FILESDIR}"/213-systemd-resolv.conf systemd-resolv.conf
|
|
||||||
|
|
||||||
# Don't default to graphical.target
|
|
||||||
rm "${D}"/usr/lib/systemd/system/default.target || die
|
|
||||||
dosym multi-user.target /usr/lib/systemd/system/default.target
|
|
||||||
|
|
||||||
# Move a few services enabled in /etc to /usr
|
|
||||||
rm "${D}"/etc/systemd/system/getty.target.wants/getty@tty1.service || die
|
|
||||||
rmdir "${D}"/etc/systemd/system/getty.target.wants || die
|
|
||||||
dosym ../getty@.service /usr/lib/systemd/system/getty.target.wants/getty@tty1.service
|
|
||||||
|
|
||||||
rm "${D}"/etc/systemd/system/multi-user.target.wants/remote-fs.target \
|
|
||||||
"${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service \
|
|
||||||
"${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service \
|
|
||||||
"${D}"/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service \
|
|
||||||
|| die
|
|
||||||
rmdir "${D}"/etc/systemd/system/multi-user.target.wants \
|
|
||||||
"${D}"/etc/systemd/system/network-online.target.wants \
|
|
||||||
|| die
|
|
||||||
systemd_enable_service multi-user.target remote-fs.target
|
|
||||||
systemd_enable_service multi-user.target systemd-networkd.service
|
|
||||||
systemd_enable_service multi-user.target systemd-resolved.service
|
|
||||||
systemd_enable_service network-online.target systemd-networkd-wait-online.service
|
|
||||||
}
|
|
||||||
|
|
||||||
migrate_locale() {
|
|
||||||
local envd_locale_def="${EROOT%/}/etc/env.d/02locale"
|
|
||||||
local envd_locale=( "${EROOT%/}"/etc/env.d/??locale )
|
|
||||||
local locale_conf="${EROOT%/}/etc/locale.conf"
|
|
||||||
|
|
||||||
if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
|
|
||||||
# If locale.conf does not exist...
|
|
||||||
if [[ -e ${envd_locale} ]]; then
|
|
||||||
# ...either copy env.d/??locale if there's one
|
|
||||||
ebegin "Moving ${envd_locale} to ${locale_conf}"
|
|
||||||
mv "${envd_locale}" "${locale_conf}"
|
|
||||||
eend ${?} || FAIL=1
|
|
||||||
else
|
|
||||||
# ...or create a dummy default
|
|
||||||
ebegin "Creating ${locale_conf}"
|
|
||||||
cat > "${locale_conf}" <<-EOF
|
|
||||||
# This file has been created by the sys-apps/systemd ebuild.
|
|
||||||
# See locale.conf(5) and localectl(1).
|
|
||||||
|
|
||||||
# LANG=${LANG}
|
|
||||||
EOF
|
|
||||||
eend ${?} || FAIL=1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ ! -L ${envd_locale} ]]; then
|
|
||||||
# now, if env.d/??locale is not a symlink (to locale.conf)...
|
|
||||||
if [[ -e ${envd_locale} ]]; then
|
|
||||||
# ...warn the user that he has duplicate locale settings
|
|
||||||
ewarn
|
|
||||||
ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
|
|
||||||
ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
|
|
||||||
ewarn "and create the symlink with the following command:"
|
|
||||||
ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
|
|
||||||
ewarn
|
|
||||||
else
|
|
||||||
# ...or just create the symlink if there's nothing here
|
|
||||||
ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
|
|
||||||
ln -n -s ../locale.conf "${envd_locale_def}"
|
|
||||||
eend ${?} || FAIL=1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
migrate_net_name_slot() {
|
|
||||||
# If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null,
|
|
||||||
# do the same for 80-net-setup-link.rules to keep the old behavior
|
|
||||||
local net_move=no
|
|
||||||
local net_name_slot_sym=no
|
|
||||||
local net_rules_path="${EROOT%/}"/etc/udev/rules.d
|
|
||||||
local net_name_slot="${net_rules_path}"/80-net-name-slot.rules
|
|
||||||
local net_setup_link="${net_rules_path}"/80-net-setup-link.rules
|
|
||||||
if [[ -e ${net_setup_link} ]]; then
|
|
||||||
net_move=no
|
|
||||||
elif [[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]]; then
|
|
||||||
net_move=yes
|
|
||||||
elif [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then
|
|
||||||
net_move=yes
|
|
||||||
net_name_slot_sym=yes
|
|
||||||
fi
|
|
||||||
if [[ ${net_move} == yes ]]; then
|
|
||||||
ebegin "Copying ${net_name_slot} to ${net_setup_link}"
|
|
||||||
|
|
||||||
if [[ ${net_name_slot_sym} == yes ]]; then
|
|
||||||
ln -nfs /dev/null "${net_setup_link}"
|
|
||||||
else
|
|
||||||
cp "${net_name_slot}" "${net_setup_link}"
|
|
||||||
fi
|
|
||||||
eend $? || FAIL=1
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
enewgroup systemd-journal
|
|
||||||
if use http; then
|
|
||||||
enewgroup systemd-journal-gateway
|
|
||||||
enewuser systemd-journal-gateway -1 -1 -1 systemd-journal-gateway
|
|
||||||
fi
|
|
||||||
systemd_update_catalog
|
|
||||||
|
|
||||||
# Keep this here in case the database format changes so it gets updated
|
|
||||||
# when required. Despite that this file is owned by sys-apps/hwids.
|
|
||||||
if has_version "sys-apps/hwids[udev]"; then
|
|
||||||
udevadm hwdb --update --root="${ROOT%/}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
udev_reload || FAIL=1
|
|
||||||
|
|
||||||
# Bug 468876
|
|
||||||
fcaps cap_dac_override,cap_sys_ptrace=ep usr/bin/systemd-detect-virt
|
|
||||||
|
|
||||||
# Bug 465468, make sure locales are respect, and ensure consistency
|
|
||||||
# between OpenRC & systemd
|
|
||||||
migrate_locale
|
|
||||||
|
|
||||||
# Migrate 80-net-name-slot.rules -> 80-net-setup-link.rules
|
|
||||||
migrate_net_name_slot
|
|
||||||
|
|
||||||
if [[ ${FAIL} ]]; then
|
|
||||||
eerror "One of the postinst commands failed. Please check the postinst output"
|
|
||||||
eerror "for errors. You may need to clean up your system and/or try installing"
|
|
||||||
eerror "systemd again."
|
|
||||||
eerror
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ ! -L "${ROOT}"/etc/mtab ]]; then
|
|
||||||
ewarn "Upstream mandates the /etc/mtab file should be a symlink to /proc/mounts."
|
|
||||||
ewarn "Not having it is not supported by upstream and will cause tools like 'df'"
|
|
||||||
ewarn "and 'mount' to not work properly. Please run:"
|
|
||||||
ewarn " # ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'"
|
|
||||||
ewarn
|
|
||||||
fi
|
|
||||||
|
|
||||||
if ! has_version sys-apps/systemd-ui; then
|
|
||||||
elog "To get additional features, a number of optional runtime dependencies may"
|
|
||||||
elog "be installed:"
|
|
||||||
elog "- sys-apps/systemd-ui: for GTK+ systemadm UI and gnome-ask-password-agent"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_prerm() {
|
|
||||||
# If removing systemd completely, remove the catalog database.
|
|
||||||
if [[ ! ${REPLACED_BY_VERSION} ]]; then
|
|
||||||
rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
|
|
||||||
fi
|
|
||||||
}
|
|
@ -1,512 +0,0 @@
|
|||||||
# Copyright 1999-2014 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.115 2014/06/14 16:33:20 floppym Exp $
|
|
||||||
|
|
||||||
EAPI=5
|
|
||||||
|
|
||||||
if [[ ${PV} == 9999 ]]; then
|
|
||||||
AUTOTOOLS_AUTORECONF=yes
|
|
||||||
EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${PN}
|
|
||||||
http://cgit.freedesktop.org/${PN}/${PN}/"
|
|
||||||
|
|
||||||
inherit git-r3
|
|
||||||
|
|
||||||
elif [[ ${PV} == *9999 ]]; then
|
|
||||||
AUTOTOOLS_AUTORECONF=yes
|
|
||||||
EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${PN}-stable
|
|
||||||
http://cgit.freedesktop.org/${PN}/${PN}-stable/"
|
|
||||||
EGIT_BRANCH=v${PV%%.*}-stable
|
|
||||||
|
|
||||||
inherit git-r3
|
|
||||||
fi
|
|
||||||
|
|
||||||
AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
|
|
||||||
PYTHON_COMPAT=( python{2_7,3_2,3_3} )
|
|
||||||
inherit autotools-utils bash-completion-r1 fcaps linux-info multilib \
|
|
||||||
multilib-minimal pam python-single-r1 systemd toolchain-funcs udev \
|
|
||||||
user
|
|
||||||
|
|
||||||
DESCRIPTION="System and service manager for Linux"
|
|
||||||
HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
|
|
||||||
SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz"
|
|
||||||
|
|
||||||
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
|
|
||||||
SLOT="0/2"
|
|
||||||
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
|
|
||||||
IUSE="acl audit cryptsetup doc +firmware-loader gcrypt gudev http introspection
|
|
||||||
kdbus +kmod lzma pam policykit python qrcode +seccomp selinux ssl
|
|
||||||
test"
|
|
||||||
|
|
||||||
MINKV="3.10"
|
|
||||||
|
|
||||||
COMMON_DEPEND=">=sys-apps/util-linux-2.20:0=
|
|
||||||
sys-libs/libcap:0=
|
|
||||||
acl? ( sys-apps/acl:0= )
|
|
||||||
audit? ( >=sys-process/audit-2:0= )
|
|
||||||
cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
|
|
||||||
gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0= )
|
|
||||||
gudev? ( dev-libs/glib:2=[${MULTILIB_USEDEP}] )
|
|
||||||
http? (
|
|
||||||
>=net-libs/libmicrohttpd-0.9.33:0=
|
|
||||||
ssl? ( >=net-libs/gnutls-3.1.4:0= )
|
|
||||||
)
|
|
||||||
introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= )
|
|
||||||
kmod? ( >=sys-apps/kmod-15:0= )
|
|
||||||
lzma? ( app-arch/xz-utils:0=[${MULTILIB_USEDEP}] )
|
|
||||||
pam? ( virtual/pam:= )
|
|
||||||
python? ( ${PYTHON_DEPS} )
|
|
||||||
qrcode? ( media-gfx/qrencode:0= )
|
|
||||||
seccomp? ( >=sys-libs/libseccomp-2.1:0= )
|
|
||||||
selinux? ( sys-libs/libselinux:0= )
|
|
||||||
abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
|
|
||||||
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
|
|
||||||
|
|
||||||
# baselayout-2.2 has /run
|
|
||||||
RDEPEND="${COMMON_DEPEND}
|
|
||||||
>=sys-apps/baselayout-2.2
|
|
||||||
|| (
|
|
||||||
>=sys-apps/util-linux-2.22
|
|
||||||
<sys-apps/sysvinit-2.88-r4
|
|
||||||
)
|
|
||||||
!sys-auth/nss-myhostname
|
|
||||||
!<sys-libs/glibc-2.14
|
|
||||||
!sys-fs/udev"
|
|
||||||
|
|
||||||
# sys-apps/daemon: the daemon only (+ build-time lib dep for tests)
|
|
||||||
PDEPEND=">=sys-apps/dbus-1.6.8-r1:0
|
|
||||||
>=sys-apps/hwids-20130717-r1[udev]
|
|
||||||
policykit? ( sys-auth/polkit )"
|
|
||||||
|
|
||||||
DEPEND="${COMMON_DEPEND}
|
|
||||||
app-arch/xz-utils:0
|
|
||||||
dev-util/gperf
|
|
||||||
>=dev-util/intltool-0.50
|
|
||||||
>=sys-devel/binutils-2.23.1
|
|
||||||
>=sys-devel/gcc-4.6
|
|
||||||
>=sys-kernel/linux-headers-${MINKV}
|
|
||||||
virtual/pkgconfig
|
|
||||||
doc? ( >=dev-util/gtk-doc-1.18 )
|
|
||||||
python? ( dev-python/lxml[${PYTHON_USEDEP}] )
|
|
||||||
test? ( >=sys-apps/dbus-1.6.8-r1:0 )"
|
|
||||||
|
|
||||||
if [[ ${PV} == *9999 ]]; then
|
|
||||||
DEPEND="${DEPEND}
|
|
||||||
app-text/docbook-xml-dtd:4.2
|
|
||||||
app-text/docbook-xml-dtd:4.5
|
|
||||||
app-text/docbook-xsl-stylesheets
|
|
||||||
dev-libs/libxslt:0
|
|
||||||
dev-libs/gobject-introspection
|
|
||||||
>=dev-libs/libgcrypt-1.4.5:0"
|
|
||||||
|
|
||||||
SRC_URI=
|
|
||||||
KEYWORDS=
|
|
||||||
fi
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
if [[ ${PV} == *9999 ]]; then
|
|
||||||
if use doc; then
|
|
||||||
gtkdocize --docdir docs/ || die
|
|
||||||
else
|
|
||||||
echo 'EXTRA_DIST =' > docs/gtk-doc.make
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
# fix regression in systemd-tmpfiles
|
|
||||||
epatch "${FILESDIR}"/214-0001-shared-fix-searching-for-configs-in-alternate-roots.patch
|
|
||||||
|
|
||||||
# Bug 463376
|
|
||||||
sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
|
|
||||||
|
|
||||||
autotools-utils_src_prepare
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_pretend() {
|
|
||||||
local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS ~DEVTMPFS ~DMIID
|
|
||||||
~EPOLL ~FANOTIFY ~FHANDLE ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS
|
|
||||||
~SECCOMP ~SIGNALFD ~SYSFS ~TIMERFD ~TMPFS_XATTR
|
|
||||||
~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2
|
|
||||||
~!GRKERNSEC_PROC"
|
|
||||||
|
|
||||||
use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
|
|
||||||
kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
|
|
||||||
use firmware-loader || CONFIG_CHECK+=" ~!FW_LOADER_USER_HELPER"
|
|
||||||
|
|
||||||
if linux_config_exists; then
|
|
||||||
local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
|
|
||||||
if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then
|
|
||||||
ewarn "It's recommended to set an empty value to the following kernel config option:"
|
|
||||||
ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ ${MERGE_TYPE} != binary ]]; then
|
|
||||||
if [[ $(gcc-major-version) -lt 4
|
|
||||||
|| ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ) ]]
|
|
||||||
then
|
|
||||||
eerror "systemd requires at least gcc 4.6 to build. Please switch the active"
|
|
||||||
eerror "gcc version using gcc-config."
|
|
||||||
die "systemd requires at least gcc 4.6"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ ${MERGE_TYPE} != buildonly ]]; then
|
|
||||||
if kernel_is -lt ${MINKV//./ }; then
|
|
||||||
ewarn "Kernel version at least ${MINKV} required"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if ! use firmware-loader && kernel_is -lt 3 8; then
|
|
||||||
ewarn "You seem to be using kernel older than 3.8. Those kernel versions"
|
|
||||||
ewarn "require systemd with USE=firmware-loader to support loading"
|
|
||||||
ewarn "firmware. Missing this flag may cause some hardware not to work."
|
|
||||||
fi
|
|
||||||
|
|
||||||
check_extra_config
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_setup() {
|
|
||||||
use python && python-single-r1_pkg_setup
|
|
||||||
}
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
# Keep using the one where the rules were installed.
|
|
||||||
MY_UDEVDIR=$(get_udevdir)
|
|
||||||
# Fix systems broken by bug #509454.
|
|
||||||
[[ ${MY_UDEVDIR} ]] || MY_UDEVDIR=/lib/udev
|
|
||||||
|
|
||||||
multilib-minimal_src_configure
|
|
||||||
}
|
|
||||||
|
|
||||||
multilib_src_configure() {
|
|
||||||
local myeconfargs=(
|
|
||||||
# disable -flto since it is an optimization flag
|
|
||||||
# and makes distcc less effective
|
|
||||||
cc_cv_CFLAGS__flto=no
|
|
||||||
|
|
||||||
--with-pamconfdir=/usr/share/pam.d
|
|
||||||
--disable-maintainer-mode
|
|
||||||
--localstatedir=/var
|
|
||||||
--with-pamlibdir=$(getpam_mod_dir)
|
|
||||||
# avoid bash-completion dep
|
|
||||||
--with-bashcompletiondir="$(get_bashcompdir)"
|
|
||||||
# make sure we get /bin:/sbin in $PATH
|
|
||||||
--enable-split-usr
|
|
||||||
# disable sysv compatibility
|
|
||||||
--with-sysvinit-path=
|
|
||||||
--with-sysvrcnd-path=
|
|
||||||
# no deps
|
|
||||||
--enable-efi
|
|
||||||
--enable-ima
|
|
||||||
# optional components/dependencies
|
|
||||||
$(use_enable acl)
|
|
||||||
$(use_enable audit)
|
|
||||||
$(use_enable cryptsetup libcryptsetup)
|
|
||||||
$(use_enable doc gtk-doc)
|
|
||||||
$(use_enable gcrypt)
|
|
||||||
$(use_enable gudev)
|
|
||||||
$(use_enable http microhttpd)
|
|
||||||
$(usex http $(use_enable ssl gnutls) --disable-gnutls)
|
|
||||||
$(use_enable introspection)
|
|
||||||
$(use_enable kdbus)
|
|
||||||
$(use_enable kmod)
|
|
||||||
$(use_enable lzma xz)
|
|
||||||
$(use_enable pam)
|
|
||||||
$(use_enable policykit polkit)
|
|
||||||
$(use_with python)
|
|
||||||
$(use_enable python python-devel)
|
|
||||||
$(use_enable qrcode qrencode)
|
|
||||||
$(use_enable seccomp)
|
|
||||||
$(use_enable selinux)
|
|
||||||
$(use_enable test tests)
|
|
||||||
|
|
||||||
# not supported (avoid automagic deps in the future)
|
|
||||||
--disable-chkconfig
|
|
||||||
|
|
||||||
# hardcode a few paths to spare some deps
|
|
||||||
QUOTAON=/usr/sbin/quotaon
|
|
||||||
QUOTACHECK=/usr/sbin/quotacheck
|
|
||||||
|
|
||||||
# dbus paths
|
|
||||||
--with-dbuspolicydir="${EPREFIX}/usr/share/dbus-1/system.d"
|
|
||||||
--with-dbussessionservicedir="${EPREFIX}/usr/share/dbus-1/services"
|
|
||||||
--with-dbussystemservicedir="${EPREFIX}/usr/share/dbus-1/system-services"
|
|
||||||
--with-dbusinterfacedir="${EPREFIX}/usr/share/dbus-1/interfaces"
|
|
||||||
|
|
||||||
--with-ntp-servers="0.pool.ntp.org 1.pool.ntp.org 2.pool.ntp.org 3.pool.ntp.org"
|
|
||||||
)
|
|
||||||
|
|
||||||
if use firmware-loader; then
|
|
||||||
myeconfargs+=(
|
|
||||||
--with-firmware-path="/lib/firmware/updates:/lib/firmware"
|
|
||||||
)
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Added for testing; this is UNSUPPORTED by the Gentoo systemd team!
|
|
||||||
if [[ -n ${ROOTPREFIX+set} ]]; then
|
|
||||||
myeconfargs+=(
|
|
||||||
--with-rootprefix="${ROOTPREFIX}"
|
|
||||||
--with-rootlibdir="${ROOTPREFIX}/$(get_libdir)"
|
|
||||||
)
|
|
||||||
fi
|
|
||||||
|
|
||||||
if ! multilib_is_native_abi; then
|
|
||||||
myeconfargs+=(
|
|
||||||
ac_cv_search_cap_init=
|
|
||||||
ac_cv_header_sys_capability_h=yes
|
|
||||||
DBUS_CFLAGS=' '
|
|
||||||
DBUS_LIBS=' '
|
|
||||||
|
|
||||||
--disable-acl
|
|
||||||
--disable-audit
|
|
||||||
--disable-gcrypt
|
|
||||||
--disable-gnutls
|
|
||||||
--disable-gtk-doc
|
|
||||||
--disable-introspection
|
|
||||||
--disable-kmod
|
|
||||||
--disable-libcryptsetup
|
|
||||||
--disable-microhttpd
|
|
||||||
--disable-networkd
|
|
||||||
--disable-pam
|
|
||||||
--disable-polkit
|
|
||||||
--disable-qrencode
|
|
||||||
--disable-seccomp
|
|
||||||
--disable-selinux
|
|
||||||
--disable-timesyncd
|
|
||||||
--disable-tests
|
|
||||||
--disable-xz
|
|
||||||
--disable-python-devel
|
|
||||||
)
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Work around bug 463846.
|
|
||||||
tc-export CC
|
|
||||||
|
|
||||||
autotools-utils_src_configure
|
|
||||||
}
|
|
||||||
|
|
||||||
multilib_src_compile() {
|
|
||||||
local mymakeopts=(
|
|
||||||
udevlibexecdir="${MY_UDEVDIR}"
|
|
||||||
)
|
|
||||||
|
|
||||||
if multilib_is_native_abi; then
|
|
||||||
emake "${mymakeopts[@]}"
|
|
||||||
else
|
|
||||||
# prerequisites for gudev
|
|
||||||
use gudev && emake src/gudev/gudev{enumtypes,marshal}.{c,h}
|
|
||||||
|
|
||||||
echo 'gentoo: $(BUILT_SOURCES)' | \
|
|
||||||
emake "${mymakeopts[@]}" -f Makefile -f - gentoo
|
|
||||||
echo 'gentoo: $(lib_LTLIBRARIES) $(pkgconfiglib_DATA)' | \
|
|
||||||
emake "${mymakeopts[@]}" -f Makefile -f - gentoo
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
multilib_src_test() {
|
|
||||||
multilib_is_native_abi || continue
|
|
||||||
|
|
||||||
default
|
|
||||||
}
|
|
||||||
|
|
||||||
multilib_src_install() {
|
|
||||||
local mymakeopts=(
|
|
||||||
# automake fails with parallel libtool relinking
|
|
||||||
# https://bugs.gentoo.org/show_bug.cgi?id=491398
|
|
||||||
-j1
|
|
||||||
|
|
||||||
udevlibexecdir="${MY_UDEVDIR}"
|
|
||||||
dist_udevhwdb_DATA=
|
|
||||||
DESTDIR="${D}"
|
|
||||||
)
|
|
||||||
|
|
||||||
if multilib_is_native_abi; then
|
|
||||||
emake "${mymakeopts[@]}" install
|
|
||||||
else
|
|
||||||
mymakeopts+=(
|
|
||||||
install-libLTLIBRARIES
|
|
||||||
install-pkgconfiglibDATA
|
|
||||||
install-includeHEADERS
|
|
||||||
# safe to call unconditionally, 'installs' empty list
|
|
||||||
install-libgudev_includeHEADERS
|
|
||||||
install-pkgincludeHEADERS
|
|
||||||
)
|
|
||||||
|
|
||||||
emake "${mymakeopts[@]}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# install compat pkg-config files
|
|
||||||
local pcfiles=( src/compat-libs/libsystemd-{daemon,id128,journal,login}.pc )
|
|
||||||
emake "${mymakeopts[@]}" install-pkgconfiglibDATA \
|
|
||||||
pkgconfiglib_DATA="${pcfiles[*]}"
|
|
||||||
}
|
|
||||||
|
|
||||||
multilib_src_install_all() {
|
|
||||||
prune_libtool_files --modules
|
|
||||||
einstalldocs
|
|
||||||
|
|
||||||
# we just keep sysvinit tools, so no need for the mans
|
|
||||||
rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
|
|
||||||
|| die
|
|
||||||
rm "${D}"/usr/share/man/man1/init.1 || die
|
|
||||||
|
|
||||||
# Disable storing coredumps in journald, bug #433457
|
|
||||||
mv "${D}"/usr/lib/sysctl.d/50-coredump.conf{,.disabled} || die
|
|
||||||
|
|
||||||
systemd_dotmpfilesd "${FILESDIR}"/systemd-coreos.conf
|
|
||||||
systemd_dotmpfilesd "${FILESDIR}"/systemd-resolv.conf
|
|
||||||
|
|
||||||
# Don't default to graphical.target
|
|
||||||
rm "${D}"/usr/lib/systemd/system/default.target || die
|
|
||||||
dosym multi-user.target /usr/lib/systemd/system/default.target
|
|
||||||
|
|
||||||
# Move a few services enabled in /etc to /usr
|
|
||||||
rm "${D}"/etc/systemd/system/getty.target.wants/getty@tty1.service || die
|
|
||||||
rmdir "${D}"/etc/systemd/system/getty.target.wants || die
|
|
||||||
dosym ../getty@.service /usr/lib/systemd/system/getty.target.wants/getty@tty1.service
|
|
||||||
|
|
||||||
rm "${D}"/etc/systemd/system/multi-user.target.wants/remote-fs.target \
|
|
||||||
"${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service \
|
|
||||||
"${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service \
|
|
||||||
"${D}"/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service \
|
|
||||||
|| die
|
|
||||||
rmdir "${D}"/etc/systemd/system/multi-user.target.wants \
|
|
||||||
"${D}"/etc/systemd/system/network-online.target.wants \
|
|
||||||
|| die
|
|
||||||
systemd_enable_service multi-user.target remote-fs.target
|
|
||||||
systemd_enable_service multi-user.target systemd-networkd.service
|
|
||||||
systemd_enable_service multi-user.target systemd-resolved.service
|
|
||||||
systemd_enable_service network-online.target systemd-networkd-wait-online.service
|
|
||||||
}
|
|
||||||
|
|
||||||
migrate_locale() {
|
|
||||||
local envd_locale_def="${EROOT%/}/etc/env.d/02locale"
|
|
||||||
local envd_locale=( "${EROOT%/}"/etc/env.d/??locale )
|
|
||||||
local locale_conf="${EROOT%/}/etc/locale.conf"
|
|
||||||
|
|
||||||
if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
|
|
||||||
# If locale.conf does not exist...
|
|
||||||
if [[ -e ${envd_locale} ]]; then
|
|
||||||
# ...either copy env.d/??locale if there's one
|
|
||||||
ebegin "Moving ${envd_locale} to ${locale_conf}"
|
|
||||||
mv "${envd_locale}" "${locale_conf}"
|
|
||||||
eend ${?} || FAIL=1
|
|
||||||
else
|
|
||||||
# ...or create a dummy default
|
|
||||||
ebegin "Creating ${locale_conf}"
|
|
||||||
cat > "${locale_conf}" <<-EOF
|
|
||||||
# This file has been created by the sys-apps/systemd ebuild.
|
|
||||||
# See locale.conf(5) and localectl(1).
|
|
||||||
|
|
||||||
# LANG=${LANG}
|
|
||||||
EOF
|
|
||||||
eend ${?} || FAIL=1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ ! -L ${envd_locale} ]]; then
|
|
||||||
# now, if env.d/??locale is not a symlink (to locale.conf)...
|
|
||||||
if [[ -e ${envd_locale} ]]; then
|
|
||||||
# ...warn the user that he has duplicate locale settings
|
|
||||||
ewarn
|
|
||||||
ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
|
|
||||||
ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
|
|
||||||
ewarn "and create the symlink with the following command:"
|
|
||||||
ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
|
|
||||||
ewarn
|
|
||||||
else
|
|
||||||
# ...or just create the symlink if there's nothing here
|
|
||||||
ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
|
|
||||||
ln -n -s ../locale.conf "${envd_locale_def}"
|
|
||||||
eend ${?} || FAIL=1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
migrate_net_name_slot() {
|
|
||||||
# If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null,
|
|
||||||
# do the same for 80-net-setup-link.rules to keep the old behavior
|
|
||||||
local net_move=no
|
|
||||||
local net_name_slot_sym=no
|
|
||||||
local net_rules_path="${EROOT%/}"/etc/udev/rules.d
|
|
||||||
local net_name_slot="${net_rules_path}"/80-net-name-slot.rules
|
|
||||||
local net_setup_link="${net_rules_path}"/80-net-setup-link.rules
|
|
||||||
if [[ -e ${net_setup_link} ]]; then
|
|
||||||
net_move=no
|
|
||||||
elif [[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]]; then
|
|
||||||
net_move=yes
|
|
||||||
elif [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then
|
|
||||||
net_move=yes
|
|
||||||
net_name_slot_sym=yes
|
|
||||||
fi
|
|
||||||
if [[ ${net_move} == yes ]]; then
|
|
||||||
ebegin "Copying ${net_name_slot} to ${net_setup_link}"
|
|
||||||
|
|
||||||
if [[ ${net_name_slot_sym} == yes ]]; then
|
|
||||||
ln -nfs /dev/null "${net_setup_link}"
|
|
||||||
else
|
|
||||||
cp "${net_name_slot}" "${net_setup_link}"
|
|
||||||
fi
|
|
||||||
eend $? || FAIL=1
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
newusergroup() {
|
|
||||||
enewgroup "$1"
|
|
||||||
enewuser "$1" -1 -1 -1 "$1"
|
|
||||||
}
|
|
||||||
|
|
||||||
enewgroup systemd-journal
|
|
||||||
newusergroup systemd-bus-proxy
|
|
||||||
newusergroup systemd-network
|
|
||||||
newusergroup systemd-resolve
|
|
||||||
newusergroup systemd-timesync
|
|
||||||
use http && newusergroup systemd-journal-gateway
|
|
||||||
|
|
||||||
systemd_update_catalog
|
|
||||||
|
|
||||||
# Keep this here in case the database format changes so it gets updated
|
|
||||||
# when required. Despite that this file is owned by sys-apps/hwids.
|
|
||||||
if has_version "sys-apps/hwids[udev]"; then
|
|
||||||
udevadm hwdb --update --root="${ROOT%/}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
udev_reload || FAIL=1
|
|
||||||
|
|
||||||
# Bug 468876
|
|
||||||
fcaps cap_dac_override,cap_sys_ptrace=ep usr/bin/systemd-detect-virt
|
|
||||||
|
|
||||||
# Bug 465468, make sure locales are respect, and ensure consistency
|
|
||||||
# between OpenRC & systemd
|
|
||||||
migrate_locale
|
|
||||||
|
|
||||||
# Migrate 80-net-name-slot.rules -> 80-net-setup-link.rules
|
|
||||||
migrate_net_name_slot
|
|
||||||
|
|
||||||
if [[ ${FAIL} ]]; then
|
|
||||||
eerror "One of the postinst commands failed. Please check the postinst output"
|
|
||||||
eerror "for errors. You may need to clean up your system and/or try installing"
|
|
||||||
eerror "systemd again."
|
|
||||||
eerror
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ ! -L "${ROOT}"/etc/mtab ]]; then
|
|
||||||
ewarn "Upstream mandates the /etc/mtab file should be a symlink to /proc/mounts."
|
|
||||||
ewarn "Not having it is not supported by upstream and will cause tools like 'df'"
|
|
||||||
ewarn "and 'mount' to not work properly. Please run:"
|
|
||||||
ewarn " # ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'"
|
|
||||||
ewarn
|
|
||||||
fi
|
|
||||||
|
|
||||||
if ! has_version sys-apps/systemd-ui; then
|
|
||||||
elog "To get additional features, a number of optional runtime dependencies may"
|
|
||||||
elog "be installed:"
|
|
||||||
elog "- sys-apps/systemd-ui: for GTK+ systemadm UI and gnome-ask-password-agent"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_prerm() {
|
|
||||||
# If removing systemd completely, remove the catalog database.
|
|
||||||
if [[ ! ${REPLACED_BY_VERSION} ]]; then
|
|
||||||
rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
|
|
||||||
fi
|
|
||||||
}
|
|
Loading…
x
Reference in New Issue
Block a user