Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
perf: Use make kernelversion instead of parsing the Makefile
kbuild: Hack for depmod not handling X.Y versions
kbuild: Move depmod call to a separate script
kbuild: Fix <linux/version.h> for empty SUBLEVEL or PATCHLEVEL
kbuild: Fix KERNELVERSION for empty SUBLEVEL or PATCHLEVEL
kbuild: silence Nothing to be done for 'all' message
+53
-19
+3
-13
Makefile
+3
-13
Makefile
···
378
378
379
379
# Read KERNELRELEASE from include/config/kernel.release (if it exists)
380
380
KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)
381
-
KERNELVERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
381
+
KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION)
382
382
383
383
export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION
384
384
export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC
···
1005
1005
1006
1006
define filechk_version.h
1007
1007
(echo \#define LINUX_VERSION_CODE $(shell \
1008
-
expr $(VERSION) \* 65536 + $(PATCHLEVEL) \* 256 + $(SUBLEVEL)); \
1008
+
expr $(VERSION) \* 65536 + 0$(PATCHLEVEL) \* 256 + 0$(SUBLEVEL)); \
1009
1009
echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))';)
1010
1010
endef
1011
1011
···
1110
1110
1111
1111
PHONY += _modinst_
1112
1112
_modinst_:
1113
-
@if [ -z "`$(DEPMOD) -V 2>/dev/null | grep module-init-tools`" ]; then \
1114
-
echo "Warning: you may need to install module-init-tools"; \
1115
-
echo "See http://www.codemonkey.org.uk/docs/post-halloween-2.6.txt";\
1116
-
sleep 1; \
1117
-
fi
1118
1113
@rm -rf $(MODLIB)/kernel
1119
1114
@rm -f $(MODLIB)/source
1120
1115
@mkdir -p $(MODLIB)/kernel
···
1526
1531
1527
1532
# Run depmod only if we have System.map and depmod is executable
1528
1533
quiet_cmd_depmod = DEPMOD $(KERNELRELEASE)
1529
-
cmd_depmod = \
1530
-
if [ -r System.map -a -x $(DEPMOD) ]; then \
1531
-
$(DEPMOD) -ae -F System.map \
1532
-
$(if $(strip $(INSTALL_MOD_PATH)), -b $(INSTALL_MOD_PATH) ) \
1533
-
$(KERNELRELEASE); \
1534
-
fi
1534
+
cmd_depmod = $(srctree)/scripts/depmod.sh $(DEPMOD) $(KERNELRELEASE)
1535
1535
1536
1536
# Create temporary dir for module support files
1537
1537
# clean it up only when building all modules
+1
scripts/Makefile.asm-generic
+1
scripts/Makefile.asm-generic
+48
scripts/depmod.sh
+48
scripts/depmod.sh
···
1
+
#!/bin/sh
2
+
#
3
+
# A depmod wrapper used by the toplevel Makefile
4
+
5
+
if test $# -ne 2; then
6
+
echo "Usage: $0 /sbin/depmod <kernelrelease>" >&2
7
+
exit 1
8
+
fi
9
+
DEPMOD=$1
10
+
KERNELRELEASE=$2
11
+
12
+
if ! "$DEPMOD" -V 2>/dev/null | grep -q module-init-tools; then
13
+
echo "Warning: you may need to install module-init-tools" >&2
14
+
echo "See http://www.codemonkey.org.uk/docs/post-halloween-2.6.txt" >&2
15
+
sleep 1
16
+
fi
17
+
18
+
if ! test -r System.map -a -x "$DEPMOD"; then
19
+
exit 0
20
+
fi
21
+
# older versions of depmod require the version string to start with three
22
+
# numbers, so we cheat with a symlink here
23
+
depmod_hack_needed=true
24
+
mkdir -p .tmp_depmod/lib/modules/$KERNELRELEASE
25
+
if "$DEPMOD" -b .tmp_depmod $KERNELRELEASE 2>/dev/null; then
26
+
if test -e .tmp_depmod/lib/modules/$KERNELRELEASE/modules.dep -o \
27
+
-e .tmp_depmod/lib/modules/$KERNELRELEASE/modules.dep.bin; then
28
+
depmod_hack_needed=false
29
+
fi
30
+
fi
31
+
if $depmod_hack_needed; then
32
+
symlink="$INSTALL_MOD_PATH/lib/modules/99.98.$KERNELRELEASE"
33
+
ln -s "$KERNELRELEASE" "$symlink"
34
+
KERNELRELEASE=99.98.$KERNELRELEASE
35
+
fi
36
+
37
+
set -- -ae -F System.map
38
+
if test -n "$INSTALL_MOD_PATH"; then
39
+
set -- "$@" -b "$INSTALL_MOD_PATH"
40
+
fi
41
+
"$DEPMOD" "$@" "$KERNELRELEASE"
42
+
ret=$?
43
+
44
+
if $depmod_hack_needed; then
45
+
rm -f "$symlink"
46
+
fi
47
+
48
+
exit $ret
+1
-6
tools/perf/util/PERF-VERSION-GEN
+1
-6
tools/perf/util/PERF-VERSION-GEN
···
23
23
then
24
24
VN=$(echo "$VN" | sed -e 's/-/./g');
25
25
else
26
-
eval $(grep '^VERSION[[:space:]]*=' ../../Makefile|tr -d ' ')
27
-
eval $(grep '^PATCHLEVEL[[:space:]]*=' ../../Makefile|tr -d ' ')
28
-
eval $(grep '^SUBLEVEL[[:space:]]*=' ../../Makefile|tr -d ' ')
29
-
eval $(grep '^EXTRAVERSION[[:space:]]*=' ../../Makefile|tr -d ' ')
30
-
31
-
VN="${VERSION}.${PATCHLEVEL}.${SUBLEVEL}${EXTRAVERSION}"
26
+
VN=$(make -sC ../.. kernelversion)
32
27
fi
33
28
34
29
VN=$(expr "$VN" : v*'\(.*\)')