leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kbuild: tar-pkg with out-out-tree building

Browse Source 
Fix out-of-tree builds for the tar-pkg targets

When I wrote the buildtar script, I didn't even think about
out-of-tree builds because I didn't use these back then. This patch
throughoutly uses ${objtree} instead of `pwd`.

Also, the kernel version is no longer manually built. Instead, it will
properly use $KERNELRELEASE .  Installing modules is only done if
CONFIG_MODULES is set.

Signed-off-by: Jan-Benedict Glaw <jbglaw@lug-owl.de>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
This commit is contained in:
Jan-Benedict Glaw 2006-01-01 14:23:47 +01:00 committed by
parent 752625cff3
commit 6073aa643f
2 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/package/Makefile
View File

@ -84,7 +84,7 @@ clean-dirs += $(objtree)/debian/
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
.PHONY: tar%pkg .PHONY: tar%pkg
tar%pkg: tar%pkg:
$(MAKE) $(MAKE) KBUILD_SRC=
$(CONFIG_SHELL) $(srctree)/scripts/package/buildtar $@ $(CONFIG_SHELL) $(srctree)/scripts/package/buildtar $@
clean-dirs += $(objtree)/tar-install/ clean-dirs += $(objtree)/tar-install/

31
scripts/package/buildtar
View File

@ -1,9 +1,9 @@
#!/bin/sh #!/bin/sh
# #
# buildtar 0.0.3 # buildtar 0.0.4
# #
# (C) 2004-2005 by Jan-Benedict Glaw <jbglaw@lug-owl.de> # (C) 2004-2006 by Jan-Benedict Glaw <jbglaw@lug-owl.de>
# #
# This script is used to compile a tarball from the currently # This script is used to compile a tarball from the currently
# prepared kernel. Based upon the builddeb script from # prepared kernel. Based upon the builddeb script from
@ -15,9 +15,8 @@ set -e
# #
# Some variables and settings used throughout the script # Some variables and settings used throughout the script
# #
version="${VERSION}.${PATCHLEVEL}.${SUBLEVEL}${EXTRAVERSION}${EXTRANAME}"
tmpdir="${objtree}/tar-install" tmpdir="${objtree}/tar-install"
tarball="${objtree}/linux-${version}.tar" tarball="${objtree}/linux-${KERNELRELEASE}.tar"
# #
@ -53,21 +52,17 @@ mkdir -p -- "${tmpdir}/boot"
# #
# Try to install modules # Try to install modules
# #
if ! make INSTALL_MOD_PATH="${tmpdir}" modules_install; then if grep -q '^CONFIG_MODULES=y' "${objtree}/.config"; then
echo "" >&2 make ARCH="${ARCH}" O="${objtree}" KBUILD_SRC= INSTALL_MOD_PATH="${tmpdir}" modules_install
echo "Ignoring error at module_install time, since that could be" >&2
echo "a result of missing local modutils/module-init-tools," >&2
echo "or you just didn't compile in module support at all..." >&2
echo "" >&2
fi fi
# #
# Install basic kernel files # Install basic kernel files
# #
cp -v -- System.map "${tmpdir}/boot/System.map-${version}" cp -v -- "${objtree}/System.map" "${tmpdir}/boot/System.map-${KERNELRELEASE}"
cp -v -- .config "${tmpdir}/boot/config-${version}" cp -v -- "${objtree}/.config" "${tmpdir}/boot/config-${KERNELRELEASE}"
cp -v -- vmlinux "${tmpdir}/boot/vmlinux-${version}" cp -v -- "${objtree}/vmlinux" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}"
# #
@ -75,17 +70,17 @@ cp -v -- vmlinux "${tmpdir}/boot/vmlinux-${version}"
# #
case "${ARCH}" in case "${ARCH}" in
i386) i386)
[ -f arch/i386/boot/bzImage ] && cp -v -- arch/i386/boot/bzImage "${tmpdir}/boot/vmlinuz-${version}" [ -f "${objtree}/arch/i386/boot/bzImage" ] && cp -v -- "${objtree}/arch/i386/boot/bzImage" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}"
;; ;;
alpha) alpha)
[ -f arch/alpha/boot/vmlinux.gz ] && cp -v -- arch/alpha/boot/vmlinux.gz "${tmpdir}/boot/vmlinuz-${version}" [ -f "${objtree}/arch/alpha/boot/vmlinux.gz" ] && cp -v -- "${objtree}/arch/alpha/boot/vmlinux.gz" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}"
;; ;;
vax) vax)
[ -f vmlinux.SYS ] && cp -v -- vmlinux.SYS "${tmpdir}/boot/vmlinux-${version}.SYS" [ -f "${objtree}/vmlinux.SYS" ] && cp -v -- "${objtree}/vmlinux.SYS" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}.SYS"
[ -f vmlinux.dsk ] && cp -v -- vmlinux.dsk "${tmpdir}/boot/vmlinux-${version}.dsk" [ -f "${objtree}/vmlinux.dsk" ] && cp -v -- "${objtree}/vmlinux.dsk" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}.dsk"
;; ;;
*) *)
[ -f "${KBUILD_IMAGE}" ] && cp -v -- "${KBUILD_IMAGE}" "${tmpdir}/boot/vmlinux-kbuild-${version}" [ -f "${KBUILD_IMAGE}" ] && cp -v -- "${KBUILD_IMAGE}" "${tmpdir}/boot/vmlinux-kbuild-${KERNELRELEASE}"
echo "" >&2 echo "" >&2
echo '** ** ** WARNING ** ** **' >&2 echo '** ** ** WARNING ** ** **' >&2
echo "" >&2 echo "" >&2