diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-10-30 16:16:56 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-10-30 16:16:56 -0400 |
| commit | f1e095f1d206b81b44160f41278ce5c78641e9b7 (patch) | |
| tree | bd293d46d2d3e4cdf435a22ddb2877c6ba1b8acc /scripts/package/builddeb | |
| parent | b0438a1b71955c425c304a2a483765ef24841766 (diff) | |
| parent | 1792f17b7210280a3d7ff29da9614ba779cfcedb (diff) | |
Merge branch 'master' into for-next
Diffstat (limited to 'scripts/package/builddeb')
| -rw-r--r-- | scripts/package/builddeb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/package/builddeb b/scripts/package/builddeb index 5f1e2fc7f171..49b74e1ee12d 100644 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb | |||
| @@ -66,7 +66,9 @@ else | |||
| 66 | cp System.map "$tmpdir/boot/System.map-$version" | 66 | cp System.map "$tmpdir/boot/System.map-$version" |
| 67 | cp .config "$tmpdir/boot/config-$version" | 67 | cp .config "$tmpdir/boot/config-$version" |
| 68 | # Not all arches include the boot path in KBUILD_IMAGE | 68 | # Not all arches include the boot path in KBUILD_IMAGE |
| 69 | if ! cp $KBUILD_IMAGE "$tmpdir/boot/vmlinuz-$version"; then | 69 | if [ -e $KBUILD_IMAGE ]; then |
| 70 | cp $KBUILD_IMAGE "$tmpdir/boot/vmlinuz-$version" | ||
| 71 | else | ||
| 70 | cp arch/$ARCH/boot/$KBUILD_IMAGE "$tmpdir/boot/vmlinuz-$version" | 72 | cp arch/$ARCH/boot/$KBUILD_IMAGE "$tmpdir/boot/vmlinuz-$version" |
| 71 | fi | 73 | fi |
| 72 | fi | 74 | fi |