12 Commits

Author SHA1 Message Date
remittor
d625301034 xmake: Disable MODERN mode for dropbear 2025-04-11 21:38:16 +03:00
remittor
349acbd731 xmake: Add patching for podkop 2025-04-11 21:38:16 +03:00
remittor
35a12373c1 vpn: Add package luci-i18n-podkop-ru 2025-04-11 21:37:46 +03:00
remittor
bd18b7bbac build: Add Xiaomi R3P and Asus ZenWiFi-BT8 2025-04-04 20:43:08 +03:00
remittor
ab609c865a base: Add package coreutils-cksum 2025-04-03 12:58:54 +03:00
remittor
20a7be2d85 Auto activate WiFi modules for Asus initramfs images 2025-03-31 11:20:54 +03:00
remittor
68a27ad4ff base_initrd: Add theme openwrt-2020 2025-03-31 09:39:04 +03:00
remittor
ff24a36fe4 xmake: Add special fantastic packages 2025-03-21 10:03:57 +03:00
remittor
88fdc87118 Add support Xiaomi R3P 2025-03-06 12:07:38 +03:00
remittor
67a306e4a5 config: Remove SQM package 2025-02-28 15:26:13 +03:00
remittor
58dd491beb base: Disable IP Tables tool 2025-02-28 15:21:26 +03:00
remittor
d4039b3221 build: Check downloaded vermagic hash 2025-02-14 16:58:54 +03:00
25 changed files with 175 additions and 58 deletions

View File

@@ -113,6 +113,7 @@ jobs:
- kng_re
- r3d
- r3g
- r3p
- rb03
- rb06
- rd03
@@ -122,6 +123,7 @@ jobs:
- rt-ax89x
- tuf_ax4200
- tuf_ax6000
- zen-bt8
steps:
- name: Initialization environment
env:
@@ -175,17 +177,30 @@ jobs:
cd $BUILD_ROOT
MAKE_JOBS=$(($(nproc)+1))
echo "$MAKE_JOBS thread compile"
# init build config
./xmake.sh -I -t $TARGET
G_DEVICE_NAME=$( grep -so '^CONFIG_TARGET.*DEVICE.*=y' .config | sed -r 's/.*DEVICE_(.*)=y/\1/' )
[ -z "$G_DEVICE_NAME" ] && exit 31
G_BOARD_NAME=$( grep -so '^CONFIG_TARGET_BOARD=.*' .config | cut -d'"' -f2 )
[ -z "$G_BOARD_NAME" ] && exit 32
G_SUBTARGET_NAME=$( grep -so '^CONFIG_TARGET_SUBTARGET=.*' .config | cut -d'"' -f2 )
[ -z "$G_SUBTARGET_NAME" ] && exit 33
VERMAGIC_LIST="vermagic-$G_BOARD_NAME-$G_SUBTARGET_NAME-*.list"
if [ $(find . -maxdepth 1 -name "$VERMAGIC_LIST" | wc -l) = "0" ]; then
./vermagic_update.sh $G_BOARD_NAME $G_SUBTARGET_NAME
fi
if [ $(find . -maxdepth 1 -name "$VERMAGIC_LIST" | wc -l) = "0" ]; then
exit 41
fi
# run build
[ "$FAKE_BUILD" != "true" ] && make -j $MAKE_JOBS download world
# process results
FILE_DATE=$(date --utc +'%y%m%d')
DEVICE_NAME=$( grep -so '^CONFIG_TARGET.*DEVICE.*=y' .config | sed -r 's/.*DEVICE_(.*)=y/\1/' )
BOARD_NAME=$( grep -so '^CONFIG_TARGET_BOARD=.*' .config | cut -d'"' -f2 )
SUBTARGET_NAME=$( grep -so '^CONFIG_TARGET_SUBTARGET=.*' .config | cut -d'"' -f2 )
OUT_DIR=$BUILD_ROOT/bin/targets/$BOARD_NAME/$SUBTARGET_NAME
OUT_DIR=$BUILD_ROOT/bin/targets/$G_BOARD_NAME/$G_SUBTARGET_NAME
if [ "$FAKE_BUILD" = "true" ]; then
mkdir -p logs
mkdir -p $OUT_DIR
echo "$BOARD_NAME $SUBTARGET_NAME $DEVICE_NAME" > "$OUT_DIR/$DEVICE_NAME.txt"
echo "$G_BOARD_NAME $G_SUBTARGET_NAME $G_DEVICE_NAME" > "$OUT_DIR/$G_DEVICE_NAME.txt"
touch "$OUT_DIR/kernel-debug.tar.zst"
ls -la
BLD_VER=$FW_VER
@@ -198,9 +213,9 @@ jobs:
exit 100
fi
echo "status=success" >> $GITHUB_OUTPUT
echo "DEVICE_NAME=$DEVICE_NAME" >> $GITHUB_ENV
echo "BOARD_NAME=$BOARD_NAME" >> $GITHUB_ENV
echo "SUBTARGET_NAME=$SUBTARGET_NAME" >> $GITHUB_ENV
echo "DEVICE_NAME=$G_DEVICE_NAME" >> $GITHUB_ENV
echo "BOARD_NAME=$G_BOARD_NAME" >> $GITHUB_ENV
echo "SUBTARGET_NAME=$G_SUBTARGET_NAME" >> $GITHUB_ENV
echo "BLD_VER=$BLD_VER" >> $GITHUB_ENV
echo "OUT_DIR=$OUT_DIR" >> $GITHUB_ENV
echo "FILE_DATE=$FILE_DATE" >> $GITHUB_ENV
@@ -231,6 +246,10 @@ jobs:
rm -f *uImage
rm -f *ubi-cleaner*
rm -f *-ram-*.bin
rm -f *-preloader*
rm -f *-bl31-uboot*
rm -f *-initramfs-recovery*
rm -f *-bt8-factory.bin
- name: Upload OUT directory
uses: actions/upload-artifact@main

