diff options
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/Makefile.build | 4 | ||||
-rw-r--r-- | scripts/Makefile.fwinst | 2 | ||||
-rw-r--r-- | scripts/Makefile.host | 2 | ||||
-rw-r--r-- | scripts/Makefile.lib | 10 | ||||
-rw-r--r-- | scripts/conmakehash.c | 12 | ||||
-rw-r--r-- | scripts/kconfig/streamline_config.pl | 2 | ||||
-rwxr-xr-x | scripts/mkcompile_h | 4 | ||||
-rw-r--r-- | scripts/package/builddeb | 2 | ||||
-rwxr-xr-x | scripts/patch-kernel | 4 |
9 files changed, 21 insertions, 21 deletions
diff --git a/scripts/Makefile.build b/scripts/Makefile.build index b5e02b669469..bf3e6778cd71 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build | |||
@@ -281,7 +281,7 @@ $(real-objs-m) : modkern_aflags := $(KBUILD_AFLAGS_MODULE) $(AFLAGS_MODULE) | |||
281 | $(real-objs-m:.o=.s): modkern_aflags := $(KBUILD_AFLAGS_MODULE) $(AFLAGS_MODULE) | 281 | $(real-objs-m:.o=.s): modkern_aflags := $(KBUILD_AFLAGS_MODULE) $(AFLAGS_MODULE) |
282 | 282 | ||
283 | quiet_cmd_as_s_S = CPP $(quiet_modtag) $@ | 283 | quiet_cmd_as_s_S = CPP $(quiet_modtag) $@ |
284 | cmd_as_s_S = $(CPP) $(a_flags) -o $@ $< | 284 | cmd_as_s_S = $(CPP) $(a_flags) -o $@ $< |
285 | 285 | ||
286 | $(obj)/%.s: $(src)/%.S FORCE | 286 | $(obj)/%.s: $(src)/%.S FORCE |
287 | $(call if_changed_dep,as_s_S) | 287 | $(call if_changed_dep,as_s_S) |
@@ -375,7 +375,7 @@ link_multi_deps = \ | |||
375 | $(filter $(addprefix $(obj)/, \ | 375 | $(filter $(addprefix $(obj)/, \ |
376 | $($(subst $(obj)/,,$(@:.o=-objs))) \ | 376 | $($(subst $(obj)/,,$(@:.o=-objs))) \ |
377 | $($(subst $(obj)/,,$(@:.o=-y)))), $^) | 377 | $($(subst $(obj)/,,$(@:.o=-y)))), $^) |
378 | 378 | ||
379 | quiet_cmd_link_multi-y = LD $@ | 379 | quiet_cmd_link_multi-y = LD $@ |
380 | cmd_link_multi-y = $(LD) $(ld_flags) -r -o $@ $(link_multi_deps) $(cmd_secanalysis) | 380 | cmd_link_multi-y = $(LD) $(ld_flags) -r -o $@ $(link_multi_deps) $(cmd_secanalysis) |
381 | 381 | ||
diff --git a/scripts/Makefile.fwinst b/scripts/Makefile.fwinst index 4d908d16c035..2c1d69c4345c 100644 --- a/scripts/Makefile.fwinst +++ b/scripts/Makefile.fwinst | |||
@@ -18,7 +18,7 @@ include $(srctree)/$(obj)/Makefile | |||
18 | include scripts/Makefile.host | 18 | include scripts/Makefile.host |
19 | 19 | ||
20 | mod-fw := $(fw-shipped-m) | 20 | mod-fw := $(fw-shipped-m) |
21 | # If CONFIG_FIRMWARE_IN_KERNEL isn't set, then install the | 21 | # If CONFIG_FIRMWARE_IN_KERNEL isn't set, then install the |
22 | # firmware for in-kernel drivers too. | 22 | # firmware for in-kernel drivers too. |
23 | ifndef CONFIG_FIRMWARE_IN_KERNEL | 23 | ifndef CONFIG_FIRMWARE_IN_KERNEL |
24 | mod-fw += $(fw-shipped-y) | 24 | mod-fw += $(fw-shipped-y) |
diff --git a/scripts/Makefile.host b/scripts/Makefile.host index 1ac414fd5030..0f0d6ba87e42 100644 --- a/scripts/Makefile.host +++ b/scripts/Makefile.host | |||
@@ -166,5 +166,5 @@ $(host-cshlib): $(obj)/%: $(host-cshobjs) FORCE | |||
166 | $(call if_changed,host-cshlib) | 166 | $(call if_changed,host-cshlib) |
167 | 167 | ||
168 | targets += $(host-csingle) $(host-cmulti) $(host-cobjs)\ | 168 | targets += $(host-csingle) $(host-cmulti) $(host-cobjs)\ |
169 | $(host-cxxmulti) $(host-cxxobjs) $(host-cshlib) $(host-cshobjs) | 169 | $(host-cxxmulti) $(host-cxxobjs) $(host-cshlib) $(host-cshobjs) |
170 | 170 | ||
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 6a5b0decb797..260bf8acfce9 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib | |||
@@ -27,7 +27,7 @@ lib-y := $(filter-out $(obj-y), $(sort $(lib-y) $(lib-m))) | |||
27 | # --------------------------------------------------------------------------- | 27 | # --------------------------------------------------------------------------- |
28 | # o if we encounter foo/ in $(obj-y), replace it by foo/built-in.o | 28 | # o if we encounter foo/ in $(obj-y), replace it by foo/built-in.o |
29 | # and add the directory to the list of dirs to descend into: $(subdir-y) | 29 | # and add the directory to the list of dirs to descend into: $(subdir-y) |
30 | # o if we encounter foo/ in $(obj-m), remove it from $(obj-m) | 30 | # o if we encounter foo/ in $(obj-m), remove it from $(obj-m) |
31 | # and add the directory to the list of dirs to descend into: $(subdir-m) | 31 | # and add the directory to the list of dirs to descend into: $(subdir-m) |
32 | 32 | ||
33 | # Determine modorder. | 33 | # Determine modorder. |
@@ -46,7 +46,7 @@ obj-m := $(filter-out %/, $(obj-m)) | |||
46 | 46 | ||
47 | subdir-ym := $(sort $(subdir-y) $(subdir-m)) | 47 | subdir-ym := $(sort $(subdir-y) $(subdir-m)) |
48 | 48 | ||
49 | # if $(foo-objs) exists, foo.o is a composite object | 49 | # if $(foo-objs) exists, foo.o is a composite object |
50 | multi-used-y := $(sort $(foreach m,$(obj-y), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))), $(m)))) | 50 | multi-used-y := $(sort $(foreach m,$(obj-y), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))), $(m)))) |
51 | multi-used-m := $(sort $(foreach m,$(obj-m), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))), $(m)))) | 51 | multi-used-m := $(sort $(foreach m,$(obj-m), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))), $(m)))) |
52 | multi-used := $(multi-used-y) $(multi-used-m) | 52 | multi-used := $(multi-used-y) $(multi-used-m) |
@@ -91,7 +91,7 @@ obj-dirs := $(addprefix $(obj)/,$(obj-dirs)) | |||
91 | 91 | ||
92 | # These flags are needed for modversions and compiling, so we define them here | 92 | # These flags are needed for modversions and compiling, so we define them here |
93 | # already | 93 | # already |
94 | # $(modname_flags) #defines KBUILD_MODNAME as the name of the module it will | 94 | # $(modname_flags) #defines KBUILD_MODNAME as the name of the module it will |
95 | # end up in (or would, if it gets compiled in) | 95 | # end up in (or would, if it gets compiled in) |
96 | # Note: Files that end up in two or more modules are compiled without the | 96 | # Note: Files that end up in two or more modules are compiled without the |
97 | # KBUILD_MODNAME definition. The reason is that any made-up name would | 97 | # KBUILD_MODNAME definition. The reason is that any made-up name would |
@@ -212,7 +212,7 @@ $(obj)/%: $(src)/%_shipped | |||
212 | 212 | ||
213 | # Commands useful for building a boot image | 213 | # Commands useful for building a boot image |
214 | # =========================================================================== | 214 | # =========================================================================== |
215 | # | 215 | # |
216 | # Use as following: | 216 | # Use as following: |
217 | # | 217 | # |
218 | # target: source(s) FORCE | 218 | # target: source(s) FORCE |
@@ -226,7 +226,7 @@ $(obj)/%: $(src)/%_shipped | |||
226 | 226 | ||
227 | quiet_cmd_ld = LD $@ | 227 | quiet_cmd_ld = LD $@ |
228 | cmd_ld = $(LD) $(LDFLAGS) $(ldflags-y) $(LDFLAGS_$(@F)) \ | 228 | cmd_ld = $(LD) $(LDFLAGS) $(ldflags-y) $(LDFLAGS_$(@F)) \ |
229 | $(filter-out FORCE,$^) -o $@ | 229 | $(filter-out FORCE,$^) -o $@ |
230 | 230 | ||
231 | # Objcopy | 231 | # Objcopy |
232 | # --------------------------------------------------------------------------- | 232 | # --------------------------------------------------------------------------- |
diff --git a/scripts/conmakehash.c b/scripts/conmakehash.c index 263a44d57fa9..61bbda54cf13 100644 --- a/scripts/conmakehash.c +++ b/scripts/conmakehash.c | |||
@@ -104,7 +104,7 @@ int main(int argc, char *argv[]) | |||
104 | } | 104 | } |
105 | } | 105 | } |
106 | 106 | ||
107 | /* For now we assume the default font is always 256 characters. */ | 107 | /* For now we assume the default font is always 256 characters. */ |
108 | fontlen = 256; | 108 | fontlen = 256; |
109 | 109 | ||
110 | /* Initialize table */ | 110 | /* Initialize table */ |
@@ -236,15 +236,15 @@ int main(int argc, char *argv[]) | |||
236 | } | 236 | } |
237 | 237 | ||
238 | /* Okay, we hit EOF, now output hash table */ | 238 | /* Okay, we hit EOF, now output hash table */ |
239 | 239 | ||
240 | fclose(ctbl); | 240 | fclose(ctbl); |
241 | 241 | ||
242 | 242 | ||
243 | /* Compute total size of Unicode list */ | 243 | /* Compute total size of Unicode list */ |
244 | nuni = 0; | 244 | nuni = 0; |
245 | for ( i = 0 ; i < fontlen ; i++ ) | 245 | for ( i = 0 ; i < fontlen ; i++ ) |
246 | nuni += unicount[i]; | 246 | nuni += unicount[i]; |
247 | 247 | ||
248 | printf("\ | 248 | printf("\ |
249 | /*\n\ | 249 | /*\n\ |
250 | * Do not edit this file; it was automatically generated by\n\ | 250 | * Do not edit this file; it was automatically generated by\n\ |
@@ -268,9 +268,9 @@ u8 dfont_unicount[%d] = \n\ | |||
268 | else | 268 | else |
269 | printf(", "); | 269 | printf(", "); |
270 | } | 270 | } |
271 | 271 | ||
272 | printf("\nu16 dfont_unitable[%d] = \n{\n\t", nuni); | 272 | printf("\nu16 dfont_unitable[%d] = \n{\n\t", nuni); |
273 | 273 | ||
274 | fp0 = 0; | 274 | fp0 = 0; |
275 | nent = 0; | 275 | nent = 0; |
276 | for ( i = 0 ; i < nuni ; i++ ) | 276 | for ( i = 0 ; i < nuni ; i++ ) |
diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl index 31331723e810..9cb8522d8d22 100644 --- a/scripts/kconfig/streamline_config.pl +++ b/scripts/kconfig/streamline_config.pl | |||
@@ -589,7 +589,7 @@ while ($repeat) { | |||
589 | 589 | ||
590 | # Now we need to see if we have to check selects; | 590 | # Now we need to see if we have to check selects; |
591 | loop_select; | 591 | loop_select; |
592 | } | 592 | } |
593 | 593 | ||
594 | my %setconfigs; | 594 | my %setconfigs; |
595 | 595 | ||
diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h index cfb8440cc0b2..6fdc97ef6023 100755 --- a/scripts/mkcompile_h +++ b/scripts/mkcompile_h | |||
@@ -68,7 +68,7 @@ UTS_TRUNCATE="cut -b -$UTS_LEN" | |||
68 | 68 | ||
69 | ( echo /\* This file is auto generated, version $VERSION \*/ | 69 | ( echo /\* This file is auto generated, version $VERSION \*/ |
70 | if [ -n "$CONFIG_FLAGS" ] ; then echo "/* $CONFIG_FLAGS */"; fi | 70 | if [ -n "$CONFIG_FLAGS" ] ; then echo "/* $CONFIG_FLAGS */"; fi |
71 | 71 | ||
72 | echo \#define UTS_MACHINE \"$ARCH\" | 72 | echo \#define UTS_MACHINE \"$ARCH\" |
73 | 73 | ||
74 | echo \#define UTS_VERSION \"`echo $UTS_VERSION | $UTS_TRUNCATE`\" | 74 | echo \#define UTS_VERSION \"`echo $UTS_VERSION | $UTS_TRUNCATE`\" |
@@ -84,7 +84,7 @@ UTS_TRUNCATE="cut -b -$UTS_LEN" | |||
84 | # recompilations. | 84 | # recompilations. |
85 | # We don't consider the file changed if only the date/time changed. | 85 | # We don't consider the file changed if only the date/time changed. |
86 | # A kernel config change will increase the generation number, thus | 86 | # A kernel config change will increase the generation number, thus |
87 | # causing compile.h to be updated (including date/time) due to the | 87 | # causing compile.h to be updated (including date/time) due to the |
88 | # changed comment in the | 88 | # changed comment in the |
89 | # first line. | 89 | # first line. |
90 | 90 | ||
diff --git a/scripts/package/builddeb b/scripts/package/builddeb index f46e4dd0558d..b151b63f9be3 100644 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb | |||
@@ -130,7 +130,7 @@ if [ "$ARCH" = "um" ] ; then | |||
130 | cp System.map "$tmpdir/usr/lib/uml/modules/$version/System.map" | 130 | cp System.map "$tmpdir/usr/lib/uml/modules/$version/System.map" |
131 | cp $KCONFIG_CONFIG "$tmpdir/usr/share/doc/$packagename/config" | 131 | cp $KCONFIG_CONFIG "$tmpdir/usr/share/doc/$packagename/config" |
132 | gzip "$tmpdir/usr/share/doc/$packagename/config" | 132 | gzip "$tmpdir/usr/share/doc/$packagename/config" |
133 | else | 133 | else |
134 | cp System.map "$tmpdir/boot/System.map-$version" | 134 | cp System.map "$tmpdir/boot/System.map-$version" |
135 | cp $KCONFIG_CONFIG "$tmpdir/boot/config-$version" | 135 | cp $KCONFIG_CONFIG "$tmpdir/boot/config-$version" |
136 | fi | 136 | fi |
diff --git a/scripts/patch-kernel b/scripts/patch-kernel index d000ea3a41fd..49b4241e814a 100755 --- a/scripts/patch-kernel +++ b/scripts/patch-kernel | |||
@@ -27,7 +27,7 @@ | |||
27 | # Nick Holloway <Nick.Holloway@alfie.demon.co.uk>, 2nd January 1995. | 27 | # Nick Holloway <Nick.Holloway@alfie.demon.co.uk>, 2nd January 1995. |
28 | # | 28 | # |
29 | # Added support for handling multiple types of compression. What includes | 29 | # Added support for handling multiple types of compression. What includes |
30 | # gzip, bzip, bzip2, zip, compress, and plaintext. | 30 | # gzip, bzip, bzip2, zip, compress, and plaintext. |
31 | # | 31 | # |
32 | # Adam Sulmicki <adam@cfar.umd.edu>, 1st January 1997. | 32 | # Adam Sulmicki <adam@cfar.umd.edu>, 1st January 1997. |
33 | # | 33 | # |
@@ -159,7 +159,7 @@ applyPatch () { | |||
159 | fi | 159 | fi |
160 | # Remove backup files | 160 | # Remove backup files |
161 | find $sourcedir/ '(' -name '*.orig' -o -name '.*.orig' ')' -exec rm -f {} \; | 161 | find $sourcedir/ '(' -name '*.orig' -o -name '.*.orig' ')' -exec rm -f {} \; |
162 | 162 | ||
163 | return 0; | 163 | return 0; |
164 | } | 164 | } |
165 | 165 | ||