Merge pull request 'Combining configs into a single assembly' (#4) from ebasov/kernel-lt:i9-ispras-fuzzing into i9-ispras-fuzzing

Reviewed-on: #4

SOURCES/0002-Correcting-the-size-of-the-character-array.patch

@@ -0,0 +1,13 @@
+diff --git a/net/rxrpc/local_event.c b/net/rxrpc/local_event.c
+index 19e929c..e9cf26d 100644
+--- a/net/rxrpc/local_event.c
++++ b/net/rxrpc/local_event.c
+@@ -16,7 +16,7 @@
+ #include <generated/utsrelease.h>
+ #include "ar-internal.h"
+ 
+-static const char rxrpc_version_string[65] = "linux-" UTS_RELEASE " AF_RXRPC";
++static const char rxrpc_version_string[128] = "linux-" UTS_RELEASE " AF_RXRPC";
+ 
+ /*
+  * Reply to a version request

SOURCES/config-6.1.111-aarch64

@@ -1,7 +1,4 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.1.111-1.el9.elrepo.aarch64 Kernel Configuration
-#
+# arm64
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.4.1 20231218 (Red Hat 11.4.1-3)"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=110401

SOURCES/config-6.1.111-x86_64

@@ -1,7 +1,4 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.1.111-1.el9.elrepo.x86_64 Kernel Configuration
-#
+# x86_64
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.4.1 20231218 (Red Hat 11.4.1-3)"
 CONFIG_CC_IS_CLANG=y
 CONFIG_CC_IS_GCC=y

SOURCES/mod-denylist.sh

@@ -12,13 +12,15 @@ Dest="$4"
 
 blacklist()
 {
-	cat > "$RpmDir/etc/modprobe.d/$1-blacklist.conf" <<-__EOF__
+  	cat > "$RpmDir/etc/modprobe.d/$1${Dest:+-${Dest}}-blacklist.conf" <<-__EOF__
+	
 	# This kernel module can be automatically loaded by non-root users. To
 	# enhance system security, the module is blacklisted by default to ensure
 	# system administrators make the module available for use as needed.
 	# See https://access.redhat.com/articles/3760101 for more details.
 	#
 	# Remove the blacklist by adding a comment # at the start of the line.
+	
 	blacklist $1
 __EOF__
 }
@@ -114,16 +116,16 @@ done < modules3.list
 
 sort -u dep.list > dep2.list
 
-if [ -n "$Dest" ]; then
+#if [ -n "$Dest" ]; then
     # now move the modules into the $Dest directory
-    while IFS= read -r mod
-    do
-	newpath=$(dirname "$mod" | sed -e "s/kernel\\//$Dest\//")
-	mkdir -p "$newpath"
-	mv "$mod" "$newpath"
-	echo "$mod" | sed -e "s/kernel\\//$Dest\//" | sed -e "s|^.|${ModDir}|g" >> "$RpmDir"/"$ListName"
-    done < dep2.list
-fi
+#    while IFS= read -r mod
+#    do
+#	newpath=$(dirname "$mod" | sed -e "s/kernel\\//$Dest\//")
+#	mkdir -p "$newpath"
+#	mv "$mod" "$newpath"
+#	echo "$mod" | sed -e "s/kernel\\//$Dest\//" | sed -e "s|^.|${ModDir}|g" >> "$RpmDir"/"$ListName"
+#    done < dep2.list
+#fi
 
 popd
 
@@ -138,12 +140,11 @@ do
   rm -f .tmp_versions/"$modfile"
 done < "$Dir"/dep2.list
 
-if [ -z "$Dest" ]; then
-	sed -e "s|^.|${ModDir}|g" "$Dir"/dep2.list > "$RpmDir/$ListName"
-	echo "./$RpmDir/$ListName created."
-	[ -d "$RpmDir/etc/modprobe.d/" ] || mkdir -p "$RpmDir/etc/modprobe.d/"
-	foreachp check_blacklist < "$List"
-fi
+
+sed -e "s|^.|${ModDir}|g" "$Dir"/dep2.list > "$RpmDir/$ListName"
+echo "./$RpmDir/$ListName created."
+[ -d "$RpmDir/etc/modprobe.d/" ] || mkdir -p "$RpmDir/etc/modprobe.d/"
+foreachp check_blacklist < "$List"
 
 # Many BIOS-es export a PNP-id which causes the floppy driver to autoload
 # even though most modern systems don't have a 3.5" floppy driver anymore