topaLE
/
ni-buildsystem
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

- images.mk. use CD variable

master
vanhofen 7 years ago
parent
92b905650c
commit
40b085332e
1 changed files with 9 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      make/images.mk

8
make/images.mk
View File

@ -118,11 +118,11 @@ flash-image-armbox: IMAGE_DATE=$(shell cat $(ROOTFS)/.version | grep "^version="
flash-image-armbox: flash-image-armbox:
mkdir -p $(IMAGE_BUILD_TMP)/$(BOXMODEL) mkdir -p $(IMAGE_BUILD_TMP)/$(BOXMODEL)
cp $(KERNEL_ZIMAGE_DTB) $(IMAGE_BUILD_TMP)/$(BOXMODEL)/kernel.bin cp $(KERNEL_ZIMAGE_DTB) $(IMAGE_BUILD_TMP)/$(BOXMODEL)/kernel.bin
cd $(ROOTFS); \ $(CD) $(ROOTFS); \
tar -cvf $(IMAGE_BUILD_TMP)/$(BOXMODEL)/rootfs.tar -C $(ROOTFS) . >/dev/null 2>&1; \ tar -cvf $(IMAGE_BUILD_TMP)/$(BOXMODEL)/rootfs.tar -C $(ROOTFS) . >/dev/null 2>&1; \
bzip2 $(IMAGE_BUILD_TMP)/$(BOXMODEL)/rootfs.tar bzip2 $(IMAGE_BUILD_TMP)/$(BOXMODEL)/rootfs.tar
# Create minimal image # Create minimal image
cd $(IMAGE_BUILD_TMP)/$(BOXMODEL); \ $(CD) $(IMAGE_BUILD_TMP)/$(BOXMODEL); \
tar -czf $(IMAGE_DIR)/$(IMAGE_NAME).tgz kernel.bin rootfs.tar.bz2 tar -czf $(IMAGE_DIR)/$(IMAGE_NAME).tgz kernel.bin rootfs.tar.bz2
echo $(IMAGE_URL)/$(IMAGE_NAME).tgz $(IMAGE_TYPE)$(IMAGE_VERSION)$(IMAGE_DATE) `md5sum $(IMAGE_DIR)/$(IMAGE_NAME).tgz | cut -c1-32` $(IMAGE_DESC) $(IMAGE_VERSION_STRING) >> $(IMAGE_DIR)/$(IMAGE_MD5FILE) echo $(IMAGE_URL)/$(IMAGE_NAME).tgz $(IMAGE_TYPE)$(IMAGE_VERSION)$(IMAGE_DATE) `md5sum $(IMAGE_DIR)/$(IMAGE_NAME).tgz | cut -c1-32` $(IMAGE_DESC) $(IMAGE_VERSION_STRING) >> $(IMAGE_DIR)/$(IMAGE_MD5FILE)
rm -rf $(IMAGE_BUILD_TMP)/$(BOXMODEL) rm -rf $(IMAGE_BUILD_TMP)/$(BOXMODEL)
@ -192,11 +192,11 @@ flash-image-armbox-multi:
mkdir -p $(IMAGE_DIR)/$(BOXMODEL) mkdir -p $(IMAGE_DIR)/$(BOXMODEL)
cp $(KERNEL_ZIMAGE_DTB) $(IMAGE_DIR)/$(BOXMODEL)/kernel.bin cp $(KERNEL_ZIMAGE_DTB) $(IMAGE_DIR)/$(BOXMODEL)/kernel.bin
cp $(EMMC_IMAGE) $(IMAGE_DIR)/$(BOXMODEL) cp $(EMMC_IMAGE) $(IMAGE_DIR)/$(BOXMODEL)
cd $(ROOTFS) && \ $(CD) $(ROOTFS); \
tar -cvf $(IMAGE_DIR)/$(BOXMODEL)/rootfs.tar -C $(ROOTFS) . >/dev/null 2>&1; \ tar -cvf $(IMAGE_DIR)/$(BOXMODEL)/rootfs.tar -C $(ROOTFS) . >/dev/null 2>&1; \
bzip2 $(IMAGE_DIR)/$(BOXMODEL)/rootfs.tar bzip2 $(IMAGE_DIR)/$(BOXMODEL)/rootfs.tar
echo $(IMAGE_PREFIX) > $(IMAGE_DIR)/$(BOXMODEL)/imageversion echo $(IMAGE_PREFIX) > $(IMAGE_DIR)/$(BOXMODEL)/imageversion
cd $(IMAGE_DIR) && \ $(CD) $(IMAGE_DIR); \
zip -r $(IMAGE_PREFIX)-$(IMAGE_SUFFIX)_multi_usb.zip $(BOXMODEL)/* zip -r $(IMAGE_PREFIX)-$(IMAGE_SUFFIX)_multi_usb.zip $(BOXMODEL)/*
# cleanup # cleanup
rm -rf $(IMAGE_DIR)/$(BOXMODEL) rm -rf $(IMAGE_DIR)/$(BOXMODEL)

Write Preview
Loading…
Cancel
Save