mptcp/openmptcprouter
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter.git synced 2025-02-14 12:21:53 +00:00
Code Issues Releases Wiki Activity

Update OpenWrt

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2020-03-30 15:13:13 +02:00
parent 138b2c224c
commit 1dfc55f12f
5 changed files with 24 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
build.sh
View file

@ -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 "dd166960f48580bf6d4a8dde071b96832bfd9e1f"
_get_repo feeds/packages https://github.com/openwrt/packages "ce15a63a9ef2877df1d61429dd6db5432a204d63"
_get_repo feeds/luci https://github.com/openwrt/luci "6efaea2ffb46f9909038b85cf12e7acf4467ae2e"
_get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "437eb41f235c25b397a9867527d738778ea489d7"
_get_repo feeds/packages https://github.com/openwrt/packages "61088496009579f86ebc1756e2331dee879ab333"
_get_repo feeds/luci https://github.com/openwrt/luci "3d965195928b993f7e2dacebd4e296a547b32552"
if [ -z "$OMR_FEED" ]; then
OMR_FEED=feeds/openmptcprouter

2
config-rpi2
View file

@ -3,4 +3,4 @@ CONFIG_TARGET_bcm27xx_bcm2709=y
CONFIG_TARGET_bcm27xx_bcm2709_DEVICE_rpi-2=y
CONFIG_PACKAGE_kmod-ath10k-ct=n
CONFIG_PACKAGE_kmod-ath9k=y
CONFIG_PACKAGE_rpi-eeprom=y
CONFIG_PACKAGE_bcm27xx-eeprom=y

2
config-rpi4
View file

@ -3,4 +3,4 @@ CONFIG_TARGET_bcm27xx_bcm2711=y
CONFIG_TARGET_bcm27xx_bcm2711_DEVICE_rpi-4=y
CONFIG_PACKAGE_kmod-ath10k-ct=n
CONFIG_PACKAGE_kmod-ath9k=y
CONFIG_PACKAGE_rpi-eeprom=y
CONFIG_PACKAGE_bcm27xx-eeprom=y

26
patches/uefi.patch
View file

@ -1144,8 +1144,8 @@ index aa80d77b978..efb0b1cff99 100644
define Build/combined
$(CP) $(KDIR)/$(KERNEL_NAME) $@.boot/boot/vmlinuz
-$(CP) $(STAGING_DIR_ROOT)/boot/. $@.boot/boot/
- PADDING="$(CONFIG_TARGET_IMAGES_PAD)" SIGNATURE="$(IMG_PART_SIGNATURE)" $(SCRIPT_DIR)/gen_image_generic.sh \
+ PADDING="$(CONFIG_TARGET_IMAGES_PAD)" SIGNATURE="$(IMG_PART_SIGNATURE)" \
- PADDING="1" SIGNATURE="$(IMG_PART_SIGNATURE)" $(SCRIPT_DIR)/gen_image_generic.sh \
+ PADDING="1" SIGNATURE="$(IMG_PART_SIGNATURE)" \
+ $(if $(filter $(1),efi),UUID="$(IMG_PART_UUID)") $(SCRIPT_DIR)/gen_image_generic.sh \
$@ \
$(CONFIG_TARGET_KERNEL_PARTSIZE) $@.boot \
@ -1177,19 +1177,21 @@ index aa80d77b978..efb0b1cff99 100644
-o $@ $@.boot $(TARGET_DIR)
endef
@@ -102,11 +105,23 @@ define Device/Default
IMAGE/combined.img.gz := append-rootfs | pad-extra 128k | grub-config pc | combined | grub-install | gzip
IMAGE/combined.vdi := append-rootfs | pad-extra 128k | grub-config pc | combined | grub-install | qemu-image vdi
IMAGE/combined.vmdk := append-rootfs | pad-extra 128k | grub-config pc | combined | grub-install | qemu-image vmdk
@@ -102,13 +105,25 @@ define Device/Default
IMAGE/combined.img.gz := grub-config pc | combined | grub-install | gzip
IMAGE/combined.vdi := grub-config pc | combined | grub-install | qemu-image vdi
IMAGE/combined.vmdk := grub-config pc | combined | grub-install | qemu-image vmdk
IMAGE/rootfs.img := append-rootfs
IMAGE/rootfs.img.gz := append-rootfs | gzip
+ ARTIFACT/image-efi.iso := grub-config iso | iso efi
+ IMAGE/combined-efi.img := append-rootfs | pad-extra 128k | grub-config efi | combined efi | grub-install efi
+ IMAGE/combined-efi.img.gz := append-rootfs | pad-extra 128k | grub-config efi | combined efi | grub-install efi | gzip
+ IMAGE/combined-efi.vdi := append-rootfs | pad-extra 128k | grub-config efi | combined efi | grub-install efi | qemu-image vdi
+ IMAGE/combined-efi.vmdk := append-rootfs | pad-extra 128k | grub-config efi | combined efi | grub-install efi | qemu-image vmdk
+ IMAGE/combined-efi.img := grub-config efi | combined efi | grub-install efi
+ IMAGE/combined-efi.img.gz := grub-config efi | combined efi | grub-install efi | gzip
+ IMAGE/combined-efi.vdi := grub-config efi | combined efi | grub-install efi | qemu-image vdi
+ IMAGE/combined-efi.vmdk := grub-config efi | combined efi | grub-install efi | qemu-image vmdk
ifeq ($(CONFIG_TARGET_IMAGES_GZIP),y)
IMAGES := combined.img.gz
IMAGES := combined.img.gz rootfs.img.gz
else
IMAGES := combined.img
IMAGES := combined.img rootfs.img
endif
+ ifeq $(CONFIG_EFI_IMAGES)
+ ifeq ($(CONFIG_TARGET_IMAGES_GZIP),y)

7
root/target/linux/generic/hack-5.4/690-mptcp_trunk.patch
View file

@ -2799,12 +2799,15 @@ diff -aurN linux-5.4/net/core/sock.c mptcp-mptcp_trunk/net/core/sock.c
} else
sk = kmalloc(prot->obj_size, priority);
@@ -1832,6 +1858,7 @@
@@ -1832,9 +1858,10 @@
atomic_set(&newsk->sk_zckey, 0);
sock_reset_flag(newsk, SOCK_DONE);
+ sock_reset_flag(newsk, SOCK_MPTCP);
mem_cgroup_sk_alloc(newsk);
/* sk->sk_memcg will be populated at accept() time */
newsk->sk_memcg = NULL;
cgroup_sk_alloc(&newsk->sk_cgrp_data);
diff -aurN linux-5.4/net/ipv4/af_inet.c mptcp-mptcp_trunk/net/ipv4/af_inet.c