Luotao Fu wrote:
> This one reworks the ubifs image options in ptxdist. The menu structure got a
> reorganisation. The help text contains now some more hints. Some new options 
> are
> also added. The ubi image targets are now stripped out from the central
> images.make file and put in a seperate Makefile. Main feature change is that 
> we
> are now able to create a addtional data partition either as an further volume 
> in
> the root.ubi image or as a standalone single-volumed ubiimage. Currently the
> data partition only contains an empty ubi volume. It's however considerable 
> that
> we can extend this so that we can generate a data partition with contents
> defined from ptxdist.

please split it in several patches. at least one moving from images.make
to image_ubi*.make and another for the enhancements.

See more comments inline

> Signed-off-by: Luotao Fu <l...@pengutronix.de>
> ---
>  config/mtd-utils/ubi.ini  |    8 ++--
>  platforms/image_ubi.in    |  114 +++++++++++++++++++++++++++++++++++----
>  platforms/image_ubifs.in  |   46 ++++++++++++----
>  rules/post/image_ubi.make |  132 
> +++++++++++++++++++++++++++++++++++++++++++++
>  rules/post/images.make    |   44 ---------------
>  5 files changed, 274 insertions(+), 70 deletions(-)
>  create mode 100644 rules/post/image_ubi.make
> 
> diff --git a/config/mtd-utils/ubi.ini b/config/mtd-utils/ubi.ini
> index 28a02bf..75d0c97 100644
> --- a/config/mtd-utils/ubi.ini
> +++ b/config/mtd-utils/ubi.ini
> @@ -1,10 +1,10 @@
> -[root]
> +...@ubi_volume_name@]
>  mode=ubi
> -image=root.ubifs
> -vol_id=1
> +ima...@ubi_volume_image@
> +vol_...@ubi_volume_id@
>  vol_si...@ubi_volume_size@
>  vol_type=dynamic
> -vol_name=root
> +vol_na...@ubi_volume_name@
>  vol_flags=autoresize
>  vol_alignment=1
>  
> diff --git a/platforms/image_ubi.in b/platforms/image_ubi.in
> index f679235..a6e0284 100644
> --- a/platforms/image_ubi.in
> +++ b/platforms/image_ubi.in
> @@ -3,21 +3,17 @@
>  menuconfig IMAGE_UBI
>       bool
>       select IMAGE_UBIFS
> -     prompt "Generate images/root.ubi      "
> +     select IMAGE_UBI_ROOT_VOL
> +     prompt "Generate UBI Image     "

please add some spaces to keep the menu nice.

>       help
> -       Build an ubi image of the root filesystem. This image is suitable for
> -       writing to raw flash devices.
> +       Build ubi formated image(s) for the root file system and an
> +       optional data partition. UBI is faster and robuster than JFFS2,
> +       we recommend strongly the usage of UBI if you want a file
> +       system for raw flash devices. The image(s) can be directly
> +       written to e.g. an mtd partition on a raw flash devices.
>  
>  if IMAGE_UBI
>  
> -config IMAGE_UBI_VOLUME_SIZE
> -     string
> -     prompt "ubi volume size"
> -     default "<invalid>"
> -     help
> -       ptxdist currently creates ubi images with only one volume in it. 
> Specify
> -       its size here.
> -
>  config IMAGE_UBI_SUB_PAGE_SIZE
>       string
>       prompt "Sub page size"
> @@ -42,5 +38,101 @@ config IMAGE_UBI_PEB_SIZE
>         This option is passed to the -p option of ubinize. Gain the
>         correct value from 'mtdinfo -u' on your target.
>  
> +config IMAGE_UBI_ROOT_VOL

consider making this a menuconfig...

> +     bool
> +     select IMAGE_UBIFS_ROOT
> +     default y
> +     prompt "Create root volume      "
> +     help
> +       Create a root volume with the content of root.ubifs. You will
> +       most probably want to activate this option is essential since
> +       otherwise the final ubi image  will not contain a root file
> +       system.
> +

