kiddin9 3 лет назад
Родитель
Сommit
c8a66e403b

+ 5 - 5
.github/workflows/Openwrt-AutoBuild.yml

@@ -109,11 +109,11 @@ jobs:
         git clone --depth 1 $REPO_URL -b v$REPO_BRANCH openwrt
         cd openwrt
         if [[ ${{matrix.target}} == "x86_64" ]]; then
-            curl -fL -o sdk.tar.xz https://downloads.openwrt.org/releases/$REPO_BRANCH/targets/x86/64/openwrt-sdk-$REPO_BRANCH-x86-64_gcc-8.4.0_musl.Linux-x86_64.tar.xz || curl -fL -o sdk.tar.xz https://downloads.openwrt.org/releases/21.02-SNAPSHOT/targets/x86/64/openwrt-sdk-21.02-SNAPSHOT-x86-64_gcc-8.4.0_musl.Linux-x86_64.tar.xz
+            curl -fL -m 60 -o sdk.tar.xz https://downloads.openwrt.org/releases/$REPO_BRANCH/targets/x86/64/openwrt-sdk-$REPO_BRANCH-x86-64_gcc-8.4.0_musl.Linux-x86_64.tar.xz || curl -fL -m 60 -o sdk.tar.xz https://openwrt.tetaneutral.net/releases/21.02-SNAPSHOT/targets/x86/64/openwrt-sdk-21.02-SNAPSHOT-x86-64_gcc-8.4.0_musl.Linux-x86_64.tar.xz
         elif [[ ${{matrix.target}} == nanopi* ]]; then
-            curl -fL -o sdk.tar.xz https://downloads.openwrt.org/releases/$REPO_BRANCH/targets/rockchip/armv8/openwrt-sdk-$REPO_BRANCH-rockchip-armv8_gcc-8.4.0_musl.Linux-x86_64.tar.xz || curl -fL -o sdk.tar.xz https://downloads.openwrt.org/releases/21.02-SNAPSHOT/targets/rockchip/armv8/openwrt-sdk-21.02-SNAPSHOT-rockchip-armv8_gcc-8.4.0_musl.Linux-x86_64.tar.xz
+            curl -fL -m 60 -o sdk.tar.xz https://downloads.openwrt.org/releases/$REPO_BRANCH/targets/rockchip/armv8/openwrt-sdk-$REPO_BRANCH-rockchip-armv8_gcc-8.4.0_musl.Linux-x86_64.tar.xz || curl -fL -m 60 -o sdk.tar.xz https://openwrt.tetaneutral.net/releases/21.02-SNAPSHOT/targets/rockchip/armv8/openwrt-sdk-21.02-SNAPSHOT-rockchip-armv8_gcc-8.4.0_musl.Linux-x86_64.tar.xz
         elif [[ ${{matrix.target}} =~ "Rpi-4B" ]]; then
-            curl -fL -o sdk.tar.xz https://downloads.openwrt.org/releases/$REPO_BRANCH/targets/bcm27xx/bcm2711/openwrt-sdk-$REPO_BRANCH-bcm27xx-bcm2711_gcc-8.4.0_musl.Linux-x86_64.tar.xz || curl -fL -o sdk.tar.xz https://downloads.openwrt.org/releases/21.02-SNAPSHOT/targets/bcm27xx/bcm2711/openwrt-sdk-21.02-SNAPSHOT-bcm27xx-bcm2711_gcc-8.4.0_musl.Linux-x86_64.tar.xz
+            curl -fL -m 60 -o sdk.tar.xz https://downloads.openwrt.org/releases/$REPO_BRANCH/targets/bcm27xx/bcm2711/openwrt-sdk-$REPO_BRANCH-bcm27xx-bcm2711_gcc-8.4.0_musl.Linux-x86_64.tar.xz || curl -fL -m 60 -o sdk.tar.xz https://openwrt.tetaneutral.net/releases/21.02-SNAPSHOT/targets/bcm27xx/bcm2711/openwrt-sdk-21.02-SNAPSHOT-bcm27xx-bcm2711_gcc-8.4.0_musl.Linux-x86_64.tar.xz
         fi
         echo "REPO_BRANCH=v$REPO_BRANCH" >> $GITHUB_ENV
         
@@ -212,8 +212,8 @@ jobs:
         cp openwrt/build_dir/target-*/linux-*/linux-*/.config ./firmware/${{matrix.target}}_kernel.config
         cd firmware
         echo "${{ env.VERSION }}.$(date +'%Y')" > version.txt
-        rename -v "s/^openwrt/${{ env.VERSION }}-openwrt/" *
-        rename -v "s/friendlyarm_//" *gz
+        rename -v "s/^openwrt/${{ env.VERSION }}-openwrt/" * || true
+        rename -v "s/friendlyarm_//" *gz || true
         md5=$((md5sum *squashfs-sysupgrade* || md5sum *squashfs-combined-efi*) | awk '{print $1}') 2>/dev/null
         echo $md5 >> version.txt
         echo $REPO_BRANCH >> version.txt

+ 2 - 2
devices/Rpi-4B/diy.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-sed -i 's,ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305,ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256,g' package/feeds/custom/luci-app-bypass/root/usr/share/ssrplus/gentrojanconfig
-sed -i 's,TLS_AES_128_GCM_SHA256:TLS_CHACHA20_POLY1305_SHA256,TLS_CHACHA20_POLY1305_SHA256:TLS_AES_128_GCM_SHA256,g' package/feeds/custom/luci-app-bypass/root/usr/share/ssrplus/gentrojanconfig
+sed -i 's,ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305,ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256,g' package/feeds/kiddin9/luci-app-bypass/root/usr/share/ssrplus/gentrojanconfig
+sed -i 's,TLS_AES_128_GCM_SHA256:TLS_CHACHA20_POLY1305_SHA256,TLS_CHACHA20_POLY1305_SHA256:TLS_AES_128_GCM_SHA256,g' package/feeds/kiddin9/luci-app-bypass/root/usr/share/ssrplus/gentrojanconfig
 
 echo '
 CONFIG_ARM64_CRYPTO=y

+ 10 - 119
devices/common/.config

@@ -21,6 +21,7 @@ CONFIG_PACKAGE_luci-app-upnp=y
 CONFIG_PACKAGE_luci-app-autoreboot=y
 CONFIG_PACKAGE_luci-app-nft-qos=y
 CONFIG_PACKAGE_luci-app-wizard=y
+CONFIG_PACKAGE_luci-app-ksmbd=y
 
 # Themes
 
@@ -35,6 +36,7 @@ CONFIG_PACKAGE_dnsmasq-full=y
 CONFIG_PACKAGE_dnsmasq_full_dhcp=y
 CONFIG_PACKAGE_dnsmasq_full_ipset=y
 
+CONFIG_PACKAGE_autoshare-ksmbd=y
 CONFIG_PACKAGE_luci-ssl=n # uhttpd服务
 CONFIG_PACKAGE_luci-ssl-nginx=y # nginx
 CONFIG_NGINX_DAV=y
@@ -83,52 +85,6 @@ CONFIG_BUSYBOX_CONFIG_WGET=y
 CONFIG_PACKAGE_bash=y
 CONFIG_PACKAGE_ca-bundle=y
 
-CONFIG_PACKAGE_kmod-macvlan=y
-CONFIG_PACKAGE_kmod-ipvlan=y
-CONFIG_PACKAGE_kmod-tun=y
-CONFIG_PACKAGE_kmod-ipt-core=y
-CONFIG_PACKAGE_kmod-ipt-filter=y
-CONFIG_PACKAGE_kmod-ipt-extra=y
-CONFIG_PACKAGE_kmod-ipt-tproxy=y
-CONFIG_PACKAGE_kmod-ipt-nat-extra=y
-CONFIG_PACKAGE_kmod-ipt-nat6=y
-CONFIG_PACKAGE_kmod-nf-nathelper=y
-
-# Wireless
-CONFIG_PACKAGE_wpad-basic-wolfssl=y
-
-# USB3.0支持:
-CONFIG_PACKAGE_kmod-usb2=y
-CONFIG_PACKAGE_kmod-usb2-pci=y
-CONFIG_PACKAGE_kmod-usb3=y
-CONFIG_PACKAGE_kmod-usb-audio=y
-CONFIG_PACKAGE_kmod-usb-printer=y
-CONFIG_PACKAGE_automount=y
-
-#ksmbd
-CONFIG_PACKAGE_kmod-fs-ksmbd=y
-
-#nfs
-CONFIG_PACKAGE_kmod-fs-nfsd=y
-CONFIG_PACKAGE_kmod-fs-nfs=y
-CONFIG_PACKAGE_kmod-fs-nfs-v4=y
-
-#3G/4G Support
-CONFIG_PACKAGE_kmod-usb-serial=y
-CONFIG_PACKAGE_kmod-usb-serial-option=y
-CONFIG_PACKAGE_kmod-usb-serial-wwan=y
-CONFIG_PACKAGE_kmod-mii=y
-CONFIG_PACKAGE_kmod-usb-acm=y
-CONFIG_PACKAGE_usb-modeswitch=y
-
-#Sound Support
-CONFIG_PACKAGE_kmod-sound-core=y
-CONFIG_PACKAGE_kmod-sound-hda-core=y
-CONFIG_PACKAGE_kmod-sound-hda-codec-realtek=y
-CONFIG_PACKAGE_kmod-sound-hda-codec-via=y
-CONFIG_PACKAGE_kmod-sound-hda-intel=y
-CONFIG_PACKAGE_kmod-sound-hda-codec-hdmi=y
-
 #USB net driver
 CONFIG_PACKAGE_kmod-usb-net-asix=y
 CONFIG_PACKAGE_kmod-usb-net-asix-ax88179=y
@@ -138,79 +94,14 @@ CONFIG_PACKAGE_kmod-usb-net-rndis=y
 CONFIG_PACKAGE_kmod-usb-net-ipheth=y
 CONFIG_PACKAGE_kmod-usb-net-cdc-ether=y
 
-#wifi drive
-CONFIG_PACKAGE_kmod-mt76=y
-CONFIG_PACKAGE_kmod-mt76x2u=y
-CONFIG_PACKAGE_kmod-rtlwifi=y
-CONFIG_PACKAGE_kmod-rtlwifi-btcoexist=y
-CONFIG_PACKAGE_kmod-rtlwifi-usb=y
-CONFIG_PACKAGE_kmod-rtl8192cu=y
-CONFIG_PACKAGE_kmod-rtl8821cu=y
-CONFIG_PACKAGE_kmod-ath9k=y
-CONFIG_PACKAGE_kmod-ath9k-htc=y
-
-# docker
-CONFIG_PACKAGE_kmod-fs-btrfs=y
-CONFIG_PACKAGE_kmod-dm=y
-CONFIG_PACKAGE_kmod-br-netfilter=y
-CONFIG_PACKAGE_kmod-ikconfig=y
-CONFIG_PACKAGE_kmod-nf-conntrack-netlink=y
-CONFIG_PACKAGE_kmod-nf-ipvs=y
-CONFIG_PACKAGE_kmod-veth=y
-CONFIG_PACKAGE_kmod-dummy=y
-
-# L2TP
-CONFIG_PACKAGE_kmod-pppol2tp=y
-
-# pptp
-CONFIG_PACKAGE_kmod-pptp=n
-CONFIG_PACKAGE_kmod-gre=n
-CONFIG_PACKAGE_kmod-nf-nathelper-extra=n
-
-# ipsec-vpnd
-CONFIG_PACKAGE_kmod-crypto-authenc=y
-CONFIG_PACKAGE_kmod-ipsec=y
-CONFIG_PACKAGE_kmod-ipsec4=y
-CONFIG_PACKAGE_kmod-ipsec6=y
-CONFIG_PACKAGE_kmod-ipt-ipsec=y
-
-# SQM
-CONFIG_PACKAGE_kmod-sched-core=y
-CONFIG_PACKAGE_kmod-sched-cake=y
-
-#AppFilter
-CONFIG_PACKAGE_kmod-oaf=y
-
-# cifsmount
-CONFIG_PACKAGE_kmod-fs-cifs=y
-CONFIG_PACKAGE_kmod-nls-utf8=y
-CONFIG_PACKAGE_kmod-crypto-misc=y
-
-# eqos
-CONFIG_PACKAGE_kmod-ifb=y
-
-# syncdial
-CONFIG_PACKAGE_kmod-ipt-conntrack-extra=y
-CONFIG_PACKAGE_kmod-ipt-ipopt=y
-CONFIG_PACKAGE_kmod-ipt-raw=y
-
-# wireguard
-CONFIG_PACKAGE_kmod-wireguard=y
-
-# map
-CONFIG_PACKAGE_kmod-ip6-tunnel=y
-CONFIG_PACKAGE_kmod-nat46=y
-
-# ebtables
-CONFIG_PACKAGE_kmod-ebtables=y
-CONFIG_PACKAGE_kmod-ebtables-ipv4=y
-CONFIG_PACKAGE_kmod-ebtables-ipv6=y
-
-# rclone
-CONFIG_PACKAGE_kmod-fuse=y
-
-# luci-app-passwall
-CONFIG_PACKAGE_kmod-ipt-iprange=y
+# Wireless
+CONFIG_PACKAGE_wpad-basic-wolfssl=y
+
+# USB3.0支持:
+CONFIG_PACKAGE_kmod-usb2=y
+CONFIG_PACKAGE_kmod-usb2-pci=y
+CONFIG_PACKAGE_kmod-usb3=y
+CONFIG_PACKAGE_automount=y
 
 CONFIG_GRUB_BOOTOPTS="nomodeset"
 