View File

@@ -62,6 +62,7 @@ CONFIG_PACKAGE_irqbalance=y
CONFIG_PACKAGE_terminfo=y
CONFIG_PACKAGE_zlib=y
CONFIG_PACKAGE_ethtool=y
CONFIG_PACKAGE_coreutils-cksum=y
### USB device mount & file systems support
CONFIG_PACKAGE_gdisk=y
@@ -251,8 +252,8 @@ CONFIG_PACKAGE_luci-app-watchcat=y
CONFIG_PACKAGE_luci-i18n-watchcat-ru=y
### IP Tables tool
CONFIG_PACKAGE_kmod-ipt-ipopt=y
CONFIG_PACKAGE_iptables-mod-ipopt=y
#CONFIG_PACKAGE_kmod-ipt-ipopt=y
#CONFIG_PACKAGE_iptables-mod-ipopt=y
### Adblock package with Luci support
CONFIG_PACKAGE_adblock=y

View File

@@ -80,3 +80,6 @@ CONFIG_PACKAGE_luci-i18n-commands-ru=y
CONFIG_PACKAGE_luci-app-opkg=y
CONFIG_PACKAGE_luci-i18n-opkg-ru=y
### Luci themes
CONFIG_PACKAGE_luci-theme-bootstrap=y
CONFIG_PACKAGE_luci-theme-openwrt-2020=y

View File

@@ -40,3 +40,4 @@ CONFIG_PACKAGE_luci-i18n-ruantiblock-ru=y
CONFIG_PACKAGE_podkop=y
CONFIG_PACKAGE_luci-app-podkop=y
CONFIG_PACKAGE_luci-i18n-podkop-ru=y

View File

@@ -136,6 +136,23 @@ if [ -f "$DIS_SVC_FN" ]; then
done
fi
WIFI77_FN="$ROOTFSDIR/etc/uci-defaults/77_wireless"
if [ -f "$WIFI77_FN" ]; then
if grep -q 'CONFIG_PACKAGE_MAC80211_ENABLE=y' $TOPDIR/.config ; then
if grep -q 'CONFIG_PACKAGE_MAC80211_PASSWORD="' $TOPDIR/.config ; then
sed -i "s#%ENABLE%#y#g" "$WIFI77_FN"
WIFI_SSID=$( get_param_qq CONFIG_PACKAGE_MAC80211_SSID "$TOPDIR/.config" )
sed -i "s#%SSID%#${WIFI_SSID}#g" "$WIFI77_FN"
WIFI_ENCRYPTION=$( get_param_qq CONFIG_PACKAGE_MAC80211_ENCRYPTION "$TOPDIR/.config" )
sed -i "s#%ENCRYPTION%#${WIFI_ENCRYPTION}#g" "$WIFI77_FN"
WIFI_PASSWORD=$( get_param_qq CONFIG_PACKAGE_MAC80211_PASSWORD "$TOPDIR/.config" )
sed -i "s#%KEY%#${WIFI_PASSWORD}#g" "$WIFI77_FN"
WIFI_COUNTRY=$( get_param_qq CONFIG_PACKAGE_MAC80211_COUNTRY "$TOPDIR/.config" )
sed -i "s#%COUNTRY%#${WIFI_COUNTRY}#g" "$WIFI77_FN"
fi
fi
fi
NEXTDNSCFG="$ROOTFSDIR/etc/config/nextdns"
if [ -f "$NEXTDNSCFG" ]; then
sed -i "s/option enabled '1'/option enabled '0'/g" "$NEXTDNSCFG"

View File

@@ -41,10 +41,6 @@ CONFIG_PACKAGE_luci-i18n-dashboard-ru=y
CONFIG_PACKAGE_luci-app-tn-netports=y
CONFIG_PACKAGE_luci-i18n-tn-netports-ru=y
### Network traffic
CONFIG_PACKAGE_luci-app-sqm=y
CONFIG_PACKAGE_luci-i18n-sqm-ru=y
### TimeControl
CONFIG_PACKAGE_luci-app-timecontrol=m

View File

@@ -24,10 +24,6 @@ CONFIG_PACKAGE_hdparm=y
CONFIG_PACKAGE_luci-app-tn-netports=y
CONFIG_PACKAGE_luci-i18n-tn-netports-ru=y
### Network traffic
CONFIG_PACKAGE_luci-app-sqm=y
CONFIG_PACKAGE_luci-i18n-sqm-ru=y
### TimeControl
CONFIG_PACKAGE_luci-app-timecontrol=m

32
r3p.config Normal file
View File

@@ -0,0 +1,32 @@
CONFIG_TARGET_ramips=y
CONFIG_TARGET_ramips_mt7621=y
CONFIG_TARGET_ramips_mt7621_DEVICE_xiaomi_mi-router-3-pro=y
#include _addons.config
#include _base.config
#include _wifi_en.config
#include _printer.config
#include _samba.config
#include _torrents.config
#include _proxy.config
#include _argon.config
#include _vpn.config
### Luci dashboard
CONFIG_PACKAGE_luci-mod-dashboard=y
CONFIG_PACKAGE_luci-i18n-dashboard-ru=y
### HDD tools
CONFIG_PACKAGE_smartmontools=y
CONFIG_PACKAGE_hdparm=y
### Network Ports viewer
CONFIG_PACKAGE_luci-app-tn-netports=y
CONFIG_PACKAGE_luci-i18n-tn-netports-ru=y
### TimeControl
CONFIG_PACKAGE_luci-app-timecontrol=m

View File

