Accepting request 248040 from Base:System
- Add upstream patches 0001-initrd-parse-etc.service-ignore-return-code-of-daemo.patch 0008-hwdb-Update-database-of-Bluetooth-company-identifier.patch - Add upstream patches 0001-initrd-parse-etc.service-ignore-return-code-of-daemo.patch 0008-hwdb-Update-database-of-Bluetooth-company-identifier.patch OBS-URL: https://build.opensuse.org/request/show/248040 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=205
This commit is contained in:
Stephan Kulow
Git OBS Bridge
commit
efdd90d35a
@ -0,0 +1,29 @@
|
|||||||
|
From f3b8fbb1da6519e14985ea444f8304673d20ad3f Mon Sep 17 00:00:00 2001
|
||||||
|
From: Harald Hoyer <harald@redhat.com>
|
||||||
|
Date: Wed, 3 Sep 2014 13:28:31 +0200
|
||||||
|
Subject: [PATCH] initrd-parse-etc.service: ignore return code of
|
||||||
|
daemon-reload
|
||||||
|
|
||||||
|
It seems the return code of systemctl daemon-reload can be !=0 in some
|
||||||
|
circumstances, which causes a failure of the unit and breaks booting in
|
||||||
|
the initrd.
|
||||||
|
---
|
||||||
|
units/initrd-parse-etc.service.in | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git units/initrd-parse-etc.service.in units/initrd-parse-etc.service.in
|
||||||
|
index c0b2543..42c059b 100644
|
||||||
|
--- units/initrd-parse-etc.service.in
|
||||||
|
+++ units/initrd-parse-etc.service.in
|
||||||
|
@@ -16,7 +16,7 @@ ConditionPathExists=/etc/initrd-release
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=oneshot
|
||||||
|
-ExecStartPre=@rootbindir@/systemctl daemon-reload
|
||||||
|
+ExecStartPre=-@rootbindir@/systemctl daemon-reload
|
||||||
|
# we have to retrigger initrd-fs.target after daemon-reload
|
||||||
|
ExecStart=-@rootbindir@/systemctl --no-block start initrd-fs.target
|
||||||
|
ExecStart=@rootbindir@/systemctl --no-block start initrd-cleanup.service
|
||||||
|
--
|
||||||
|
1.7.9.2
|
||||||
|
|
||||||
104
0008-hwdb-Update-database-of-Bluetooth-company-identifier.patch
Normal file
104
0008-hwdb-Update-database-of-Bluetooth-company-identifier.patch
Normal file
@ -0,0 +1,104 @@
|
|||||||
|
From de68938a2cb3ab535ebd9198723a651753c1a1df Mon Sep 17 00:00:00 2001
|
||||||
|
From: Marcel Holtmann <marcel@holtmann.org>
|
||||||
|
Date: Mon, 8 Sep 2014 05:06:18 +0200
|
||||||
|
Subject: [PATCH] hwdb: Update database of Bluetooth company identifiers
|
||||||
|
|
||||||
|
---
|
||||||
|
hwdb/20-bluetooth-vendor-product.hwdb | 77 ++++++++++++++++++++++++++++++++-
|
||||||
|
1 file changed, 76 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git hwdb/20-bluetooth-vendor-product.hwdb hwdb/20-bluetooth-vendor-product.hwdb
|
||||||
|
index 9f3136a..14aee74 100644
|
||||||
|
--- hwdb/20-bluetooth-vendor-product.hwdb
|
||||||
|
+++ hwdb/20-bluetooth-vendor-product.hwdb
|
||||||
|
@@ -184,7 +184,7 @@ bluetooth:v003B*
|
||||||
|
ID_VENDOR_FROM_DATABASE=Gennum Corporation
|
||||||
|
|
||||||
|
bluetooth:v003C*
|
||||||
|
- ID_VENDOR_FROM_DATABASE=Research In Motion
|
||||||
|
+ ID_VENDOR_FROM_DATABASE=BlackBerry Limited (formerly Research In Motion)
|
||||||
|
|
||||||
|
bluetooth:v003D*
|
||||||
|
ID_VENDOR_FROM_DATABASE=IPextreme, Inc.
|
||||||
|
@@ -1073,3 +1073,78 @@ bluetooth:v0162*
|
||||||
|
|
||||||
|
bluetooth:v0163*
|
||||||
|
ID_VENDOR_FROM_DATABASE=PCH International
|
||||||
|
+
|
||||||
|
+bluetooth:v0164*
|
||||||
|
+ ID_VENDOR_FROM_DATABASE=Qingdao Yeelink Information Technology Co., Ltd.
|
||||||
|
+
|
||||||
|
+bluetooth:v0165*
|
||||||
|
+ ID_VENDOR_FROM_DATABASE=Milwaukee Tool (formerly Milwaukee Electric Tools)
|
||||||
|
+
|
||||||
|
+bluetooth:v0166*
|
||||||
|
+ ID_VENDOR_FROM_DATABASE=MISHIK Pte Ltd
|
||||||
|
+
|
||||||
|
+bluetooth:v0167*
|
||||||
|
+ ID_VENDOR_FROM_DATABASE=Bayer HealthCare
|
||||||
|
+
|
||||||
|
+bluetooth:v0168*
|
||||||
|
+ ID_VENDOR_FROM_DATABASE=Spicebox LLC
|
||||||
|
+
|
||||||
|
+bluetooth:v0169*
|
||||||
|
+ ID_VENDOR_FROM_DATABASE=emberlight
|
||||||
|
+
|
||||||
|
+bluetooth:v016A*
|
||||||
|
+ ID_VENDOR_FROM_DATABASE=Cooper-Atkins Corporation
|
||||||
|
+
|
||||||
|
+bluetooth:v016B*
|
||||||
|
+ ID_VENDOR_FROM_DATABASE=Qblinks
|
||||||
|
+
|
||||||
|
+bluetooth:v016C*
|
||||||
|
+ ID_VENDOR_FROM_DATABASE=MYSPHERA
|
||||||
|
+
|
||||||
|
+bluetooth:v016D*
|
||||||
|
+ ID_VENDOR_FROM_DATABASE=LifeScan Inc
|
||||||
|
+
|
||||||
|
+bluetooth:v016E*
|
||||||
|
+ ID_VENDOR_FROM_DATABASE=Volantic AB
|
||||||
|
+
|
||||||
|
+bluetooth:v016F*
|
||||||
|
+ ID_VENDOR_FROM_DATABASE=Podo Labs, Inc
|
||||||
|
+
|
||||||
|
+bluetooth:v0170*
|
||||||
|
+ ID_VENDOR_FROM_DATABASE=Roche Diabetes Care AG
|
||||||
|
+
|
||||||
|
+bluetooth:v0171*
|
||||||
|
+ ID_VENDOR_FROM_DATABASE=Amazon Fulfillment Service
|
||||||
|
+
|
||||||
|
+bluetooth:v0172*
|
||||||
|
+ ID_VENDOR_FROM_DATABASE=Connovate Technology Private Limited
|
||||||
|
+
|
||||||
|
+bluetooth:v0173*
|
||||||
|
+ ID_VENDOR_FROM_DATABASE=Kocomojo, LLC
|
||||||
|
+
|
||||||
|
+bluetooth:v0174*
|
||||||
|
+ ID_VENDOR_FROM_DATABASE=Everykey LLC
|
||||||
|
+
|
||||||
|
+bluetooth:v0175*
|
||||||
|
+ ID_VENDOR_FROM_DATABASE=Dynamic Controls
|
||||||
|
+
|
||||||
|
+bluetooth:v0176*
|
||||||
|
+ ID_VENDOR_FROM_DATABASE=SentriLock
|
||||||
|
+
|
||||||
|
+bluetooth:v0177*
|
||||||
|
+ ID_VENDOR_FROM_DATABASE=I-SYST inc.
|
||||||
|
+
|
||||||
|
+bluetooth:v0178*
|
||||||
|
+ ID_VENDOR_FROM_DATABASE=CASIO COMPUTER CO., LTD.
|
||||||
|
+
|
||||||
|
+bluetooth:v0179*
|
||||||
|
+ ID_VENDOR_FROM_DATABASE=LAPIS Semiconductor Co., Ltd.
|
||||||
|
+
|
||||||
|
+bluetooth:v017A*
|
||||||
|
+ ID_VENDOR_FROM_DATABASE=Telemonitor, Inc.
|
||||||
|
+
|
||||||
|
+bluetooth:v017B*
|
||||||
|
+ ID_VENDOR_FROM_DATABASE=taskit GmbH
|
||||||
|
+
|
||||||
|
+bluetooth:v017C*
|
||||||
|
+ ID_VENDOR_FROM_DATABASE=Daimler AG
|
||||||
|
--
|
||||||
|
1.7.9.2
|
||||||
|
|
||||||
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Sep 8 14:48:37 UTC 2014 - werner@suse.de
|
||||||
|
|
||||||
|
- Add upstream patches
|
||||||
|
0001-initrd-parse-etc.service-ignore-return-code-of-daemo.patch
|
||||||
|
0008-hwdb-Update-database-of-Bluetooth-company-identifier.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Sep 4 13:10:28 UTC 2014 - werner@suse.de
|
Thu Sep 4 13:10:28 UTC 2014 - werner@suse.de
|
||||||
|
|
||||||
|
|||||||
@ -828,6 +828,10 @@ Patch398: 0004-config-parser-fix-mem-leak.patch
|
|||||||
Patch399: 0005-login-fix-mem-leak.patch
|
Patch399: 0005-login-fix-mem-leak.patch
|
||||||
# PATCH-FIX-UPSTREAM added at 2014/09/02
|
# PATCH-FIX-UPSTREAM added at 2014/09/02
|
||||||
Patch400: 0001-login-simplify-controller-handling.patch
|
Patch400: 0001-login-simplify-controller-handling.patch
|
||||||
|
# PATCH-FIX-UPSTREAM added at 2014/09/05
|
||||||
|
Patch401: 0001-initrd-parse-etc.service-ignore-return-code-of-daemo.patch
|
||||||
|
# PATCH-FIX-UPSTREAM added at 2014/09/08
|
||||||
|
Patch402: 0008-hwdb-Update-database-of-Bluetooth-company-identifier.patch
|
||||||
|
|
||||||
# UDEV PATCHES
|
# UDEV PATCHES
|
||||||
# ============
|
# ============
|
||||||
@ -1528,6 +1532,8 @@ cp %{SOURCE7} m4/
|
|||||||
%patch398 -p0
|
%patch398 -p0
|
||||||
%patch399 -p0
|
%patch399 -p0
|
||||||
%patch400 -p0
|
%patch400 -p0
|
||||||
|
%patch401 -p0
|
||||||
|
%patch402 -p0
|
||||||
|
|
||||||
# udev patches
|
# udev patches
|
||||||
%patch1001 -p1
|
%patch1001 -p1
|
||||||
|
|||||||
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Sep 8 14:48:37 UTC 2014 - werner@suse.de
|
||||||
|
|
||||||
|
- Add upstream patches
|
||||||
|
0001-initrd-parse-etc.service-ignore-return-code-of-daemo.patch
|
||||||
|
0008-hwdb-Update-database-of-Bluetooth-company-identifier.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Sep 4 13:10:28 UTC 2014 - werner@suse.de
|
Thu Sep 4 13:10:28 UTC 2014 - werner@suse.de
|
||||||
|
|
||||||
|
|||||||
@ -823,6 +823,10 @@ Patch398: 0004-config-parser-fix-mem-leak.patch
|
|||||||
Patch399: 0005-login-fix-mem-leak.patch
|
Patch399: 0005-login-fix-mem-leak.patch
|
||||||
# PATCH-FIX-UPSTREAM added at 2014/09/02
|
# PATCH-FIX-UPSTREAM added at 2014/09/02
|
||||||
Patch400: 0001-login-simplify-controller-handling.patch
|
Patch400: 0001-login-simplify-controller-handling.patch
|
||||||
|
# PATCH-FIX-UPSTREAM added at 2014/09/05
|
||||||
|
Patch401: 0001-initrd-parse-etc.service-ignore-return-code-of-daemo.patch
|
||||||
|
# PATCH-FIX-UPSTREAM added at 2014/09/08
|
||||||
|
Patch402: 0008-hwdb-Update-database-of-Bluetooth-company-identifier.patch
|
||||||
|
|
||||||
# UDEV PATCHES
|
# UDEV PATCHES
|
||||||
# ============
|
# ============
|
||||||
@ -1523,6 +1527,8 @@ cp %{SOURCE7} m4/
|
|||||||
%patch398 -p0
|
%patch398 -p0
|
||||||
%patch399 -p0
|
%patch399 -p0
|
||||||
%patch400 -p0
|
%patch400 -p0
|
||||||
|
%patch401 -p0
|
||||||
|
%patch402 -p0
|
||||||
|
|
||||||
# udev patches
|
# udev patches
|
||||||
%patch1001 -p1
|
%patch1001 -p1
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user