rpm/systemd
SHA256
1
0
Fork 0
forked from pool/systemd
Code Pull Requests Activity

.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=704
This commit is contained in:
Dr. Werner Fink 2014-07-04 10:28:58 +00:00 committed by Git OBS Bridge
parent 4c779b801f
commit 2d4a621271
13 changed files with 4806 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
0001-architecture-Add-tilegx.patch Normal file
View File

@ -0,0 +1,56 @@
From 46eea341c36f0caf0bdd5b2274a1ef7cb4e83e97 Mon Sep 17 00:00:00 2001
From: Henrik Grindal Bakken <hgb@ifi.uio.no>
Date: Thu, 27 Feb 2014 21:19:13 +0100
Subject: [PATCH] architecture: Add tilegx
Add Tilera's TILE-GX processor family support.
---
src/shared/architecture.c | 3 +++
src/shared/architecture.h | 3 +++
2 files changed, 6 insertions(+)
diff --git src/shared/architecture.c src/shared/architecture.c
index ceba492..fcdb3d5 100644
--- src/shared/architecture.c
+++ src/shared/architecture.c
@@ -112,6 +112,8 @@ Architecture uname_architecture(void) {
{ "sh", ARCHITECTURE_SH },
#elif defined(__m68k__)
{ "m68k", ARCHITECTURE_M68K },
+#elif defined(__tilegx__)
+ { "tilegx", ARCHITECTURE_TILEGX },
#else
#error "Please register your architecture here!"
#endif
@@ -158,6 +160,7 @@ static const char *const architecture_table[_ARCHITECTURE_MAX] = {
[ARCHITECTURE_SH] = "sh",
[ARCHITECTURE_SH64] = "sh64",
[ARCHITECTURE_M68K] = "m68k",
+ [ARCHITECTURE_TILEGX] = "tilegx",
};
DEFINE_STRING_TABLE_LOOKUP(architecture, Architecture);
diff --git src/shared/architecture.h src/shared/architecture.h
index 3183645..e589a91 100644
--- src/shared/architecture.h
+++ src/shared/architecture.h
@@ -47,6 +47,7 @@ typedef enum Architecture {
ARCHITECTURE_SH,
ARCHITECTURE_SH64,
ARCHITECTURE_M68K,
+ ARCHITECTURE_TILEGX,
_ARCHITECTURE_MAX,
_ARCHITECTURE_INVALID = -1
} Architecture;
@@ -107,6 +108,8 @@ Architecture uname_architecture(void);
# define native_architecture() ARCHITECTURE_SH
#elif defined(__m68k__)
# define native_architecture() ARCHITECTURE_M68K
+#elif defined(__tilegx__)
+# define native_architecture() ARCHITECTURE_TILEGX
#else
#error "Please register your architecture here!"
#endif
--
1.7.9.2

39
0001-udev-net_setup_link-add-a-bit-more-logging.patch Normal file
View File

@ -0,0 +1,39 @@
From 866ee3682213789f85b877700457fdca05695a0e Mon Sep 17 00:00:00 2001
From: Tom Gundersen <teg@jklm.no>
Date: Thu, 3 Jul 2014 09:57:27 +0200
Subject: [PATCH] udev: net_setup_link - add a bit more logging
---
src/udev/net/link-config.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git src/udev/net/link-config.c src/udev/net/link-config.c
index 7a9d01b..b8650a6 100644
--- src/udev/net/link-config.c
+++ src/udev/net/link-config.c
@@ -92,14 +92,20 @@ static int link_config_ctx_connect(link_config_ctx *ctx) {
if (ctx->ethtool_fd == -1) {
r = ethtool_connect(&ctx->ethtool_fd);
- if (r < 0)
+ if (r < 0) {
+ log_warning("link_config: could not connect to ethtool: %s",
+ strerror(-r));
return r;
+ }
}
if (!ctx->rtnl) {
r = sd_rtnl_open(&ctx->rtnl, 0);
- if (r < 0)
+ if (r < 0) {
+ log_warning("link_config: could not connect to rtnl: %s",
+ strerror(-r));
return r;
+ }
}
return 0;
--
1.7.9.2

55
0002-architecture-Add-cris.patch Normal file
View File

@ -0,0 +1,55 @@
From 86bafac9540ba9e111ccba2fdf4161fe3a67cd3b Mon Sep 17 00:00:00 2001
From: Umut Tezduyar Lindskog <umut.tezduyar@axis.com>
Date: Tue, 4 Mar 2014 13:58:35 +0100
Subject: [PATCH] architecture: Add cris
---
src/shared/architecture.c | 3 +++
src/shared/architecture.h | 3 +++
2 files changed, 6 insertions(+)
diff --git src/shared/architecture.c src/shared/architecture.c
index fcdb3d5..9e0c3ef 100644
--- src/shared/architecture.c
+++ src/shared/architecture.c
@@ -114,6 +114,8 @@ Architecture uname_architecture(void) {
{ "m68k", ARCHITECTURE_M68K },
#elif defined(__tilegx__)
{ "tilegx", ARCHITECTURE_TILEGX },
+#elif defined(__cris__)
+ { "cris", ARCHITECTURE_CRIS },
#else
#error "Please register your architecture here!"
#endif
@@ -161,6 +163,7 @@ static const char *const architecture_table[_ARCHITECTURE_MAX] = {
[ARCHITECTURE_SH64] = "sh64",
[ARCHITECTURE_M68K] = "m68k",
[ARCHITECTURE_TILEGX] = "tilegx",
+ [ARCHITECTURE_CRIS] = "cris",
};
DEFINE_STRING_TABLE_LOOKUP(architecture, Architecture);
diff --git src/shared/architecture.h src/shared/architecture.h
index e589a91..20e848b 100644
--- src/shared/architecture.h
+++ src/shared/architecture.h
@@ -48,6 +48,7 @@ typedef enum Architecture {
ARCHITECTURE_SH64,
ARCHITECTURE_M68K,
ARCHITECTURE_TILEGX,
+ ARCHITECTURE_CRIS,
_ARCHITECTURE_MAX,
_ARCHITECTURE_INVALID = -1
} Architecture;
@@ -110,6 +111,8 @@ Architecture uname_architecture(void);
# define native_architecture() ARCHITECTURE_M68K
#elif defined(__tilegx__)
# define native_architecture() ARCHITECTURE_TILEGX
+#elif defined(__cris__)
+# define native_architecture() ARCHITECTURE_CRIS
#else
#error "Please register your architecture here!"
#endif
--
1.7.9.2

28
0002-namespace-fix-uninitialized-memory-access.patch Normal file
View File

@ -0,0 +1,28 @@
Based on 002b226843e77630128da580225f9c3ef8474db2 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 3 Jul 2014 16:27:53 +0200
Subject: [PATCH] namespace: fix uninitialized memory access
---
src/core/namespace.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- src/core/namespace.c
+++ src/core/namespace.c 2014-07-04 00:00:00.000000000 +0000
@@ -68,6 +68,7 @@ static int append_mounts(BindMount **p,
STRV_FOREACH(i, strv) {
(*p)->ignore = false;
+ (*p)->done = false;
if ((mode == INACCESSIBLE || mode == READONLY) && (*i)[0] == '-') {
(*p)->ignore = true;
@@ -298,7 +299,7 @@ int setup_namespace(
private_dev;
if (n > 0) {
- m = mounts = (BindMount *) alloca(n * sizeof(BindMount));
+ m = mounts = (BindMount *) alloca0(n * sizeof(BindMount));
r = append_mounts(&m, read_write_dirs, READWRITE);
if (r < 0)
return r;

24
0003-arch-add-crisv32-to-uname-check.patch Normal file
View File

@ -0,0 +1,24 @@
From 9b3a0ba3e9e28382a1072bf0e2c07a3661432743 Mon Sep 17 00:00:00 2001
From: Umut Tezduyar Lindskog <umut.tezduyar@axis.com>
Date: Thu, 3 Jul 2014 09:54:45 +0200
Subject: [PATCH] arch: add crisv32 to uname check
---
src/shared/architecture.c | 1 +
1 file changed, 1 insertion(+)
diff --git src/shared/architecture.c src/shared/architecture.c
index 9e0c3ef..7dd049a 100644
--- src/shared/architecture.c
+++ src/shared/architecture.c
@@ -116,6 +116,7 @@ Architecture uname_architecture(void) {
{ "tilegx", ARCHITECTURE_TILEGX },
#elif defined(__cris__)
{ "cris", ARCHITECTURE_CRIS },
+ { "crisv32", ARCHITECTURE_CRIS },
#else
#error "Please register your architecture here!"
#endif
--
1.7.9.2

34
0003-namespace-make-sure-tmp-var-tmp-and-dev-are-writable.patch Normal file
View File

@ -0,0 +1,34 @@
Based on 664064d60c36e1f62c7e9177e4c7498035467e07 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 3 Jul 2014 16:27:57 +0200
Subject: [PATCH] namespace: make sure /tmp, /var/tmp and /dev are writable in
namespaces we set up
---
src/core/namespace.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
--- src/core/namespace.c
+++ src/core/namespace.c 2014-07-04 09:55:21.582234949 +0000
@@ -263,14 +263,17 @@ static int make_read_only(BindMount *m)
assert(m);
- if (m->mode != INACCESSIBLE && m->mode != READONLY)
- return 0;
+ if (IN_SET(m->mode, INACCESSIBLE, READONLY))
+ r = mount(NULL, m->path, NULL, MS_BIND|MS_REMOUNT|MS_RDONLY|MS_REC, NULL);
+ else if (IN_SET(m->mode, READWRITE, PRIVATE_TMP, PRIVATE_VAR_TMP, PRIVATE_DEV))
+ r = mount(NULL, m->path, NULL, MS_BIND|MS_REMOUNT|MS_REC, NULL);
+ else
+ r = 0;
- r = mount(NULL, m->path, NULL, MS_BIND|MS_REMOUNT|MS_RDONLY|MS_REC, NULL);
if (r < 0 && !(m->ignore && errno == ENOENT))
return -errno;
- return 0;
+ return r;
}
int setup_namespace(

27
0004-architecture-remove-cris-from-uname-list.patch Normal file
View File

@ -0,0 +1,27 @@
From bc4bc52bc3de56405045b0437e145a7067fb085d Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 3 Jul 2014 22:52:44 +0200
Subject: [PATCH] architecture: remove "cris" from uname list
the only correct name appears to be "crisv32"...
http://lists.freedesktop.org/archives/systemd-devel/2014-July/020899.html
---
src/shared/architecture.c | 1 -
1 file changed, 1 deletion(-)
diff --git src/shared/architecture.c src/shared/architecture.c
index 7dd049a..6cdca4e 100644
--- src/shared/architecture.c
+++ src/shared/architecture.c
@@ -115,7 +115,6 @@ Architecture uname_architecture(void) {
#elif defined(__tilegx__)
{ "tilegx", ARCHITECTURE_TILEGX },
#elif defined(__cris__)
- { "cris", ARCHITECTURE_CRIS },
{ "crisv32", ARCHITECTURE_CRIS },
#else
#error "Please register your architecture here!"
--
1.7.9.2

4392
0006-hwdb-update.patch Normal file
View File

File diff suppressed because it is too large Load Diff

49
0007-hwdb-Update-database-of-Bluetooth-company-identifier.patch Normal file
View File

@ -0,0 +1,49 @@
From 063e36db8aed7b54100b33089deb6d2e86d516b9 Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Thu, 3 Jul 2014 16:13:48 +0200
Subject: [PATCH] hwdb: Update database of Bluetooth company identifiers
---
hwdb/20-bluetooth-vendor-product.hwdb | 26 +++++++++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
diff --git hwdb/20-bluetooth-vendor-product.hwdb hwdb/20-bluetooth-vendor-product.hwdb
index 377748a..9f3136a 100644
--- hwdb/20-bluetooth-vendor-product.hwdb
+++ hwdb/20-bluetooth-vendor-product.hwdb
@@ -1045,7 +1045,31 @@ bluetooth:v0159*
ID_VENDOR_FROM_DATABASE=ChefSteps, Inc.
bluetooth:v015A*
- ID_VENDOR_FROM_DATABASE=micus AG
+ ID_VENDOR_FROM_DATABASE=micas AG
bluetooth:v015B*
ID_VENDOR_FROM_DATABASE=Biomedical Research Ltd.
+
+bluetooth:v015C*
+ ID_VENDOR_FROM_DATABASE=Pitius Tec S.L.
+
+bluetooth:v015D*
+ ID_VENDOR_FROM_DATABASE=Estimote, Inc.
+
+bluetooth:v015E*
+ ID_VENDOR_FROM_DATABASE=Unikey Technologies, Inc.
+
+bluetooth:v015F*
+ ID_VENDOR_FROM_DATABASE=Timer Cap Co.
+
+bluetooth:v0160*
+ ID_VENDOR_FROM_DATABASE=AwoX
+
+bluetooth:v0161*
+ ID_VENDOR_FROM_DATABASE=yikes
+
+bluetooth:v0162*
+ ID_VENDOR_FROM_DATABASE=MADSGlobal NZ Ltd.
+
+bluetooth:v0163*
+ ID_VENDOR_FROM_DATABASE=PCH International
--
1.7.9.2

24
systemd-mini.changes
View File

@ -1,3 +1,27 @@
-------------------------------------------------------------------
Fri Jul 4 10:01:07 UTC 2014 - werner@suse.de
- Port and add upstream patches
0001-udev-net_setup_link-add-a-bit-more-logging.patch
0003-namespace-make-sure-tmp-var-tmp-and-dev-are-writable.patch
0002-namespace-fix-uninitialized-memory-access.patch
-------------------------------------------------------------------
Fri Jul 4 09:43:12 UTC 2014 - werner@suse.de
- Add upstream patches
0001-architecture-Add-tilegx.patch
0002-architecture-Add-cris.patch
0003-arch-add-crisv32-to-uname-check.patch
0004-architecture-remove-cris-from-uname-list.patch
-------------------------------------------------------------------
Fri Jul 4 09:32:47 UTC 2014 - werner@suse.de
- Add upstream patches
0006-hwdb-update.patch
0007-hwdb-Update-database-of-Bluetooth-company-identifier.patch
-------------------------------------------------------------------
Thu Jul 3 12:48:27 UTC 2014 - werner@suse.de

27
systemd-mini.spec
View File

@ -633,6 +633,24 @@ Patch309: 0003-localed-consider-an-unset-model-as-a-wildcard.patch
Patch310: 0004-sd-bus-when-an-event-loop-terminates-explicitly-clos.patch
# PATCH-FIX-UPSTREAM added at 2014/07/03
Patch311: 0005-bus-close-a-bus-that-failed-to-connect.patch
# PATCH-FIX-UPSTREAM added at 2014/07/04
Patch312: 0006-hwdb-update.patch
# PATCH-FIX-UPSTREAM added at 2014/07/04
Patch313: 0007-hwdb-Update-database-of-Bluetooth-company-identifier.patch
# PATCH-FIX-UPSTREAM added at 2014/07/04
Patch314: 0001-architecture-Add-tilegx.patch
# PATCH-FIX-UPSTREAM added at 2014/07/04
Patch315: 0002-architecture-Add-cris.patch
# PATCH-FIX-UPSTREAM added at 2014/07/04
Patch316: 0003-arch-add-crisv32-to-uname-check.patch
# PATCH-FIX-UPSTREAM added at 2014/07/04
Patch317: 0004-architecture-remove-cris-from-uname-list.patch
# PATCH-FIX-UPSTREAM added at 2014/07/04
Patch318: 0001-udev-net_setup_link-add-a-bit-more-logging.patch
# PATCH-FIX-UPSTREAM added at 2014/07/04
Patch319: 0003-namespace-make-sure-tmp-var-tmp-and-dev-are-writable.patch
# PATCH-FIX-UPSTREAM added at 2014/07/04
Patch320: 0002-namespace-fix-uninitialized-memory-access.patch
# UDEV PATCHES
# ============
@ -1203,6 +1221,15 @@ cp %{SOURCE7} m4/
%patch309 -p0
%patch310 -p0
%patch311 -p0
%patch312 -p0
%patch313 -p0
%patch314 -p0
%patch315 -p0
%patch316 -p0
%patch317 -p0
%patch318 -p0
%patch319 -p0
%patch320 -p0
# udev patches
%patch1001 -p1

24
systemd.changes
View File

@ -1,3 +1,27 @@
-------------------------------------------------------------------
Fri Jul 4 10:01:07 UTC 2014 - werner@suse.de
- Port and add upstream patches
0001-udev-net_setup_link-add-a-bit-more-logging.patch
0003-namespace-make-sure-tmp-var-tmp-and-dev-are-writable.patch
0002-namespace-fix-uninitialized-memory-access.patch
-------------------------------------------------------------------
Fri Jul 4 09:43:12 UTC 2014 - werner@suse.de
- Add upstream patches
0001-architecture-Add-tilegx.patch
0002-architecture-Add-cris.patch
0003-arch-add-crisv32-to-uname-check.patch
0004-architecture-remove-cris-from-uname-list.patch
-------------------------------------------------------------------
Fri Jul 4 09:32:47 UTC 2014 - werner@suse.de
- Add upstream patches
0006-hwdb-update.patch
0007-hwdb-Update-database-of-Bluetooth-company-identifier.patch
-------------------------------------------------------------------
Thu Jul 3 12:48:27 UTC 2014 - werner@suse.de

27
systemd.spec
View File

@ -628,6 +628,24 @@ Patch309: 0003-localed-consider-an-unset-model-as-a-wildcard.patch
Patch310: 0004-sd-bus-when-an-event-loop-terminates-explicitly-clos.patch
# PATCH-FIX-UPSTREAM added at 2014/07/03
Patch311: 0005-bus-close-a-bus-that-failed-to-connect.patch
# PATCH-FIX-UPSTREAM added at 2014/07/04
Patch312: 0006-hwdb-update.patch
# PATCH-FIX-UPSTREAM added at 2014/07/04
Patch313: 0007-hwdb-Update-database-of-Bluetooth-company-identifier.patch
# PATCH-FIX-UPSTREAM added at 2014/07/04
Patch314: 0001-architecture-Add-tilegx.patch
# PATCH-FIX-UPSTREAM added at 2014/07/04
Patch315: 0002-architecture-Add-cris.patch
# PATCH-FIX-UPSTREAM added at 2014/07/04
Patch316: 0003-arch-add-crisv32-to-uname-check.patch
# PATCH-FIX-UPSTREAM added at 2014/07/04
Patch317: 0004-architecture-remove-cris-from-uname-list.patch
# PATCH-FIX-UPSTREAM added at 2014/07/04
Patch318: 0001-udev-net_setup_link-add-a-bit-more-logging.patch
# PATCH-FIX-UPSTREAM added at 2014/07/04
Patch319: 0003-namespace-make-sure-tmp-var-tmp-and-dev-are-writable.patch
# PATCH-FIX-UPSTREAM added at 2014/07/04
Patch320: 0002-namespace-fix-uninitialized-memory-access.patch
# UDEV PATCHES
# ============
@ -1198,6 +1216,15 @@ cp %{SOURCE7} m4/
%patch309 -p0
%patch310 -p0
%patch311 -p0
%patch312 -p0
%patch313 -p0
%patch314 -p0
%patch315 -p0
%patch316 -p0
%patch317 -p0
%patch318 -p0
%patch319 -p0
%patch320 -p0
# udev patches
%patch1001 -p1