From 0708698c665860db03b9d3af8d7b6a184529d570 Mon Sep 17 00:00:00 2001 From: lean Date: Wed, 29 Sep 2021 17:19:46 +0800 Subject: [PATCH] rockchip: add default pacakge --- target/linux/rockchip/Makefile | 4 ++-- target/linux/rockchip/image/Makefile | 4 ++-- target/linux/rockchip/image/armv8.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/target/linux/rockchip/Makefile b/target/linux/rockchip/Makefile index a0ca9a048..0c6186be8 100644 --- a/target/linux/rockchip/Makefile +++ b/target/linux/rockchip/Makefile @@ -17,8 +17,8 @@ endef include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += uboot-envtools partx-utils e2fsprogs mkf2fs kmod-gpio-button-hotplug \ - automount autocore-arm fdisk e2fsprogs ethtool haveged htop lm-sensors \ - openssh-sftp-server luci-app-zerotier + automount autocore-arm autosamba fdisk cfdisk e2fsprogs ethtool haveged htop \ + luci-app-zerotier luci-app-ipsec-vpnd KERNELNAME:=Image dtbs diff --git a/target/linux/rockchip/image/Makefile b/target/linux/rockchip/image/Makefile index 79e628ca5..f05fe8595 100644 --- a/target/linux/rockchip/image/Makefile +++ b/target/linux/rockchip/image/Makefile @@ -34,7 +34,7 @@ define Build/pine64-img # http://opensource.rock-chips.com/wiki_Boot_option#Boot_flow # # U-Boot SPL expects the U-Boot ITB to be located at sector 0x4000 (8 MiB) on the MMC storage - $(SCRIPT_DIR)/gen_image_generic.sh \ + PADDING=1 $(SCRIPT_DIR)/gen_image_generic.sh \ $@ \ $(CONFIG_TARGET_KERNEL_PARTSIZE) $@.boot \ $(CONFIG_TARGET_ROOTFS_PARTSIZE) $(IMAGE_ROOTFS) \ @@ -53,7 +53,7 @@ define Build/pine64-bin # Generate a new partition table in $@ with 32 MiB of alignment # padding for the idbloader, uboot and trust image to fit: # http://opensource.rock-chips.com/wiki_Boot_option#Boot_flow - $(SCRIPT_DIR)/gen_image_generic.sh \ + PADDING=1 $(SCRIPT_DIR)/gen_image_generic.sh \ $@ \ $(CONFIG_TARGET_KERNEL_PARTSIZE) $@.boot \ $(CONFIG_TARGET_ROOTFS_PARTSIZE) $(IMAGE_ROOTFS) \ diff --git a/target/linux/rockchip/image/armv8.mk b/target/linux/rockchip/image/armv8.mk index 7f1331293..c71e61929 100644 --- a/target/linux/rockchip/image/armv8.mk +++ b/target/linux/rockchip/image/armv8.mk @@ -27,7 +27,7 @@ define Device/friendlyarm_nanopi-r4s DEVICE_MODEL := NanoPi R4S SOC := rk3399 UBOOT_DEVICE_NAME := nanopi-r4s-rk3399 - IMAGE/sysupgrade.img.gz := boot-common | boot-script nanopi-r4s | pine64-img | gzip | append-metadata + IMAGE/sysupgrade.img.gz := boot-common | boot-script nanopi-r4s | pine64-bin | gzip | append-metadata DEVICE_PACKAGES := kmod-r8169 -urngd endef TARGET_DEVICES += friendlyarm_nanopi-r4s