Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Petr Vorel <petr.vorel@gmail.com>
To: Edgar Bonet <bonet@grenoble.cnrs.fr>
Cc: Buildroot development <buildroot@buildroot.org>,
	Julien Olivain <ju.o@free.fr>,
	"Yann E. MORIN" <yann.morin.1998@free.fr>
Subject: Re: [Buildroot] [PATCH v2 1/4] support/kconfig/patches: make all patches quilt-friendly
Date: Thu, 17 Jul 2025 00:01:52 +0200	[thread overview]
Message-ID: <20250716220152.GA125918@pevik> (raw)
In-Reply-To: <25430fea-b185-436e-8f88-b53f4fe04673@grenoble.cnrs.fr>

> On 16/07/2025 22:39, Petr Vorel wrote:
> > Hi Edgar,

> >> According to support/kconfig/README.buildroot, the patches in
> >> support/kconfig/patches/ are meant to be applied by quilt. However, two
> >> of those patches are in git format, which makes quilt error out with:

> >>     Applying patch patches/22-kconfig-lxdialog-fix-check-with-GCC14.patch
> >>     can't find file to patch at input line 32
> >>     [...]
> >>     No file to patch.  Skipping patch.

> >> Fix the format to make quilt happy.

> > How about using 'git quiltimport' instead?

> I didn't know about “git quiltimport”. I guess
> support/kconfig/README.buildroot could be rewritten to use it, although
> the fact that “git quiltimport” creates commits may somewhat complicate
> the procedure described there.

OK, although I regret loosing metadata, I'm not against using quilt format.

I have never used quilt to update, therefore I haven't experienced problems with
a patch format. If support/kconfig/README.buildroot is still up to date and this
patch is updated it'd be good to update support/kconfig/README.buildroot to
mention how to create quilt compatible patches. I suppose it's something like:

git format-patch --no-signature --no-stat --subject-prefix="" ...

Kind regards,
Petr

> Regards,

> Edgar.

> > Kind regards,
> > Petr

> >> Signed-off-by: Edgar Bonet <bonet@grenoble.cnrs.fr>
> >> ---
> >>  ...config-lxdialog-fix-check-with-GCC14.patch | 11 +++----
> >>  ...onfig-mn-conf-handle-backspace-H-key.patch | 31 +++++++++----------
> >>  2 files changed, 18 insertions(+), 24 deletions(-)

> >> diff --git a/support/kconfig/patches/22-kconfig-lxdialog-fix-check-with-GCC14.patch b/support/kconfig/patches/22-kconfig-lxdialog-fix-check-with-GCC14.patch
> >> index 41081bb45d..edcc857190 100644
> >> --- a/support/kconfig/patches/22-kconfig-lxdialog-fix-check-with-GCC14.patch
> >> +++ b/support/kconfig/patches/22-kconfig-lxdialog-fix-check-with-GCC14.patch
> >> @@ -25,10 +25,10 @@ Tested-by: Petr Vorel <petr.vorel@gmail.com>
> >>   kconfig/lxdialog/check-lxdialog.sh | 2 +-
> >>   1 file changed, 1 insertion(+), 1 deletion(-)

