systemd: bump to v208.
authorEric Le Bihan <eric.le.bihan.dev@free.fr>
Wed, 12 Mar 2014 14:49:45 +0000 (15:49 +0100)
committerPeter Korsgaard <peter@korsgaard.com>
Wed, 12 Mar 2014 21:24:26 +0000 (22:24 +0100)
This version bump comes with a patch, backported from v209, to fix
a linker error when EFI support is disabled.

Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/systemd/systemd-02-efi-fix-Undefined-reference-efi_loader_get_boot_usec.patch [new file with mode: 0644]
package/systemd/systemd.mk

diff --git a/package/systemd/systemd-02-efi-fix-Undefined-reference-efi_loader_get_boot_usec.patch b/package/systemd/systemd-02-efi-fix-Undefined-reference-efi_loader_get_boot_usec.patch
new file mode 100644 (file)
index 0000000..84b0a1a
--- /dev/null
@@ -0,0 +1,29 @@
+From 70d9b9fc0a4fa1698ff00e364c61bb875244efa1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez@opensuse.org>
+Date: Tue, 11 Feb 2014 09:54:49 -0300
+Subject: [PATCH] efi: fix Undefined reference efi_loader_get_boot_usec when
+ EFI support is disabled
+
+Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
+---
+ src/shared/boot-timestamps.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/shared/boot-timestamps.c b/src/shared/boot-timestamps.c
+index 9449965..d656685 100644
+--- a/src/shared/boot-timestamps.c
++++ b/src/shared/boot-timestamps.c
+@@ -40,8 +40,10 @@ int boot_timestamps(const dual_timestamp *n, dual_timestamp *firmware, dual_time
+
+         r = acpi_get_boot_usec(&x, &y);
+         if (r < 0) {
++#ifdef ENABLE_EFI
+                 r = efi_loader_get_boot_usec(&x, &y);
+                 if (r < 0)
++#endif
+                         return r;
+         }
+
+--
+1.7.9.5
+
index 0fc00e19f33b700537b1f561af03377fa123c05d..0ac465125580a72cdbb4792198115023501d3ee2 100644 (file)
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SYSTEMD_VERSION = 207
+SYSTEMD_VERSION = 208
 SYSTEMD_SITE = http://www.freedesktop.org/software/systemd/
 SYSTEMD_SOURCE = systemd-$(SYSTEMD_VERSION).tar.xz
 SYSTEMD_LICENSE = GPLv2+