From 3cefcdd73225e5404b077640ece987efff04216f Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Tue, 2 Apr 2013 19:02:14 +0200
Subject: [PATCH] restore RHEL 6 configuration selections

This was trickier in the previous compat, but I think
this restores the required options for RHEL6.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
---
 compat/compat/Kconfig |  9 ++++++---
 plumbing/Makefile     | 10 ++++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/compat/compat/Kconfig b/compat/compat/Kconfig
index c473897402a4..2bb119637749 100644
--- a/compat/compat/Kconfig
+++ b/compat/compat/Kconfig
@@ -38,6 +38,8 @@
 
 config BACKPORT_BUILD_FW_LOADER
 	tristate
+	# RHEL6, starting from 6.0, backports the FW loader already
+	depends on !BACKPORT_RHEL_KERNEL_6_0
 	default m if BACKPORT_FW_LOADER && (!FW_LOADER || BACKPORT_KERNEL_2_6_33)
 
 config BACKPORT_FW_LOADER
@@ -57,7 +59,8 @@ config BACKPORT_USERSEL_NET_SCH_FQ_CODEL
 
 config BACKPORT_BUILD_KFIFO
 	def_bool y
-	# FIXME: REDHAT_6_1 also includes this
+	# RHEL6, starting from 6.1, backports kfifo already
+	depends on !BACKPORT_RHEL_KERNEL_6_1
 	depends on BACKPORT_KERNEL_2_6_36
 
 config BACKPORT_BUILD_CORDIC
@@ -80,8 +83,8 @@ config BACKPORT_BUILD_GENERIC_ATOMIC64
 
 config BACKPORT_OPTION_BT_SOCK_CREATE_NEEDS_KERN
 	bool
-	# FIXME: REDHAT_6_0 also requires this
-	default y if !BACKPORT_KERNEL_2_6_33
+	# in RHEL6 (starting from 6.0), the function needs the argument
+	default y if !BACKPORT_KERNEL_2_6_33 || BACKPORT_RHEL_KERNEL_6_0
 
 config BACKPORT_BUILD_AVERAGE
 	bool
diff --git a/plumbing/Makefile b/plumbing/Makefile
index 55f756281892..5fb7863ab6c2 100644
--- a/plumbing/Makefile
+++ b/plumbing/Makefile
@@ -10,6 +10,7 @@ BACKPORT_PWD := $(shell pwd)
 
 KLIB_BUILD ?= /lib/modules/$(shell uname -r)/build/
 KERNEL_CONFIG := $(KLIB_BUILD)/.config
+KERNEL_MAKEFILE := $(KLIB_BUILD)/Makefile
 CONFIG_MD5 := $(shell md5sum $(KERNEL_CONFIG) | sed 's/\s.*//')
 
 export KLIB_BUILD BACKPORT_PWD
@@ -60,6 +61,15 @@ default:
 			fi								;\
 			if [ "$$v" = "$$kver" ] ; then print=1 ; fi			;\
 		done > Kconfig.versions							;\
+		# RHEL as well, sadly we need to grep for it				;\
+		RHEL_MAJOR=$$(grep '^RHEL_MAJOR' $(KERNEL_MAKEFILE) | 			\
+					sed 's/.*=\s*\([0-9]*\)/\1/;t;d')		;\
+		RHEL_MINOR=$$(grep '^RHEL_MINOR' $(KERNEL_MAKEFILE) | 			\
+					sed 's/.*=\s*\([0-9]*\)/\1/;t;d')		;\
+		for v in $$(seq 0 $$RHEL_MINOR) ; do 					\
+			echo config BACKPORT_RHEL_KERNEL_$${RHEL_MAJOR}_$$v		;\
+			echo "    def_bool y"						;\
+		done >> Kconfig.versions						;\
 		echo " done."								;\
 	fi										;\
 	echo "$(CONFIG_MD5)" > .kernel_config_md5
-- 
2.30.2