diff --git a/patch/kernel/meson64-dev/packaging-4.x-DEV-with-postinstall-scripts.patch b/patch/kernel/meson64-dev/packaging-4.x-DEV-with-postinstall-scripts.patch index 42e2d77a5..179e31d76 100644 --- a/patch/kernel/meson64-dev/packaging-4.x-DEV-with-postinstall-scripts.patch +++ b/patch/kernel/meson64-dev/packaging-4.x-DEV-with-postinstall-scripts.patch @@ -1,5 +1,5 @@ diff --git a/scripts/package/builddeb b/scripts/package/builddeb -index 807c9cd..9b9435f 100755 +index 1845c5d..9dab810 100755 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -29,6 +29,28 @@ create_package() { @@ -31,14 +31,13 @@ index 807c9cd..9b9435f 100755 # Create the package dpkg-gencontrol $forcearch -Vkernel:debarch="${debarch}" -p$pname -P"$pdir" dpkg --build "$pdir" .. -@@ -95,11 +117,13 @@ tmpdir="$objtree/debian/tmp" - fwdir="$objtree/debian/fwtmp" +@@ -94,10 +116,13 @@ sourcename=$KDEB_SOURCENAME + tmpdir="$objtree/debian/tmp" 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" @@ -49,18 +48,18 @@ index 807c9cd..9b9435f 100755 dbg_packagename=$packagename-dbg debarch= forcearch= -@@ -126,7 +150,9 @@ esac +@@ -124,7 +149,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" "$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 "$fwdir/lib/firmware/$version/" -@@ -180,6 +206,11 @@ if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then + mkdir -p "$kernel_headers_dir/lib/modules/$version/" +@@ -177,6 +204,11 @@ if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then fi fi @@ -72,7 +71,7 @@ index 807c9cd..9b9435f 100755 if [ "$ARCH" != "um" ]; then $MAKE headers_check KBUILD_SRC= $MAKE headers_install KBUILD_SRC= INSTALL_HDR_PATH="$libc_headers_dir/usr" -@@ -192,7 +223,7 @@ fi +@@ -189,7 +221,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 +80,7 @@ index 807c9cd..9b9435f 100755 else want_initrd=No fi -@@ -204,9 +235,11 @@ for script in postinst postrm preinst prerm ; do +@@ -201,9 +233,11 @@ for script in postinst postrm preinst prerm ; do set -e # Pass maintainer script parameters to hook scripts @@ -93,7 +92,7 @@ index 807c9cd..9b9435f 100755 export INITRD=$want_initrd test -d $debhookdir/$script.d && run-parts --arg="$version" --arg="/$installed_image_path" $debhookdir/$script.d -@@ -215,6 +248,55 @@ EOF +@@ -212,6 +246,55 @@ EOF chmod 755 "$tmpdir/DEBIAN/$script" done @@ -149,7 +148,7 @@ index 807c9cd..9b9435f 100755 # Try to determine maintainer and email values if [ -n "$DEBEMAIL" ]; then email=$DEBEMAIL -@@ -329,12 +411,20 @@ if grep -q '^CONFIG_GCC_PLUGINS=y' $KCONFIG_CONFIG ; then +@@ -325,12 +408,20 @@ if grep -q '^CONFIG_GCC_PLUGINS=y' $KCONFIG_CONFIG ; then fi destdir=$kernel_headers_dir/usr/src/linux-headers-$version mkdir -p "$destdir" @@ -170,7 +169,7 @@ index 807c9cd..9b9435f 100755 cat <> debian/control Package: $kernel_headers_packagename -@@ -363,6 +453,16 @@ fi +@@ -343,6 +434,16 @@ EOF cat <> debian/control @@ -187,7 +186,7 @@ index 807c9cd..9b9435f 100755 Package: $libc_headers_packagename Section: devel Provides: linux-kernel-headers -@@ -374,7 +474,7 @@ EOF +@@ -354,7 +455,7 @@ EOF if [ "$ARCH" != "um" ]; then create_package "$kernel_headers_packagename" "$kernel_headers_dir"