mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 14:19:16 +00:00
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
This commit is contained in:
commit
6aecceccf5
4 changed files with 53 additions and 19 deletions
16
Makefile
16
Makefile
|
@ -378,7 +378,7 @@ KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds
|
||||||
|
|
||||||
# Read KERNELRELEASE from include/config/kernel.release (if it exists)
|
# Read KERNELRELEASE from include/config/kernel.release (if it exists)
|
||||||
KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)
|
KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)
|
||||||
KERNELVERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
|
KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION)
|
||||||
|
|
||||||
export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION
|
export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION
|
||||||
export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC
|
export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC
|
||||||
|
@ -1005,7 +1005,7 @@ endef
|
||||||
|
|
||||||
define filechk_version.h
|
define filechk_version.h
|
||||||
(echo \#define LINUX_VERSION_CODE $(shell \
|
(echo \#define LINUX_VERSION_CODE $(shell \
|
||||||
expr $(VERSION) \* 65536 + $(PATCHLEVEL) \* 256 + $(SUBLEVEL)); \
|
expr $(VERSION) \* 65536 + 0$(PATCHLEVEL) \* 256 + 0$(SUBLEVEL)); \
|
||||||
echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))';)
|
echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))';)
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
@ -1110,11 +1110,6 @@ modules_install: _modinst_ _modinst_post
|
||||||
|
|
||||||
PHONY += _modinst_
|
PHONY += _modinst_
|
||||||
_modinst_:
|
_modinst_:
|
||||||
@if [ -z "`$(DEPMOD) -V 2>/dev/null | grep module-init-tools`" ]; then \
|
|
||||||
echo "Warning: you may need to install module-init-tools"; \
|
|
||||||
echo "See http://www.codemonkey.org.uk/docs/post-halloween-2.6.txt";\
|
|
||||||
sleep 1; \
|
|
||||||
fi
|
|
||||||
@rm -rf $(MODLIB)/kernel
|
@rm -rf $(MODLIB)/kernel
|
||||||
@rm -f $(MODLIB)/source
|
@rm -f $(MODLIB)/source
|
||||||
@mkdir -p $(MODLIB)/kernel
|
@mkdir -p $(MODLIB)/kernel
|
||||||
|
@ -1531,12 +1526,7 @@ quiet_cmd_rmfiles = $(if $(wildcard $(rm-files)),CLEAN $(wildcard $(rm-files))
|
||||||
|
|
||||||
# Run depmod only if we have System.map and depmod is executable
|
# Run depmod only if we have System.map and depmod is executable
|
||||||
quiet_cmd_depmod = DEPMOD $(KERNELRELEASE)
|
quiet_cmd_depmod = DEPMOD $(KERNELRELEASE)
|
||||||
cmd_depmod = \
|
cmd_depmod = $(srctree)/scripts/depmod.sh $(DEPMOD) $(KERNELRELEASE)
|
||||||
if [ -r System.map -a -x $(DEPMOD) ]; then \
|
|
||||||
$(DEPMOD) -ae -F System.map \
|
|
||||||
$(if $(strip $(INSTALL_MOD_PATH)), -b $(INSTALL_MOD_PATH) ) \
|
|
||||||
$(KERNELRELEASE); \
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Create temporary dir for module support files
|
# Create temporary dir for module support files
|
||||||
# clean it up only when building all modules
|
# clean it up only when building all modules
|
||||||
|
|
|
@ -17,6 +17,7 @@ quiet_cmd_wrap = WRAP $@
|
||||||
cmd_wrap = echo "\#include <asm-generic/$*.h>" >$@
|
cmd_wrap = echo "\#include <asm-generic/$*.h>" >$@
|
||||||
|
|
||||||
all: $(patsubst %, $(obj)/%, $(generic-y))
|
all: $(patsubst %, $(obj)/%, $(generic-y))
|
||||||
|
@:
|
||||||
|
|
||||||
$(obj)/%.h:
|
$(obj)/%.h:
|
||||||
$(call cmd,wrap)
|
$(call cmd,wrap)
|
||||||
|
|
48
scripts/depmod.sh
Executable file
48
scripts/depmod.sh
Executable file
|
@ -0,0 +1,48 @@
|
||||||
|
#!/bin/sh
|
||||||
|
#
|
||||||
|
# A depmod wrapper used by the toplevel Makefile
|
||||||
|
|
||||||
|
if test $# -ne 2; then
|
||||||
|
echo "Usage: $0 /sbin/depmod <kernelrelease>" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
DEPMOD=$1
|
||||||
|
KERNELRELEASE=$2
|
||||||
|
|
||||||
|
if ! "$DEPMOD" -V 2>/dev/null | grep -q module-init-tools; then
|
||||||
|
echo "Warning: you may need to install module-init-tools" >&2
|
||||||
|
echo "See http://www.codemonkey.org.uk/docs/post-halloween-2.6.txt" >&2
|
||||||
|
sleep 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! test -r System.map -a -x "$DEPMOD"; then
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
# older versions of depmod require the version string to start with three
|
||||||
|
# numbers, so we cheat with a symlink here
|
||||||
|
depmod_hack_needed=true
|
||||||
|
mkdir -p .tmp_depmod/lib/modules/$KERNELRELEASE
|
||||||
|
if "$DEPMOD" -b .tmp_depmod $KERNELRELEASE 2>/dev/null; then
|
||||||
|
if test -e .tmp_depmod/lib/modules/$KERNELRELEASE/modules.dep -o \
|
||||||
|
-e .tmp_depmod/lib/modules/$KERNELRELEASE/modules.dep.bin; then
|
||||||
|
depmod_hack_needed=false
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
if $depmod_hack_needed; then
|
||||||
|
symlink="$INSTALL_MOD_PATH/lib/modules/99.98.$KERNELRELEASE"
|
||||||
|
ln -s "$KERNELRELEASE" "$symlink"
|
||||||
|
KERNELRELEASE=99.98.$KERNELRELEASE
|
||||||
|
fi
|
||||||
|
|
||||||
|
set -- -ae -F System.map
|
||||||
|
if test -n "$INSTALL_MOD_PATH"; then
|
||||||
|
set -- "$@" -b "$INSTALL_MOD_PATH"
|
||||||
|
fi
|
||||||
|
"$DEPMOD" "$@" "$KERNELRELEASE"
|
||||||
|
ret=$?
|
||||||
|
|
||||||
|
if $depmod_hack_needed; then
|
||||||
|
rm -f "$symlink"
|
||||||
|
fi
|
||||||
|
|
||||||
|
exit $ret
|
|
@ -23,12 +23,7 @@ if test -d ../../.git -o -f ../../.git &&
|
||||||
then
|
then
|
||||||
VN=$(echo "$VN" | sed -e 's/-/./g');
|
VN=$(echo "$VN" | sed -e 's/-/./g');
|
||||||
else
|
else
|
||||||
eval $(grep '^VERSION[[:space:]]*=' ../../Makefile|tr -d ' ')
|
VN=$(make -sC ../.. kernelversion)
|
||||||
eval $(grep '^PATCHLEVEL[[:space:]]*=' ../../Makefile|tr -d ' ')
|
|
||||||
eval $(grep '^SUBLEVEL[[:space:]]*=' ../../Makefile|tr -d ' ')
|
|
||||||
eval $(grep '^EXTRAVERSION[[:space:]]*=' ../../Makefile|tr -d ' ')
|
|
||||||
|
|
||||||
VN="${VERSION}.${PATCHLEVEL}.${SUBLEVEL}${EXTRAVERSION}"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
VN=$(expr "$VN" : v*'\(.*\)')
|
VN=$(expr "$VN" : v*'\(.*\)')
|
||||||
|
|
Loading…
Reference in a new issue