OdroidXU4-next: update postinstall script

This commit is contained in:
Terence Haddock 2016-04-08 16:31:08 +02:00
parent be5815e7a1
commit 43b1cf4087

View file

@ -1,10 +1,10 @@
diff --git a/scripts/package/builddeb b/scripts/package/builddeb diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 6c3b038..cc9b3c0 100755 index 88dbf23..8fb7611 100755
--- a/scripts/package/builddeb --- a/scripts/package/builddeb
+++ b/scripts/package/builddeb +++ b/scripts/package/builddeb
@@ -27,6 +27,28 @@ create_package() { @@ -63,6 +63,28 @@ create_package() {
chown -R root:root "$pdir" forcearch="-DArchitecture=$debarch"
chmod -R go-w "$pdir" fi
+ # Create preinstall and post install script to remove dtb + # Create preinstall and post install script to remove dtb
+ if [[ "$1" == *dtb* ]]; then + if [[ "$1" == *dtb* ]]; then
@ -29,9 +29,9 @@ index 6c3b038..cc9b3c0 100755
+ fi + fi
+ +
# Create the package # Create the package
dpkg-gencontrol $forcearch -Vkernel:debarch="${debarch}" -p$pname -P"$pdir" dpkg-gencontrol $forcearch -Vkernel:debarch="${debarch:-$(dpkg --print-architecture)}" -p$pname -P"$pdir"
dpkg --build "$pdir" .. dpkg --build "$pdir" ..
@@ -93,11 +115,13 @@ tmpdir="$objtree/debian/tmp" @@ -80,11 +102,13 @@ tmpdir="$objtree/debian/tmp"
fwdir="$objtree/debian/fwtmp" fwdir="$objtree/debian/fwtmp"
kernel_headers_dir="$objtree/debian/hdrtmp" kernel_headers_dir="$objtree/debian/hdrtmp"
libc_headers_dir="$objtree/debian/headertmp" libc_headers_dir="$objtree/debian/headertmp"
@ -47,20 +47,20 @@ index 6c3b038..cc9b3c0 100755
+dtb_packagename=linux-dtb-next"$LOCALVERSION" +dtb_packagename=linux-dtb-next"$LOCALVERSION"
+libc_headers_packagename=linux-libc-dev-next"$LOCALVERSION" +libc_headers_packagename=linux-libc-dev-next"$LOCALVERSION"
dbg_packagename=$packagename-dbg dbg_packagename=$packagename-dbg
debarch=
forcearch= if [ "$ARCH" = "um" ] ; then
@@ -124,7 +148,9 @@ esac @@ -108,7 +132,9 @@ esac
BUILD_DEBUG="$(grep -s '^CONFIG_DEBUG_INFO=y' $KCONFIG_CONFIG || true)" BUILD_DEBUG="$(grep -s '^CONFIG_DEBUG_INFO=y' $KCONFIG_CONFIG || true)"
# Setup the directory structure # Setup the directory structure
-rm -rf "$tmpdir" "$fwdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir" $objtree/debian/files -rm -rf "$tmpdir" "$fwdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir"
+rm -rf "$tmpdir" "$fwdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir" "$dtb_dir" $objtree/debian/files +rm -rf "$tmpdir" "$fwdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbt_dir"
+mkdir -m 755 -p "$dtb_dir/DEBIAN" +mkdir -m 755 -p "$dtb_dir/DEBIAN"
+mkdir -p "$dtb_dir/boot/dtb-$version" "$dtb_dir/usr/share/doc/$dtb_packagename" +mkdir -p "$dtb_dir/boot/dtb-$version" "$dtb_dir/usr/share/doc/$dtb_packagename"
mkdir -m 755 -p "$tmpdir/DEBIAN" mkdir -m 755 -p "$tmpdir/DEBIAN"
mkdir -p "$tmpdir/lib" "$tmpdir/boot" mkdir -p "$tmpdir/lib" "$tmpdir/boot" "$tmpdir/usr/share/doc/$packagename"
mkdir -p "$fwdir/lib/firmware/$version/" mkdir -m 755 -p "$fwdir/DEBIAN"
@@ -183,6 +209,11 @@ if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then @@ -165,6 +191,11 @@ if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then
fi fi
fi fi
@ -72,7 +72,7 @@ index 6c3b038..cc9b3c0 100755
if [ "$ARCH" != "um" ]; then if [ "$ARCH" != "um" ]; then
$MAKE headers_check KBUILD_SRC= $MAKE headers_check KBUILD_SRC=
$MAKE headers_install KBUILD_SRC= INSTALL_HDR_PATH="$libc_headers_dir/usr" $MAKE headers_install KBUILD_SRC= INSTALL_HDR_PATH="$libc_headers_dir/usr"
@@ -195,7 +226,7 @@ fi @@ -177,7 +208,7 @@ fi
# so do we; recent versions of dracut and initramfs-tools will obey this. # so do we; recent versions of dracut and initramfs-tools will obey this.
debhookdir=${KDEB_HOOKDIR:-/etc/kernel} debhookdir=${KDEB_HOOKDIR:-/etc/kernel}
if grep -q '^CONFIG_BLK_DEV_INITRD=y' $KCONFIG_CONFIG; then if grep -q '^CONFIG_BLK_DEV_INITRD=y' $KCONFIG_CONFIG; then
@ -81,7 +81,7 @@ index 6c3b038..cc9b3c0 100755
else else
want_initrd=No want_initrd=No
fi fi
@@ -207,9 +238,11 @@ for script in postinst postrm preinst prerm ; do @@ -189,9 +220,11 @@ for script in postinst postrm preinst prerm ; do
set -e set -e
# Pass maintainer script parameters to hook scripts # Pass maintainer script parameters to hook scripts
@ -93,7 +93,7 @@ index 6c3b038..cc9b3c0 100755
export INITRD=$want_initrd export INITRD=$want_initrd
test -d $debhookdir/$script.d && run-parts --arg="$version" --arg="/$installed_image_path" $debhookdir/$script.d test -d $debhookdir/$script.d && run-parts --arg="$version" --arg="/$installed_image_path" $debhookdir/$script.d
@@ -218,6 +251,59 @@ EOF @@ -200,6 +233,59 @@ EOF
chmod 755 "$tmpdir/DEBIAN/$script" chmod 755 "$tmpdir/DEBIAN/$script"
done done
@ -153,7 +153,7 @@ index 6c3b038..cc9b3c0 100755
# Try to determine maintainer and email values # Try to determine maintainer and email values
if [ -n "$DEBEMAIL" ]; then if [ -n "$DEBEMAIL" ]; then
email=$DEBEMAIL email=$DEBEMAIL
@@ -328,16 +414,24 @@ fi @@ -306,16 +392,24 @@ fi
(cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f) >> "$objtree/debian/hdrobjfiles" (cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f) >> "$objtree/debian/hdrobjfiles"
destdir=$kernel_headers_dir/usr/src/linux-headers-$version destdir=$kernel_headers_dir/usr/src/linux-headers-$version
mkdir -p "$destdir" mkdir -p "$destdir"
@ -179,7 +179,7 @@ index 6c3b038..cc9b3c0 100755
Architecture: any Architecture: any
Description: Linux kernel headers for $KERNELRELEASE on \${kernel:debarch} Description: Linux kernel headers for $KERNELRELEASE on \${kernel:debarch}
This package provides kernel header files for $KERNELRELEASE on \${kernel:debarch} This package provides kernel header files for $KERNELRELEASE on \${kernel:debarch}
@@ -363,6 +457,16 @@ fi @@ -341,6 +435,16 @@ fi
cat <<EOF >> debian/control cat <<EOF >> debian/control
@ -196,7 +196,7 @@ index 6c3b038..cc9b3c0 100755
Package: $libc_headers_packagename Package: $libc_headers_packagename
Section: devel Section: devel
Provides: linux-kernel-headers Provides: linux-kernel-headers
@@ -374,7 +478,7 @@ EOF @@ -352,7 +456,7 @@ EOF
if [ "$ARCH" != "um" ]; then if [ "$ARCH" != "um" ]; then
create_package "$kernel_headers_packagename" "$kernel_headers_dir" create_package "$kernel_headers_packagename" "$kernel_headers_dir"