@@ -17,10 +17,6 @@ CONFIG_PACKAGE_luci-i18n-dashboard-ru=y
CONFIG_PACKAGE_luci-app-tn-netports=y
CONFIG_PACKAGE_luci-i18n-tn-netports-ru=y
### Network traffic
CONFIG_PACKAGE_luci-app-sqm=y
CONFIG_PACKAGE_luci-i18n-sqm-ru=y
### TimeControl
#CONFIG_PACKAGE_luci-app-timecontrol=m

View File

@@ -17,10 +17,6 @@ CONFIG_PACKAGE_luci-i18n-dashboard-ru=y
CONFIG_PACKAGE_luci-app-tn-netports=y
CONFIG_PACKAGE_luci-i18n-tn-netports-ru=y
### Network traffic
CONFIG_PACKAGE_luci-app-sqm=y
CONFIG_PACKAGE_luci-i18n-sqm-ru=y
### TimeControl
#CONFIG_PACKAGE_luci-app-timecontrol=m

View File

@@ -17,10 +17,6 @@ CONFIG_PACKAGE_luci-i18n-dashboard-ru=y
CONFIG_PACKAGE_luci-app-tn-netports=y
CONFIG_PACKAGE_luci-i18n-tn-netports-ru=y
### Network traffic
CONFIG_PACKAGE_luci-app-sqm=y
CONFIG_PACKAGE_luci-i18n-sqm-ru=y
### TimeControl
#CONFIG_PACKAGE_luci-app-timecontrol=m

View File

@@ -23,10 +23,6 @@ CONFIG_PACKAGE_luci-i18n-dashboard-ru=y
CONFIG_PACKAGE_luci-app-tn-netports=y
CONFIG_PACKAGE_luci-i18n-tn-netports-ru=y
### Network traffic
CONFIG_PACKAGE_luci-app-sqm=y
CONFIG_PACKAGE_luci-i18n-sqm-ru=y
### TimeControl
CONFIG_PACKAGE_luci-app-timecontrol=m

View File

@@ -4,6 +4,7 @@ CONFIG_TARGET_mediatek_filogic_DEVICE_asus_rt-ax52=y
#include _addons.config
#include _base_initrd.config
#include _wifi_en.config
CONFIG_TARGET_INITRAMFS_FORCE=y

View File

@@ -23,10 +23,6 @@ CONFIG_PACKAGE_luci-i18n-dashboard-ru=y
CONFIG_PACKAGE_luci-app-tn-netports=y
CONFIG_PACKAGE_luci-i18n-tn-netports-ru=y
### Network traffic
CONFIG_PACKAGE_luci-app-sqm=y
CONFIG_PACKAGE_luci-i18n-sqm-ru=y
### TimeControl
CONFIG_PACKAGE_luci-app-timecontrol=m

View File

@@ -4,6 +4,7 @@ CONFIG_TARGET_mediatek_filogic_DEVICE_asus_rt-ax57m=y
#include _addons.config
#include _base_initrd.config
#include _wifi_en.config
CONFIG_TARGET_INITRAMFS_FORCE=y

View File

@@ -37,10 +37,6 @@ CONFIG_PACKAGE_luci-i18n-dashboard-ru=y
CONFIG_PACKAGE_luci-app-tn-netports=y
CONFIG_PACKAGE_luci-i18n-tn-netports-ru=y
### Network traffic
CONFIG_PACKAGE_luci-app-sqm=y
CONFIG_PACKAGE_luci-i18n-sqm-ru=y
### TimeControl
CONFIG_PACKAGE_luci-app-timecontrol=m

View File

@@ -4,6 +4,7 @@ CONFIG_TARGET_mediatek_filogic_DEVICE_asus_rt-ax59u=y
#include _addons.config
#include _base_initrd.config
#include _wifi_en.config
CONFIG_TARGET_INITRAMFS_FORCE=y

View File