use "if IMAGE_UBI_ROOT_VOL" .... "endif", rather than adding "depends on
IMAGE_UBI_ROOT_VOL" to each individual option.

> +config IMAGE_UBI_ROOT_VOL_SIZE
> +     string
> +     prompt "root volume size"
> +     depends on IMAGE_UBI_ROOT_VOL
> +     default "<invalid>"
> +     help
> +       Give the root volume size here. You can use size unit like
> +       "KiB" or "MiB" here. The volume size must be greater
> +       than than the actual ubifs file. Further the sum of all
> +       volumes in an UBI image should be slightly smaller than the
> +       mtd device, to wich the image will be flashed. The spare place
> +       is supposed to be used for Jounal and other UBI header
> +       informations. We recommend a ratio between spare place and the
> +       actual size of the mtd partion at about 10% or higher. It is OK
> +       to define a big amount of spare place. The UBI System will scan
> +       for available space at boot time and expand the volume to the
> +       maximal usable size after reserving internally used blocks.
> +       An example: Our UBI image is supposed to contain a single "root"
> +       volume. The mtd partition, onto which we will flash the UBI
> +       image has a size of 32MiB. Our actual rootfs.ubifs has a size
> +       of 16MiB. Than we should define our root volume size between
> +       16MiB and 29MiB. We decide for 25MiB. During the boot process
> +       the UBI system detects a mtd partiton of 32MiB. After reserving
> +       2MiB for internal use it will expand our volume automatically to
> +       30MiB.

IMHO some line breaks make this text easier to read

> +
> +config IMAGE_UBI_ROOT_VOL_NAME
> +     string
> +     prompt "root volume name"
> +     depends on IMAGE_UBI_ROOT_VOL
> +     default "root"
> +     help
> +       Give the root volume name here. Default is "root".
> +
> +config UBI_CREATE_DATA

comments about menuconfig and ifdef also apply here.

> +     bool
> +     prompt "Create a data partition"
> +     select IMAGE_UBIFS_DATA
> +     help
> +       Generate a data partition. The ubifs image containg the data
> +       partition can either integrated into the root ubi Image as
> +       a further volume or created as a standalone flashable UBI image.
> +
> +choice
> +     prompt "Type of data partition"
> +     default IMAGE_UBI_DATA_VOL
> +     depends on UBI_CREATE_DATA
> +     help
> +       specify the type of the data partition.
> +
> +config IMAGE_UBI_DATA_VOL
> +     bool
> +     prompt "Volume            "
> +     help
> +       Combine the datavolume and the rootfs volume in one single ubi
> +       image.
> +
> +config IMAGE_UBI_DATA
> +     bool
> +     prompt "Standalone        "
> +     help
> +       Build a single volume standalone ubi image for the data ubifs
> +       image. This image can be directly written to e.g. an mtd
> +       partition on a raw flash devices.
> +endchoice
> +
> +config IMAGE_UBI_DATA_VOL_SIZE
> +     string
> +     prompt "data volume size"
> +     depends on UBI_CREATE_DATA
> +     default "<invalid>"
> +     help
> +       Give the data volume size here. You can use size unit like
> +       "KiB" or "MiB" here. The volume size must be greater
> +       than than the actual ubifs file and smaller than the mtd device
> +       less 10% spare place.
> +
> +config IMAGE_UBI_DATA_VOL_NAME
> +     string
> +     prompt "data volume name"
> +     depends on UBI_CREATE_DATA
> +     default "data"
> +     help
> +       Give the data volume name here. Default is "data".
> +
>  endif
>  
> diff --git a/platforms/image_ubifs.in b/platforms/image_ubifs.in
> index c569cd8..85b3e1e 100644
> --- a/platforms/image_ubifs.in
> +++ b/platforms/image_ubifs.in
> @@ -3,12 +3,12 @@
>  menuconfig IMAGE_UBIFS
>       bool
>       select HOST_MTD_UTILS
> -     prompt "Generate images/root.ubifs    "
> +     prompt "Generate UBIFS Images  "

please add some spaces for the menu niceness

