Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
9d8d5a28
Commit
9d8d5a28
authored
18 years ago
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge
git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
parents
4a8e4a27
df9df036
No related merge requests found
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
41 additions
and
26 deletions
+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
No files found.
Makefile
View file @
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
# ===========================================================================
...
...
This diff is collapsed.
Click to expand it.
scripts/kconfig/confdata.c
View file @
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"
);
...
...
This diff is collapsed.
Click to expand it.
scripts/kconfig/gconf.c
View file @
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
);
...
...
This diff is collapsed.
Click to expand it.
scripts/kconfig/lxdialog/Makefile
View file @
9d8d5a28
...
...
@@ -2,8 +2,8 @@
#
check-lxdialog
:=
$(srctree)
/
$(src)
/check-lxdialog.sh
HOST_EXTRACFLAGS
:=
$(
shell
$(CONFIG_SHELL)
$
(
check-lxdialog
)
-ccflags
)
HOST_LOADLIBES
:=
$(
shell
$(CONFIG_SHELL)
$
(
check-lxdialog
)
-ldflags
)
HOST_EXTRACFLAGS
:=
$(
shell
$(CONFIG_SHELL)
$
(
check-lxdialog
)
-ccflags
)
HOST_LOADLIBES
:=
$(
shell
$(CONFIG_SHELL)
$
(
check-lxdialog
)
-ldflags
$(HOSTCC)
)
HOST_EXTRACFLAGS
+=
-DLOCALE
...
...
This diff is collapsed.
Click to expand it.
scripts/kconfig/lxdialog/check-lxdialog.sh
View file @
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
;;
"*"
)
...
...
This diff is collapsed.
Click to expand it.
scripts/kconfig/mconf.c
View file @
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
));
...
...
This diff is collapsed.
Click to expand it.
scripts/kconfig/symbol.c
View file @
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
);
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment