diff --git a/patch/kernel/rockchip-dev/packaging-4.x-DEV-with-postinstall-scripts.patch b/patch/kernel/rockchip-dev/packaging-4.x-DEV-with-postinstall-scripts.patch index 422e3279c..6706864e3 100644 --- a/patch/kernel/rockchip-dev/packaging-4.x-DEV-with-postinstall-scripts.patch +++ b/patch/kernel/rockchip-dev/packaging-4.x-DEV-with-postinstall-scripts.patch @@ -1,10 +1,10 @@ diff --git a/scripts/package/builddeb b/scripts/package/builddeb -index 6c3b038..cc9b3c0 100755 +index 807c9cd..9b9435f 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" +@@ -29,6 +29,28 @@ 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 @@ -31,7 +31,7 @@ index 6c3b038..cc9b3c0 100755 # Create the package dpkg-gencontrol $forcearch -Vkernel:debarch="${debarch}" -p$pname -P"$pdir" dpkg --build "$pdir" .. -@@ -93,11 +115,13 @@ tmpdir="$objtree/debian/tmp" +@@ -95,11 +117,13 @@ tmpdir="$objtree/debian/tmp" fwdir="$objtree/debian/fwtmp" kernel_headers_dir="$objtree/debian/hdrtmp" libc_headers_dir="$objtree/debian/headertmp" @@ -41,15 +41,15 @@ index 6c3b038..cc9b3c0 100755 -fwpackagename=linux-firmware-image-$version -kernel_headers_packagename=linux-headers-$version -libc_headers_packagename=linux-libc-dev -+packagename=linux-image-dev"$LOCALVERSION" -+fwpackagename=linux-firmware-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" ++fwpackagename=linux-firmware-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 debarch= forcearch= -@@ -124,7 +148,9 @@ esac +@@ -126,7 +150,9 @@ esac BUILD_DEBUG="$(grep -s '^CONFIG_DEBUG_INFO=y' $KCONFIG_CONFIG || true)" # Setup the directory structure @@ -60,7 +60,7 @@ index 6c3b038..cc9b3c0 100755 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 +@@ -180,6 +206,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 +@@ -192,7 +223,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 +@@ -204,9 +235,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,55 @@ EOF +@@ -215,6 +248,55 @@ EOF chmod 755 "$tmpdir/DEBIAN/$script" done @@ -149,8 +149,8 @@ index 6c3b038..cc9b3c0 100755 # Try to determine maintainer and email values if [ -n "$DEBEMAIL" ]; then email=$DEBEMAIL -@@ -328,16 +414,24 @@ fi - (cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f) >> "$objtree/debian/hdrobjfiles" +@@ -329,12 +411,20 @@ if grep -q '^CONFIG_GCC_PLUGINS=y' $KCONFIG_CONFIG ; then + fi destdir=$kernel_headers_dir/usr/src/linux-headers-$version mkdir -p "$destdir" +######################## headers patch @@ -170,12 +170,7 @@ index 6c3b038..cc9b3c0 100755 cat <> debian/control Package: $kernel_headers_packagename --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 +@@ -363,6 +453,16 @@ fi cat <> debian/control @@ -192,7 +187,7 @@ index 6c3b038..cc9b3c0 100755 Package: $libc_headers_packagename Section: devel Provides: linux-kernel-headers -@@ -374,7 +478,7 @@ EOF +@@ -374,7 +474,7 @@ EOF if [ "$ARCH" != "um" ]; then create_package "$kernel_headers_packagename" "$kernel_headers_dir"