1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter.git synced 2025-03-09 15:40:20 +00:00

Revert "Update build.sh"

This reverts commit 0780782826.
This commit is contained in:
suyuan 2021-04-05 03:39:20 +08:00
parent 56aa565b10
commit 5cf265f18c

View file

@ -207,6 +207,9 @@ fi
if [ "$OMR_PACKAGES" = "mini" ]; then if [ "$OMR_PACKAGES" = "mini" ]; then
echo "CONFIG_PACKAGE_${OMR_DIST}-mini=y" >> "$OMR_TARGET/source/.config" echo "CONFIG_PACKAGE_${OMR_DIST}-mini=y" >> "$OMR_TARGET/source/.config"
fi fi
if [ "$OMR_PACKAGES" = "zuixiao" ]; then
echo "CONFIG_PACKAGE_${OMR_DIST}-zuixiao=y" >> "$OMR_TARGET/source/.config"
fi
if [ "$OMR_TARGET" = "bpi-r1" -a "$OMR_OPENWRT" = "master" ]; then if [ "$OMR_TARGET" = "bpi-r1" -a "$OMR_OPENWRT" = "master" ]; then
# We disable mc in master, because it leads to unknown compilation errors on bpi-r1 target # We disable mc in master, because it leads to unknown compilation errors on bpi-r1 target
@ -336,13 +339,6 @@ if ! patch -Rf -N -p1 -s --dry-run < ../../patches/nanqinlang.patch; then
fi fi
echo "Done" echo "Done"
echo "Checking if remove_abi patch is set or not"
if ! patch -Rf -N -p1 -s --dry-run < ../../patches/remove_abi.patch; then
echo "apply..."
patch -N -p1 -s < ../../patches/remove_abi.patch
fi
echo "Done"
# Add BBR2 patch, only working on 64bits images for now # Add BBR2 patch, only working on 64bits images for now
if [ "$OMR_TARGET" = "x86_64" ] || [ "$OMR_TARGET" = "bpi-r64" ] || [ "$OMR_TARGET" = "rpi4" ] || [ "$OMR_TARGET" = "espressobin" ] || [ "$OMR_TARGET" = "r2s" ] || [ "$OMR_TARGET" = "rpi3" ]; then if [ "$OMR_TARGET" = "x86_64" ] || [ "$OMR_TARGET" = "bpi-r64" ] || [ "$OMR_TARGET" = "rpi4" ] || [ "$OMR_TARGET" = "espressobin" ] || [ "$OMR_TARGET" = "r2s" ] || [ "$OMR_TARGET" = "rpi3" ]; then
echo "Checking if BBRv2 patch is set or not" echo "Checking if BBRv2 patch is set or not"
@ -424,7 +420,7 @@ if [ "$OMR_KERNEL" = "5.4" ]; then
echo "Set to kernel 5.4 for mediatek arch (BPI-R2)" echo "Set to kernel 5.4 for mediatek arch (BPI-R2)"
find target/linux/mediatek -type f -name Makefile -exec sed -i 's%KERNEL_PATCHVER:=4.19%KERNEL_PATCHVER:=5.4%g' {} \; find target/linux/mediatek -type f -name Makefile -exec sed -i 's%KERNEL_PATCHVER:=4.19%KERNEL_PATCHVER:=5.4%g' {} \;
echo "Done" echo "Done"
echo "Set to kernel 5.4 for IPQ (4019)" echo "Set to kernel 5.4 for IPQ (4019)"
find target/linux/ipq40xx -type f -name Makefile -exec sed -i 's%KERNEL_PATCHVER:=4.19%KERNEL_PATCHVER:=5.4%g' {} \; find target/linux/ipq40xx -type f -name Makefile -exec sed -i 's%KERNEL_PATCHVER:=4.19%KERNEL_PATCHVER:=5.4%g' {} \;
echo "Done" echo "Done"
fi fi
@ -447,6 +443,7 @@ cd "$OMR_TARGET/source"
echo "Update feeds index" echo "Update feeds index"
cp .config .config.keep cp .config .config.keep
scripts/feeds clean scripts/feeds clean
scripts/feeds install -a
scripts/feeds update -a scripts/feeds update -a
#cd - #cd -
@ -479,4 +476,4 @@ fi
echo "Building $OMR_DIST for the target $OMR_TARGET" echo "Building $OMR_DIST for the target $OMR_TARGET"
make defconfig make defconfig
make IGNORE_ERRORS=m "$@" make IGNORE_ERRORS=m "$@"
echo "Done" echo "Done"