From d274aa4f6aa050e56347f40eb65f8b2c8a44a21c Mon Sep 17 00:00:00 2001 From: fda77 Date: Tue, 1 Oct 2024 13:45:29 +0200 Subject: [PATCH] bump kconfig-host --- docs/CHANGELOG.md | 1 + make/host-tools/kconfig-host/kconfig-host.mk | 8 ++++---- .../kconfig-host/patches/100-main_makefile.patch | 2 +- .../patches/400-do_not_create_autoconf_stuff.patch | 4 ++-- .../kconfig-host/patches/610-unchangable_style.patch | 4 ++-- .../patches/630-fail_on_unmet_direct_dependency.patch | 4 ++-- .../patches/640-max_item_count_for_choice_dialog.patch | 2 +- .../kconfig-host/patches/660-project_name.patch | 2 +- 8 files changed, 14 insertions(+), 13 deletions(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 19a1a7fc9b..e1dfdd0da6 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -60,6 +60,7 @@ Latest changes * busybox 1.37.0 * cmake 3.30.4 * fakeroot 1.36 + * kconfig 6.11 * meson 1.5.2 * openssl 3.0.15 * precompiled host-tools 2024-09-28 diff --git a/make/host-tools/kconfig-host/kconfig-host.mk b/make/host-tools/kconfig-host/kconfig-host.mk index a4a7c6c746..e3b28cafcc 100644 --- a/make/host-tools/kconfig-host/kconfig-host.mk +++ b/make/host-tools/kconfig-host/kconfig-host.mk @@ -1,8 +1,8 @@ -$(call TOOLS_INIT, v6.10) +$(call TOOLS_INIT, v6.11) ## patches/100-main_makefile.patch contains also the version $(PKG)_SOURCE:=kconfig-$($(PKG)_VERSION).tar.xz -$(PKG)_HASH:=3643a47b3adc7c332de807eda622ca9f69c8168a62229712ddd1eb158bda8b7a -$(PKG)_SITE:=git_archive@git://repo.or.cz/linux.git,scripts/basic,scripts/kconfig,scripts/Kbuild.include,scripts/Makefile.compiler,scripts/Makefile.build,scripts/Makefile.host,scripts/Makefile.lib,Documentation/kbuild/kconfig-language.rst,Documentation/kbuild/kconfig-macro-language.rst,Documentation/kbuild/kconfig.rst +$(PKG)_HASH:=b628d1e54814c61ce0cdfab26c466bf0b35de4ade6cca335ce236e94a9efab86 +$(PKG)_SITE:=git_archive@git://repo.or.cz/linux.git,scripts/basic,scripts/include,scripts/kconfig,scripts/Kbuild.include,scripts/Makefile.compiler,scripts/Makefile.build,scripts/Makefile.host,scripts/Makefile.lib,Documentation/kbuild/kconfig-language.rst,Documentation/kbuild/kconfig-macro-language.rst,Documentation/kbuild/kconfig.rst ### MANPAGE:=https://www.kernel.org/doc/html/next/kbuild/kconfig-language.html ### CHANGES:=https://github.com/torvalds/linux/tags ### CVSREPO:=https://github.com/torvalds/linux/tree/master/scripts/kconfig @@ -19,7 +19,6 @@ $(PKG)_TARGET_PRG := conf mconf nconf gconf gconf.glade qconf $(PKG)_TARGET_ARG := config menuconfig nconfig gconfig gconfig xconfig $(PKG)_TARGET_ALL := $(join $(KCONFIG_HOST_TARGET_ARG),$(patsubst %,--%,$(KCONFIG_HOST_TARGET_PRG))) - $(PKG)_CONDITIONAL_PATCHES+=$(if $(FREETZ_TOOLS_KCONFIG_BUTTONS),buttons) $(PKG)_REBUILD_SUBOPTS += FREETZ_TOOLS_KCONFIG_BUTTONS @@ -34,6 +33,7 @@ $(TOOLS_CONFIGURED_NOP) $($(PKG)_TARGET_PRG:%=$($(PKG)_DIR)/scripts/kconfig/%): $($(PKG)_DIR)/.unpacked $(TOOLS_SUBMAKE) -C $(KCONFIG_HOST_DIR) \ + HOST_EXTRACFLAGS="-Iscripts/include" \ HOSTPKG_CONFIG="pkgconf" \ $(subst --$(notdir $@),,$(filter %--$(notdir $@),$(KCONFIG_HOST_TARGET_ALL))) diff --git a/make/host-tools/kconfig-host/patches/100-main_makefile.patch b/make/host-tools/kconfig-host/patches/100-main_makefile.patch index 3a853ce82c..0cbe551f05 100644 --- a/make/host-tools/kconfig-host/patches/100-main_makefile.patch +++ b/make/host-tools/kconfig-host/patches/100-main_makefile.patch @@ -9,7 +9,7 @@ it that way for Freetz. +++ Makefile @@ -0,0 +1,100 @@ +VERSION = 6 -+PATCHLEVEL = 10 ++PATCHLEVEL = 11 +SUBLEVEL = 0 +EXTRAVERSION = +NAME = "Linux for Workgroups" diff --git a/make/host-tools/kconfig-host/patches/400-do_not_create_autoconf_stuff.patch b/make/host-tools/kconfig-host/patches/400-do_not_create_autoconf_stuff.patch index 351a12c372..5624db05c0 100644 --- a/make/host-tools/kconfig-host/patches/400-do_not_create_autoconf_stuff.patch +++ b/make/host-tools/kconfig-host/patches/400-do_not_create_autoconf_stuff.patch @@ -1,6 +1,6 @@ --- scripts/kconfig/confdata.c +++ scripts/kconfig/confdata.c -@@ -1097,6 +1097,7 @@ +@@ -1068,6 +1068,7 @@ int conf_write_autoconf(int overwrite) { @@ -8,7 +8,7 @@ struct symbol *sym; const char *autoconf_name = conf_get_autoconfig_name(); int ret; -@@ -1136,6 +1137,7 @@ +@@ -1107,6 +1108,7 @@ &comment_style_pound); if (ret) return ret; diff --git a/make/host-tools/kconfig-host/patches/610-unchangable_style.patch b/make/host-tools/kconfig-host/patches/610-unchangable_style.patch index 05033cb237..d93d0b8b06 100644 --- a/make/host-tools/kconfig-host/patches/610-unchangable_style.patch +++ b/make/host-tools/kconfig-host/patches/610-unchangable_style.patch @@ -1,6 +1,6 @@ --- scripts/kconfig/mconf.c +++ scripts/kconfig/mconf.c -@@ -559,7 +559,7 @@ +@@ -545,7 +545,7 @@ if (sym_is_changeable(sym)) item_make("[%c]", val == no ? ' ' : '*'); else @@ -9,7 +9,7 @@ item_set_tag('t'); item_set_data(menu); break; -@@ -575,7 +575,7 @@ +@@ -561,7 +561,7 @@ else item_make("<%c>", ch); } else diff --git a/make/host-tools/kconfig-host/patches/630-fail_on_unmet_direct_dependency.patch b/make/host-tools/kconfig-host/patches/630-fail_on_unmet_direct_dependency.patch index 75b57bd0c9..a39b52a360 100644 --- a/make/host-tools/kconfig-host/patches/630-fail_on_unmet_direct_dependency.patch +++ b/make/host-tools/kconfig-host/patches/630-fail_on_unmet_direct_dependency.patch @@ -1,6 +1,6 @@ --- scripts/kconfig/symbol.c +++ scripts/kconfig/symbol.c -@@ -337,7 +337,7 @@ +@@ -360,7 +360,7 @@ struct gstr gs = str_new(); str_printf(&gs, @@ -9,7 +9,7 @@ sym->name); str_printf(&gs, " Depends on [%c]: ", -@@ -352,6 +352,7 @@ +@@ -375,6 +375,7 @@ fputs(str_get(&gs), stderr); sym_warnings++; diff --git a/make/host-tools/kconfig-host/patches/640-max_item_count_for_choice_dialog.patch b/make/host-tools/kconfig-host/patches/640-max_item_count_for_choice_dialog.patch index 6c0288cf62..8d21ef01ba 100644 --- a/make/host-tools/kconfig-host/patches/640-max_item_count_for_choice_dialog.patch +++ b/make/host-tools/kconfig-host/patches/640-max_item_count_for_choice_dialog.patch @@ -1,6 +1,6 @@ --- scripts/kconfig/mconf.c +++ scripts/kconfig/mconf.c -@@ -639,9 +639,9 @@ +@@ -625,9 +625,9 @@ dialog_clear(); res = dialog_checklist(prompt ? prompt : "Main Menu", radiolist_instructions, diff --git a/make/host-tools/kconfig-host/patches/660-project_name.patch b/make/host-tools/kconfig-host/patches/660-project_name.patch index cbccff3322..a2e5317321 100644 --- a/make/host-tools/kconfig-host/patches/660-project_name.patch +++ b/make/host-tools/kconfig-host/patches/660-project_name.patch @@ -1,6 +1,6 @@ --- scripts/kconfig/mconf.c +++ scripts/kconfig/mconf.c -@@ -894,7 +894,7 @@ +@@ -880,7 +880,7 @@ if (conf_get_changed()) res = dialog_yesno(NULL, "Do you wish to save your new configuration?\n"