Commit graph

122 commits

Author SHA1 Message Date
Felix Fietkau
f22b382485 image.mk: make ubinize.cfg optional
When using UbinizeImage with ubifs rootfs, ubinize.cfg is no longer
needed. Yet, the absance of ubinize.cfg would make the build process
abort with an error.
Fix that by checking if ubinize.cfg is present and do no not call the
"classic" ubinize image generation if it isn't.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
[missing new-line before UbinizeImage added itentionally]

SVN-Revision: 43788
2014-12-27 13:03:19 +00:00
Imre Kaloz
9038e8d248 don't copy initramfs.elf unconditionally
targets that need it should do it in their image Makefile

Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

SVN-Revision: 43780
2014-12-26 14:31:45 +00:00
Imre Kaloz
f3755f5758 The ubinized filesystems should be used for generating the final images, so store them in KDIR instead.
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

SVN-Revision: 43778
2014-12-26 13:33:22 +00:00
Felix Fietkau
f6a6e9194a image.mk: remove legacy target rules
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 42881
2014-10-12 15:01:08 +00:00
Felix Fietkau
44d04757af image.mk: parallelize cpio.gz and tar.gz filesystem build
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 42880
2014-10-12 15:01:01 +00:00
Felix Fietkau
f135811687 image.mk: split off jffs2-raw images into a separate make target to improve parallel build time
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 42879
2014-10-12 15:00:55 +00:00
Felix Fietkau
275cef6363 image.mk: clean up and parallelize mkfs calls
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 42878
2014-10-12 15:00:49 +00:00
Felix Fietkau
7cbdc57b40 image.mk: call mkfs/prepare for the image builder
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 42874
2014-10-12 15:00:11 +00:00
Felix Fietkau
71617f21a5 image.mk: reduce code duplication, move prepare to a separate make target
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 42873
2014-10-12 15:00:07 +00:00
Felix Fietkau
9d242ae89c image.mk: remove the unnecessary .NOTPARALLEL flag
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 42872
2014-10-12 15:00:03 +00:00
Felix Fietkau
0a9ee89dbd image: only call Image/BuildKernel/Initramfs if initramfs is actually enabled
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 41914
2014-07-31 23:40:37 +00:00
John Crispin
63426e08bd include/image.mk: add a path variable for the dts folder
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 41789
2014-07-21 18:41:56 +00:00
Imre Kaloz
dc9ebfc9e6 make UbinizeImage work nicely without a kernel volume
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

SVN-Revision: 41359
2014-06-27 12:58:08 +00:00
Imre Kaloz
c026f34ce6 include UbinizeImage parameters' description in the file
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

SVN-Revision: 41356
2014-06-27 10:32:09 +00:00
John Crispin
22a35a7b11 SysupgradeNAND: include rootfs-type in image name
also add quotes to paths

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

SVN-Revision: 41326
2014-06-24 18:13:51 +00:00
John Crispin
d0a54744e9 image.mk: introduce Image/Build/UbinizeImage make target
paramters:
$(1) board name
$(2) ubinize-image options (e.g. --no-kernel and/or --uboot-env)
$(3) rootfstype (e.g. squashfs or ubifs)
$(4) kernel image file
$(5) options to pass-through to ubinize (i.e. $($(PROFILE)_UBI_OPTS)))

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

SVN-Revision: 41311
2014-06-24 18:12:47 +00:00
John Crispin
1a3ebd51ad procd: some cleanup for SysupgradeNAND
Removed unused ubi file file from template as ubinized images are
passed directly and not inside the tarball.
Also removed left-over white-space.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

SVN-Revision: 41237
2014-06-17 15:40:02 +00:00
John Crispin
28277caccb include/image.mk: cleanup the SysupgradeNAND template
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 41223
2014-06-16 18:55:18 +00:00
John Crispin
371c700810 include/image.mk: add a target for generating sysupgrade tar files for nand
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 41127
2014-06-11 12:59:41 +00:00
Felix Fietkau
5eecccd75e build: make the squashfs block size configurable
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 40979
2014-06-02 17:04:34 +00:00
John Crispin
14421bd7fb image: ext4: rename config options as these are only used for ext4 image creation
Signed-off-by: Michael Heimpold <mhei@heimpold.de>

SVN-Revision: 40926
2014-06-02 12:44:10 +00:00
John Crispin
5fd7e00d9d image: ext4: allow creation of a journaling filesystem
Signed-off-by: Michael Heimpold <mhei@heimpold.de>

SVN-Revision: 40925
2014-06-02 12:44:07 +00:00
John Crispin
fe20272ab1 image: ext4: allow to choose a block size for the rootfs
Signed-off-by: Michael Heimpold <mhei@heimpold.de>

SVN-Revision: 40924
2014-06-02 12:44:04 +00:00
John Crispin
709cab91d2 lantiq: BT Home Hub 2B support - board support
Board support patch for BT Home Hub 2B

Signed-off-by: Ben Mulvihill <ben.mulvihill@gmail.com>

SVN-Revision: 40370
2014-04-03 14:26:54 +00:00
John Crispin
08f03e959b include/make.mk: add support for ubinize-overlay.cfg
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 40365
2014-04-03 14:26:31 +00:00
Luka Perkov
fbe8d27c7f image: remove spaces from toupper function
The extra prefix space is passed to the caller.

Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 38855
2013-11-18 22:23:38 +00:00
Luka Perkov
b4ecda7b3f image: don't force ubifs journal size
Small journal size can lead to problems if nand flash is too big. By default
ubifs will use ~12% of volume size or a maximum of 8MiB.

Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 38799
2013-11-14 01:35:21 +00:00
Luka Perkov
7938d16451 build: make MkuImage more generic
Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 38516
2013-10-23 22:16:09 +00:00
Luka Perkov
03ccf4eeb0 build: set owner root for all files on ubifs creation
When creating an image it makes no sense to have files owned by
the uid and gid on the host (and even creates a bug when for
example dropbear authorized_keys is included via env/files).

Signed-off-by: Joris de Vries <joris@apptrician.nl>

SVN-Revision: 38442
2013-10-18 00:11:20 +00:00
Luka Perkov
acdb0ac35c build: move mkits.sh script to more common place
Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 38430
2013-10-16 10:29:50 +00:00
Luka Perkov
41027beb69 ubifs: remove breaking commas from ubi calls
The extra commas get output by the shell resulting in errors since
the commands that get called with those extra commas are then
malformed.

Signed-off-by: Joris de Vries <joris@apptrician.nl>

SVN-Revision: 38419
2013-10-15 21:37:31 +00:00
Luka Perkov
a531d21590 ubifs: when creating ubi(fs) images profile originated arguments have priority
Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 38381
2013-10-13 03:35:15 +00:00
Luka Perkov
5ed845fbea image: introduce MkuImageARM function
Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 38380
2013-10-13 03:35:14 +00:00
Luka Perkov
c808a4a7ef ubifs: enable building modular images
Now it is possible to build ubi/ubifs images for only selected boards inside
single target.

Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 38375
2013-10-12 21:44:48 +00:00
Luka Perkov
05625233ed image: if possible use profile name when building .tar.gz images
Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 38374
2013-10-12 21:44:46 +00:00
Luka Perkov
9051e79bc2 build: extend menu with few ubifs options
Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 38303
2013-10-04 10:49:47 +00:00
Gabor Juhos
261fc738cc image: generate separate jffs2 images w/o padding
The new root.jffs2-*-raw images can be used for firmware
images with custom padding requirements.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 38196
2013-09-25 20:03:20 +00:00
Luka Perkov
99c46e474e image: add hooks for kernel/DTB installation in root filesystem
Signed-off-by: Michael Heimpold <mhei@heimpold.de>

SVN-Revision: 37852
2013-08-28 00:07:41 +00:00
Gabor Juhos
fd0325324f image: ensure that /dev/console exist in rootfs images
Linux expects that the /dev/console node is present in
the rootfs image. Create the node in rootfs images, in
order to make std{in,out,err} usable even in early init
process.

Note: tar.gz and cpio.gz images are not handled yet.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 37847
2013-08-27 12:02:58 +00:00
Gabor Juhos
ce9e0767b5 image: fix a typo in JFFS2OPTS to fix jffs2 rootfs generation
Due to a typo in the Makefile variable, mkfs.jffs2 is called
without the correct parameters.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 37514
2013-07-23 10:21:21 +00:00
Gabor Juhos
c39b64d78f image: fix initramfs image name
Preserve order of components in initramfs image filename
when doing copy from $(KDIR) to $(BIN_DIR).

