kbuild: move include/config/ksym/* to include/ksym/*

masahir0y · masahir0y · commit fbfa9be9904e · 2018-03-26T02:01:23.000+09:00
The idea of using fixdep was inspired by Kconfig, but autoksyms
belongs to a different group.  So, I want to move those touched
files under include/config/ksym/ to include/ksym/.

The directory include/ksym/ can be removed by 'make clean' because
it is meaningless for the external module building.

Signed-off-by: Masahiro Yamada &lt;yamada.masahiro@socionext.com&gt;
Acked-by: Nicolas Pitre &lt;nico@linaro.org&gt;
diff --git a/.gitignore b/.gitignore
@@ -87,6 +87,7 @@ modules.builtin
 #
 include/config
 include/generated
+include/ksym
 arch/*/include/generated
 
 # stgit generated dirs
diff --git a/Makefile b/Makefile
@@ -1336,7 +1336,7 @@ endif # CONFIG_MODULES
 # make distclean Remove editor backup files, patch leftover files and the like
 
 # Directories & files removed with 'make clean'
-CLEAN_DIRS  += $(MODVERDIR)
+CLEAN_DIRS  += $(MODVERDIR) include/ksym
 
 # Directories & files removed with 'make mrproper'
 MRPROPER_DIRS  += include/config usr/include include/generated          \
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
@@ -366,7 +366,7 @@ ksym_dep_filter =                                                            \
 	    $(CPP) $(call flags_nodeps,a_flags) -D__KSYM_DEPS__ $< ;;        \
 	  boot*|build*|cpp_its_S|*cpp_lds_S|dtc|host*|vdso*) : ;;            \
 	  *) echo "Don't know how to preprocess $(1)" >&2; false ;;          \
-	esac | tr ";" "\n" | sed -n 's/^.*=== __KSYM_\(.*\) ===.*$$/KSYM_\1/p'
+	esac | tr ";" "\n" | sed -n 's/^.*=== __KSYM_\(.*\) ===.*$$/_\1/p'
 
 cmd_and_fixdep =                                                             \
 	$(echo-cmd) $(cmd_$(1));                                             \
diff --git a/scripts/adjust_autoksyms.sh b/scripts/adjust_autoksyms.sh
@@ -80,7 +80,7 @@ sort "$cur_ksyms_file" "$new_ksyms_file" | uniq -u |
 sed -n 's/^#define __KSYM_\(.*\) 1/\1/p' | tr "A-Z_" "a-z/" |
 while read sympath; do
 	if [ -z "$sympath" ]; then continue; fi
-	depfile="include/config/ksym/${sympath}.h"
+	depfile="include/ksym/${sympath}.h"
 	mkdir -p "$(dirname "$depfile")"
 	touch "$depfile"
 	echo $((count += 1))
diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
@@ -113,11 +113,11 @@ static void usage(void)
 /*
  * Print out a dependency path from a symbol name
  */
-static void print_config(const char *m, int slen)
+static void print_dep(const char *m, int slen, const char *dir)
 {
 	int c, i;
 
-	printf("    $(wildcard include/config/");
+	printf("    $(wildcard %s/", dir);
 	for (i = 0; i < slen; i++) {
 		c = m[i];
 		if (c == '_')
@@ -140,7 +140,7 @@ static void do_extra_deps(void)
 			fprintf(stderr, "fixdep: bad data on stdin\n");
 			exit(1);
 		}
-		print_config(buf, len - 1);
+		print_dep(buf, len - 1, "include/ksym");
 	}
 }
 
@@ -208,7 +208,7 @@ static void use_config(const char *m, int slen)
 	    return;
 
 	define_config(m, slen, hash);
-	print_config(m, slen);
+	print_dep(m, slen, "include/config");
 }
 
 /* test if s ends in sub */

Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,7 @@ modules.builtin`
`87`	`87`	`#`
`88`	`88`	`include/config`
`89`	`89`	`include/generated`
	`90`	`+include/ksym`
`90`	`91`	`arch/*/include/generated`
`91`	`92`
`92`	`93`	`# stgit generated dirs`
Original file line number	Diff line number	Diff line change
`@@ -113,11 +113,11 @@ static void usage(void)`
`113`	`113`	`/*`
`114`	`114`	`* Print out a dependency path from a symbol name`
`115`	`115`	`*/`
`116`		`-static void print_config(const char *m, int slen)`
	`116`	`+static void print_dep(const char m, int slen, const char dir)`
`117`	`117`	`{`
`118`	`118`	`int c, i;`
`119`	`119`
`120`		`- printf(" $(wildcard include/config/");`
	`120`	`+ printf(" $(wildcard %s/", dir);`
`121`	`121`	`for (i = 0; i < slen; i++) {`
`122`	`122`	`c = m[i];`
`123`	`123`	`if (c == '_')`
`@@ -140,7 +140,7 @@ static void do_extra_deps(void)`
`140`	`140`	`fprintf(stderr, "fixdep: bad data on stdin\n");`
`141`	`141`	`exit(1);`
`142`	`142`	`}`
`143`		`- print_config(buf, len - 1);`
	`143`	`+ print_dep(buf, len - 1, "include/ksym");`
`144`	`144`	`}`
`145`	`145`	`}`
`146`	`146`
`@@ -208,7 +208,7 @@ static void use_config(const char *m, int slen)`
`208`	`208`	`return;`
`209`	`209`
`210`	`210`	`define_config(m, slen, hash);`
`211`		`- print_config(m, slen);`
	`211`	`+ print_dep(m, slen, "include/config");`
`212`	`212`	`}`
`213`	`213`
`214`	`214`	`/* test if s ends in sub */`