From c939bf8bacb59784430c4d99f9d41ce0f7a5588a Mon Sep 17 00:00:00 2001
From: "Justin M. Forbes" <jforbes@fedoraproject.org>
Date: Thu, 24 Feb 2022 14:23:37 -0600
Subject: kernel-5.17-0.rc5.23d04328444a.105

* Thu Feb 24 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc5.23d04328444a.105]
- mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning (Waiman Long)
Resolves: rhbz#

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
---
 process_configs.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'process_configs.sh')

diff --git a/process_configs.sh b/process_configs.sh
index 8c997a5fa..312449fe1 100755
--- a/process_configs.sh
+++ b/process_configs.sh
@@ -226,15 +226,17 @@ function process_configs()
 	for cfg in "$SCRIPT_DIR/${PACKAGE_NAME}${KVERREL}${SUBARCH}"*.config
 	do
 		arch=$(head -1 "$cfg" | cut -b 3-)
-		cfgtmp="${cfg}.tmp"
-		cfgorig="${cfg}.orig"
-		cat "$cfg" > "$cfgorig"
 
 		if [ "$arch" = "EMPTY" ]
 		then
 			# This arch is intentionally left blank
 			continue
 		fi
+
+		cfgtmp="${cfg}.tmp"
+		cfgorig="${cfg}.orig"
+		cat "$cfg" > "$cfgorig"
+
 		echo -n "Processing $cfg ... "
 
 		make ${MAKEOPTS} ARCH="$arch" CROSS_COMPILE=$(get_cross_compile $arch) KCONFIG_CONFIG="$cfgorig" listnewconfig >& .listnewconfig
-- 
cgit 


From 9f1c3bb900eb4e4bac059cea50a2780deba79ed5 Mon Sep 17 00:00:00 2001
From: "Justin M. Forbes" <jforbes@fedoraproject.org>
Date: Fri, 4 Mar 2022 12:55:47 -0600
Subject: kernel-5.17-0.rc6.38f80f42147f.113

* Fri Mar 04 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc6.38f80f42147f.113]
- redhat/configs/build_configs.sh: Parallelize execution (Prarit Bhargava)
- redhat/configs/build_configs.sh: Provide better messages (Prarit Bhargava)
- redhat/configs/build_configs.sh: Create unique output files (Prarit Bhargava)
- redhat/configs/build_configs.sh: Add local variables (Prarit Bhargava)
- redhat/configs/process_configs.sh: Parallelize execution (Prarit Bhargava)
- redhat/configs/process_configs.sh: Provide better messages (Prarit Bhargava)
- redhat/configs/process_configs.sh: Create unique output files (Prarit Bhargava)
- redhat/configs/process_configs.sh: Add processing config function (Prarit Bhargava)
- mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning (Waiman Long)
Resolves: rhbz#

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
---
 process_configs.sh | 160 +++++++++++++++++++++++++++++++++--------------------
 1 file changed, 100 insertions(+), 60 deletions(-)

(limited to 'process_configs.sh')

diff --git a/process_configs.sh b/process_configs.sh
index 312449fe1..b620040cc 100755
--- a/process_configs.sh
+++ b/process_configs.sh
@@ -60,6 +60,9 @@ switch_to_toplevel()
 
 checkoptions()
 {
+	count=$3
+	variant=$4
+
 	/usr/bin/awk '
 
 		/is not set/ {
@@ -82,10 +85,10 @@ checkoptions()
 					 print "Found "a[1]"="a[2]" after generation, had " a[1]"="configs[a[1]]" in Source tree";
 			}
 		}
-	' "$1" "$2" > .mismatches
+	' "$1" "$2" > .mismatches${count}
 
 	checkoptions_error=false
-	if test -s .mismatches
+	if test -s .mismatches${count}
 	then
 		while read -r LINE
 		do
@@ -97,14 +100,14 @@ checkoptions()
 				checkoptions_error=true
 				break
 			fi
-		done < .mismatches
+		done < .mismatches${count}
 
 		! $checkoptions_error && return
 
-		echo "Error: Mismatches found in configuration files"
-		cat .mismatches
-		RETURNCODE=1
+		sed -i "1s/^/Error: Mismatches found in configuration files for ${variant}\n/" .mismatches${count}
 		[ "$CONTINUEONERROR" ] || exit 1
+	else
+		rm -f .mismatches${count}
 	fi
 }
 
@@ -218,73 +221,109 @@ function commit_new_configs()
 	git commit -m "[redhat] AUTOMATIC: New configs"
 }
 