Patchwork: http://patchwork.openwrt.org/patch/3811/
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 37452
2013-07-19 17:12:45 +00:00
Florian Fainelli
f5a0a578f8 include/image.mk: do not make initramfs build exclusive
Allow building initramfs along with other types of filesystems.

Signed-off-by: Florian Fainelli <florian@openwrt.org>

SVN-Revision: 37050
2013-06-27 19:58:35 +00:00
Jonas Gorski
9f7ef8d5f0 target: split jffs2 NAND out of jffs2
Make jffs2_nand a separate option so this can be triggered without forcing
jffs2 images for nor targets.

Adds a new NAND_BLOCKSIZE variable that allows setting the generated layout
in <page_size>:<block_size> pairs.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>

SVN-Revision: 36860
2013-06-05 20:58:03 +00:00
Luka Perkov
2477bab03e include/image.mk: export ubifs image from mkfs.ubifs
SVN-Revision: 35473
2013-02-03 21:00:24 +00:00
Florian Fainelli
ce5dd3b9e2 image.mk: use XZ bcj architecture filter if available
xz supports using an architecture specific BCJ filter, use that one to
save us a couple kB while producing squashfs filesystems (mimics the
Linux kernel).

Signed-off-by: Florian Fainelli <florian@openwrt.org>

SVN-Revision: 35097
2013-01-11 16:44:26 +00:00
Florian Fainelli
5698062707 Revert "include/image.mk: call Image/Build/{cpiogz,targz}"
This breaks on platforms building their own targz/cpioz images.

Signed-off-by: Florian Fainelli <florian@openwrt.org>

SVN-Revision: 34498
2012-12-04 22:59:05 +00:00
Florian Fainelli
592aa97626 include/image.mk: call Image/Build/{cpiogz,targz}
All Image/mkfs/... macros call the Image/Build except for
Image/mkfs/targz and Image/mkfs/cpiogz

This patch adds the Image/Build call for Image/mkfs/targz and
Image/mkfs/cpiogz.

Signed-off-by: Maarten Bezemer <m.m.bezemer@utwente.nl>
Signed-off-by: Florian Fainelli <florian@openwrt.org>

SVN-Revision: 34473
2012-12-04 16:19:09 +00:00
Gabor Juhos
d90e805fe6 build: Add TARGET_ROOTFS_RESERVED_PCT option to reduce wasted space
The genext2fs tool will 'reserve' 5% of the image size by default,
apparently by creating a huge lost+found directory. In fact it seemed to
be much more than 5% in practice — I saw an image with 8MiB used, and
recovered about 2MiB of it by deleting the 'empty' lost+found directory:

/dev/loop0         48377  8482     37438  19% /mnt/spare
 # rmdir lost+found/
/dev/loop0         48377  6014     39906  14% /mnt/spare

This makes it configurable, but leaves it at the genext2fs default
of 5% for now. It should probably be changed to default to zero, but
that can be a separate patch.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 34408
2012-11-29 17:37:15 +00:00
Florian Fainelli
7196f5d7c8 image.mk: don't squash file permissions in JFFS2 images
Currently we call mkfs.jffs2 --squash, which will change
both file permissions and owners.

If we have some file with suid bits, it will clear these bits.

Thus it's enough to just squash file owners, by replacing that
argument to --squash-uids.

Signed-off-by: Jonh Wendell <jonh.wendell@oiwifi.com.br>
Signed-off-by: Florian Fainelli <florian@openwrt.org>

SVN-Revision: 34397
2012-11-27 18:42:45 +00:00
Jo-Philipp Wich
deff2382d0 include/image.mk: /tmp should have mode 1777
On the off chance that the root filesystem's /tmp is used directly as a
temporary directory instead of having a tmpfs mounted over it, it should have
the sticky bit set.

Signed-off-by: Mark Mentovai <mark@moxienet.com>

SVN-Revision: 32572
2012-07-01 11:48:54 +00:00