Re: [Buildroot] [PATCH v2 1/4] support/kconfig/patches: make all patches quilt-friendly

[Petr Vorel <petr.vorel@gmail.com>]

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?

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