Accepting request 227295 from openSUSE:Factory:Staging:Gcc49

- also autoreconf in systemd-mini to simplify spec file logic
  and fix build in staging:gcc49
  (obsoleting 0002-make-209-working-on-older-dist.patch)

OBS-URL: https://build.opensuse.org/request/show/227295
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=572

0002-make-209-working-on-older-dist.patch

@@ -1,65 +0,0 @@
---- systemd-209/units/kmod-static-nodes.service.in
-+++ systemd-209/units/kmod-static-nodes.service.in	2014-02-27 15:04:30.378236539 +0000
-@@ -15,4 +15,5 @@ ConditionPathExists=/lib/modules/%v/modu
- [Service]
- Type=oneshot
- RemainAfterExit=yes
-+ExecStartPre=@MKDIR_P@ /run/tmpfiles.d
- ExecStart=@KMOD@ static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf
---- systemd-209/configure
-+++ systemd-209/configure	2014-02-28 17:13:50.770735397 +0000
-@@ -15999,12 +15999,12 @@ if test -n "$KMOD_CFLAGS"; then
-     pkg_cv_KMOD_CFLAGS="$KMOD_CFLAGS"
-  elif test -n "$PKG_CONFIG"; then
-     if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" libkmod >= 15 \""; } >&5
--  ($PKG_CONFIG --exists --print-errors " libkmod >= 15 ") 2>&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" libkmod >= 14 \""; } >&5
-+  ($PKG_CONFIG --exists --print-errors " libkmod >= 14 ") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
--  pkg_cv_KMOD_CFLAGS=`$PKG_CONFIG --cflags " libkmod >= 15 " 2>/dev/null`
-+  pkg_cv_KMOD_CFLAGS=`$PKG_CONFIG --cflags " libkmod >= 14 " 2>/dev/null`
- 		      test "x$?" != "x0" && pkg_failed=yes
- else
-   pkg_failed=yes
-@@ -16016,12 +16016,12 @@ if test -n "$KMOD_LIBS"; then
-     pkg_cv_KMOD_LIBS="$KMOD_LIBS"
-  elif test -n "$PKG_CONFIG"; then
-     if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" libkmod >= 15 \""; } >&5
--  ($PKG_CONFIG --exists --print-errors " libkmod >= 15 ") 2>&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" libkmod >= 14 \""; } >&5
-+  ($PKG_CONFIG --exists --print-errors " libkmod >= 14 ") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
--  pkg_cv_KMOD_LIBS=`$PKG_CONFIG --libs " libkmod >= 15 " 2>/dev/null`
-+  pkg_cv_KMOD_LIBS=`$PKG_CONFIG --libs " libkmod >= 14 " 2>/dev/null`
- 		      test "x$?" != "x0" && pkg_failed=yes
- else
-   pkg_failed=yes
-@@ -16042,18 +16042,18 @@ else
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        KMOD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " libkmod >= 15 " 2>&1`
-+	        KMOD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " libkmod >= 14 " 2>&1`
-         else
--	        KMOD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " libkmod >= 15 " 2>&1`
-+	        KMOD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " libkmod >= 14 " 2>&1`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$KMOD_PKG_ERRORS" >&5
- 
--	as_fn_error $? "*** kmod version >= 15 not found" "$LINENO" 5
-+	as_fn_error $? "*** kmod version >= 14 not found" "$LINENO" 5
- elif test $pkg_failed = untried; then
-      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
--	as_fn_error $? "*** kmod version >= 15 not found" "$LINENO" 5
-+	as_fn_error $? "*** kmod version >= 14 not found" "$LINENO" 5
- else
- 	KMOD_CFLAGS=$pkg_cv_KMOD_CFLAGS
- 	KMOD_LIBS=$pkg_cv_KMOD_LIBS

pre_checkin.sh

@@ -4,18 +4,6 @@
 # create a -mini spec for systemd for bootstrapping
 
 ORIG_SPEC=systemd
