[packages/systemd/DEVEL] - started update to 197 - partially updated target-pld and config-pld patches; most of the distro-
qboosh
qboosh at pld-linux.org
Thu Jan 10 21:39:04 CET 2013
commit 91bc913765e47f2513726a5bd5fa68602f0f1a66
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Thu Jan 10 21:38:57 2013 +0100
- started update to 197
- partially updated target-pld and config-pld patches;
most of the distro-specific stuff support has been dropped upstream
in favor of systemd-specific solutions; only some knobs left at
configure level
- release 0.1
config-pld.patch | 29 +++--
systemd.spec | 46 +++++--
target-pld.patch | 370 +++++++++++++------------------------------------------
udev-so.patch | 18 ++-
4 files changed, 152 insertions(+), 311 deletions(-)
---
diff --git a/systemd.spec b/systemd.spec
index 5c805ee..ceb59b9 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -1,6 +1,11 @@
# TODO:
-# - pldize vconsole setup:
-# http://cgit.freedesktop.org/systemd/systemd/tree/src/vconsole/vconsole-setup.c
+# - restore PLD support (or drop and switch to systemd solutions?) in:
+# - vconsole setup: http://cgit.freedesktop.org/systemd/systemd/tree/src/vconsole/vconsole-setup.c
+# (only vconsole.* from /proc/cmdline and /etc/vconsole.conf supported upstream)
+# - prefdm unit (dropped upstream, left in patch but unbound)
+# - hostname in /etc/sysconfig/network (only /etc/hostname supported upstream)
+# - locales (only locale.* from /proc/cmdline and /etc/locale.conf supported upstream)
+# - units/rescue.service.m4.in
# - initrd needs love (does not build and is probably completly unusable in current form)
# - merge rpm macros provided by systemd with ours
#
@@ -40,13 +45,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: 196
-Release: 3
+Version: 197
+Release: 0.1
Epoch: 1
License: GPL v2+
Group: Base
Source0: http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.xz
-# Source0-md5: 05ebd7f108e420e2b4e4810ea4b3c810
+# Source0-md5: 56a860dceadfafe59f40141eb5223743
Source1: %{name}-sysv-convert
Source2: %{name}_booted.c
Source3: network.service
@@ -598,6 +603,7 @@ cp -p %{SOURCE2} src/systemd_booted.c
%{__autoconf}
%{__autoheader}
%{__automake}
+CPPFLAGS="%{rpmcppflags} -DTARGET_PLD"
%if %{with initrd}
patch -p1 <%{PATCH100}
%configure \
@@ -611,7 +617,6 @@ patch -p1 <%{PATCH100}
--disable-silent-rules \
--disable-shared \
--enable-static \
- --with-distro=pld \
--with-rootprefix="" \
--with-rootlibdir=/%{_lib} \
--disable-audit \
@@ -669,15 +674,20 @@ patch -p1 -R <%{PATCH100}
%{__enable_disable microhttpd} \
%{__enable_disable qrencode} \
--disable-silent-rules \
+ --enable-chkconfig \
--enable-gtk-doc \
--enable-introspection \
--enable-split-usr \
--enable-shared \
--enable-static \
- --with-distro=pld \
+ --with-html-dir=%{_gtkdocdir} \
+ --with-kbd-setfont="/bin/setfont" \
+ --with-rc-local-script-path-start=/etc/rc.d/rc.local \
+ --with-rc-local-script-path-stop=/sbin/halt.local \
--with-rootprefix="" \
--with-rootlibdir=/%{_lib} \
- --with-html-dir=%{_gtkdocdir}
+ --with-sysvinit-path=/etc/rc.d/init.d \
+ --with-sysvrcnd-path=/etc/rc.d
%{__make}
./libtool --mode=link --tag=CC %{__cc} %{rpmcppflags} %{rpmcflags} -o systemd_booted %{rpmldflags} src/systemd_booted.c -L. -lsystemd-daemon
@@ -807,6 +817,8 @@ install -d $RPM_BUILD_ROOT/var/log
:> $RPM_BUILD_ROOT/var/log/btmp
:> $RPM_BUILD_ROOT/var/log/wtmp
+%{__mv} $RPM_BUILD_ROOT{%{_libdir},/%{_lib}}/libnss_myhostname.so.2
+
%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
%{__rm} $RPM_BUILD_ROOT/%{_lib}/security/pam_systemd.la
%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -999,10 +1011,12 @@ fi
%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}/libnss_myhostname.so.2
%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
%attr(755,root,root) /lib/systemd/systemd-binfmt
+%attr(755,root,root) /lib/systemd/systemd-bootchart
%attr(755,root,root) /lib/systemd/systemd-cgroups-agent
%attr(755,root,root) /lib/systemd/systemd-coredump
%{?with_cryptsetup:%attr(755,root,root) /lib/systemd/systemd-cryptsetup}
@@ -1036,6 +1050,7 @@ fi
/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/80-net-name-slot.rules
/lib/udev/rules.d/99-systemd.rules
%dir %{_libexecdir}/systemd
%dir %{_libexecdir}/systemd/catalog
@@ -1070,6 +1085,7 @@ fi
%{_mandir}/man1/loginctl.1*
%{_mandir}/man1/systemd.1*
%{_mandir}/man1/systemd-ask-password.1*
+%{_mandir}/man1/systemd-bootchart.1*
%{_mandir}/man1/systemd-cat.1*
%{_mandir}/man1/systemd-cgls.1*
%{_mandir}/man1/systemd-cgtop.1*
@@ -1102,6 +1118,8 @@ fi
%{_mandir}/man7/kernel-command-line.7*
%{_mandir}/man7/systemd.journal-fields.7*
%{_mandir}/man7/systemd.special.7*
+%{_mandir}/man7/systemd.time.7*
+%{_mandir}/man8/nss-myhostname.8*
%{_mandir}/man8/systemd-binfmt.8*
%{?with_cryptsetup:%{_mandir}/man8/systemd-cryptsetup-generator.8*}
%{_mandir}/man8/systemd-fsck.8*
@@ -1109,6 +1127,9 @@ fi
%{_mandir}/man8/systemd-getty-generator.8*
%{_mandir}/man8/systemd-hostnamed.8*
%{_mandir}/man8/systemd-initctl.8*
+%{_mandir}/man8/systemd-journal-gatewayd.8*
+%{_mandir}/man8/systemd-journal-gatewayd.service.8*
+%{_mandir}/man8/systemd-journal-gatewayd.socket.8*
%{_mandir}/man8/systemd-journald.8*
%{_mandir}/man8/systemd-localed.8*
%{_mandir}/man8/systemd-logind.8*
@@ -1189,7 +1210,7 @@ fi
%{systemdunitdir}/*.timer
%dir %{systemdunitdir}/basic.target.wants
%dir %{systemdunitdir}/dbus.target.wants
-%dir %{systemdunitdir}/final.target.wants
+#%dir %{systemdunitdir}/final.target.wants
%dir %{systemdunitdir}/graphical.target.wants
%dir %{systemdunitdir}/halt.target.wants
%dir %{systemdunitdir}/kexec.target.wants
@@ -1203,11 +1224,11 @@ fi
%dir %{systemdunitdir}/sysinit.target.wants
%dir %{systemdunitdir}/syslog.target.wants
%{systemdunitdir}/basic.target.wants/*
-%{systemdunitdir}/final.target.wants/*
-%{systemdunitdir}/graphical.target.wants/*
+#%{systemdunitdir}/final.target.wants/halt-local.service
+#%{systemdunitdir}/graphical.target.wants/display-manager.service
%{systemdunitdir}/local-fs.target.wants/*
%{systemdunitdir}/multi-user.target.wants/getty.target
-%{systemdunitdir}/multi-user.target.wants/rc-local.service
+#%{systemdunitdir}/multi-user.target.wants/rc-local.service
%{systemdunitdir}/multi-user.target.wants/systemd-ask-password-wall.path
%{systemdunitdir}/multi-user.target.wants/systemd-logind.service
%{systemdunitdir}/multi-user.target.wants/systemd-user-sessions.service
@@ -1341,6 +1362,7 @@ fi
%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-bluetooth-vendor-product.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
diff --git a/config-pld.patch b/config-pld.patch
index 58b544d..9c1515c 100644
--- a/config-pld.patch
+++ b/config-pld.patch
@@ -1,11 +1,26 @@
---- systemd-37/tmpfiles.d/legacy.conf.org 2011-11-29 18:53:25.625949937 +0100
-+++ systemd-37/tmpfiles.d/legacy.conf 2011-11-29 18:53:34.999494346 +0100
-@@ -17,6 +17,5 @@
- # On modern systems a BSD file lock is a better choice if
- # serialization is needed on those devices.
+--- systemd-197/tmpfiles.d/legacy.conf.orig 2013-01-10 18:39:00.583810299 +0100
++++ systemd-197/tmpfiles.d/legacy.conf 2013-01-10 18:46:26.250467676 +0100
+@@ -10,12 +10,12 @@
+ # These files are considered legacy and are unnecessary on legacy-free
+ # systems.
-d /run/lock 0755 root root -
--d /run/lock/subsys 0755 root root -
--d /run/lock/lockdev 0775 root lock -
+d /run/lock 1771 root root -
+
+ # /run/lock/subsys is used for serializing SysV service execution, and
+ # hence without use on SysV-less systems.
+
+-d /run/lock/subsys 0755 root root -
+d /run/lock/subsys 0700 root root -
+
+ # /run/lock/lockdev is used to serialize access to tty devices via
+ # LCK..xxx style lock files, For more information see:
+@@ -23,7 +23,7 @@
+ # On modern systems a BSD file lock is a better choice if
+ # serialization is needed on those devices.
+
+-d /run/lock/lockdev 0775 root lock -
++#d /run/lock/lockdev 0775 root lock -
+
+ # /forcefsck, /fastboot and /forcequotecheck are deprecated in favor of the
+ # kernel command line options 'fsck.mode=force', 'fsck.mode=skip' and
diff --git a/target-pld.patch b/target-pld.patch
index eee49c2..06f5161 100644
--- a/target-pld.patch
+++ b/target-pld.patch
@@ -1,162 +1,46 @@
-diff --git a/Makefile.am b/Makefile.am
-index 170465a..bce467d 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -115,6 +115,12 @@ AM_CPPFLAGS += \
- -DKBD_SETFONT=\"/usr/bin/setfont\" \
- -DDEFAULT_FONT=\"LatArCyrHeb-16\"
- else
-+if TARGET_PLD
-+AM_CPPFLAGS += \
-+ -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
-+ -DKBD_SETFONT=\"/bin/setfont\" \
-+ -DDEFAULT_FONT=\"LatArCyrHeb-16\"
-+else
- AM_CPPFLAGS += \
- -DKBD_LOADKEYS=\"/bin/loadkeys\" \
- -DKBD_SETFONT=\"/bin/setfont\" \
-@@ -132,6 +138,7 @@ endif
- endif
- endif
- endif
-+endif
-
- rootbin_PROGRAMS = \
- systemd \
-@@ -381,6 +388,14 @@
- systemd-rc-local-generator
- endif
-
-+if TARGET_PLD
-+dist_systemunit_DATA += \
-+ units/pld/prefdm.service \
-+ units/pld/halt-local.service
-+systemgenerator_PROGRAMS += \
-+ systemd-rc-local-generator
-+endif
-+
- if TARGET_MANDRIVA
- dist_systemunit_DATA += \
- units/mandriva/prefdm.service \
-@@ -1992,6 +1999,23 @@ if TARGET_FEDORA
- $(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
- endif
-
-+if TARGET_PLD
-+ $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
-+ ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
-+ rm -f rc-local.service && \
-+ $(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
-+ ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
-+ rm -f halt-local.service && \
-+ $(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
-+ ( cd $(DESTDIR)$(systemunitdir) && \
-+ rm -f display-manager.service single.service && \
-+ $(LN_S) prefdm.service display-manager.service && \
-+ $(LN_S) rescue.service single.service )
-+ ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
-+ rm -f display-manager.service && \
-+ $(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
-+endif
-+
- if TARGET_MANDRIVA
- $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
- ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
-diff --git a/configure.ac b/configure.ac
-index 596a32a..f701bfd 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -448,6 +449,12 @@ case $with_distro in
- M4_DEFINES=-DTARGET_MANDRIVA=1
- have_plymouth=yes
- ;;
-+ pld)
-+ SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d
-+ SYSTEM_SYSVRCND_PATH=/etc/rc.d
-+ AC_DEFINE(TARGET_PLD, [], [Target is PLD Linux])
-+ M4_DISTRO_FLAG=-DTARGET_PLD=1
-+ ;;
- angstrom)
- SYSTEM_SYSVRCND_PATH=/etc
- AC_DEFINE(TARGET_ANGSTROM, [], [Target is Ångström])
-@@ -510,6 +517,7 @@ if test -n "$enable_plymouth"; then
- fi
-
- AM_CONDITIONAL(TARGET_FEDORA, test x"$with_distro" = xfedora)
-+AM_CONDITIONAL(TARGET_PLD, test x"$with_distro" = xpld)
- AM_CONDITIONAL(TARGET_SUSE, test x"$with_distro" = xsuse)
- AM_CONDITIONAL(TARGET_DEBIAN, test x"$with_distro" = xdebian)
- AM_CONDITIONAL(TARGET_UBUNTU, test x"$with_distro" = xubuntu)
-diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
-index 3477ba1..d32718d 100644
---- a/src/fsck/fsck.c
-+++ b/src/fsck/fsck.c
-@@ -127,7 +127,7 @@ static int parse_proc_cmdline(void) {
- arg_skip = true;
- else if (startswith(w, "fsck"))
- log_warning("Invalid fsck parameter. Ignoring.");
--#if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
-+#if defined(TARGET_FEDORA) || defined(TARGET_PLD) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
- 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
-@@ -30,7 +30,7 @@
- #include "util.h"
- #include "log.h"
-
--#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) {
-
- static int read_distro_hostname(char **hn) {
-
--#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;
-
-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) {
-
- if (detect_container(NULL) <= 0)
- if ((r = parse_env_file("/proc/cmdline", WHITESPACE,
--#if defined(TARGET_FEDORA)
-+#if defined(TARGET_FEDORA) || defined(TARGET_PLD)
- "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));
- }
-
--#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],
-diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
-index 298cb4e..cec3974 100644
---- a/src/systemctl/systemctl.c
-+++ b/src/systemctl/systemctl.c
-@@ -3460,7 +3460,7 @@ finish:
- static int enable_sysv_units(char **args) {
- int r = 0;
-
--#if defined (HAVE_SYSV_COMPAT) && (defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_SUSE) || defined(TARGET_ALTLINUX) || defined(TARGET_MAGEIA))
-+#if defined (HAVE_SYSV_COMPAT) && (defined(TARGET_FEDORA) || defined(TARGET_PLD) || defined(TARGET_MANDRIVA) || defined(TARGET_SUSE) || defined(TARGET_ALTLINUX) || defined(TARGET_MAGEIA))
- const char *verb = args[0];
- unsigned f = 1, t = 1;
- LookupPaths paths;
+#diff --git a/Makefile.am b/Makefile.am
+#index 170465a..bce467d 100644
+#--- a/Makefile.am
+#+++ b/Makefile.am
+#@@ -381,6 +388,14 @@
+# systemd-rc-local-generator
+# endif
+#
+#+if TARGET_PLD
+#+dist_systemunit_DATA += \
+#+ units/pld/prefdm.service \
+#+ units/pld/halt-local.service
+#+systemgenerator_PROGRAMS += \
+#+ systemd-rc-local-generator
+#+endif
+#+
+# if TARGET_MANDRIVA
+# dist_systemunit_DATA += \
+# units/mandriva/prefdm.service \
+#@@ -1992,6 +1999,23 @@ if TARGET_FEDORA
+# $(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
+# endif
+#
+#+if TARGET_PLD
+#+ $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
+#+ ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
+#+ rm -f rc-local.service && \
+#+ $(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
+#+ ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
+#+ rm -f halt-local.service && \
+#+ $(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
+#+ ( cd $(DESTDIR)$(systemunitdir) && \
+#+ rm -f display-manager.service single.service && \
+#+ $(LN_S) prefdm.service display-manager.service && \
+#+ $(LN_S) rescue.service single.service )
+#+ ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
+#+ rm -f display-manager.service && \
+#+ $(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
+#+endif
+#+
+# if TARGET_MANDRIVA
+# $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
+# ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
--- systemd-196/src/timedate/timedated.c~ 2012-10-16 23:35:40.589269718 +0200
+++ systemd-196/src/timedate/timedated.c 2012-12-21 11:46:13.545086335 +0100
@@ -175,6 +175,15 @@
@@ -175,130 +59,52 @@ index 298cb4e..cec3974 100644
#ifdef HAVE_DEBIAN
r = read_one_line_file("/etc/timezone", &tz.zone);
if (r < 0) {
-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
-@@ -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
- }
-
-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
-+++ b/units/console-shell.service.m4.in
-@@ -11,6 +11,9 @@ After=systemd-user-sessions.service plymouth-quit-wait.service
- m4_ifdef(`TARGET_FEDORA',
- After=rc-local.service
- )m4_dnl
-+m4_ifdef(`TARGET_PLD',
-+After=rc-local.service
-+)m4_dnl
- m4_ifdef(`TARGET_ARCH',
- After=rc-local.service
- )m4_dnl
-diff --git a/units/getty at .service.m4 b/units/getty at .service.m4
-index d2a145d..cae4ae5 100644
---- a/units/getty at .service.m4
-+++ b/units/getty at .service.m4
-@@ -12,6 +12,9 @@ After=dev-%i.device systemd-user-sessions.service plymouth-quit-wait.service
- m4_ifdef(`TARGET_FEDORA',
- After=rc-local.service
- )m4_dnl
-+m4_ifdef(`TARGET_PLD',
-+After=rc-local.service
-+)m4_dnl
- m4_ifdef(`TARGET_ARCH',
- After=rc-local.service
- )m4_dnl
-diff --git a/units/rescue.service.m4.in b/units/rescue.service.m4.in
-index 7dd8a22..5a9c363 100644
---- a/units/rescue.service.m4.in
-+++ b/units/rescue.service.m4.in
-@@ -22,6 +22,9 @@ ExecStartPre=-/bin/echo 'Welcome to rescue mode. Use "systemctl default" or ^D t
- m4_ifdef(`TARGET_FEDORA',
- `EnvironmentFile=/etc/sysconfig/init
- ExecStart=-/bin/bash -c "exec ${SINGLE}"',
-+m4_ifdef(`TARGET_PLD',
-+`EnvironmentFile=/etc/sysconfig/init
-+ExecStart=-/bin/bash -c "exec ${SINGLE}"',
- m4_ifdef(`TARGET_MANDRIVA',
- `EnvironmentFile=/etc/sysconfig/init
- ExecStart=-/bin/bash -c "exec ${SINGLE}"',
-@@ -31,7 +34,7 @@ ExecStart=-/bin/bash -c "exec ${SINGLE}"',
- m4_ifdef(`TARGET_MAGEIA',
- `EnvironmentFile=/etc/sysconfig/init
- ExecStart=-/bin/bash -c "exec ${SINGLE}"',
--`ExecStart=-/sbin/sulogin')))
-+`ExecStart=-/sbin/sulogin'))))
- ExecStopPost=- at SYSTEMCTL@ --fail --no-block default
- StandardInput=tty-force
- StandardOutput=inherit
-diff --git a/units/serial-getty at .service.m4 b/units/serial-getty at .service.m4
-index e5f0ca6..69b7fc2 100644
---- a/units/serial-getty at .service.m4
-+++ b/units/serial-getty at .service.m4
-@@ -12,6 +12,9 @@ After=dev-%i.device systemd-user-sessions.service plymouth-quit-wait.service
- m4_ifdef(`TARGET_FEDORA',
- After=rc-local.service
- )m4_dnl
-+m4_ifdef(`TARGET_PLD',
-+After=rc-local.service
-+)m4_dnl
- m4_ifdef(`TARGET_ARCH',
- After=rc-local.service
- )m4_dnl
-diff --git a/src/rc-local-generator/rc-local-generator.c b/src/rc-local-generator/rc-local-generator.c
-index ac6424a..a247c25 100644
---- a/src/rc-local-generator/rc-local-generator.c
-+++ b/src/rc-local-generator/rc-local-generator.c
-@@ -27,7 +27,7 @@
- #include "util.h"
- #include "mkdir.h"
-
--#if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
-+#if defined(TARGET_FEDORA) || defined(TARGET_PLD) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
- #define SCRIPT_PATH_START "/etc/rc.d/rc.local"
- #elif defined(TARGET_SUSE)
- #define SCRIPT_PATH_START "/etc/init.d/boot.local"
---- /dev/null
-+++ b/units/pld/halt-local.service
-@@ -0,0 +1,20 @@
-+# This file is part of systemd.
-+#
-+# systemd is free software; you can redistribute it and/or modify it
-+# under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+
-+[Unit]
-+Description=/sbin/halt.local Compatibility
-+ConditionFileIsExecutable=/sbin/halt.local
-+DefaultDependencies=no
-+After=shutdown.target
-+Before=final.target
-+
-+[Service]
-+Type=oneshot
-+ExecStart=/sbin/halt.local
-+TimeoutSec=0
-+StandardOutput=tty
-+RemainAfterExit=yes
+#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
+#@@ -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
+# }
+#
+#diff --git a/units/rescue.service.m4.in b/units/rescue.service.m4.in
+#index 7dd8a22..5a9c363 100644
+#--- a/units/rescue.service.m4.in
+#+++ b/units/rescue.service.m4.in
+#@@ -22,6 +22,9 @@ ExecStartPre=-/bin/echo 'Welcome to rescue mode. Use "systemctl default" or ^D t
+# m4_ifdef(`TARGET_FEDORA',
+# `EnvironmentFile=/etc/sysconfig/init
+# ExecStart=-/bin/bash -c "exec ${SINGLE}"',
+#+m4_ifdef(`TARGET_PLD',
+#+`EnvironmentFile=/etc/sysconfig/init
+#+ExecStart=-/bin/bash -c "exec ${SINGLE}"',
+# m4_ifdef(`TARGET_MANDRIVA',
+# `EnvironmentFile=/etc/sysconfig/init
+# ExecStart=-/bin/bash -c "exec ${SINGLE}"',
+#@@ -31,7 +34,7 @@ ExecStart=-/bin/bash -c "exec ${SINGLE}"',
+# m4_ifdef(`TARGET_MAGEIA',
+# `EnvironmentFile=/etc/sysconfig/init
+# ExecStart=-/bin/bash -c "exec ${SINGLE}"',
+#-`ExecStart=-/sbin/sulogin')))
+#+`ExecStart=-/sbin/sulogin'))))
+# ExecStopPost=- at SYSTEMCTL@ --fail --no-block default
+# StandardInput=tty-force
+# StandardOutput=inherit
--- /dev/null
-+++ b/units/pld/prefdm.service
++++ b/units/prefdm.service
@@ -0,0 +1,20 @@
+# This file is part of systemd.
+#
diff --git a/udev-so.patch b/udev-so.patch
index da20d60..041f206 100644
--- a/udev-so.patch
+++ b/udev-so.patch
@@ -1,15 +1,13 @@
---- 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)/libudev.so) && \
+--- systemd-197/Makefile.am.orig 2013-01-10 18:46:53.447133776 +0100
++++ systemd-197/Makefile.am 2013-01-10 18:50:46.550462251 +0100
+@@ -173,8 +173,10 @@
+ $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
+ so_img_name=$$(readlink $(DESTDIR)$(libdir)/$$libname) && \
so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
-- ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libudev.so && \
-- mv $(DESTDIR)$(libdir)/libudev.so.* $(DESTDIR)$(rootlibdir); \
+ if test "x$$so_img_name" != "x"; then \
-+ ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libudev.so && \
-+ mv $(DESTDIR)$(libdir)/libudev.so.* $(DESTDIR)$(rootlibdir); \
+ ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \
+ mv $(DESTDIR)$(libdir)/$$libname.* $(DESTDIR)$(rootlibdir); \
+ fi; true; \
fi
+ endef
- libudev-uninstall-move-hook:
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/systemd.git/commitdiff/91bc913765e47f2513726a5bd5fa68602f0f1a66
More information about the pld-cvs-commit
mailing list