Commit 6f1e9403 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'master' of git://

* 'master' of git://
  kbuild: Fixup deb-pkg target to generate separate firmware deb
parents 43e61711 bf1b3644
...@@ -15,15 +15,18 @@ set -e ...@@ -15,15 +15,18 @@ set -e
revision=`cat .version` revision=`cat .version`
tmpdir="$objtree/debian/tmp" tmpdir="$objtree/debian/tmp"
packagename=linux-$version packagename=linux-$version
if [ "$ARCH" == "um" ] ; then if [ "$ARCH" == "um" ] ; then
packagename=user-mode-linux-$version packagename=user-mode-linux-$version
fi fi
# Setup the directory structure # Setup the directory structure
rm -rf "$tmpdir" rm -rf "$tmpdir" "$fwdir"
mkdir -p "$tmpdir/DEBIAN" "$tmpdir/lib" "$tmpdir/boot" mkdir -p "$tmpdir/DEBIAN" "$tmpdir/lib" "$tmpdir/boot"
mkdir -p "$fwdir/DEBIAN" "$fwdir/lib"
if [ "$ARCH" == "um" ] ; then if [ "$ARCH" == "um" ] ; then
mkdir -p "$tmpdir/usr/lib/uml/modules/$version" "$tmpdir/usr/share/doc/$packagename" "$tmpdir/usr/bin" mkdir -p "$tmpdir/usr/lib/uml/modules/$version" "$tmpdir/usr/share/doc/$packagename" "$tmpdir/usr/bin"
fi fi
...@@ -107,6 +110,7 @@ Standards-Version: 3.6.1 ...@@ -107,6 +110,7 @@ Standards-Version: 3.6.1
Package: $packagename Package: $packagename
Provides: kernel-image-$version, linux-image-$version Provides: kernel-image-$version, linux-image-$version
Suggests: $fwpackagename
Architecture: any Architecture: any
Description: Linux kernel, version $version Description: Linux kernel, version $version
This package contains the Linux kernel, modules and corresponding other This package contains the Linux kernel, modules and corresponding other
...@@ -118,8 +122,24 @@ fi ...@@ -118,8 +122,24 @@ fi
chown -R root:root "$tmpdir" chown -R root:root "$tmpdir"
chmod -R go-w "$tmpdir" chmod -R go-w "$tmpdir"
# 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/"
cat <<EOF >> debian/control
Package: $fwpackagename
Architecture: all
Description: Linux kernel firmware, version $version
This package contains firmware from the Linux kernel, version $version
dpkg-gencontrol -isp -p$fwpackagename -P"$fwdir"
dpkg --build "$fwdir" ..
# Perform the final magic # Perform the final magic
dpkg-gencontrol -isp dpkg-gencontrol -isp -p$packagename
dpkg --build "$tmpdir" .. dpkg --build "$tmpdir" ..
exit 0 exit 0
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment