commit 19e6c1c75bc99e537904931715b710fb875c5445
Author: Jakub Bogusz <[email protected]>
Date: Sat Aug 2 19:34:25 2014 +0200
- updated pld-sysv-network patch
- removed obsolete udev-so,hibernate-to-file patches
hibernate-to-file.patch | 23 -----------------------
pld-sysv-network.patch | 8 ++++----
systemd.spec | 8 ++------
udev-so.patch | 15 ---------------
4 files changed, 6 insertions(+), 48 deletions(-)
---
diff --git a/systemd.spec b/systemd.spec
index 7bbbbcc..2a2efae 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -57,14 +57,12 @@ Patch1: config-pld.patch
Patch2: shut-sysv-up.patch
Patch3: pld-sysv-network.patch
Patch4: tmpfiles-not-fatal.patch
-Patch6: udev-so.patch
Patch8: udev-ploop-rules.patch
Patch9: udevadm-in-sbin.patch
Patch10: net-rename-revert.patch
Patch11: nss-in-rootlib.patch
Patch12: proc-hidepid.patch
Patch14: dont-hash-null-keys.patch
-Patch15: hibernate-to-file.patch
Patch16: systemd-configfs.patch
Patch17: pld-boot_efi_mount.patch
Patch18: optional-tmp-on-tmpfs.patch
@@ -613,18 +611,16 @@ Uzupełnianie parametrów w zsh dla poleceń udev.
%patch0 -p1
%patch1 -p1
#patch2 -p1
-#patch3 -p1
+%patch3 -p1
%patch4 -p1
-# made upstream
-#patch6 -p1
%patch8 -p1
%patch9 -p1
+# rejected upstream
#patch10 -p1
%patch11 -p1
%patch12 -p1
# possible cause of infinite loop inside systemd-login
#patch14 -p1
-#patch15 -p1
%patch16 -p1
%patch17 -p1
%patch18 -p1
diff --git a/hibernate-to-file.patch b/hibernate-to-file.patch
deleted file mode 100644
index 3ee6966..0000000
--- a/hibernate-to-file.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 0c6f1f4ea4980ff719979d36f10bd6ea3e464c02
-Author: Jan Janssen <[email protected]>
-Date: Thu Oct 31 17:22:03 2013 +0100
-
- Make hibernation test work for swap files
-
- Suspend to disk works for swap files too (even if it is located
- on an ecrypted file system):
- https://www.kernel.org/doc/Documentation/power/swsusp-and-swap-files.txt
-
-diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c
-index d068bfc..2bb0493 100644
---- a/src/shared/sleep-config.c
-+++ b/src/shared/sleep-config.c
-@@ -206,7 +206,7 @@ static int hibernation_partition_size(size_t *size, size_t
*used) {
- if (!d)
- return -ENOMEM;
-
-- if (!streq(type, "partition")) {
-+ if (!streq(type, "partition") && !streq(type, "file")) {
- log_debug("Partition %s has type %s, ignoring.", d,
type);
- continue;
- }
diff --git a/pld-sysv-network.patch b/pld-sysv-network.patch
index 224b8e4..3088ad0 100644
--- a/pld-sysv-network.patch
+++ b/pld-sysv-network.patch
@@ -1,15 +1,15 @@
---- systemd-38/src/core/service.c~ 2012-01-26 00:12:06.239561034 +0100
-+++ systemd-38/src/core/service.c 2012-01-26 18:26:15.476825041 +0100
+--- systemd-215/src/sysv-generator/sysv-generator.c~ 2012-01-26
00:12:06.239561034 +0100
++++ systemd-215/src/sysv-generator/sysv-generator.c 2012-01-26
18:26:15.476825041 +0100
@@ -516,6 +516,13 @@
line++;
t = strstrip(l);
+ // PLD specific ugly hack to detect SysV services requiring
network
+ if (startswith_no_case(t, ". /etc/sysconfig/network")) {
-+ r = unit_add_dependency_by_name(UNIT(s),
UNIT_REQUIRES | UNIT_AFTER, "network.target", NULL, true);
++ r = strv_extend(&s->wants, "network.target");
+
+ if (r < 0)
-+ log_error("[%s:%u] Failed to add dependency
on network.target, ignoring: %s", path, line, strerror(-r));
++ log_error("[%s:%u] Failed to add dependency
on network.target, ignoring: %s", s->path, line, strerror(-r));
+ }
if (*t != '#') {
/* Try to figure out whether this init script supports
diff --git a/udev-so.patch b/udev-so.patch
deleted file mode 100644
index a135a82..0000000
--- a/udev-so.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- udev-146/Makefile.am~ 2009-08-14 14:14:06.000000000 +0200
-+++ udev-146/Makefile.am 2009-08-15 20:54:31.651285047 +0200
-@@ -485,8 +485,10 @@
- $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
- so_img_name=$$(readlink $(DESTDIR)$(libdir)/$$libname) && \
- so_img_rel_target_prefix=$$(echo $(libdir) | sed
's,\(^/\|\)[^/][^/]*,..,g') && \
-- $(LN_S) -f
$$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name
$(DESTDIR)$(libdir)/$$libname && \
-- mv $(DESTDIR)$(libdir)/$$libname.* $(DESTDIR)$(rootlibdir); \
-+ if test "x$$so_img_name" != "x"; then \
-+ $(LN_S) -f
$$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name
$(DESTDIR)$(libdir)/$$libname && \
-+ mv $(DESTDIR)$(libdir)/$$libname.*
$(DESTDIR)$(rootlibdir); \
-+ fi; true; \
- fi
- endef
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/systemd.git/commitdiff/19e6c1c75bc99e537904931715b710fb875c5445
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