@@ -42,10 +42,6 @@ CONFIG_PACKAGE_luci-i18n-dashboard-ru=y
CONFIG_PACKAGE_luci-app-tn-netports=y
CONFIG_PACKAGE_luci-i18n-tn-netports-ru=y
### Network traffic
CONFIG_PACKAGE_luci-app-sqm=y
CONFIG_PACKAGE_luci-i18n-sqm-ru=y
### TimeControl
CONFIG_PACKAGE_luci-app-timecontrol=m

View File

@@ -37,10 +37,6 @@ CONFIG_PACKAGE_luci-i18n-dashboard-ru=y
CONFIG_PACKAGE_luci-app-tn-netports=y
CONFIG_PACKAGE_luci-i18n-tn-netports-ru=y
### Network traffic
CONFIG_PACKAGE_luci-app-sqm=y
CONFIG_PACKAGE_luci-i18n-sqm-ru=y
### TimeControl
CONFIG_PACKAGE_luci-app-timecontrol=m

View File

@@ -4,6 +4,7 @@ CONFIG_TARGET_mediatek_filogic_DEVICE_asus_tuf-ax4200=y
#include _addons.config
#include _base_initrd.config
#include _wifi_en.config
CONFIG_TARGET_INITRAMFS_FORCE=y

View File

@@ -37,10 +37,6 @@ CONFIG_PACKAGE_luci-i18n-dashboard-ru=y
CONFIG_PACKAGE_luci-app-tn-netports=y
CONFIG_PACKAGE_luci-i18n-tn-netports-ru=y
### Network traffic
CONFIG_PACKAGE_luci-app-sqm=y
CONFIG_PACKAGE_luci-i18n-sqm-ru=y
### TimeControl
CONFIG_PACKAGE_luci-app-timecontrol=m

View File

@@ -4,6 +4,7 @@ CONFIG_TARGET_mediatek_filogic_DEVICE_asus_tuf-ax6000=y
#include _addons.config
#include _base_initrd.config
#include _wifi_en.config
CONFIG_TARGET_INITRAMFS_FORCE=y

View File

