1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter.git synced 2025-03-09 15:40:20 +00:00
Ycarus (Yannick Chabanois) 2023-12-07 21:22:28 +01:00
parent 9507a41175
commit 0ede546bd4
2 changed files with 99 additions and 3 deletions

View file

@ -799,9 +799,6 @@ rm -rf feeds/${OMR_KERNEL}/luci/modules/luci-mod-network
if [ -d ${OMR_FEED}/netifd ]; then
if [ "${OMR_KERNEL}" != "5.4" ]; then
rm -rf ${OMR_TARGET}/${OMR_KERNEL}/source/package/network/config/netifd
else
rm -rf ${OMR_FEED}/netifd
fi
fi
[ -d ${OMR_FEED}/iperf3 ] && rm -rf feeds/${OMR_KERNEL}/packages/net/iperf3
[ -d ${OMR_FEED}/golang ] && rm -rf feeds/${OMR_KERNEL}/packages/lang/golang
@ -818,6 +815,9 @@ fi
if ! patch -Rf -N -p1 -s --dry-run < ../../patches/luci-syslog.patch; then
patch -N -p1 -s < ../../patches/luci-syslog.patch
fi
if [ "$OMR_KERNEL" = "5.4" ] && ! patch -Rf -N -p1 -s --dry-run < ../../patches/luci-base-add_array_sort_utilities.patch; then
patch -N -p1 -s < ../../patches/luci-base-add_array_sort_utilities.patch
fi
if [ ! patch -Rf -N -p1 -s --dry-run < ../../patches/luci-nftables.patch ] && [ -d luci/modules/luci-mod-status ]; then
patch -N -p1 -s < ../../patches/luci-nftables.patch
fi
@ -851,6 +851,14 @@ if [ -n "$CUSTOM_FEED" ]; then
else
scripts/feeds install -a -d y -f -p openmptcprouter
fi
# Use iproute2 package from the normal repo for 5.4
if [ "$OMR_KERNEL" = "5.4" ]; then
scripts/feeds uninstall iproute2
scripts/feeds uninstall libbpf
scripts/feeds uninstall netifd
scripts/feeds install iproute2
scripts/feeds install netifd
fi
cp .config.keep .config
scripts/feeds install kmod-macremapper
echo "Done"