From bf4ada22d37c16fb018823c32c7e77dc4120ff86 Mon Sep 17 00:00:00 2001 From: John Doe Date: Sun, 1 May 2022 21:45:52 +0800 Subject: [PATCH] pull #1115 --- r1p-lts.config.seed | 1 + r1p.config.seed | 1 + r1s-h3.config.seed | 4 +++- r1s.config.seed | 2 ++ r2c.config.seed | 1 + r2s.config.seed | 1 + r4s.config.seed | 1 + scripts/autoupdate-bash.sh | 2 +- x86.config.seed | 7 ++++--- 9 files changed, 15 insertions(+), 5 deletions(-) diff --git a/r1p-lts.config.seed b/r1p-lts.config.seed index 7bb4bcd..21ce9d4 100644 --- a/r1p-lts.config.seed +++ b/r1p-lts.config.seed @@ -1,6 +1,7 @@ CONFIG_TARGET_rockchip=y CONFIG_TARGET_rockchip_armv8=y CONFIG_TARGET_rockchip_armv8_DEVICE_xunlong_orangepi-r1-plus-lts=y + CONFIG_TARGET_OPTIMIZATION="-O3 -pipe -march=armv8-a+crypto+crc -mcpu=cortex-a53+crypto+crc -mtune=cortex-a53" CONFIG_TARGET_ROOTFS_PARTSIZE=600 diff --git a/r1p.config.seed b/r1p.config.seed index 448c44e..ee96318 100644 --- a/r1p.config.seed +++ b/r1p.config.seed @@ -1,6 +1,7 @@ CONFIG_TARGET_rockchip=y CONFIG_TARGET_rockchip_armv8=y CONFIG_TARGET_rockchip_armv8_DEVICE_xunlong_orangepi-r1-plus=y + CONFIG_TARGET_OPTIMIZATION="-O3 -pipe -march=armv8-a+crypto+crc -mcpu=cortex-a53+crypto+crc -mtune=cortex-a53" CONFIG_TARGET_ROOTFS_PARTSIZE=600 diff --git a/r1s-h3.config.seed b/r1s-h3.config.seed index 57dd663..865129a 100644 --- a/r1s-h3.config.seed +++ b/r1s-h3.config.seed @@ -1,6 +1,8 @@ CONFIG_TARGET_sunxi=y CONFIG_TARGET_sunxi_cortexa7=y CONFIG_TARGET_sunxi_cortexa7_DEVICE_friendlyarm_nanopi-r1=y + + CONFIG_TARGET_ROOTFS_PARTSIZE=360 @@ -12,6 +14,7 @@ CONFIG_TARGET_ROOTFS_PARTSIZE=360 + CONFIG_PACKAGE_luci-app-cpufreq=y @@ -32,7 +35,6 @@ CONFIG_PACKAGE_luci-theme-argon=y - CONFIG_PACKAGE_iw=y CONFIG_PACKAGE_iwinfo=y CONFIG_PACKAGE_wpad-wolfssl=y diff --git a/r1s.config.seed b/r1s.config.seed index 6fb68aa..5e10583 100644 --- a/r1s.config.seed +++ b/r1s.config.seed @@ -1,6 +1,7 @@ CONFIG_TARGET_sunxi=y CONFIG_TARGET_sunxi_cortexa53=y CONFIG_TARGET_sunxi_cortexa53_DEVICE_friendlyarm_nanopi-r1s-h5=y + CONFIG_TARGET_OPTIMIZATION="-O3 -pipe -march=armv8-a+crypto+crc -mcpu=cortex-a53+crypto+crc -mtune=cortex-a53" CONFIG_TARGET_ROOTFS_PARTSIZE=360 @@ -12,6 +13,7 @@ CONFIG_TARGET_ROOTFS_PARTSIZE=360 + CONFIG_PACKAGE_luci-app-cpufreq=y diff --git a/r2c.config.seed b/r2c.config.seed index 0852b48..bbffb50 100644 --- a/r2c.config.seed +++ b/r2c.config.seed @@ -5,6 +5,7 @@ CONFIG_TESTING_KERNEL=y CONFIG_TARGET_OPTIMIZATION="-O3 -pipe -march=armv8-a+crypto+crc -mcpu=cortex-a53+crypto+crc -mtune=cortex-a53" CONFIG_TARGET_ROOTFS_PARTSIZE=600 + CONFIG_PACKAGE_luci-app-adbyby-plus=y CONFIG_PACKAGE_luci-app-ddnsto=y CONFIG_PACKAGE_luci-app-dockerman=y diff --git a/r2s.config.seed b/r2s.config.seed index e22737a..c5eec69 100644 --- a/r2s.config.seed +++ b/r2s.config.seed @@ -1,6 +1,7 @@ CONFIG_TARGET_rockchip=y CONFIG_TARGET_rockchip_armv8=y CONFIG_TARGET_rockchip_armv8_DEVICE_friendlyarm_nanopi-r2s=y + CONFIG_TARGET_OPTIMIZATION="-O3 -pipe -march=armv8-a+crypto+crc -mcpu=cortex-a53+crypto+crc -mtune=cortex-a53" CONFIG_TARGET_ROOTFS_PARTSIZE=600 diff --git a/r4s.config.seed b/r4s.config.seed index 6581607..0c0cea3 100644 --- a/r4s.config.seed +++ b/r4s.config.seed @@ -1,6 +1,7 @@ CONFIG_TARGET_rockchip=y CONFIG_TARGET_rockchip_armv8=y CONFIG_TARGET_rockchip_armv8_DEVICE_friendlyarm_nanopi-r4s=y + CONFIG_TARGET_OPTIMIZATION="-O3 -pipe -march=armv8-a+crypto+crc -mcpu=cortex-a72.cortex-a53+crypto+crc -mtune=cortex-a72.cortex-a53" CONFIG_TARGET_ROOTFS_PARTSIZE=600 diff --git a/scripts/autoupdate-bash.sh b/scripts/autoupdate-bash.sh index fd43113..e1119cd 100644 --- a/scripts/autoupdate-bash.sh +++ b/scripts/autoupdate-bash.sh @@ -20,7 +20,7 @@ proceed_command losetup proceed_command resize2fs opkg install coreutils-truncate || true -board_id=$(cat /etc/board.json | jsonfilter -e '@["model"].id' | sed 's/friendly.*,nanopi-//;s/xunlong,orangepi-//;s/^r2$/r2s/;s/^r1s-h5$/r1s/;s/^r1$/r1s-h3/;s/^r1-plus$/r1p/;s/^r1-plus-lts$/r1p-lts/;s/default-string-default-string/x86/;s/vmware-inc-vmware7-1/x86/') +board_id=$(cat /etc/board.json | jsonfilter -e '@["model"].id' | sed 's/friendly.*,nanopi-//;s/xunlong,orangepi-//;s/^r2$/r2s/;s/^r1s-h5$/r1s/;s/^r1$/r1s-h3/;s/^r1-plus$/r1p/;s/^r1-plus-lts$/r1p-lts/;s/default-string-default-string/x86/;s/vmware-inc-vmware7-1/x86/;s/qemu-standard-pc-q35-ich9-2009/x86/;s/qemu-standard-pc-i440fx-piix-1996/x86/') mount -t tmpfs -o remount,size=850m tmpfs /tmp rm -rf /tmp/upg && mkdir /tmp/upg && cd /tmp/upg diff --git a/x86.config.seed b/x86.config.seed index e621317..d489138 100644 --- a/x86.config.seed +++ b/x86.config.seed @@ -5,6 +5,7 @@ CONFIG_TARGET_x86_64_DEVICE_generic=y # CONFIG_VMDK_IMAGES is not set CONFIG_TARGET_ROOTFS_PARTSIZE=600 +CONFIG_PACKAGE_acpid=y CONFIG_PACKAGE_luci-app-adbyby-plus=y CONFIG_PACKAGE_luci-app-ddnsto=y CONFIG_PACKAGE_luci-app-dockerman=y @@ -23,13 +24,13 @@ CONFIG_PACKAGE_luci-theme-openwrt=y CONFIG_PACKAGE_luci-theme-openwrt-2020=y CONFIG_PACKAGE_collectd-mod-ping=y CONFIG_PACKAGE_collectd-mod-thermal=y +CONFIG_PACKAGE_qemu-ga=y - - -CONFIG_PACKAGE_kmod-ath9k-htc=y CONFIG_PACKAGE_kmod-igc=y +CONFIG_PACKAGE_kmod-ath9k-htc=y CONFIG_PACKAGE_kmod-mt76x0u=y CONFIG_PACKAGE_kmod-mt76x2u=y +CONFIG_PACKAGE_kmod-r8125=y CONFIG_PACKAGE_kmod-rtl8821cu=y CONFIG_PACKAGE_kmod-rtl8812au-ac=y CONFIG_PACKAGE_iw=y