-for patch in $(grep -lE 'Makefile.(am|in)|configure\.ac' *.patch)
-do
-    sed -rn 's/^Patch([0-9]+):\s+'${patch}'/patch\1/p' $ORIG_SPEC.spec
-done | while read patch
-do
-    grep -1E '^%'${patch}'[^0-9]' $ORIG_SPEC.spec | grep -q bootstrap
-    if ((${PIPESTATUS[1]} != 0))
-    then
-	echo Patch ${patch} does trigger 'auto(re)configure' 1>&2
-	exit 1
-    fi
-done
 EDIT_WARNING="##### WARNING: please do not edit this auto generated spec file. Use the ${ORIG_SPEC}.spec! #####\n"
 sed "s/^%define bootstrap.*$/${EDIT_WARNING}%define bootstrap 1/;
      s/^%define udevpkgname.*$/${EDIT_WARNING}%define udevpkgname udev-mini/;

systemd-mini.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Mar 24 11:19:38 UTC 2014 - coolo@suse.com
+
+- also autoreconf in systemd-mini to simplify spec file logic
+  and fix build in staging:gcc49
+  (obsoleting 0002-make-209-working-on-older-dist.patch)
+
 -------------------------------------------------------------------
 Wed Mar 19 13:21:37 UTC 2014 - werner@suse.de
 

systemd-mini.spec

@@ -151,20 +151,6 @@ Source1061:     write_dev_root_rule
 Source1062:     systemd-udev-root-symlink
 Source1063:     udev-generate-peristent-rule.sh
 
-##############################################################################
-#
-# WARNING: For the case of for bootstrapping patch should not affect
-# the files
-#
-#    Makefile.am, Makefile.in, and configure.ac
-#
-# as this triggers an (re)autoconfigure.  Please check patches with the command
-#
-#   grep -lE 'Makefile.(am|in)|configure\.ac' *.patch
-#
-# to surround them with %if ! 0%{?bootstrap} ... %endif
-#
-##############################################################################
 #
 # PATCH-FIX-UPSTREAM avoid-assertion-if-invalid-address-familily-is-passed-to-g.patch lnussel@suse.com bnc#791101 -- avoid assertion if invalid address familily is passed to gethostbyaddr_r
 Patch0:         avoid-assertion-if-invalid-address-familily-is-passed-to-g.patch
@@ -238,7 +224,6 @@ Patch93:        0001-Don-t-snprintf-a-potentially-NULL-pointer.patch
 Patch114:       0001-systemd-empty-sigmask-on-reexec.patch
 # PATCH-FIX-SUSE 0001-make-209-working-on-older-dist.patch werner@suse.com
 Patch117:       0001-make-209-working-on-older-dist.patch
-Patch118:       0002-make-209-working-on-older-dist.patch
 # PATCH-FIX-SUSE 0001-make-fortify-happy-with-ppoll.patch werner@suse.com
 Patch119:       0001-make-fortify-happy-with-ppoll.patch
 # PATCH-FIX-SUSE 0001-avoid-abort-due-timeout-at-user-service.patch werner@suse.com
@@ -579,18 +564,11 @@ cp %{SOURCE7} m4/
 
 # systemd patches
 %patch0 -p1
-%if ! 0%{?bootstrap}
 %patch1 -p1
-%endif
 %patch3 -p1
-# don't apply when bootstrapping to not modify configure.in
-%if ! 0%{?bootstrap}
 %patch4 -p1
-%endif
 %patch5 -p1
-%if ! 0%{?bootstrap}
 %patch6 -p1
-%endif
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
@@ -600,9 +578,7 @@ cp %{SOURCE7} m4/
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
-%if ! 0%{?bootstrap}
 %patch17 -p1
-%endif
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
@@ -625,19 +601,13 @@ cp %{SOURCE7} m4/
 %patch46 -p1
 %patch47 -p1
 %patch84 -p1
-%if ! 0%{?bootstrap}
 %patch86 -p1
-%endif
 %patch90 -p1
 %patch91 -p1
 %patch93 -p1
 %patch114 -p0
 %if 0%{?suse_version} <= 1310
-%if ! 0%{?bootstrap}
 %patch117 -p1
-%else
-%patch118 -p1
-%endif
 %endif
 %patch119 -p1
 %patch120 -p1
@@ -654,9 +624,7 @@ cp %{SOURCE7} m4/
 %patch131 -p0
 %patch132 -p0
 %patch133 -p0
-%if ! 0%{?bootstrap}
 %patch134 -p0
-%endif
 %patch135 -p0
 %patch136 -p0
 %patch137 -p0
