Commit Graph

102 Commits

Author SHA1 Message Date
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
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
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
6c02dd2b04 x86: rename gen_image_x86.sh to gen_image_grub.sh
SVN-Revision: 33510
2012-09-22 20:10:31 +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
Vasilis Tsiligiannis
b4f51343c6 Make gzipping of images configurable via menuconfig
SVN-Revision: 30587
2012-02-16 17:53:57 +00:00
Jo-Philipp Wich
2fc3fe1d09 Make the grub timeout configurable on x86 targets
Signed-off-by: Justus Winter <4winter@informatik.uni-hamburg.de>

SVN-Revision: 29786
2012-01-19 01:14:45 +00:00
John Crispin
dfc19a34b4 * adds support for Artec Thincan
Signed-of-By: Lauri Võsandi <lauri.vosandi@gmail.com>

SVN-Revision: 26919
2011-05-17 10:35:14 +00:00
Jo-Philipp Wich
76bfcee5ea gzip jffs2 images Signed-off-by: Vasilis Tsiligiannis <b_tsiligiannis@silverton.gr>
SVN-Revision: 26625
2011-04-12 20:48:47 +00:00
Imre Kaloz
4052849677 switch from ext2 to ext4 (w/o) journaling
SVN-Revision: 24084
2010-11-22 12:12:39 +00:00
Andy Boyett
0f5d0f69ab image: use internal qemu-img for vmdk and vdi images drop host dependencies on qemu-utils and VirtualBox
SVN-Revision: 22553
2010-08-09 04:22:39 +00:00
Felix Fietkau
816a9b30f6 x86: build fully functional images on Mac OS X, now that grub is fixed
SVN-Revision: 21609
2010-05-28 19:48:21 +00:00
Nicolas Thill
2c82cf966c image/x86: fix typo when building on Mac OS X (closes: #7303)
SVN-Revision: 21401
2010-05-08 12:46:25 +00:00
Nicolas Thill
482ee200cb target/x86: use common config items for options shared between generic and olpc targets
SVN-Revision: 21364
2010-05-05 02:07:38 +00:00
Nicolas Thill
5403c59f57 images: rename CONFIG_TARGET_ROOTFS_FSPART to CONFIG_TARGET_ROOTFS_PARTSIZE
SVN-Revision: 21362
2010-05-05 01:52:54 +00:00
Nicolas Thill
3bca4b2094 package/grub: build a host grub and a target grub (#7269) - use the host grub binary for grub install, but with target stage files - disable SSP (-fno-stack-protector) & Compile Time Buffer Checks (-U_FORTIFY_SOURCE) if appropriate - create a target grub package
SVN-Revision: 21305
2010-05-02 17:32:25 +00:00
Nicolas Thill
a64f53f482 target/x86: add to changes missed from [21246] preventing .vdi & .vmdk image generation
SVN-Revision: 21277
2010-04-30 18:43:39 +00:00
Nicolas Thill
99d4eee466 target/x86: various image changes * add a -combined suffix for grub+kernel+rootfs images and -rootfs for root filesystem only images * change ext from .image to .img * fix perms on VirtualBox .vdi image * gzip ext2 rootfs image as well
SVN-Revision: 21246
2010-04-29 03:03:47 +00:00
Nicolas Thill
bd1fc43e6d target/x86: rearrange image Makefile, indent, reorder, simplify, change some ifeq/ifneq tests
SVN-Revision: 21245
2010-04-29 00:47:05 +00:00
Nicolas Thill
224db523da replace old quote stripping with calls to qstrip macro
SVN-Revision: 21242
2010-04-29 00:32:44 +00:00
Nicolas Thill
e2b57ecf5f define a shared IMG_PREFIX variable used as a basename for image files, it contains board & subtarget infos (if appropriate) allowing subtargets to share the same bin directory without overwriting each other's files
SVN-Revision: 20834
2010-04-12 23:15:56 +00:00
Jo-Philipp Wich
9ce3d38331 - clean up menu.lst template - make grub usage of vt0 selectable in menuconfig - choose appropriate default baudrate for soekris devices - fix generation of grub menu for iso images
SVN-Revision: 19681
2010-02-17 00:59:41 +00:00
Jo-Philipp Wich
e0fc8fb6aa make console port editable through menuconfig, gzip ext2 images, add suitable defaults for Xen
SVN-Revision: 19612
2010-02-12 19:04:12 +00:00
Florian Fainelli
a155e4fd53 add rootwait option to the kernel command line (#6209)
SVN-Revision: 18672
2009-12-06 09:12:34 +00:00
Imre Kaloz
93fe520994 change x86 image generation handling to treat only olpc specially
SVN-Revision: 18441
2009-11-17 19:49:25 +00:00
Florian Fainelli
e49c2d7691 merge the olpc target with the x86 target, both tested and running
SVN-Revision: 18279
2009-11-03 01:02:39 +00:00
Imre Kaloz
a9c958c2de make kernels use /etc/preinit by default
SVN-Revision: 15840
2009-05-14 10:20:53 +00:00
Jo-Philipp Wich
9209af2c00 Fix building of iso filesystem This fixes two errors when building iso filesystem:
a) dir root.grub/boot doesn't get created.
b) the creation of .image file by gen_image.sh which apparently is not needed
when building an iso.

Signed-off-by: Vasilis Tsiligiannis <b_tsiligiannis@silverton.gr>

SVN-Revision: 15682
2009-05-07 13:50:09 +00:00
Hauke Mehrtens
76fe41a8d3 The image was selected from a wrong location. Fixes bug #4618
SVN-Revision: 14948
2009-03-19 13:02:06 +00:00
Jo-Philipp Wich
e0440fefb6 Use wildcards to copy grub stage files, will cover both i386-pc and i386-openwrt directory names
SVN-Revision: 13963
2009-01-10 23:12:21 +00:00
Jo-Philipp Wich
2273aadfb2 fix grub installation on target images, regression caused by multi-libc support
SVN-Revision: 13936
2009-01-08 16:51:01 +00:00
Steven Barth
5c95516f24 Use VBoxManage instead of obsolete vditool to generate VirtualBox images.
SVN-Revision: 13821
2009-01-02 14:35:18 +00:00
Florian Fainelli
45cc45cac5 Add support for creating VMware vmdk images #1317
SVN-Revision: 13158
2008-11-09 17:39:09 +00:00
Felix Fietkau
2b5ce63303 x86: don't attempt to compile grub on darwin
SVN-Revision: 11599
2008-06-28 17:54:44 +00:00
Felix Fietkau
b0e669ee13 fix x86 image build order (fixes #3317)
SVN-Revision: 11359
2008-06-04 21:55:25 +00:00
Florian Fainelli
8c0c28eef2 Add virtualbox images to x86 (#3475)
SVN-Revision: 11298
2008-05-30 16:50:37 +00:00
Imre Kaloz
e7432794fa fix image generation on x86
SVN-Revision: 10610
2008-03-17 12:37:52 +00:00
Felix Fietkau
1bca0cc517 make the image filenames a bit shorter
SVN-Revision: 9533
2007-11-10 23:08:11 +00:00
John Crispin
16b236fb69 fixed generation of iso images
SVN-Revision: 9317
2007-10-14 13:39:35 +00:00
Felix Fietkau
27baec04a1 move grub menu.lst to the right place
SVN-Revision: 9216
2007-10-09 16:57:12 +00:00
Felix Fietkau
8c97372e0d move grub to package/
SVN-Revision: 9212
2007-10-09 03:19:07 +00:00
John Crispin
215fa7eb8b added generation of x86 livecds, from #2391
SVN-Revision: 9191
2007-10-08 18:53:19 +00:00
Felix Fietkau
56231056ea strip the kernel version suffix from target directories, except for brcm-2.4 (the -2.4 will be included in the board name here). CONFIG_LINUX_<ver>_<board> becomes CONFIG_TARGET_<board>, same for profiles.
SVN-Revision: 8653
2007-09-06 16:27:37 +00:00