diff --git a/build.sh b/build.sh index 2372d718..291672a4 100755 --- a/build.sh +++ b/build.sh @@ -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 diff --git a/config b/config index db0543e7..792e660b 100644 --- a/config +++ b/config @@ -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 @@ -230,4 +231,4 @@ CONFIG_LUCI_LANG_fr=y CONFIG_LUCI_LANG_it=y CONFIG_TARGET_ROOTFS_PARTSIZE=512 CONFIG_TARGET_KERNEL_PARTSIZE=64 -CONFIG_OPENSSL_WITH_CHACHA_POLY1305=y \ No newline at end of file +CONFIG_OPENSSL_WITH_CHACHA_POLY1305=y diff --git a/config-bpi-r2 b/config-bpi-r2 index 3c8e764d..6794d248 100644 --- a/config-bpi-r2 +++ b/config-bpi-r2 @@ -14,4 +14,4 @@ CONFIG_PACKAGE_uboot-envtools=y CONFIG_PACKAGE_attr=y CONFIG_PACKAGE_f2fs-tools=y CONFIG_PACKAGE_f2fsck=y -CONFIG_PACKAGE_mkf2fs=y \ No newline at end of file +CONFIG_PACKAGE_mkf2fs=y diff --git a/config-rpi2 b/config-rpi2 index dc3ef074..cead6078 100644 --- a/config-rpi2 +++ b/config-rpi2 @@ -2,4 +2,4 @@ CONFIG_TARGET_brcm2708=y CONFIG_TARGET_brcm2708_bcm2709=y CONFIG_TARGET_brcm2708_bcm2709_DEVICE_rpi-2=y CONFIG_PACKAGE_kmod-ath10k-ct=n -CONFIG_PACKAGE_kmod-ath9k=y \ No newline at end of file +CONFIG_PACKAGE_kmod-ath9k=y diff --git a/config-rpi3 b/config-rpi3 index e46b0c10..bfa3a004 100644 --- a/config-rpi3 +++ b/config-rpi3 @@ -2,4 +2,4 @@ CONFIG_TARGET_brcm2708=y CONFIG_TARGET_brcm2708_bcm2710=y CONFIG_TARGET_brcm2708_bcm2710_DEVICE_rpi-3=y CONFIG_PACKAGE_kmod-ath10k-ct=n -CONFIG_PACKAGE_kmod-ath9k=y \ No newline at end of file +CONFIG_PACKAGE_kmod-ath9k=y diff --git a/config-rpi4 b/config-rpi4 index d2580752..bf27d75f 100644 --- a/config-rpi4 +++ b/config-rpi4 @@ -2,4 +2,4 @@ CONFIG_TARGET_brcm2708=y CONFIG_TARGET_brcm2708_bcm2711=y CONFIG_TARGET_brcm2708_bcm2711_DEVICE_rpi-4=y CONFIG_PACKAGE_kmod-ath10k-ct=n -CONFIG_PACKAGE_kmod-ath9k=y \ No newline at end of file +CONFIG_PACKAGE_kmod-ath9k=y diff --git a/config-x86_64 b/config-x86_64 index fdfdcdfc..25699d13 100644 --- a/config-x86_64 +++ b/config-x86_64 @@ -8,4 +8,4 @@ CONFIG_PACKAGE_open-vm-tools=m CONFIG_PACKAGE_kmod-ath9k=y CONFIG_GRUB_IMAGES=y CONFIG_EFI_IMAGES=y -# CONFIG_VMDK_IMAGES is not set \ No newline at end of file +# CONFIG_VMDK_IMAGES is not set diff --git a/patches/uefi.patch b/patches/uefi.patch index 1b126561..31a8ef38 100644 --- a/patches/uefi.patch +++ b/patches/uefi.patch @@ -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" diff --git a/root/target/linux/generic/config-4.19 b/root/target/linux/generic/config-4.19 index ab6e1113..44f72f2c 100644 --- a/root/target/linux/generic/config-4.19 +++ b/root/target/linux/generic/config-4.19 @@ -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