Commit Graph

104 Commits

Author SHA1 Message Date
Zoltan HERPAI
7b5c989ab9 merge: targets: update image generation and targets
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
2017-12-08 19:41:18 +01:00
Stijn Tintel
a576ed5437 scripts/gen_image_generic.sh: move from x86/image
The script can also be useful for other targets.

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
2017-07-14 04:09:16 +02:00
Felix Fietkau
7887a46f45 build: enable gzipping of images on x86 even if ext4 is disabled
There is lots of padding between the boot partition and the rootfs, so
gzipping is helpful here

Signed-off-by: Felix Fietkau <nbd@nbd.name>
2017-07-06 11:30:33 +02:00
Philip Prindeville
7fe5963be0 build: allow specifying flow-control to grub on serial console
On the more sophisticated (i.e. deeper FIFO) serial controllers,
flow-control might be needed to avoid dropping output.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
2017-04-03 08:51:02 +02:00
Rafał Miłecki
425f958830 x86: image: drop duplicated copy of bzImage into vmlinuz
It's already done once few lines earlier in the Image/Build/iso.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
2017-03-16 11:28:33 +01:00
Rafał Miłecki
f5d403488e x86: image: drop unneeded grub call
It appears there isn't any Image/Build/grub/* define so this step looks
redundant.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
2017-03-12 15:06:52 +01:00
Rafał Miłecki
9a267e6a4b x86: image: drop unused ROOTDELAY variable
It's unused since commit 7427007193 ("x86: remove the olpc subtarget,
it has been unmaintained for a long time").

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
2017-03-12 15:06:52 +01:00
Alexandru Ardelean
81a2f9d6f8 target/linux/x86/image: add explicit prefix to grub-mkimage command
In the latest version of grub-mkimage, the prefix option is mandatory.
Not supplying it fails with:
```
Prefix not specified (use the -p option).
```

In grub-2.02-beta2 a DEFAULT_DIRECTORY was defined
in `include/grub/osdep/hostfile_unix.h` as:
```
 #if defined (__NetBSD__)
 /* NetBSD uses /boot for its boot block.  */
 # define DEFAULT_DIRECTORY  "/"GRUB_DIR_NAME
 #else
 # define DEFAULT_DIRECTORY  "/"GRUB_BOOT_DIR_NAME"/"GRUB_DIR_NAME
 #endif
```

Where:
* GRUB_BOOT_DIR_NAME == boot
* GRUB_DIR_NAME == grub

This was used if the -p option was omitted.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2016-12-20 16:24:21 +01:00
Wilfried Klaebe
81e3c022e0 x86: fix GRUB_ROOT for Xen subtarget
Change grub's root device to xen/xvda,msdos1 for the x86_xen_domu
target so that it will boot without further changes.

