kbuild: trivial - remove trailing spaces
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Signed-off-by: Michal Marek <mmarek@suse.cz>
This commit is contained in:
parent
9319f4539c
commit
38385f8f01
8
Makefile
8
Makefile
|
@ -162,7 +162,7 @@ export srctree objtree VPATH
|
||||||
# SUBARCH tells the usermode build what the underlying arch is. That is set
|
# SUBARCH tells the usermode build what the underlying arch is. That is set
|
||||||
# first, and if a usermode build is happening, the "ARCH=um" on the command
|
# first, and if a usermode build is happening, the "ARCH=um" on the command
|
||||||
# line overrides the setting of ARCH below. If a native build is happening,
|
# line overrides the setting of ARCH below. If a native build is happening,
|
||||||
# then ARCH is assigned, getting whatever value it gets normally, and
|
# then ARCH is assigned, getting whatever value it gets normally, and
|
||||||
# SUBARCH is subsequently ignored.
|
# SUBARCH is subsequently ignored.
|
||||||
|
|
||||||
SUBARCH := $(shell uname -m | sed -e s/i.86/x86/ -e s/x86_64/x86/ \
|
SUBARCH := $(shell uname -m | sed -e s/i.86/x86/ -e s/x86_64/x86/ \
|
||||||
|
@ -290,7 +290,7 @@ export KBUILD_CHECKSRC KBUILD_SRC KBUILD_EXTMOD
|
||||||
# cmd_cc_o_c = $(CC) $(c_flags) -c -o $@ $<
|
# cmd_cc_o_c = $(CC) $(c_flags) -c -o $@ $<
|
||||||
#
|
#
|
||||||
# If $(quiet) is empty, the whole command will be printed.
|
# If $(quiet) is empty, the whole command will be printed.
|
||||||
# If it is set to "quiet_", only the short version will be printed.
|
# If it is set to "quiet_", only the short version will be printed.
|
||||||
# If it is set to "silent_", nothing will be printed at all, since
|
# If it is set to "silent_", nothing will be printed at all, since
|
||||||
# the variable $(silent_cmd_cc_o_c) doesn't exist.
|
# the variable $(silent_cmd_cc_o_c) doesn't exist.
|
||||||
#
|
#
|
||||||
|
@ -869,7 +869,7 @@ ifdef CONFIG_BUILD_DOCSRC
|
||||||
endif
|
endif
|
||||||
+$(call if_changed,link-vmlinux)
|
+$(call if_changed,link-vmlinux)
|
||||||
|
|
||||||
# The actual objects are generated when descending,
|
# The actual objects are generated when descending,
|
||||||
# make sure no implicit rule kicks in
|
# make sure no implicit rule kicks in
|
||||||
$(sort $(vmlinux-deps)): $(vmlinux-dirs) ;
|
$(sort $(vmlinux-deps)): $(vmlinux-dirs) ;
|
||||||
|
|
||||||
|
@ -1484,7 +1484,7 @@ endif
|
||||||
$(build)=$(build-dir) $(@:.ko=.o)
|
$(build)=$(build-dir) $(@:.ko=.o)
|
||||||
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
|
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
|
||||||
|
|
||||||
# FIXME Should go into a make.lib or something
|
# FIXME Should go into a make.lib or something
|
||||||
# ===========================================================================
|
# ===========================================================================
|
||||||
|
|
||||||
quiet_cmd_rmdirs = $(if $(wildcard $(rm-dirs)),CLEAN $(wildcard $(rm-dirs)))
|
quiet_cmd_rmdirs = $(if $(wildcard $(rm-dirs)),CLEAN $(wildcard $(rm-dirs)))
|
||||||
|
|
|
@ -281,7 +281,7 @@ $(real-objs-m) : modkern_aflags := $(KBUILD_AFLAGS_MODULE) $(AFLAGS_MODULE)
|
||||||
$(real-objs-m:.o=.s): modkern_aflags := $(KBUILD_AFLAGS_MODULE) $(AFLAGS_MODULE)
|
$(real-objs-m:.o=.s): modkern_aflags := $(KBUILD_AFLAGS_MODULE) $(AFLAGS_MODULE)
|
||||||
|
|
||||||
quiet_cmd_as_s_S = CPP $(quiet_modtag) $@
|
quiet_cmd_as_s_S = CPP $(quiet_modtag) $@
|
||||||
cmd_as_s_S = $(CPP) $(a_flags) -o $@ $<
|
cmd_as_s_S = $(CPP) $(a_flags) -o $@ $<
|
||||||
|
|
||||||
$(obj)/%.s: $(src)/%.S FORCE
|
$(obj)/%.s: $(src)/%.S FORCE
|
||||||
$(call if_changed_dep,as_s_S)
|
$(call if_changed_dep,as_s_S)
|
||||||
|
@ -375,7 +375,7 @@ link_multi_deps = \
|
||||||
$(filter $(addprefix $(obj)/, \
|
$(filter $(addprefix $(obj)/, \
|
||||||
$($(subst $(obj)/,,$(@:.o=-objs))) \
|
$($(subst $(obj)/,,$(@:.o=-objs))) \
|
||||||
$($(subst $(obj)/,,$(@:.o=-y)))), $^)
|
$($(subst $(obj)/,,$(@:.o=-y)))), $^)
|
||||||
|
|
||||||
quiet_cmd_link_multi-y = LD $@
|
quiet_cmd_link_multi-y = LD $@
|
||||||
cmd_link_multi-y = $(LD) $(ld_flags) -r -o $@ $(link_multi_deps) $(cmd_secanalysis)
|
cmd_link_multi-y = $(LD) $(ld_flags) -r -o $@ $(link_multi_deps) $(cmd_secanalysis)
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,7 @@ include $(srctree)/$(obj)/Makefile
|
||||||
include scripts/Makefile.host
|
include scripts/Makefile.host
|
||||||
|
|
||||||
mod-fw := $(fw-shipped-m)
|
mod-fw := $(fw-shipped-m)
|
||||||
# If CONFIG_FIRMWARE_IN_KERNEL isn't set, then install the
|
# If CONFIG_FIRMWARE_IN_KERNEL isn't set, then install the
|
||||||
# firmware for in-kernel drivers too.
|
# firmware for in-kernel drivers too.
|
||||||
ifndef CONFIG_FIRMWARE_IN_KERNEL
|
ifndef CONFIG_FIRMWARE_IN_KERNEL
|
||||||
mod-fw += $(fw-shipped-y)
|
mod-fw += $(fw-shipped-y)
|
||||||
|
|
|
@ -166,5 +166,5 @@ $(host-cshlib): $(obj)/%: $(host-cshobjs) FORCE
|
||||||
$(call if_changed,host-cshlib)
|
$(call if_changed,host-cshlib)
|
||||||
|
|
||||||
targets += $(host-csingle) $(host-cmulti) $(host-cobjs)\
|
targets += $(host-csingle) $(host-cmulti) $(host-cobjs)\
|
||||||
$(host-cxxmulti) $(host-cxxobjs) $(host-cshlib) $(host-cshobjs)
|
$(host-cxxmulti) $(host-cxxobjs) $(host-cshlib) $(host-cshobjs)
|
||||||
|
|
||||||
|
|
|
@ -27,7 +27,7 @@ lib-y := $(filter-out $(obj-y), $(sort $(lib-y) $(lib-m)))
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# o if we encounter foo/ in $(obj-y), replace it by foo/built-in.o
|
# o if we encounter foo/ in $(obj-y), replace it by foo/built-in.o
|
||||||
# and add the directory to the list of dirs to descend into: $(subdir-y)
|
# and add the directory to the list of dirs to descend into: $(subdir-y)
|
||||||
# o if we encounter foo/ in $(obj-m), remove it from $(obj-m)
|
# o if we encounter foo/ in $(obj-m), remove it from $(obj-m)
|
||||||
# and add the directory to the list of dirs to descend into: $(subdir-m)
|
# and add the directory to the list of dirs to descend into: $(subdir-m)
|
||||||
|
|
||||||
# Determine modorder.
|
# Determine modorder.
|
||||||
|
@ -46,7 +46,7 @@ obj-m := $(filter-out %/, $(obj-m))
|
||||||
|
|
||||||
subdir-ym := $(sort $(subdir-y) $(subdir-m))
|
subdir-ym := $(sort $(subdir-y) $(subdir-m))
|
||||||
|
|
||||||
# if $(foo-objs) exists, foo.o is a composite object
|
# if $(foo-objs) exists, foo.o is a composite object
|
||||||
multi-used-y := $(sort $(foreach m,$(obj-y), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))), $(m))))
|
multi-used-y := $(sort $(foreach m,$(obj-y), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))), $(m))))
|
||||||
multi-used-m := $(sort $(foreach m,$(obj-m), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))), $(m))))
|
multi-used-m := $(sort $(foreach m,$(obj-m), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))), $(m))))
|
||||||
multi-used := $(multi-used-y) $(multi-used-m)
|
multi-used := $(multi-used-y) $(multi-used-m)
|
||||||
|
@ -91,7 +91,7 @@ obj-dirs := $(addprefix $(obj)/,$(obj-dirs))
|
||||||
|
|
||||||
# These flags are needed for modversions and compiling, so we define them here
|
# These flags are needed for modversions and compiling, so we define them here
|
||||||
# already
|
# already
|
||||||
# $(modname_flags) #defines KBUILD_MODNAME as the name of the module it will
|
# $(modname_flags) #defines KBUILD_MODNAME as the name of the module it will
|
||||||
# end up in (or would, if it gets compiled in)
|
# end up in (or would, if it gets compiled in)
|
||||||
# Note: Files that end up in two or more modules are compiled without the
|
# Note: Files that end up in two or more modules are compiled without the
|
||||||
# KBUILD_MODNAME definition. The reason is that any made-up name would
|
# KBUILD_MODNAME definition. The reason is that any made-up name would
|
||||||
|
@ -212,7 +212,7 @@ $(obj)/%: $(src)/%_shipped
|
||||||
|
|
||||||
# Commands useful for building a boot image
|
# Commands useful for building a boot image
|
||||||
# ===========================================================================
|
# ===========================================================================
|
||||||
#
|
#
|
||||||
# Use as following:
|
# Use as following:
|
||||||
#
|
#
|
||||||
# target: source(s) FORCE
|
# target: source(s) FORCE
|
||||||
|
@ -226,7 +226,7 @@ $(obj)/%: $(src)/%_shipped
|
||||||
|
|
||||||
quiet_cmd_ld = LD $@
|
quiet_cmd_ld = LD $@
|
||||||
cmd_ld = $(LD) $(LDFLAGS) $(ldflags-y) $(LDFLAGS_$(@F)) \
|
cmd_ld = $(LD) $(LDFLAGS) $(ldflags-y) $(LDFLAGS_$(@F)) \
|
||||||
$(filter-out FORCE,$^) -o $@
|
$(filter-out FORCE,$^) -o $@
|
||||||
|
|
||||||
# Objcopy
|
# Objcopy
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
|
|
@ -104,7 +104,7 @@ int main(int argc, char *argv[])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* For now we assume the default font is always 256 characters. */
|
/* For now we assume the default font is always 256 characters. */
|
||||||
fontlen = 256;
|
fontlen = 256;
|
||||||
|
|
||||||
/* Initialize table */
|
/* Initialize table */
|
||||||
|
@ -236,15 +236,15 @@ int main(int argc, char *argv[])
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Okay, we hit EOF, now output hash table */
|
/* Okay, we hit EOF, now output hash table */
|
||||||
|
|
||||||
fclose(ctbl);
|
fclose(ctbl);
|
||||||
|
|
||||||
|
|
||||||
/* Compute total size of Unicode list */
|
/* Compute total size of Unicode list */
|
||||||
nuni = 0;
|
nuni = 0;
|
||||||
for ( i = 0 ; i < fontlen ; i++ )
|
for ( i = 0 ; i < fontlen ; i++ )
|
||||||
nuni += unicount[i];
|
nuni += unicount[i];
|
||||||
|
|
||||||
printf("\
|
printf("\
|
||||||
/*\n\
|
/*\n\
|
||||||
* Do not edit this file; it was automatically generated by\n\
|
* Do not edit this file; it was automatically generated by\n\
|
||||||
|
@ -268,9 +268,9 @@ u8 dfont_unicount[%d] = \n\
|
||||||
else
|
else
|
||||||
printf(", ");
|
printf(", ");
|
||||||
}
|
}
|
||||||
|
|
||||||
printf("\nu16 dfont_unitable[%d] = \n{\n\t", nuni);
|
printf("\nu16 dfont_unitable[%d] = \n{\n\t", nuni);
|
||||||
|
|
||||||
fp0 = 0;
|
fp0 = 0;
|
||||||
nent = 0;
|
nent = 0;
|
||||||
for ( i = 0 ; i < nuni ; i++ )
|
for ( i = 0 ; i < nuni ; i++ )
|
||||||
|
|
|
@ -589,7 +589,7 @@ while ($repeat) {
|
||||||
|
|
||||||
# Now we need to see if we have to check selects;
|
# Now we need to see if we have to check selects;
|
||||||
loop_select;
|
loop_select;
|
||||||
}
|
}
|
||||||
|
|
||||||
my %setconfigs;
|
my %setconfigs;
|
||||||
|
|
||||||
|
|
|
@ -68,7 +68,7 @@ UTS_TRUNCATE="cut -b -$UTS_LEN"
|
||||||
|
|
||||||
( echo /\* This file is auto generated, version $VERSION \*/
|
( echo /\* This file is auto generated, version $VERSION \*/
|
||||||
if [ -n "$CONFIG_FLAGS" ] ; then echo "/* $CONFIG_FLAGS */"; fi
|
if [ -n "$CONFIG_FLAGS" ] ; then echo "/* $CONFIG_FLAGS */"; fi
|
||||||
|
|
||||||
echo \#define UTS_MACHINE \"$ARCH\"
|
echo \#define UTS_MACHINE \"$ARCH\"
|
||||||
|
|
||||||
echo \#define UTS_VERSION \"`echo $UTS_VERSION | $UTS_TRUNCATE`\"
|
echo \#define UTS_VERSION \"`echo $UTS_VERSION | $UTS_TRUNCATE`\"
|
||||||
|
@ -84,7 +84,7 @@ UTS_TRUNCATE="cut -b -$UTS_LEN"
|
||||||
# recompilations.
|
# recompilations.
|
||||||
# We don't consider the file changed if only the date/time changed.
|
# We don't consider the file changed if only the date/time changed.
|
||||||
# A kernel config change will increase the generation number, thus
|
# A kernel config change will increase the generation number, thus
|
||||||
# causing compile.h to be updated (including date/time) due to the
|
# causing compile.h to be updated (including date/time) due to the
|
||||||
# changed comment in the
|
# changed comment in the
|
||||||
# first line.
|
# first line.
|
||||||
|
|
||||||
|
|
|
@ -130,7 +130,7 @@ if [ "$ARCH" = "um" ] ; then
|
||||||
cp System.map "$tmpdir/usr/lib/uml/modules/$version/System.map"
|
cp System.map "$tmpdir/usr/lib/uml/modules/$version/System.map"
|
||||||
cp $KCONFIG_CONFIG "$tmpdir/usr/share/doc/$packagename/config"
|
cp $KCONFIG_CONFIG "$tmpdir/usr/share/doc/$packagename/config"
|
||||||
gzip "$tmpdir/usr/share/doc/$packagename/config"
|
gzip "$tmpdir/usr/share/doc/$packagename/config"
|
||||||
else
|
else
|
||||||
cp System.map "$tmpdir/boot/System.map-$version"
|
cp System.map "$tmpdir/boot/System.map-$version"
|
||||||
cp $KCONFIG_CONFIG "$tmpdir/boot/config-$version"
|
cp $KCONFIG_CONFIG "$tmpdir/boot/config-$version"
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
# Nick Holloway <Nick.Holloway@alfie.demon.co.uk>, 2nd January 1995.
|
# Nick Holloway <Nick.Holloway@alfie.demon.co.uk>, 2nd January 1995.
|
||||||
#
|
#
|
||||||
# Added support for handling multiple types of compression. What includes
|
# Added support for handling multiple types of compression. What includes
|
||||||
# gzip, bzip, bzip2, zip, compress, and plaintext.
|
# gzip, bzip, bzip2, zip, compress, and plaintext.
|
||||||
#
|
#
|
||||||
# Adam Sulmicki <adam@cfar.umd.edu>, 1st January 1997.
|
# Adam Sulmicki <adam@cfar.umd.edu>, 1st January 1997.
|
||||||
#
|
#
|
||||||
|
@ -159,7 +159,7 @@ applyPatch () {
|
||||||
fi
|
fi
|
||||||
# Remove backup files
|
# Remove backup files
|
||||||
find $sourcedir/ '(' -name '*.orig' -o -name '.*.orig' ')' -exec rm -f {} \;
|
find $sourcedir/ '(' -name '*.orig' -o -name '.*.orig' ')' -exec rm -f {} \;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue