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

Fix patch

Browse source
This commit is contained in:
Ycarus 2019-06-02 16:40:47 +02:00
parent 71c0381332
commit ccd48b1b1a
1 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
patches/images.patch
View file

@ -14,20 +14,14 @@
config TARGET_IMAGES_PAD config TARGET_IMAGES_PAD
bool "Pad images to filesystem size (for JFFS2)" bool "Pad images to filesystem size (for JFFS2)"
depends on GRUB_IMAGES depends on GRUB_IMAGES
--- a/target/linux/x86/image/Makefile 2019-05-28 14:35:00.895067331 +0200 --- a/target/linux/x86/image/Makefile.orig 2019-06-02 16:35:18.593501507 +0200
+++ b/target/linux/x86/image/Makefile 2019-05-28 14:42:40.461306376 +0200 +++ b/target/linux/x86/image/Makefile 2019-06-02 16:39:23.242404445 +0200
@@ -137,12 +137,21 @@ @@ -141,6 +141,15 @@
ifneq ($(CONFIG_VMDK_IMAGES),)
define Image/Build/vmdk
rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vmdk || true
qemu-img convert -f raw -O vmdk \
$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vmdk
endef endef
endif endif
+ifneq ($(CONFIG_HYPERV_IMAGES),) +ifneq ($(CONFIG_HYPERV_IMAGES),)
+ define Image/Build/hyperv + define Image/Build/hyperv
+ rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vhdx || true + rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vhdx || true
+ qemu-img convert -f raw -O vhdx \ + qemu-img convert -f raw -O vhdx \
+ $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \ + $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \