From 6f776b97b50174214924ff454665d50f985a39f4 Mon Sep 17 00:00:00 2001 From: John Doe Date: Sat, 28 Aug 2021 07:52:15 +0800 Subject: [PATCH] Build: fix x86 --- common.seed | 1 - merge_files.sh | 6 ++++-- patches.sh | 33 ++++++++++++++++++--------------- r1p.config.seed | 1 + r1s-h3.config.seed | 2 +- r1s.config.seed | 10 ++++++++++ r2c.config.seed | 1 + r2s.config.seed | 1 + r4s.config.seed | 1 + 9 files changed, 37 insertions(+), 19 deletions(-) diff --git a/common.seed b/common.seed index 2c2ba0c..ae05a54 100644 --- a/common.seed +++ b/common.seed @@ -13,7 +13,6 @@ CONFIG_PACKAGE_luci-app-adguardhome=y CONFIG_PACKAGE_luci-app-argon-config=y CONFIG_PACKAGE_luci-app-aria2=y CONFIG_PACKAGE_luci-app-arpbind=y -CONFIG_PACKAGE_luci-app-cpufreq=y CONFIG_PACKAGE_luci-app-ddns=y CONFIG_PACKAGE_luci-app-diskman=y CONFIG_PACKAGE_luci-app-filetransfer=y diff --git a/merge_files.sh b/merge_files.sh index 27bf52d..34c66ac 100644 --- a/merge_files.sh +++ b/merge_files.sh @@ -19,5 +19,7 @@ chmod 600 files/etc/dropbear/* eval `cat .config | grep \" | head -n 10` . files/etc/opkg/distfeeds.conf | tee files/etc/opkg/distfeeds.conf -echo "iptables -t nat -A PREROUTING -p udp --dport 53 -j REDIRECT --to-ports 53" >> files/etc/firewall.user -echo "iptables -t nat -A PREROUTING -p tcp --dport 53 -j REDIRECT --to-ports 53" >> files/etc/firewall.user +echo 'iptables -t nat -A PREROUTING -p udp --dport 53 -j REDIRECT --to-ports 53' >> files/etc/firewall.user +echo 'iptables -t nat -A PREROUTING -p tcp --dport 53 -j REDIRECT --to-ports 53' >> files/etc/firewall.user +echo '[ -n "$(command -v ip6tables)" ] && ip6tables -t nat -A PREROUTING -p udp --dport 53 -j REDIRECT --to-ports 53' >> files/etc/firewall.user +echo '[ -n "$(command -v ip6tables)" ] && ip6tables -t nat -A PREROUTING -p tcp --dport 53 -j REDIRECT --to-ports 53' >> files/etc/firewall.user diff --git a/patches.sh b/patches.sh index 240a060..3af0a2b 100644 --- a/patches.sh +++ b/patches.sh @@ -15,14 +15,18 @@ sed -i '/DEPENDS+/ s/$/ +wsdd2/' `find package/ -follow -type f -path '*/ksmbd-t sed -i 's/ +ntfs-3g/ +ntfs3-mount/' `find package/ -follow -type f -path '*/automount/Makefile'` sed -i '/skip\=/ a skip=`mount | grep -q /dev/$device; echo $?`' `find package/ -follow -type f -path */automount/files/15-automount` +if [ $DEVICE = 'x86' ]; then + sed -i 's/kmod-i40evf//' target/linux/x86/Makefile +fi + if [ $DEVICE = 'r2s' -o $DEVICE = 'r2c' ]; then - sed -i 's/1400000/1450000/' target/linux/rockchip/patches-5.4/991-arm64-dts-rockchip-add-more-cpu-operating-points-for.patch - sed -i "s/enable '0'/enable '1'/" `find package/ -follow -type f -path '*/luci-app-oled/root/etc/config/oled'` - config_file_cpufreq=`find package/ -follow -type f -path '*/luci-app-cpufreq/root/etc/config/cpufreq'` - truncate -s-1 $config_file_cpufreq - echo -e "\toption governor0 'schedutil'" >> $config_file_cpufreq - echo -e "\toption minfreq0 '816000'" >> $config_file_cpufreq - echo -e "\toption maxfreq0 '1512000'\n" >> $config_file_cpufreq + sed -i 's/1400000/1450000/' target/linux/rockchip/patches-5.4/991-arm64-dts-rockchip-add-more-cpu-operating-points-for.patch + sed -i "s/enable '0'/enable '1'/" `find package/ -follow -type f -path '*/luci-app-oled/root/etc/config/oled'` + config_file_cpufreq=`find package/ -follow -type f -path '*/luci-app-cpufreq/root/etc/config/cpufreq'` + truncate -s-1 $config_file_cpufreq + echo -e "\toption governor0 'schedutil'" >> $config_file_cpufreq + echo -e "\toption minfreq0 '816000'" >> $config_file_cpufreq + echo -e "\toption maxfreq0 '1512000'\n" >> $config_file_cpufreq fi if [ $DEVICE = 'r4s' ]; then @@ -30,16 +34,12 @@ if [ $DEVICE = 'r4s' ]; then fi if [[ $DEVICE =~ ('r2s'|'r2c'|'r4s'|'r1p') ]]; then - wget https://github.com/coolsnowwolf/lede/raw/757e42d70727fe6b937bb31794a9ad4f5ce98081/target/linux/rockchip/config-default -NP target/linux/rockchip/ - wget https://github.com/coolsnowwolf/lede/commit/f341ef96fe4b509a728ba1281281da96bac23673.patch - git apply f341ef96fe4b509a728ba1281281da96bac23673.patch - rm f341ef96fe4b509a728ba1281281da96bac23673.patch + wget https://github.com/coolsnowwolf/lede/raw/757e42d70727fe6b937bb31794a9ad4f5ce98081/target/linux/rockchip/config-default -NP target/linux/rockchip/ + wget https://github.com/coolsnowwolf/lede/commit/f341ef96fe4b509a728ba1281281da96bac23673.patch + git apply f341ef96fe4b509a728ba1281281da96bac23673.patch + rm f341ef96fe4b509a728ba1281281da96bac23673.patch fi -sed -i '/182.140.223.146/d' scripts/download.pl -sed -i '/\.cn\//d' scripts/download.pl -sed -i '/tencent/d' scripts/download.pl - #inject the firmware version strDate=`TZ=UTC-8 date +%Y-%m-%d` status_pages=`find package/ -follow -type f \( -path '*/autocore/files/arm/index.htm' -o -path '*/autocore/files/x86/index.htm' -o -path '*/autocore/files/arm/rpcd_10_system.js' \)` @@ -69,3 +69,6 @@ fi #set default theme to argon sed -i '/uci commit luci/i\uci set luci.main.mediaurlbase="/luci-static/argon"' `find package -type f -path '*/default-settings/files/zzz-default-settings'` + +#remove the mirros from cn +sed -i '/182.140.223.146/d;/\.cn\//d;/tencent/d' scripts/download.pl \ No newline at end of file diff --git a/r1p.config.seed b/r1p.config.seed index b4a9787..8b7d5a8 100644 --- a/r1p.config.seed +++ b/r1p.config.seed @@ -14,6 +14,7 @@ CONFIG_PACKAGE_luci-app-linkease=y CONFIG_PACKAGE_luci-app-netdata=y CONFIG_PACKAGE_luci-app-openclash=y CONFIG_PACKAGE_luci-app-opkg=y +CONFIG_PACKAGE_luci-app-cpufreq=y CONFIG_PACKAGE_luci-app-passwall=y CONFIG_PACKAGE_luci-app-qbittorrent=y CONFIG_PACKAGE_luci-app-statistics=y diff --git a/r1s-h3.config.seed b/r1s-h3.config.seed index b18c134..6177de8 100644 --- a/r1s-h3.config.seed +++ b/r1s-h3.config.seed @@ -14,7 +14,7 @@ CONFIG_TARGET_ROOTFS_PARTSIZE=360 CONFIG_PACKAGE_luci-app-opkg=y - +CONFIG_PACKAGE_luci-app-cpufreq=y diff --git a/r1s.config.seed b/r1s.config.seed index 5d8d258..dab44e9 100644 --- a/r1s.config.seed +++ b/r1s.config.seed @@ -5,3 +5,13 @@ CONFIG_TARGET_OPTIMIZATION="-O3 -pipe -march=armv8-a+crypto+crc -mcpu=cortex-a53 CONFIG_TARGET_ROOTFS_PARTSIZE=360 + + + + + + + + + +CONFIG_PACKAGE_luci-app-cpufreq=y diff --git a/r2c.config.seed b/r2c.config.seed index be38457..fcec787 100644 --- a/r2c.config.seed +++ b/r2c.config.seed @@ -14,6 +14,7 @@ CONFIG_PACKAGE_luci-app-linkease=y CONFIG_PACKAGE_luci-app-netdata=y CONFIG_PACKAGE_luci-app-openclash=y CONFIG_PACKAGE_luci-app-opkg=y +CONFIG_PACKAGE_luci-app-cpufreq=y CONFIG_PACKAGE_luci-app-passwall=y CONFIG_PACKAGE_luci-app-qbittorrent=y CONFIG_PACKAGE_luci-app-statistics=y diff --git a/r2s.config.seed b/r2s.config.seed index f2d477d..70db6b8 100644 --- a/r2s.config.seed +++ b/r2s.config.seed @@ -14,6 +14,7 @@ CONFIG_PACKAGE_luci-app-linkease=y CONFIG_PACKAGE_luci-app-netdata=y CONFIG_PACKAGE_luci-app-openclash=y CONFIG_PACKAGE_luci-app-opkg=y +CONFIG_PACKAGE_luci-app-cpufreq=y CONFIG_PACKAGE_luci-app-passwall=y CONFIG_PACKAGE_luci-app-qbittorrent=y CONFIG_PACKAGE_luci-app-statistics=y diff --git a/r4s.config.seed b/r4s.config.seed index e7f0cb0..7ad97a4 100644 --- a/r4s.config.seed +++ b/r4s.config.seed @@ -14,6 +14,7 @@ CONFIG_PACKAGE_luci-app-linkease=y CONFIG_PACKAGE_luci-app-netdata=y CONFIG_PACKAGE_luci-app-openclash=y CONFIG_PACKAGE_luci-app-opkg=y +CONFIG_PACKAGE_luci-app-cpufreq=y CONFIG_PACKAGE_luci-app-passwall=y CONFIG_PACKAGE_luci-app-qbittorrent=y CONFIG_PACKAGE_luci-app-statistics=y