From ce0774c47b38a3bab5bc761025fb613feacda39a2b06982bacf25b6d690b0065 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 2 Jul 2013 10:29:43 +0000 Subject: [PATCH] Accepting request 181612 from Base:System - systemd-mini doesn't need dbus-1, only dbus-1-devel (forwarded request 181585 from coolo) OBS-URL: https://build.opensuse.org/request/show/181612 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=149 --- 1008-add-msft-compability-rules.patch | 29 +++++++++++++++++++++++++++ systemd-mini.changes | 11 ++++++++++ systemd-mini.spec | 6 +++++- systemd.changes | 11 ++++++++++ systemd.spec | 6 +++++- 5 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 1008-add-msft-compability-rules.patch diff --git a/1008-add-msft-compability-rules.patch b/1008-add-msft-compability-rules.patch new file mode 100644 index 00000000..41d6e698 --- /dev/null +++ b/1008-add-msft-compability-rules.patch @@ -0,0 +1,29 @@ +Index: systemd-204/Makefile.am +=================================================================== +--- systemd-204.orig/Makefile.am ++++ systemd-204/Makefile.am +@@ -2242,6 +2242,10 @@ dist_udevrules_DATA += \ + rules/80-hotplug-cpu-mem.rules + + # ------------------------------------------------------------------------------ ++dist_udevrules_DATA += \ ++ rules/61-msft.rules ++ ++# ------------------------------------------------------------------------------ + if ENABLE_GUDEV + if ENABLE_GTK_DOC + SUBDIRS += \ +Index: systemd-204/rules/61-msft.rules +=================================================================== +--- /dev/null ++++ systemd-204/rules/61-msft.rules +@@ -0,0 +1,9 @@ ++# MSFT compability rules ++ACTION!="add|change", GOTO="msft_end" ++ ++ENV{DEVTYPE}=="partition", IMPORT{parent}="SCSI_IDENT_*" ++KERNEL=="sd*[!0-9]|sr*", ENV{SCSI_IDENT_LUN_T10}!="?*", IMPORT{program}="/usr/bin/sg_inq -p di --export $tempnode" ++KERNEL=="sd*|sr*", ENV{DEVTYPE}=="disk", ENV{SCSI_IDENT_LUN_T10}=="?*", SYMLINK+="disk/by-id/scsi-1$env{SCSI_IDENT_LUN_T10}" ++KERNEL=="sd*", ENV{DEVTYPE}=="partition", ENV{SCSI_IDENT_LUN_T10}=="?*", SYMLINK+="disk/by-id/scsi-1$env{SCSI_IDENT_LUN_T10}-part%n" ++ ++LABEL="msft_end" diff --git a/systemd-mini.changes b/systemd-mini.changes index 93f18dd0..c3814085 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Jul 1 09:14:55 UTC 2013 - coolo@suse.com + +- systemd-mini doesn't need dbus-1, only dbus-1-devel + +------------------------------------------------------------------- +Wed Jun 26 09:31:14 UTC 2013 - rmilasan@suse.com + +- Re-add fixed udev MSFT compability rules (bnc#805059, bnc#826528). + add: 1008-add-msft-compability-rules.patch + ------------------------------------------------------------------- Wed Jun 26 08:51:29 UTC 2013 - rmilasan@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index 294894f7..2acc148c 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -35,8 +35,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: %{real} = %{version}-%{release} BuildRequires: audit-devel -BuildRequires: dbus-1 %if ! 0%{?bootstrap} +BuildRequires: dbus-1 BuildRequires: docbook-xsl-stylesheets %endif BuildRequires: fdupes @@ -80,6 +80,7 @@ BuildRequires: pkgconfig(libselinux) >= 2.1.9 BuildRequires: pkgconfig(libsepol) BuildRequires: pkgconfig(usbutils) >= 0.82 %if 0%{?bootstrap} +#!BuildIgnore: dbus-1 Requires: this-is-only-for-build-envs Conflicts: systemd Conflicts: kiwi @@ -201,6 +202,8 @@ Patch1005: 1005-create-default-links-for-primary-cd_dvd-drive.patch Patch1006: 1006-udev-always-rename-network.patch # PATCH-FIX-OPENSUSE 1007-physical-hotplug-cpu-and-memory.patch Patch1007: 1007-physical-hotplug-cpu-and-memory.patch +# PATCH-FIX-OPENSUSE 1008-add-msft-compability-rules.patch +Patch1008: 1008-add-msft-compability-rules.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -435,6 +438,7 @@ cp %{SOURCE7} m4/ # don't apply when bootstrapping to not modify Makefile.am %if ! 0%{?bootstrap} %patch1007 -p1 +%patch1008 -p1 %endif %build diff --git a/systemd.changes b/systemd.changes index 93f18dd0..c3814085 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Jul 1 09:14:55 UTC 2013 - coolo@suse.com + +- systemd-mini doesn't need dbus-1, only dbus-1-devel + +------------------------------------------------------------------- +Wed Jun 26 09:31:14 UTC 2013 - rmilasan@suse.com + +- Re-add fixed udev MSFT compability rules (bnc#805059, bnc#826528). + add: 1008-add-msft-compability-rules.patch + ------------------------------------------------------------------- Wed Jun 26 08:51:29 UTC 2013 - rmilasan@suse.com diff --git a/systemd.spec b/systemd.spec index d5edcf32..ac3929f1 100644 --- a/systemd.spec +++ b/systemd.spec @@ -30,8 +30,8 @@ License: LGPL-2.1+ Group: System/Base BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: audit-devel -BuildRequires: dbus-1 %if ! 0%{?bootstrap} +BuildRequires: dbus-1 BuildRequires: docbook-xsl-stylesheets %endif BuildRequires: fdupes @@ -75,6 +75,7 @@ BuildRequires: pkgconfig(libselinux) >= 2.1.9 BuildRequires: pkgconfig(libsepol) BuildRequires: pkgconfig(usbutils) >= 0.82 %if 0%{?bootstrap} +#!BuildIgnore: dbus-1 Requires: this-is-only-for-build-envs Conflicts: systemd Conflicts: kiwi @@ -196,6 +197,8 @@ Patch1005: 1005-create-default-links-for-primary-cd_dvd-drive.patch Patch1006: 1006-udev-always-rename-network.patch # PATCH-FIX-OPENSUSE 1007-physical-hotplug-cpu-and-memory.patch Patch1007: 1007-physical-hotplug-cpu-and-memory.patch +# PATCH-FIX-OPENSUSE 1008-add-msft-compability-rules.patch +Patch1008: 1008-add-msft-compability-rules.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -430,6 +433,7 @@ cp %{SOURCE7} m4/ # don't apply when bootstrapping to not modify Makefile.am %if ! 0%{?bootstrap} %patch1007 -p1 +%patch1008 -p1 %endif %build