Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 227673
b: refs/heads/master
c: cd8d60a
h: refs/heads/master
i:
  227671: ddf1e90
v: v3
  • Loading branch information
Theodore Ts'o authored and Michal Marek committed Dec 29, 2010
1 parent 12f0883 commit 133f5d1
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 55f88eccf9c288eed2f93f9ca7d7fe4dd2da762e
refs/heads/master: cd8d60a20a4516016c117ac0f1ac7b06ff606f7e
28 changes: 27 additions & 1 deletion trunk/scripts/package/builddeb
Original file line number Diff line number Diff line change
Expand Up @@ -76,15 +76,17 @@ else
fi
tmpdir="$objtree/debian/tmp"
fwdir="$objtree/debian/fwtmp"
hdrdir="$objtree/debian/hdrtmp"
packagename=linux-image-$version
fwpackagename=linux-firmware-image
hdrpackagename=linux-headers-$version

if [ "$ARCH" = "um" ] ; then
packagename=user-mode-linux-$version
fi

# Setup the directory structure
rm -rf "$tmpdir" "$fwdir"
rm -rf "$tmpdir" "$fwdir" "$hdrdir"
mkdir -m 755 -p "$tmpdir/DEBIAN"
mkdir -p "$tmpdir/lib" "$tmpdir/boot" "$tmpdir/usr/share/doc/$packagename"
mkdir -m 755 -p "$fwdir/DEBIAN"
Expand Down Expand Up @@ -226,6 +228,30 @@ EOF

fi

# Build header package
find . -name Makefile -o -name Kconfig\* -o -name \*.pl > /tmp/files$$
find arch/x86/include include scripts -type f >> /tmp/files$$
(cd $objtree; find .config Module.symvers include scripts -type f >> /tmp/objfiles$$)
destdir=$hdrdir/usr/src/linux-headers-$version
mkdir -p "$destdir" "$hdrdir/DEBIAN" "$hdrdir/usr/share/doc/$hdrpackagename"
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: $hdrpackagename
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 "$hdrpackagename" "$hdrdir"

# 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/"
Expand Down

0 comments on commit 133f5d1

Please sign in to comment.