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

Update OpenWrt

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2020-03-06 10:58:06 +01:00
parent 07ac02e875
commit fc28fa0900
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
build.sh
View file

@ -58,9 +58,9 @@ else
fi fi
#_get_repo source https://github.com/ysurac/openmptcprouter-source "master" #_get_repo source https://github.com/ysurac/openmptcprouter-source "master"
_get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "fc65fae3048172c2aa9efb9c793789ebe8b0a8e3" _get_repo "$OMR_TARGET/source" https://github.com/openwrt/openwrt "a017773a92d624142a78452bc0c00e6bc6523967"
_get_repo feeds/packages https://github.com/openwrt/packages "552c9ec87a144980ebd2a54a3dbc1f3824597500" _get_repo feeds/packages https://github.com/openwrt/packages "e0c0c3c3f030c8582c9493ff894ee0528198f2ce"
_get_repo feeds/luci https://github.com/openwrt/luci "562425605af51443986cb2596199564e4102ffff" _get_repo feeds/luci https://github.com/openwrt/luci "0c7f3331aff33567e01e0d9c0c63b9a1a16fbe14"
if [ -z "$OMR_FEED" ]; then if [ -z "$OMR_FEED" ]; then
OMR_FEED=feeds/openmptcprouter OMR_FEED=feeds/openmptcprouter

8
patches/uefi.patch
View file

@ -937,7 +937,7 @@ index ac70e771c86..6af5cfed963 100644
GRUB_TIMEOUT:=$(call qstrip,$(CONFIG_GRUB_TIMEOUT)) GRUB_TIMEOUT:=$(call qstrip,$(CONFIG_GRUB_TIMEOUT))
GRUB_TITLE:=$(call qstrip,$(CONFIG_GRUB_TITLE)) GRUB_TITLE:=$(call qstrip,$(CONFIG_GRUB_TITLE))
@@ -93,8 +97,67 @@ ifneq ($(CONFIG_GRUB_IMAGES),) @@ -93,9 +97,68 @@ ifneq ($(CONFIG_GRUB_IMAGES),)
endef endef
endif endif
@ -1000,6 +1000,7 @@ index ac70e771c86..6af5cfed963 100644
+endif +endif
+ +
define Image/Build/iso define Image/Build/iso
rm -fR $(KDIR)/root.grub $(KDIR)/grub2
$(INSTALL_DIR) $(KDIR)/root.grub/boot/grub $(KDIR)/grub2 $(INSTALL_DIR) $(KDIR)/root.grub/boot/grub $(KDIR)/grub2
+ $(INSTALL_DIR) $(KDIR)/root.grub/efi/boot + $(INSTALL_DIR) $(KDIR)/root.grub/efi/boot
$(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz $(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz
@ -1195,7 +1196,7 @@ index ac060818df1..f66c5873e37 100644
get_partitions /tmp/image.bs image get_partitions /tmp/image.bs image
@@ -94,4 +94,17 @@ platform_do_upgrade() { @@ -94,6 +94,18 @@ platform_do_upgrade() {
#copy partition uuid #copy partition uuid
echo "Writing new UUID to /dev/$diskdev..." echo "Writing new UUID to /dev/$diskdev..."
get_image "$@" | dd of="/dev/$diskdev" bs=1 skip=440 count=4 seek=440 conv=fsync get_image "$@" | dd of="/dev/$diskdev" bs=1 skip=440 count=4 seek=440 conv=fsync
@ -1211,5 +1212,6 @@ index ac060818df1..f66c5873e37 100644
+ sed -i "s/\(PARTUUID=\)[a-f0-9-]\+/\1$4$3$2$1-$6$5-$8$7-$9/ig" /mnt/boot/grub/grub.cfg + sed -i "s/\(PARTUUID=\)[a-f0-9-]\+/\1$4$3$2$1-$6$5-$8$7-$9/ig" /mnt/boot/grub/grub.cfg
+ umount /mnt + umount /mnt
+ fi + fi
+
platform_do_bootloader_upgrade "$diskdev"
} }