commit 31abf6faa42397c9496f3a3c63796c7fd15cbb12

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

_constraints

@@ -1,5 +1,5 @@
 <constraints>
-  <!-- Require 20GB everywhere except for s390x -->
+  <!-- Default 20GB for binary packages -->
   <overwrite>
     <conditions>
 <package>kernel-debug</package>
@@ -10,11 +10,25 @@
     </conditions>
     <hardware>
       <disk>
-        <size unit="G">20</size>
+        <size unit="G">25</size>
       </disk>
     </hardware>
   </overwrite>
 
+  <!-- 8GB for kernel-source -->
+  <overwrite>
+    <conditions>
+      <package>kernel-source</package>
+      <package>kernel-source-rt</package>
+    </conditions>
+    <hardware>
+      <disk>
+        <size unit="G">8</size>
+      </disk>
+    </hardware>
+  </overwrite>
+
+  <!-- 10GB for binary package on s390x -->
   <overwrite>
     <conditions>
       <arch>s390x</arch>
@@ -31,6 +45,7 @@
     </hardware>
   </overwrite>
 
+  <!-- 8 CPUs for binary packages on x86 -->
   <overwrite>
     <conditions>
       <arch>i586</arch>
@@ -46,6 +61,7 @@
     </hardware>
   </overwrite>
 
+  <!-- 4 CPUs for binary packages on POWER -->
   <overwrite>
     <conditions>
       <arch>ppc</arch>

constraints.in

@@ -1,16 +1,30 @@
 <constraints>
-  <!-- Require 20GB everywhere except for s390x -->
+  <!-- Default 20GB for binary packages -->
   <overwrite>
     <conditions>
 @BINARY_PACKAGES_XML@
     </conditions>
     <hardware>
       <disk>
-        <size unit="G">20</size>
+        <size unit="G">25</size>
       </disk>
     </hardware>
   </overwrite>
 
+  <!-- 8GB for kernel-source -->
+  <overwrite>
+    <conditions>
+      <package>kernel-source</package>
+      <package>kernel-source-rt</package>
+    </conditions>
+    <hardware>
+      <disk>
+        <size unit="G">8</size>
+      </disk>
+    </hardware>
+  </overwrite>
+
+  <!-- 10GB for binary package on s390x -->
   <overwrite>
     <conditions>
       <arch>s390x</arch>
@@ -23,6 +37,7 @@
     </hardware>
   </overwrite>
 
+  <!-- 8 CPUs for binary packages on x86 -->
   <overwrite>
     <conditions>
       <arch>i586</arch>
@@ -34,6 +49,7 @@
     </hardware>
   </overwrite>
 
+  <!-- 4 CPUs for binary packages on POWER -->
   <overwrite>
     <conditions>
       <arch>ppc</arch>

kernel-binary.spec.in

@@ -372,20 +372,16 @@ if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then
     %_sourcedir/modversions --unpack . < $_
 fi
 
-# copy module signing certificate(s)
+# copy module signing certificate(s). We use the default path and trick
+# certs/Makefile to not regenerate the certificate. It is done this way so
+# that the kernel-source package can be rebuilt even without the certificate
+mkdir -p certs
 for f in %_sourcedir/*.crt; do
     if ! test -e "$f"; then
         continue
     fi
-    case "${f##*/}" in
+    touch certs/x509.genkey
-    SLES-UEFI*.crt)
+    cat "$f" >>certs/signing_key.pem
-        ../scripts/config --set-str CONFIG_MODULE_SIG_KEY "${f##*/}"
-	cp "$f" .
-	;;
-    *)
-        cat "$f" >>keyring.crt
-        ../scripts/config --set-str CONFIG_SYSTEM_TRUSTED_KEYS "keyring.crt"
-    esac
 done
 
 MAKE_ARGS="$MAKE_ARGS %{?_smp_mflags}"

kernel-debug.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Aug  1 09:50:41 CEST 2016 - jslaby@suse.cz
+
+- rpm/constraints.in: inscrease binary size req to 25G
+  Currently, the build of master's -default kernel consumes exactly 20G.
+  So increase the limit from 20G to 25G to stop build failures in the
+  BS.
+- commit c8360d6
+
 -------------------------------------------------------------------
 Mon Jul 25 09:22:34 CEST 2016 - mkubecek@suse.cz
 
@@ -37,6 +46,14 @@ Mon Jul 18 21:46:49 CEST 2016 - jeffm@suse.com
 - Eliminated 2 patches.
 - commit f837062
 
+-------------------------------------------------------------------
+Mon Jul 18 10:14:34 CEST 2016 - mmarek@suse.com
+
+- rpm/kernel-spec-macros: Add kver_cmp macro
+  This allows to use %if statements based on the version of the kernel to
+  be built.
+- commit ea700be
+
 -------------------------------------------------------------------
 Fri Jul 15 18:03:57 CEST 2016 - afaerber@suse.de
 
@@ -49,12 +66,25 @@ Fri Jul 15 18:03:57 CEST 2016 - afaerber@suse.de
   It's needed for the Jetson TK1.
 - commit 4d3bed9
 