-function process_configs()
+function process_config()
 {
-	# assume we are in $source_tree/configs, need to get to top level
-	pushd "$(switch_to_toplevel)" &>/dev/null
+	local cfg
+	local arch
+	local cfgtmp
+	local cfgorig
+	local count
+	local variant
 
-	for cfg in "$SCRIPT_DIR/${PACKAGE_NAME}${KVERREL}${SUBARCH}"*.config
-	do
-		arch=$(head -1 "$cfg" | cut -b 3-)
+	cfg=$1
+	count=$2
 
-		if [ "$arch" = "EMPTY" ]
-		then
-			# This arch is intentionally left blank
-			continue
-		fi
+	arch=$(head -1 "$cfg" | cut -b 3-)
 
-		cfgtmp="${cfg}.tmp"
-		cfgorig="${cfg}.orig"
-		cat "$cfg" > "$cfgorig"
+	if [ "$arch" = "EMPTY" ]
+	then
+		# This arch is intentionally left blank
+		return
+	fi
 
-		echo -n "Processing $cfg ... "
+	variant=$(basename "$cfg" | cut -d"-" -f3- | cut -d"." -f1)
 
-		make ${MAKEOPTS} ARCH="$arch" CROSS_COMPILE=$(get_cross_compile $arch) KCONFIG_CONFIG="$cfgorig" listnewconfig >& .listnewconfig
-		grep -E 'CONFIG_' .listnewconfig > .newoptions
-		if test -n "$NEWOPTIONS" && test -s .newoptions
-		then
-			echo "Found unset config items, please set them to an appropriate value"
-			cat .newoptions
-			rm .newoptions
-			RETURNCODE=1
-			[ "$CONTINUEONERROR" ] || exit 1
-		fi
-		rm .newoptions
+	cfgtmp="${cfg}.tmp"
+	cfgorig="${cfg}.orig"
+	cat "$cfg" > "$cfgorig"
 
-		grep -E 'config.*warning' .listnewconfig > .warnings
-		if test -n "$CHECKWARNINGS" && test -s .warnings
-		then
-			echo "Found misconfigured config items, please set them to an appropriate value"
-			cat .warnings
-			rm .warnings
-			RETURNCODE=1
-			[ "$CONTINUEONERROR" ] || exit 1
-		fi
-		rm .warnings
+	echo "Processing $cfg ... "
 
-		rm .listnewconfig
+	make ${MAKEOPTS} ARCH="$arch" CROSS_COMPILE=$(get_cross_compile $arch) KCONFIG_CONFIG="$cfgorig" listnewconfig >& .listnewconfig${count}
+	grep -E 'CONFIG_' .listnewconfig${count} > .newoptions${count}
+	if test -n "$NEWOPTIONS" && test -s .newoptions${count}
+	then
+		echo "Found unset config items in ${variant}, please set them to an appropriate value" >> .errors${count}
+		cat .newoptions${count} >> .errors${count}
+		rm .newoptions${count}
+		RETURNCODE=1
+		[ "$CONTINUEONERROR" ] || exit 1
+	fi
+	rm .newoptions${count}
 
-		make ${MAKEOPTS} ARCH="$arch" CROSS_COMPILE=$(get_cross_compile $arch) KCONFIG_CONFIG="$cfgorig" olddefconfig > /dev/null || exit 1
-		echo "# $arch" > "$cfgtmp"
-		cat "$cfgorig" >> "$cfgtmp"
-		if test -n "$CHECKOPTIONS"
-		then
-			checkoptions "$cfg" "$cfgtmp"
-		fi
-		# if test run, don't overwrite original
-		if test -n "$TESTRUN"
-		then
-			rm -f "$cfgtmp"
-		else
-			mv "$cfgtmp" "$cfg"
-		fi
-		rm -f "$cfgorig"
-		echo "done"
+	grep -E 'config.*warning' .listnewconfig${count} > .warnings${count}
+	if test -n "$CHECKWARNINGS" && test -s .warnings${count}
+	then
+		echo "Found misconfigured config items in ${variant}, please set them to an appropriate value" >> .errors${count}
+		cat .warnings${count} >> .errors${count}
+		rm .warnings${count}
+		[ "$CONTINUEONERROR" ] || exit 1
+	fi
+	rm .warnings${count}
+
+	rm .listnewconfig${count}
+
+	make ${MAKEOPTS} ARCH="$arch" CROSS_COMPILE=$(get_cross_compile $arch) KCONFIG_CONFIG="$cfgorig" olddefconfig > /dev/null || exit 1
+	echo "# $arch" > "$cfgtmp"
+	cat "$cfgorig" >> "$cfgtmp"
+	if test -n "$CHECKOPTIONS"
+	then
+		checkoptions "$cfg" "$cfgtmp" "$count" "$variant"
+	fi
+	# if test run, don't overwrite original
+	if test -n "$TESTRUN"
+	then
+		rm -f "$cfgtmp"
+	else
+		mv "$cfgtmp" "$cfg"
+	fi
+	rm -f "$cfgorig"
+	echo "Processing $cfg complete"
+}
+
+function process_configs()
+{
+	# assume we are in $source_tree/configs, need to get to top level
+	pushd "$(switch_to_toplevel)" &>/dev/null
+
+	count=0
+	for cfg in "$SCRIPT_DIR/${PACKAGE_NAME}${KVERREL}${SUBARCH}"*.config
+	do
+		process_config "$cfg" "$count" &
+		waitpids[${count}]=$!
+		((count++))
+		while [ "$(jobs | grep Running | wc -l)" -ge $RHJOBS ]; do :; done
+	done
+	for pid in ${waitpids[*]}; do
+		wait ${pid}
 	done
+
 	rm "$SCRIPT_DIR"/*.config*.old
+
+	if ls .errors* 1> /dev/null 2>&1; then
+		RETURNCODE=1
+		cat .errors*
+		rm .errors* -f
+	fi
+	if ls .mismatches* 1> /dev/null 2>&1; then
+		RETURNCODE=1
+		cat .mismatches*
+		rm .mismatches* -f
+	fi
+
 	popd > /dev/null
 
-	echo "Processed config files are in $SCRIPT_DIR"
+	[ $RETURNCODE -eq 0 ] && echo "Processed config files are in $SCRIPT_DIR"
 }
 
 CHECKOPTIONS=""
@@ -345,6 +384,7 @@ PACKAGE_NAME="${1:-kernel}" # defines the package name used
 KVERREL="$(test -n "$2" && echo "-$2" || echo "")"
 SUBARCH="$(test -n "$3" && echo "-$3" || echo "")"
 FLAVOR="$(test -n "$4" && echo "-$4" || echo "-common")"
+RHJOBS="$(test -n "$5" && echo "$5" || nproc --all)"
 SCRIPT=$(readlink -f "$0")
 SCRIPT_DIR=$(dirname "$SCRIPT")
 
-- 
cgit 


From d742ad28a01d2499b8f0ef2e7a51ba9e4ceca07a Mon Sep 17 00:00:00 2001
From: "Justin M. Forbes" <jforbes@fedoraproject.org>
Date: Tue, 8 Mar 2022 11:11:22 -0600
Subject: kernel-5.17-0.rc7.ea4424be1688.117

* Tue Mar 08 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc7.ea4424be1688.117]
- redhat/configs/process_configs.sh: Fix issue with old error files (Prarit Bhargava)
- redhat/configs/build_configs.sh: Parallelize execution (Prarit Bhargava)
- redhat/configs/build_configs.sh: Provide better messages (Prarit Bhargava)
- redhat/configs/build_configs.sh: Create unique output files (Prarit Bhargava)
- redhat/configs/build_configs.sh: Add local variables (Prarit Bhargava)
- redhat/configs/process_configs.sh: Parallelize execution (Prarit Bhargava)
- redhat/configs/process_configs.sh: Provide better messages (Prarit Bhargava)
- redhat/configs/process_configs.sh: Create unique output files (Prarit Bhargava)
- redhat/configs/process_configs.sh: Add processing config function (Prarit Bhargava)
- mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning (Waiman Long)
Resolves: rhbz#

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
---
 process_configs.sh | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'process_configs.sh')

diff --git a/process_configs.sh b/process_configs.sh
index b620040cc..a946ce4c8 100755
--- a/process_configs.sh
+++ b/process_configs.sh
@@ -296,6 +296,11 @@ function process_configs()
 	# assume we are in $source_tree/configs, need to get to top level
 	pushd "$(switch_to_toplevel)" &>/dev/null
 
+	# The next line is throwaway code for transition to parallel
+	# processing.  Leaving this line in place is harmless, but it can be
+	# removed the next time anyone updates this function.
+	[ -f .mismatches ] && rm -f .mismatches
+
 	count=0
 	for cfg in "$SCRIPT_DIR/${PACKAGE_NAME}${KVERREL}${SUBARCH}"*.config
 	do
-- 
cgit 


From 03f5c70c80c95d95131703e6e8537602d1fc5124 Mon Sep 17 00:00:00 2001
From: "Justin M. Forbes" <jforbes@fedoraproject.org>
Date: Fri, 11 Mar 2022 09:55:39 -0600
Subject: kernel-5.17-0.rc7.79b00034e9dc.120

* Fri Mar 11 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc7.79b00034e9dc.120]
- mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning (Waiman Long)
Resolves: rhbz#

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
---
 process_configs.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'process_configs.sh')

diff --git a/process_configs.sh b/process_configs.sh
index a946ce4c8..376f79584 100755
--- a/process_configs.sh
+++ b/process_configs.sh
@@ -104,7 +104,7 @@ checkoptions()
 
 		! $checkoptions_error && return
 
-		sed -i "1s/^/Error: Mismatches found in configuration files for ${variant}\n/" .mismatches${count}
+		sed -i "1s/^/Error: Mismatches found in configuration files for ${arch} ${variant}\n/" .mismatches${count}
 		[ "$CONTINUEONERROR" ] || exit 1
 	else
 		rm -f .mismatches${count}
@@ -253,7 +253,7 @@ function process_config()
 	grep -E 'CONFIG_' .listnewconfig${count} > .newoptions${count}
 	if test -n "$NEWOPTIONS" && test -s .newoptions${count}
 	then
-		echo "Found unset config items in ${variant}, please set them to an appropriate value" >> .errors${count}
+		echo "Found unset config items in ${arch} ${variant}, please set them to an appropriate value" >> .errors${count}
 		cat .newoptions${count} >> .errors${count}
 		rm .newoptions${count}
 		RETURNCODE=1
@@ -264,7 +264,7 @@ function process_config()
 	grep -E 'config.*warning' .listnewconfig${count} > .warnings${count}
 	if test -n "$CHECKWARNINGS" && test -s .warnings${count}
 	then
-		echo "Found misconfigured config items in ${variant}, please set them to an appropriate value" >> .errors${count}
+		echo "Found misconfigured config items in ${arch} ${variant}, please set them to an appropriate value" >> .errors${count}
 		cat .warnings${count} >> .errors${count}
 		rm .warnings${count}
 		[ "$CONTINUEONERROR" ] || exit 1
-- 
cgit 


From dab93b00b0acac32ebed02f8f177ad5bccc9997a Mon Sep 17 00:00:00 2001
From: "Justin M. Forbes" <jforbes@fedoraproject.org>
Date: Wed, 16 Mar 2022 09:23:47 -0500
Subject: kernel-5.17-0.rc8.56e337f2cf13.123

* Wed Mar 16 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc8.56e337f2cf13.123]
- redhat/Makefile: Reorganize variables (Prarit Bhargava)
- redhat/Makefile: Add some descriptions (Prarit Bhargava)
- redhat/Makefile: Move SNAPSHOT check (Prarit Bhargava)
- redhat/Makefile: Deprecate BREW_FLAGS, KOJI_FLAGS, and TEST_FLAGS (Prarit Bhargava)
- redhat/genspec.sh: Rework RPMVERSION variable (Prarit Bhargava)
- redhat/Makefile: Remove dead comment (Prarit Bhargava)
- redhat/Makefile: Cleanup KABI* variables. (Prarit Bhargava)
- redhat/Makefile.variables: Default RHGITCOMMIT to HEAD (Prarit Bhargava)
- redhat/scripts/create-tarball.sh: Use Makefile TARBALL variable (Prarit Bhargava)
- redhat/Makefile: Remove extra DIST_BRANCH (Prarit Bhargava)
- redhat/Makefile: Remove STAMP_VERSION (Prarit Bhargava)
- redhat/Makefile: Move NO_CONFIGCHECKS to Makefile.variables (Prarit Bhargava)
- redhat/Makefile: Move RHJOBS to Makefile.variables (Prarit Bhargava)
- redhat/Makefile: Move RHGIT* variables to Makefile.variables (Prarit Bhargava)
- redhat/Makefile: Move PREBUILD_GIT_ONLY to Makefile.variables (Prarit Bhargava)
- redhat/Makefile: Move BUILD to Makefile.variables (Prarit Bhargava)
- redhat/Makefile: Move BUILD_FLAGS to Makefile.variables. (Prarit Bhargava)
- redhat/Makefile: Move BUILD_PROFILE to Makefile.variables (Prarit Bhargava)
- redhat/Makefile: Move BUILD_TARGET and BUILD_SCRATCH_TARGET to Makefile.variables (Prarit Bhargava)
- redhat/Makefile: Remove RHPRODUCT variable (Prarit Bhargava)
- redhat/Makefile: Cleanup DISTRO variable (Prarit Bhargava)
- redhat/Makefile: Move HEAD to Makefile.variables. (Prarit Bhargava)
- redhat: Combine Makefile and Makefile.common (Prarit Bhargava)
- redhat/koji/Makefile: Decouple koji Makefile from Makefile.common (Prarit Bhargava)
- mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning (Waiman Long)
Resolves: rhbz#

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
---
 process_configs.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'process_configs.sh')

diff --git a/process_configs.sh b/process_configs.sh
index 376f79584..2ee4037ad 100755
--- a/process_configs.sh
+++ b/process_configs.sh
@@ -388,16 +388,15 @@ done
 PACKAGE_NAME="${1:-kernel}" # defines the package name used
 KVERREL="$(test -n "$2" && echo "-$2" || echo "")"
 SUBARCH="$(test -n "$3" && echo "-$3" || echo "")"
-FLAVOR="$(test -n "$4" && echo "-$4" || echo "-common")"
+FLAVOR="$(test -n "$4" && echo "-$4" || echo "-ark")"
 RHJOBS="$(test -n "$5" && echo "$5" || nproc --all)"
 SCRIPT=$(readlink -f "$0")
 SCRIPT_DIR=$(dirname "$SCRIPT")
 
-# Most RHEL options are options we want in Fedora so RHEL pending settings head
-# to common/
+# Config options for RHEL should target the pending-ark directory, not pending-common.
 if [ "$FLAVOR" = "-rhel" ]
 then
-	FLAVOR="-common"
+	FLAVOR="-ark"
 fi
 
 # to handle this script being a symlink
-- 
cgit 


From 55017c651490388db35458885b29e69739eb6b32 Mon Sep 17 00:00:00 2001
From: "Justin M. Forbes" <jforbes@fedoraproject.org>
Date: Thu, 24 Mar 2022 09:44:17 -0500
Subject: kernel-5.18-0.rc0.20220324gited4643521e6a.6

* Thu Mar 24 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.18-0.rc0.20220324gited4643521e6a.6]
- Fix up CONFIG_SND_AMD_ACP_CONFIG files (Patrick Talbert)
- Remove CONFIG_SND_SOC_SOF_DEBUG_PROBES files (Patrick Talbert)
Resolves: rhbz#

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
---
 process_configs.sh | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'process_configs.sh')

diff --git a/process_configs.sh b/process_configs.sh
index 2ee4037ad..27372afc2 100755
--- a/process_configs.sh
+++ b/process_configs.sh
@@ -304,6 +304,10 @@ function process_configs()
 	count=0
 	for cfg in "$SCRIPT_DIR/${PACKAGE_NAME}${KVERREL}${SUBARCH}"*.config
 	do
+		if [ "$count" -eq 0 ]; then
+			# do the first one by itself so that tools are built
+			process_config "$cfg" "$count"
+		fi
 		process_config "$cfg" "$count" &
 		waitpids[${count}]=$!
 		((count++))
-- 
cgit 


From bcf6d6313b28d73341a302d0657b7c90d298b9cc Mon Sep 17 00:00:00 2001
From: "Justin M. Forbes" <jforbes@fedoraproject.org>
Date: Mon, 28 Mar 2022 10:40:29 -0500
Subject: kernel-5.18.0-0.rc0.ae085d7f9365.9

* Mon Mar 28 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc0.ae085d7f9365.9]
- Avoid creating files in $RPM_SOURCE_DIR (Nicolas Chauvet)
- mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning (Waiman Long)
Resolves: rhbz#

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
---
 process_configs.sh | 55 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 30 insertions(+), 25 deletions(-)

(limited to 'process_configs.sh')

diff --git a/process_configs.sh b/process_configs.sh
index 27372afc2..3343bca5c 100755
--- a/process_configs.sh
+++ b/process_configs.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
 #
 # This script takes the merged config files and processes them through oldconfig
 # and listnewconfig
@@ -85,10 +85,10 @@ checkoptions()
 					 print "Found "a[1]"="a[2]" after generation, had " a[1]"="configs[a[1]]" in Source tree";
 			}
 		}
-	' "$1" "$2" > .mismatches${count}
+	' "$1" "$2" > .mismatches"${count}"
 
 	checkoptions_error=false
-	if test -s .mismatches${count}
+	if test -s .mismatches"${count}"
 	then
 		while read -r LINE
 		do
@@ -100,14 +100,14 @@ checkoptions()
 				checkoptions_error=true
 				break
 			fi
-		done < .mismatches${count}
+		done < .mismatches"${count}"
 
 		! $checkoptions_error && return
 
-		sed -i "1s/^/Error: Mismatches found in configuration files for ${arch} ${variant}\n/" .mismatches${count}
+		sed -i "1s/^/Error: Mismatches found in configuration files for ${arch} ${variant}\n/" .mismatches"${count}"
 		[ "$CONTINUEONERROR" ] || exit 1
 	else
-		rm -f .mismatches${count}
+		rm -f .mismatches"${count}"
 	fi
 }
 
@@ -206,11 +206,13 @@ function commit_new_configs()
 		fi
 		echo -n "Checking for new configs in $cfg ... "
 
-		make ${MAKEOPTS} ARCH="$arch" CROSS_COMPILE=$(get_cross_compile $arch) KCONFIG_CONFIG="$cfgorig" listnewconfig >& .listnewconfig
+		# shellcheck disable=SC2086
+		make ${MAKEOPTS} ARCH="$arch" CROSS_COMPILE="$(get_cross_compile "$arch")" KCONFIG_CONFIG="$cfgorig" listnewconfig >& .listnewconfig
 		grep -E 'CONFIG_' .listnewconfig > .newoptions
 		if test -s .newoptions
 		then
-			make ${MAKEOPTS} ARCH="$arch" CROSS_COMPILE=$(get_cross_compile $arch) KCONFIG_CONFIG="$cfgorig" helpnewconfig >& .helpnewconfig
+		# shellcheck disable=SC2086
+			make ${MAKEOPTS} ARCH="$arch" CROSS_COMPILE="$(get_cross_compile "$arch")" KCONFIG_CONFIG="$cfgorig" helpnewconfig >& .helpnewconfig
 			parsenewconfigs
 		fi
 		rm .newoptions
@@ -249,31 +251,33 @@ function process_config()
 
 	echo "Processing $cfg ... "
 
-	make ${MAKEOPTS} ARCH="$arch" CROSS_COMPILE=$(get_cross_compile $arch) KCONFIG_CONFIG="$cfgorig" listnewconfig >& .listnewconfig${count}
-	grep -E 'CONFIG_' .listnewconfig${count} > .newoptions${count}
-	if test -n "$NEWOPTIONS" && test -s .newoptions${count}
+	# shellcheck disable=SC2086
+	make ${MAKEOPTS} ARCH="$arch" CROSS_COMPILE="$(get_cross_compile "$arch")" KCONFIG_CONFIG="$cfgorig" listnewconfig >& .listnewconfig"${count}"
+	grep -E 'CONFIG_' .listnewconfig"${count}" > .newoptions"${count}"
+	if test -n "$NEWOPTIONS" && test -s .newoptions"${count}"
 	then
-		echo "Found unset config items in ${arch} ${variant}, please set them to an appropriate value" >> .errors${count}
-		cat .newoptions${count} >> .errors${count}
-		rm .newoptions${count}
+		echo "Found unset config items in ${arch} ${variant}, please set them to an appropriate value" >> .errors"${count}"
+		cat .newoptions"${count}" >> .errors"${count}"
+		rm .newoptions"${count}"
 		RETURNCODE=1
 		[ "$CONTINUEONERROR" ] || exit 1
 	fi
-	rm .newoptions${count}
+	rm .newoptions"${count}"
 
-	grep -E 'config.*warning' .listnewconfig${count} > .warnings${count}
-	if test -n "$CHECKWARNINGS" && test -s .warnings${count}
+	grep -E 'config.*warning' .listnewconfig"${count}" > .warnings"${count}"
+	if test -n "$CHECKWARNINGS" && test -s .warnings"${count}"
 	then
-		echo "Found misconfigured config items in ${arch} ${variant}, please set them to an appropriate value" >> .errors${count}
-		cat .warnings${count} >> .errors${count}
-		rm .warnings${count}
+		echo "Found misconfigured config items in ${arch} ${variant}, please set them to an appropriate value" >> .errors"${count}"
+		cat .warnings"${count}" >> .errors"${count}"
+		rm .warnings"${count}"
 		[ "$CONTINUEONERROR" ] || exit 1
 	fi
-	rm .warnings${count}
+	rm .warnings"${count}"
 
-	rm .listnewconfig${count}
+	rm .listnewconfig"${count}"
 
-	make ${MAKEOPTS} ARCH="$arch" CROSS_COMPILE=$(get_cross_compile $arch) KCONFIG_CONFIG="$cfgorig" olddefconfig > /dev/null || exit 1
+	# shellcheck disable=SC2086
+	make ${MAKEOPTS} ARCH="$arch" CROSS_COMPILE="$(get_cross_compile "$arch")" KCONFIG_CONFIG="$cfgorig" olddefconfig > /dev/null || exit 1
 	echo "# $arch" > "$cfgtmp"
 	cat "$cfgorig" >> "$cfgtmp"
 	if test -n "$CHECKOPTIONS"
@@ -311,7 +315,7 @@ function process_configs()
 		process_config "$cfg" "$count" &
 		waitpids[${count}]=$!
 		((count++))
-		while [ "$(jobs | grep Running | wc -l)" -ge $RHJOBS ]; do :; done
+		while [ "$(jobs | grep -c Running)" -ge "$RHJOBS" ]; do :; done
 	done
 	for pid in ${waitpids[*]}; do
 		wait ${pid}
@@ -378,7 +382,7 @@ do
 			;;
 		-m)
 			shift
-			if [ "$1" = "CC=clang" -o "$1" = "LLVM=1" ]; then
+			if [ "$1" = "CC=clang" ] || [ "$1" = "LLVM=1" ]; then
 				CC_IS_CLANG=1
 			fi
 			MAKEOPTS="$MAKEOPTS $1"
@@ -393,6 +397,7 @@ PACKAGE_NAME="${1:-kernel}" # defines the package name used
 KVERREL="$(test -n "$2" && echo "-$2" || echo "")"
 SUBARCH="$(test -n "$3" && echo "-$3" || echo "")"
 FLAVOR="$(test -n "$4" && echo "-$4" || echo "-ark")"
+# shellcheck disable=SC2015
 RHJOBS="$(test -n "$5" && echo "$5" || nproc --all)"
 SCRIPT=$(readlink -f "$0")
 SCRIPT_DIR=$(dirname "$SCRIPT")
-- 
cgit 


From ec96983c95a52f6df6e20e276ff9c761139e32d8 Mon Sep 17 00:00:00 2001
From: "Justin M. Forbes" <jforbes@fedoraproject.org>
Date: Tue, 29 Mar 2022 11:09:57 -0500
Subject: kernel-5.18.0-0.rc0.1930a6e739c4.10

* Tue Mar 29 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc0.1930a6e739c4.10]
- Avoid creating files in $RPM_SOURCE_DIR (Nicolas Chauvet)
- mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning (Waiman Long)
Resolves: rhbz#

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
---
 process_configs.sh | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'process_configs.sh')

diff --git a/process_configs.sh b/process_configs.sh
index 3343bca5c..91e6d1226 100755
--- a/process_configs.sh
+++ b/process_configs.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
 #
 # This script takes the merged config files and processes them through oldconfig
 # and listnewconfig
@@ -92,7 +92,7 @@ checkoptions()
 	then
 		while read -r LINE
 		do
-			if find ./ -name "$(echo "$LINE" | awk -F "=" ' { print $1 } ' | awk ' { print $2 }')" -print0 | xargs -0 grep ^ | grep -q "process_configs_known_broken"; then
+			if find "${REDHAT}"/configs -name "$(echo "$LINE" | awk -F "=" ' { print $1 } ' | awk ' { print $2 }')" -print0 | xargs -0 grep ^ | grep -q "process_configs_known_broken"; then
 				# This is a known broken config.
 				# See script help warning.
 				checkoptions_error=false
@@ -105,7 +105,6 @@ checkoptions()
 		! $checkoptions_error && return
 
 		sed -i "1s/^/Error: Mismatches found in configuration files for ${arch} ${variant}\n/" .mismatches"${count}"
-		[ "$CONTINUEONERROR" ] || exit 1
 	else
 		rm -f .mismatches"${count}"
 	fi
@@ -260,7 +259,6 @@ function process_config()
 		cat .newoptions"${count}" >> .errors"${count}"
 		rm .newoptions"${count}"
 		RETURNCODE=1
-		[ "$CONTINUEONERROR" ] || exit 1
 	fi
 	rm .newoptions"${count}"
 
@@ -270,7 +268,6 @@ function process_config()
 		echo "Found misconfigured config items in ${arch} ${variant}, please set them to an appropriate value" >> .errors"${count}"
 		cat .warnings"${count}" >> .errors"${count}"
 		rm .warnings"${count}"
-		[ "$CONTINUEONERROR" ] || exit 1
 	fi
 	rm .warnings"${count}"
 
@@ -340,7 +337,6 @@ function process_configs()
 }
 
 CHECKOPTIONS=""
-CONTINUEONERROR=""
 NEWOPTIONS=""
 TESTRUN=""
 CHECKWARNINGS=""
@@ -355,7 +351,6 @@ do
 	case $key in
 		-a)
 			CHECKOPTIONS="x"
-			CONTINUEONERROR="x"
 			NEWOPTIONS="x"
 			CHECKWARNINGS="x"
 			;;
@@ -365,9 +360,6 @@ do
 		-h)
 			usage
 			;;
-		-i)
-			CONTINUEONERROR="x"
-			;;
 		-n)
 			NEWOPTIONS="x"
 			;;
-- 
cgit 


From b4aa7140f3d9ab3f0910055d3f8f805ae1326906 Mon Sep 17 00:00:00 2001
From: "Justin M. Forbes" <jforbes@fedoraproject.org>
Date: Wed, 20 Apr 2022 08:35:44 -0500
Subject: kernel-5.18.0-0.rc3.559089e0a93d442.28

* Wed Apr 20 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc3.559089e0a93d442.28]
- redhat/Makefile: Deprecate SINGLE_TARBALL (Prarit Bhargava)
- redhat/Makefile.rhpkg: Remove quotes for RHDISTGIT (Prarit Bhargava)
- redhat/self-test: Clean up data set (Prarit Bhargava)
- redhat/scripts/create-tarball.sh: Use Makefile variables (Prarit Bhargava)
- redhat/Makefile: Cleanup TARBALL target (Prarit Bhargava)
- redhat/Makefile: Use RPMVERSION (Prarit Bhargava)
- redhat/scripts/rh-dist-git.sh: Use Makefile variables (Prarit Bhargava)
- redhat/configs/build_configs.sh: Use Makefile variables (Prarit Bhargava)
- redhat/configs/process_configs.sh: Use Makefile variables (Prarit Bhargava)
- redhat/kernel.spec.template: Use RPM_BUILD_NCPUS (Prarit Bhargava)
- redhat/configs/generate_all_configs.sh: Use Makefile variables (Prarit Bhargava)
Resolves: rhbz#

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
---
 process_configs.sh | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'process_configs.sh')

diff --git a/process_configs.sh b/process_configs.sh
index 91e6d1226..e6bce0fe6 100755
--- a/process_configs.sh
+++ b/process_configs.sh
@@ -191,7 +191,7 @@ function commit_new_configs()
 	# assume we are in $source_tree/configs, need to get to top level
 	pushd "$(switch_to_toplevel)" &>/dev/null
 
-	for cfg in "$SCRIPT_DIR/${PACKAGE_NAME}${KVERREL}${SUBARCH}"*.config
+	for cfg in "$SCRIPT_DIR/${PACKAGE_NAME}${KVERREL}"*.config
 	do
 		arch=$(head -1 "$cfg" | cut -b 3-)
 		cfgtmp="${cfg}.tmp"
@@ -303,7 +303,7 @@ function process_configs()
 	[ -f .mismatches ] && rm -f .mismatches
 
 	count=0
-	for cfg in "$SCRIPT_DIR/${PACKAGE_NAME}${KVERREL}${SUBARCH}"*.config
+	for cfg in "$SCRIPT_DIR/${PACKAGE_NAME}${KVERREL}"*.config
 	do
 		if [ "$count" -eq 0 ]; then
 			# do the first one by itself so that tools are built
@@ -385,12 +385,9 @@ do
 	shift
 done
 
-PACKAGE_NAME="${1:-kernel}" # defines the package name used
-KVERREL="$(test -n "$2" && echo "-$2" || echo "")"
-SUBARCH="$(test -n "$3" && echo "-$3" || echo "")"
-FLAVOR="$(test -n "$4" && echo "-$4" || echo "-ark")"
+KVERREL="$(test -n "$1" && echo "-$1" || echo "")"
+FLAVOR="$(test -n "$2" && echo "-$2" || echo "-ark")"
 # shellcheck disable=SC2015
-RHJOBS="$(test -n "$5" && echo "$5" || nproc --all)"
 SCRIPT=$(readlink -f "$0")
 SCRIPT_DIR=$(dirname "$SCRIPT")
 
-- 
cgit 


From 7ef390b6c4b96503cbea4a54f5caff0e84dbb9aa Mon Sep 17 00:00:00 2001
From: "Justin M. Forbes" <jforbes@fedoraproject.org>
Date: Mon, 9 May 2022 08:31:19 -0500
Subject: kernel-5.18.0-0.rc6.47

* Mon May 09 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc6.46]
- redhat/self-test: Add test to verify Makefile declarations. (Prarit Bhargava)
- redhat/Makefile: Add RHTEST (Prarit Bhargava)
Resolves:

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
---
 process_configs.sh | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'process_configs.sh')

diff --git a/process_configs.sh b/process_configs.sh
index e6bce0fe6..b6f48c9a9 100755
--- a/process_configs.sh
+++ b/process_configs.sh
@@ -6,6 +6,8 @@
 # Globally disable suggestion of appending '|| exit' or '|| return' to cd/pushd/popd commands
 # shellcheck disable=SC2164
 
+test -n "$RHTEST" && exit 0
+
 usage()
 {
 	# alphabetical order please
-- 
cgit 


From 483a93c5de77fdc40a4aeefc5fac9fae4180a9e3 Mon Sep 17 00:00:00 2001
From: "Justin M. Forbes" <jforbes@fedoraproject.org>
Date: Fri, 13 May 2022 07:09:44 -0500
Subject: kernel-5.18.0-0.rc6.20220513gitf3f19f939c11925.51

* Fri May 13 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc6.f3f19f939c11925.50]
- Add CONFIG_EFI_DXE_MEM_ATTRIBUTES (Justin M. Forbes)
- efi: x86: Set the NX-compatibility flag in the PE header (Peter Jones)
- efi: libstub: ensure allocated memory to be executable (Baskov Evgeniy)
- efi: libstub: declare DXE services table (Baskov Evgeniy)
Resolves:

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
---
 process_configs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'process_configs.sh')

diff --git a/process_configs.sh b/process_configs.sh
index b6f48c9a9..987fb78c1 100755
--- a/process_configs.sh
+++ b/process_configs.sh
@@ -262,7 +262,7 @@ function process_config()
 		rm .newoptions"${count}"
 		RETURNCODE=1
 	fi
-	rm .newoptions"${count}"
+	rm -f .newoptions"${count}"
 
 	grep -E 'config.*warning' .listnewconfig"${count}" > .warnings"${count}"
 	if test -n "$CHECKWARNINGS" && test -s .warnings"${count}"
-- 
cgit