From 414aa0e44ea003078fcd9a70ddc9fc092ec7e24aea137293145a896e2da2485a Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 13 Mar 2014 13:46:47 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=551 --- ...linker-find-libudev-for-libdevmapper.patch | 43 +++++++++++++++++++ ...USE-etc-sysconfig-kernel-module-list.patch | 4 +- systemd-mini.changes | 7 +++ systemd.changes | 9 +++- systemd.spec | 3 ++ 5 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 let-linker-find-libudev-for-libdevmapper.patch diff --git a/let-linker-find-libudev-for-libdevmapper.patch b/let-linker-find-libudev-for-libdevmapper.patch new file mode 100644 index 00000000..d1cdc590 --- /dev/null +++ b/let-linker-find-libudev-for-libdevmapper.patch @@ -0,0 +1,43 @@ +--- systemd-210/Makefile.am ++++ systemd-210/Makefile.am 2014-03-13 08:54:36.010736086 +0000 +@@ -3691,6 +3691,10 @@ systemd_cryptsetup_CFLAGS = \ + $(AM_CFLAGS) \ + $(LIBCRYPTSETUP_CFLAGS) + ++systemd_cryptsetup_LDFLAGS = \ ++ $(AM_LDFLAGS) \ ++ -Wl,-rpath-link=$(top_srcdir)/.libs ++ + systemd_cryptsetup_LDADD = \ + libsystemd-label.la \ + libudev-internal.la \ +--- systemd-210/Makefile.in ++++ systemd-210/Makefile.in 2014-03-13 09:19:48.950238725 +0000 +@@ -8964,7 +8964,7 @@ src/cryptsetup/systemd_cryptsetup-crypts + + systemd-cryptsetup$(EXEEXT): $(systemd_cryptsetup_OBJECTS) $(systemd_cryptsetup_DEPENDENCIES) $(EXTRA_systemd_cryptsetup_DEPENDENCIES) + @rm -f systemd-cryptsetup$(EXEEXT) +- $(AM_V_CCLD)$(systemd_cryptsetup_LINK) $(systemd_cryptsetup_OBJECTS) $(systemd_cryptsetup_LDADD) $(LIBS) ++ $(AM_V_CCLD)$(systemd_cryptsetup_LINK) $(systemd_cryptsetup_OBJECTS) $(systemd_cryptsetup_LDFLAGS) $(systemd_cryptsetup_LDADD) $(LIBS) + src/cryptsetup/cryptsetup-generator.$(OBJEXT): \ + src/cryptsetup/$(am__dirstamp) \ + src/cryptsetup/$(DEPDIR)/$(am__dirstamp) +--- systemd-210/configure.ac ++++ systemd-210/configure.ac 2014-03-13 13:46:24.394235954 +0000 +@@ -151,16 +151,11 @@ CC_CHECK_FLAGS_APPEND([with_cflags], [CF + -fno-common \ + -fdiagnostics-show-option \ + -fdiagnostics-color \ +- -fno-strict-aliasing \ + -fvisibility=hidden \ + -ffunction-sections \ + -fdata-sections \ + -fstack-protector \ + --param=ssp-buffer-size=4]) +-AS_CASE([$CFLAGS], [*-O[[12345\ ]]*], +- [CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\ +- -flto])], +- [AC_MSG_RESULT([skipping -flto, optimization not enabled])]) + AC_SUBST([OUR_CFLAGS], "$with_cflags $address_sanitizer_cflags") + + AS_CASE([$CFLAGS], [*-O[[12345\ ]]*], diff --git a/module-load-handle-SUSE-etc-sysconfig-kernel-module-list.patch b/module-load-handle-SUSE-etc-sysconfig-kernel-module-list.patch index 4037a743..4f557c54 100644 --- a/module-load-handle-SUSE-etc-sysconfig-kernel-module-list.patch +++ b/module-load-handle-SUSE-etc-sysconfig-kernel-module-list.patch @@ -19,7 +19,7 @@ Subject: module-load: handle SUSE /etc/sysconfig/kernel module list r = parse_argv(argc, argv); if (r <= 0) -@@ -318,7 +321,29 @@ int main(int argc, char *argv[]) { +@@ -318,7 +321,31 @@ int main(int argc, char *argv[]) { r = k; } } @@ -31,6 +31,8 @@ Subject: module-load: handle SUSE /etc/sysconfig/kernel module list + NULL)) < 0) { + if (r != -ENOENT) + log_warning("Failed to read /etc/sysconfig/kernel: %s", strerror(-r)); ++ else ++ r = EXIT_SUCCESS; + } else + r = EXIT_SUCCESS; + if (modules_on_boot) { diff --git a/systemd-mini.changes b/systemd-mini.changes index 443d5f96..943c744f 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Mar 12 16:52:09 UTC 2014 - werner@suse.de + +- Modify patch + module-load-handle-SUSE-etc-sysconfig-kernel-module-list.patch + to ignore if /etc/sysconfig/kernel does not exist (bnc#865834) + ------------------------------------------------------------------- Wed Mar 12 14:35:10 UTC 2014 - werner@suse.de diff --git a/systemd.changes b/systemd.changes index 443d5f96..faabfaf0 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,7 +1,14 @@ +------------------------------------------------------------------- +Wed Mar 12 16:52:09 UTC 2014 - werner@suse.de + +- Modify patch + module-load-handle-SUSE-etc-sysconfig-kernel-module-list.patch + to ignore if /etc/sysconfig/kernel does not exist (bnc#865834) + ------------------------------------------------------------------- Wed Mar 12 14:35:10 UTC 2014 - werner@suse.de -- Add patch use-correct-size-4-reply_cookie-4-bigendian.patch to +- Add patch systemd-big-endian-reply-matching.patch make sure that systemd can talk with dbus-daemon even on big endian systems (bnc#867888) diff --git a/systemd.spec b/systemd.spec index 1797e01e..acf1ee8a 100644 --- a/systemd.spec +++ b/systemd.spec @@ -305,6 +305,8 @@ Patch1022: 1022-systemd-tmpfiles-ownerkeep.patch Patch1999: systemd-install-compat_pkgconfig-always.patch # PATCH-FIX-OPENSUSE systemd-dbus-system-bus-address.patch always use /run/dbus not /var/run Patch2000: systemd-dbus-system-bus-address.patch +# PATCH-FIX-SUSE During linkage of systemd-cryptsetup let linker find libudev for libdevmapper +Patch2001: let-linker-find-libudev-for-libdevmapper.patch # udev patches # PATCH-FIX-USTREAM added at 2014/03/03 Patch1034: 0013-cdrom_id-use-the-old-MMC-fallback.patch @@ -626,6 +628,7 @@ cp %{SOURCE7} m4/ %patch1022 -p1 %patch1999 -p1 %patch2000 -p1 +%patch2001 -p1 # udev patches %patch1034 -p0 %patch1035 -p0