GIT Revision: f223ee652010d2179a7287193aa4d7e6db362131

OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-source?expand=0&rev=7169

kernel-binary.spec.in

@@ -20,6 +20,7 @@
 %define srcversion @SRCVERSION@
 %define patchversion @PATCHVERSION@
 %define variant @VARIANT@%{nil}
+%define vanilla_only @VANILLA_ONLY@
 
 %include %_sourcedir/kernel-spec-macros
 
@@ -297,11 +298,25 @@ fi
 #     %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat)
 %if %CONFIG_KMSG_IDS == "y"
     chmod +x ../linux-%srcversion/scripts/kmsg-doc
-    make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2
-%else
-    make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y
+    MAKE_ARGS="$MAKE_ARGS D=2"
 %endif
 
+while true; do
+    make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y 2>&1 \
+        | tee buildlog
+    if test "${PIPESTATUS[0]}" -eq 0; then
+        break
+    fi
+    # In the linux-next and vanilla branches, we try harder to build a
+    # package.
+    if test 0%vanilla_only -gt 0 &&
+			%_sourcedir/try-disable-staging-driver buildlog; then
+        echo "Retrying make"
+    else
+        exit 1
+    fi
+done
+
 %install
 
 # get rid of /usr/lib/rpm/brp-strip-debug