4 files changed, 122 insertions, 11 deletions

diff --git a/scripts/package/Makefile b/scripts/package/Makefile
index d0b931b994fc..006960ebbce9 100644
--- a/scripts/package/Makefile
+++ b/scripts/package/Makefile
@@ -26,9 +26,9 @@ RPM := $(shell if [ -x "/usr/bin/rpmbuild" ]; then echo rpmbuild; \
                    else echo rpm; fi)
 
 # Remove hyphens since they have special meaning in RPM filenames
-KERNELPATH := kernel-$(subst -,,$(KERNELRELEASE))
+KERNELPATH := kernel-$(subst -,_,$(KERNELRELEASE))
 MKSPEC     := $(srctree)/scripts/package/mkspec
-PREV       := set -e; cd ..;
+PREV       := set -e; cd -P ..;
 
 # rpm-pkg
 # ---------------------------------------------------------------------------
@@ -127,7 +127,8 @@ rm -r $(perf-tar);                                                  \
 $(if $(findstring tar-src,$@),,                                     \
 $(if $(findstring bz2,$@),bzip2,                                    \
 $(if $(findstring gz,$@),gzip,                                      \
-$(error unknown target $@)))                                       \
+$(if $(findstring xz,$@),xz,                                        \
+$(error unknown target $@))))                                       \
         -f -9 $(perf-tar).tar)
 
 perf-%pkg: FORCE
@@ -142,7 +143,9 @@ help: FORCE
         @echo '  tar-pkg             - Build the kernel as an uncompressed tarball'
         @echo '  targz-pkg           - Build the kernel as a gzip compressed tarball'
         @echo '  tarbz2-pkg          - Build the kernel as a bzip2 compressed tarball'
+        @echo '  tarxz-pkg           - Build the kernel as a xz compressed tarball'
         @echo '  perf-tar-src-pkg    - Build $(perf-tar).tar source tarball'
         @echo '  perf-targz-src-pkg  - Build $(perf-tar).tar.gz source tarball'
         @echo '  perf-tarbz2-src-pkg - Build $(perf-tar).tar.bz2 source tarball'
+        @echo '  perf-tarxz-src-pkg  - Build $(perf-tar).tar.xz source tarball'
 
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 5f1e2fc7f171..f6cbc3ddb68b 100644
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -25,8 +25,44 @@ create_package() {
         chown -R root:root "$pdir"
         chmod -R go-w "$pdir"
 
+        # Attempt to find the correct Debian architecture
+        local forcearch="" debarch=""
+        case "$UTS_MACHINE" in
+        i386|ia64|alpha)
+                debarch="$UTS_MACHINE" ;;
+        x86_64)
+                debarch=amd64 ;;
+        sparc*)
+                debarch=sparc ;;
+        s390*)
+                debarch=s390 ;;
+        ppc*)
+                debarch=powerpc ;;
+        parisc*)
+                debarch=hppa ;;
+        mips*)
+                debarch=mips$(grep -q CPU_LITTLE_ENDIAN=y .config && echo el) ;;
+        arm*)
+                debarch=arm$(grep -q CONFIG_AEABI=y .config && echo el) ;;
+        *)
+                echo "" >&2
+                echo "** ** **  WARNING  ** ** **" >&2
+                echo "" >&2
+                echo "Your architecture doesn't have it's equivalent" >&2
+                echo "Debian userspace architecture defined!" >&2
+                echo "Falling back to using your current userspace instead!" >&2
+                echo "Please add support for $UTS_MACHINE to ${0} ..." >&2
+                echo "" >&2
+        esac
+        if [ -n "$KBUILD_DEBARCH" ] ; then
+                debarch="$KBUILD_DEBARCH"
+        fi
+        if [ -n "$debarch" ] ; then
+                forcearch="-DArchitecture=$debarch"
+        fi
+
         # Create the package
-        dpkg-gencontrol -isp -p$pname -P"$pdir"
+        dpkg-gencontrol -isp $forcearch -p$pname -P"$pdir"
         dpkg --build "$pdir" ..
 }
 
@@ -40,17 +76,27 @@ else
 fi
 tmpdir="$objtree/debian/tmp"
 fwdir="$objtree/debian/fwtmp"
+kernel_headers_dir="$objtree/debian/hdrtmp"
+libc_headers_dir="$objtree/debian/headertmp"
 packagename=linux-image-$version
 fwpackagename=linux-firmware-image
