[packages/systemd] Version: 218
jajcus
jajcus at pld-linux.org
Fri Apr 3 13:32:02 CEST 2015
commit 7dffbad739c3cb5f5f5a220a6709ff865279648b
Author: Jacek Konieczny <j.konieczny at eggsoft.pl>
Date: Fri Apr 3 13:31:36 2015 +0200
Version: 218
Builds and boots in a VM
pld-boot_efi_mount.patch | 23 ++++++++++++-----------
systemd-bug-87125.patch | 18 ------------------
systemd.spec | 23 +++++++++++++++++++----
3 files changed, 31 insertions(+), 33 deletions(-)
---
diff --git a/systemd.spec b/systemd.spec
index dfa3047..d6c249d 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -20,13 +20,13 @@ Summary: A System and Service Manager
Summary(pl.UTF-8): systemd - zarządca systemu i usług dla Linuksa
Name: systemd
# Verify ChangeLog and NEWS when updating (since there are incompatible/breaking changes very often)
-Version: 217
+Version: 218
Release: 0.1
Epoch: 1
License: GPL v2+ (udev), LGPL v2.1+ (the rest)
Group: Base
Source0: http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.xz
-# Source0-md5: e68dbff3cc19f66e341572d9fb2ffa89
+# Source0-md5: 4e2c511b0a7932d7fc9d79822273aac6
Source1: %{name}-sysv-convert
Source2: %{name}_booted.c
Source3: network.service
@@ -62,7 +62,6 @@ Patch9: udevadm-in-sbin.patch
Patch10: net-rename-revert.patch
Patch11: nss-in-rootlib.patch
Patch12: proc-hidepid.patch
-Patch13: systemd-bug-87125.patch
Patch14: dont-hash-null-keys.patch
Patch16: systemd-configfs.patch
Patch17: pld-boot_efi_mount.patch
@@ -91,6 +90,7 @@ BuildRequires: libblkid-devel >= 2.20
BuildRequires: libcap-devel
BuildRequires: libgcrypt-devel >= 1.4.5
%{?with_microhttpd:BuildRequires: libmicrohttpd-devel >= 0.9.33}
+BuildRequires: libmount-devel
BuildRequires: libseccomp-devel >= 1.0.0
%{?with_selinux:BuildRequires: libselinux-devel >= 2.1.9}
BuildRequires: libtool >= 2:2.2
@@ -622,7 +622,6 @@ Uzupełnianie parametrów w zsh dla poleceń udev.
#patch10 -p1
%patch11 -p1
%patch12 -p1
-%patch13 -p1
# possible cause of infinite loop inside systemd-login
#patch14 -p1
%patch16 -p1
@@ -1081,6 +1080,7 @@ fi
%attr(755,root,root) /lib/systemd/systemd-localed
%attr(755,root,root) /lib/systemd/systemd-logind
%attr(755,root,root) /lib/systemd/systemd-machined
+%attr(755,root,root) /lib/systemd/systemd-machine-id-commit
%attr(755,root,root) /lib/systemd/systemd-modules-load
%attr(755,root,root) /lib/systemd/systemd-networkd
%attr(755,root,root) /lib/systemd/systemd-networkd-wait-online
@@ -1168,6 +1168,7 @@ fi
%{_mandir}/man1/systemd-firstboot.1*
%{_mandir}/man1/systemd-firstboot.service.1*
%{_mandir}/man1/systemd-inhibit.1*
+%{_mandir}/man1/systemd-machine-id-commit.1*
%{_mandir}/man1/systemd-machine-id-setup.1*
%{_mandir}/man1/systemd-notify.1*
%{_mandir}/man1/systemd-nspawn.1*
@@ -1177,24 +1178,33 @@ fi
%{_mandir}/man1/timedatectl.1*
%{_mandir}/man5/binfmt.d.5*
%{_mandir}/man5/bootchart.conf.5*
+%{_mandir}/man5/bootchart.conf.d.5*
%{_mandir}/man5/coredump.conf.5*
+%{_mandir}/man5/coredump.conf.d.5*
%{_mandir}/man5/hostname.5*
%{_mandir}/man5/journald.conf.5*
+%{_mandir}/man5/journald.conf.d.5*
%{_mandir}/man5/locale.conf.5*
%{_mandir}/man5/localtime.5*
%{_mandir}/man5/logind.conf.5*
+%{_mandir}/man5/logind.conf.d.5*
%{_mandir}/man5/machine-id.5*
%{_mandir}/man5/machine-info.5*
%{_mandir}/man5/modules-load.d.5*
%{_mandir}/man5/os-release.5*
%{_mandir}/man5/resolved.conf.5*
+%{_mandir}/man5/resolved.conf.d.5*
+%{_mandir}/man5/sleep.conf.d.5*
%{_mandir}/man5/sysctl.d.5*
+%{_mandir}/man5/system.conf.d.5*
%{_mandir}/man5/systemd.*.5*
%{_mandir}/man5/systemd-sleep.conf.5*
%{_mandir}/man5/systemd-system.conf.5*
%{_mandir}/man5/systemd-user.conf.5*
%{_mandir}/man5/sysusers.d.5*
%{_mandir}/man5/timesyncd.conf.5*
+%{_mandir}/man5/timesyncd.conf.d.5*
+%{_mandir}/man5/user.conf.d.5*
%{_mandir}/man5/vconsole.conf.5*
%{_mandir}/man7/bootup.7*
%{_mandir}/man7/daemon.7*
@@ -1230,6 +1240,7 @@ fi
%{_mandir}/man8/systemd-localed.8*
%{_mandir}/man8/systemd-logind.8*
%{_mandir}/man8/systemd-machined.8*
+%{_mandir}/man8/systemd-machine-id-commit.service.8*
%{_mandir}/man8/systemd-modules-load.8*
%{_mandir}/man8/systemd-networkd-wait-online.8
%{_mandir}/man8/systemd-networkd-wait-online.service.8.*
@@ -1248,6 +1259,7 @@ fi
%{_mandir}/man8/systemd-socket-proxyd.8.gz
%{_mandir}/man8/systemd-sysctl.8*
%{_mandir}/man8/systemd-system-update-generator.8*
+%{_mandir}/man8/systemd-sysv-generator.8*
%{_mandir}/man8/systemd-sysusers.8.gz
%{_mandir}/man8/systemd-sysusers.service.8
%{_mandir}/man8/systemd-timedated.8*
@@ -1560,6 +1572,7 @@ fi
/lib/udev/hwdb.d/20-usb-classes.hwdb
/lib/udev/hwdb.d/20-usb-vendor-model.hwdb
/lib/udev/hwdb.d/60-keyboard.hwdb
+/lib/udev/hwdb.d/70-mouse.hwdb
%attr(755,root,root) %{_sbindir}/start_udev
%attr(755,root,root) %{_sbindir}/udevd
@@ -1594,6 +1607,7 @@ fi
/lib/udev/rules.d/60-persistent-v4l.rules
/lib/udev/rules.d/61-accelerometer.rules
/lib/udev/rules.d/64-btrfs.rules
+/lib/udev/rules.d/70-mouse.rules
/lib/udev/rules.d/70-power-switch.rules
/lib/udev/rules.d/75-net-description.rules
/lib/udev/rules.d/75-probe_mtd.rules
@@ -1601,6 +1615,7 @@ fi
/lib/udev/rules.d/78-sound-card.rules
/lib/udev/rules.d/80-drivers.rules
/lib/udev/rules.d/80-net-setup-link.rules
+/lib/udev/rules.d/90-vconsole.rules
/lib/udev/rules.d/95-udev-late.rules
%{_mandir}/man5/udev.conf.5*
diff --git a/pld-boot_efi_mount.patch b/pld-boot_efi_mount.patch
index cd7e6b4..ce43d66 100644
--- a/pld-boot_efi_mount.patch
+++ b/pld-boot_efi_mount.patch
@@ -1,6 +1,7 @@
---- systemd-215/src/efi-boot-generator/efi-boot-generator.c.orig 2014-03-18 18:05:49.801378306 +0100
-+++ systemd-215/src/efi-boot-generator/efi-boot-generator.c 2014-07-11 11:44:46.017114762 +0200
-@@ -69,9 +69,9 @@ int main(int argc, char *argv[]) {
+diff -dur -x '*~' -x '*.orig' -x '*.rej' systemd-218.orig/src/efi-boot-generator/efi-boot-generator.c systemd-218/src/efi-boot-generator/efi-boot-generator.c
+--- systemd-218.orig/src/efi-boot-generator/efi-boot-generator.c 2014-12-05 01:26:51.000000000 +0100
++++ systemd-218/src/efi-boot-generator/efi-boot-generator.c 2015-04-02 15:45:18.000000000 +0200
+@@ -69,9 +69,9 @@
return EXIT_SUCCESS;
}
@@ -13,7 +14,7 @@
return EXIT_SUCCESS;
}
-@@ -84,7 +84,7 @@ int main(int argc, char *argv[]) {
+@@ -84,7 +84,7 @@
return EXIT_FAILURE;
}
@@ -21,8 +22,8 @@
+ name = strappenda(arg_dest, "/boot-efi.mount");
f = fopen(name, "wxe");
if (!f) {
- log_error("Failed to create mount unit file %s: %m", name);
-@@ -105,7 +105,7 @@ int main(int argc, char *argv[]) {
+ log_error_errno(errno, "Failed to create mount unit file %s: %m", name);
+@@ -105,7 +105,7 @@
"Description=EFI System Partition\n"
"Documentation=man:systemd-efi-boot-generator(8)\n");
@@ -31,7 +32,7 @@
if (r < 0)
return EXIT_FAILURE;
-@@ -113,7 +113,7 @@ int main(int argc, char *argv[]) {
+@@ -113,7 +113,7 @@
"\n"
"[Mount]\n"
"What=%s\n"
@@ -40,7 +41,7 @@
"Type=vfat\n"
"Options=umask=0077,noauto\n",
what);
-@@ -124,7 +124,7 @@ int main(int argc, char *argv[]) {
+@@ -124,7 +124,7 @@
return EXIT_FAILURE;
}
@@ -49,7 +50,7 @@
fclose(f);
f = fopen(name, "wxe");
if (!f) {
-@@ -136,7 +136,7 @@ int main(int argc, char *argv[]) {
+@@ -136,7 +136,7 @@
"[Unit]\n"
"Description=EFI System Partition Automount\n\n"
"[Automount]\n"
@@ -58,7 +59,7 @@
fflush(f);
if (ferror(f)) {
-@@ -144,10 +144,10 @@ int main(int argc, char *argv[]) {
+@@ -144,10 +144,10 @@
return EXIT_FAILURE;
}
@@ -68,6 +69,6 @@
- if (symlink("../boot.automount", name) < 0) {
+ if (symlink("../boot-efi.automount", name) < 0) {
- log_error("Failed to create symlink %s: %m", name);
+ log_error_errno(errno, "Failed to create symlink %s: %m", name);
return EXIT_FAILURE;
}
diff --git a/systemd-bug-87125.patch b/systemd-bug-87125.patch
deleted file mode 100644
index 1fca108..0000000
--- a/systemd-bug-87125.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- systemd/src/core/load-fragment.c~ 2014-12-08 22:49:17.972350464 +0100
-+++ systemd/src/core/load-fragment.c 2014-12-08 23:26:58.503614651 +0100
-@@ -64,7 +64,6 @@
- #include "seccomp-util.h"
- #endif
-
--#if !defined(HAVE_SYSV_COMPAT) || !defined(HAVE_SECCOMP) || !defined(HAVE_PAM) || !defined(HAVE_SELINUX) || !defined(HAVE_SMACK) || !defined(HAVE_APPARMOR)
- int config_parse_warn_compat(
- const char *unit,
- const char *filename,
-@@ -95,7 +94,6 @@ int config_parse_warn_compat(
-
- return 0;
- }
--#endif
-
- int config_parse_unit_deps(const char *unit,
- const char *filename,
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/systemd.git/commitdiff/7dffbad739c3cb5f5f5a220a6709ff865279648b
More information about the pld-cvs-commit
mailing list