@@ -690,19 +658,13 @@ cp %{SOURCE7} m4/
 %patch1014 -p1
 %patch1018 -p1
 %patch1019 -p1
-%if ! 0%{?bootstrap}
 %patch1020 -p1
-%endif
 %patch1022 -p1
 %patch1023 -p1
 %patch1024 -p1
-%if ! 0%{?bootstrap}
 %patch1999 -p1
-%endif
 %patch2000 -p1
-%if ! 0%{?bootstrap}
 %patch2001 -p1
-%endif
 # udev patches
 %patch1034 -p0
 %patch1035 -p0
@@ -711,23 +673,16 @@ cp %{SOURCE7} m4/
 %patch1003 -p1
 %patch1005 -p1
 %patch1006 -p1
-# don't apply when bootstrapping to not modify Makefile.am
-%if ! 0%{?bootstrap}
 %patch1007 -p1
-%endif
 %if 0%{?suse_version} <= 1310
-%if ! 0%{?bootstrap}
 %patch1008 -p1
 %endif
-%endif
 
 # ensure generate files are removed
 rm -f units/emergency.service
 
 %build
-%if ! 0%{?bootstrap}
 autoreconf -fiv
-%endif
 # prevent pre-generated and distributed files from re-building
 find . -name "*.[1-8]" -exec touch '{}' '+';
 export V=1
@@ -1250,9 +1205,7 @@ exit 0
 %{_prefix}/lib/systemd/system-generators/systemd-rc-local-generator
 %{_prefix}/lib/systemd/system-generators/systemd-fstab-generator
 %{_prefix}/lib/systemd/system-generators/systemd-system-update-generator
-%if ! 0%{?bootstrap}
 %{_prefix}/lib/systemd/system-generators/systemd-insserv-generator
-%endif
 %{_prefix}/lib/systemd/system-generators/systemd-gpt-auto-generator
 /%{_lib}/security/pam_systemd.so
 /etc/pam.d/systemd-user
@@ -1338,9 +1291,7 @@ exit 0
 %{_prefix}/lib/udev/rules.d/73-seat-numlock.rules
 %endif
 %{_prefix}/lib/udev/rules.d/99-systemd.rules
-%if ! 0%{?bootstrap}
 %{_prefix}/lib/udev/numlock-on
-%endif
 %if 0%{suse_version} < 1310
 %{_sysconfdir}/rpm/macros.systemd
 %endif

systemd.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Mar 24 11:19:38 UTC 2014 - coolo@suse.com
+
+- also autoreconf in systemd-mini to simplify spec file logic
+  and fix build in staging:gcc49
+  (obsoleting 0002-make-209-working-on-older-dist.patch)
+
 -------------------------------------------------------------------
 Wed Mar 19 13:21:37 UTC 2014 - werner@suse.de
 

systemd.spec

@@ -146,20 +146,6 @@ Source1061:     write_dev_root_rule
 Source1062:     systemd-udev-root-symlink
 Source1063:     udev-generate-peristent-rule.sh
 
-##############################################################################
-#
-# WARNING: For the case of for bootstrapping patch should not affect
-# the files
-#
-#    Makefile.am, Makefile.in, and configure.ac
-#
-# as this triggers an (re)autoconfigure.  Please check patches with the command
-#
-#   grep -lE 'Makefile.(am|in)|configure\.ac' *.patch
-#
-# to surround them with %if ! 0%{?bootstrap} ... %endif
-#
-##############################################################################
 #
 # PATCH-FIX-UPSTREAM avoid-assertion-if-invalid-address-familily-is-passed-to-g.patch lnussel@suse.com bnc#791101 -- avoid assertion if invalid address familily is passed to gethostbyaddr_r
 Patch0:         avoid-assertion-if-invalid-address-familily-is-passed-to-g.patch
@@ -233,7 +219,6 @@ Patch93:        0001-Don-t-snprintf-a-potentially-NULL-pointer.patch
 Patch114:       0001-systemd-empty-sigmask-on-reexec.patch
 # PATCH-FIX-SUSE 0001-make-209-working-on-older-dist.patch werner@suse.com
 Patch117:       0001-make-209-working-on-older-dist.patch
