xmake: Fix build podkop (remove conflicts)

.github/workflows/build.yml

@@ -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:
@@ -244,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

_addons.config

@@ -45,6 +45,10 @@ CONFIG_FEED__alpine_fan_control=m
 #GIT_FEED _amneziawg=https://github.com/lolo6oT/awg-openwrt.git dev-24.10
 CONFIG_FEED__amneziawg=m
 
+### Zapret
+#GIT_FEED _zapret=https://github.com/remittor/zapret-openwrt.git
+CONFIG_FEED__zapret=m
+
 ### ruantiblock
 #GIT_FEED _ruantiblock=https://github.com/gSpotx2f/ruantiblock_openwrt.git
 CONFIG_FEED__ruantiblock=m

_proxy.config

@@ -7,3 +7,9 @@ CONFIG_PACKAGE_luci-app-https-dns-proxy=y
 CONFIG_PACKAGE_luci-i18n-https-dns-proxy-ru=y
 
 CONFIG_PACKAGE_igmpproxy=y
+
+CONFIG_PACKAGE_zapret=y
+CONFIG_PACKAGE_zapret-tpws=y
+CONFIG_PACKAGE_zapret-mdig=y
+CONFIG_PACKAGE_zapret-ip2net=y
+CONFIG_PACKAGE_luci-app-zapret=y

_vpn.config

@@ -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

xmake.sh

@@ -127,6 +127,26 @@ 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
+		sed -i 's/CONFLICTS:=.*/CONFLICTS:=/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 )
@@ -220,7 +240,20 @@ function build_target {
 			sed -i 's/\$(INSTALL_DIR) \$(1)\/usr\/{bin,sbin}/#\$(INSTALL_DIR) \$(1)\/usr\/__bin_sbin__/g' $NTFS3G
 		fi
 	fi
-
+	
+	XPATCHES=$XDIR/patches
+	for incfn in $XPATCHES/*.patch; do
+		[ ! -f "$incfn" ] && continue
+		inc=`patch -p1 -N -r - < "$incfn"`
+		if [ $? != 0 ]; then
+			if ! echo "$inc" | grep -q "patch detected!  Skipping patch."; then
+				echo "Patch '$(basename $incfn)' FAILED"
+				exit 1
+			fi
+		fi
+		echo "Patch '$(basename $incfn)' result: OK"
+	done
+	
 	OPKG_DIR=$XDIR/files/etc/opkg
 	if [ -d $OPKG_DIR ]; then
 		rm -rf $OPKG_DIR

zen-bt8.config

@@ -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
+

zen-bt8_initramfs.config

@@ -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
+
+