+kernel_headers_packagename=linux-headers-$version
+libc_headers_packagename=linux-libc-dev
 
 if [ "$ARCH" = "um" ] ; then
         packagename=user-mode-linux-$version
 fi
 
 # Setup the directory structure
-rm -rf "$tmpdir" "$fwdir"
-mkdir -p "$tmpdir/DEBIAN" "$tmpdir/lib" "$tmpdir/boot" "$tmpdir/usr/share/doc/$packagename"
-mkdir -p "$fwdir/DEBIAN" "$fwdir/lib" "$fwdir/usr/share/doc/$fwpackagename"
+rm -rf "$tmpdir" "$fwdir" "$kernel_headers_dir" "$libc_headers_dir"
+mkdir -m 755 -p "$tmpdir/DEBIAN"
+mkdir -p  "$tmpdir/lib" "$tmpdir/boot" "$tmpdir/usr/share/doc/$packagename"
+mkdir -m 755 -p "$fwdir/DEBIAN"
+mkdir -p "$fwdir/lib" "$fwdir/usr/share/doc/$fwpackagename"
+mkdir -m 755 -p "$libc_headers_dir/DEBIAN"
+mkdir -p "$libc_headers_dir/usr/share/doc/$libc_headers_packagename"
+mkdir -m 755 -p "$kernel_headers_dir/DEBIAN"
+mkdir -p "$kernel_headers_dir/usr/share/doc/$kernel_headers_packagename"
 if [ "$ARCH" = "um" ] ; then
         mkdir -p "$tmpdir/usr/lib/uml/modules/$version" "$tmpdir/usr/bin"
 fi
@@ -66,7 +112,9 @@ else
         cp System.map "$tmpdir/boot/System.map-$version"
         cp .config "$tmpdir/boot/config-$version"
         # Not all arches include the boot path in KBUILD_IMAGE
-        if ! cp $KBUILD_IMAGE "$tmpdir/boot/vmlinuz-$version"; then
+        if [ -e $KBUILD_IMAGE ]; then
+                cp $KBUILD_IMAGE "$tmpdir/boot/vmlinuz-$version"
+        else
                 cp arch/$ARCH/boot/$KBUILD_IMAGE "$tmpdir/boot/vmlinuz-$version"
         fi
 fi
@@ -79,6 +127,9 @@ if grep -q '^CONFIG_MODULES=y' .config ; then
         fi
 fi
 
+make headers_check
+make headers_install INSTALL_HDR_PATH="$libc_headers_dir/usr"
+
 # Install the maintainer scripts
 # Note: hook scripts under /etc/kernel are also executed by official Debian
 # kernel packages, as well as kernel packages built using make-kpkg
@@ -186,6 +237,30 @@ EOF
 
 fi
 
+# Build header package
+(cd $srctree; find . -name Makefile -o -name Kconfig\* -o -name \*.pl > /tmp/files$$)
+(cd $srctree; find arch/$SRCARCH/include include scripts -type f >> /tmp/files$$)
+(cd $objtree; find .config Module.symvers include scripts -type f >> /tmp/objfiles$$)
+destdir=$kernel_headers_dir/usr/src/linux-headers-$version
+mkdir -p "$destdir"
+(cd $srctree; tar -c -f - -T /tmp/files$$) | (cd $destdir; tar -xf -)
+(cd $objtree; tar -c -f - -T /tmp/objfiles$$) | (cd $destdir; tar -xf -)
+rm -f /tmp/files$$ /tmp/objfiles$$
+arch=$(dpkg --print-architecture)
+
+cat <<EOF >> debian/control
+
+Package: $kernel_headers_packagename
+Provides: linux-headers, linux-headers-2.6
+Architecture: $arch
+Description: Linux kernel headers for $KERNELRELEASE on $arch
+ This package provides kernel header files for $KERNELRELEASE on $arch
+ .
+ This is useful for people who need to build external modules
+EOF
+
+create_package "$kernel_headers_packagename" "$kernel_headers_dir"
+
 # Do we have firmware? Move it out of the way and build it into a package.
 if [ -e "$tmpdir/lib/firmware" ]; then
         mv "$tmpdir/lib/firmware" "$fwdir/lib/"
@@ -201,6 +276,18 @@ EOF
         create_package "$fwpackagename" "$fwdir"
 fi
 
