gentoo auto-resync : 17:01:2023 - 01:13:38

3 files changed, 22 insertions, 17 deletions

diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 3ef5872c3985..663a83ec3124 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass
index 16ef69ebccb8..a65d0c441ba2 100644
--- a/eclass/linux-info.eclass
+++ b/eclass/linux-info.eclass
@@ -805,8 +805,14 @@ check_extra_config() {
 			export LINUX_CONFIG_EXISTS_DONE="${old_LINUX_CONFIG_EXISTS_DONE}"
 			return 0
 		fi
-	else
-		require_configured_kernel
+	elif ! linux_config_exists; then
+		qeerror "Could not find a neither a usable .config in the kernel source directory"
+		qeerror "nor a /proc/config.gz file,"
+		qeerror "Please ensure that ${KERNEL_DIR} points to a configured set of Linux sources."
+		qeerror "If you are using KBUILD_OUTPUT, please set the environment var so that"
+		qeerror "it points to the necessary object directory so that it might find .config"
+		qeerror "or have a properly configured kernel to produce a config.gz file. (CONFIG_IKCONFIG)."
+		die "Kernel not configured; no .config found in ${KV_OUT_DIR} or /proc/config.gz found"
 	fi
 
 	ebegin "Checking for suitable kernel configuration options"
diff --git a/eclass/unpacker.eclass b/eclass/unpacker.eclass
index 326b2fa67524..44ff2af5acf3 100644
--- a/eclass/unpacker.eclass
+++ b/eclass/unpacker.eclass
@@ -596,7 +596,8 @@ unpacker_src_unpack() {
 #
 # Note: USE flags are not yet handled.
 unpacker_src_uri_depends() {
-	local uri deps d
+	local uri
+	local -A deps
 
 	if [[ $# -eq 0 ]] ; then
 		# Disable path expansion for USE conditionals. #654960
@@ -606,20 +607,19 @@ unpacker_src_uri_depends() {
 	fi
 
 	for uri in "$@" ; do
-		local m=${uri,,}
-		case ${m} in
+		case ${uri,,} in
 		*.cpio.*|*.cpio)
-			d="app-arch/cpio" ;;
+			deps[cpio]="app-arch/cpio" ;;
 		*.rar)
-			d="app-arch/unrar" ;;
+			deps[rar]="app-arch/unrar" ;;
 		*.7z)
-			d="app-arch/p7zip" ;;
+			deps[7z]="app-arch/p7zip" ;;
 		*.xz)
-			d="app-arch/xz-utils" ;;
+			deps[xz]="app-arch/xz-utils" ;;
 		*.zip)
-			d="app-arch/unzip" ;;
+			deps[zip]="app-arch/unzip" ;;
 		*.lz)
-			d="
+			deps[lz]="
 				|| (
 					>=app-arch/xz-utils-5.4.0
 					app-arch/plzip
@@ -629,18 +629,17 @@ unpacker_src_uri_depends() {
 			"
 			;;
 		*.zst)
-			d="app-arch/zstd" ;;
+			deps[zst]="app-arch/zstd" ;;
 		*.lha|*.lzh)
-			d="app-arch/lha" ;;
+			deps[lhah]="app-arch/lha" ;;
 		*.lz4)
-			d="app-arch/lz4" ;;
+			deps[lz4]="app-arch/lz4" ;;
 		*.lzo)
-			d="app-arch/lzop" ;;
+			deps[lzo]="app-arch/lzop" ;;
 		esac
-		deps+=" ${d}"
 	done
 
-	echo "${deps}"
+	echo "${deps[*]}"
 }
 
 EXPORT_FUNCTIONS src_unpack