Accepting request 18054 from Kernel:HEAD

Copy from Kernel:HEAD/kernel-source based on submit request 18054 from user jeff_mahoney

OBS-URL: https://build.opensuse.org/request/show/18054
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kernel-source?expand=0&rev=67

kernel-binary.spec.in

@@ -69,7 +69,19 @@ BuildRequires:  coreutils module-init-tools sparse
 BuildRequires:  fdupes
 Provides:       %{name}_%_target_cpu = %version-%release
 %if %split_base
-Requires:       %name-base_%_target_cpu = %version-%release
+Provides:       kernel-base = %version-%source_rel
+# Disabled for now, as the update doesn't work as expected.
+#Provides:       %name-base = %version-%release
+#Obsoletes:      %name-base <= %version-%release
+# What we want is
+# 11.1      -> 11.2
+# base,main -> main
+# base      -> base
+# If you know how to solve this via rpm dependencies, I'll buy you a
+# chocolate ;).
+# For now the base subpackage will be also updated, but it shouldn't cause any
+# new problems (the overlaping files are identical). New installs will only
+# have the main package.
 %endif
 Requires(pre):  coreutils awk
 Requires(post): module-init-tools
@@ -313,6 +325,17 @@ if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then
     %_sourcedir/modversions --unpack . < $_
 fi
 
+# If the %jobs macro is defined to a number, make will spawn that many jobs.
+# There are several ways how to define it:
+# If you are using the build script:
+#     build --jobs=N kernel-$flavor.spec
+# With plain rpmbuild:
+#     rpmbuild -ba --define 'jobs N' kernel-$flavor.spec
+# To spawn as many jobs as there are cpu cores:
+#     rpmbuild -ba --define "jobs 0$(grep -c ^processor /proc/cpuinfo)" \
+#         kernel-$flavor.spec
+# You can also set this permanently in ~/.rpmmacros:
+#     %jobs 0%(grep -c ^processor /proc/cpuinfo)
 %if %CONFIG_KMSG_IDS == "y"
     chmod +x scripts/kmsg-doc
     make %{?jobs:-j%jobs} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2
@@ -338,10 +361,17 @@ mkdir -p %buildroot/boot
 # (Could strip out non-public symbols.)
 cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
 
+%define extract_vmlinux_debuginfo 0
+%if 0%{?__debug_package:1}
+%ifnarch ppc ppc64
+%define extract_vmlinux_debuginfo 1
+%endif
+%endif
+
 add_vmlinux()
 {
     local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor
-%if 0%{?__debug_package:1}
+%if %extract_vmlinux_debuginfo
     local vmlinux_debug=usr/lib/debug/$vmlinux.debug
     mkdir -p $(dirname %buildroot/$vmlinux_debug)
     cp vmlinux %buildroot/$vmlinux
@@ -422,17 +452,10 @@ add_vmlinux()
 %endif
 
 for sub in '-base' '' '-extra'; do
-    if \
-%if %split_base
-        [ "x$sub" = "x-base" ];
-%else
-        [ "x$sub" = "x" ];
-%endif
-    then
-        base_package=1
-    else
-        base_package=0
-    fi
+    case "$sub" in
+    '-base' | '') base_package=1 ;;
+    *) base_package=0 ;;
+    esac
     for script in preun postun pre post devel-pre devel-post; do
         sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \
             -e "s:@IMAGE@:$image:g" \
@@ -655,7 +678,8 @@ done
 } | add_dirs_to_filelist > %my_builddir/kernel-base.files
 
 %if %split_base
-    add_dirs_to_filelist %my_builddir/main-modules > %my_builddir/kernel-main.files
+    add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
+	> %my_builddir/kernel-main.files
 %endif
 %if %split_extra
     add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
@@ -684,7 +708,6 @@ License:        GPL v2 only
 Group:          System/Kernel
 Url:            http://www.kernel.org/
 AutoReqProv:    on
-Provides:       %name-base_%_target_cpu = %version-%release
 Provides:       kernel-base = %version-%source_rel
 Requires(pre):  coreutils awk
 Requires(post): module-init-tools
@@ -806,6 +829,8 @@ Debug information for package %name-devel
 
 %source_timestamp
 
+%if %extract_vmlinux_debuginfo
 %files devel-debuginfo -f vmlinux.debug.files
+%endif
 
 %changelog