diff --git a/patch/kernel/odroidxu4-next/packaging-4.x-NEXT-with-postinstall-scripts.patch b/patch/kernel/odroidxu4-next/packaging-4.x-NEXT-with-postinstall-scripts.patch
index 79e79de9d..76a71a224 100644
--- a/patch/kernel/odroidxu4-next/packaging-4.x-NEXT-with-postinstall-scripts.patch
+++ b/patch/kernel/odroidxu4-next/packaging-4.x-NEXT-with-postinstall-scripts.patch
@@ -1,10 +1,10 @@
 diff --git a/scripts/package/builddeb b/scripts/package/builddeb
-index 6c3b038..cc9b3c0 100755
+index 88dbf23..8fb7611 100755
 --- a/scripts/package/builddeb
 +++ b/scripts/package/builddeb
-@@ -27,6 +27,28 @@ create_package() {
- 	chown -R root:root "$pdir"
- 	chmod -R go-w "$pdir"
+@@ -63,6 +63,28 @@ create_package() {
+ 		forcearch="-DArchitecture=$debarch"
+ 	fi
  
 +	# Create preinstall and post install script to remove dtb
 +	if [[ "$1" == *dtb* ]]; then
@@ -29,9 +29,9 @@ index 6c3b038..cc9b3c0 100755
 +	fi
 +	
  	# 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" ..
-@@ -93,11 +115,13 @@ tmpdir="$objtree/debian/tmp"
+@@ -80,11 +102,13 @@ tmpdir="$objtree/debian/tmp"
  fwdir="$objtree/debian/fwtmp"
  kernel_headers_dir="$objtree/debian/hdrtmp"
  libc_headers_dir="$objtree/debian/headertmp"
@@ -47,20 +47,20 @@ index 6c3b038..cc9b3c0 100755
 +dtb_packagename=linux-dtb-next"$LOCALVERSION"
 +libc_headers_packagename=linux-libc-dev-next"$LOCALVERSION"
  dbg_packagename=$packagename-dbg
- debarch=
- forcearch=
-@@ -124,7 +148,9 @@ esac
+ 
+ if [ "$ARCH" = "um" ] ; then
+@@ -108,7 +132,9 @@ esac
  BUILD_DEBUG="$(grep -s '^CONFIG_DEBUG_INFO=y' $KCONFIG_CONFIG || true)"
  
  # 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" "$dtb_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" "$dbt_dir"
 +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 "$fwdir/lib/firmware/$version/"
-@@ -183,6 +209,11 @@ if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then
+ mkdir -p  "$tmpdir/lib" "$tmpdir/boot" "$tmpdir/usr/share/doc/$packagename"
+ mkdir -m 755 -p "$fwdir/DEBIAN"
+@@ -165,6 +191,11 @@ if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then
  	fi
  fi
  
@@ -72,7 +72,7 @@ index 6c3b038..cc9b3c0 100755
  if [ "$ARCH" != "um" ]; then
  	$MAKE headers_check KBUILD_SRC=
  	$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.
  debhookdir=${KDEB_HOOKDIR:-/etc/kernel}
  if grep -q '^CONFIG_BLK_DEV_INITRD=y' $KCONFIG_CONFIG; then
@@ -81,7 +81,7 @@ index 6c3b038..cc9b3c0 100755
  else
  	want_initrd=No
  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
  
  # Pass maintainer script parameters to hook scripts
@@ -93,7 +93,7 @@ index 6c3b038..cc9b3c0 100755
  export INITRD=$want_initrd
  
  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"
  done
  
@@ -153,7 +153,7 @@ index 6c3b038..cc9b3c0 100755
  # Try to determine maintainer and email values
  if [ -n "$DEBEMAIL" ]; then
         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"
  destdir=$kernel_headers_dir/usr/src/linux-headers-$version
  mkdir -p "$destdir"
@@ -179,7 +179,7 @@ index 6c3b038..cc9b3c0 100755
  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
+@@ -341,6 +435,16 @@ fi
  
  cat <<EOF >> debian/control
  
@@ -196,7 +196,7 @@ index 6c3b038..cc9b3c0 100755
  Package: $libc_headers_packagename
  Section: devel
  Provides: linux-kernel-headers
-@@ -374,7 +478,7 @@ EOF
+@@ -352,7 +456,7 @@ EOF
  
  if [ "$ARCH" != "um" ]; then
  	create_package "$kernel_headers_packagename" "$kernel_headers_dir"