+cat <<EOF >> debian/control
+
+Package: $libc_headers_packagename
+Section: devel
+Provides: linux-kernel-headers
+Architecture: any
+Description: Linux support headers for userspace development
+ This package provides userspaces headers from the Linux kernel.  These headers
+ are used by the installed headers for GNU glibc and other system libraries.
+EOF
+
+create_package "$libc_headers_packagename" "$libc_headers_dir"
 create_package "$packagename" "$tmpdir"
 
 exit 0
diff --git a/scripts/package/buildtar b/scripts/package/buildtar
index 51b2aa0acb82..8a7b15598ea9 100644
--- a/scripts/package/buildtar
+++ b/scripts/package/buildtar
@@ -35,6 +35,10 @@ case "${1}" in
                 compress="bzip2 -c9"
                 file_ext=".bz2"
                 ;;
+        tarxz-pkg)
+                compress="xz -c9"
+                file_ext=".xz"
+                ;;
         *)
                 echo "Unknown tarball target \"${1}\" requested, please add it to ${0}." >&2
                 exit 1
@@ -88,7 +92,7 @@ case "${ARCH}" in
                 echo "" >&2
                 echo '** ** **  WARNING  ** ** **' >&2
                 echo "" >&2
-                echo "Your architecture did not define any architecture-dependant files" >&2
+                echo "Your architecture did not define any architecture-dependent files" >&2
                 echo "to be placed into the tarball. Please add those to ${0} ..." >&2
                 echo "" >&2
                 sleep 5
diff --git a/scripts/package/mkspec b/scripts/package/mkspec
index 15440f55aef6..4bf17ddf7c7f 100755
--- a/scripts/package/mkspec
+++ b/scripts/package/mkspec
@@ -22,7 +22,7 @@ if [ "`grep CONFIG_DRM=y .config | cut -f2 -d\=`" = "y" ]; then
 fi
 
 PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
-__KERNELRELEASE=`echo $KERNELRELEASE | sed -e "s/-//g"`
+__KERNELRELEASE=`echo $KERNELRELEASE | sed -e "s/-/_/g"`
 
 echo "Name: kernel"
 echo "Summary: The Linux Kernel"
@@ -47,6 +47,18 @@ echo ""
 echo "%description"
 echo "The Linux Kernel, the operating system core itself"
 echo ""
+echo "%package headers"
+echo "Summary: Header files for the Linux kernel for use by glibc"
+echo "Group: Development/System"
+echo "Obsoletes: kernel-headers"
+echo "Provides: kernel-headers = %{version}"
+echo "%description headers"
+echo "Kernel-headers includes the C header files that specify the interface"
+echo "between the Linux kernel and userspace libraries and programs.  The"
+echo "header files define structures and constants that are needed for"
+echo "building most standard programs and are also needed for rebuilding the"
+echo "glibc package."
+echo ""
 
 if ! $PREBUILT; then
 echo "%prep"
@@ -70,7 +82,7 @@ echo 'mkdir -p $RPM_BUILD_ROOT/boot $RPM_BUILD_ROOT/lib/modules'
 echo 'mkdir -p $RPM_BUILD_ROOT/lib/firmware'
 echo "%endif"
 
-echo 'INSTALL_MOD_PATH=$RPM_BUILD_ROOT make %{_smp_mflags} KBUILD_SRC= modules_install'
+echo 'INSTALL_MOD_PATH=$RPM_BUILD_ROOT make %{?_smp_mflags} KBUILD_SRC= modules_install'
 echo "%ifarch ia64"
 echo 'cp $KBUILD_IMAGE $RPM_BUILD_ROOT'"/boot/efi/vmlinuz-$KERNELRELEASE"
 echo 'ln -s '"efi/vmlinuz-$KERNELRELEASE" '$RPM_BUILD_ROOT'"/boot/"
@@ -83,6 +95,7 @@ echo 'cp $KBUILD_IMAGE $RPM_BUILD_ROOT'"/boot/vmlinuz-$KERNELRELEASE"
 echo "%endif"
 echo "%endif"
 
+echo 'make %{?_smp_mflags} INSTALL_HDR_PATH=$RPM_BUILD_ROOT/usr headers_install'
 echo 'cp System.map $RPM_BUILD_ROOT'"/boot/System.map-$KERNELRELEASE"
 
 echo 'cp .config $RPM_BUILD_ROOT'"/boot/config-$KERNELRELEASE"
@@ -105,3 +118,7 @@ echo "/lib/modules/$KERNELRELEASE"
 echo "/lib/firmware"
 echo "/boot/*"
 echo ""
+echo "%files headers"
+echo '%defattr (-, root, root)'
+echo "/usr/include"
+echo ""