>       help
> -       Build an ubifs image of the root filesystem. Note that this image
> -       is not suitable for raw flash but for usage with the ubiupdatevol
> -       utility. If you are looking for a image for raw flash look at the
> -       root.ubi option below
> +       Build ubifs images of the root filesystem or an optional data
> +       partition. Note that this image is not suitable for raw flash
> +       but for usage with the ubiupdatevol utility. If you are looking
> +       for a image for raw flash look at the "UBI Image" option below
>  
>  if IMAGE_UBIFS
>  
> @@ -28,8 +28,24 @@ config IMAGE_UBIFS_LEB_SIZE
>         This option is passed to the -e option of mkfs.ubifs. Gain the
>         correct value from 'mtdinfo -u' on your target.
>  
> -config IMAGE_UBIFS_MAX_LEB_COUNT
> +config IMAGE_UBIFS_EXTRA_ARGS
> +     string
> +     default ""
> +     prompt "extra arguments passed to mkfs.ubifs"
> +     help
> +       If needed you can add extra arguments for mkfs.ubifs here
> +       (e.g. --devtable=${PTXDIST_WORKSPACE}/device_table.txt)
> +
> +config IMAGE_UBIFS_ROOT
> +     bool
> +     default y
> +     prompt "Generate images/root.ubifs      "
> +     help
> +       Build an ubifs image of the root filesystem.
> +
> +config IMAGE_UBIFS_ROOT_MAX_LEB_COUNT

You renamed some options, please add a migration helper to:
"scripts/migrate/migrate_platform"

>       string
> +     depends on IMAGE_UBIFS_ROOT
>       default "<invalid>"
>       prompt "maximum logical erase block count"
>       help
> @@ -37,12 +53,20 @@ config IMAGE_UBIFS_MAX_LEB_COUNT
>         the maximum size of your ubi filesystem in units of logical erase
>         blocks
>  
> -config IMAGE_UBIFS_EXTRA_ARGS
> +config IMAGE_UBIFS_DATA
> +     bool
> +     prompt "Generate images/data.ubifs      "
> +     help
> +       Build an empty data image of the root filesystem.
> +
> +config IMAGE_UBIFS_DATA_MAX_LEB_COUNT
>       string
> -     default ""
> -     prompt "extra arguments passed to mkfs.ubifs"
> +     depends on IMAGE_UBIFS_DATA
> +     default "<invalid>"
> +     prompt "maximum logical erase block count"
>       help
> -       If needed you can add extra arguments for mkfs.ubifs here
> -       (e.g. --devtable=${PTXDIST_WORKSPACE}/device_table.txt)
> +       This option is passed to the -c option of mkfs.ubifs. This specifies
> +       the maximum size of your ubi filesystem in units of logical erase
> +       blocks
>  
>  endif
> diff --git a/rules/post/image_ubi.make b/rules/post/image_ubi.make
> new file mode 100644
> index 0000000..9de6b23
> --- /dev/null
> +++ b/rules/post/image_ubi.make
> @@ -0,0 +1,132 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2003-2010 by the ptxdist project <ptxdist@pengutronix.de>
> +#
> +# See CREDITS for details about who has contributed to this project.
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +SEL_ROOTFS-$(PTXCONF_IMAGE_UBIFS_ROOT)       += $(IMAGEDIR)/root.ubifs
> +SEL_ROOTFS-$(PTXCONF_IMAGE_UBIFS_DATA)       += $(IMAGEDIR)/data.ubifs
> +SEL_ROOTFS-$(PTXCONF_IMAGE_UBI)              += $(IMAGEDIR)/root.ubi
> +SEL_ROOTFS-$(PTXCONF_IMAGE_UBI_DATA) += $(IMAGEDIR)/data.ubi
> +
> +#
> +# create the UBIFS image
> +#
> +$(IMAGEDIR)/root.ubifs: $(STATEDIR)/image_working_dir 
> $(STATEDIR)/host-mtd-utils.install.post
> +     @echo -n "Creating root.ubifs from working dir... (-m 
> $(PTXCONF_IMAGE_UBIFS_MINIMUM_IO_UNIT_SIZE) "
> +     @echo -n "-e $(PTXCONF_IMAGE_UBIFS_LEB_SIZE) -c 
> $(PTXCONF_IMAGE_UBIFS_ROOT_MAX_LEB_COUNT)"
> +     @echo -n "$(PTXCONF_IMAGE_UBIFS_EXTRA_ARGS)) "
> +     @cd $(WORKDIR);                                                         
> \
> +     (awk -F: $(DOPERMISSIONS) $(IMAGEDIR)/permissions &&                    
> \
> +     (                                                                       
> \
> +             echo -n "$(PTXCONF_SYSROOT_HOST)/sbin/mkfs.ubifs ";             
> \
> +             echo -n "-d $(WORKDIR) ";                                       
> \
> +             echo -n "-e $(PTXCONF_IMAGE_UBIFS_LEB_SIZE) ";                  
> \
> +             echo -n "-m $(PTXCONF_IMAGE_UBIFS_MINIMUM_IO_UNIT_SIZE) ";      
> \
> +             echo -n "-c $(PTXCONF_IMAGE_UBIFS_ROOT_MAX_LEB_COUNT) ";        
> \
> +             echo -n "$(PTXCONF_IMAGE_UBIFS_EXTRA_ARGS) ";                   
> \
> +             echo -n "-o $@" )                                               
> \
> +     ) | $(FAKEROOT) --
> +     @echo "done."
> +
> +#
> +# create the UBIFS image for data partition
> +#
> +$(IMAGEDIR)/data.ubifs: $(STATEDIR)/image_working_dir 
> $(STATEDIR)/host-mtd-utils.install.post