+-------------------------------------------------------------------
+Fri Jul 15 17:32:23 CEST 2016 - tiwai@suse.de
+
+- rpm/kernel-source.spec.in: recommends openssl-devel (bsc#987384)
+- commit 2c51311
+
 -------------------------------------------------------------------
 Fri Jul 15 08:05:57 CEST 2016 - tiwai@suse.de
 
 - Update patch-tags for ecrpytfs fix patches (boo#989084).
 - commit ecd9058
 
+-------------------------------------------------------------------
+Wed Jul 13 12:17:38 CEST 2016 - tiwai@suse.de
+
+- rpm/constraints.in: Increase to 8GB for kernel-source
+  4GB seems still too tight for some archs like ppc64le...
+- commit d82b2bf
+
 -------------------------------------------------------------------
 Mon Jul 11 19:59:12 CEST 2016 - jslaby@suse.cz
 
@@ -308,6 +338,24 @@ Mon Jun 20 14:03:35 CEST 2016 - jslaby@suse.cz
 - base: make module_create_drivers_dir race-free (bnc#983977).
 - commit 6cfe0b8
 
+-------------------------------------------------------------------
+Wed Jun 15 17:06:07 CEST 2016 - mmarek@suse.cz
+
+- rpm/constraints.in: Really require 4GB for kernel-source, add -rt (bsc#984845)
+- commit a0dec36
+
+-------------------------------------------------------------------
+Wed Jun 15 15:17:11 CEST 2016 - mmarek@suse.cz
+
+- rpm/constraints.in: Require 4GB of disk space for kernel-source (bsc#984845)
+- commit 1b20111
+
+-------------------------------------------------------------------
+Tue Jun 14 16:56:52 CEST 2016 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Use the default value for CONFIG_MODULE_SIG_KEY (bsc#983634)
+- commit 6eb6cd2
+
 -------------------------------------------------------------------
 Mon Jun 13 21:46:58 CEST 2016 - jeffm@suse.com
 

kernel-debug.spec

@@ -63,7 +63,7 @@ License:        GPL-2.0
 Group:          System/Kernel
 Version:        4.7.0
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g89a2ada
+Release:        <RELEASE>.g31abf6f
 %else
 Release:        0
 %endif
@@ -505,20 +505,16 @@ if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then
     %_sourcedir/modversions --unpack . < $_
 fi
 
-# copy module signing certificate(s)
+# copy module signing certificate(s). We use the default path and trick
+# certs/Makefile to not regenerate the certificate. It is done this way so
+# that the kernel-source package can be rebuilt even without the certificate
+mkdir -p certs
 for f in %_sourcedir/*.crt; do
     if ! test -e "$f"; then
         continue
     fi
-    case "${f##*/}" in
+    touch certs/x509.genkey
-    SLES-UEFI*.crt)
+    cat "$f" >>certs/signing_key.pem
-        ../scripts/config --set-str CONFIG_MODULE_SIG_KEY "${f##*/}"
-	cp "$f" .
-	;;
-    *)
-        cat "$f" >>keyring.crt
-        ../scripts/config --set-str CONFIG_SYSTEM_TRUSTED_KEYS "keyring.crt"
-    esac
 done
 
 MAKE_ARGS="$MAKE_ARGS %{?_smp_mflags}"

kernel-default.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Aug  1 09:50:41 CEST 2016 - jslaby@suse.cz
+
+- rpm/constraints.in: inscrease binary size req to 25G
+  Currently, the build of master's -default kernel consumes exactly 20G.
+  So increase the limit from 20G to 25G to stop build failures in the
+  BS.
+- commit c8360d6
+
 -------------------------------------------------------------------
 Mon Jul 25 09:22:34 CEST 2016 - mkubecek@suse.cz
 
@@ -37,6 +46,14 @@ Mon Jul 18 21:46:49 CEST 2016 - jeffm@suse.com
 - Eliminated 2 patches.
 - commit f837062
 
+-------------------------------------------------------------------
+Mon Jul 18 10:14:34 CEST 2016 - mmarek@suse.com
+
+- rpm/kernel-spec-macros: Add kver_cmp macro
+  This allows to use %if statements based on the version of the kernel to
+  be built.
+- commit ea700be
+
 -------------------------------------------------------------------
 Fri Jul 15 18:03:57 CEST 2016 - afaerber@suse.de
 
@@ -49,12 +66,25 @@ Fri Jul 15 18:03:57 CEST 2016 - afaerber@suse.de
   It's needed for the Jetson TK1.
 - commit 4d3bed9
 
+-------------------------------------------------------------------
+Fri Jul 15 17:32:23 CEST 2016 - tiwai@suse.de
+
+- rpm/kernel-source.spec.in: recommends openssl-devel (bsc#987384)
+- commit 2c51311
+
 -------------------------------------------------------------------
 Fri Jul 15 08:05:57 CEST 2016 - tiwai@suse.de
 
 - Update patch-tags for ecrpytfs fix patches (boo#989084).
 - commit ecd9058
 
+-------------------------------------------------------------------
+Wed Jul 13 12:17:38 CEST 2016 - tiwai@suse.de
+
+- rpm/constraints.in: Increase to 8GB for kernel-source
+  4GB seems still too tight for some archs like ppc64le...
+- commit d82b2bf
+
 -------------------------------------------------------------------
 Mon Jul 11 19:59:12 CEST 2016 - jslaby@suse.cz
 
@@ -308,6 +338,24 @@ Mon Jun 20 14:03:35 CEST 2016 - jslaby@suse.cz
 - base: make module_create_drivers_dir race-free (bnc#983977).
 - commit 6cfe0b8
 
+-------------------------------------------------------------------
+Wed Jun 15 17:06:07 CEST 2016 - mmarek@suse.cz
+
+- rpm/constraints.in: Really require 4GB for kernel-source, add -rt (bsc#984845)
+- commit a0dec36
+
+-------------------------------------------------------------------
+Wed Jun 15 15:17:11 CEST 2016 - mmarek@suse.cz
+
+- rpm/constraints.in: Require 4GB of disk space for kernel-source (bsc#984845)
+- commit 1b20111
+
+-------------------------------------------------------------------
+Tue Jun 14 16:56:52 CEST 2016 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Use the default value for CONFIG_MODULE_SIG_KEY (bsc#983634)
+- commit 6eb6cd2
+
 -------------------------------------------------------------------
 Mon Jun 13 21:46:58 CEST 2016 - jeffm@suse.com
 

kernel-default.spec

@@ -63,7 +63,7 @@ License:        GPL-2.0
 Group:          System/Kernel
 Version:        4.7.0
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g89a2ada
+Release:        <RELEASE>.g31abf6f
 %else
 Release:        0
 %endif
@@ -548,20 +548,16 @@ if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then
     %_sourcedir/modversions --unpack . < $_
 fi
 
-# copy module signing certificate(s)
+# copy module signing certificate(s). We use the default path and trick
+# certs/Makefile to not regenerate the certificate. It is done this way so
+# that the kernel-source package can be rebuilt even without the certificate
+mkdir -p certs
 for f in %_sourcedir/*.crt; do
     if ! test -e "$f"; then
         continue
     fi
-    case "${f##*/}" in
+    touch certs/x509.genkey
-    SLES-UEFI*.crt)
+    cat "$f" >>certs/signing_key.pem
-        ../scripts/config --set-str CONFIG_MODULE_SIG_KEY "${f##*/}"
-	cp "$f" .
-	;;
-    *)
-        cat "$f" >>keyring.crt
-        ../scripts/config --set-str CONFIG_SYSTEM_TRUSTED_KEYS "keyring.crt"
-    esac
 done
 
 MAKE_ARGS="$MAKE_ARGS %{?_smp_mflags}"

kernel-docs.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Aug  1 09:50:41 CEST 2016 - jslaby@suse.cz
+
+- rpm/constraints.in: inscrease binary size req to 25G
+  Currently, the build of master's -default kernel consumes exactly 20G.
+  So increase the limit from 20G to 25G to stop build failures in the
+  BS.
+- commit c8360d6
+
 -------------------------------------------------------------------
 Mon Jul 25 09:22:34 CEST 2016 - mkubecek@suse.cz
 
@@ -37,6 +46,14 @@ Mon Jul 18 21:46:49 CEST 2016 - jeffm@suse.com
 - Eliminated 2 patches.
 - commit f837062
 
+-------------------------------------------------------------------
+Mon Jul 18 10:14:34 CEST 2016 - mmarek@suse.com
+
+- rpm/kernel-spec-macros: Add kver_cmp macro
+  This allows to use %if statements based on the version of the kernel to
+  be built.
+- commit ea700be
+
 -------------------------------------------------------------------
 Fri Jul 15 18:03:57 CEST 2016 - afaerber@suse.de
 
@@ -49,12 +66,25 @@ Fri Jul 15 18:03:57 CEST 2016 - afaerber@suse.de
   It's needed for the Jetson TK1.
 - commit 4d3bed9
 
+-------------------------------------------------------------------
+Fri Jul 15 17:32:23 CEST 2016 - tiwai@suse.de
+
+- rpm/kernel-source.spec.in: recommends openssl-devel (bsc#987384)
+- commit 2c51311
+
 -------------------------------------------------------------------
 Fri Jul 15 08:05:57 CEST 2016 - tiwai@suse.de
 
 - Update patch-tags for ecrpytfs fix patches (boo#989084).
 - commit ecd9058
 
+-------------------------------------------------------------------
+Wed Jul 13 12:17:38 CEST 2016 - tiwai@suse.de
+
+- rpm/constraints.in: Increase to 8GB for kernel-source
+  4GB seems still too tight for some archs like ppc64le...
+- commit d82b2bf
+
 -------------------------------------------------------------------
 Mon Jul 11 19:59:12 CEST 2016 - jslaby@suse.cz
 
@@ -308,6 +338,24 @@ Mon Jun 20 14:03:35 CEST 2016 - jslaby@suse.cz
 - base: make module_create_drivers_dir race-free (bnc#983977).
 - commit 6cfe0b8
 
+-------------------------------------------------------------------
+Wed Jun 15 17:06:07 CEST 2016 - mmarek@suse.cz
+
+- rpm/constraints.in: Really require 4GB for kernel-source, add -rt (bsc#984845)
+- commit a0dec36
+
+-------------------------------------------------------------------
+Wed Jun 15 15:17:11 CEST 2016 - mmarek@suse.cz
+
+- rpm/constraints.in: Require 4GB of disk space for kernel-source (bsc#984845)
+- commit 1b20111
+
+-------------------------------------------------------------------
+Tue Jun 14 16:56:52 CEST 2016 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Use the default value for CONFIG_MODULE_SIG_KEY (bsc#983634)
+- commit 6eb6cd2
+
 -------------------------------------------------------------------
 Mon Jun 13 21:46:58 CEST 2016 - jeffm@suse.com
 

kernel-docs.spec

@@ -29,7 +29,7 @@ License:        GPL-2.0
 Group:          Documentation/Man
 Version:        4.7.0
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g89a2ada
+Release:        <RELEASE>.g31abf6f
 %else
 Release:        0
 %endif

kernel-lpae.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Aug  1 09:50:41 CEST 2016 - jslaby@suse.cz
+
+- rpm/constraints.in: inscrease binary size req to 25G
+  Currently, the build of master's -default kernel consumes exactly 20G.
+  So increase the limit from 20G to 25G to stop build failures in the
+  BS.
+- commit c8360d6
+
 -------------------------------------------------------------------
 Mon Jul 25 09:22:34 CEST 2016 - mkubecek@suse.cz
 
@@ -37,6 +46,14 @@ Mon Jul 18 21:46:49 CEST 2016 - jeffm@suse.com
 - Eliminated 2 patches.
 - commit f837062
 
+-------------------------------------------------------------------
+Mon Jul 18 10:14:34 CEST 2016 - mmarek@suse.com
+
+- rpm/kernel-spec-macros: Add kver_cmp macro
+  This allows to use %if statements based on the version of the kernel to
+  be built.
+- commit ea700be
+
 -------------------------------------------------------------------
 Fri Jul 15 18:03:57 CEST 2016 - afaerber@suse.de
 
@@ -49,12 +66,25 @@ Fri Jul 15 18:03:57 CEST 2016 - afaerber@suse.de
   It's needed for the Jetson TK1.
 - commit 4d3bed9
 
+-------------------------------------------------------------------
+Fri Jul 15 17:32:23 CEST 2016 - tiwai@suse.de
+
+- rpm/kernel-source.spec.in: recommends openssl-devel (bsc#987384)
+- commit 2c51311
+
 -------------------------------------------------------------------
 Fri Jul 15 08:05:57 CEST 2016 - tiwai@suse.de
 
 - Update patch-tags for ecrpytfs fix patches (boo#989084).
 - commit ecd9058
 
+-------------------------------------------------------------------
+Wed Jul 13 12:17:38 CEST 2016 - tiwai@suse.de
+
+- rpm/constraints.in: Increase to 8GB for kernel-source
+  4GB seems still too tight for some archs like ppc64le...
+- commit d82b2bf
+
 -------------------------------------------------------------------
 Mon Jul 11 19:59:12 CEST 2016 - jslaby@suse.cz
 
@@ -308,6 +338,24 @@ Mon Jun 20 14:03:35 CEST 2016 - jslaby@suse.cz
 - base: make module_create_drivers_dir race-free (bnc#983977).
 - commit 6cfe0b8
 
+-------------------------------------------------------------------
+Wed Jun 15 17:06:07 CEST 2016 - mmarek@suse.cz
+
+- rpm/constraints.in: Really require 4GB for kernel-source, add -rt (bsc#984845)
+- commit a0dec36
+
+-------------------------------------------------------------------
+Wed Jun 15 15:17:11 CEST 2016 - mmarek@suse.cz
+
+- rpm/constraints.in: Require 4GB of disk space for kernel-source (bsc#984845)
+- commit 1b20111
+
+-------------------------------------------------------------------
+Tue Jun 14 16:56:52 CEST 2016 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Use the default value for CONFIG_MODULE_SIG_KEY (bsc#983634)
+- commit 6eb6cd2
+
 -------------------------------------------------------------------
 Mon Jun 13 21:46:58 CEST 2016 - jeffm@suse.com
 

kernel-lpae.spec

@@ -63,7 +63,7 @@ License:        GPL-2.0
 Group:          System/Kernel
 Version:        4.7.0
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g89a2ada
+Release:        <RELEASE>.g31abf6f
 %else
 Release:        0
 %endif
@@ -499,20 +499,16 @@ if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then
     %_sourcedir/modversions --unpack . < $_
 fi
 
-# copy module signing certificate(s)
+# copy module signing certificate(s). We use the default path and trick
+# certs/Makefile to not regenerate the certificate. It is done this way so
+# that the kernel-source package can be rebuilt even without the certificate
+mkdir -p certs
 for f in %_sourcedir/*.crt; do
     if ! test -e "$f"; then
         continue
     fi
-    case "${f##*/}" in
+    touch certs/x509.genkey
-    SLES-UEFI*.crt)
+    cat "$f" >>certs/signing_key.pem
-        ../scripts/config --set-str CONFIG_MODULE_SIG_KEY "${f##*/}"
-	cp "$f" .
-	;;
-    *)
-        cat "$f" >>keyring.crt
-        ../scripts/config --set-str CONFIG_SYSTEM_TRUSTED_KEYS "keyring.crt"
-    esac
 done
 
 MAKE_ARGS="$MAKE_ARGS %{?_smp_mflags}"

kernel-obs-build.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Aug  1 09:50:41 CEST 2016 - jslaby@suse.cz
+
+- rpm/constraints.in: inscrease binary size req to 25G
+  Currently, the build of master's -default kernel consumes exactly 20G.
+  So increase the limit from 20G to 25G to stop build failures in the
+  BS.
+- commit c8360d6
+
 -------------------------------------------------------------------
 Mon Jul 25 09:22:34 CEST 2016 - mkubecek@suse.cz
 
@@ -37,6 +46,14 @@ Mon Jul 18 21:46:49 CEST 2016 - jeffm@suse.com
 - Eliminated 2 patches.
 - commit f837062
 
+-------------------------------------------------------------------
+Mon Jul 18 10:14:34 CEST 2016 - mmarek@suse.com
+
+- rpm/kernel-spec-macros: Add kver_cmp macro
+  This allows to use %if statements based on the version of the kernel to
+  be built.
+- commit ea700be
+
 -------------------------------------------------------------------
 Fri Jul 15 18:03:57 CEST 2016 - afaerber@suse.de
 
@@ -49,12 +66,25 @@ Fri Jul 15 18:03:57 CEST 2016 - afaerber@suse.de
   It's needed for the Jetson TK1.
 - commit 4d3bed9
 
+-------------------------------------------------------------------
+Fri Jul 15 17:32:23 CEST 2016 - tiwai@suse.de
+
+- rpm/kernel-source.spec.in: recommends openssl-devel (bsc#987384)
+- commit 2c51311
+
 -------------------------------------------------------------------
 Fri Jul 15 08:05:57 CEST 2016 - tiwai@suse.de
 
 - Update patch-tags for ecrpytfs fix patches (boo#989084).
 - commit ecd9058
 
+-------------------------------------------------------------------
+Wed Jul 13 12:17:38 CEST 2016 - tiwai@suse.de
+
+- rpm/constraints.in: Increase to 8GB for kernel-source
+  4GB seems still too tight for some archs like ppc64le...
+- commit d82b2bf
+
 -------------------------------------------------------------------
 Mon Jul 11 19:59:12 CEST 2016 - jslaby@suse.cz
 
@@ -308,6 +338,24 @@ Mon Jun 20 14:03:35 CEST 2016 - jslaby@suse.cz
 - base: make module_create_drivers_dir race-free (bnc#983977).
 - commit 6cfe0b8
 
+-------------------------------------------------------------------
+Wed Jun 15 17:06:07 CEST 2016 - mmarek@suse.cz
+
+- rpm/constraints.in: Really require 4GB for kernel-source, add -rt (bsc#984845)
+- commit a0dec36
+
+-------------------------------------------------------------------
+Wed Jun 15 15:17:11 CEST 2016 - mmarek@suse.cz
+
+- rpm/constraints.in: Require 4GB of disk space for kernel-source (bsc#984845)
+- commit 1b20111
+
+-------------------------------------------------------------------
+Tue Jun 14 16:56:52 CEST 2016 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Use the default value for CONFIG_MODULE_SIG_KEY (bsc#983634)
+- commit 6eb6cd2
+
 -------------------------------------------------------------------
 Mon Jun 13 21:46:58 CEST 2016 - jeffm@suse.com
 

kernel-obs-build.spec

@@ -53,7 +53,7 @@ License:        GPL-2.0
 Group:          SLES
 Version:        4.7.0
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g89a2ada
+Release:        <RELEASE>.g31abf6f
 %else
 Release:        0
 %endif

kernel-obs-qa.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Aug  1 09:50:41 CEST 2016 - jslaby@suse.cz
+
+- rpm/constraints.in: inscrease binary size req to 25G
+  Currently, the build of master's -default kernel consumes exactly 20G.
+  So increase the limit from 20G to 25G to stop build failures in the
+  BS.
+- commit c8360d6
+
 -------------------------------------------------------------------
 Mon Jul 25 09:22:34 CEST 2016 - mkubecek@suse.cz
 
@@ -37,6 +46,14 @@ Mon Jul 18 21:46:49 CEST 2016 - jeffm@suse.com
 - Eliminated 2 patches.
 - commit f837062
 
+-------------------------------------------------------------------
+Mon Jul 18 10:14:34 CEST 2016 - mmarek@suse.com
+
+- rpm/kernel-spec-macros: Add kver_cmp macro
+  This allows to use %if statements based on the version of the kernel to
+  be built.
+- commit ea700be
+
 -------------------------------------------------------------------
 Fri Jul 15 18:03:57 CEST 2016 - afaerber@suse.de
 
@@ -49,12 +66,25 @@ Fri Jul 15 18:03:57 CEST 2016 - afaerber@suse.de
   It's needed for the Jetson TK1.
 - commit 4d3bed9
 
+-------------------------------------------------------------------
+Fri Jul 15 17:32:23 CEST 2016 - tiwai@suse.de
+
+- rpm/kernel-source.spec.in: recommends openssl-devel (bsc#987384)
+- commit 2c51311
+
 -------------------------------------------------------------------
 Fri Jul 15 08:05:57 CEST 2016 - tiwai@suse.de
 
 - Update patch-tags for ecrpytfs fix patches (boo#989084).
 - commit ecd9058
 
+-------------------------------------------------------------------
+Wed Jul 13 12:17:38 CEST 2016 - tiwai@suse.de
+
+- rpm/constraints.in: Increase to 8GB for kernel-source
+  4GB seems still too tight for some archs like ppc64le...
+- commit d82b2bf
+
 -------------------------------------------------------------------
 Mon Jul 11 19:59:12 CEST 2016 - jslaby@suse.cz
 
@@ -308,6 +338,24 @@ Mon Jun 20 14:03:35 CEST 2016 - jslaby@suse.cz
 - base: make module_create_drivers_dir race-free (bnc#983977).
 - commit 6cfe0b8
 
+-------------------------------------------------------------------
+Wed Jun 15 17:06:07 CEST 2016 - mmarek@suse.cz
+
+- rpm/constraints.in: Really require 4GB for kernel-source, add -rt (bsc#984845)
+- commit a0dec36
+
+-------------------------------------------------------------------
+Wed Jun 15 15:17:11 CEST 2016 - mmarek@suse.cz
+
+- rpm/constraints.in: Require 4GB of disk space for kernel-source (bsc#984845)
+- commit 1b20111
+
+-------------------------------------------------------------------
+Tue Jun 14 16:56:52 CEST 2016 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Use the default value for CONFIG_MODULE_SIG_KEY (bsc#983634)
+- commit 6eb6cd2
+
 -------------------------------------------------------------------
 Mon Jun 13 21:46:58 CEST 2016 - jeffm@suse.com
 

kernel-obs-qa.spec

@@ -38,7 +38,7 @@ License:        GPL-2.0
 Group:          SLES
 Version:        4.7.0
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g89a2ada
+Release:        <RELEASE>.g31abf6f
 %else
 Release:        0
 %endif

kernel-pae.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Aug  1 09:50:41 CEST 2016 - jslaby@suse.cz
+
+- rpm/constraints.in: inscrease binary size req to 25G
+  Currently, the build of master's -default kernel consumes exactly 20G.
+  So increase the limit from 20G to 25G to stop build failures in the
+  BS.
+- commit c8360d6
+
 -------------------------------------------------------------------
 Mon Jul 25 09:22:34 CEST 2016 - mkubecek@suse.cz
 
@@ -37,6 +46,14 @@ Mon Jul 18 21:46:49 CEST 2016 - jeffm@suse.com
 - Eliminated 2 patches.
 - commit f837062
 
+-------------------------------------------------------------------
+Mon Jul 18 10:14:34 CEST 2016 - mmarek@suse.com
+
+- rpm/kernel-spec-macros: Add kver_cmp macro
+  This allows to use %if statements based on the version of the kernel to
+  be built.
+- commit ea700be
+
 -------------------------------------------------------------------
 Fri Jul 15 18:03:57 CEST 2016 - afaerber@suse.de
 
@@ -49,12 +66,25 @@ Fri Jul 15 18:03:57 CEST 2016 - afaerber@suse.de
   It's needed for the Jetson TK1.
 - commit 4d3bed9
 
+-------------------------------------------------------------------
+Fri Jul 15 17:32:23 CEST 2016 - tiwai@suse.de
+
+- rpm/kernel-source.spec.in: recommends openssl-devel (bsc#987384)
+- commit 2c51311
+
 -------------------------------------------------------------------
 Fri Jul 15 08:05:57 CEST 2016 - tiwai@suse.de
 
 - Update patch-tags for ecrpytfs fix patches (boo#989084).
 - commit ecd9058
 
+-------------------------------------------------------------------
+Wed Jul 13 12:17:38 CEST 2016 - tiwai@suse.de
+
+- rpm/constraints.in: Increase to 8GB for kernel-source
+  4GB seems still too tight for some archs like ppc64le...
+- commit d82b2bf
+
 -------------------------------------------------------------------
 Mon Jul 11 19:59:12 CEST 2016 - jslaby@suse.cz
 
@@ -308,6 +338,24 @@ Mon Jun 20 14:03:35 CEST 2016 - jslaby@suse.cz
 - base: make module_create_drivers_dir race-free (bnc#983977).
 - commit 6cfe0b8
 
+-------------------------------------------------------------------
+Wed Jun 15 17:06:07 CEST 2016 - mmarek@suse.cz
+
+- rpm/constraints.in: Really require 4GB for kernel-source, add -rt (bsc#984845)
+- commit a0dec36
+
+-------------------------------------------------------------------
+Wed Jun 15 15:17:11 CEST 2016 - mmarek@suse.cz
+
+- rpm/constraints.in: Require 4GB of disk space for kernel-source (bsc#984845)
+- commit 1b20111
+
+-------------------------------------------------------------------
+Tue Jun 14 16:56:52 CEST 2016 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Use the default value for CONFIG_MODULE_SIG_KEY (bsc#983634)
+- commit 6eb6cd2
+
 -------------------------------------------------------------------
 Mon Jun 13 21:46:58 CEST 2016 - jeffm@suse.com
 

kernel-pae.spec

@@ -63,7 +63,7 @@ License:        GPL-2.0
 Group:          System/Kernel
 Version:        4.7.0
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g89a2ada
+Release:        <RELEASE>.g31abf6f
 %else
 Release:        0
 %endif
@@ -525,20 +525,16 @@ if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then
     %_sourcedir/modversions --unpack . < $_
 fi
 
-# copy module signing certificate(s)
+# copy module signing certificate(s). We use the default path and trick
+# certs/Makefile to not regenerate the certificate. It is done this way so
+# that the kernel-source package can be rebuilt even without the certificate
+mkdir -p certs
 for f in %_sourcedir/*.crt; do
     if ! test -e "$f"; then
         continue
     fi
-    case "${f##*/}" in
+    touch certs/x509.genkey
-    SLES-UEFI*.crt)
+    cat "$f" >>certs/signing_key.pem
-        ../scripts/config --set-str CONFIG_MODULE_SIG_KEY "${f##*/}"
-	cp "$f" .
-	;;
-    *)
-        cat "$f" >>keyring.crt
-        ../scripts/config --set-str CONFIG_SYSTEM_TRUSTED_KEYS "keyring.crt"
-    esac
 done
 
 MAKE_ARGS="$MAKE_ARGS %{?_smp_mflags}"

kernel-source.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Aug  1 09:50:41 CEST 2016 - jslaby@suse.cz
+
+- rpm/constraints.in: inscrease binary size req to 25G
+  Currently, the build of master's -default kernel consumes exactly 20G.
+  So increase the limit from 20G to 25G to stop build failures in the
+  BS.
+- commit c8360d6
+
 -------------------------------------------------------------------
 Mon Jul 25 09:22:34 CEST 2016 - mkubecek@suse.cz
 
@@ -37,6 +46,14 @@ Mon Jul 18 21:46:49 CEST 2016 - jeffm@suse.com
 - Eliminated 2 patches.
 - commit f837062
 
+-------------------------------------------------------------------
+Mon Jul 18 10:14:34 CEST 2016 - mmarek@suse.com
+
+- rpm/kernel-spec-macros: Add kver_cmp macro
+  This allows to use %if statements based on the version of the kernel to
+  be built.
+- commit ea700be
+
 -------------------------------------------------------------------
 Fri Jul 15 18:03:57 CEST 2016 - afaerber@suse.de
 
@@ -49,12 +66,25 @@ Fri Jul 15 18:03:57 CEST 2016 - afaerber@suse.de
   It's needed for the Jetson TK1.
 - commit 4d3bed9
 
+-------------------------------------------------------------------
+Fri Jul 15 17:32:23 CEST 2016 - tiwai@suse.de
+
+- rpm/kernel-source.spec.in: recommends openssl-devel (bsc#987384)
+- commit 2c51311
+
 -------------------------------------------------------------------
 Fri Jul 15 08:05:57 CEST 2016 - tiwai@suse.de
 
 - Update patch-tags for ecrpytfs fix patches (boo#989084).
 - commit ecd9058
 
+-------------------------------------------------------------------
+Wed Jul 13 12:17:38 CEST 2016 - tiwai@suse.de
+
+- rpm/constraints.in: Increase to 8GB for kernel-source
+  4GB seems still too tight for some archs like ppc64le...
+- commit d82b2bf
+
 -------------------------------------------------------------------
 Mon Jul 11 19:59:12 CEST 2016 - jslaby@suse.cz
 
@@ -308,6 +338,24 @@ Mon Jun 20 14:03:35 CEST 2016 - jslaby@suse.cz
 - base: make module_create_drivers_dir race-free (bnc#983977).
 - commit 6cfe0b8
 
+-------------------------------------------------------------------
+Wed Jun 15 17:06:07 CEST 2016 - mmarek@suse.cz
+
+- rpm/constraints.in: Really require 4GB for kernel-source, add -rt (bsc#984845)
+- commit a0dec36
+
+-------------------------------------------------------------------
+Wed Jun 15 15:17:11 CEST 2016 - mmarek@suse.cz
+
+- rpm/constraints.in: Require 4GB of disk space for kernel-source (bsc#984845)
+- commit 1b20111
+
+-------------------------------------------------------------------
+Tue Jun 14 16:56:52 CEST 2016 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Use the default value for CONFIG_MODULE_SIG_KEY (bsc#983634)
+- commit 6eb6cd2
+
 -------------------------------------------------------------------
 Mon Jun 13 21:46:58 CEST 2016 - jeffm@suse.com
 

kernel-source.spec

@@ -32,7 +32,7 @@ License:        GPL-2.0
 Group:          Development/Sources
 Version:        4.7.0
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g89a2ada
+Release:        <RELEASE>.g31abf6f
 %else
 Release:        0
 %endif
@@ -114,6 +114,7 @@ BuildArch:      noarch
 Prefix:         /usr/src
 # Source is only complete with devel files.
 Requires:       kernel-devel%variant = %version-%release
+Recommends:     openssl-devel
 
 %(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,find-provides,find-requires,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,log.sh,try-disable-staging-driver,compress-vmlinux.sh})
 

kernel-source.spec.in

@@ -114,6 +114,7 @@ BuildArch:      noarch
 Prefix:         /usr/src
 # Source is only complete with devel files.
 Requires:       kernel-devel%variant = %version-%release
+Recommends:     openssl-devel
 
 %(chmod +x %_sourcedir/{@SCRIPTS@})
 

kernel-spec-macros

@@ -26,6 +26,10 @@
 # how the kernel release string (uname -r) should look like
 %define kernelrelease %patchversion-%source_rel
 
+# Compare the kernel version to the given argument, return value semantics
+# same as strcmp(3). Example: %%if %%{kver_cmp 4.8} > 0 ... %%endif
+%define kver_cmp() %{lua: print(rpm.vercmp(rpm.expand("%patchversion"), rpm.expand("%1")))}
+
 %define my_builddir %_builddir/%{name}-%{version}
 
 # macro to add the source timestamp to package descriptions

kernel-syms.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Aug  1 09:50:41 CEST 2016 - jslaby@suse.cz
+
+- rpm/constraints.in: inscrease binary size req to 25G
+  Currently, the build of master's -default kernel consumes exactly 20G.
+  So increase the limit from 20G to 25G to stop build failures in the
+  BS.
+- commit c8360d6
+
 -------------------------------------------------------------------
 Mon Jul 25 09:22:34 CEST 2016 - mkubecek@suse.cz
 
@@ -37,6 +46,14 @@ Mon Jul 18 21:46:49 CEST 2016 - jeffm@suse.com
 - Eliminated 2 patches.
 - commit f837062
 
+-------------------------------------------------------------------
+Mon Jul 18 10:14:34 CEST 2016 - mmarek@suse.com
+
+- rpm/kernel-spec-macros: Add kver_cmp macro
+  This allows to use %if statements based on the version of the kernel to
+  be built.
+- commit ea700be
+
 -------------------------------------------------------------------
 Fri Jul 15 18:03:57 CEST 2016 - afaerber@suse.de
 
@@ -49,12 +66,25 @@ Fri Jul 15 18:03:57 CEST 2016 - afaerber@suse.de
   It's needed for the Jetson TK1.
 - commit 4d3bed9
 
+-------------------------------------------------------------------
+Fri Jul 15 17:32:23 CEST 2016 - tiwai@suse.de
+
+- rpm/kernel-source.spec.in: recommends openssl-devel (bsc#987384)
+- commit 2c51311
+
 -------------------------------------------------------------------
 Fri Jul 15 08:05:57 CEST 2016 - tiwai@suse.de
 
 - Update patch-tags for ecrpytfs fix patches (boo#989084).
 - commit ecd9058
 
+-------------------------------------------------------------------
+Wed Jul 13 12:17:38 CEST 2016 - tiwai@suse.de
+
+- rpm/constraints.in: Increase to 8GB for kernel-source
+  4GB seems still too tight for some archs like ppc64le...
+- commit d82b2bf
+
 -------------------------------------------------------------------
 Mon Jul 11 19:59:12 CEST 2016 - jslaby@suse.cz
 
@@ -308,6 +338,24 @@ Mon Jun 20 14:03:35 CEST 2016 - jslaby@suse.cz
 - base: make module_create_drivers_dir race-free (bnc#983977).
 - commit 6cfe0b8
 
+-------------------------------------------------------------------
+Wed Jun 15 17:06:07 CEST 2016 - mmarek@suse.cz
+
+- rpm/constraints.in: Really require 4GB for kernel-source, add -rt (bsc#984845)
+- commit a0dec36
+
+-------------------------------------------------------------------
+Wed Jun 15 15:17:11 CEST 2016 - mmarek@suse.cz
+
+- rpm/constraints.in: Require 4GB of disk space for kernel-source (bsc#984845)
+- commit 1b20111
+
+-------------------------------------------------------------------
+Tue Jun 14 16:56:52 CEST 2016 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Use the default value for CONFIG_MODULE_SIG_KEY (bsc#983634)
+- commit 6eb6cd2
+
 -------------------------------------------------------------------
 Mon Jun 13 21:46:58 CEST 2016 - jeffm@suse.com
 

kernel-syms.spec

@@ -27,7 +27,7 @@ Group:          Development/Sources
 Version:        4.7.0
 %if %using_buildservice
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g89a2ada
+Release:        <RELEASE>.g31abf6f
 %else
 Release:        0
 %endif

kernel-vanilla.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Aug  1 09:50:41 CEST 2016 - jslaby@suse.cz
+
+- rpm/constraints.in: inscrease binary size req to 25G
+  Currently, the build of master's -default kernel consumes exactly 20G.
+  So increase the limit from 20G to 25G to stop build failures in the
+  BS.
+- commit c8360d6
+
 -------------------------------------------------------------------
 Mon Jul 25 09:22:34 CEST 2016 - mkubecek@suse.cz
 
@@ -37,6 +46,14 @@ Mon Jul 18 21:46:49 CEST 2016 - jeffm@suse.com
 - Eliminated 2 patches.
 - commit f837062
 
+-------------------------------------------------------------------
+Mon Jul 18 10:14:34 CEST 2016 - mmarek@suse.com
+
+- rpm/kernel-spec-macros: Add kver_cmp macro
+  This allows to use %if statements based on the version of the kernel to
+  be built.
+- commit ea700be
+
 -------------------------------------------------------------------
 Fri Jul 15 18:03:57 CEST 2016 - afaerber@suse.de
 
@@ -49,12 +66,25 @@ Fri Jul 15 18:03:57 CEST 2016 - afaerber@suse.de
   It's needed for the Jetson TK1.
 - commit 4d3bed9
 
+-------------------------------------------------------------------
+Fri Jul 15 17:32:23 CEST 2016 - tiwai@suse.de
+
+- rpm/kernel-source.spec.in: recommends openssl-devel (bsc#987384)
+- commit 2c51311
+
 -------------------------------------------------------------------
 Fri Jul 15 08:05:57 CEST 2016 - tiwai@suse.de
 
 - Update patch-tags for ecrpytfs fix patches (boo#989084).
 - commit ecd9058
 
+-------------------------------------------------------------------
+Wed Jul 13 12:17:38 CEST 2016 - tiwai@suse.de
+
+- rpm/constraints.in: Increase to 8GB for kernel-source
+  4GB seems still too tight for some archs like ppc64le...
+- commit d82b2bf
+
 -------------------------------------------------------------------
 Mon Jul 11 19:59:12 CEST 2016 - jslaby@suse.cz
 
@@ -308,6 +338,24 @@ Mon Jun 20 14:03:35 CEST 2016 - jslaby@suse.cz
 - base: make module_create_drivers_dir race-free (bnc#983977).
 - commit 6cfe0b8
 
+-------------------------------------------------------------------
+Wed Jun 15 17:06:07 CEST 2016 - mmarek@suse.cz
+
+- rpm/constraints.in: Really require 4GB for kernel-source, add -rt (bsc#984845)
+- commit a0dec36
+
+-------------------------------------------------------------------
+Wed Jun 15 15:17:11 CEST 2016 - mmarek@suse.cz
+
+- rpm/constraints.in: Require 4GB of disk space for kernel-source (bsc#984845)
+- commit 1b20111
+
+-------------------------------------------------------------------
+Tue Jun 14 16:56:52 CEST 2016 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Use the default value for CONFIG_MODULE_SIG_KEY (bsc#983634)
+- commit 6eb6cd2
+
 -------------------------------------------------------------------
 Mon Jun 13 21:46:58 CEST 2016 - jeffm@suse.com
 

kernel-vanilla.spec

@@ -63,7 +63,7 @@ License:        GPL-2.0
 Group:          System/Kernel
 Version:        4.7.0
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g89a2ada
+Release:        <RELEASE>.g31abf6f
 %else
 Release:        0
 %endif
@@ -498,20 +498,16 @@ if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then
     %_sourcedir/modversions --unpack . < $_
 fi
 
-# copy module signing certificate(s)
+# copy module signing certificate(s). We use the default path and trick
+# certs/Makefile to not regenerate the certificate. It is done this way so
+# that the kernel-source package can be rebuilt even without the certificate
+mkdir -p certs
 for f in %_sourcedir/*.crt; do
     if ! test -e "$f"; then
         continue
     fi
-    case "${f##*/}" in
+    touch certs/x509.genkey
-    SLES-UEFI*.crt)
+    cat "$f" >>certs/signing_key.pem
-        ../scripts/config --set-str CONFIG_MODULE_SIG_KEY "${f##*/}"
-	cp "$f" .
-	;;
-    *)
-        cat "$f" >>keyring.crt
-        ../scripts/config --set-str CONFIG_SYSTEM_TRUSTED_KEYS "keyring.crt"
-    esac
 done
 
 MAKE_ARGS="$MAKE_ARGS %{?_smp_mflags}"

source-timestamp

@@ -1,3 +1,3 @@
-2016-07-25 10:42:47 +0200
+2016-08-01 09:57:32 +0200
-GIT Revision: 89a2adaa0f1e861c150bad2fb3589fd2f72800cd
+GIT Revision: 31abf6faa42397c9496f3a3c63796c7fd15cbb12
 GIT Branch: stable