kconfig: drop localization support (694c49a7) · Commits · e / devices / android_kernel_fairphone_FP4

scripts/kconfig/.gitignore

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -2,9 +2,6 @@
	# Generated files		# Generated files
	#		#
	*.moc		*.moc
	gconf.glade.h
	*.pot
	*.mo

	#		#
	# configuration programs		# configuration programs
	@@ -14,4 +11,3 @@ mconf
	nconf		nconf
	qconf		qconf
	gconf		gconf
	kxgettext

scripts/kconfig/Makefile

+3 −39

Original line number	Original line	Diff line number	Diff line
	@@ -3,7 +3,7 @@
	# Kernel configuration targets		# Kernel configuration targets
	# These targets are used from top-level makefile		# These targets are used from top-level makefile

	PHONY += xconfig gconfig menuconfig config syncconfig update-po-config \		PHONY += xconfig gconfig menuconfig config syncconfig \
	localmodconfig localyesconfig		localmodconfig localyesconfig

	ifdef KBUILD_KCONFIG		ifdef KBUILD_KCONFIG
	@@ -55,29 +55,6 @@ localyesconfig localmodconfig: $(obj)/conf
	fi		fi
	$(Q)rm -f .tmp.config		$(Q)rm -f .tmp.config

	# Create new linux.pot file
	# Adjust charset to UTF-8 in .po file to accept UTF-8 in Kconfig files
	update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h
	$(Q)$(kecho) " GEN config.pot"
	$(Q)xgettext --default-domain=linux \
	--add-comments --keyword=_ --keyword=N_ \
	--from-code=UTF-8 \
	--files-from=$(srctree)/scripts/kconfig/POTFILES.in \
	--directory=$(srctree) --directory=$(objtree) \
	--output $(obj)/config.pot
	$(Q)sed -i s/CHARSET/UTF-8/ $(obj)/config.pot
	$(Q)(for i in `ls $(srctree)/arch/*/Kconfig \
	$(srctree)/arch/*/um/Kconfig`; \
	do \
	$(kecho) " GEN $$i"; \
	$(obj)/kxgettext $$i \
	>> $(obj)/config.pot; \
	done )
	$(Q)$(kecho) " GEN linux.pot"
	$(Q)msguniq --sort-by-file --to-code=UTF-8 $(obj)/config.pot \
	--output $(obj)/linux.pot
	$(Q)rm -f $(obj)/config.pot

	# These targets map 1:1 to the commandline options of 'conf'		# These targets map 1:1 to the commandline options of 'conf'
	simple-targets := oldconfig allnoconfig allyesconfig allmodconfig \		simple-targets := oldconfig allnoconfig allyesconfig allmodconfig \
	alldefconfig randconfig listnewconfig olddefconfig		alldefconfig randconfig listnewconfig olddefconfig
	@@ -179,19 +156,11 @@ help:
	# object files used by all kconfig flavours		# object files used by all kconfig flavours

	conf-objs := conf.o zconf.tab.o		conf-objs := conf.o zconf.tab.o
	kxgettext-objs := kxgettext.o zconf.tab.o

	hostprogs-y := conf kxgettext		hostprogs-y := conf

	targets += zconf.lex.c		targets += zconf.lex.c
	clean-files += gconf.glade.h
	clean-files += config.pot linux.pot

	# Add environment specific flags
	HOST_EXTRACFLAGS += $(shell $(CONFIG_SHELL) $(srctree)/$(src)/check.sh $(HOSTCC) $(HOSTCFLAGS)) \
	-DLOCALE
	HOST_EXTRACXXFLAGS += $(shell $(CONFIG_SHELL) $(srctree)/$(src)/check.sh $(HOSTCXX) $(HOSTCXXFLAGS)) \
	-DLOCALE
	# generated files seem to need this to find local include files		# generated files seem to need this to find local include files
	HOSTCFLAGS_zconf.lex.o := -I$(src)		HOSTCFLAGS_zconf.lex.o := -I$(src)
	HOSTCFLAGS_zconf.tab.o := -I$(src)		HOSTCFLAGS_zconf.tab.o := -I$(src)
	@@ -244,11 +213,6 @@ $(obj)/gconf.o: $(obj)/.gconf-cfg

	$(obj)/zconf.tab.o: $(obj)/zconf.lex.c		$(obj)/zconf.tab.o: $(obj)/zconf.lex.c

	# Extract gconf menu items for i18n support
	$(obj)/gconf.glade.h: $(obj)/gconf.glade
	$(Q)intltool-extract --type=gettext/glade --srcdir=$(srctree) \
	$(obj)/gconf.glade

	# check if necessary packages are available, and configure build flags		# check if necessary packages are available, and configure build flags
	define filechk_conf_cfg		define filechk_conf_cfg
	$(CONFIG_SHELL) $<		$(CONFIG_SHELL) $<

