From e5733fb9b365d1adc41f1e193348850fae5c98d3 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Mon, 21 Oct 2019 19:27:34 +0200 Subject: [PATCH 1/7] Fix #705 --- config | 2 +- config-bpi-r2 | 2 +- config-rpi2 | 2 +- config-rpi3 | 2 +- config-rpi4 | 2 +- config-x86_64 | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config b/config index db0543e7..3dce52b7 100644 --- a/config +++ b/config @@ -230,4 +230,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 From 770e4eb3ee191ffacdc369a43378c6f2d446a9a5 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Wed, 23 Oct 2019 17:06:10 +0200 Subject: [PATCH 2/7] Fix packages links for x86 --- build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.sh b/build.sh index 2372d718..59e82e7c 100755 --- a/build.sh +++ b/build.sh @@ -51,6 +51,8 @@ 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 From fa7d7566008527a181dd79f6eda0868651a1ac81 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Sat, 26 Oct 2019 12:00:05 +0200 Subject: [PATCH 3/7] Enable ECF as module --- config | 1 + root/target/linux/generic/config-4.19 | 1 + 2 files changed, 2 insertions(+) diff --git a/config b/config index 3dce52b7..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 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 From 996759b3e1e94e13bdeb5fa90190d31b15c44386 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Sun, 27 Oct 2019 08:57:41 +0100 Subject: [PATCH 4/7] Update to latest OpenWRT commit --- build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sh b/build.sh index 59e82e7c..0eee3929 100755 --- a/build.sh +++ b/build.sh @@ -58,9 +58,9 @@ else 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 "b9d58f7e066fdd58be173c56e0f3ff3664d08059" +_get_repo feeds/packages https://github.com/openwrt/packages "9d39cd2d3c117578fd99291b11c3363c7b91b774" +_get_repo feeds/luci https://github.com/openwrt/luci "176cbe12ea29006e4d4bf9dd3fe2ee708c010372" if [ -z "$OMR_FEED" ]; then OMR_FEED=feeds/openmptcprouter From e3863a861f2d1dae52c9c72cd92c9b9c05f9418a Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Tue, 29 Oct 2019 21:38:55 +0100 Subject: [PATCH 5/7] Update OpenWrt --- build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sh b/build.sh index 0eee3929..65b8441e 100755 --- a/build.sh +++ b/build.sh @@ -58,9 +58,9 @@ else fi #_get_repo source https://github.com/ysurac/openmptcprouter-source "master" -_get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "b9d58f7e066fdd58be173c56e0f3ff3664d08059" -_get_repo feeds/packages https://github.com/openwrt/packages "9d39cd2d3c117578fd99291b11c3363c7b91b774" -_get_repo feeds/luci https://github.com/openwrt/luci "176cbe12ea29006e4d4bf9dd3fe2ee708c010372" +_get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "f526e85426aa8d232b167e871a0b329f0205f827" +_get_repo feeds/packages https://github.com/openwrt/packages "fa5c7b4c9a1d4b963e0d4ecb4385b2d5039d43b3" +_get_repo feeds/luci https://github.com/openwrt/luci "58ae7e1dc07bdb0219c57b60ed2a4da9c822e352" if [ -z "$OMR_FEED" ]; then OMR_FEED=feeds/openmptcprouter From 60ab0310e789bebcd793a4faaa737be8408db71b Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Wed, 6 Nov 2019 18:09:12 +0100 Subject: [PATCH 6/7] Update OpenWrt --- build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sh b/build.sh index 65b8441e..291672a4 100755 --- a/build.sh +++ b/build.sh @@ -58,9 +58,9 @@ else fi #_get_repo source https://github.com/ysurac/openmptcprouter-source "master" -_get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "f526e85426aa8d232b167e871a0b329f0205f827" -_get_repo feeds/packages https://github.com/openwrt/packages "fa5c7b4c9a1d4b963e0d4ecb4385b2d5039d43b3" -_get_repo feeds/luci https://github.com/openwrt/luci "58ae7e1dc07bdb0219c57b60ed2a4da9c822e352" +_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 From 6607a53cded215358d64b9c682f6bc75cd34549f Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Wed, 6 Nov 2019 18:35:48 +0100 Subject: [PATCH 7/7] Update UEFI patch --- patches/uefi.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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"