diff mbox

[1/3] scripts/kconfig: ensure we use proper CONFIG_ prefix

Message ID 1353542766-24422-2-git-send-email-yann.morin.1998@free.fr (mailing list archive)
State New, archived
Headers show

Commit Message

Yann E. MORIN Nov. 22, 2012, 12:06 a.m. UTC
Now that we get the CONFIG_ prefix from the environment, we must
ensure we use the proper prefix in case the user has it set in
the environment.

Simply unexport CONFIG_ to fallback to our hard-coded default.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 scripts/kconfig/Makefile |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

Comments

Michal Marek Dec. 20, 2012, 10:20 p.m. UTC | #1
On Thu, Nov 22, 2012 at 01:06:04AM +0100, Yann E. MORIN wrote:
> Now that we get the CONFIG_ prefix from the environment, we must
> ensure we use the proper prefix in case the user has it set in
> the environment.
> 
> Simply unexport CONFIG_ to fallback to our hard-coded default.
> 
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Sorry for the delay. I applied this patch, so that the $CONFIG_ patches
do not cause any breakage in 3.8-rc1. We can discuss later if / how to
change it to use some Kconfig syntax instead.

Michal
--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Yann E. MORIN Dec. 20, 2012, 10:27 p.m. UTC | #2
Michal, All,

On Thursday 20 December 2012 Michal Marek wrote:
> On Thu, Nov 22, 2012 at 01:06:04AM +0100, Yann E. MORIN wrote:
> > Now that we get the CONFIG_ prefix from the environment, we must
> > ensure we use the proper prefix in case the user has it set in
> > the environment.
> > 
> > Simply unexport CONFIG_ to fallback to our hard-coded default.
> > 
> > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> 
> Sorry for the delay. I applied this patch, so that the $CONFIG_ patches
> do not cause any breakage in 3.8-rc1. We can discuss later if / how to
> change it to use some Kconfig syntax instead.

Ok, no problem! :-)

Of course, you can then forget about the first patch in the pull-request
I sent a few minutes ago. ;-)

Regards,
Yann E. MORIN.
diff mbox

Patch

diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 3091794..231b475 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -11,6 +11,9 @@  else
 Kconfig := Kconfig
 endif
 
+# We need this, in case the user has it in its environment
+unexport CONFIG_
+
 xconfig: $(obj)/qconf
 	$< $(Kconfig)