[packages/systemd] - updated to 196 - disabled initrd package, use normal udevd for initrd from now on - added python b

baggins baggins at pld-linux.org
Thu Dec 20 11:54:59 CET 2012 

commit 618c1d39366d5e1559b6c1671e7acee369415990
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Dec 20 11:51:53 2012 +0100

    - updated to 196
    - disabled initrd package, use normal udevd for initrd from now on
    - added python bindings package
    - enabled coredump-to-journal support, it's properly working now
    - updated patches and removed obsolete kmsg-to-syslog patch
    - added udev hwdb

 kmsg-to-syslog.patch    | 11 ---------
 net-rename-revert.patch |  2 +-
 pld-sysv-network.patch  |  6 ++---
 systemd.spec            | 66 ++++++++++++++++++++++++++++++++++++++-----------
 target-pld.patch        | 47 ++++++++++++++++-------------------
 udevadm-in-sbin.patch   |  5 +---
 6 files changed, 77 insertions(+), 60 deletions(-)
---
diff --git a/systemd.spec b/systemd.spec
index 014162d..a57c6d0 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -11,7 +11,7 @@
 %bcond_without	selinux		# without SELinux support
 %bcond_without	tcpd		# libwrap (tcp_wrappers) support
 
-%bcond_without	initrd		# build without udev-initrd
+%bcond_with	initrd		# build without udev-initrd
 %bcond_with	uClibc		# link initrd version with static uClibc
 %bcond_with	klibc		# link initrd version with static klibc
 %bcond_with	dietlibc	# link initrd version with static dietlibc (currently broken and unsupported)
@@ -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,6 @@ Patch1:		config-pld.patch
 Patch2:		shut-sysv-up.patch
 Patch3:		pld-sysv-network.patch
 Patch4:		tmpfiles-not-fatal.patch
-Patch5:		kmsg-to-syslog.patch
 Patch6:		udev-so.patch
 Patch7:		udev-uClibc.patch
 Patch8:		udev-ploop-rules.patch
@@ -108,7 +107,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
@@ -551,6 +552,19 @@ A userspace implementation of devfs - static binary for initrd.
 Implementacja devfs w przestrzeni użytkownika - statyczna binarka dla
 initrd.
 
+%package -n python-systemd
+Summary:	Systemd Python bindings
+Summary(pl.UTF-8):	Wiązania do Systemd dla Pythona
+Group:		Development/Languages/Python
+%pyrequires_eq	python
+Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
+
+%description -n python-systemd
+Systemd Python bindings.
+
+%description -n python-systemd -l pl.UTF-8
+Wiązania do Systemd dla Pythona.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -558,7 +572,6 @@ initrd.
 #patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 %patch6 -p1
 %if %{with uClibc}
 %patch7 -p1
@@ -595,10 +608,8 @@ patch -p1 <%{PATCH100}
 	--disable-keymap \
 	--disable-gtk-doc \
 	--disable-introspection \
-	--with-pci-ids-path=%{_sysconfdir}/pci.ids \
 	--disable-audit \
 	--disable-pam \
-	--disable-plymouth \
 	--disable-selinux \
 	--enable-split-usr
 
@@ -639,7 +650,6 @@ patch -p1 -R <%{PATCH100}
 	%{__enable_disable pam} \
 	%{__enable_disable selinux} \
 	%{__enable_disable tcpd tcpwrap} \
-	--disable-plymouth \
 	--disable-silent-rules \
 	--enable-shared \
 	--enable-static \
@@ -647,7 +657,6 @@ patch -p1 -R <%{PATCH100}
 	--with-rootprefix="" \
 	--with-rootlibdir=/%{_lib} \
 	--with-html-dir=%{_gtkdocdir} \
-	--with-pci-ids-path=%{_sysconfdir}/pci.ids \
 	--enable-gtk-doc \
 	--enable-introspection \
 	--enable-split-usr
@@ -958,6 +967,10 @@ 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-coredumpctl
+%attr(755,root,root) %{_bindir}/timedatectl
 %attr(755,root,root) %{_bindir}/systemd-cat
 %attr(755,root,root) %{_bindir}/systemd-cgtop
 %attr(755,root,root) %{_bindir}/systemd-cgls
@@ -1010,6 +1023,7 @@ fi
 %{_libexecdir}/tmpfiles.d/systemd.conf
 %{_libexecdir}/tmpfiles.d/tmp.conf
 %{_libexecdir}/tmpfiles.d/x11.conf
+%{_libexecdir}/systemd/catalog
 %{_datadir}/dbus-1/interfaces/org.freedesktop.hostname1.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.locale1.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.*.xml