this doesn't depend on "$(STATEDIR)/image_working_dir"

> +     @echo -n "Creating data.ubifs from empty dir... (-m 
> $(PTXCONF_IMAGE_UBIFS_MINIMUM_IO_UNIT_SIZE) "
> +     @echo -n "-e $(PTXCONF_IMAGE_UBIFS_LEB_SIZE) -c 
> $(PTXCONF_IMAGE_UBIFS_DATA_MAX_LEB_COUNT)"
> +     @echo -n "$(PTXCONF_IMAGE_UBIFS_DATA_EXTRA_ARGS)) "
> +     @cd ${PTXDIST_TEMPDIR};                                         \
> +     DATA_TMPDIR="$$(mktemp -d ${PTXDIST_TEMPDIR}/data.XXXXXX)";     \
> +     echo $(PTXCONF_SYSROOT_HOST)/sbin/mkfs.ubifs                    \
> +      -d $${DATA_TMPDIR}                                             \
> +      -e $(PTXCONF_IMAGE_UBIFS_LEB_SIZE)                             \
> +      -m $(PTXCONF_IMAGE_UBIFS_MINIMUM_IO_UNIT_SIZE)                 \
> +      -c $(PTXCONF_IMAGE_UBIFS_DATA_MAX_LEB_COUNT)                   \
> +      $(PTXCONF_IMAGE_UBIFS_DATA_EXTRA_ARGS)                         \
> +      -o $@                                                          \
> +     | $(FAKEROOT) --
> +     @echo "done."
> +
> +#
> +# create the UBI image
> +#
> +
> +ifdef PTXCONF_IMAGE_UBI_ROOT_VOL
> +$(IMAGEDIR)/root.ubi: $(IMAGEDIR)/root.ubifs
> +endif
> +
> +ifdef PTXCONF_IMAGE_UBI_DATA_VOL
> +$(IMAGEDIR)/root.ubi: $(IMAGEDIR)/data.ubifs
> +endif
> +
> +$(IMAGEDIR)/root.ubi: $(STATEDIR)/image_working_dir 
> $(STATEDIR)/host-mtd-utils.install.post

this doens't depend on "$(STATEDIR)/image_working_dir" (probably not you
fault).

