Patched in Tegra support.

3 files changed, 19 insertions, 28 deletions

diff --git a/scripts/package/Makefile b/scripts/package/Makefile
index 87bf08076b1..bc6aa003860 100644
--- a/scripts/package/Makefile
+++ b/scripts/package/Makefile
@@ -141,7 +141,7 @@ perf-%pkg: FORCE
 help: FORCE
         @echo '  rpm-pkg             - Build both source and binary RPM kernel packages'
         @echo '  binrpm-pkg          - Build only the binary kernel package'
-        @echo '  deb-pkg             - Build the kernel as a deb package'
+        @echo '  deb-pkg             - Build the kernel as an deb package'
         @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'
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index acb86507828..f6cbc3ddb68 100644
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -92,12 +92,11 @@ 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/firmware/$version/" "$fwdir/usr/share/doc/$fwpackagename"
+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"
-mkdir -p "$kernel_headers_dir/lib/modules/$version/"
 if [ "$ARCH" = "um" ] ; then
         mkdir -p "$tmpdir/usr/lib/uml/modules/$version" "$tmpdir/usr/bin"
 fi
@@ -121,19 +120,15 @@ else
 fi
 
 if grep -q '^CONFIG_MODULES=y' .config ; then
-        INSTALL_MOD_PATH="$tmpdir" $MAKE KBUILD_SRC= modules_install
-        rm -f "$tmpdir/lib/modules/$version/build"
-        rm -f "$tmpdir/lib/modules/$version/source"
+        INSTALL_MOD_PATH="$tmpdir" make KBUILD_SRC= modules_install
         if [ "$ARCH" = "um" ] ; then
                 mv "$tmpdir/lib/modules/$version"/* "$tmpdir/usr/lib/uml/modules/$version/"
                 rmdir "$tmpdir/lib/modules/$version"
         fi
 fi
 
-if [ "$ARCH" != "um" ]; then
-        $MAKE headers_check KBUILD_SRC=
-        $MAKE headers_install KBUILD_SRC= INSTALL_HDR_PATH="$libc_headers_dir/usr"
-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
@@ -243,15 +238,14 @@ EOF
 fi
 
 # Build header package
-(cd $srctree; find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl > "$objtree/debian/hdrsrcfiles")
-(cd $srctree; find arch/$SRCARCH/include include scripts -type f >> "$objtree/debian/hdrsrcfiles")
-(cd $objtree; find arch/$SRCARCH/include .config Module.symvers include scripts -type f >> "$objtree/debian/hdrobjfiles")
+(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 "$objtree/debian/hdrsrcfiles") | (cd $destdir; tar -xf -)
-(cd $objtree; tar -c -f - -T "$objtree/debian/hdrobjfiles") | (cd $destdir; tar -xf -)
-ln -sf "/usr/src/linux-headers-$version" "$kernel_headers_dir/lib/modules/$version/build"
-rm -f "$objtree/debian/hdrsrcfiles" "$objtree/debian/hdrobjfiles"
+(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
@@ -265,10 +259,11 @@ Description: Linux kernel headers 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/firmware/$version/"
-        rmdir "$tmpdir/lib/firmware"
+        mv "$tmpdir/lib/firmware" "$fwdir/lib/"
 
         cat <<EOF >> debian/control
 
@@ -292,11 +287,7 @@ Description: Linux support headers for userspace development
  are used by the installed headers for GNU glibc and other system libraries.
 EOF
 
-if [ "$ARCH" != "um" ]; then
-        create_package "$kernel_headers_packagename" "$kernel_headers_dir"
-        create_package "$libc_headers_packagename" "$libc_headers_dir"
-fi
-
+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 62d8234f878..8a7b15598ea 100644
--- a/scripts/package/buildtar
+++ b/scripts/package/buildtar
@@ -28,15 +28,15 @@ case "${1}" in
                 file_ext=""
                 ;;
         targz-pkg)
-                compress="gzip"
+                compress="gzip -c9"
                 file_ext=".gz"
                 ;;
         tarbz2-pkg)
-                compress="bzip2"
+                compress="bzip2 -c9"
                 file_ext=".bz2"
                 ;;
         tarxz-pkg)
-                compress="xz"
+                compress="xz -c9"
                 file_ext=".xz"
                 ;;
         *)
@@ -109,7 +109,7 @@ esac
         if tar --owner=root --group=root --help >/dev/null 2>&1; then
                 opts="--owner=root --group=root"
         fi
-        tar cf - boot/* lib/* $opts | ${compress} > "${tarball}${file_ext}"
+        tar cf - . $opts | ${compress} > "${tarball}${file_ext}"
 )
 
 echo "Tarball successfully created in ${tarball}${file_ext}"