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

Merge pull request #1 from Ysurac/develop

update
This commit is contained in:
user747 2019-11-10 23:52:22 -05:00 committed by GitHub
commit 9f5fd38fee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 15 additions and 11 deletions

View file

@ -51,14 +51,16 @@ elif [ "$OMR_TARGET" = "wrt32x" ]; then
OMR_REAL_TARGET="arm_cortex-a9_vfpv3"
elif [ "$OMR_TARGET" = "bpi-r2" ]; then
OMR_REAL_TARGET="arm_cortex-a7_neon-vfpv4"
elif [ "$OMR_TARGET" = "x86" ]; then
OMR_REAL_TARGET="i386_pentium4"
else
OMR_REAL_TARGET=${OMR_TARGET}
fi
#_get_repo source https://github.com/ysurac/openmptcprouter-source "master"
_get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "ced4c0e6352a7994f4facd3de2e541ba073a7008"
_get_repo feeds/packages https://github.com/openwrt/packages "a2bbedb880ff9d37549c1e0e334177ce0dc88937"
_get_repo feeds/luci https://github.com/openwrt/luci "f3ff641d8e4e5127db7fc7738187edb4aa88d18b"
_get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "80a799125bf34b49793e7757e3d08d30030c1b92"
_get_repo feeds/packages https://github.com/openwrt/packages "2c08576233b5ef76a9c4f640a55ad1e0336fae0d"
_get_repo feeds/luci https://github.com/openwrt/luci "a8a76978298ba1cfddadbb48da73fa2abde82692"
if [ -z "$OMR_FEED" ]; then
OMR_FEED=feeds/openmptcprouter

1
config
View file

@ -194,6 +194,7 @@ CONFIG_KERNEL_DEFAULT_FULLMESH=y
CONFIG_KERNEL_MPTCP_NDIFFPORTS=y
CONFIG_KERNEL_DEFAULT_NDIFFPORTS=n
CONFIG_KERNEL_MPTCP_BINDER=y
CONFIG_KERNEL_MPTCP_ECF=y
CONFIG_KERNEL_DEFAULT_BINDER=n
CONFIG_KERNEL_DEFAULT_DUMMY=n
CONFIG_KERNEL_MPTCP_ROUNDROBIN=y

View file

@ -841,13 +841,13 @@ index d9beeb02953..cc5a4d56fbe 100755
[ -n "$PADDING" ] && dd if=/dev/zero of="$OUTPUT" bs=512 seek="$ROOTFSOFFSET" conv=notrunc count="$ROOTFSSIZE"
dd if="$ROOTFSIMAGE" of="$OUTPUT" bs=512 seek="$ROOTFSOFFSET" conv=notrunc
-make_ext4fs -J -l "$KERNELSIZE" "$OUTPUT.kernel" "$KERNELDIR"
-make_ext4fs -J -L kernel -l "$KERNELSIZE" "$OUTPUT.kernel" "$KERNELDIR"
+if [ -n "$EFI_SIGNATURE" ]; then
+ [ -n "$PADDING" ] && dd if=/dev/zero of="$OUTPUT" bs=512 seek="$(($ROOTFSOFFSET + $ROOTFSSIZE))" conv=notrunc count="$sect"
+ mkfs.fat -C "$OUTPUT.kernel" -S 512 "$(($KERNELSIZE / 1024))"
+ mcopy -s -i "$OUTPUT.kernel" "$KERNELDIR"/* ::/
+else
+ make_ext4fs -J -l "$KERNELSIZE" "$OUTPUT.kernel" "$KERNELDIR"
+ make_ext4fs -J -L kernel -l "$KERNELSIZE" "$OUTPUT.kernel" "$KERNELDIR"
+fi
dd if="$OUTPUT.kernel" of="$OUTPUT" bs=512 seek="$KERNELOFFSET" conv=notrunc
rm -f "$OUTPUT.kernel"

View file

@ -6123,6 +6123,7 @@ CONFIG_MPTCP_ROUNDROBIN=y
CONFIG_MPTCP_BLEST=y
CONFIG_MPTCP_REDUNDANT=y
CONFIG_MPTCP_NETLINK=y
CONFIG_MPTCP_ECF=y
CONFIG_DEFAULT_FULLMESH=y
CONFIG_DEFAULT_SCHEDULER=y
# CONFIG_DEFAULT_NDIFFPORTS is not set