+ 8 - 6
devices/common/default-settings

@@ -18,8 +18,12 @@ uci commit dockerd
 
 sed -i '/profile.d/d' /lib/upgrade/keep.d/base-files
 
-sed -i 's/\(custom.*\)\/custom/\1/' /etc/opkg/distfeeds.conf
-sed -i 's?\(src/gz openwrt_\(core\|telephony\)\)?#\1?' /etc/opkg/distfeeds.conf
+sed -i '/openwrt_kiddin9/d' /etc/opkg/distfeeds.conf
+VERSION="$(cat /etc/os-release | grep "VERSION=" | cut -d \" -f 2)"
+ARCH="$(cat /etc/os-release | grep "OPENWRT_ARCH=" | cut -d \" -f 2)"
+sed -i "s?\(targets/.*\)/packages?\1/$VERSION?" /etc/opkg/distfeeds.conf
+sed -i "\$a src/gz openwrt_kmods https://op.supes.top/packages/$ARCH/kmods/$VERSION" /etc/opkg/distfeeds.conf
+sed -i "\$a src/gz openwrt_kiddin9 https://op.supes.top/packages/$ARCH" /etc/opkg/distfeeds.conf
 
 echo $(uci -q get uhttpd.main.index_page) | grep -q "cgi-bin/luci" ||
 	uci -q add_list uhttpd.main.index_page='cgi-bin/luci' && uci commit uhttpd
