* '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
Showing the changes to scripts (5 of 16 files). Show all
Unified · Split
| @@ -45,6 +45,8 @@ __clean-files := $(extra-y) $(always) \ · 44 unmodified lines | ||
| 45 | 45 | $(host-progs) \ |
| 46 | 46 | $(hostprogs-y) $(hostprogs-m) $(hostprogs-) |
| 47 | 47 | |
| 48 | +__clean-files := $(filter-out $(no-clean-files), $(__clean-files)) | |
| 49 | + | |
| 48 | 50 | # as clean-files is given relative to the current directory, this adds |
| 49 | 51 | # a $(obj) prefix, except for absolute paths |
| 50 | 52 | |
| @@ -120,7 +120,9 @@ _c_flags += $(if $(patsubst n%,, \ · 119 unmodified lines | ||
| 120 | 120 | endif |
| 121 | 121 | |
| 122 | 122 | ifdef 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) | |
| 124 | 126 | endif |
| 125 | 127 | |
| 126 | 128 | |
| @@ -107,12 +107,8 @@ static int read_symbol(FILE *in, struct sym_entry *s) · 106 unmodified lines | ||
| 107 | 107 | |
| 108 | 108 | rc = fscanf(in, "%llx %c %499s\n", &s->addr, &stype, str); |
| 109 | 109 | if (rc != 3) { |
| 110 | − if (rc != EOF) { | |
| 111 | − /* skip line. sym is used as dummy to | |
| 112 | − * shut of "warn_unused_result" warning. | |
| 113 | − */ | |
| 114 | − sym = fgets(str, 500, in); | |
| 115 | − } | |
| 110 | + if (rc != EOF && fgets(str, 500, in) == NULL) | |
| 111 | + fprintf(stderr, "Read error or end of file.\n"); | |
| 116 | 112 | return -1; |
| 117 | 113 | } |
| 118 | 114 | |
| @@ -1208,6 +1208,9 @@ static Elf_Sym *find_elf_symbol2(struct elf_info *elf, Elf_Addr addr, · 1207 unmodified lines | ||
| 1208 | 1208 | * .cpuinit.data => __cpudata |
| 1209 | 1209 | * .memexitconst => __memconst |
| 1210 | 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 | */ |
| 1212 | 1215 | static char *sec2annotation(const char *s) |
| 1213 | 1216 | { |
| @@ -1230,7 +1233,7 @@ static char *sec2annotation(const char *s) · 16 unmodified lines | ||
| 1230 | 1233 | strcat(p, "data "); |
| 1231 | 1234 | else |
| 1232 | 1235 | strcat(p, " "); |
| 1233 | − return r; /* we leak her but we do not care */ | |
| 1236 | + return r; | |
| 1234 | 1237 | } else { |
| 1235 | 1238 | return strdup(""); |
| 1236 | 1239 | } |
| @@ -160,8 +160,10 @@ if test "$CONFIG_LOCALVERSION_AUTO" = "y"; then · 159 unmodified lines | ||
| 160 | 160 | # full scm version string |
| 161 | 161 | res="$res$(scm_version)" |
| 162 | 162 | else |
| 163 | − # apped a plus sign if the repository is not in a clean tagged | |
| 164 | − # state and LOCALVERSION= is not specified | |
| 163 | + # append a plus sign if the repository is not in a clean | |
| 164 | + # 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 | 167 | if test "${LOCALVERSION+set}" != "set"; then |
| 166 | 168 | scm=$(scm_version --short) |
| 167 | 169 | res="$res${scm:++}" |