@@ -1027,6 +1041,10 @@ fi
 %{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy
 %dir %{_datadir}/systemd
 %{_datadir}/systemd/kbd-model-map
+%{_mandir}/man1/hostnamectl.1*
+%{_mandir}/man1/localectl.1*
+%{_mandir}/man1/systemd-coredumpctl.1*
+%{_mandir}/man1/timedatectl.1*
 %{_mandir}/man1/journalctl.1*
 %{_mandir}/man1/loginctl.1*
 %{_mandir}/man1/systemd.1*
@@ -1047,6 +1065,7 @@ fi
 %{_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 +1073,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*
@@ -1074,6 +1092,10 @@ fi
 %{_mandir}/man8/systemd-quotacheck.8*
 %{_mandir}/man8/systemd-random-seed.8*
 %{_mandir}/man8/systemd-readahead.8*
+%{_mandir}/man8/systemd-fsck.8*
+%{_mandir}/man8/systemd-hybrid-sleep.service.8*
+%{_mandir}/man8/systemd-udevd-control.socket.8*
+%{_mandir}/man8/systemd-udevd-kernel.socket.8*
 %{_mandir}/man8/systemd-remount-fs.8*
 %{_mandir}/man8/systemd-shutdown.8*
 %{_mandir}/man8/systemd-shutdownd.8*
@@ -1128,10 +1150,7 @@ fi
 %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.
-#%{_libexecdir}/sysctl.d/coredump.conf
+%{_libexecdir}/sysctl.d/coredump.conf
 %attr(755,root,root) /bin/systemctl
 %attr(755,root,root) /bin/systemd-tmpfiles
 %attr(755,root,root) /bin/systemd_booted
@@ -1144,6 +1163,7 @@ fi
 %{systemdunitdir}/*.mount
 %{systemdunitdir}/*.path
 %{systemdunitdir}/*.service
+%exclude %{systemdunitdir}/rc-inetd.service
 %{systemdunitdir}/*.socket
 %{systemdunitdir}/*.target
 %{systemdunitdir}/*.timer
@@ -1302,6 +1322,7 @@ fi
 
 %dir %{_sysconfdir}/udev
 %dir %{_sysconfdir}/udev/rules.d
+%dir %{_sysconfdir}/udev/hwdb.d
 
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/modprobe.d/fbdev-blacklist.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/modprobe.d/udev_blacklist.conf
@@ -1322,6 +1343,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
@@ -1332,6 +1354,14 @@ fi
 /lib/udev/rules.d/95-keymap.rules
 /lib/udev/rules.d/95-udev-late.rules
 
+%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
+
 %{_mandir}/man7/udev.7*
 %{_mandir}/man8/udevadm.8*
 %{_mandir}/man8/udevd.8*
@@ -1389,3 +1419,9 @@ fi
 %attr(755,root,root) %{_libdir}/initrd/udev/collect
 %attr(755,root,root) %{_libdir}/initrd/udev/mtd_probe
 %endif
+
+%files -n python-systemd
+%defattr(644,root,root,755)
+%dir %{py_sitedir}/systemd
+%{py_sitedir}/systemd/*.py*
+%attr(755,root,root) %{py_sitedir}/systemd/*.so
diff --git a/kmsg-to-syslog.patch b/kmsg-to-syslog.patch
deleted file mode 100644
index 6590be9..0000000
--- a/kmsg-to-syslog.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- systemd-44/src/journal/journald.conf~	2012-03-15 23:13:15.000000000 +0100
-+++ systemd-44/src/journal/journald.conf	2012-04-23 08:17:08.660433320 +0200
-@@ -22,7 +22,7 @@
- #ForwardToSyslog=yes
- #ForwardToKMsg=no
- #ForwardToConsole=no
--#ImportKernel=no
-+ImportKernel=no
- #TTYPath=/dev/console
- #MaxLevelStore=debug
- #MaxLevelSyslog=debug
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..224b8e4 100644
--- a/pld-sysv-network.patch
+++ b/pld-sysv-network.patch
@@ -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..47a3e83 100644
--- a/target-pld.patch
+++ b/target-pld.patch
@@ -108,8 +108,8 @@ index 2c2f10c..754f0c7 100644
  #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"
@@ -117,8 +117,8 @@ index 2c2f10c..754f0c7 100644
  
  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;
  
@@ -139,8 +139,8 @@ index 7f692e9..0a45854 100644
                          log_warning("Failed to read /etc/locale.conf: %s", strerror(-r));
          }
  
--#if defined(TARGET_FEDORA) || defined(TARGET_ALTLINUX)
-+#if defined(TARGET_FEDORA) || defined(TARGET_PLD) || defined(TARGET_ALTLINUX)
+-#if defined(TARGET_ALTLINUX)
++#if defined(TARGET_PLD) || defined(TARGET_ALTLINUX)
          if (r <= 0 &&
              (r = parse_env_file("/etc/sysconfig/i18n", NEWLINE,
                                  "LANG", &variables[VARIABLE_LANG],
@@ -157,32 +157,27 @@ 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) {
+@@ -358,6 +358,16 @@
+                         free(vc_keymap);
+                         vc_keymap = t;
+                 }
++
++#elif defined(TARGET_PLD)
++                r = parse_env_file("/etc/sysconfig/console", NEWLINE,
++                                   "CONSOLEFONT", &vc_font,
++                                   "CONSOLEMAP", &vc_font_map,
++                                   "CONSOLESCREENFONTMAP", &vc_font_unimap,
++                                   "KEYTABLE", &vc_keymap,
++                                   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..e0d5d29 100644
--- a/udevadm-in-sbin.patch
+++ b/udevadm-in-sbin.patch
@@ -18,12 +18,9 @@
 +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 @@
+@@ -29,4 +29,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/618c1d39366d5e1559b6c1671e7acee369415990

More information about the pld-cvs-commit mailing list