History

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

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.

Masahiro Yamada committed 8 years ago

Commit fbfa9be1 parent 1f50b805 files · +8 −7Browse files

Showing the changes to scripts (3 of 5 files). Show all

Unified · Split

3 files
  1. scripts/Kbuild.include +1 −1
  2. scripts/adjust_autoksyms.sh +1 −1
  3. scripts/basic/fixdep.c +4 −4
scripts/Kbuild.include+1−1
@@ -366,7 +366,7 @@ ksym_dep_filter = \ · 365 unmodified lines
366366 $(CPP) $(call flags_nodeps,a_flags) -D__KSYM_DEPS__ $< ;; \
367367 boot*|build*|cpp_its_S|*cpp_lds_S|dtc|host*|vdso*) : ;; \
368368 *) echo "Don't know how to preprocess $(1)" >&2; false ;; \
369− esac | tr ";" "\n" | sed -n 's/^.*=== __KSYM_\(.*\) ===.*$$/KSYM_\1/p'
369+ esac | tr ";" "\n" | sed -n 's/^.*=== __KSYM_\(.*\) ===.*$$/_\1/p'
370370
371371 cmd_and_fixdep = \
372372 $(echo-cmd) $(cmd_$(1)); \
scripts/adjust_autoksyms.sh+1−1
@@ -80,7 +80,7 @@ sort "$cur_ksyms_file" "$new_ksyms_file" | uniq -u | · 79 unmodified lines
8080 sed -n 's/^#define __KSYM_\(.*\) 1/\1/p' | tr "A-Z_" "a-z/" |
8181 while read sympath; do
8282 if [ -z "$sympath" ]; then continue; fi
83− depfile="include/config/ksym/${sympath}.h"
83+ depfile="include/ksym/${sympath}.h"
8484 mkdir -p "$(dirname "$depfile")"
8585 touch "$depfile"
8686 echo $((count += 1))
scripts/basic/fixdep.c+4−4
@@ -113,11 +113,11 @@ static void usage(void) · 112 unmodified lines
113113 /*
114114 * Print out a dependency path from a symbol name
115115 */
116−static void print_config(const char *m, int slen)
116+static void print_dep(const char *m, int slen, const char *dir)
117117 {
118118 int c, i;
119119
120− printf(" $(wildcard include/config/");
120+ printf(" $(wildcard %s/", dir);
121121 for (i = 0; i < slen; i++) {
122122 c = m[i];
123123 if (c == '_')
@@ -140,7 +140,7 @@ static void do_extra_deps(void) · 16 unmodified lines
140140 fprintf(stderr, "fixdep: bad data on stdin\n");
141141 exit(1);
142142 }
143− print_config(buf, len - 1);
143+ print_dep(buf, len - 1, "include/ksym");
144144 }
145145 }
146146
@@ -208,7 +208,7 @@ static void use_config(const char *m, int slen) · 61 unmodified lines
208208 return;
209209
210210 define_config(m, slen, hash);
211− print_config(m, slen);
211+ print_dep(m, slen, "include/config");
212212 }
213213
214214 /* test if s ends in sub */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t