History

Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: initramfs: Fix build break on symbol-prefixed archs initramfs: fix initramfs size calculation initramfs: generalize initramfs_data.xxx.S variants scripts/kallsyms: Enable error messages while hush up unnecessary warnings scripts/setlocalversion: update comment kbuild: Use a single clean rule for kernel and external modules kbuild: Do not run make clean in $(srctree) scripts/mod/modpost.c: fix commentary accordingly to last changes kbuild: Really don't clean bounds.h and asm-offsets.h

Linus Torvalds committed 16 years ago

Commit c9e2a722 parents 9aca0e7 d63f6d116 files · +61 −163Browse files

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

Unified · Split

5 files
  1. scripts/Makefile.clean +2 −0
  2. scripts/Makefile.lib +3 −1
  3. scripts/kallsyms.c +2 −6
  4. scripts/mod/modpost.c +4 −1
  5. scripts/setlocalversion +4 −2
scripts/Makefile.clean+2−0
@@ -45,6 +45,8 @@ __clean-files := $(extra-y) $(always) \ · 44 unmodified lines
45 $(host-progs) \45 $(host-progs) \
46 $(hostprogs-y) $(hostprogs-m) $(hostprogs-)46 $(hostprogs-y) $(hostprogs-m) $(hostprogs-)
47 47
48__clean-files := $(filter-out $(no-clean-files), $(__clean-files))
49
48# as clean-files is given relative to the current directory, this adds50# as clean-files is given relative to the current directory, this adds
49# a $(obj) prefix, except for absolute paths51# a $(obj) prefix, except for absolute paths
50 52
scripts/Makefile.lib+3−1
@@ -120,7 +120,9 @@ _c_flags += $(if $(patsubst n%,, \ · 119 unmodified lines
120endif120endif
121 121
122ifdef CONFIG_SYMBOL_PREFIX122ifdef CONFIG_SYMBOL_PREFIX
123_cpp_flags += -DSYMBOL_PREFIX=$(patsubst "%",%,$(CONFIG_SYMBOL_PREFIX))123_sym_flags = -DSYMBOL_PREFIX=$(patsubst "%",%,$(CONFIG_SYMBOL_PREFIX))
124_cpp_flags += $(_sym_flags)
125_a_flags += $(_sym_flags)
124endif126endif
125 127
126 128
scripts/kallsyms.c+2−6
@@ -107,12 +107,8 @@ static int read_symbol(FILE *in, struct sym_entry *s) · 106 unmodified lines
107 107
108 rc = fscanf(in, "%llx %c %499s\n", &s->addr, &stype, str);108 rc = fscanf(in, "%llx %c %499s\n", &s->addr, &stype, str);
109 if (rc != 3) {109 if (rc != 3) {
110 if (rc != EOF) {110 if (rc != EOF && fgets(str, 500, in) == NULL)
111 /* skip line. sym is used as dummy to111 fprintf(stderr, "Read error or end of file.\n");
112 * shut of "warn_unused_result" warning.
113 */
114 sym = fgets(str, 500, in);
115 }
116 return -1;112 return -1;
117 }113 }
118 114
scripts/mod/modpost.c+4−1
@@ -1208,6 +1208,9 @@ static Elf_Sym *find_elf_symbol2(struct elf_info *elf, Elf_Addr addr, · 1207 unmodified lines
1208 * .cpuinit.data => __cpudata1208 * .cpuinit.data => __cpudata
1209 * .memexitconst => __memconst1209 * .memexitconst => __memconst
1210 * etc.1210 * etc.
1211 *
1212 * The memory of returned value has been allocated on a heap. The user of this
1213 * method should free it after usage.
1211*/1214*/
1212static char *sec2annotation(const char *s)1215static char *sec2annotation(const char *s)
1213{1216{
@@ -1230,7 +1233,7 @@ static char *sec2annotation(const char *s) · 16 unmodified lines
1230 strcat(p, "data ");1233 strcat(p, "data ");
1231 else1234 else
1232 strcat(p, " ");1235 strcat(p, " ");
1233 return r; /* we leak her but we do not care */1236 return r;
1234 } else {1237 } else {
1235 return strdup("");1238 return strdup("");
1236 }1239 }
scripts/setlocalversion+4−2
@@ -160,8 +160,10 @@ if test "$CONFIG_LOCALVERSION_AUTO" = "y"; then · 159 unmodified lines
160 # full scm version string160 # full scm version string
161 res="$res$(scm_version)"161 res="$res$(scm_version)"
162else162else
163 # apped a plus sign if the repository is not in a clean tagged163 # append a plus sign if the repository is not in a clean
164 # state and LOCALVERSION= is not specified164 # annotated or signed tagged state (as git describe only
165 # looks at signed or annotated tags - git tag -a/-s) and
166 # LOCALVERSION= is not specified
165 if test "${LOCALVERSION+set}" != "set"; then167 if test "${LOCALVERSION+set}" != "set"; then
166 scm=$(scm_version --short)168 scm=$(scm_version --short)
167 res="$res${scm:++}"169 res="$res${scm:++}"