From d9d95f0f0b674cd781ee69431fc32f260767dadc Mon Sep 17 00:00:00 2001 From: hejiawencc Date: Tue, 12 Jul 2022 17:14:54 +0800 Subject: [PATCH] =?UTF-8?q?scripts=20=20=E6=9B=B4=E6=96=B0kernel=20deb?= =?UTF-8?q?=E6=89=93=E5=8C=85=E8=84=9A=E6=9C=AC=EF=BC=8C=E9=80=82=E9=85=8D?= =?UTF-8?q?exboot=E6=8C=82=E8=BD=BD=E5=88=B0/boot=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/package/builddeb | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/scripts/package/builddeb b/scripts/package/builddeb index b0678030cd94..a08a9325a4d4 100755 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -89,21 +89,14 @@ cp "$($MAKE -s -f $srctree/Makefile image_name)" "$tmpdir/$installed_image_path" if grep -q "^CONFIG_OF=y" $KCONFIG_CONFIG ; then # Only some architectures with OF support have this target if grep -q dtbs_install "${srctree}/arch/$SRCARCH/Makefile"; then - $MAKE KBUILD_SRC= INSTALL_DTBS_PATH="$tmpdir/usr/lib/$packagename" dtbs_install + $MAKE KBUILD_SRC= INSTALL_DTBS_PATH="$tmpdir/boot/usr/lib/$packagename" dtbs_install 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 + cp $objtree/arch/arm64/boot/dts/rockchip/uEnv/uEnv*.txt "$tmpdir/boot" + if [ -f "$tmpdir/boot/usr/lib/$packagename/${RK_KERNEL_DTS}.dtb" ]; then + cp "$tmpdir/boot/usr/lib/$packagename/${RK_KERNEL_DTS}.dtb" "$tmpdir/boot/rk-kernel.dtb" fi fi