@@ -127,6 +127,25 @@ function build_target {
fi
fi
PODKOP_MK=$XDIR/package/feeds/_podkop/podkop/Makefile
if [ -f $PODKOP_MK ]; then
sed -i 's/+sing-box / /g' $PODKOP_MK
fi
PODKOP_SH=$XDIR/package/feeds/_podkop/podkop/files/usr/bin/podkop
if [ -f $PODKOP_SH ] && ! grep -q '(which sing-box)' $PODKOP_SH ; then
sed -i '/,\\"dns_configured\\":/i [ -z "$(which sing-box)" ] && status="not installed"' $PODKOP_SH
fi
DROPBEAR_MK=$XDIR/package/network/services/dropbear/Makefile
if [ -f $DROPBEAR_MK ]; then
sed -i 's/^PKG_RELEASE:=.*/PKG_RELEASE:=0/g' $DROPBEAR_MK
sed -i '/,CONFIG_DROPBEAR_MODERN_ONLY,/d' $DROPBEAR_MK
sed -i 's/\tCONFIG_DROPBEAR_MODERN_ONLY/ /g' $DROPBEAR_MK
sed -i 's/ CONFIG_DROPBEAR_MODERN_ONLY/ /g' $DROPBEAR_MK
sed -i 's/DROPBEAR_DH_GROUP14_SHA1,0/ /g' $DROPBEAR_MK
sed -i 's/DROPBEAR_SHA1_HMAC,0/ /g' $DROPBEAR_MK
fi
make defconfig
NSS_DRV_PPPOE_ENABLE=$( get_cfg_opt_flag $CFG NSS_DRV_PPPOE_ENABLE )
@@ -233,11 +252,11 @@ function build_target {
cp $FANT_PKG_KEY $OPKG_KEYS_DIR/53ff2b6672243d28
OPKG_CFEED_FN=$OPKG_DIR/customfeeds.conf
cp $OPKG_SRC_DIR/customfeeds.conf $OPKG_CFEED_FN
PKG_LINK="https://fantastic-packages.github.io/packages/releases/<<VER>>/packages/<<ARCH>>"
echo "" >> $OPKG_CFEED_FN
fant_luci="src/gz fantastic_packages_luci https://fantastic-packages.github.io/packages/releases/<<VER>>/packages/<<ARCH>>/luci"
echo "$fant_luci" >> $OPKG_CFEED_FN
fant_pkgs="src/gz fantastic_packages_packages https://fantastic-packages.github.io/packages/releases/<<VER>>/packages/<<ARCH>>/packages"
echo "$fant_pkgs" >> $OPKG_CFEED_FN
echo "src/gz fantastic_packages_luci $PKG_LINK/luci" >> $OPKG_CFEED_FN
echo "src/gz fantastic_packages_packages $PKG_LINK/packages" >> $OPKG_CFEED_FN
echo "src/gz fantastic_packages_special $PKG_LINK/special" >> $OPKG_CFEED_FN
TARGET_ARCH_PACKAGES=$( get_cfg_opt_value $CFG TARGET_ARCH_PACKAGES )
[ -z "$TARGET_ARCH_PACKAGES" ] && die "Cannot find TARGET ARCH"
sed -i "s/<<VER>>/24.10/g" $OPKG_CFEED_FN

47
zen-bt8.config Normal file
View File

@@ -0,0 +1,47 @@
CONFIG_TARGET_mediatek=y
CONFIG_TARGET_mediatek_filogic=y
CONFIG_TARGET_mediatek_filogic_DEVICE_asus_zenwifi-bt8=y
#include _addons.config
#include _base.config
#include _wifi_en.config
#include _printer.config
#include _samba.config
#include _torrents.config
#include _proxy.config
#include _argon.config
#include _vpn.config
CONFIG_KERNEL_KALLSYMS=y
### Temp and sensors
CONFIG_PACKAGE_lm-sensors=y
CONFIG_PACKAGE_lm-sensors-detect=y
CONFIG_PACKAGE_luci-app-temp-status=y
CONFIG_PACKAGE_luci-i18n-temp-status-ru=y
CONFIG_PACKAGE_collectd-mod-sensors=y
### USB
CONFIG_PACKAGE_kmod-usb-storage-uas=y
### HDD tools
CONFIG_PACKAGE_smartmontools=y
CONFIG_PACKAGE_hdparm=y
CONFIG_PACKAGE_hd-idle=y
CONFIG_PACKAGE_luci-app-hd-idle=y
#CONFIG_PACKAGE_luci-i18n-hd-idle-ru=y
CONFIG_PACKAGE_luci-app-disks-info=y
#CONFIG_PACKAGE_luci-i18n-disks-info-ru=y
CONFIG_PACKAGE_luci-app-diskman=y
### Luci dashboard
CONFIG_PACKAGE_luci-mod-dashboard=y
CONFIG_PACKAGE_luci-i18n-dashboard-ru=y
### Network Ports viewer
CONFIG_PACKAGE_luci-app-tn-netports=y
CONFIG_PACKAGE_luci-i18n-tn-netports-ru=y
### TimeControl
CONFIG_PACKAGE_luci-app-timecontrol=m

17
zen-bt8_initramfs.config Normal file
View File

@@ -0,0 +1,17 @@
CONFIG_TARGET_mediatek=y
CONFIG_TARGET_mediatek_filogic=y
CONFIG_TARGET_mediatek_filogic_DEVICE_asus_zenwifi-bt8=y
CONFIG_KERNEL_KALLSYMS=y
#include _addons.config
#include _base_initrd.config
#include _wifi_en.config
CONFIG_TARGET_INITRAMFS_FORCE=y
CONFIG_TARGET_ROOTFS_INITRAMFS=y
CONFIG_USES_SEPARATE_INITRAMFS=n
CONFIG_TARGET_ROOTFS_INITRAMFS_SEPARATE=n