* [PATCH]
@ 2010-08-14 12:43 Sam Ravnborg
0 siblings, 0 replies; 6+ messages in thread
From: Sam Ravnborg @ 2010-08-14 12:43 UTC (permalink / raw)
To: Michal Marek, linux-kbuild, lkml
From 705dbd8a31520722bda78e1bc731e2880f8df0ff Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@ravnborg.org>
Date: Sat, 14 Aug 2010 14:40:00 +0200
Subject: [PATCH] kconfig: fix segfault when detecting recursive dependency
Following sample Kconfig generated a segfault:
config FOO
bool
select PERF_EVENTS if HAVE_HW_BREAKPOINT
config PERF_EVENTS
bool
config HAVE_HW_BREAKPOINT
bool
depends on PERF_EVENTS
Fix by reverting back to a valid property if there was no
property on the stack of symbols.
The above pattern were seen in sh Kconfig.
A fix for the Kconfig file has been sent to the sh folks.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---
scripts/kconfig/symbol.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
index e95718f..943712c 100644
--- a/scripts/kconfig/symbol.c
+++ b/scripts/kconfig/symbol.c
@@ -937,6 +937,8 @@ static void sym_check_print_recursive(struct symbol *last_sym)
sym = stack->sym;
next_sym = stack->next ? stack->next->sym : last_sym;
prop = stack->prop;
+ if (prop == NULL)
+ prop = stack->sym->prop;
/* for choice values find the menu entry (used below) */
if (sym_is_choice(sym) || sym_is_choice_value(sym)) {
--
1.6.0.6
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH]
@ 2010-09-19 2:25 Junio C Hamano
2010-09-19 9:54 ` [PATCH] Sam Ravnborg
0 siblings, 1 reply; 6+ messages in thread
From: Junio C Hamano @ 2010-09-19 2:25 UTC (permalink / raw)
To: Sam Ravnborg
Cc: Roman Zippel, Michal Marek, Li Zefan, linux-kbuild, linux-kernel
In 60f33b8 (kconfig: get rid of stray a.o, support ncursesw, 2006-01-15),
support to link menuconfig with ncursesw library was added. To compute
the linker command option -l, we check "libncursesw.{so,a,dylib}" to allow
ncursesw to be used as a replacement ncurses. However, when checking what
header file to include, we do not check /usr/include/ncursesw directory.
Add /usr/include/ncursesw to the list of directories that are checked.
With this patch, on my Debian Lenny box with libncursesw5-dev package but
not libncurses5-dev package, I can say "make menuconfig".
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
* There is no /usr/include/ncurses/ directory but /usr/include/ncursesw
exists, and has curses.h in it.
scripts/kconfig/lxdialog/check-lxdialog.sh | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/scripts/kconfig/lxdialog/check-lxdialog.sh b/scripts/kconfig/lxdialog/check-lxdialog.sh
index fcef0f5..82cc3a8 100644
--- a/scripts/kconfig/lxdialog/check-lxdialog.sh
+++ b/scripts/kconfig/lxdialog/check-lxdialog.sh
@@ -23,6 +23,8 @@ ccflags()
echo '-I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>"'
elif [ -f /usr/include/ncurses/curses.h ]; then
echo '-I/usr/include/ncurses -DCURSES_LOC="<ncurses/curses.h>"'
+ elif [ -f /usr/include/ncursesw/curses.h ]; then
+ echo '-I/usr/include/ncursesw -DCURSES_LOC="<ncursesw/curses.h>"'
elif [ -f /usr/include/ncurses.h ]; then
echo '-DCURSES_LOC="<ncurses.h>"'
else
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH]
2010-09-19 2:25 [PATCH] Junio C Hamano
@ 2010-09-19 9:54 ` Sam Ravnborg
2010-09-19 18:21 ` [PATCH] Junio C Hamano
0 siblings, 1 reply; 6+ messages in thread
From: Sam Ravnborg @ 2010-09-19 9:54 UTC (permalink / raw)
To: Junio C Hamano
Cc: Roman Zippel, Michal Marek, Li Zefan, linux-kbuild, linux-kernel
On Sat, Sep 18, 2010 at 07:25:32PM -0700, Junio C Hamano wrote:
> In 60f33b8 (kconfig: get rid of stray a.o, support ncursesw, 2006-01-15),
> support to link menuconfig with ncursesw library was added. To compute
> the linker command option -l, we check "libncursesw.{so,a,dylib}" to allow
> ncursesw to be used as a replacement ncurses. However, when checking what
> header file to include, we do not check /usr/include/ncursesw directory.
>
> Add /usr/include/ncursesw to the list of directories that are checked.
> With this patch, on my Debian Lenny box with libncursesw5-dev package but
> not libncurses5-dev package, I can say "make menuconfig".
>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Except for the missing patch subject then it looks OK.
Suggested subject:
kconfig: fix menuconfig on debian lenny
Add as this is a fix we should Cc: <stable@kerne.org>?
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Sam
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH]
2010-09-19 9:54 ` [PATCH] Sam Ravnborg
@ 2010-09-19 18:21 ` Junio C Hamano
2010-09-19 19:31 ` [PATCH] Sam Ravnborg
2010-09-20 12:11 ` [PATCH] Michal Marek
0 siblings, 2 replies; 6+ messages in thread
From: Junio C Hamano @ 2010-09-19 18:21 UTC (permalink / raw)
To: Sam Ravnborg
Cc: Roman Zippel, Michal Marek, Li Zefan, linux-kbuild, linux-kernel
Sam Ravnborg <sam@ravnborg.org> writes:
> On Sat, Sep 18, 2010 at 07:25:32PM -0700, Junio C Hamano wrote:
>> In 60f33b8 (kconfig: get rid of stray a.o, support ncursesw, 2006-01-15),
>> support to link menuconfig with ncursesw library was added. To compute
>> the linker command option -l, we check "libncursesw.{so,a,dylib}" to allow
>> ncursesw to be used as a replacement ncurses. However, when checking what
>> header file to include, we do not check /usr/include/ncursesw directory.
>>
>> Add /usr/include/ncursesw to the list of directories that are checked.
>> With this patch, on my Debian Lenny box with libncursesw5-dev package but
>> not libncurses5-dev package, I can say "make menuconfig".
>>
>> Signed-off-by: Junio C Hamano <gitster@pobox.com>
>
> Except for the missing patch subject then it looks OK.
> Suggested subject:
> kconfig: fix menuconfig on debian lenny
Sorry, the missing subject really was sloppy of me, and thanks.
> Add as this is a fix we should Cc: <stable@kerne.org>?
I don't think the fix deserves to be in stable. It does not look like
60f33b8 made it possible to use ncursesw on a box like mine so the patch
is not evan an regression-fix.
> Acked-by: Sam Ravnborg <sam@ravnborg.org>
Thanks; is it my responsibility to follow-up the thread with identical
patch with updated Subject and with your Ack, hoping somebody in kbuild
team would pick it up?
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH]
2010-09-19 18:21 ` [PATCH] Junio C Hamano
@ 2010-09-19 19:31 ` Sam Ravnborg
2010-09-20 12:11 ` [PATCH] Michal Marek
1 sibling, 0 replies; 6+ messages in thread
From: Sam Ravnborg @ 2010-09-19 19:31 UTC (permalink / raw)
To: Junio C Hamano
Cc: Roman Zippel, Michal Marek, Li Zefan, linux-kbuild, linux-kernel
On Sun, Sep 19, 2010 at 11:21:21AM -0700, Junio C Hamano wrote:
> Sam Ravnborg <sam@ravnborg.org> writes:
>
> > On Sat, Sep 18, 2010 at 07:25:32PM -0700, Junio C Hamano wrote:
> >> In 60f33b8 (kconfig: get rid of stray a.o, support ncursesw, 2006-01-15),
> >> support to link menuconfig with ncursesw library was added. To compute
> >> the linker command option -l, we check "libncursesw.{so,a,dylib}" to allow
> >> ncursesw to be used as a replacement ncurses. However, when checking what
> >> header file to include, we do not check /usr/include/ncursesw directory.
> >>
> >> Add /usr/include/ncursesw to the list of directories that are checked.
> >> With this patch, on my Debian Lenny box with libncursesw5-dev package but
> >> not libncurses5-dev package, I can say "make menuconfig".
> >>
> >> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> >
> > Except for the missing patch subject then it looks OK.
> > Suggested subject:
> > kconfig: fix menuconfig on debian lenny
>
> Sorry, the missing subject really was sloppy of me, and thanks.
>
> > Add as this is a fix we should Cc: <stable@kerne.org>?
>
> I don't think the fix deserves to be in stable. It does not look like
> 60f33b8 made it possible to use ncursesw on a box like mine so the patch
> is not evan an regression-fix.
OK
>
> > Acked-by: Sam Ravnborg <sam@ravnborg.org>
>
> Thanks; is it my responsibility to follow-up the thread with identical
> patch with updated Subject and with your Ack, hoping somebody in kbuild
> team would pick it up?
I assume Michal will pick it up anyway - but if you do it would make
it simpler for him to do so.
So no need..
Sam
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH]
2010-09-19 18:21 ` [PATCH] Junio C Hamano
2010-09-19 19:31 ` [PATCH] Sam Ravnborg
@ 2010-09-20 12:11 ` Michal Marek
1 sibling, 0 replies; 6+ messages in thread
From: Michal Marek @ 2010-09-20 12:11 UTC (permalink / raw)
To: Junio C Hamano
Cc: Sam Ravnborg, Roman Zippel, Li Zefan, linux-kbuild, linux-kernel
On 19.9.2010 20:21, Junio C Hamano wrote:
> Sam Ravnborg <sam@ravnborg.org> writes:
>> On Sat, Sep 18, 2010 at 07:25:32PM -0700, Junio C Hamano wrote:
>>> In 60f33b8 (kconfig: get rid of stray a.o, support ncursesw, 2006-01-15),
>>> support to link menuconfig with ncursesw library was added. To compute
>>> the linker command option -l, we check "libncursesw.{so,a,dylib}" to allow
>>> ncursesw to be used as a replacement ncurses. However, when checking what
>>> header file to include, we do not check /usr/include/ncursesw directory.
>>>
>>> Add /usr/include/ncursesw to the list of directories that are checked.
>>> With this patch, on my Debian Lenny box with libncursesw5-dev package but
>>> not libncurses5-dev package, I can say "make menuconfig".
>>>
>>> Signed-off-by: Junio C Hamano <gitster@pobox.com>
>>
[...]
>
>> Acked-by: Sam Ravnborg <sam@ravnborg.org>
>
> Thanks; is it my responsibility to follow-up the thread with identical
> patch with updated Subject and with your Ack, hoping somebody in kbuild
> team would pick it up?
I fixed the subject line myself and applied it to kbuild-2.6.git#kconfig.
Thanks,
Michal
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-09-20 12:11 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-19 2:25 [PATCH] Junio C Hamano
2010-09-19 9:54 ` [PATCH] Sam Ravnborg
2010-09-19 18:21 ` [PATCH] Junio C Hamano
2010-09-19 19:31 ` [PATCH] Sam Ravnborg
2010-09-20 12:11 ` [PATCH] Michal Marek
-- strict thread matches above, loose matches on Subject: below --
2010-08-14 12:43 [PATCH] Sam Ravnborg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox