Home Home > GIT Browse > SLE15-SP1-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.com>2018-05-29 16:54:31 -0400
committerJeff Mahoney <jeffm@suse.com>2018-05-29 17:04:44 -0400
commitcd0437b50ce3e319408b11c8f8ac03c83f375516 (patch)
treee3b13f29be0b4ad9f4b4ffe6e4b643f10920bf1a
parente7cee223fbd0d24581a8cc099ca63373444b9669 (diff)
rpm: fix typo, SUSE_KERNEL_RELEASE -> SUSE_KERNEL_RELEASED (bsc#1095104).rpm-4.12.14-23--SLE-15-Packages-GMC2rpm-4.12.14-23
This causes release kernels to report as (unreleased).
-rw-r--r--config/arm64/default2
-rw-r--r--config/ppc64le/debug1
-rw-r--r--config/ppc64le/default2
-rw-r--r--config/s390x/default2
-rw-r--r--config/s390x/zfcpdump2
-rw-r--r--config/x86_64/default2
-rw-r--r--patches.suse/kernel-add-release-status-to-kernel-build.patch6
7 files changed, 8 insertions, 9 deletions
diff --git a/config/arm64/default b/config/arm64/default
index f54eb7e9ec..40496111a6 100644
--- a/config/arm64/default
+++ b/config/arm64/default
@@ -7556,4 +7556,4 @@ CONFIG_SUSE_VERSION=15
CONFIG_SUSE_PATCHLEVEL=0
CONFIG_SUSE_AUXRELEASE=0
CONFIG_SUSE_KERNEL_SUPPORTED=y
-# CONFIG_SUSE_KERNEL_RELEASE is not set
+# CONFIG_SUSE_KERNEL_RELEASED is not set
diff --git a/config/ppc64le/debug b/config/ppc64le/debug
index 69d64cff27..f1fcdc3611 100644
--- a/config/ppc64le/debug
+++ b/config/ppc64le/debug
@@ -41,7 +41,6 @@ CONFIG_MAC80211_TDLS_DEBUG=y
CONFIG_MAC80211_VERBOSE_DEBUG=y
# CONFIG_MODULE_SIG is not set
CONFIG_PCIEASPM_DEBUG=y
-CONFIG_PPC_DEBUG_RFI=y
CONFIG_RCU_TORTURE_TEST_SLOW_CLEANUP=y
CONFIG_RCU_TORTURE_TEST_SLOW_CLEANUP_DELAY=3
CONFIG_RCU_TORTURE_TEST_SLOW_INIT=y
diff --git a/config/ppc64le/default b/config/ppc64le/default
index 01590be9e5..320cda01d3 100644
--- a/config/ppc64le/default
+++ b/config/ppc64le/default
@@ -5376,4 +5376,4 @@ CONFIG_SUSE_VERSION=15
CONFIG_SUSE_PATCHLEVEL=0
CONFIG_SUSE_AUXRELEASE=0
CONFIG_SUSE_KERNEL_SUPPORTED=y
-# CONFIG_SUSE_KERNEL_RELEASE is not set
+# CONFIG_SUSE_KERNEL_RELEASED is not set
diff --git a/config/s390x/default b/config/s390x/default
index fdcdbee857..25df726256 100644
--- a/config/s390x/default
+++ b/config/s390x/default
@@ -3124,4 +3124,4 @@ CONFIG_SUSE_VERSION=15
CONFIG_SUSE_PATCHLEVEL=0
CONFIG_SUSE_AUXRELEASE=0
CONFIG_SUSE_KERNEL_SUPPORTED=y
-# CONFIG_SUSE_KERNEL_RELEASE is not set
+# CONFIG_SUSE_KERNEL_RELEASED is not set
diff --git a/config/s390x/zfcpdump b/config/s390x/zfcpdump
index 92420bc5bd..c0afc03112 100644
--- a/config/s390x/zfcpdump
+++ b/config/s390x/zfcpdump
@@ -1252,4 +1252,4 @@ CONFIG_SUSE_VERSION=15
CONFIG_SUSE_PATCHLEVEL=0
CONFIG_SUSE_AUXRELEASE=0
# CONFIG_SUSE_KERNEL_SUPPORTED is not set
-# CONFIG_SUSE_KERNEL_RELEASE is not set
+# CONFIG_SUSE_KERNEL_RELEASED is not set
diff --git a/config/x86_64/default b/config/x86_64/default
index 73faa46968..9cc286d35d 100644
--- a/config/x86_64/default
+++ b/config/x86_64/default
@@ -7345,4 +7345,4 @@ CONFIG_SUSE_VERSION=15
CONFIG_SUSE_PATCHLEVEL=0
CONFIG_SUSE_AUXRELEASE=0
CONFIG_SUSE_KERNEL_SUPPORTED=y
-# CONFIG_SUSE_KERNEL_RELEASE is not set
+# CONFIG_SUSE_KERNEL_RELEASED is not set
diff --git a/patches.suse/kernel-add-release-status-to-kernel-build.patch b/patches.suse/kernel-add-release-status-to-kernel-build.patch
index 821166e0b6..f130ffef2e 100644
--- a/patches.suse/kernel-add-release-status-to-kernel-build.patch
+++ b/patches.suse/kernel-add-release-status-to-kernel-build.patch
@@ -23,7 +23,7 @@ Signed-off-by: Jeff Mahoney <jeffm@suse.com>
If you aren't building a kernel for an enterprise distribution,
say n.
-+config SUSE_KERNEL_RELEASE
++config SUSE_KERNEL_RELEASED
+ bool "Release kernel"
+ default n
+ help
@@ -36,7 +36,7 @@ Signed-off-by: Jeff Mahoney <jeffm@suse.com>
#ifdef CONFIG_SUSE_KERNEL_SUPPORTED
const char *supported_printable(int taint)
{
-+#ifdef CONFIG_SUSE_KERNEL_RELEASE
++#ifdef CONFIG_SUSE_KERNEL_RELEASED
int mask = (1 << TAINT_PROPRIETARY_MODULE) | (1 << TAINT_NO_SUPPORT);
if ((taint & mask) == mask)
return "No, Proprietary and Unsupported modules are loaded";
@@ -63,7 +63,7 @@ Signed-off-by: Jeff Mahoney <jeffm@suse.com>
(int)strcspn(init_utsname()->version, " "),
- init_utsname()->version, SUSE_PRODUCT_SHORTNAME);
+ init_utsname()->version, SUSE_PRODUCT_SHORTNAME,
-+#ifndef CONFIG_SUSE_KERNEL_RELEASE
++#ifndef CONFIG_SUSE_KERNEL_RELEASED
+ " (unreleased)"
+#else
+ ""