[packages/systemd/DEVEL] - started update to 196 - updated net-rename-revert,pld-sysv-network,target-pld,udevadm-in-sbin patc
qboosh
qboosh at pld-linux.org
Fri Nov 23 21:29:12 CET 2012
commit aa52b0b63b93ee252a0f38fef9f5ba7dcb23876e
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri Nov 23 21:29:14 2012 +0100
- started update to 196
- updated net-rename-revert,pld-sysv-network,target-pld,udevadm-in-sbin patches
net-rename-revert.patch | 2 +-
pld-sysv-network.patch | 12 +++----
systemd.spec | 66 ++++++++++++++++++++++++++++++------
target-pld.patch | 90 ++++++++++++++++++++++++-------------------------
udevadm-in-sbin.patch | 9 ++---
5 files changed, 111 insertions(+), 68 deletions(-)
---
diff --git a/systemd.spec b/systemd.spec
index 5bf7c84..57f5de9 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -38,13 +38,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: 187
-Release: 4
+Version: 196
+Release: 0.1
Epoch: 1
License: GPL v2+
Group: Base
Source0: http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.xz
-# Source0-md5: 26606e3c84448800ef0b3ffd57e6e8b6
+# Source0-md5: 05ebd7f108e420e2b4e4810ea4b3c810
Source1: %{name}-sysv-convert
Source2: %{name}_booted.c
Source3: network.service
@@ -74,7 +74,7 @@ Patch1: config-pld.patch
Patch2: shut-sysv-up.patch
Patch3: pld-sysv-network.patch
Patch4: tmpfiles-not-fatal.patch
-Patch5: kmsg-to-syslog.patch
+#Patch5: kmsg-to-syslog.patch
Patch6: udev-so.patch
Patch7: udev-uClibc.patch
Patch8: udev-ploop-rules.patch
@@ -108,7 +108,9 @@ BuildRequires: m4
%{?with_pam:BuildRequires: pam-devel}
BuildRequires: pciutils
BuildRequires: pkgconfig >= 0.9.0
+BuildRequires: python-devel
BuildRequires: python-modules
+BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.628
BuildRequires: sed >= 4.0
BuildRequires: usbutils >= 0.82
@@ -380,6 +382,18 @@ Header files for systemd libraries.
%description devel -l pl.UTF-8
Pliki nagłówkowe bibliotek systemd.
+%package -n python-systemd
+Summary: Python interface to systemd
+Summary(pl.UTF-8): Pythonowy interfejs do systemd
+Group: Development/Languages/Python
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+
+%description -n python-systemd
+Python interface to systemd.
+
+%description -n python-systemd -l pl.UTF-8
+Pythonowy interfejs do systemd.
+
%package -n bash-completion-systemd
Summary: bash-completion for systemd
Summary(pl.UTF-8): Bashowe dopełnianie składni dla systemd
@@ -558,7 +572,7 @@ initrd.
#patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
+#patch5 -p1
%patch6 -p1
%if %{with uClibc}
%patch7 -p1
@@ -783,6 +797,8 @@ install -d $RPM_BUILD_ROOT/var/log
%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
%{__rm} $RPM_BUILD_ROOT/%{_lib}/security/pam_systemd.la
%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
+%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/systemd/*.la
+%py_postclean
%clean
rm -rf $RPM_BUILD_ROOT
@@ -958,14 +974,18 @@ fi
%attr(755,root,root) /bin/systemd-machine-id-setup
%attr(755,root,root) /bin/systemd-notify
%attr(755,root,root) /bin/systemd-tty-ask-password-agent
+%attr(755,root,root) %{_bindir}/hostnamectl
+%attr(755,root,root) %{_bindir}/localectl
%attr(755,root,root) %{_bindir}/systemd-cat
%attr(755,root,root) %{_bindir}/systemd-cgtop
%attr(755,root,root) %{_bindir}/systemd-cgls
+%attr(755,root,root) %{_bindir}/systemd-coredumpctl
%attr(755,root,root) %{_bindir}/systemd-delta
%attr(755,root,root) %{_bindir}/systemd-detect-virt
%attr(755,root,root) %{_bindir}/systemd-nspawn
%attr(755,root,root) %{_bindir}/systemd-stdio-bridge
%attr(755,root,root) %{_bindir}/systemd-sysv-convert
+%attr(755,root,root) %{_bindir}/timedatectl
%attr(755,root,root) /lib/systemd/pld-clean-tmp
%attr(755,root,root) /lib/systemd/pld-storage-init
%attr(755,root,root) /lib/systemd/systemd-ac-power
@@ -999,11 +1019,13 @@ fi
%dir /lib/systemd/system-generators
%attr(755,root,root) /lib/systemd/systemd
%attr(755,root,root) /lib/systemd/system-generators/systemd-*-generator
-/lib/udev/rules.d/99-systemd.rules
/lib/udev/rules.d/70-uaccess.rules
/lib/udev/rules.d/71-seat.rules
/lib/udev/rules.d/73-seat-late.rules
+/lib/udev/rules.d/99-systemd.rules
%dir %{_libexecdir}/systemd
+%dir %{_libexecdir}/systemd/catalog
+%{_libexecdir}/systemd/catalog/systemd.catalog
%{_libexecdir}/systemd/user
%dir %{_libexecdir}/systemd/user-generators
%{_libexecdir}/tmpfiles.d/legacy.conf
@@ -1027,13 +1049,16 @@ fi
%{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy
%dir %{_datadir}/systemd
%{_datadir}/systemd/kbd-model-map
+%{_mandir}/man1/hostnamectl.1*
%{_mandir}/man1/journalctl.1*
+%{_mandir}/man1/localectl.1*
%{_mandir}/man1/loginctl.1*
%{_mandir}/man1/systemd.1*
%{_mandir}/man1/systemd-ask-password.1*
%{_mandir}/man1/systemd-cat.1*
%{_mandir}/man1/systemd-cgls.1*
%{_mandir}/man1/systemd-cgtop.1*
+%{_mandir}/man1/systemd-coredumpctl.1*
%{_mandir}/man1/systemd-delta.1*
%{_mandir}/man1/systemd-detect-virt.1*
%{_mandir}/man1/systemd-inhibit.1*
@@ -1041,12 +1066,14 @@ fi
%{_mandir}/man1/systemd-notify.1*
%{_mandir}/man1/systemd-nspawn.1*
%{_mandir}/man1/systemd-tty-ask-password-agent.1*
+%{_mandir}/man1/timedatectl.1*
%{_mandir}/man5/binfmt.d.5*
# cfl with rc-scripts
#%{_mandir}/man5/crypttab.5*
%{_mandir}/man5/hostname.5*
%{_mandir}/man5/journald.conf.5*
%{_mandir}/man5/locale.conf.5*
+%{_mandir}/man5/localtime.5*
%{_mandir}/man5/logind.conf.5*
%{_mandir}/man5/machine-id.5*
%{_mandir}/man5/machine-info.5*
@@ -1054,7 +1081,6 @@ fi
%{_mandir}/man5/os-release.5*
%{_mandir}/man5/sysctl.d.5*
%{_mandir}/man5/systemd.*.5*
-%{_mandir}/man5/timezone.5*
%{_mandir}/man5/vconsole.conf.5*
%{_mandir}/man7/bootup.7*
%{_mandir}/man7/daemon.7*
@@ -1063,6 +1089,7 @@ fi
%{_mandir}/man7/systemd.special.7*
%{_mandir}/man8/systemd-binfmt.8*
%{?with_cryptsetup:%{_mandir}/man8/systemd-cryptsetup-generator.8*}
+%{_mandir}/man8/systemd-fsck.8*
%{_mandir}/man8/systemd-fstab-generator.8*
%{_mandir}/man8/systemd-getty-generator.8*
%{_mandir}/man8/systemd-hostnamed.8*
@@ -1126,12 +1153,12 @@ fi
%dir %{_libexecdir}/binfmt.d
%dir %{_libexecdir}/modules-load.d
%dir %{_libexecdir}/sysctl.d
-%dir /lib/systemd/system-sleep
-%dir /lib/systemd/system-shutdown
# Don't package the kernel.core_pattern setting until systemd-coredump
# is a part of an actual systemd release and it's made clear how to
-# get the core dumps out of the journal.
+# get the core dumps out of the journal. -- is it ready in 196?
#%{_libexecdir}/sysctl.d/coredump.conf
+%dir /lib/systemd/system-sleep
+%dir /lib/systemd/system-shutdown
%attr(755,root,root) /bin/systemctl
%attr(755,root,root) /bin/systemd-tmpfiles
%attr(755,root,root) /bin/systemd_booted
@@ -1192,6 +1219,7 @@ fi
%{_mandir}/man8/systemd-halt.service.8*
%{_mandir}/man8/systemd-hibernate.service.8*
%{_mandir}/man8/systemd-hostnamed.service.8*
+%{_mandir}/man8/systemd-hybrid-sleep.service.8*
%{_mandir}/man8/systemd-initctl.service.8*
%{_mandir}/man8/systemd-initctl.socket.8*
%{_mandir}/man8/systemd-journald.service.8*
@@ -1219,6 +1247,8 @@ fi
%{_mandir}/man8/systemd-tmpfiles-clean.timer.8*
%{_mandir}/man8/systemd-tmpfiles-setup.service.8*
%{_mandir}/man8/systemd-udevd.service.8*
+%{_mandir}/man8/systemd-udevd-control.socket.8*
+%{_mandir}/man8/systemd-udevd-kernel.socket.8*
%{_mandir}/man8/systemd-update-utmp-runlevel.service.8*
%{_mandir}/man8/systemd-update-utmp-shutdown.service.8*
%{_mandir}/man8/systemd-user-sessions.service.8*
@@ -1259,6 +1289,13 @@ fi
%{_mandir}/man3/SD_*.3*
%{_mandir}/man3/sd*.3*
+%files -n python-systemd
+%defattr(644,root,root,755)
+%dir %{py_sitedir}/systemd
+%attr(755,root,root) %{py_sitedir}/systemd/_journal.so
+%{py_sitedir}/systemd/__init__.py[co]
+%{py_sitedir}/systemd/journal.py[co]
+
%files -n bash-completion-systemd
%defattr(644,root,root,755)
/etc/bash_completion.d/systemd-bash-completion.sh
@@ -1295,6 +1332,14 @@ fi
%attr(755,root,root) /lib/udev/accelerometer
%attr(755,root,root) /lib/udev/findkeyboards
+%dir /lib/udev/hwdb.d
+/lib/udev/hwdb.d/20-OUI.hwdb
+/lib/udev/hwdb.d/20-acpi-vendor.hwdb
+/lib/udev/hwdb.d/20-pci-classes.hwdb
+/lib/udev/hwdb.d/20-pci-vendor-product.hwdb
+/lib/udev/hwdb.d/20-usb-classes.hwdb
+/lib/udev/hwdb.d/20-usb-vendor-product.hwdb
+
%attr(755,root,root) %{_sbindir}/start_udev
%attr(755,root,root) %{_sbindir}/udevd
%attr(755,root,root) %{_sbindir}/udevadm
@@ -1322,6 +1367,7 @@ fi
/lib/udev/rules.d/60-persistent-storage.rules
/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-power-switch.rules
/lib/udev/rules.d/75-net-description.rules
/lib/udev/rules.d/75-probe_mtd.rules
diff --git a/net-rename-revert.patch b/net-rename-revert.patch
index 3c885ff..2a8561e 100644
--- a/net-rename-revert.patch
+++ b/net-rename-revert.patch
@@ -65,7 +65,7 @@ index 2ade0ab..aff1487 100644
util_strscpy(ifr.ifr_newname, IFNAMSIZ, event->name);
err = ioctl(sk, SIOCSIFNAME, &ifr);
- if (err >= 0) {
-- print_kmsg("renamed network interface %s to %s", ifr.ifr_name, ifr.ifr_newname);
+- print_kmsg("renamed network interface %s to %s\n", ifr.ifr_name, ifr.ifr_newname);
- } else {
+ if (err == 0) {
+ rename_netif_kernel_log(ifr);
diff --git a/pld-sysv-network.patch b/pld-sysv-network.patch
index 5872654..9996b2b 100644
--- a/pld-sysv-network.patch
+++ b/pld-sysv-network.patch
@@ -1,6 +1,6 @@
---- 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
-@@ -516,6 +516,13 @@
+--- systemd-195/src/core/service.c.orig 2012-11-18 17:12:26.141170373 +0100
++++ systemd-195/src/core/service.c 2012-11-18 19:50:52.677638896 +0100
+@@ -625,6 +625,13 @@
line++;
t = strstrip(l);
@@ -11,9 +11,9 @@
+ if (r < 0)
+ log_error("[%s:%u] Failed to add dependency on network.target, ignoring: %s", path, line, strerror(-r));
+ }
- if (*t != '#')
- continue;
-
+ if (*t != '#') {
+ /* Try to figure out whether this init script supports
+ * the reload operation. This heuristic looks for
--- systemd-44/man/systemd.special.xml~ 2012-02-20 16:33:32.000000000 +0200
+++ systemd-44/man/systemd.special.xml 2012-03-18 10:44:01.469494195 +0200
@@ -324,6 +324,10 @@
diff --git a/target-pld.patch b/target-pld.patch
index b8c5479..f760bbe 100644
--- a/target-pld.patch
+++ b/target-pld.patch
@@ -100,33 +100,29 @@ index 3477ba1..d32718d 100644
else if (strneq(w, "fastboot", l))
arg_skip = true;
else if (strneq(w, "forcefsck", l))
-diff --git a/src/core/hostname-setup.c b/src/core/hostname-setup.c
-index 2c2f10c..754f0c7 100644
---- a/src/core/hostname-setup.c
-+++ b/src/core/hostname-setup.c
+--- systemd-196/src/core/hostname-setup.c.orig 2012-11-22 18:55:56.870504205 +0100
++++ systemd-196/src/core/hostname-setup.c 2012-11-22 19:25:25.313800686 +0100
@@ -30,7 +30,7 @@
#include "util.h"
#include "log.h"
--#if defined(TARGET_FEDORA) || defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
-+#if defined(TARGET_FEDORA) || defined(TARGET_PLD) || defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
+-#if defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
++#if defined(TARGET_PLD) || defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
#define FILENAME "/etc/sysconfig/network"
#elif defined(TARGET_SUSE) || defined(TARGET_SLACKWARE)
#define FILENAME "/etc/HOSTNAME"
-@@ -64,7 +64,7 @@ static int read_and_strip_hostname(const char *path, char **hn) {
+@@ -63,7 +63,7 @@
static int read_distro_hostname(char **hn) {
--#if defined(TARGET_FEDORA) || defined(TARGET_ARCH) || defined(TARGET_GENTOO) || defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
-+#if defined(TARGET_FEDORA) || defined(TARGET_PLD) || defined(TARGET_ARCH) || defined(TARGET_GENTOO) || defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
+-#if defined(TARGET_GENTOO) || defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
++#if defined(TARGET_PLD) || defined(TARGET_GENTOO) || defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
int r;
- FILE *f;
+ _cleanup_fclose_ FILE *f = NULL;
-diff --git a/src/core/locale-setup.c b/src/core/locale-setup.c
-index 7f692e9..0a45854 100644
---- a/src/core/locale-setup.c
-+++ b/src/core/locale-setup.c
-@@ -74,7 +74,7 @@ int locale_setup(void) {
+--- systemd-196/src/core/locale-setup.c.orig 2012-11-09 15:55:35.888582232 +0100
++++ systemd-196/src/core/locale-setup.c 2012-11-22 19:51:50.910434298 +0100
+@@ -74,7 +74,7 @@
if (detect_container(NULL) <= 0)
if ((r = parse_env_file("/proc/cmdline", WHITESPACE,
@@ -135,15 +131,15 @@ index 7f692e9..0a45854 100644
"LANG", &variables[VARIABLE_LANG],
#endif
"locale.LANG", &variables[VARIABLE_LANG],
-@@ -121,7 +121,7 @@ int locale_setup(void) {
- log_warning("Failed to read /etc/locale.conf: %s", strerror(-r));
+@@ -189,7 +189,7 @@
+ if (r != -ENOENT)
+ log_warning("Failed to read /etc/profile.env: %s", strerror(-r));
}
-
--#if defined(TARGET_FEDORA) || defined(TARGET_ALTLINUX)
-+#if defined(TARGET_FEDORA) || defined(TARGET_PLD) || defined(TARGET_ALTLINUX)
+-#elif defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA )
++#elif defined(TARGET_PLD) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA )
if (r <= 0 &&
(r = parse_env_file("/etc/sysconfig/i18n", NEWLINE,
- "LANG", &variables[VARIABLE_LANG],
+ "LANG", &variables[VARIABLE_LANG],
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 298cb4e..cec3974 100644
--- a/src/systemctl/systemctl.c
@@ -157,32 +153,36 @@ index 298cb4e..cec3974 100644
const char *verb = args[0];
unsigned f = 1, t = 1;
LookupPaths paths;
-diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
-index 16f54b5..758b9df 100644
---- a/src/timedate/timedated.c
-+++ b/src/timedate/timedated.c
-@@ -174,7 +174,7 @@ static int read_data(void) {
- if (r != -ENOENT)
- log_warning("Failed to read /etc/timezone: %s", strerror(-r));
-
--#ifdef TARGET_FEDORA
-+#if defined(TARGET_FEDORA) || defined(TARGET_PLD)
- r = parse_env_file("/etc/sysconfig/clock", NEWLINE,
- "ZONE", &zone,
- NULL);
-diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
-index 9196789..1d1a916 100644
---- a/src/vconsole/vconsole-setup.c
-+++ b/src/vconsole/vconsole-setup.c
-@@ -230,7 +230,7 @@ int main(int argc, char **argv) {
+#diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
+#index 16f54b5..758b9df 100644
+#--- a/src/timedate/timedated.c
+#+++ b/src/timedate/timedated.c
+#@@ -174,7 +174,7 @@ static int read_data(void) {
+# if (r != -ENOENT)
+# log_warning("Failed to read /etc/timezone: %s", strerror(-r));
+#
+#-#ifdef TARGET_FEDORA
+#+#if defined(TARGET_FEDORA) || defined(TARGET_PLD)
+# r = parse_env_file("/etc/sysconfig/clock", NEWLINE,
+# "ZONE", &zone,
+# NULL);
+--- systemd-196/src/vconsole/vconsole-setup.c.orig 2012-11-22 19:52:29.773766819 +0100
++++ systemd-196/src/vconsole/vconsole-setup.c 2012-11-22 21:16:19.416995321 +0100
+@@ -358,6 +358,14 @@
+ free(vc_keymap);
+ vc_keymap = t;
+ }
++#elif defined(TARGET_PLD)
++ r = parse_env_file("/etc/sysconfig/console", NEWLINE,
++ "CONSOLEFONT", &vc_font,
++ "CONSOLESCREENFONTMAP", &vc_font_map,
++ "CONSOLEMAP", &vc_font_unimap,
++ NULL);
++ if (r < 0 && r != -ENOENT)
++ log_warning("Failed to read /etc/sysconfig/console: %s", strerror(-r));
+ #endif
}
- if (r <= 0) {
--#if defined(TARGET_FEDORA)
-+#if defined(TARGET_FEDORA) || defined(TARGET_PLD)
- r = parse_env_file("/etc/sysconfig/i18n", NEWLINE,
- "SYSFONT", &vc_font,
- "SYSFONTACM", &vc_font_map,
diff --git a/units/console-shell.service.m4.in b/units/console-shell.service.m4.in
index 02adc84..a9f31fd 100644
--- a/units/console-shell.service.m4.in
diff --git a/udevadm-in-sbin.patch b/udevadm-in-sbin.patch
index 2e4e6fe..7541fc7 100644
--- a/udevadm-in-sbin.patch
+++ b/udevadm-in-sbin.patch
@@ -16,14 +16,11 @@
RemainAfterExit=yes
-ExecStart=@bindir@/udevadm trigger --type=subsystems --action=add ; @bindir@/udevadm trigger --type=devices --action=add
+ExecStart=@sbindir@/udevadm trigger --type=subsystems --action=add ; @sbindir@/udevadm trigger --type=devices --action=add
---- systemd-183/units/systemd-udev-settle.service.in~ 2012-05-30 13:43:34.886201138 +0200
-+++ systemd-183/units/systemd-udev-settle.service.in 2012-05-30 13:55:44.546175399 +0200
-@@ -29,7 +29,7 @@
+--- systemd-195/units/systemd-udev-settle.service.in.orig 2012-11-18 20:33:15.230919232 +0100
++++ systemd-195/units/systemd-udev-settle.service.in 2012-11-18 20:47:27.324234805 +0100
+@@ -27,4 +27,4 @@
Type=oneshot
TimeoutSec=180
RemainAfterExit=yes
-ExecStart=@bindir@/udevadm settle
+ExecStart=@sbindir@/udevadm settle
-
- [Install]
- WantedBy=basic.target
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/systemd.git/commitdiff/aa52b0b63b93ee252a0f38fef9f5ba7dcb23876e
More information about the pld-cvs-commit
mailing list