-Patch118:       0002-make-209-working-on-older-dist.patch
 # PATCH-FIX-SUSE 0001-make-fortify-happy-with-ppoll.patch werner@suse.com
 Patch119:       0001-make-fortify-happy-with-ppoll.patch
 # PATCH-FIX-SUSE 0001-avoid-abort-due-timeout-at-user-service.patch werner@suse.com
@@ -574,18 +559,11 @@ cp %{SOURCE7} m4/
 
 # systemd patches
 %patch0 -p1
-%if ! 0%{?bootstrap}
 %patch1 -p1
-%endif
 %patch3 -p1
-# don't apply when bootstrapping to not modify configure.in
-%if ! 0%{?bootstrap}
 %patch4 -p1
-%endif
 %patch5 -p1
-%if ! 0%{?bootstrap}
 %patch6 -p1
-%endif
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
@@ -595,9 +573,7 @@ cp %{SOURCE7} m4/
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
-%if ! 0%{?bootstrap}
 %patch17 -p1
-%endif
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
@@ -620,19 +596,13 @@ cp %{SOURCE7} m4/
 %patch46 -p1
 %patch47 -p1
 %patch84 -p1
-%if ! 0%{?bootstrap}
 %patch86 -p1
-%endif
 %patch90 -p1
 %patch91 -p1
 %patch93 -p1
 %patch114 -p0
 %if 0%{?suse_version} <= 1310
-%if ! 0%{?bootstrap}
 %patch117 -p1
-%else
-%patch118 -p1
-%endif
 %endif
 %patch119 -p1
 %patch120 -p1
@@ -649,9 +619,7 @@ cp %{SOURCE7} m4/
 %patch131 -p0
 %patch132 -p0
 %patch133 -p0
-%if ! 0%{?bootstrap}
 %patch134 -p0
-%endif
 %patch135 -p0
 %patch136 -p0
 %patch137 -p0
@@ -685,19 +653,13 @@ cp %{SOURCE7} m4/
 %patch1014 -p1
 %patch1018 -p1
 %patch1019 -p1
-%if ! 0%{?bootstrap}
 %patch1020 -p1
-%endif
 %patch1022 -p1
 %patch1023 -p1
 %patch1024 -p1
-%if ! 0%{?bootstrap}
 %patch1999 -p1
-%endif
 %patch2000 -p1
-%if ! 0%{?bootstrap}
 %patch2001 -p1
-%endif
 # udev patches
 %patch1034 -p0
 %patch1035 -p0
@@ -706,23 +668,16 @@ cp %{SOURCE7} m4/
 %patch1003 -p1
 %patch1005 -p1
 %patch1006 -p1
-# don't apply when bootstrapping to not modify Makefile.am
-%if ! 0%{?bootstrap}
 %patch1007 -p1
-%endif
 %if 0%{?suse_version} <= 1310
-%if ! 0%{?bootstrap}
 %patch1008 -p1
 %endif
-%endif
 
 # ensure generate files are removed
 rm -f units/emergency.service
 
 %build
-%if ! 0%{?bootstrap}
 autoreconf -fiv
-%endif
 # prevent pre-generated and distributed files from re-building
 find . -name "*.[1-8]" -exec touch '{}' '+';
 export V=1
@@ -1245,9 +1200,7 @@ exit 0
 %{_prefix}/lib/systemd/system-generators/systemd-rc-local-generator
 %{_prefix}/lib/systemd/system-generators/systemd-fstab-generator
 %{_prefix}/lib/systemd/system-generators/systemd-system-update-generator
-%if ! 0%{?bootstrap}
 %{_prefix}/lib/systemd/system-generators/systemd-insserv-generator
-%endif
 %{_prefix}/lib/systemd/system-generators/systemd-gpt-auto-generator
 /%{_lib}/security/pam_systemd.so
 /etc/pam.d/systemd-user
@@ -1333,9 +1286,7 @@ exit 0
 %{_prefix}/lib/udev/rules.d/73-seat-numlock.rules
 %endif
 %{_prefix}/lib/udev/rules.d/99-systemd.rules
-%if ! 0%{?bootstrap}
 %{_prefix}/lib/udev/numlock-on
-%endif
 %if 0%{suse_version} < 1310
 %{_sysconfdir}/rpm/macros.systemd
 %endif