aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Štetiar <ynezz@true.cz>2019-03-28 15:02:22 +0000
committerPetr Štetiar <ynezz@true.cz>2019-06-25 14:12:22 +0000
commit438a2c5f4a58019ffe97de9fa353cb5417930d25 (patch)
tree1c17ae47c5582476ef399b32a759027eb1efb5e6
parent62105e5c9a4ed8f205c48ef39f4aeedc34eef643 (diff)
downloadupstream-438a2c5f4a58019ffe97de9fa353cb5417930d25.tar.gz
upstream-438a2c5f4a58019ffe97de9fa353cb5417930d25.tar.bz2
upstream-438a2c5f4a58019ffe97de9fa353cb5417930d25.zip
rb532,x86: image: use new IMG_COMBINED and IMG_ROOTFS vars
In `build: image: Add IMG_ROOTFS and IMG_COMBINED variables` we've added this new variables so switch to them now. Signed-off-by: Petr Štetiar <ynezz@true.cz>
-rw-r--r--target/linux/rb532/image/Makefile2
-rw-r--r--target/linux/x86/image/Makefile24
2 files changed, 13 insertions, 13 deletions
diff --git a/target/linux/rb532/image/Makefile b/target/linux/rb532/image/Makefile
index 12265fe2c6..615c9bd265 100644
--- a/target/linux/rb532/image/Makefile
+++ b/target/linux/rb532/image/Makefile
@@ -84,7 +84,7 @@ define Image/Build
$(call Image/Build/$(1),$(1))
$(CP) $(KDIR)/vmlinux.elf $(BIN_DIR)/$(IMG_PREFIX)-$(1).kernel
$(STAGING_DIR_HOST)/bin/patch-cmdline $(BIN_DIR)/$(IMG_PREFIX)-$(1).kernel 'root=/dev/sda2 '
- ./gen_image.sh $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).bin \
+ ./gen_image.sh $(BIN_DIR)/$(IMG_COMBINED)-$(1).bin \
6 $(BIN_DIR)/$(IMG_PREFIX)-$(1).kernel \
$(CONFIG_TARGET_ROOTFS_PARTSIZE) $(KDIR)/root.$(1) \
128
diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile
index 2d04d12237..0771547f29 100644
--- a/target/linux/x86/image/Makefile
+++ b/target/linux/x86/image/Makefile
@@ -71,7 +71,7 @@ ifneq ($(CONFIG_GRUB_IMAGES),)
-c ./grub-early.cfg \
$(GRUB2_MODULES)
$(CP) $(STAGING_DIR_HOST)/lib/grub/i386-pc/*.img $(KDIR)/grub2/
- echo '(hd0) $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img' > $(KDIR)/grub2/device.map
+ echo '(hd0) $(BIN_DIR)/$(IMG_COMBINED)-$(1).img' > $(KDIR)/grub2/device.map
sed \
-e 's#@SERIAL_CONFIG@#$(strip $(GRUB_SERIAL_CONFIG))#g' \
-e 's#@TERMINAL_CONFIG@#$(strip $(GRUB_TERMINAL_CONFIG))#g' \
@@ -81,7 +81,7 @@ ifneq ($(CONFIG_GRUB_IMAGES),)
./grub.cfg > $(KDIR)/root.grub/boot/grub/grub.cfg
-$(CP) $(STAGING_DIR_ROOT)/boot/. $(KDIR)/root.grub/boot/
PADDING="1" SIGNATURE="$(SIGNATURE)" PATH="$(TARGET_PATH)" $(SCRIPT_DIR)/gen_image_generic.sh \
- $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
+ $(BIN_DIR)/$(IMG_COMBINED)-$(1).img \
$(CONFIG_TARGET_KERNEL_PARTSIZE) $(KDIR)/root.grub \
$(CONFIG_TARGET_ROOTFS_PARTSIZE) $(KDIR)/root.$(1) \
256
@@ -89,7 +89,7 @@ ifneq ($(CONFIG_GRUB_IMAGES),)
--device-map="$(KDIR)/grub2/device.map" \
-d "$(KDIR)/grub2" \
-r "hd0,msdos1" \
- "$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img"
+ "$(BIN_DIR)/$(IMG_COMBINED)-$(1).img"
endef
endif
@@ -125,25 +125,25 @@ endef
ifneq ($(CONFIG_VDI_IMAGES),)
define Image/Build/vdi
- rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi || true
+ rm $(BIN_DIR)/$(IMG_COMBINED)-$(1).vdi || true
qemu-img convert -f raw -O vdi \
- $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
- $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi
+ $(BIN_DIR)/$(IMG_COMBINED)-$(1).img \
+ $(BIN_DIR)/$(IMG_COMBINED)-$(1).vdi
endef
endif
ifneq ($(CONFIG_VMDK_IMAGES),)
define Image/Build/vmdk
- rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vmdk || true
+ rm $(BIN_DIR)/$(IMG_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
+ $(BIN_DIR)/$(IMG_COMBINED)-$(1).img \
+ $(BIN_DIR)/$(IMG_COMBINED)-$(1).vmdk
endef
endif
define Image/Build/gzip
- gzip -f9n $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img
- gzip -f9n $(BIN_DIR)/$(IMG_PREFIX)-rootfs-$(1).img
+ gzip -f9n $(BIN_DIR)/$(IMG_COMBINED)-$(1).img
+ gzip -f9n $(BIN_DIR)/$(IMG_ROOTFS)-$(1).img
endef
ifneq ($(CONFIG_TARGET_IMAGES_GZIP),)
@@ -173,7 +173,7 @@ define Image/Build
$(call Image/Build/grub2,$(1))
$(call Image/Build/vdi,$(1))
$(call Image/Build/vmdk,$(1))
- $(CP) $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_PREFIX)-rootfs-$(1).img
+ $(CP) $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_ROOTFS)-$(1).img
else
$(CP) $(KDIR)/root.iso $(BIN_DIR)/$(IMG_PREFIX).iso
endif