Fix Odroid C2 packaging script

This commit is contained in:
zador-blood-stained 2016-06-07 13:43:56 +03:00
parent add21994d0
commit 98fca07d89
3 changed files with 21 additions and 29 deletions

View File

@ -1,11 +0,0 @@
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -218,7 +218,7 @@
for script in postinst postrm preinst prerm ; do
mkdir -p "$tmpdir$debhookdir/$script.d"
cat <<EOF > "$tmpdir/DEBIAN/$script"
-#!/bin/sh
+#!/bin/bash
set -e

View File

@ -1,5 +1,5 @@
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 152d4d2..9b30ad2 100644
index 152d4d2..a2fa373 100644
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -35,13 +35,15 @@ create_package() {
@ -98,6 +98,15 @@ index 152d4d2..9b30ad2 100644
cp System.map "$tmpdir/boot/System.map-$version"
cp $KCONFIG_CONFIG "$tmpdir/boot/config-$version"
fi
@@ -138,7 +168,7 @@ fi
if [ -e $KBUILD_IMAGE ]; then
cp $KBUILD_IMAGE "$tmpdir/$installed_image_path"
else
- cp arch/$ARCH/boot/$KBUILD_IMAGE "$tmpdir/$installed_image_path"
+ cp arch/$ARCH/boot/Image "$tmpdir/$installed_image_path"
fi
if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then
@@ -150,21 +180,25 @@ if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then
rmdir "$tmpdir/lib/modules/$version"
fi
@ -136,7 +145,13 @@ index 152d4d2..9b30ad2 100644
if [ "$ARCH" != "um" ]; then
$MAKE headers_check KBUILD_SRC=
$MAKE headers_install KBUILD_SRC= INSTALL_HDR_PATH="$libc_headers_dir/usr"
@@ -189,9 +223,11 @@ for script in postinst postrm preinst prerm ; do
@@ -184,14 +218,16 @@ fi
for script in postinst postrm preinst prerm ; do
mkdir -p "$tmpdir$debhookdir/$script.d"
cat <<EOF > "$tmpdir/DEBIAN/$script"
-#!/bin/sh
+#!/bin/bash
set -e
# Pass maintainer script parameters to hook scripts
@ -231,7 +246,7 @@ index 152d4d2..9b30ad2 100644
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -287,22 +379,32 @@ EOF
@@ -287,22 +379,33 @@ EOF
fi
@ -242,6 +257,7 @@ index 152d4d2..9b30ad2 100644
+# Build kernel 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 $srctree; find security -type f -name \*.h) >> "$objtree/debian/hdrsrcfiles"
+(cd $srctree; find arch/$SRCARCH -name module.lds -o -name Kbuild.platforms -o -name Platform) >> "$objtree/debian/hdrsrcfiles"
+(cd $srctree; find $(find arch/$SRCARCH -name include -o -name scripts -type d) -type f) >> "$objtree/debian/hdrsrcfiles"
+(cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f) >> "$objtree/debian/hdrobjfiles"
@ -271,7 +287,7 @@ index 152d4d2..9b30ad2 100644
Architecture: any
Description: Linux kernel headers for $KERNELRELEASE on \${kernel:debarch}
This package provides kernel header files for $KERNELRELEASE on \${kernel:debarch}
@@ -328,6 +430,16 @@ fi
@@ -328,6 +431,16 @@ fi
cat <<EOF >> debian/control
@ -288,7 +304,7 @@ index 152d4d2..9b30ad2 100644
Package: $libc_headers_packagename
Section: devel
Provides: linux-kernel-headers
@@ -339,7 +451,7 @@ EOF
@@ -339,7 +452,7 @@ EOF
if [ "$ARCH" != "um" ]; then
create_package "$kernel_headers_packagename" "$kernel_headers_dir"

View File

@ -1,13 +0,0 @@
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 152d4d2..4455453 100644
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -138,7 +168,7 @@ fi
if [ -e $KBUILD_IMAGE ]; then
cp $KBUILD_IMAGE "$tmpdir/$installed_image_path"
else
- cp arch/$ARCH/boot/$KBUILD_IMAGE "$tmpdir/$installed_image_path"
+ cp arch/$ARCH/boot/Image "$tmpdir/$installed_image_path"
fi
if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then