Signed-off-by: Wilfried Klaebe <w+lede-project@chaos.in-kiel.de>
[Jo-Philipp Wich: fixed and rebased patch from FS#264, added subject]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2016-11-19 11:45:29 +01:00
Felix Fietkau
be59b1718d x86: drop the use of block2mtd, use ext4/f2fs as overlay filesystem
Signed-off-by: Felix Fietkau <nbd@nbd.name>
2016-09-10 12:17:39 +02:00
Felix Fietkau
eceb6b924a x86: remove obsolete reference to $(PROFILE)
Signed-off-by: Felix Fietkau <nbd@nbd.name>
2016-07-20 10:13:50 +02:00
Felix Fietkau
d5ee23ee27 x86: stop relying on hexdump for image build signature
Use perl to generate random number instead.
See https://github.com/freifunk-gluon/gluon/issues/811

Signed-off-by: Felix Fietkau <nbd@nbd.name>
2016-07-03 18:39:11 +02:00
Felix Fietkau
825ef34f15 x86: remove defunct etherboot image building code
Signed-off-by: Felix Fietkau <nbd@nbd.name>
2016-05-12 17:46:39 +02:00
Felix Fietkau
900b4865b8 x86: remove obsolete Config.in file
Signed-off-by: Felix Fietkau <nbd@nbd.name>
2016-05-12 17:46:14 +02:00
Felix Fietkau
2e5f84fc10 x86: remove legacy script/makefile code for rdc devices
Signed-off-by: Felix Fietkau <nbd@nbd.name>
2016-05-12 17:39:04 +02:00
Felix Fietkau
303a241478 x86: enable grub at_keyboard support for x86_64
Signed-off-by: Felix Fietkau <nbd@nbd.name>
2016-05-12 17:00:53 +02:00
John Crispin
fa69553900 branding: add LEDE branding
Signed-off-by: John Crispin <blogic@openwrt.org>
2016-03-24 22:40:13 +01:00
John Crispin
096b3759a9 build: Prevent more gzip timestamps
To improve reproducibility, prevent the inclusion of timestamps
in the gzip header.

Signed-off-by: Reiner Herrmann <reiner@reiner-h.de>

SVN-Revision: 46361
2015-07-14 09:57:45 +00:00
Jo-Philipp Wich
0ee9504911 all: replace genext2fs with make_ext4fs
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 45517
2015-04-20 13:57:43 +00:00
Felix Fietkau
09aad60610 x86: remove bogus bzImage copy that breaks initramfs+no-initramfs builds
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 45114
2015-03-29 04:31:35 +00:00
Felix Fietkau
7427007193 x86: remove the olpc subtarget, it has been unmaintained for a long time
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 45083
2015-03-28 11:37:08 +00:00
Jo-Philipp Wich
02e2548b84 x86: use PARTUUID instead explicitly specifying the device by default
This changes the x86 image generation to match x86_64, using the PARTUUID for
the rootfs instead of explicitly configuring the device.

It unbreaks KVM with VirtIO, which uses /dev/vda2 instead of /dev/sda2.

Tested in QEMU/KVM with VirtIO, VirtualBox and VMware.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>

SVN-Revision: 44966
2015-03-24 10:08:12 +00:00
Felix Fietkau
578aa97f8c x86: disable rts/cts for serial console in grub - fixes net48xx boot issues
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 44753
2015-03-14 08:38:35 +00:00
Felix Fietkau
c718d0b10c x86: remove the arbitrary limitation of vmware/virtualbox images to ext4, select TARGET_IMAGES_PAD instead
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 41763
2014-07-20 08:18:50 +00:00
Felix Fietkau
f02e3a2a4a x86: try harder to attach block2mtd to fix boot issues on devices with longer delays
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 40444
2014-04-10 14:43:17 +00:00
Imre Kaloz
cc49f7c6e9 move most of the x86 image generation options to the main file
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

SVN-Revision: 39206
2014-01-07 10:18:55 +00:00
Imre Kaloz
c11bd50d77 For now vdi and vmdk images should be x86 only
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

SVN-Revision: 38896
2013-11-22 14:39:53 +00:00
Imre Kaloz
4242b42880 VMWare and VirtualBox images should select what they need, not depend on it..
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

SVN-Revision: 38892
2013-11-22 09:54:36 +00:00
Imre Kaloz
4c65eebf06 rationalize target image options
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

SVN-Revision: 38891
2013-11-22 09:44:14 +00:00
Felix Fietkau
09f4018b2e x86: Fix CONFIG_X86_GRUB_SERIAL=""
With

    .config:CONFIG_X86_GRUB_SERIAL=""

which (AFAICT) is the way to tell GRUB not to use a serial console, in

    target/linux/x86/image/Makefile:ifneq ($(CONFIG_X86_GRUB_SERIAL),)

$(CONFIG_X86_GRUB_SERIAL) expands to `""' (a literal double double-quote),
making the condition unconditionally false.

This patch fixes the situation by passing CONFIG_X86_GRUB_SERIAL through
qstrip before testing.

Signed-off-by: Tamas TEVESZ <ice@extreme.hu>

SVN-Revision: 37749
2013-08-10 18:35:29 +00:00
Florian Fainelli
6a4f2922f6 targets: prepare for supporting normal and initramfs images
In order to support both normal images and initramfs, ensure that each
target sets KERNELNAME properly so that the generic kernel building code
can copy the corresponding files over $(KDIR) with the appropriate
extension. Update the various paths to the kernel and wrapper images
from $(LINUX_DIR)/arch/$(ARCH)/boot/$(foo) to $(KDIR)/$(foo).

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

SVN-Revision: 37049
2013-06-27 19:58:31 +00:00
Felix Fietkau
96bb7c123b build: consistently use 'depends on' instead of 'depends'
make the syntax more compatible with kernel menuconfig

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

SVN-Revision: 36351
2013-04-17 15:36:41 +00:00
Jo-Philipp Wich
7399df1d69 x86: explicitely pass staging directory to grub-mkimage instead of relying on build time defaults (#12821)
SVN-Revision: 35200
2013-01-17 15:46:26 +00:00
Felix Fietkau
46288bf98e x86: use $(strip) for the at_keyboard check
SVN-Revision: 34127
2012-11-09 10:53:36 +00:00
Felix Fietkau
0a9e05fb0e x86: only enable at_keyboard for the generic and kvm_guest subtargets to avoid hangs on alix2 and others (thx, russell)
SVN-Revision: 34126
2012-11-09 10:19:51 +00:00
Florian Fainelli
60ecd5fe04 merge the RDC R-321x target as a subtarget of x86
SVN-Revision: 33779
2012-10-15 18:54:34 +00:00
Felix Fietkau
856fba88d9 x86: remove the reboot=bios command line parameter (#12193)
SVN-Revision: 33671
2012-10-09 15:20:11 +00:00
Felix Fietkau
1abbe676d1 x86: rename the iso file to openwrt-x86-generic.iso
SVN-Revision: 33641
2012-10-07 23:05:39 +00:00
Felix Fietkau
0dd7644ec7 x86: remove grub-legacy
SVN-Revision: 33640
2012-10-07 23:01:56 +00:00
Felix Fietkau
a1bcd25082 x86: add grub2 iso support
SVN-Revision: 33639
2012-10-07 23:01:52 +00:00
Felix Fietkau
493b7c7f3c x86: avoid using grub prepare when using grub2
SVN-Revision: 33525
2012-09-23 09:59:56 +00:00
Felix Fietkau
52e8ee0666 x86: add support for building grub2 images
SVN-Revision: 33513
2012-09-22 20:10:42 +00:00
Felix Fietkau
ce4244c8af x86: split generic image building into a separate script
SVN-Revision: 33511
2012-09-22 20:10:35 +00:00
Felix Fietkau
6c02dd2b04 x86: rename gen_image_x86.sh to gen_image_grub.sh
SVN-Revision: 33510
2012-09-22 20:10:31 +00:00
Jo-Philipp Wich
e3663ff907 use ttyS0 @ 115200 baud as default for KVM guests
SVN-Revision: 32384
2012-06-15 12:59:49 +00:00
Gabor Juhos
9e54e012d6 x86: image: select bootscript images by default for OLPC
SVN-Revision: 31783
2012-05-18 09:57:29 +00:00
Jo-Philipp Wich
4b230e19fc PATCH: Disable console terminal in Grub for alix2 target
The alix2 target has the VGA console for grub enabled by default. This
prevents the grub menu from appearing on bootup. It is disabled by
default for the other embedded x86 platforms. This patch corrects that
behavior for the alix2 target.

Signed-off-by: Adam Gensler <openwrt@kristenandadam.net>

SVN-Revision: 31270
2012-04-12 23:30:27 +00:00
Vasilis Tsiligiannis
eed8e2a4fd Disable by default padding of images
SVN-Revision: 30590
2012-02-16 17:54:07 +00:00
Vasilis Tsiligiannis
8676e49d9d Allow gzipping of squashfs images with padded jffs2 partition
SVN-Revision: 30589
2012-02-16 17:54:04 +00:00
Vasilis Tsiligiannis
ab09db09fc GZip only ext4 and padded images
SVN-Revision: 30588
2012-02-16 17:54:01 +00:00