mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-06-21 06:01:23 +00:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes: docbook: make cleandocs kbuild: fix spurious initramfs rebuild Documentation: explain the difference between __bitwise and __bitwise__ kbuild: make it possible for the linker to discard local symbols from vmlinux kbuild: remove pointless strdup() on arguments passed to new_module() in modpost kbuild: fix a few typos in top-level Makefile kbuild: introduce destination-y for exported headers kbuild: use git svn instead of git-svn in setlocalversion kconfig: fix update-po-config to accect backslash in input kbuild: fix option processing for -I in headerdep
This commit is contained in:
commit
80a04d3f2f
11 changed files with 116 additions and 18 deletions
|
@ -14,6 +14,8 @@ _dst := $(if $(dst),$(dst),$(obj))
|
|||
kbuild-file := $(srctree)/$(obj)/Kbuild
|
||||
include $(kbuild-file)
|
||||
|
||||
_dst := $(if $(destination-y),$(destination-y),$(_dst))
|
||||
|
||||
include scripts/Kbuild.include
|
||||
|
||||
install := $(INSTALL_HDR_PATH)/$(_dst)
|
||||
|
|
|
@ -97,7 +97,7 @@ print_mtime() {
|
|||
}
|
||||
|
||||
list_parse() {
|
||||
echo "$1 \\"
|
||||
[ ! -L "$1" ] && echo "$1 \\" || :
|
||||
}
|
||||
|
||||
# for each file print a line in following format
|
||||
|
|
|
@ -19,7 +19,7 @@ my $opt_graph;
|
|||
version => \&version,
|
||||
|
||||
all => \$opt_all,
|
||||
I => \@opt_include,
|
||||
"I=s" => \@opt_include,
|
||||
graph => \$opt_graph,
|
||||
);
|
||||
|
||||
|
|
|
@ -43,6 +43,10 @@ static char *escape(const char* text, char *bf, int len)
|
|||
++text;
|
||||
goto next;
|
||||
}
|
||||
else if (*text == '\\') {
|
||||
*bfp++ = '\\';
|
||||
len--;
|
||||
}
|
||||
*bfp++ = *text++;
|
||||
next:
|
||||
--len;
|
||||
|
|
|
@ -1913,7 +1913,7 @@ static void read_dump(const char *fname, unsigned int kernel)
|
|||
if (!mod) {
|
||||
if (is_vmlinux(modname))
|
||||
have_vmlinux = 1;
|
||||
mod = new_module(NOFAIL(strdup(modname)));
|
||||
mod = new_module(modname);
|
||||
mod->skip = 1;
|
||||
}
|
||||
s = sym_add_exported(symname, mod, export_no(export));
|
||||
|
@ -1997,7 +1997,7 @@ static void read_markers(const char *fname)
|
|||
|
||||
mod = find_module(modname);
|
||||
if (!mod) {
|
||||
mod = new_module(NOFAIL(strdup(modname)));
|
||||
mod = new_module(modname);
|
||||
mod->skip = 1;
|
||||
}
|
||||
if (is_vmlinux(modname)) {
|
||||
|
|
|
@ -21,7 +21,7 @@ if head=`git rev-parse --verify --short HEAD 2>/dev/null`; then
|
|||
|
||||
# Is this git on svn?
|
||||
if git config --get svn-remote.svn.url >/dev/null; then
|
||||
printf -- '-svn%s' "`git-svn find-rev $head`"
|
||||
printf -- '-svn%s' "`git svn find-rev $head`"
|
||||
fi
|
||||
|
||||
# Are there uncommitted changes?
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue