From 645a2ecffab015123eb09f493ac1a74ddf81e290201809eea07c0fd514213d14 Mon Sep 17 00:00:00 2001 From: Robert Milasan Date: Tue, 11 Jun 2013 11:22:32 +0000 Subject: [PATCH] Accepting request 178519 from home:rmilasan:branches:Base:System - Add udev MSFT compability rules (bnc#805059). add: 1007-add-msft-compability-rules.patch - Add sg3_utils requires, need it by 61-msft.rules (bnc#805059). - Clean-up spec file, put udev patches after systemd patches. - Rebase patches so they would apply nicely. - Add udev MSFT compability rules (bnc#805059). add: 1007-add-msft-compability-rules.patch - Add sg3_utils requires, need it by 61-msft.rules (bnc#805059). - Clean-up spec file, put udev patches after systemd patches. - Rebase patches so they would apply nicely. OBS-URL: https://build.opensuse.org/request/show/178519 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=391 --- ...port-alien-child-as-alive-when-it-s-.patch | 13 ++--- 1006-udev-always-rename-network.patch | 12 ++--- 1007-add-msft-compability-rules.patch | 50 ++++++++++++++++++ ...pport-for-SysV-scripts-for-the-early.patch | 22 ++++---- ...-boot-prefixed-initscript-bnc-746506.patch | 10 ++-- ...STEMCTL_OPTIONS-environment-variable.patch | 10 ++-- ...lock-value-in-etc-sysconfig-keyboard.patch | 52 +++++++++---------- ...vice-with-detected-pid-as-RemainAfte.patch | 10 ++-- ...ndle-boot-sysctl.conf-kernel_release.patch | 21 ++++---- systemd-mini.changes | 9 ++++ systemd-mini.spec | 23 ++++---- systemd.changes | 9 ++++ systemd.spec | 23 ++++---- 13 files changed, 165 insertions(+), 99 deletions(-) create mode 100644 1007-add-msft-compability-rules.patch diff --git a/0008-service-don-t-report-alien-child-as-alive-when-it-s-.patch b/0008-service-don-t-report-alien-child-as-alive-when-it-s-.patch index 90a17003..c99f2428 100644 --- a/0008-service-don-t-report-alien-child-as-alive-when-it-s-.patch +++ b/0008-service-don-t-report-alien-child-as-alive-when-it-s-.patch @@ -14,11 +14,11 @@ become empty but the service would still report as active (running). src/core/service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/core/service.c b/src/core/service.c -index e110a41..973bd03 100644 ---- a/src/core/service.c -+++ b/src/core/service.c -@@ -1865,7 +1865,7 @@ static int main_pid_good(Service *s) { +Index: systemd-204/src/core/service.c +=================================================================== +--- systemd-204.orig/src/core/service.c ++++ systemd-204/src/core/service.c +@@ -1933,7 +1933,7 @@ static int main_pid_good(Service *s) { /* If it's an alien child let's check if it is still * alive ... */ @@ -27,6 +27,3 @@ index e110a41..973bd03 100644 return kill(s->main_pid, 0) >= 0 || errno != ESRCH; /* .. otherwise assume we'll get a SIGCHLD for it, --- -1.8.1.4 - diff --git a/1006-udev-always-rename-network.patch b/1006-udev-always-rename-network.patch index d6d56edd..d1c61d05 100644 --- a/1006-udev-always-rename-network.patch +++ b/1006-udev-always-rename-network.patch @@ -8,11 +8,11 @@ udev: ensure that the network interfaces are renamed even if they exist src/udev/udev-event.c | 46 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 43 insertions(+), 3 deletions(-) -diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c -index 3db2cb7..3ee9039 100644 ---- a/src/udev/udev-event.c -+++ b/src/udev/udev-event.c -@@ -750,6 +750,7 @@ static int rename_netif(struct udev_event *event) +Index: systemd-204/src/udev/udev-event.c +=================================================================== +--- systemd-204.orig/src/udev/udev-event.c ++++ systemd-204/src/udev/udev-event.c +@@ -750,6 +750,7 @@ static int rename_netif(struct udev_even struct udev_device *dev = event->dev; int sk; struct ifreq ifr; @@ -20,7 +20,7 @@ index 3db2cb7..3ee9039 100644 int err; log_debug("changing net interface name from '%s' to '%s'\n", -@@ -766,12 +767,51 @@ static int rename_netif(struct udev_event *event) +@@ -766,12 +767,51 @@ static int rename_netif(struct udev_even strscpy(ifr.ifr_name, IFNAMSIZ, udev_device_get_sysname(dev)); strscpy(ifr.ifr_newname, IFNAMSIZ, event->name); err = ioctl(sk, SIOCSIFNAME, &ifr); diff --git a/1007-add-msft-compability-rules.patch b/1007-add-msft-compability-rules.patch new file mode 100644 index 00000000..289bc7eb --- /dev/null +++ b/1007-add-msft-compability-rules.patch @@ -0,0 +1,50 @@ +Index: systemd-204/Makefile.am +=================================================================== +--- systemd-204.orig/Makefile.am ++++ systemd-204/Makefile.am +@@ -2238,6 +2238,10 @@ dist_udevrules_DATA += \ + rules/73-seat-numlock.rules + + # ------------------------------------------------------------------------------ ++dist_udevrules_DATA += \ ++ rules/61-msft.rules ++ ++# ------------------------------------------------------------------------------ + if ENABLE_GUDEV + if ENABLE_GTK_DOC + SUBDIRS += \ +Index: systemd-204/Makefile.in +=================================================================== +--- systemd-204.orig/Makefile.in ++++ systemd-204/Makefile.in +@@ -2609,6 +2609,7 @@ am__dist_udevrules_DATA_DIST = rules/99- + rules/95-udev-late.rules rules/50-firmware.rules \ + rules/80-drivers.rules rules/60-cdrom_id.rules \ + rules/60-persistent-v4l.rules rules/61-accelerometer.rules \ ++ rules/61-msft.rules \ + src/udev/keymap/95-keymap.rules \ + src/udev/keymap/95-keyboard-force-release.rules \ + rules/75-probe_mtd.rules src/login/70-uaccess.rules \ +@@ -3341,7 +3342,7 @@ dist_udevrules_DATA = rules/99-systemd.r + rules/78-sound-card.rules rules/80-net-name-slot.rules \ + rules/95-udev-late.rules $(am__append_53) $(am__append_55) \ + rules/60-cdrom_id.rules rules/60-persistent-v4l.rules \ +- rules/61-accelerometer.rules $(am__append_71) \ ++ rules/61-accelerometer.rules rules/61-msft.rules $(am__append_71) \ + rules/75-probe_mtd.rules $(am__append_173) + nodist_udevrules_DATA = $(am__append_174) + dist_pkgsysconf_DATA = src/core/system.conf src/core/user.conf \ +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", ENV{ID_BUS}="scsi" ++KERNEL=="sd*|sr*", ENV{DEVTYPE}=="disk", ENV{SCSI_IDENT_LUN_T10}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-1$env{SCSI_IDENT_LUN_T10}" ++KERNEL=="sd*", ENV{DEVTYPE}=="partition", ENV{SCSI_IDENT_LUN_T10}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-1$env{SCSI_IDENT_LUN_T10}-part%n" ++ ++LABEL="msft_end" diff --git a/Revert-service-drop-support-for-SysV-scripts-for-the-early.patch b/Revert-service-drop-support-for-SysV-scripts-for-the-early.patch index eeb004a2..de856e1f 100644 --- a/Revert-service-drop-support-for-SysV-scripts-for-the-early.patch +++ b/Revert-service-drop-support-for-SysV-scripts-for-the-early.patch @@ -10,10 +10,10 @@ Conflicts: src/core/service.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 46 insertions(+), 5 deletions(-) -diff --git a/src/core/service.c b/src/core/service.c -index c13ff35..0b39ec6 100644 ---- a/src/core/service.c -+++ b/src/core/service.c +Index: systemd-204/src/core/service.c +=================================================================== +--- systemd-204.orig/src/core/service.c ++++ systemd-204/src/core/service.c @@ -51,7 +51,8 @@ typedef enum RunlevelType { @@ -55,7 +55,7 @@ index c13ff35..0b39ec6 100644 #endif static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = { -@@ -332,6 +345,9 @@ static char *sysv_translate_name(const char *name) { +@@ -332,6 +345,9 @@ static char *sysv_translate_name(const c if (endswith(name, ".sh")) /* Drop .sh suffix */ strcpy(stpcpy(r, name) - 3, ".service"); @@ -65,7 +65,7 @@ index c13ff35..0b39ec6 100644 else /* Normal init script name */ strcpy(stpcpy(r, name), ".service"); -@@ -934,6 +950,13 @@ static int service_load_sysv_path(Service *s, const char *path) { +@@ -934,6 +950,13 @@ static int service_load_sysv_path(Servic if ((r = sysv_exec_commands(s, supports_reload)) < 0) goto finish; @@ -79,7 +79,7 @@ index c13ff35..0b39ec6 100644 if (s->sysv_runlevels && !chars_intersect(RUNLEVELS_UP, s->sysv_runlevels)) { /* If there a runlevels configured for this service -@@ -1015,6 +1038,9 @@ static int service_load_sysv_name(Service *s, const char *name) { +@@ -1015,6 +1038,9 @@ static int service_load_sysv_name(Servic if (endswith(name, ".sh.service")) return -ENOENT; @@ -89,7 +89,7 @@ index c13ff35..0b39ec6 100644 STRV_FOREACH(p, UNIT(s)->manager->lookup_paths.sysvinit_path) { char *path; int r; -@@ -1035,6 +1061,18 @@ static int service_load_sysv_name(Service *s, const char *name) { +@@ -1035,6 +1061,18 @@ static int service_load_sysv_name(Servic } free(path); @@ -108,7 +108,7 @@ index c13ff35..0b39ec6 100644 if (r < 0) return r; -@@ -3661,7 +3699,7 @@ static int service_enumerate(Manager *m) { +@@ -3667,7 +3705,7 @@ static int service_enumerate(Manager *m) if (de->d_name[0] == 'S') { @@ -117,7 +117,7 @@ index c13ff35..0b39ec6 100644 SERVICE(service)->sysv_start_priority_from_rcnd = MAX(a*10 + b, SERVICE(service)->sysv_start_priority_from_rcnd); -@@ -3678,7 +3716,8 @@ static int service_enumerate(Manager *m) { +@@ -3684,7 +3722,8 @@ static int service_enumerate(Manager *m) goto finish; } else if (de->d_name[0] == 'K' && @@ -127,7 +127,7 @@ index c13ff35..0b39ec6 100644 r = set_ensure_allocated(&shutdown_services, trivial_hash_func, trivial_compare_func); -@@ -3718,7 +3757,9 @@ static int service_enumerate(Manager *m) { +@@ -3724,7 +3763,9 @@ static int service_enumerate(Manager *m) * runlevels we assume the stop jobs will be implicitly added * by the core logic. Also, we don't really distinguish here * between the runlevels 0 and 6 and just add them to the diff --git a/fix-support-for-boot-prefixed-initscript-bnc-746506.patch b/fix-support-for-boot-prefixed-initscript-bnc-746506.patch index 189576cc..77a2e6b7 100644 --- a/fix-support-for-boot-prefixed-initscript-bnc-746506.patch +++ b/fix-support-for-boot-prefixed-initscript-bnc-746506.patch @@ -6,11 +6,11 @@ Subject: fix support for boot prefixed initscript (bnc#746506) src/systemctl/systemctl.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) -diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c -index c2b1749..84ce87c 100644 ---- a/src/systemctl/systemctl.c -+++ b/src/systemctl/systemctl.c -@@ -4060,8 +4060,28 @@ static int enable_sysv_units(char **args) { +Index: systemd-204/src/systemctl/systemctl.c +=================================================================== +--- systemd-204.orig/src/systemctl/systemctl.c ++++ systemd-204/src/systemctl/systemctl.c +@@ -4082,8 +4082,28 @@ static int enable_sysv_units(char **args p[strlen(p) - sizeof(".service") + 1] = 0; found_sysv = access(p, F_OK) >= 0; diff --git a/handle-SYSTEMCTL_OPTIONS-environment-variable.patch b/handle-SYSTEMCTL_OPTIONS-environment-variable.patch index f139b0fb..d66c24fc 100644 --- a/handle-SYSTEMCTL_OPTIONS-environment-variable.patch +++ b/handle-SYSTEMCTL_OPTIONS-environment-variable.patch @@ -7,11 +7,11 @@ Subject: handle SYSTEMCTL_OPTIONS environment variable src/systemctl/systemctl.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) -diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c -index 84ce87c..cceafc9 100644 ---- a/src/systemctl/systemctl.c -+++ b/src/systemctl/systemctl.c -@@ -5926,6 +5926,28 @@ int main(int argc, char*argv[]) { +Index: systemd-204/src/systemctl/systemctl.c +=================================================================== +--- systemd-204.orig/src/systemctl/systemctl.c ++++ systemd-204/src/systemctl/systemctl.c +@@ -5974,6 +5974,28 @@ int main(int argc, char*argv[]) { log_parse_environment(); log_open(); diff --git a/handle-numlock-value-in-etc-sysconfig-keyboard.patch b/handle-numlock-value-in-etc-sysconfig-keyboard.patch index 00c10673..a25c27d7 100644 --- a/handle-numlock-value-in-etc-sysconfig-keyboard.patch +++ b/handle-numlock-value-in-etc-sysconfig-keyboard.patch @@ -14,11 +14,11 @@ Subject: handle numlock value in /etc/sysconfig/keyboard create mode 100644 rules/73-seat-numlock.rules create mode 100644 src/login/numlock-on.c -diff --git a/Makefile.am b/Makefile.am -index d594a3d..e82d092 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -2205,6 +2205,19 @@ dist_udevrules_DATA += \ +Index: systemd-204/Makefile.am +=================================================================== +--- systemd-204.orig/Makefile.am ++++ systemd-204/Makefile.am +@@ -2219,6 +2219,19 @@ dist_udevrules_DATA += \ rules/61-accelerometer.rules # ------------------------------------------------------------------------------ @@ -38,11 +38,11 @@ index d594a3d..e82d092 100644 if ENABLE_GUDEV if ENABLE_GTK_DOC SUBDIRS += \ -diff --git a/configure.ac b/configure.ac -index e58d694..222ed22 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -789,6 +789,11 @@ AM_CONDITIONAL(ENABLE_MANPAGES, [test "x$have_manpages" = "xyes"]) +Index: systemd-204/configure.ac +=================================================================== +--- systemd-204.orig/configure.ac ++++ systemd-204/configure.ac +@@ -791,6 +791,11 @@ AM_CONDITIONAL(ENABLE_MANPAGES, [test "x # ------------------------------------------------------------------------------ @@ -54,11 +54,10 @@ index e58d694..222ed22 100644 # Location of the init scripts as mandated by LSB SYSTEM_SYSVINIT_PATH=/etc/init.d SYSTEM_SYSVRCND_PATH=/etc/rc.d -diff --git a/rules/73-seat-numlock.rules b/rules/73-seat-numlock.rules -new file mode 100644 -index 0000000..e0061ed +Index: systemd-204/rules/73-seat-numlock.rules +=================================================================== --- /dev/null -+++ b/rules/73-seat-numlock.rules ++++ systemd-204/rules/73-seat-numlock.rules @@ -0,0 +1,8 @@ +# This file is part of systemd. +# @@ -68,11 +67,10 @@ index 0000000..e0061ed +# (at your option) any later version. + +SUBSYSTEM=="tty", ACTION=="add", KERNEL=="tty[0-9]|tty1[0-2]", TEST=="/run/numlock-on", RUN+="numlock-on $env{DEVNAME}" -diff --git a/src/login/numlock-on.c b/src/login/numlock-on.c -new file mode 100644 -index 0000000..77a8368 +Index: systemd-204/src/login/numlock-on.c +=================================================================== --- /dev/null -+++ b/src/login/numlock-on.c ++++ systemd-204/src/login/numlock-on.c @@ -0,0 +1,37 @@ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ + @@ -111,10 +109,10 @@ index 0000000..77a8368 + /* add cast to prevent warning caused by -Wwrite-strings */ + return execv(args[0], (char * const*) args); +} -diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c -index 384f936..e1f8868 100644 ---- a/src/vconsole/vconsole-setup.c -+++ b/src/vconsole/vconsole-setup.c +Index: systemd-204/src/vconsole/vconsole-setup.c +=================================================================== +--- systemd-204.orig/src/vconsole/vconsole-setup.c ++++ systemd-204/src/vconsole/vconsole-setup.c @@ -321,12 +321,14 @@ int main(int argc, char **argv) { char *vc_kbd_delay = NULL; char *vc_kbd_rate = NULL; @@ -187,11 +185,11 @@ index 384f936..e1f8868 100644 #ifdef HAVE_SYSV_COMPAT if (compose_table_pid > 0) -diff --git a/units/systemd-vconsole-setup.service.in b/units/systemd-vconsole-setup.service.in -index 18faa63..44ebbd0 100644 ---- a/units/systemd-vconsole-setup.service.in -+++ b/units/systemd-vconsole-setup.service.in -@@ -11,7 +11,7 @@ Documentation=man:systemd-vconsole-setup.service(8) man:vconsole.conf(5) +Index: systemd-204/units/systemd-vconsole-setup.service.in +=================================================================== +--- systemd-204.orig/units/systemd-vconsole-setup.service.in ++++ systemd-204/units/systemd-vconsole-setup.service.in +@@ -11,7 +11,7 @@ Documentation=man:systemd-vconsole-setup DefaultDependencies=no Conflicts=shutdown.target After=systemd-readahead-collect.service systemd-readahead-replay.service diff --git a/service-flags-sysv-service-with-detected-pid-as-RemainAfte.patch b/service-flags-sysv-service-with-detected-pid-as-RemainAfte.patch index 91cd2eab..fb00b6d8 100644 --- a/service-flags-sysv-service-with-detected-pid-as-RemainAfte.patch +++ b/service-flags-sysv-service-with-detected-pid-as-RemainAfte.patch @@ -12,11 +12,11 @@ Fixes https://bugzilla.novell.com/show_bug.cgi?id=721426 src/core/service.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) -diff --git a/src/core/service.c b/src/core/service.c -index 08fc97c..5118b06 100644 ---- a/src/core/service.c -+++ b/src/core/service.c -@@ -2072,8 +2072,13 @@ static void service_enter_running(Service *s, ServiceResult f) { +Index: systemd-204/src/core/service.c +=================================================================== +--- systemd-204.orig/src/core/service.c ++++ systemd-204/src/core/service.c +@@ -2075,8 +2075,13 @@ static void service_enter_running(Servic cgroup_ok = cgroup_good(s); if ((main_pid_ok > 0 || (main_pid_ok < 0 && cgroup_ok != 0)) && diff --git a/sysctl-handle-boot-sysctl.conf-kernel_release.patch b/sysctl-handle-boot-sysctl.conf-kernel_release.patch index 9213a508..3ca7dc2a 100644 --- a/sysctl-handle-boot-sysctl.conf-kernel_release.patch +++ b/sysctl-handle-boot-sysctl.conf-kernel_release.patch @@ -10,10 +10,10 @@ configuration), needed by openSUSE (bnc#809420). units/systemd-sysctl.service.in | 1 + 2 files changed, 9 insertions(+) -diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c -index db18dd9..aa10b79 100644 ---- a/src/sysctl/sysctl.c -+++ b/src/sysctl/sysctl.c +Index: systemd-204/src/sysctl/sysctl.c +=================================================================== +--- systemd-204.orig/src/sysctl/sysctl.c ++++ systemd-204/src/sysctl/sysctl.c @@ -26,6 +26,7 @@ #include #include @@ -36,11 +36,11 @@ index db18dd9..aa10b79 100644 r = conf_files_list_nulstr(&files, ".conf", NULL, conf_file_dirs); if (r < 0) { -diff --git a/units/systemd-sysctl.service.in b/units/systemd-sysctl.service.in -index 45e1ceb..61d13c9 100644 ---- a/units/systemd-sysctl.service.in -+++ b/units/systemd-sysctl.service.in -@@ -19,6 +19,7 @@ ConditionDirectoryNotEmpty=|/usr/lib/sysctl.d +Index: systemd-204/units/systemd-sysctl.service.in +=================================================================== +--- systemd-204.orig/units/systemd-sysctl.service.in ++++ systemd-204/units/systemd-sysctl.service.in +@@ -20,6 +20,7 @@ ConditionDirectoryNotEmpty=|/usr/lib/sys ConditionDirectoryNotEmpty=|/usr/local/lib/sysctl.d ConditionDirectoryNotEmpty=|/etc/sysctl.d ConditionDirectoryNotEmpty=|/run/sysctl.d @@ -48,6 +48,3 @@ index 45e1ceb..61d13c9 100644 [Service] Type=oneshot --- -1.8.1.4 - diff --git a/systemd-mini.changes b/systemd-mini.changes index 2ef556c6..fa6ce837 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Jun 11 11:01:46 UTC 2013 - rmilasan@suse.com + +- Add udev MSFT compability rules (bnc#805059). + add: 1007-add-msft-compability-rules.patch +- Add sg3_utils requires, need it by 61-msft.rules (bnc#805059). +- Clean-up spec file, put udev patches after systemd patches. +- Rebase patches so they would apply nicely. + ------------------------------------------------------------------- Tue Jun 11 02:29:49 UTC 2013 - crrodriguez@opensuse.org diff --git a/systemd-mini.spec b/systemd-mini.spec index b0dfb6ec..531bff1d 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -190,6 +190,8 @@ Patch1004: 1004-fix-devname-prefix.patch Patch1005: 1005-create-default-links-for-primary-cd_dvd-drive.patch # PATCH-FIX-OPENSUSE 1006-udev-always-rename-network.patch Patch1006: 1006-udev-always-rename-network.patch +# PATCH-FIX-OPENSUSE 1007-add-msft-compability-rules.patch +Patch1007: 1007-add-msft-compability-rules.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -232,7 +234,7 @@ Summary: A rule-based device node and kernel event manager License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html -PreReq: /bin/pidof /bin/rm /usr/bin/stat %insserv_prereq %fillup_prereq /usr/sbin/groupadd /usr/bin/getent /sbin/mkinitrd +PreReq: /bin/pidof /bin/rm /usr/bin/stat %insserv_prereq %fillup_prereq /usr/sbin/groupadd /usr/bin/getent /sbin/mkinitrd /usr/bin/sg_inq Requires(post): lib%{udevpkgname}%{udev_major} Conflicts: systemd < 39 Conflicts: aaa_base < 11.5 @@ -366,15 +368,7 @@ This package marks the installation to not use syslog but only the journal. cp %{SOURCE7} m4/ %endif -#udev -%patch1001 -p1 -%patch1002 -p1 -%patch1003 -p1 -%patch1004 -p1 -%patch1005 -p1 -%patch1006 -p1 - -#systemd +# systemd patches %patch0 -p1 %patch1 -p1 %patch3 -p1 @@ -416,6 +410,15 @@ cp %{SOURCE7} m4/ %patch45 -p1 %patch46 -p1 +# udev patches +%patch1001 -p1 +%patch1002 -p1 +%patch1003 -p1 +%patch1004 -p1 +%patch1005 -p1 +%patch1006 -p1 +%patch1007 -p1 + %build autoreconf -fiv diff --git a/systemd.changes b/systemd.changes index 2ef556c6..fa6ce837 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Jun 11 11:01:46 UTC 2013 - rmilasan@suse.com + +- Add udev MSFT compability rules (bnc#805059). + add: 1007-add-msft-compability-rules.patch +- Add sg3_utils requires, need it by 61-msft.rules (bnc#805059). +- Clean-up spec file, put udev patches after systemd patches. +- Rebase patches so they would apply nicely. + ------------------------------------------------------------------- Tue Jun 11 02:29:49 UTC 2013 - crrodriguez@opensuse.org diff --git a/systemd.spec b/systemd.spec index 844eb2c5..d05c71db 100644 --- a/systemd.spec +++ b/systemd.spec @@ -185,6 +185,8 @@ Patch1004: 1004-fix-devname-prefix.patch Patch1005: 1005-create-default-links-for-primary-cd_dvd-drive.patch # PATCH-FIX-OPENSUSE 1006-udev-always-rename-network.patch Patch1006: 1006-udev-always-rename-network.patch +# PATCH-FIX-OPENSUSE 1007-add-msft-compability-rules.patch +Patch1007: 1007-add-msft-compability-rules.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -227,7 +229,7 @@ Summary: A rule-based device node and kernel event manager License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html -PreReq: /bin/pidof /bin/rm /usr/bin/stat %insserv_prereq %fillup_prereq /usr/sbin/groupadd /usr/bin/getent /sbin/mkinitrd +PreReq: /bin/pidof /bin/rm /usr/bin/stat %insserv_prereq %fillup_prereq /usr/sbin/groupadd /usr/bin/getent /sbin/mkinitrd /usr/bin/sg_inq Requires(post): lib%{udevpkgname}%{udev_major} Conflicts: systemd < 39 Conflicts: aaa_base < 11.5 @@ -361,15 +363,7 @@ This package marks the installation to not use syslog but only the journal. cp %{SOURCE7} m4/ %endif -#udev -%patch1001 -p1 -%patch1002 -p1 -%patch1003 -p1 -%patch1004 -p1 -%patch1005 -p1 -%patch1006 -p1 - -#systemd +# systemd patches %patch0 -p1 %patch1 -p1 %patch3 -p1 @@ -411,6 +405,15 @@ cp %{SOURCE7} m4/ %patch45 -p1 %patch46 -p1 +# udev patches +%patch1001 -p1 +%patch1002 -p1 +%patch1003 -p1 +%patch1004 -p1 +%patch1005 -p1 +%patch1006 -p1 +%patch1007 -p1 + %build autoreconf -fiv