Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 149501
b: refs/heads/master
c: 4f66199
h: refs/heads/master
i:
  149499: 5078e73
v: v3
  • Loading branch information
Frans Pop authored and Sam Ravnborg committed Jun 9, 2009
1 parent 179c4df commit f4a5a4c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 12 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: af6c159885537eb6582a61156ccfb73e83c0478d
refs/heads/master: 4f66199b4b372a530333d0f25aeb5d80362241ed
21 changes: 10 additions & 11 deletions trunk/scripts/package/builddeb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Copyright 2003 Wichert Akkerman <wichert@wiggy.net>
#
# Simple script to generate a deb package for a Linux kernel. All the
# complexity of what to do with a kernel after it is installer or removed
# complexity of what to do with a kernel after it is installed or removed
# is left to other scripts and packages: they can install scripts in the
# /etc/kernel/{pre,post}{inst,rm}.d/ directories that will be called on
# package install and removal.
Expand All @@ -13,26 +13,26 @@ set -e

# Some variables and settings used throughout the script
version=$KERNELRELEASE
revision=`cat .version`
revision=$(cat .version)
tmpdir="$objtree/debian/tmp"
fwdir="$objtree/debian/fwtmp"
packagename=linux-$version
fwpackagename=linux-firmware-image

if [ "$ARCH" == "um" ] ; then
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"
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"
fi

# Build and install the kernel
if [ "$ARCH" == "um" ] ; then
if [ "$ARCH" = "um" ] ; then
$MAKE linux
cp System.map "$tmpdir/usr/lib/uml/modules/$version/System.map"
cp .config "$tmpdir/usr/share/doc/$packagename/config"
Expand All @@ -46,7 +46,7 @@ fi

if grep -q '^CONFIG_MODULES=y' .config ; then
INSTALL_MOD_PATH="$tmpdir" make KBUILD_SRC= modules_install
if [ "$ARCH" == "um" ] ; then
if [ "$ARCH" = "um" ] ; then
mv "$tmpdir/lib/modules/$version"/* "$tmpdir/usr/lib/uml/modules/$version/"
rmdir "$tmpdir/lib/modules/$version"
fi
Expand Down Expand Up @@ -77,9 +77,8 @@ linux ($version-$revision) unstable; urgency=low
EOF

# Generate a control file
if [ "$ARCH" == "um" ]; then

cat <<EOF > debian/control
if [ "$ARCH" = "um" ]; then
cat <<EOF > debian/control
Source: linux
Section: base
Priority: optional
Expand All @@ -101,7 +100,7 @@ Description: User Mode Linux kernel, version $version
EOF

else
cat <<EOF > debian/control
cat <<EOF > debian/control
Source: linux
Section: base
Priority: optional
Expand All @@ -116,6 +115,7 @@ Description: Linux kernel, version $version
This package contains the Linux kernel, modules and corresponding other
files version $version
EOF

fi

# Fix some ownership and permissions
Expand Down Expand Up @@ -143,4 +143,3 @@ dpkg-gencontrol -isp -p$packagename
dpkg --build "$tmpdir" ..

exit 0

0 comments on commit f4a5a4c

Please sign in to comment.