domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rb532,x86: image: use new IMG_COMBINED and IMG_ROOTFS vars

Browse Source 
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>
This commit is contained in:
Petr Štetiar
2019-03-28 15:02:22 +00:00
parent 62105e5c9a
commit 438a2c5f4a
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/rb532/image/Makefile
View File

@@ -84,7 +84,7 @@ define Image/Build
$(call Image/Build/$(1),$(1)) $(call Image/Build/$(1),$(1))
$(CP) $(KDIR)/vmlinux.elf $(BIN_DIR)/$(IMG_PREFIX)-$(1).kernel $(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 ' $(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 \ 6 $(BIN_DIR)/$(IMG_PREFIX)-$(1).kernel \
$(CONFIG_TARGET_ROOTFS_PARTSIZE) $(KDIR)/root.$(1) \ $(CONFIG_TARGET_ROOTFS_PARTSIZE) $(KDIR)/root.$(1) \
128 128

24
target/linux/x86/image/Makefile
View File

@@ -71,7 +71,7 @@ ifneq ($(CONFIG_GRUB_IMAGES),)
-c ./grub-early.cfg \ -c ./grub-early.cfg \
$(GRUB2_MODULES) $(GRUB2_MODULES)
$(CP) $(STAGING_DIR_HOST)/lib/grub/i386-pc/*.img $(KDIR)/grub2/ $(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 \ sed \
-e 's#@SERIAL_CONFIG@#$(strip $(GRUB_SERIAL_CONFIG))#g' \ -e 's#@SERIAL_CONFIG@#$(strip $(GRUB_SERIAL_CONFIG))#g' \
-e 's#@TERMINAL_CONFIG@#$(strip $(GRUB_TERMINAL_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 ./grub.cfg > $(KDIR)/root.grub/boot/grub/grub.cfg
-$(CP) $(STAGING_DIR_ROOT)/boot/. $(KDIR)/root.grub/boot/ -$(CP) $(STAGING_DIR_ROOT)/boot/. $(KDIR)/root.grub/boot/
PADDING="1" SIGNATURE="$(SIGNATURE)" PATH="$(TARGET_PATH)" $(SCRIPT_DIR)/gen_image_generic.sh \ 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_KERNEL_PARTSIZE) $(KDIR)/root.grub \
$(CONFIG_TARGET_ROOTFS_PARTSIZE) $(KDIR)/root.$(1) \ $(CONFIG_TARGET_ROOTFS_PARTSIZE) $(KDIR)/root.$(1) \
256 256
@@ -89,7 +89,7 @@ ifneq ($(CONFIG_GRUB_IMAGES),)
--device-map="$(KDIR)/grub2/device.map" \ --device-map="$(KDIR)/grub2/device.map" \
-d "$(KDIR)/grub2" \ -d "$(KDIR)/grub2" \
-r "hd0,msdos1" \ -r "hd0,msdos1" \
"$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img" "$(BIN_DIR)/$(IMG_COMBINED)-$(1).img"
endef endef
endif endif
@@ -125,25 +125,25 @@ endef
ifneq ($(CONFIG_VDI_IMAGES),) ifneq ($(CONFIG_VDI_IMAGES),)
define Image/Build/vdi 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 \ qemu-img convert -f raw -O vdi \
$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \ $(BIN_DIR)/$(IMG_COMBINED)-$(1).img \
$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi $(BIN_DIR)/$(IMG_COMBINED)-$(1).vdi
endef endef
endif endif
ifneq ($(CONFIG_VMDK_IMAGES),) ifneq ($(CONFIG_VMDK_IMAGES),)
define Image/Build/vmdk 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 \ qemu-img convert -f raw -O vmdk \
$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \ $(BIN_DIR)/$(IMG_COMBINED)-$(1).img \
$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vmdk $(BIN_DIR)/$(IMG_COMBINED)-$(1).vmdk
endef endef
endif endif
define Image/Build/gzip define Image/Build/gzip
gzip -f9n $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img gzip -f9n $(BIN_DIR)/$(IMG_COMBINED)-$(1).img
gzip -f9n $(BIN_DIR)/$(IMG_PREFIX)-rootfs-$(1).img gzip -f9n $(BIN_DIR)/$(IMG_ROOTFS)-$(1).img
endef endef
ifneq ($(CONFIG_TARGET_IMAGES_GZIP),) ifneq ($(CONFIG_TARGET_IMAGES_GZIP),)
@@ -173,7 +173,7 @@ define Image/Build
$(call Image/Build/grub2,$(1)) $(call Image/Build/grub2,$(1))
$(call Image/Build/vdi,$(1)) $(call Image/Build/vdi,$(1))
$(call Image/Build/vmdk,$(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 else
$(CP) $(KDIR)/root.iso $(BIN_DIR)/$(IMG_PREFIX).iso $(CP) $(KDIR)/root.iso $(BIN_DIR)/$(IMG_PREFIX).iso
endif endif