@@ -70,14 +74,12 @@ test $version -lt 1 && {
 	uci -q get wireless.${radio} >/dev/null 2>&1 && {
 		uci -q batch <<-EOT
 			set -q wireless.${radio}.disabled='0'
-			set -q wireless.${radio}.country='CN'
-			set -q wireless.${radio}.channel='auto'
 		EOT
 		
 		if [ "$(uci -q get wireless.${radio}.hwmode)" = "11a" ]; then
-			uci -q set wireless.${radio}.txpower='23'
+			uci -q set wireless.${radio}.htmode='VHT80'
 		else
-			uci -q set wireless.${radio}.txpower='20'
+			uci -q set wireless.${radio}.htmode='VHT40'
 		fi
 
 		obj=`uci -q add wireless wifi-iface`

+ 11 - 6
devices/common/diy.sh

@@ -3,12 +3,12 @@
 shopt -s extglob
 sed -i '/	refresh_config();/d' scripts/feeds
 [ ! -f feeds.conf ] && {
-sed -i '$a src-git custom https://github.com/kiddin9/openwrt-packages.git;master' feeds.conf.default
+sed -i '$a src-git kiddin9 https://github.com/kiddin9/openwrt-packages.git;master' feeds.conf.default
 }
 ./scripts/feeds update -a
-./scripts/feeds install -a -p custom
+./scripts/feeds install -a -p kiddin9
 ./scripts/feeds install -a
-cd feeds/custom; git pull; cd -
+cd feeds/kiddin9; git pull; cd -
 (
 svn export --force https://github.com/immortalwrt/immortalwrt/branches/openwrt-21.02/package/network/services/ppp package/network/services/ppp
 svn export --force https://github.com/immortalwrt/immortalwrt/branches/openwrt-21.02/package/network/services/dnsmasq package/network/services/dnsmasq
@@ -18,8 +18,13 @@ svn co https://github.com/immortalwrt/immortalwrt/branches/openwrt-21.02/target/
 curl -sfL https://git.io/J0klM --create-dirs -o package/network/config/firewall/patches/fullconenat.patch
 curl -sfL https://raw.githubusercontent.com/coolsnowwolf/lede/master/target/linux/generic/hack-5.4/601-netfilter-export-udp_get_timeouts-function.patch -o target/linux/generic/hack-5.4/601-netfilter-export-udp_get_timeouts-function.patch
 ) &
+
+REPO_BRANCH="$(curl -s https://api.github.com/repos/openwrt/openwrt/tags | jq -r '.[].name' | grep v21 | head -n 1 | sed -e 's/v//')"
+vermagic="$(curl -sfL https://downloads.openwrt.org/releases/$REPO_BRANCH/targets/x86/64/kmods/ | grep -o 'href="5\..*/"' | cut -d - -f 3 | cut -d / -f 1)"
+sed -i "s/^.*vermagic$/\techo "$vermagic" > \$(LINUX_DIR)\/.vermagic/" include/kernel-defaults.mk
+
 sed -i 's?zstd$?zstd ucl upx\n$(curdir)/upx/compile := $(curdir)/ucl/compile?g' tools/Makefile
-sed -i 's/\/cgi-bin\/\(luci\|cgi-\)/\/\1/g' `find package/feeds/custom/luci-*/ -name "*.lua" -or -name "*.htm*" -or -name "*.js"` &
+sed -i 's/\/cgi-bin\/\(luci\|cgi-\)/\/\1/g' `find package/feeds/kiddin9/luci-*/ -name "*.lua" -or -name "*.htm*" -or -name "*.js"` &
 sed -i 's/Os/O2/g' include/target.mk
 sed -i 's/$(TARGET_DIR)) install/$(TARGET_DIR)) install --force-overwrite/' package/Makefile
 sed -i "/mediaurlbase/d" package/feeds/*/luci-theme*/root/etc/uci-defaults/*
@@ -50,11 +55,11 @@ sed -i \
 	-e "s/+nginx\( \|$\)/+nginx-ssl\1/" \
 	-e 's/+python\( \|$\)/+python3/' \
 	-e 's?../../lang?$(TOPDIR)/feeds/packages/lang?' \
-	package/feeds/custom/*/Makefile
+	package/feeds/kiddin9/*/Makefile
 
 (
 if [ -f sdk.tar.xz ]; then
-	sed -i 's,$(STAGING_DIR_HOST)/bin/upx,upx,' package/feeds/custom/*/Makefile
+	sed -i 's,$(STAGING_DIR_HOST)/bin/upx,upx,' package/feeds/kiddin9/*/Makefile
 	mkdir sdk
 	tar -xJf sdk.tar.xz -C sdk
 	cp -rf sdk/*/staging_dir/* ./staging_dir/

+ 6 - 6
devices/common/patches/turboacc.patch

@@ -1,5 +1,5 @@
---- a/package/feeds/custom/luci-app-turboacc/Makefile
-+++ b/package/feeds/custom/luci-app-turboacc/Makefile
+--- a/package/feeds/kiddin9/luci-app-turboacc/Makefile
++++ b/package/feeds/kiddin9/luci-app-turboacc/Makefile
 @@ -32,7 +32,6 @@ LUCI_DEPENDS:=+pdnsd-alt \
  define Package/$(PKG_NAME)/config
  config PACKAGE_$(PKG_NAME)_INCLUDE_OFFLOADING
@@ -9,8 +9,8 @@
  
  config PACKAGE_$(PKG_NAME)_INCLUDE_SHORTCUT_FE_DRV
 
---- a/package/feeds/custom/luci-app-turboacc/luasrc/model/cbi/turboacc.lua
-+++ b/package/feeds/custom/luci-app-turboacc/luasrc/model/cbi/turboacc.lua
+--- a/package/feeds/kiddin9/luci-app-turboacc/luasrc/model/cbi/turboacc.lua
++++ b/package/feeds/kiddin9/luci-app-turboacc/luasrc/model/cbi/turboacc.lua
 @@ -55,25 +55,4 @@ fullcone_nat.default = 0
  fullcone_nat.description = translate("Using FullCone NAT can improve gaming performance effectively")
  end 
@@ -38,8 +38,8 @@
 -
  return m
 
---- a/package/feeds/custom/luci-app-turboacc/luasrc/view/turboacc/turboacc_status.htm
-+++ b/package/feeds/custom/luci-app-turboacc/luasrc/view/turboacc/turboacc_status.htm
+--- a/package/feeds/kiddin9/luci-app-turboacc/luasrc/view/turboacc/turboacc_status.htm
++++ b/package/feeds/kiddin9/luci-app-turboacc/luasrc/view/turboacc/turboacc_status.htm
 @@ -4,7 +4,6 @@
  		<tr><td width="33%"><%:Flow Offloading%></td><td id="_fastpath_state"><em><%:Collecting data...%></em></td></tr>
  		<tr><td width="33%"><%:FullCone NAT%></td><td id="_fullconenat_state"><em><%:Collecting data...%></em></td></tr>

+ 0 - 7
devices/nanopi-r2c/.config

@@ -12,10 +12,3 @@ CONFIG_PACKAGE_luci-app-zerotier=n
 
 # 其他需要安装的软件包:
 CONFIG_PACKAGE_my-autocore-arm=y
-
-# LED modules
-CONFIG_PACKAGE_kmod-leds-gpio=y
-CONFIG_PACKAGE_kmod-ledtrig-activity=y
-CONFIG_PACKAGE_kmod-ledtrig-gpio=y
-CONFIG_PACKAGE_kmod-ledtrig-oneshot=y
-CONFIG_PACKAGE_kmod-ledtrig-transient=y

+ 0 - 6
devices/nanopi-r2s/.config

@@ -13,9 +13,3 @@ CONFIG_PACKAGE_luci-app-zerotier=n
 # 其他需要安装的软件包:
 CONFIG_PACKAGE_my-autocore-arm=y
 
-# LED modules
-CONFIG_PACKAGE_kmod-leds-gpio=y
-CONFIG_PACKAGE_kmod-ledtrig-activity=y
-CONFIG_PACKAGE_kmod-ledtrig-gpio=y
-CONFIG_PACKAGE_kmod-ledtrig-oneshot=y
-CONFIG_PACKAGE_kmod-ledtrig-transient=y

+ 0 - 7
devices/nanopi-r4s/.config

@@ -11,10 +11,3 @@ CONFIG_PACKAGE_luci-app-cpufreq=y
 CONFIG_PACKAGE_luci-app-zerotier=n
 
 CONFIG_PACKAGE_my-autocore-arm=y
-
-# LED modules
-CONFIG_PACKAGE_kmod-leds-gpio=y
-CONFIG_PACKAGE_kmod-ledtrig-activity=y
-CONFIG_PACKAGE_kmod-ledtrig-gpio=y
-CONFIG_PACKAGE_kmod-ledtrig-oneshot=y
-CONFIG_PACKAGE_kmod-ledtrig-transient=y

+ 0 - 7
devices/x86_64/.config

@@ -12,11 +12,8 @@ CONFIG_VMDK_IMAGES=n
 # 其他需要安装的软件包:
 CONFIG_PACKAGE_luci-proto-bonding=y
 CONFIG_PACKAGE_my-autocore-x86=y
-CONFIG_PACKAGE_luci-app-samba4=y
-CONFIG_PACKAGE_autoshare-samba=y
 
 # x86
-CONFIG_PACKAGE_kmod-usb-hid=y
 CONFIG_PACKAGE_qemu-ga=y
 CONFIG_PACKAGE_lm-sensors-detect=y
 CONFIG_PACKAGE_kmod-bonding=y
@@ -46,10 +43,6 @@ CONFIG_PACKAGE_ath10k-firmware-qca9888=y
 CONFIG_PACKAGE_ath10k-firmware-qca988x=y
 CONFIG_PACKAGE_ath10k-firmware-qca9984=y
 CONFIG_PACKAGE_brcmfmac-firmware-43602a1-pcie=y
-CONFIG_PACKAGE_kmod-sound-i8x0=y
-CONFIG_PACKAGE_kmod-sound-via82xx=y
-CONFIG_PACKAGE_alsa-utils=y
-CONFIG_PACKAGE_kmod-iwlwifi=y
 CONFIG_PACKAGE_snmpd=y
 CONFIG_PACKAGE_acpid=y
 CONFIG_PACKAGE_blkid=y

+ 1 - 1
onekey/rebuild.sh

@@ -110,7 +110,7 @@ echo
 echo
 sleep 3s
 
-sed -i 's,$(STAGING_DIR_HOST)/bin/upx,upx,' package/feeds/custom/*/Makefile
+sed -i 's,$(STAGING_DIR_HOST)/bin/upx,upx,' package/feeds/kiddin9/*/Makefile
 
 make -j$(($(nproc)+1)) download v=s ; make -j$(($(nproc)+1)) || make -j1 V=s