> +     @echo -n "Creating root.ubi from"
> +ifdef PTXCONF_IMAGE_UBI_ROOT_VOL
> +     @echo -n " root.ubifs,"
> +endif
> +ifdef PTXCONF_IMAGE_UBI_DATA_VOL
> +     @echo -n " data.ubifs"
> +endif

consider using $(^) + filter-out to remove the host-mtd-utils

> +     @echo -n "..."
> +     @echo -n "(-s $(PTXCONF_IMAGE_UBI_SUB_PAGE_SIZE) "
> +     @echo -n "-O $(PTXCONF_IMAGE_UBI_VID_HEADER_OFFSET) -p 
> $(PTXCONF_IMAGE_UBI_PEB_SIZE) "
> +     @echo -n "-m $(PTXCONF_IMAGE_UBIFS_MINIMUM_IO_UNIT_SIZE)"
> +     @echo -n "$(PTXCONF_IMAGE_UBI_EXTRA_ARGS)) "
> +ifdef PTXCONF_IMAGE_UBI_ROOT_VOL
> +     @UBI_VOLUME_SIZE="$(call remove_quotes, 
> $(PTXCONF_IMAGE_UBI_ROOT_VOL_SIZE))" \
> +      UBI_VOLUME_NAME="$(call remove_quotes, 
> $(PTXCONF_IMAGE_UBI_ROOT_VOL_NAME))" \
> +      UBI_VOLUME_ID="0" \
> +      UBI_VOLUME_IMAGE="root.ubifs" \
> +     ptxd_replace_magic "${PTXDIST_TOPDIR}/config/mtd-utils/ubi.ini" > 
> "${PTXDIST_TEMPDIR}/ubi_root.ini"
> +endif
> +ifdef PTXCONF_IMAGE_UBI_DATA_VOL
> +     # Only one partition can be marked as autoresize, remove this line in an
> +     # exsiting ubi.ini file
> +     @[ -r ${PTXDIST_TEMPDIR}/ubi.ini ] && sed -i "/.*autoresize.*/d" 
> "${PTXDIST_TEMPDIR}/ubi_root.ini"

This doesn't work with make, beause it checks the return value....:

[frog...@hardanger:ptxdist (master)]$ [ -e /tmp/foobarbar ] && echo OK
[frog...@hardanger:ptxdist (master)]$ echo $?
1

As you see if ubi.ini isn't readable, it will exit with 1, and make will
bail out. please use "if [ ]; then .... fi" instead.

> +     @UBI_VOLUME_SIZE="$(call remove_quotes, 
> $(PTXCONF_IMAGE_UBI_DATA_VOL_SIZE))" \
> +      UBI_VOLUME_NAME="$(call remove_quotes, 
> $(PTXCONF_IMAGE_UBI_DATA_VOL_NAME))" \
> +      UBI_VOLUME_ID="1" \
> +      UBI_VOLUME_IMAGE="data.ubifs" \
> +     ptxd_replace_magic "${PTXDIST_TOPDIR}/config/mtd-utils/ubi.ini" >> 
> "${PTXDIST_TEMPDIR}/ubi_root.ini"
> +endif
> +     @cd $(IMAGEDIR);                                                        
> \
> +     $(PTXCONF_SYSROOT_HOST)/sbin/ubinize                                    
> \
> +             -s $(PTXCONF_IMAGE_UBI_SUB_PAGE_SIZE)                           
> \
> +             -O $(PTXCONF_IMAGE_UBI_VID_HEADER_OFFSET)                       
> \
> +             -p $(PTXCONF_IMAGE_UBI_PEB_SIZE)                                
> \
> +             -m $(PTXCONF_IMAGE_UBIFS_MINIMUM_IO_UNIT_SIZE)                  
> \
> +             $(PTXCONF_IMAGE_UBI_EXTRA_ARGS)                                 
> \
> +             -o $@                                                           
> \
> +             ${PTXDIST_TEMPDIR}/ubi_root.ini;                                
>         \
> +
> +     @echo "done."
> +
> +$(IMAGEDIR)/data.ubi: $(STATEDIR)/image_working_dir 
> $(STATEDIR)/host-mtd-utils.install.post $(IMAGEDIR)/data.ubifs

