KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

imx6: use ubinize-image.sh to fix build with per-device rootfs

Browse source 
Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2016-07-31 18:34:31 +02:00
parent 1448501558
commit 468a9b7a77
3 changed files with 4 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
target/linux/imx6/image/Makefile
View file

@ -51,20 +51,10 @@ define Build/ubi-boot-overlay
$(BIN_DIR)/$(IMG_PREFIX)-$(DEVICE_NAME)-bootfs_$(word 1, $(1)).ubifs
# ubi
rm -rf p $(KDIR)/$(DEVICE_NAME)_$(word 1, $(1))
mkdir -p $(KDIR)/$(DEVICE_NAME)_$(word 1, $(1))
$(CP) $(word 2, $^) \
$(KDIR)/$(DEVICE_NAME)_$(word 1, $(1))/
$(CP) $(KDIR)/boot-$(DEVICE_NAME)-bootfs_$(word 1, $(1)).ubifs \
$(KDIR)/$(DEVICE_NAME)_$(word 1, $(1))/boot.ubifs
$(CP) ./ubinize-$(DEVICE_NAME).cfg \
$(KDIR)/$(DEVICE_NAME)_$(word 1, $(1))/ubinize.cfg
( cd $(KDIR)/$(DEVICE_NAME)_$(word 1, $(1)); \
$(STAGING_DIR_HOST)/bin/ubinize \
-m $(word 2, $(1)) -p $(word 4, $(1)) -s $(word 2, $(1)) \
-o $@ \
ubinize.cfg \
)
sh $(TOPDIR)/scripts/ubinize-image.sh \
--part boot=$(KDIR)/boot-$(DEVICE_NAME)-bootfs_$(word 1, $(1)).ubifs=15 \
$(IMAGE_ROOTFS) $@ \
-m $(word 2, $(1)) -p $(word 4, $(1)) -s $(word 2, $(1))
endef
define Build/bootfs.tar.gz

37
target/linux/imx6/image/ubinize-ventana.cfg
View file

@ -1,37 +0,0 @@
[boot]
# Volume mode (other option is static)
mode=ubi
# Source image
image=boot.ubifs
# Volume ID in UBI image
vol_id=0
# Allow for dynamic resize
vol_type=dynamic
# Volume name
vol_name=boot
vol_size=15MiB
[rootfs]
# Volume mode (other option is static)
mode=ubi
# Source image
image=root.squashfs
# Volume ID in UBI image
vol_id=1
# Allow for dynamic resize
vol_type=dynamic
# Volume name
vol_name=rootfs
[rootfs_data]
# Volume mode (other option is static)
mode=ubi
# Volume ID in UBI image
vol_id=2
# Allow for dynamic resize
vol_type=dynamic
# Volume name
vol_name=rootfs_data
# Autoresize volume at first mount
vol_flags=autoresize
vol_size=1MiB

13
target/linux/imx6/image/ubinize.cfg
View file

@ -1,13 +0,0 @@
[rootfs]
# Volume mode (other option is static)
mode=ubi
# Source image
image=root.ubifs
# Volume ID in UBI image
vol_id=0
# Allow for dynamic resize
vol_type=dynamic
# Volume name
vol_name=rootfs
# Autoresize volume at first mount
vol_flags=autoresize