[ meson64 ] Bugfix for packaging patch, adding proper AUFS patch

patch/kernel/meson64-next/general-packaging-4.17-next.patch

@@ -5,7 +5,7 @@ index 90c9a8a..3c79b90 100755
 @@ -29,6 +29,27 @@ create_package() {
  	# in case we are in a restrictive umask environment like 0077
  	chmod -R a+rX "$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
@@ -38,12 +38,12 @@ index 90c9a8a..3c79b90 100755
 -kernel_headers_packagename=linux-headers-$version
 -libc_headers_packagename=linux-libc-dev
 +dtb_dir="$objtree/debian/dtbtmp"
-+packagename=linux-image-dev"$LOCALVERSION"
-+kernel_headers_packagename=linux-headers-dev"$LOCALVERSION"
-+dtb_packagename=linux-dtb-dev"$LOCALVERSION"
-+libc_headers_packagename=linux-libc-dev-dev"$LOCALVERSION"
++packagename=linux-image-next"$LOCALVERSION"
++kernel_headers_packagename=linux-headers-next"$LOCALVERSION"
++dtb_packagename=linux-dtb-next"$LOCALVERSION"
++libc_headers_packagename=linux-libc-dev-next"$LOCALVERSION"
  dbg_packagename=$packagename-dbg
- 
+
  if [ "$ARCH" = "um" ] ; then
 @@ -52,6 +75,15 @@ fi
  # XXX: have each arch Makefile export a variable of the canonical image install
@@ -63,7 +63,7 @@ index 90c9a8a..3c79b90 100755
  	;;
 @@ -65,7 +97,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" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir" "$dtb_dir" $objtree/debian/files
@@ -75,7 +75,7 @@ index 90c9a8a..3c79b90 100755
 @@ -118,6 +152,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
@@ -90,13 +90,13 @@ index 90c9a8a..3c79b90 100755
  	cat <<EOF > "$tmpdir/DEBIAN/$script"
 -#!/bin/sh
 +#!/bin/bash
- 
+
  set -e
- 
+
 @@ -153,9 +192,60 @@ EOF
  	chmod 755 "$tmpdir/DEBIAN/$script"
  done
- 
+
 +##
 +## Create sym link to kernel image
 +##
@@ -164,7 +164,7 @@ index 90c9a8a..3c79b90 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)
 +
  if [ "$ARCH" != "um" ]; then
@@ -173,7 +173,7 @@ index 90c9a8a..3c79b90 100755
 +	# create_package "$libc_headers_packagename" "$libc_headers_dir"
 +	create_package "$dtb_packagename" "$dtb_dir"
  fi
- 
+
  create_package "$packagename" "$tmpdir"
 diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian
 index 6adb3a1..00e12eb 100755
@@ -185,14 +185,14 @@ index 6adb3a1..00e12eb 100755
  sourcename=$KDEB_SOURCENAME
 -packagename=linux-image-$version
 -kernel_headers_packagename=linux-headers-$version
-+packagename=linux-image-dev$LOCALVERSION
-+kernel_headers_packagename=linux-headers-dev$LOCALVERSION
-+dtb_packagename=linux-dtb-dev$LOCALVERSION
++packagename=linux-image-next$LOCALVERSION
++kernel_headers_packagename=linux-headers-next$LOCALVERSION
++dtb_packagename=linux-dtb-next$LOCALVERSION
  dbg_packagename=$packagename-dbg
  debarch=
 +image_name=
  set_debarch
- 
+
  if [ "$ARCH" = "um" ] ; then
 @@ -168,6 +170,11 @@ Architecture: $debarch
  Description: Linux kernel debugging symbols for $version
@@ -204,7 +204,7 @@ index 6adb3a1..00e12eb 100755
 +Description: Linux DTB, version $version
 + This package contains device blobs from the Linux kernel, version $version
  EOF
- 
+
  cat <<EOF > debian/rules
 diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile
 index f839ecd9..cd276162 100644
@@ -218,4 +218,4 @@ index f839ecd9..cd276162 100644
 +KBUILD_IMAGE	:= $(boot)/Image
  KBUILD_DTBS	:= dtbs
 
- all:	Image.gz $(KBUILD_DTBS) 
+ all:	Image.gz $(KBUILD_DTBS)