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

Merge branch 'test' into ipq60xx

Browse source
This commit is contained in:
suyuan168 2022-06-21 11:56:56 +08:00
commit 26f03e7e14
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
build.sh
View file

@ -140,7 +140,15 @@ rm -rf "$OMR_TARGET/${OMR_KERNEL}/source/target/linux/mediatek/patches-5.4"
rm -rf "$OMR_TARGET/${OMR_KERNEL}/source/package/boot/uboot-mediatek" rm -rf "$OMR_TARGET/${OMR_KERNEL}/source/package/boot/uboot-mediatek"
rm -rf "$OMR_TARGET/${OMR_KERNEL}/source/package/boot/arm-trusted-firmware-mediatek" rm -rf "$OMR_TARGET/${OMR_KERNEL}/source/package/boot/arm-trusted-firmware-mediatek"
rm -rf "$OMR_TARGET/${OMR_KERNEL}/source/tools/firmware-utils" rm -rf "$OMR_TARGET/${OMR_KERNEL}/source/tools/firmware-utils"
cp -rf root/* "$OMR_TARGET/${OMR_KERNEL}/source" if [ "$OMR_TARGET" != "rutx" ]; then
# There is many customization to support rutx and this seems to break other ipq40xx, so dirty workaround for now
mv "$OMR_TARGET/${OMR_KERNEL}/source/target/linux/ipq40xx" "$OMR_TARGET/${OMR_KERNEL}/source/target/linux/ipq40xx.old"
cp -rf root/* "$OMR_TARGET/${OMR_KERNEL}/source"
rm -rf "$OMR_TARGET/${OMR_KERNEL}/source/target/linux/ipq40xx"
mv "$OMR_TARGET/${OMR_KERNEL}/source/target/linux/ipq40xx.old" "$OMR_TARGET/${OMR_KERNEL}/source/target/linux/ipq40xx"
else
cp -rf root/* "$OMR_TARGET/${OMR_KERNEL}/source"
fi
cat >> "$OMR_TARGET/${OMR_KERNEL}/source/package/base-files/files/etc/banner" <<EOF cat >> "$OMR_TARGET/${OMR_KERNEL}/source/package/base-files/files/etc/banner" <<EOF
----------------------------------------------------- -----------------------------------------------------
@ -148,8 +156,6 @@ cat >> "$OMR_TARGET/${OMR_KERNEL}/source/package/base-files/files/etc/banner" <<
VERSION: $(git -C "$OMR_FEED" tag --sort=committerdate | tail -1) VERSION: $(git -C "$OMR_FEED" tag --sort=committerdate | tail -1)
TARGET: $OMR_TARGET TARGET: $OMR_TARGET
ARCH: $OMR_REAL_TARGET ARCH: $OMR_REAL_TARGET
BUILD REPO: $(git config --get remote.origin.url)
BUILD DATE: $(date -u) BUILD DATE: $(date -u)
----------------------------------------------------- -----------------------------------------------------
EOF EOF

2
root/target/linux/generic/config-5.4
View file

@ -1888,6 +1888,7 @@ CONFIG_GPIO_SYSFS=y
CONFIG_HARDENED_USERCOPY=y CONFIG_HARDENED_USERCOPY=y
# CONFIG_HARDENED_USERCOPY_FALLBACK is not set # CONFIG_HARDENED_USERCOPY_FALLBACK is not set
# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set # CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
CONFIG_HARDEN_BRANCH_HISTORY=y
CONFIG_HARDEN_EL2_VECTORS=y CONFIG_HARDEN_EL2_VECTORS=y
# CONFIG_HARDLOCKUP_DETECTOR is not set # CONFIG_HARDLOCKUP_DETECTOR is not set
# CONFIG_HAVE_AOUT is not set # CONFIG_HAVE_AOUT is not set
@ -3082,6 +3083,7 @@ CONFIG_MISC_FILESYSTEMS=y
# CONFIG_MISDN_NETJET is not set # CONFIG_MISDN_NETJET is not set
# CONFIG_MISDN_SPEEDFAX is not set # CONFIG_MISDN_SPEEDFAX is not set
# CONFIG_MISDN_W6692 is not set # CONFIG_MISDN_W6692 is not set
CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y
# CONFIG_MKISS is not set # CONFIG_MKISS is not set
# CONFIG_MLX4_CORE is not set # CONFIG_MLX4_CORE is not set
# CONFIG_MLX4_EN is not set # CONFIG_MLX4_EN is not set