* A typo in post-install.in corrected.
* header-install.in now correctly takes care of the asm-offsets.s files. * Some kernel -> linux changes in the Makefile. svn path=/branches/kernel-image-2.6.11/; revision=3285
This commit is contained in:
parent
c78e51fecb
commit
1da70290ab
|
@ -37,8 +37,8 @@ endif
|
|||
default := $(basedir)/config.default
|
||||
configs := $(notdir $(wildcard $(basedir)/config.*))
|
||||
configs := $(filter-out config.common config.default, $(configs))
|
||||
tkdir := kernel-source-$(version)
|
||||
kdir := kernel-source-$(version)-$(subarch)
|
||||
tkdir := linux-source-$(version)
|
||||
kdir := linux-source-$(version)-$(subarch)
|
||||
ifndef flavours
|
||||
flavours := $(patsubst config.%,%,$(configs))
|
||||
endif
|
||||
|
@ -49,7 +49,7 @@ controls += $(basedir)/control.in
|
|||
|
||||
#
|
||||
# Here we construct the command lines for different make-kpkg
|
||||
# calls (build, kernel-image, kernel-headers) based on the values
|
||||
# calls (build, linux-image, linux-headers) based on the values
|
||||
# of variables defined so far and provided by the arch/subarch
|
||||
# in Makefile.inc. @flavour@ in the expressions is going to be
|
||||
# replaced by the flavour for which the command is run.
|
||||
|
@ -192,11 +192,13 @@ $(kdir): post-install-$(subarch) $(controls)
|
|||
# build-$(subarch)-% target, which creates the build directory.
|
||||
#
|
||||
# Some arches have extra arch/${ARCH}/kernel/asm-offsets.s files
|
||||
# which have to be included in kernel-headers. The problem is that
|
||||
# which have to be included in linux-headers. The problem is that
|
||||
# they are only generated during build and we never performed a
|
||||
# full build in the directory $(kdir) where kernel-headers are
|
||||
# full build in the directory $(kdir) where linux-headers are
|
||||
# built. So, after build we check whether current build arch has
|
||||
# such a file and symlink it into the $(kdir) if necessary.
|
||||
# such a file and symlink it into the $(kdir) if necessary. It will
|
||||
# then be picked up and included into the linux-headers package
|
||||
# by the headers-install script.
|
||||
#
|
||||
build-stamp-$(subarch)-%: build-$(subarch)-%
|
||||
PATH=$$PWD/bin:$$PATH; \
|
||||
|
|
|
@ -13,6 +13,15 @@ cd @ksource_dir@
|
|||
find . -path './Documentation/*' -prune -o \
|
||||
-path './debian/*' -prune -o -type f \
|
||||
\( -name Makefile -o -name 'Kconfig*' -o -path './scripts/*' \) -print
|
||||
#
|
||||
# The command below will include all the asm-offsets.s files, which have
|
||||
# have been linked into the linux-headers build directory during the
|
||||
# buildng of the images.
|
||||
#
|
||||
find arch -name 'asm-offsets.s'
|
||||
#
|
||||
# And we need to include all the extra files too
|
||||
#
|
||||
for i in @headers_extra@; do
|
||||
echo "${i}"
|
||||
done
|
||||
|
|
|
@ -50,7 +50,7 @@ dir=$top/usr/src/linux-headers-$version
|
|||
#
|
||||
arch=$(readlink include/asm)
|
||||
arch=$(basename "${arch}")
|
||||
arch="$${arch#asm-}"
|
||||
arch="${arch#asm-}"
|
||||
|
||||
debhelper_pre $pkg
|
||||
|
||||
|
|
Loading…
Reference in New Issue