scripts/kconfig/POTFILES.in

deleted100644 → 0

+0 −12

Original line number	Original line	Diff line number	Diff line
	scripts/kconfig/lxdialog/checklist.c
	scripts/kconfig/lxdialog/inputbox.c
	scripts/kconfig/lxdialog/menubox.c
	scripts/kconfig/lxdialog/textbox.c
	scripts/kconfig/lxdialog/util.c
	scripts/kconfig/lxdialog/yesno.c
	scripts/kconfig/mconf.c
	scripts/kconfig/conf.c
	scripts/kconfig/confdata.c
	scripts/kconfig/gconf.c
	scripts/kconfig/gconf.glade.h
	scripts/kconfig/qconf.cc

scripts/kconfig/check.sh

deleted100755 → 0

+0 −14

Original line number	Original line	Diff line number	Diff line
	#!/bin/sh
	# SPDX-License-Identifier: GPL-2.0
	# Needed for systems without gettext
	$* -x c -o /dev/null - > /dev/null 2>&1 << EOF
	#include <libintl.h>
	int main()
	{
	gettext("");
	return 0;
	}
	EOF
	if [ ! "$?" -eq "0" ]; then
	echo -DKBUILD_NO_NLS;
	fi

scripts/kconfig/conf.c

+23 −28

