Commit Graph

137 Commits (8f970a79ae18422f46bc073416d6575ac863e998)

Author SHA1 Message Date
Felix Fietkau c8a91544bb build: allow changing kernel name in new image code
Necessary for targets using zImage or other kernel
image types.

Signed-off-by: Claudio Leite <leitec@staticky.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44018 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-01-18 00:34:57 +00:00
Felix Fietkau 496f379a42 build: allow passing parameters to padjffs2 via the pad-rootfs command
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44015 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-01-17 21:19:57 +00:00
Felix Fietkau 0742781ec8 build: add image makefile helper function for pading with an offset
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44012 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-01-17 21:19:24 +00:00
Felix Fietkau 6ee18aa54e ramips: convert mt7621 images to new image building code
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43908 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-01-10 15:26:53 +00:00
Felix Fietkau 0565d88e3b build: add new image building code infrastructure
This simplifies building device / profile specific images, and allows
the build system to parallelize generating images

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43907 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-01-10 15:26:47 +00:00
Jo-Philipp Wich a8bb90bd2f build: add version number to filenames
This commit introduces a new option CONFIG_VERSION_FILENAMES which causes
OpenWrt to embed the version number in generated image files, SDK- and
ImageBuilder archives.

The option is enabled by default if CONFIG_VERSIONOPT is set.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43869 3c298f89-4303-0410-b956-a3cf2f4a3e73
2015-01-08 11:02:00 +00:00
Felix Fietkau 17ace69bf7 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]

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43788 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-12-27 13:03:19 +00:00
Imre Kaloz 3087d22944 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>



git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43780 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-12-26 14:31:45 +00:00
Imre Kaloz 826c6d187c 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>



git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43778 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-12-26 13:33:22 +00:00
Felix Fietkau 4d934085db image.mk: remove legacy target rules
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42881 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-10-12 15:01:08 +00:00
Felix Fietkau 787a1b03f4 image.mk: parallelize cpio.gz and tar.gz filesystem build
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42880 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-10-12 15:01:01 +00:00
Felix Fietkau 11c0682008 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>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42879 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-10-12 15:00:55 +00:00
Felix Fietkau 5c9e6a65b6 image.mk: clean up and parallelize mkfs calls
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42878 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-10-12 15:00:49 +00:00
Felix Fietkau 23a100cc84 image.mk: call mkfs/prepare for the image builder
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42874 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-10-12 15:00:11 +00:00
Felix Fietkau 25f63fe71e image.mk: reduce code duplication, move prepare to a separate make target
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42873 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-10-12 15:00:07 +00:00
Felix Fietkau 699b3a35ef image.mk: remove the unnecessary .NOTPARALLEL flag
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42872 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-10-12 15:00:03 +00:00
Felix Fietkau 929db89dbe image: only call Image/BuildKernel/Initramfs if initramfs is actually enabled
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41914 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-07-31 23:40:37 +00:00
John Crispin ba86e2f03b include/image.mk: add a path variable for the dts folder
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41789 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-07-21 18:41:56 +00:00
Imre Kaloz 5f417387b8 make UbinizeImage work nicely without a kernel volume
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>



git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41359 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-27 12:58:08 +00:00
Imre Kaloz b4696a8be5 include UbinizeImage parameters' description in the file
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41356 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-27 10:32:09 +00:00
John Crispin f5d5de027c SysupgradeNAND: include rootfs-type in image name
also add quotes to paths

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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41326 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-24 18:13:51 +00:00
John Crispin 2badccb73e 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>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41311 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-24 18:12:47 +00:00
John Crispin 31f99ff64c 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>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41237 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-17 15:40:02 +00:00
John Crispin 8167453148 include/image.mk: cleanup the SysupgradeNAND template
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41223 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-16 18:55:18 +00:00
John Crispin f1c0ad03b7 include/image.mk: add a target for generating sysupgrade tar files for nand
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41127 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-11 12:59:41 +00:00
Felix Fietkau a4816ec4b5 build: make the squashfs block size configurable
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40979 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-02 17:04:34 +00:00
John Crispin 032740230c image: ext4: rename config options as these are only used for ext4 image creation
Signed-off-by: Michael Heimpold <mhei@heimpold.de>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40926 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-02 12:44:10 +00:00
John Crispin 6d5d06b702 image: ext4: allow creation of a journaling filesystem
Signed-off-by: Michael Heimpold <mhei@heimpold.de>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40925 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-02 12:44:07 +00:00
John Crispin 6c2dc17952 image: ext4: allow to choose a block size for the rootfs
Signed-off-by: Michael Heimpold <mhei@heimpold.de>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40924 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-06-02 12:44:04 +00:00
John Crispin 8d8017f979 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>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40370 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-04-03 14:26:54 +00:00
John Crispin 16ecf558d8 include/make.mk: add support for ubinize-overlay.cfg
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-04-03 14:26:31 +00:00
Luka Perkov 1b9673d79a image: remove spaces from toupper function
The extra prefix space is passed to the caller.

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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38855 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-11-18 22:23:38 +00:00
Luka Perkov c872fd9a56 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>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38799 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-11-14 01:35:21 +00:00
Luka Perkov eb680c576e build: make MkuImage more generic
Signed-off-by: Luka Perkov <luka@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38516 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-10-23 22:16:09 +00:00
Luka Perkov f0662fc03c 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>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38442 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-10-18 00:11:20 +00:00
Luka Perkov 4f1464dcef build: move mkits.sh script to more common place
Signed-off-by: Luka Perkov <luka@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38430 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-10-16 10:29:50 +00:00
Luka Perkov 9eb69ef0dc 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>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38419 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-10-15 21:37:31 +00:00
Luka Perkov 5f4047589a ubifs: when creating ubi(fs) images profile originated arguments have priority
Signed-off-by: Luka Perkov <luka@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38381 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-10-13 03:35:15 +00:00
Luka Perkov 75f47798f9 image: introduce MkuImageARM function
Signed-off-by: Luka Perkov <luka@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38380 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-10-13 03:35:14 +00:00
Luka Perkov f6ccd395dd 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>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38375 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-10-12 21:44:48 +00:00
Luka Perkov 3684777fc7 image: if possible use profile name when building .tar.gz images
Signed-off-by: Luka Perkov <luka@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38374 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-10-12 21:44:46 +00:00
Luka Perkov 69507e8413 build: extend menu with few ubifs options
Signed-off-by: Luka Perkov <luka@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38303 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-10-04 10:49:47 +00:00
Gabor Juhos e51a6a6d99 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>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38196 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-09-25 20:03:20 +00:00
Luka Perkov 95fe0abb96 image: add hooks for kernel/DTB installation in root filesystem
Signed-off-by: Michael Heimpold <mhei@heimpold.de>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37852 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-08-28 00:07:41 +00:00
Gabor Juhos 173c4c7527 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>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37847 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-08-27 12:02:58 +00:00
Gabor Juhos 42e10356e6 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>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37514 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-07-23 10:21:21 +00:00
Gabor Juhos b18e0a3e11 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>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37452 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-07-19 17:12:45 +00:00
Florian Fainelli 405fb366b1 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>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37050 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-06-27 19:58:35 +00:00
Jonas Gorski 982f0f3386 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>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36860 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-06-05 20:58:03 +00:00
Luka Perkov a6c3641123 include/image.mk: export ubifs image from mkfs.ubifs
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35473 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-02-03 21:00:24 +00:00