X-Git-Url: https://git.whamcloud.com/gitweb?a=blobdiff_plain;f=contrib%2Flbuild%2Flbuild-rhel;h=d8955f311cab4ba363a59a51135800e980930366;hb=a6b39ad3486bc490bbaa942fa3e99b97a5671e0e;hp=8611f195e2fb82ceb23458dbd9cf9238f1aaa83e;hpb=2968a40a163aa1b0f106c6d29fdf908a1748faad;p=fs%2Flustre-release.git

diff --git a/contrib/lbuild/lbuild-rhel b/contrib/lbuild/lbuild-rhel
index 8611f19..d8955f31 100644
--- a/contrib/lbuild/lbuild-rhel
+++ b/contrib/lbuild/lbuild-rhel
@@ -58,13 +58,18 @@ prepare_and_build_srpm() {
 	popd >/dev/null
 
 	# copy our .config into the RPM build tree
+	if [[ $DISTROMAJ == "rhel7" ]];then
+		local cfg_file_name=kernel-$lnxmaj-${TARGET_ARCH}.config
+	else
+		local cfg_file_name=kernel-${TARGET_ARCH}.config
+	fi
 	(echo "# $(basearch ${TARGET_ARCH})"; cat $CONFIG_FILE) > \
-		SOURCES/kernel-$lnxmaj-${TARGET_ARCH}.config
+		SOURCES/$cfg_file_name
 
 	# XXX - hackity hack -- until we get (or generate from the base
 	#                       config) configs for xen and debug
 	local f=""
-	for f in SOURCES/kernel-${lnxmaj}-*.config; do
+	for f in SOURCES/kernel-*.config; do
 		grep -q "^CONFIG_SD_IOSTATS=y" $f || \
 		echo "CONFIG_SD_IOSTATS=y" >> $f
 	done