this doens't depend on "$(STATEDIR)/image_working_dir"

> +     @echo -n "Creating data.ubi from data.ubifs... (-s 
> $(PTXCONF_IMAGE_UBI_SUB_PAGE_SIZE) "

use $(^) here, aswell

> +     @echo -n "-O $(PTXCONF_IMAGE_UBI_VID_HEADER_OFFSET) -p 
> $(PTXCONF_IMAGE_UBI_PEB_SIZE) "
> +     @echo -n "-m $(PTXCONF_IMAGE_UBIFS_MINIMUM_IO_UNIT_SIZE)"
> +     @echo -n "$(PTXCONF_IMAGE_UBI_EXTRA_ARGS)) "
> +     @UBI_VOLUME_SIZE="$(call remove_quotes, 
> $(PTXCONF_IMAGE_UBI_DATA_VOL_SIZE))" \
> +      UBI_VOLUME_NAME="$(call remove_quotes, 
> $(PTXCONF_IMAGE_UBI_DATA_VOL_NAME))" \
> +      UBI_VOLUME_ID="0" \
> +      UBI_VOLUME_IMAGE="data.ubifs" \
> +     ptxd_replace_magic "${PTXDIST_TOPDIR}/config/mtd-utils/ubi.ini" > 
> "${PTXDIST_TEMPDIR}/ubi_data.ini"
> +     @cd $(IMAGEDIR);                                                        
> \
> +     $(PTXCONF_SYSROOT_HOST)/sbin/ubinize                            \
> +             -s $(PTXCONF_IMAGE_UBI_SUB_PAGE_SIZE)                           
> \
> +             -O $(PTXCONF_IMAGE_UBI_VID_HEADER_OFFSET)                       
> \
> +             -p $(PTXCONF_IMAGE_UBI_PEB_SIZE)                                
> \
> +             -m $(PTXCONF_IMAGE_UBIFS_MINIMUM_IO_UNIT_SIZE)                  
> \
> +             $(PTXCONF_IMAGE_UBI_DATA_EXTRA_ARGS)                            
> \
> +             -o $@                                                           
> \
> +             $(PTXDIST_TEMPDIR)/ubi_data.ini;
> +
> +     @echo "done."
> +
> +# vim600:set foldmethod=marker:
> +# vim600:set syntax=make:
> diff --git a/rules/post/images.make b/rules/post/images.make
> index bcf6df7..9c0b7a9 100644
> --- a/rules/post/images.make
> +++ b/rules/post/images.make
> @@ -73,8 +73,6 @@ WORKDIR := $(IMAGEDIR)/work_dir
>  SEL_ROOTFS-$(PTXCONF_IMAGE_TGZ)              += $(IMAGEDIR)/root.tgz
>  SEL_ROOTFS-$(PTXCONF_IMAGE_JFFS2)    += $(IMAGEDIR)/root.jffs2
>  SEL_ROOTFS-$(PTXCONF_IMAGE_JFFS2_SUM)        += $(IMAGEDIR)/root.sum.jffs2
> -SEL_ROOTFS-$(PTXCONF_IMAGE_UBIFS)    += $(IMAGEDIR)/root.ubifs
> -SEL_ROOTFS-$(PTXCONF_IMAGE_UBI)              += $(IMAGEDIR)/root.ubi
>  SEL_ROOTFS-$(PTXCONF_IMAGE_EXT2)     += $(IMAGEDIR)/root.ext2
>  SEL_ROOTFS-$(PTXCONF_IMAGE_HD)               += $(IMAGEDIR)/hd.img
>  SEL_ROOTFS-$(PTXCONF_IMAGE_EXT2_GZIP)        += $(IMAGEDIR)/root.ext2.gz
> @@ -132,48 +130,6 @@ $(IMAGEDIR)/root.sum.jffs2: $(IMAGEDIR)/root.jffs2
>       @echo "done."
>  
>  #
> -# create the UBIFS image
> -#
> -$(IMAGEDIR)/root.ubifs: $(STATEDIR)/image_working_dir 
> $(STATEDIR)/host-mtd-utils.install.post
> -     @echo -n "Creating root.ubifs from working dir... (-m 
> $(PTXCONF_IMAGE_UBIFS_MINIMUM_IO_UNIT_SIZE) "
> -     @echo -n "-e $(PTXCONF_IMAGE_UBIFS_LEB_SIZE) -c 
> $(PTXCONF_IMAGE_UBIFS_MAX_LEB_COUNT)"
> -     @echo -n "$(PTXCONF_IMAGE_UBIFS_EXTRA_ARGS)) "
> -     @cd $(WORKDIR);                                                         
> \
> -     (awk -F: $(DOPERMISSIONS) $(IMAGEDIR)/permissions &&                    
> \
> -     (                                                                       
> \
> -             echo -n "$(PTXCONF_SYSROOT_HOST)/sbin/mkfs.ubifs ";             
> \
> -             echo -n "-d $(WORKDIR) ";                                       
> \
> -             echo -n "-e $(PTXCONF_IMAGE_UBIFS_LEB_SIZE) ";                  
> \
> -             echo -n "-m $(PTXCONF_IMAGE_UBIFS_MINIMUM_IO_UNIT_SIZE) ";      
> \
> -             echo -n "-c $(PTXCONF_IMAGE_UBIFS_MAX_LEB_COUNT) ";             
> \
> -             echo -n "$(PTXCONF_IMAGE_UBIFS_EXTRA_ARGS) ";                   
> \
> -             echo -n "-o $@" )                                               
> \
> -     ) | $(FAKEROOT) --
> -     @echo "done."
> -
> -#
> -# create the UBI image
> -#
> -$(IMAGEDIR)/root.ubi: $(STATEDIR)/image_working_dir 
> $(STATEDIR)/host-mtd-utils.install.post $(IMAGEDIR)/root.ubifs
> -     @echo -n "Creating root.ubi from root.ubifs... (-s 
> $(PTXCONF_IMAGE_UBI_SUB_PAGE_SIZE) "
> -     @echo -n "-O $(PTXCONF_IMAGE_UBI_VID_HEADER_OFFSET) -p 
> $(PTXCONF_IMAGE_UBI_PEB_SIZE) "
> -     @echo -n "-m $(PTXCONF_IMAGE_UBIFS_MINIMUM_IO_UNIT_SIZE)"
> -     @echo -n "$(PTXCONF_IMAGE_UBI_EXTRA_ARGS)) "
> -     @export UBI_VOLUME_SIZE=${PTXCONF_IMAGE_UBI_VOLUME_SIZE} && \
> -     ptxd_replace_magic "${PTXDIST_TOPDIR}/config/mtd-utils/ubi.ini" > 
> "${PTXDIST_TEMPDIR}/ubi.ini"
> -     @cd $(IMAGEDIR);                                                        
> \
> -     $(PTXCONF_SYSROOT_HOST)/sbin/ubinize                                    
> \
> -             -s $(PTXCONF_IMAGE_UBI_SUB_PAGE_SIZE)                           
> \
> -             -O $(PTXCONF_IMAGE_UBI_VID_HEADER_OFFSET)                       
> \
> -             -p $(PTXCONF_IMAGE_UBI_PEB_SIZE)                                
> \
> -             -m $(PTXCONF_IMAGE_UBIFS_MINIMUM_IO_UNIT_SIZE)                  
> \
> -             $(PTXCONF_IMAGE_UBI_EXTRA_ARGS)                                 
> \
> -             -o $@                                                           
> \
> -             ${PTXDIST_TEMPDIR}/ubi.ini;                                     
> \
> -
> -     @echo "done."
> -
> -#
>  # create the squashfs image
>  #
>  IMAGE_SQUASHFS_EXTRA_ARGS := \

cheers, Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


Attachment: signature.asc
Description: OpenPGP digital signature

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Reply via email to