Original line number	Original line	Diff line number	Diff line
	@@ -3,7 +3,6 @@
	* Released under the terms of the GNU GPL v2.0.		* Released under the terms of the GNU GPL v2.0.
	*/		*/

	#include <locale.h>
	#include <ctype.h>		#include <ctype.h>
	#include <limits.h>		#include <limits.h>
	#include <stdio.h>		#include <stdio.h>
	@@ -86,7 +85,7 @@ static int conf_askvalue(struct symbol sym, const char def)
	enum symbol_type type = sym_get_type(sym);		enum symbol_type type = sym_get_type(sym);

	if (!sym_has_value(sym))		if (!sym_has_value(sym))
	printf(_("(NEW) "));		printf("(NEW) ");

	line[0] = '\n';		line[0] = '\n';
	line[1] = 0;		line[1] = 0;
	@@ -133,7 +132,7 @@ static int conf_string(struct menu *menu)
	const char *def;		const char *def;

	while (1) {		while (1) {
	printf("%*s%s ", indent - 1, "", _(menu->prompt->text));		printf("%*s%s ", indent - 1, "", menu->prompt->text);
	printf("(%s) ", sym->name);		printf("(%s) ", sym->name);
	def = sym_get_string_value(sym);		def = sym_get_string_value(sym);
	if (sym_get_string_value(sym))		if (sym_get_string_value(sym))
	@@ -166,7 +165,7 @@ static int conf_sym(struct menu *menu)
	tristate oldval, newval;		tristate oldval, newval;

	while (1) {		while (1) {
	printf("%*s%s ", indent - 1, "", _(menu->prompt->text));		printf("%*s%s ", indent - 1, "", menu->prompt->text);
	if (sym->name)		if (sym->name)
	printf("(%s) ", sym->name);		printf("(%s) ", sym->name);
	putchar('[');		putchar('[');
	@@ -251,7 +250,7 @@ static int conf_choice(struct menu *menu)
	case no:		case no:
	return 1;		return 1;
	case mod:		case mod:
	printf("%*s%s\n", indent - 1, "", _(menu_get_prompt(menu)));		printf("%*s%s\n", indent - 1, "", menu_get_prompt(menu));
	return 0;		return 0;
	case yes:		case yes:
	break;		break;
	@@ -261,7 +260,7 @@ static int conf_choice(struct menu *menu)
	while (1) {		while (1) {
	int cnt, def;		int cnt, def;

	printf("%*s%s\n", indent - 1, "", _(menu_get_prompt(menu)));		printf("%*s%s\n", indent - 1, "", menu_get_prompt(menu));
	def_sym = sym_get_choice_value(sym);		def_sym = sym_get_choice_value(sym);
	cnt = def = 0;		cnt = def = 0;
	line[0] = 0;		line[0] = 0;
	@@ -269,7 +268,7 @@ static int conf_choice(struct menu *menu)
	if (!menu_is_visible(child))		if (!menu_is_visible(child))
	continue;		continue;
	if (!child->sym) {		if (!child->sym) {
	printf("%c %s\n", indent, '', _(menu_get_prompt(child)));		printf("%c %s\n", indent, '', menu_get_prompt(child));
	continue;		continue;
	}		}
	cnt++;		cnt++;
	@@ -278,14 +277,14 @@ static int conf_choice(struct menu *menu)
	printf("%*c", indent, '>');		printf("%*c", indent, '>');
	} else		} else
	printf("%*c", indent, ' ');		printf("%*c", indent, ' ');
	printf(" %d. %s", cnt, _(menu_get_prompt(child)));		printf(" %d. %s", cnt, menu_get_prompt(child));
	if (child->sym->name)		if (child->sym->name)
	printf(" (%s)", child->sym->name);		printf(" (%s)", child->sym->name);
	if (!sym_has_value(child->sym))		if (!sym_has_value(child->sym))
	printf(_(" (NEW)"));		printf(" (NEW)");
	printf("\n");		printf("\n");
	}		}
	printf(_("%*schoice"), indent - 1, "");		printf("%*schoice", indent - 1, "");
	if (cnt == 1) {		if (cnt == 1) {
	printf("[1]: 1\n");		printf("[1]: 1\n");
	goto conf_childs;		goto conf_childs;
	@@ -372,7 +371,7 @@ static void conf(struct menu *menu)
	if (prompt)		if (prompt)
	printf("%c\n%c %s\n%*c\n",		printf("%c\n%c %s\n%*c\n",
	indent, '*',		indent, '*',
	indent, '*', _(prompt),		indent, '*', prompt,
	indent, '*');		indent, '*');
	default:		default:
	;		;
	@@ -437,7 +436,7 @@ static void check_conf(struct menu *menu)
	}		}
	} else {		} else {
	if (!conf_cnt++)		if (!conf_cnt++)
	printf(_("\n Restart config...\n*\n"));		printf("\n Restart config...\n*\n");
	rootEntry = menu_get_parent_menu(menu);		rootEntry = menu_get_parent_menu(menu);
	conf(rootEntry);		conf(rootEntry);
	}		}
	@@ -498,10 +497,6 @@ int main(int ac, char **av)
	const char name, defconfig_file = NULL /* gcc uninit */;		const char name, defconfig_file = NULL /* gcc uninit */;
	struct stat tmpstat;		struct stat tmpstat;

	setlocale(LC_ALL, "");
	bindtextdomain(PACKAGE, LOCALEDIR);
	textdomain(PACKAGE);

	tty_stdio = isatty(0) && isatty(1);		tty_stdio = isatty(0) && isatty(1);

	while ((opt = getopt_long(ac, av, "s", long_opts, NULL)) != -1) {		while ((opt = getopt_long(ac, av, "s", long_opts, NULL)) != -1) {
	@@ -559,7 +554,7 @@ int main(int ac, char **av)
	}		}
	}		}
	if (ac == optind) {		if (ac == optind) {
	fprintf(stderr, _("%s: Kconfig file missing\n"), av[0]);		fprintf(stderr, "%s: Kconfig file missing\n", av[0]);
	conf_usage(progname);		conf_usage(progname);
	exit(1);		exit(1);
	}		}
	@@ -569,12 +564,12 @@ int main(int ac, char **av)
	if (sync_kconfig) {		if (sync_kconfig) {
	name = conf_get_configname();		name = conf_get_configname();
	if (stat(name, &tmpstat)) {		if (stat(name, &tmpstat)) {
	fprintf(stderr, _("***\n"		fprintf(stderr, "***\n"
	"*** Configuration file \"%s\" not found!\n"		"*** Configuration file \"%s\" not found!\n"
	"***\n"		"***\n"
	"*** Please run some configurator (e.g. \"make oldconfig\" or\n"		"*** Please run some configurator (e.g. \"make oldconfig\" or\n"
	"*** \"make menuconfig\" or \"make xconfig\").\n"		"*** \"make menuconfig\" or \"make xconfig\").\n"
	"***\n"), name);		"***\n", name);
	exit(1);		exit(1);
	}		}
	}		}
	@@ -585,9 +580,9 @@ int main(int ac, char **av)
	defconfig_file = conf_get_default_confname();		defconfig_file = conf_get_default_confname();
	if (conf_read(defconfig_file)) {		if (conf_read(defconfig_file)) {
	fprintf(stderr,		fprintf(stderr,
	_("***\n"		"***\n"
	"*** Can't find default configuration \"%s\"!\n"		"*** Can't find default configuration \"%s\"!\n"
	"***\n"),		"***\n",
	defconfig_file);		defconfig_file);
	exit(1);		exit(1);
	}		}
	@@ -611,7 +606,7 @@ int main(int ac, char **av)
	if ((strcmp(name, "") != 0) && (strcmp(name, "1") != 0)) {		if ((strcmp(name, "") != 0) && (strcmp(name, "1") != 0)) {
	if (conf_read_simple(name, S_DEF_USER)) {		if (conf_read_simple(name, S_DEF_USER)) {
	fprintf(stderr,		fprintf(stderr,
	_("*** Can't read seed configuration \"%s\"!\n"),		"*** Can't read seed configuration \"%s\"!\n",
	name);		name);
	exit(1);		exit(1);
	}		}
	@@ -628,7 +623,7 @@ int main(int ac, char **av)
	if (conf_read_simple(name, S_DEF_USER) &&		if (conf_read_simple(name, S_DEF_USER) &&
	conf_read_simple("all.config", S_DEF_USER)) {		conf_read_simple("all.config", S_DEF_USER)) {
	fprintf(stderr,		fprintf(stderr,
	_("*** KCONFIG_ALLCONFIG set, but no \"%s\" or \"all.config\" file found\n"),		"*** KCONFIG_ALLCONFIG set, but no \"%s\" or \"all.config\" file found\n",
	name);		name);
	exit(1);		exit(1);
	}		}
	@@ -642,7 +637,7 @@ int main(int ac, char **av)
	name = getenv("KCONFIG_NOSILENTUPDATE");		name = getenv("KCONFIG_NOSILENTUPDATE");
	if (name && *name) {		if (name && *name) {
	fprintf(stderr,		fprintf(stderr,
	_("\n*** The configuration requires explicit update.\n\n"));		"\n*** The configuration requires explicit update.\n\n");
	return 1;		return 1;
	}		}
	}		}
	@@ -694,22 +689,22 @@ int main(int ac, char **av)
	* All other commands are only used to generate a config.		* All other commands are only used to generate a config.
	*/		*/
	if (conf_get_changed() && conf_write(NULL)) {		if (conf_get_changed() && conf_write(NULL)) {
	fprintf(stderr, _("\n*** Error during writing of the configuration.\n\n"));		fprintf(stderr, "\n*** Error during writing of the configuration.\n\n");
	exit(1);		exit(1);
	}		}
	if (conf_write_autoconf()) {		if (conf_write_autoconf()) {
	fprintf(stderr, _("\n*** Error during update of the configuration.\n\n"));		fprintf(stderr, "\n*** Error during update of the configuration.\n\n");
	return 1;		return 1;
	}		}
	} else if (input_mode == savedefconfig) {		} else if (input_mode == savedefconfig) {
	if (conf_write_defconfig(defconfig_file)) {		if (conf_write_defconfig(defconfig_file)) {
	fprintf(stderr, _("n*** Error while saving defconfig to: %s\n\n"),		fprintf(stderr, "n*** Error while saving defconfig to: %s\n\n",
	defconfig_file);		defconfig_file);
	return 1;		return 1;
	}		}
	} else if (input_mode != listnewconfig) {		} else if (input_mode != listnewconfig) {
	if (conf_write(NULL)) {		if (conf_write(NULL)) {
	fprintf(stderr, _("\n*** Error during writing of the configuration.\n\n"));		fprintf(stderr, "\n*** Error during writing of the configuration.\n\n");
	exit(1);		exit(1);
	}		}
	}		}