From e09945979927fb54f4f965651187e1afd508deaa Mon Sep 17 00:00:00 2001
From: hejiawencc <hjw0415@outlook.com>
Date: Tue, 5 Jul 2022 14:58:29 +0800
Subject: [PATCH] =?UTF-8?q?deb=20=E4=BF=AE=E6=94=B9=E5=86=85=E6=A0=B8deb?=
 =?UTF-8?q?=E6=89=93=E5=8C=85=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 arch/arm64/Makefile      |  6 +++---
 scripts/package/builddeb | 24 +++++++++++++++++++++++-
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile
index 5b3908880485..b046cf5da260 100644
--- a/arch/arm64/Makefile
+++ b/arch/arm64/Makefile
@@ -126,10 +126,10 @@ core-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a
 
 # Default target when executing plain make
 boot		:= arch/arm64/boot
-KBUILD_IMAGE	:= $(boot)/Image.gz
+KBUILD_IMAGE	:= $(boot)/Image
 KBUILD_DTBS	:= dtbs
 
-all:	Image.gz $(KBUILD_DTBS)
+all:	Image $(KBUILD_DTBS)
 
 
 Image: vmlinux
@@ -150,7 +150,7 @@ dtbs: prepare scripts
 	$(Q)$(MAKE) $(build)=$(boot)/dts
 
 dtbs_install:
-	$(Q)$(MAKE) $(dtbinst)=$(boot)/dts
+	$(Q)$(MAKE) $(dtbinst)=$(boot)/dts/rockchip
 
 PHONY += vdso_install
 vdso_install:
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 0b31f4f1f92c..b0678030cd94 100755
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -55,6 +55,9 @@ case $ARCH in
 um)
 	installed_image_path="usr/bin/linux-$version"
 	;;
+arm*)
+	installed_image_path="boot/Image-$version"
+	;;
 parisc|mips|powerpc)
 	installed_image_path="boot/vmlinux-$version"
 	;;
@@ -90,6 +93,20 @@ if grep -q "^CONFIG_OF=y" $KCONFIG_CONFIG ; then
 	fi
 fi
 
+if grep -q "^CONFIG_ARCH_ROCKCHIP=y" $KCONFIG_CONFIG ; then
+	mkdir -p "$tmpdir/boot/extlinux"
+	echo "label ${RK_KERNEL_DTS} linux-$version" > $tmpdir/boot/extlinux/extlinux.conf
+	echo -e "\tkernel /Image-$version" >> $tmpdir/boot/extlinux/extlinux.conf
+	if [ -f "$tmpdir/usr/lib/$packagename/${RK_KERNEL_DTS}.dtb" ]; then
+		cp "$tmpdir/usr/lib/$packagename/${RK_KERNEL_DTS}.dtb" "$tmpdir/boot/"
+		echo -e "\tfdt /${RK_KERNEL_DTS}.dtb" >> $tmpdir/boot/extlinux/extlinux.conf
+	fi
+	if [ -e "ramdisk.img" ]; then
+		cp "ramdisk.img" "$tmpdir/boot/initrd-$version"
+		echo -e "\tinitrd /initrd-$version" >> $tmpdir/boot/extlinux/extlinux.conf
+	fi
+fi
+
 if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then
 	INSTALL_MOD_PATH="$tmpdir" $MAKE KBUILD_SRC= modules_install
 	rm -f "$tmpdir/lib/modules/$version/build"
@@ -134,6 +151,11 @@ if grep -q '^CONFIG_BLK_DEV_INITRD=y' $KCONFIG_CONFIG; then
 else
 	want_initrd=No
 fi
+
+if grep -q "^CONFIG_ARCH_ROCKCHIP=y" $KCONFIG_CONFIG ; then
+	want_initrd=No
+fi
+
 for script in postinst postrm preinst prerm ; do
 	mkdir -p "$tmpdir$debhookdir/$script.d"
 	cat <<EOF > "$tmpdir/DEBIAN/$script"
@@ -155,7 +177,7 @@ done
 
 # Build kernel header package
 (cd $srctree; find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl) > "$objtree/debian/hdrsrcfiles"
-(cd $srctree; find arch/*/include include scripts -type f -o -type l) >> "$objtree/debian/hdrsrcfiles"
+(cd $srctree; find arch/arm{,64}/include include scripts -type f -o -type l) >> "$objtree/debian/hdrsrcfiles"
 (cd $srctree; find arch/$SRCARCH -name module.lds -o -name Kbuild.platforms -o -name Platform) >> "$objtree/debian/hdrsrcfiles"
 (cd $srctree; find $(find arch/$SRCARCH -name include -o -name scripts -type d) -type f) >> "$objtree/debian/hdrsrcfiles"
 if grep -q '^CONFIG_STACK_VALIDATION=y' $KCONFIG_CONFIG ; then