commit systemd for openSUSE:12.2

3 Jul 2012

Hello community,

here is the log from the commit of package systemd for openSUSE:12.2 checked in at 2012-07-03 14:13:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.2/systemd (Old)
 and      /work/SRC/openSUSE:12.2/.systemd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "systemd", Maintainer is ""

Changes:
--------

--- /work/SRC/openSUSE:12.2/systemd/systemd.changes	2012-06-25 15:54:42.000000000 +0200
+++ /work/SRC/openSUSE:12.2/.systemd.new/systemd.changes	2012-07-03 14:26:13.000000000 +0200
@@ -1,0 +2,7 @@
+Mon Jul  2 15:44:28 UTC 2012 - fcrozat@suse.com
+
+- Do not ship plymouth units, they are shipped by plymouth package
+  now (bnc#769397).
+- Fix module loading (bnc#769462)
+
+-------------------------------------------------------------------

Old:
----
  correct_plymouth_paths_and_conflicts.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ systemd.spec ++++++
--- /var/tmp/diff_new_pack.CMoXt4/_old	2012-07-03 14:26:13.000000000 +0200
+++ /var/tmp/diff_new_pack.CMoXt4/_new	2012-07-03 14:26:13.000000000 +0200
@@ -82,7 +82,6 @@
 Patch33:        crypt-loop-file.patch
 Patch36:        sysctl-modules.patch
 Patch38:        dm-lvm-after-local-fs-pre-target.patch
-Patch39:        correct_plymouth_paths_and_conflicts.patch
 Patch41:        0001-add-sparse-support-to-detect-endianness-bug.patch
 
 # Upstream First - Policy:
@@ -125,15 +124,6 @@
 %description sysvinit
 Drop-in replacement of System V init tools.
 
-%package plymouth
-Summary:        Plymouth support for systemd
-Group:          System/Base
-Requires:       %{name} = %{version}
-Requires:       plymouth
-
-%description plymouth
-Plymouth integration for systemd
-
 %prep
 %setup -q
 %patch1 -p1
@@ -152,7 +142,6 @@
 %patch33 -p1
 %patch36 -p1
 %patch38 -p1
-%patch39 -p1
 %patch40 -p1
 %patch41 -p1
 %patch42 -p1
@@ -166,6 +155,7 @@
 find . -name "*.[1-8]" -exec touch '{}' \;
 touch src/systemadm.c
 export V=1
+# disable plymouth at configure time, units are shipped in plymouth package now
 %configure \
   --with-distro=suse \
   --docdir=%{_docdir}/systemd \
@@ -173,6 +163,7 @@
   --with-pamlibdir=/%{_lib}/security \
   --enable-split-usr \
   --disable-gtk \
+  --disable-plymouth \
   CFLAGS="%{optflags}"
 make %{?_smp_mflags}
 
@@ -350,10 +341,6 @@
 %{_datadir}/polkit-1/actions
 %{_datadir}/polkit-1/actions/org.freedesktop.systemd1.policy
 %{_datadir}/systemd
-# Packaged in plymouth subpackage
-%exclude /lib/systemd/system/plymouth-*.service
-%exclude /lib/systemd/system/*.wants/plymouth-*.service
-%exclude /lib/systemd/system/systemd-ask-password-plymouth.*
 # Packaged in gtk subpackage
 %exclude %{_mandir}/man1/systemadm.1*
 # Packaged in sysvinit subpackage
@@ -404,12 +391,6 @@
 %{_libdir}/pkgconfig/libsystemd-id128.pc
 %{_libdir}/pkgconfig/libsystemd-journal.pc
 
-%files plymouth
-%defattr(-,root,root,-)
-/lib/systemd/system/plymouth-*.service
-/lib/systemd/system/*.wants/plymouth-*.service
-/lib/systemd/system/systemd-ask-password-plymouth.*
-
 %files sysvinit
 %defattr(-,root,root,-)
 /sbin/init

++++++ modules_on_boot.patch ++++++
--- /var/tmp/diff_new_pack.CMoXt4/_old	2012-07-03 14:26:13.000000000 +0200
+++ /var/tmp/diff_new_pack.CMoXt4/_new	2012-07-03 14:26:13.000000000 +0200
@@ -7,10 +7,10 @@
  src/modules-load.c |   42 ++++++++++++++++++++++++++++++++++++++++++
  1 files changed, 42 insertions(+), 0 deletions(-)
 
-Index: systemd-41/src/modules-load.c
+Index: systemd-44/src/modules-load.c
 ===================================================================
---- systemd-41.orig/src/modules-load.c
-+++ systemd-41/src/modules-load.c
+--- systemd-44.orig/src/modules-load.c
++++ systemd-44/src/modules-load.c
 @@ -44,6 +44,9 @@ static void systemd_kmod_log(void *data,
  int main(int argc, char *argv[]) {
          int r = EXIT_FAILURE;
@@ -21,7 +21,7 @@
          struct kmod_ctx *ctx;
          const int probe_flags = KMOD_PROBE_APPLY_BLACKLIST|KMOD_PROBE_IGNORE_LOADED;
  
-@@ -141,9 +144,58 @@ int main(int argc, char *argv[]) {
+@@ -141,9 +144,59 @@ int main(int argc, char *argv[]) {
  
                  fclose(f);
          }
@@ -67,6 +67,7 @@
 +                                }
  
 +                                kmod_module_unref_list(modlist);
++                                modlist = NULL;
 +                        }
 +                }
 +                strv_free(modules);
@@ -80,10 +81,10 @@
          kmod_unref(ctx);
  
          return r;
-Index: systemd-41/units/systemd-modules-load.service.in
+Index: systemd-44/units/systemd-modules-load.service.in
 ===================================================================
---- systemd-41.orig/units/systemd-modules-load.service.in
-+++ systemd-41/units/systemd-modules-load.service.in
+--- systemd-44.orig/units/systemd-modules-load.service.in
++++ systemd-44/units/systemd-modules-load.service.in
 @@ -11,6 +11,7 @@ DefaultDependencies=no
  Conflicts=shutdown.target
  After=systemd-readahead-collect.service systemd-readahead-replay.service


-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

commit systemd for openSUSE:12.2

root＠hilbert.suse.de