> >> -diff --git a/kconfig/lxdialog/check-lxdialog.sh b/kconfig/lxdialog/check-lxdialog.sh
> >> -index 16cd9a3186..27d6c30a57 100755
> >> ---- a/kconfig/lxdialog/check-lxdialog.sh
> >> -+++ b/kconfig/lxdialog/check-lxdialog.sh
> >> +Index: kconfig.new/lxdialog/check-lxdialog.sh
> >> +===================================================================
> >> +--- kconfig.orig/lxdialog/check-lxdialog.sh
> >> ++++ kconfig/lxdialog/check-lxdialog.sh
> >>  @@ -48,7 +48,7 @@ trap "rm -f $tmp" 0 1 2 3 15
> >>   check() {
> >>           $cc -x c - -o $tmp 2>/dev/null <<'EOF'
> >> @@ -38,6 +38,3 @@ index 16cd9a3186..27d6c30a57 100755
> >>   EOF
> >>   	if [ $? != 0 ]; then
> >>   	    echo " *** Unable to find the ncurses libraries or the"       1>&2
> >> --- 
> >> -2.44.0
> >> -
> >> diff --git a/support/kconfig/patches/23-kconfig-mn-conf-handle-backspace-H-key.patch b/support/kconfig/patches/23-kconfig-mn-conf-handle-backspace-H-key.patch
> >> index 6e32115f70..f72f9f339b 100644
> >> --- a/support/kconfig/patches/23-kconfig-mn-conf-handle-backspace-H-key.patch
> >> +++ b/support/kconfig/patches/23-kconfig-mn-conf-handle-backspace-H-key.patch
> >> @@ -16,11 +16,11 @@ Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> >>   kconfig/nconf.gui.c         | 3 ++-
> >>   3 files changed, 5 insertions(+), 3 deletions(-)

> >> -diff --git a/kconfig/lxdialog/inputbox.c b/kconfig/lxdialog/inputbox.c
> >> -index 611945611bf8..1dcfb288ee63 100644
> >> ---- a/kconfig/lxdialog/inputbox.c
> >> -+++ b/kconfig/lxdialog/inputbox.c
> >> -@@ -113,7 +113,8 @@ int dialog_inputbox(const char *title, const char *prompt, int height, int width
> >> +Index: kconfig/lxdialog/inputbox.c
> >> +===================================================================
> >> +--- kconfig.orig/lxdialog/inputbox.c
> >> ++++ kconfig/lxdialog/inputbox.c
> >> +@@ -126,7 +126,8 @@ int dialog_inputbox(const char *title, const char *prompt, int height, int width
> >>   			case KEY_DOWN:
> >>   				break;
> >>   			case KEY_BACKSPACE:
> >> @@ -30,10 +30,10 @@ index 611945611bf8..1dcfb288ee63 100644
> >>   				if (pos) {
> >>   					wattrset(dialog, dlg.inputbox.atr);
> >>   					if (input_x == 0) {
> >> -diff --git a/kconfig/nconf.c b/kconfig/nconf.c
> >> -index a4670f4e825a..ac92c0ded6c5 100644
> >> ---- a/kconfig/nconf.c
> >> -+++ b/kconfig/nconf.c
> >> +Index: kconfig/nconf.c
> >> +===================================================================
> >> +--- kconfig.orig/nconf.c
> >> ++++ kconfig/nconf.c
> >>  @@ -1048,7 +1048,7 @@ static int do_match(int key, struct match_state *state, int *ans)
> >>   		state->match_direction = FIND_NEXT_MATCH_UP;
> >>   		*ans = get_mext_match(state->pattern,
> >> @@ -43,11 +43,11 @@ index a4670f4e825a..ac92c0ded6c5 100644
> >>   		state->pattern[strlen(state->pattern)-1] = '\0';
> >>   		adj_match_dir(&state->match_direction);
> >>   	} else
> >> -diff --git a/kconfig/nconf.gui.c b/kconfig/nconf.gui.c
> >> -index 7be620a1fcdb..77f525a8617c 100644
> >> ---- a/kconfig/nconf.gui.c
> >> -+++ b/kconfig/nconf.gui.c
> >> -@@ -439,7 +439,8 @@ int dialog_inputbox(WINDOW *main_window,
> >> +Index: kconfig/nconf.gui.c
> >> +===================================================================
> >> +--- kconfig.orig/nconf.gui.c
> >> ++++ kconfig/nconf.gui.c
> >> +@@ -440,7 +440,8 @@ int dialog_inputbox(WINDOW *main_window,
> >>   		case KEY_F(F_EXIT):
> >>   		case KEY_F(F_BACK):
> >>   			break;
> >> @@ -57,6 +57,3 @@ index 7be620a1fcdb..77f525a8617c 100644
> >>   		case KEY_BACKSPACE:
> >>   			if (cursor_position > 0) {
> >>   				memmove(&result[cursor_position-1],
> >> --- 
> >> -2.48.1
> >> -
> > _______________________________________________
> > buildroot mailing list
> > buildroot@buildroot.org
> > https://lists.buildroot.org/mailman/listinfo/buildroot

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

  reply	other threads:[~2025-07-16 22:02 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-07-16 18:15 [Buildroot] [PATCH v2 0/4] Fix compiler warnings in support/kconfig Edgar Bonet via buildroot
2025-07-16 18:17 ` [Buildroot] [PATCH v2 1/4] support/kconfig/patches: make all patches quilt-friendly Edgar Bonet via buildroot
2025-07-16 20:39   ` Petr Vorel
2025-07-16 21:08     ` Edgar Bonet via buildroot
2025-07-16 22:01       ` Petr Vorel [this message]
2025-07-17 10:53         ` Edgar Bonet via buildroot
2025-07-16 18:18 ` [Buildroot] [PATCH v2 2/4] support/kconfig/patches: add missing patch Edgar Bonet via buildroot
2025-07-16 18:19 ` [Buildroot] [PATCH v2 3/4] support/kconfig: fix compiler warning in util.c Edgar Bonet via buildroot
2025-07-16 18:20 ` [Buildroot] [PATCH v2 4/4] support/kconfig: fix compiler warning in nconf.c Edgar Bonet via buildroot

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250716220152.GA125918@pevik \
    --to=petr.vorel@gmail.com \
    --cc=bonet@grenoble.cnrs.fr \
    --cc=buildroot@buildroot.org \
    --cc=ju.o@free.fr \
    --cc=yann.morin.1998@free.fr \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox