From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 580E3138334 for ; Tue, 19 Feb 2019 07:40:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 31681E08EC; Tue, 19 Feb 2019 07:40:27 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EF643E08EC for ; Tue, 19 Feb 2019 07:40:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3729C335C8E for ; Tue, 19 Feb 2019 07:40:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A318F549 for ; Tue, 19 Feb 2019 07:40:22 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1550561723.aa0c1b8902caaf411e6a1abf46fb4d8f5e5867ed.robbat2@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: defaults/ X-VCS-Repository: proj/genkernel X-VCS-Files: defaults/config.sh X-VCS-Directories: defaults/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: aa0c1b8902caaf411e6a1abf46fb4d8f5e5867ed X-VCS-Branch: master Date: Tue, 19 Feb 2019 07:40:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0ea05ad4-97a6-4d8f-9965-611cda083c7c X-Archives-Hash: b4b3a0d6287efb0a7246d911ecea29e7 commit: aa0c1b8902caaf411e6a1abf46fb4d8f5e5867ed Author: Christoph Junghans lanl gov> AuthorDate: Tue Jul 3 22:00:18 2018 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Tue Feb 19 07:35:23 2019 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=aa0c1b89 fix override of KERNEL_MAKE_DIRECTIVE_OVERRIDE Setting KERNEL_MAKE_DIRECTIVE_OVERRIDE in genkernel.conf didn't work. As default get loaded afterwards. Signed-off-by: Christoph Junghans gentoo.org> Signed-off-by: Robin H. Johnson gentoo.org> defaults/config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaults/config.sh b/defaults/config.sh index b961f68..3be9e4d 100755 --- a/defaults/config.sh +++ b/defaults/config.sh @@ -8,7 +8,7 @@ KERNEL_MAKE_DIRECTIVE="--INVALID--" # for xen-based kernels, the default value of # KERNEL_MAKE_DIRECTIVE_OVERRIDE cannot be "" DEFAULT_KERNEL_MAKE_DIRECTIVE_OVERRIDE="--INVALID--" -KERNEL_MAKE_DIRECTIVE_OVERRIDE="${DEFAULT_KERNEL_MAKE_DIRECTIVE_OVERRIDE}" +KERNEL_MAKE_DIRECTIVE_OVERRIDE="${KERNEL_MAKE_DIRECTIVE_OVERRIDE:-${DEFAULT_KERNEL_MAKE_DIRECTIVE_OVERRIDE}}" KERNEL_MAKE_DIRECTIVE_2="" KERNEL_BINARY="--INVALID--" KERNEL_BINARY_OVERRIDE=""