From 0cdc3b81307fe01970844fa4b570b1faf2fadec1 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor.pecovnik@gmail.com>
Date: Sat, 27 Jan 2018 09:42:03 +0100
Subject: [PATCH] Replacing wrong packaging patch

---
 ...ing-4.x-DEV-with-postinstall-scripts.patch | 87 ++++++++++---------
 1 file changed, 44 insertions(+), 43 deletions(-)

diff --git a/patch/kernel/odroidxu4-dev/packaging-4.x-DEV-with-postinstall-scripts.patch b/patch/kernel/odroidxu4-dev/packaging-4.x-DEV-with-postinstall-scripts.patch
index a65353d1b4..959270f1a9 100644
--- a/patch/kernel/odroidxu4-dev/packaging-4.x-DEV-with-postinstall-scripts.patch
+++ b/patch/kernel/odroidxu4-dev/packaging-4.x-DEV-with-postinstall-scripts.patch
@@ -1,11 +1,11 @@
 diff --git a/scripts/package/builddeb b/scripts/package/builddeb
-index 0bc8747..9dab810 100755
+index 6c3b038..cc9b3c0 100755
 --- a/scripts/package/builddeb
 +++ b/scripts/package/builddeb
-@@ -29,6 +29,28 @@ create_package() {
- 	# in case we are in a restrictive umask environment like 0077
- 	chmod -R a+rX "$pdir"
- 
+@@ -27,6 +27,28 @@ create_package() {
+ 	chown -R root:root "$pdir"
+ 	chmod -R go-w "$pdir"
+
 +	# Create preinstall and post install script to remove dtb
 +	if [[ "$1" == *dtb* ]]; then
 +		echo "if [ -d /boot/dtb-$version ]; then mv /boot/dtb-$version /boot/dtb-$version.old; fi" >> $pdir/DEBIAN/preinst
@@ -20,24 +20,25 @@ index 0bc8747..9dab810 100755
 +		echo "exit 0" >> $pdir/DEBIAN/postinst
 +		chmod 775 $pdir/DEBIAN/postinst
 +	fi
-+	
++
 +	# Create postinstall script for headers
 +	if [[ "$1" == *headers* ]]; then
 +		echo "cd /usr/src/linux-headers-$version; echo \"Compiling headers - please wait ...\"; make -s scripts >/dev/null 2>&1" >> $pdir/DEBIAN/postinst
 +		echo "exit 0" >> $pdir/DEBIAN/postinst
 +		chmod 775 $pdir/DEBIAN/postinst
 +	fi
-+	
++
  	# Create the package
  	dpkg-gencontrol $forcearch -Vkernel:debarch="${debarch}" -p$pname -P"$pdir"
  	dpkg --build "$pdir" ..
-@@ -94,10 +116,13 @@ sourcename=$KDEB_SOURCENAME
- tmpdir="$objtree/debian/tmp"
+@@ -93,11 +115,13 @@ tmpdir="$objtree/debian/tmp"
+ fwdir="$objtree/debian/fwtmp"
  kernel_headers_dir="$objtree/debian/hdrtmp"
  libc_headers_dir="$objtree/debian/headertmp"
 +dtb_dir="$objtree/debian/dtbtmp"
  dbg_dir="$objtree/debian/dbgtmp"
 -packagename=linux-image-$version
+-fwpackagename=linux-firmware-image-$version
 -kernel_headers_packagename=linux-headers-$version
 -libc_headers_packagename=linux-libc-dev
 +packagename=linux-image-dev"$LOCALVERSION"
@@ -48,21 +49,21 @@ index 0bc8747..9dab810 100755
  dbg_packagename=$packagename-dbg
  debarch=
  forcearch=
-@@ -124,7 +149,9 @@ esac
+@@ -124,7 +148,9 @@ esac
  BUILD_DEBUG="$(grep -s '^CONFIG_DEBUG_INFO=y' $KCONFIG_CONFIG || true)"
- 
+
  # Setup the directory structure
--rm -rf "$tmpdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir" $objtree/debian/files
+-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" "$dtb_dir" $objtree/debian/files
 +mkdir -m 755 -p "$dtb_dir/DEBIAN"
 +mkdir -p "$dtb_dir/boot/dtb-$version" "$dtb_dir/usr/share/doc/$dtb_packagename"
  mkdir -m 755 -p "$tmpdir/DEBIAN"
  mkdir -p "$tmpdir/lib" "$tmpdir/boot"
- mkdir -p "$kernel_headers_dir/lib/modules/$version/"
-@@ -177,6 +204,11 @@ if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then
+ mkdir -p "$fwdir/lib/firmware/$version/"
+@@ -183,6 +209,11 @@ if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then
  	fi
  fi
- 
+
 +if grep -q '^CONFIG_OF=y' $KCONFIG_CONFIG ; then
 +	#mkdir -p "$tmpdir/boot/dtb"
 +	INSTALL_DTBS_PATH="$dtb_dir/boot/dtb-$version" $MAKE KBUILD_SRC= dtbs_install
@@ -71,42 +72,37 @@ index 0bc8747..9dab810 100755
  if [ "$ARCH" != "um" ]; then
  	$MAKE headers_check KBUILD_SRC=
  	$MAKE headers_install KBUILD_SRC= INSTALL_HDR_PATH="$libc_headers_dir/usr"
-@@ -189,21 +221,23 @@ fi
+@@ -195,7 +226,7 @@ fi
  # so do we; recent versions of dracut and initramfs-tools will obey this.
  debhookdir=${KDEB_HOOKDIR:-/etc/kernel}
  if grep -q '^CONFIG_BLK_DEV_INITRD=y' $KCONFIG_CONFIG; then
 -	want_initrd=Yes
-+	want_initrd=Yes 
++	want_initrd=Yes
  else
  	want_initrd=No
  fi
- for script in postinst postrm preinst prerm ; do
- 	mkdir -p "$tmpdir$debhookdir/$script.d"
- 	cat <<EOF > "$tmpdir/DEBIAN/$script"
--#!/bin/sh
-+#!/bin/bash
- 
+@@ -207,9 +238,11 @@ for script in postinst postrm preinst prerm ; do
  set -e
- 
+
  # Pass maintainer script parameters to hook scripts
 +
  export DEB_MAINT_PARAMS="\$*"
- 
+
  # Tell initramfs builder whether it's wanted
 +
  export INITRD=$want_initrd
- 
+
  test -d $debhookdir/$script.d && run-parts --arg="$version" --arg="/$installed_image_path" $debhookdir/$script.d
-@@ -212,6 +246,55 @@ EOF
+@@ -218,6 +251,55 @@ EOF
  	chmod 755 "$tmpdir/DEBIAN/$script"
  done
- 
+
 +##
 +## Create sym link to kernel image
 +##
 +sed -e "s/set -e//g" -i $tmpdir/DEBIAN/postinst
 +sed -e "s/exit 0//g" -i $tmpdir/DEBIAN/postinst
-+cat >> $tmpdir/DEBIAN/postinst <<EOT 
++cat >> $tmpdir/DEBIAN/postinst <<EOT
 +if [ "\$(grep nand /proc/partitions)" != "" ] && [ "\$(grep mmc /proc/partitions)" = "" ]; then
 +mkimage -A arm -O linux -T kernel -C none -a "0x40008000" -e "0x40008000" -n "Linux kernel" -d /$installed_image_path /boot/uImage  > /dev/null 2>&1
 +cp /boot/uImage /tmp/uImage
@@ -125,7 +121,7 @@ index 0bc8747..9dab810 100755
 +##
 +sed -e "s/set -e//g" -i $tmpdir/DEBIAN/preinst
 +sed -e "s/exit 0//g" -i $tmpdir/DEBIAN/preinst
-+cat >> $tmpdir/DEBIAN/preinst <<EOT 
++cat >> $tmpdir/DEBIAN/preinst <<EOT
 +# exit if we are running chroot
 +if [ "\$(stat -c %d:%i /)" != "\$(stat -c %d:%i /proc/1/root/.)" ]; then exit 0; fi
 +
@@ -141,20 +137,20 @@ index 0bc8747..9dab810 100755
 +done
 +
 +bootfstype=\$(blkid -s TYPE -o value \$boot_partition)
-+if [ "\$bootfstype" = "vfat" ]; then 
-+umount /boot; 
++if [ "\$bootfstype" = "vfat" ]; then
++umount /boot;
 +rm -f /boot/System.map* /boot/config* /boot/vmlinuz* /boot/zImage /boot/uImage
 +fi
 +}
 +mountpoint -q /boot && check_and_unmount
 +EOT
-+echo "exit 0" >> $tmpdir/DEBIAN/preinst 
++echo "exit 0" >> $tmpdir/DEBIAN/preinst
 +
  # Try to determine maintainer and email values
  if [ -n "$DEBEMAIL" ]; then
         email=$DEBEMAIL
-@@ -325,12 +408,20 @@ if grep -q '^CONFIG_GCC_PLUGINS=y' $KCONFIG_CONFIG ; then
- fi
+@@ -328,16 +414,24 @@ fi
+ (cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f) >> "$objtree/debian/hdrobjfiles"
  destdir=$kernel_headers_dir/usr/src/linux-headers-$version
  mkdir -p "$destdir"
 +######################## headers patch
@@ -168,16 +164,21 @@ index 0bc8747..9dab810 100755
  (cd $objtree; cp $KCONFIG_CONFIG $destdir/.config) # copy .config manually to be where it's expected to be
  ln -sf "/usr/src/linux-headers-$version" "$kernel_headers_dir/lib/modules/$version/build"
  rm -f "$objtree/debian/hdrsrcfiles" "$objtree/debian/hdrobjfiles"
- 
+
 +(cd "$destdir"; make M=scripts clean)
 +
  cat <<EOF >> debian/control
- 
+
  Package: $kernel_headers_packagename
-@@ -343,6 +434,16 @@ EOF
- 
+-Provides: linux-headers, linux-headers-2.6
++Provides: linux-headers
+ Architecture: any
+ Description: Linux kernel headers for $KERNELRELEASE on \${kernel:debarch}
+  This package provides kernel header files for $KERNELRELEASE on \${kernel:debarch}
+@@ -363,6 +457,16 @@ fi
+
  cat <<EOF >> debian/control
- 
+
 +Package: $dtb_packagename
 +Architecture: any
 +Description: Linux DTB, version $version
@@ -191,12 +192,12 @@ index 0bc8747..9dab810 100755
  Package: $libc_headers_packagename
  Section: devel
  Provides: linux-kernel-headers
-@@ -354,7 +455,7 @@ EOF
- 
+@@ -374,7 +478,7 @@ EOF
+
  if [ "$ARCH" != "um" ]; then
  	create_package "$kernel_headers_packagename" "$kernel_headers_dir"
 -	create_package "$libc_headers_packagename" "$libc_headers_dir"
 +#	create_package "$libc_headers_packagename" "$libc_headers_dir"
  fi
- 
+
  create_package "$packagename" "$tmpdir"