Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Linux-御风守护者
linux
提交
9d8d5a28
L
linux
项目概览
Linux-御风守护者
/
linux
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
9d8d5a28
编写于
1月 16, 2006
作者:
L
Linus Torvalds
浏览文件
操作
浏览文件
下载
差异文件
Merge
git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
上级
4a8e4a27
df9df036
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
41 addition
and
26 deletion
+41
-26
Makefile
Makefile
+15
-13
scripts/kconfig/confdata.c
scripts/kconfig/confdata.c
+1
-1
scripts/kconfig/gconf.c
scripts/kconfig/gconf.c
+1
-1
scripts/kconfig/lxdialog/Makefile
scripts/kconfig/lxdialog/Makefile
+3
-3
scripts/kconfig/lxdialog/check-lxdialog.sh
scripts/kconfig/lxdialog/check-lxdialog.sh
+18
-5
scripts/kconfig/mconf.c
scripts/kconfig/mconf.c
+1
-1
scripts/kconfig/symbol.c
scripts/kconfig/symbol.c
+2
-2
未找到文件。
Makefile
浏览文件 @
9d8d5a28
...
...
@@ -106,12 +106,13 @@ KBUILD_OUTPUT := $(shell cd $(KBUILD_OUTPUT) && /bin/pwd)
$(if
$(KBUILD_OUTPUT),,
\
$(error
output
directory
"$(saved-output)"
does
not
exist))
.PHONY
:
$(MAKECMDGOALS)
.PHONY
:
$(MAKECMDGOALS) cdbuilddir
$(MAKECMDGOALS) _all
:
cdbuilddir
$(filter-out _all,$(MAKECMDGOALS)) _all
:
cdbuilddir
:
$(
if
$(KBUILD_VERBOSE:1=)
,@
)
$(MAKE)
-C
$(KBUILD_OUTPUT)
\
KBUILD_SRC
=
$(CURDIR)
\
KBUILD_EXTMOD
=
"
$(KBUILD_EXTMOD)
"
-f
$(CURDIR)
/Makefile
$
@
KBUILD_EXTMOD
=
"
$(KBUILD_EXTMOD)
"
-f
$(CURDIR)
/Makefile
$
(MAKECMDGOALS)
# Leave processing to above invocation of make
skip-makefile
:=
1
...
...
@@ -337,8 +338,9 @@ AFLAGS := -D__ASSEMBLY__
# Read KERNELRELEASE from .kernelrelease (if it exists)
KERNELRELEASE
=
$(
shell
cat
.kernelrelease 2> /dev/null
)
KERNELVERSION
=
$(VERSION)
.
$(PATCHLEVEL)
.
$(SUBLEVEL)$(EXTRAVERSION)
export
VERSION
PATCHLEVEL
SUBLEVEL
KERNELRELEASE
\
export
VERSION
PATCHLEVEL
SUBLEVEL
KERNELRELEASE
KERNELVERSION
\
ARCH
CONFIG_SHELL
HOSTCC
HOSTCFLAGS
CROSS_COMPILE
AS
LD
CC
\
CPP
AR
NM
STRIP
OBJCOPY
OBJDUMP
MAKE
AWK
GENKSYMS
PERL
UTS_MACHINE
\
HOSTCXX
HOSTCXXFLAGS
LDFLAGS_MODULE
CHECK
CHECKFLAGS
...
...
@@ -433,6 +435,7 @@ export KBUILD_DEFCONFIG
config %config
:
scripts_basic outputmakefile FORCE
$(Q)
mkdir
-p
include/linux
$(Q)$(MAKE)
$(build)
=
scripts/kconfig
$@
$(Q)$(MAKE)
.kernelrelease
else
# ===========================================================================
...
...
@@ -542,7 +545,7 @@ export INSTALL_PATH ?= /boot
# makefile but the arguement can be passed to make if needed.
#
MODLIB
:
=
$(INSTALL_MOD_PATH)
/lib/modules/
$(KERNELRELEASE)
MODLIB
=
$(INSTALL_MOD_PATH)
/lib/modules/
$(KERNELRELEASE)
export
MODLIB
...
...
@@ -783,12 +786,10 @@ endif
localver-full
=
$(localver)
$
(
localver-auto
)
# Store (new) KERNELRELASE string in .kernelrelease
kernelrelease
=
\
$(VERSION)
.
$(PATCHLEVEL)
.
$(SUBLEVEL)$(EXTRAVERSION)
$
(
localver-full
)
kernelrelease
=
$(KERNELVERSION)
$
(
localver-full
)
.kernelrelease
:
FORCE
$(Q)
rm
-f
.kernelrelease
$(Q)
echo
$(kernelrelease)
>
.kernelrelease
$(Q)
echo
" Building kernel
$(kernelrelease)
"
$(Q)
rm
-f
$@
$(Q)
echo
$(kernelrelease)
>
$@
# Things we need to do before we recursively start building the kernel
...
...
@@ -898,7 +899,7 @@ define filechk_version.h
)
endef
include/linux/version.h
:
$(srctree)/Makefile FORCE
include/linux/version.h
:
$(srctree)/Makefile
.config
FORCE
$(
call
filechk,version.h
)
# ---------------------------------------------------------------------------
...
...
@@ -1301,9 +1302,10 @@ checkstack:
$(PERL)
$(src)
/scripts/checkstack.pl
$(ARCH)
kernelrelease
:
@
echo
$(KERNELRELEASE)
$(
if
$(
wildcard
.kernelrelease
)
,
$(Q)
echo
$(KERNELRELEASE)
,
\
$(
error
kernelrelease not valid - run
'make *config'
to update it
))
kernelversion
:
@
echo
$(
VERSION)
.
$(PATCHLEVEL)
.
$(SUBLEVEL)$(EXTRA
VERSION)
@
echo
$(
KERNEL
VERSION)
# FIXME Should go into a make.lib or something
# ===========================================================================
...
...
scripts/kconfig/confdata.c
浏览文件 @
9d8d5a28
...
...
@@ -375,7 +375,7 @@ int conf_write(const char *name)
if
(
!
out_h
)
return
1
;
}
sym
=
sym_lookup
(
"KERNEL
RELEASE
"
,
0
);
sym
=
sym_lookup
(
"KERNEL
VERSION
"
,
0
);
sym_calc_value
(
sym
);
time
(
&
now
);
env
=
getenv
(
"KCONFIG_NOTIMESTAMP"
);
...
...
scripts/kconfig/gconf.c
浏览文件 @
9d8d5a28
...
...
@@ -276,7 +276,7 @@ void init_main_window(const gchar * glade_file)
NULL
);
sprintf
(
title
,
_
(
"Linux Kernel v%s Configuration"
),
getenv
(
"KERNEL
RELEASE
"
));
getenv
(
"KERNEL
VERSION
"
));
gtk_window_set_title
(
GTK_WINDOW
(
main_wnd
),
title
);
gtk_widget_show
(
main_wnd
);
...
...
scripts/kconfig/lxdialog/Makefile
浏览文件 @
9d8d5a28
# Makefile to build lxdialog package
#
check-lxdialog
:=
$(srctree)
/
$(src)
/check-lxdialog.sh
HOST_EXTRACFLAGS
:=
$(
shell
$(CONFIG_SHELL)
$
(
check-lxdialog
)
-ccflags
)
HOST_LOADLIBES
:=
$(
shell
$(CONFIG_SHELL)
$
(
check-lxdialog
)
-ldflags
)
check-lxdialog
:=
$(srctree)
/
$(src)
/check-lxdialog.sh
HOST_EXTRACFLAGS
:=
$(
shell
$(CONFIG_SHELL)
$
(
check-lxdialog
)
-ccflags
)
HOST_LOADLIBES
:=
$(
shell
$(CONFIG_SHELL)
$
(
check-lxdialog
)
-ldflags
$(HOSTCC)
)
HOST_EXTRACFLAGS
+=
-DLOCALE
...
...
scripts/kconfig/lxdialog/check-lxdialog.sh
浏览文件 @
9d8d5a28
...
...
@@ -4,11 +4,22 @@
# What library to link
ldflags
()
{
if
[
`
uname
`
==
SunOS
]
;
then
echo
'-lcurses'
else
echo
"main() {}"
|
$cc
-lncursesw
-xc
-
-o
/dev/null 2> /dev/null
if
[
$?
-eq
0
]
;
then
echo
'-lncursesw'
exit
fi
echo
"main() {}"
|
$cc
-lncurses
-xc
-
-o
/dev/null 2> /dev/null
if
[
$?
-eq
0
]
;
then
echo
'-lncurses'
exit
fi
echo
"main() {}"
|
$cc
-lcurses
-xc
-
-o
/dev/null 2> /dev/null
if
[
$?
-eq
0
]
;
then
echo
'-lcurses'
exit
fi
exit
1
}
# Where is ncurses.h?
...
...
@@ -28,7 +39,7 @@ ccflags()
compiler
=
""
# Check if we can link to ncurses
check
()
{
echo
"main() {}"
|
$c
ompiler
-xc
-
echo
"main() {}"
|
$c
c
-xc
-
-o
/dev/null 2> /dev/null
if
[
$?
!=
0
]
;
then
echo
" *** Unable to find the ncurses libraries."
1>&2
echo
" *** make menuconfig require the ncurses libraries"
1>&2
...
...
@@ -51,13 +62,15 @@ fi
case
"
$1
"
in
"-check"
)
shift
c
ompiler
=
"
$@
"
c
c
=
"
$@
"
check
;;
"-ccflags"
)
ccflags
;;
"-ldflags"
)
shift
cc
=
"
$@
"
ldflags
;;
"*"
)
...
...
scripts/kconfig/mconf.c
浏览文件 @
9d8d5a28
...
...
@@ -1051,7 +1051,7 @@ int main(int ac, char **av)
conf_parse
(
av
[
1
]);
conf_read
(
NULL
);
sym
=
sym_lookup
(
"KERNEL
RELEASE
"
,
0
);
sym
=
sym_lookup
(
"KERNEL
VERSION
"
,
0
);
sym_calc_value
(
sym
);
sprintf
(
menu_backtitle
,
_
(
"Linux Kernel v%s Configuration"
),
sym_get_string_value
(
sym
));
...
...
scripts/kconfig/symbol.c
浏览文件 @
9d8d5a28
...
...
@@ -61,10 +61,10 @@ void sym_init(void)
if
(
p
)
sym_add_default
(
sym
,
p
);
sym
=
sym_lookup
(
"KERNEL
RELEASE
"
,
0
);
sym
=
sym_lookup
(
"KERNEL
VERSION
"
,
0
);
sym
->
type
=
S_STRING
;
sym
->
flags
|=
SYMBOL_AUTO
;
p
=
getenv
(
"KERNEL
RELEASE
"
);
p
=
getenv
(
"KERNEL
VERSION
"
);
if
(
p
)
sym_add_default
(
sym
,
p
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录