Felix Fietkau
d3c8499987
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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37749 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-08-10 18:35:29 +00:00
Florian Fainelli
704e2ed39d
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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37049 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-06-27 19:58:31 +00:00
Jo-Philipp Wich
29f2452461
x86: explicitely pass staging directory to grub-mkimage instead of relying on build time defaults ( #12821 )
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35200 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-01-17 15:46:26 +00:00
Felix Fietkau
114523d5b7
x86: use $(strip) for the at_keyboard check
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34127 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-11-09 10:53:36 +00:00
Felix Fietkau
ce5e0d1df8
x86: only enable at_keyboard for the generic and kvm_guest subtargets to avoid hangs on alix2 and others (thx, russell)
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34126 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-11-09 10:19:51 +00:00
Florian Fainelli
86148ac69b
[x86] merge the RDC R-321x target as a subtarget of x86
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33779 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-10-15 18:54:34 +00:00
Felix Fietkau
56803b05a0
x86: rename the iso file to openwrt-x86-generic.iso
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33641 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-10-07 23:05:39 +00:00
Felix Fietkau
7bb6460a5d
x86: remove grub-legacy
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33640 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-10-07 23:01:56 +00:00
Felix Fietkau
ea575c9316
x86: add grub2 iso support
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33639 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-10-07 23:01:52 +00:00
Felix Fietkau
4fe0549e77
x86: avoid using grub prepare when using grub2
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33525 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-09-23 09:59:56 +00:00
Felix Fietkau
b043edb3d5
x86: add support for building grub2 images
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33513 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-09-22 20:10:42 +00:00
Felix Fietkau
4650f24b21
x86: rename gen_image_x86.sh to gen_image_grub.sh
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33510 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-09-22 20:10:31 +00:00
Vasilis Tsiligiannis
f96dd212f5
[x86] Allow gzipping of squashfs images with padded jffs2 partition
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30589 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-02-16 17:54:04 +00:00
Vasilis Tsiligiannis
c326fbec1a
[x86] GZip only ext4 and padded images
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30588 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-02-16 17:54:01 +00:00
Vasilis Tsiligiannis
7cb3f70eea
[x86] Make gzipping of images configurable via menuconfig
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30587 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-02-16 17:53:57 +00:00
Jo-Philipp Wich
d3cae4c425
Make the grub timeout configurable on x86 targets
...
Signed-off-by: Justus Winter <4winter@informatik.uni-hamburg.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29786 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-01-19 01:14:45 +00:00
John Crispin
f7044753af
[x86]
...
* adds support for Artec Thincan
Signed-of-By: Lauri Võsandi <lauri.vosandi@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26919 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-05-17 10:35:14 +00:00
Jo-Philipp Wich
af192f49ce
[x86] gzip jffs2 images
...
Signed-off-by: Vasilis Tsiligiannis <b_tsiligiannis@silverton.gr>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26625 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-04-12 20:48:47 +00:00
Imre Kaloz
c1725149e1
switch from ext2 to ext4 (w/o) journaling
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24084 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-11-22 12:12:39 +00:00
Andy Boyett
1ab07cd99b
[x86] image: use internal qemu-img for vmdk and vdi images
...
drop host dependencies on qemu-utils and VirtualBox
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22553 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-08-09 04:22:39 +00:00
Felix Fietkau
12abbd4d08
x86: build fully functional images on Mac OS X, now that grub is fixed
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21609 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-05-28 19:48:21 +00:00
Nicolas Thill
c0eb3b3611
image/x86: fix typo when building on Mac OS X ( closes : #7303 )
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21401 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-05-08 12:46:25 +00:00
Nicolas Thill
711491bad1
target/x86: use common config items for options shared between generic and olpc targets
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21364 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-05-05 02:07:38 +00:00
Nicolas Thill
560f2614b5
images: rename CONFIG_TARGET_ROOTFS_FSPART to CONFIG_TARGET_ROOTFS_PARTSIZE
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21362 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-05-05 01:52:54 +00:00
Nicolas Thill
443cf0e427
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
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21305 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-05-02 17:32:25 +00:00
Nicolas Thill
8aea0611d9
target/x86: add to changes missed from [21246] preventing .vdi & .vmdk image generation
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21277 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-30 18:43:39 +00:00
Nicolas Thill
ac838e71ff
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
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21246 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-29 03:03:47 +00:00
Nicolas Thill
dd725d483d
target/x86: rearrange image Makefile, indent, reorder, simplify, change some ifeq/ifneq tests
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21245 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-29 00:47:05 +00:00
Nicolas Thill
b1c612578a
replace old quote stripping with calls to qstrip macro
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21242 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-29 00:32:44 +00:00
Nicolas Thill
9d42bb1a21
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
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20834 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-12 23:15:56 +00:00
Jo-Philipp Wich
dd432e2ca6
[x86]
...
- 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
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19681 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-02-17 00:59:41 +00:00
Jo-Philipp Wich
e53a72a759
[x86] make console port editable through menuconfig, gzip ext2 images, add suitable defaults for Xen
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19612 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-02-12 19:04:12 +00:00
Florian Fainelli
90b91c76ab
[x86] add rootwait option to the kernel command line ( #6209 )
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18672 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-12-06 09:12:34 +00:00
Imre Kaloz
3790ba0f38
change x86 image generation handling to treat only olpc specially
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18441 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-11-17 19:49:25 +00:00
Florian Fainelli
1f8e50c932
[x86] merge the olpc target with the x86 target, both tested and running
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18279 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-11-03 01:02:39 +00:00
Imre Kaloz
476b993379
make kernels use /etc/preinit by default
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15840 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-05-14 10:20:53 +00:00
Jo-Philipp Wich
df2bb6497f
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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15682 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-05-07 13:50:09 +00:00
Hauke Mehrtens
1b15bd6d80
[x86] The image was selected from a wrong location.
...
Fixes bug #4618
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14948 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-03-19 13:02:06 +00:00
Jo-Philipp Wich
e08ba07cba
[x86] Use wildcards to copy grub stage files, will cover both i386-pc and i386-openwrt directory names
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13963 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-01-10 23:12:21 +00:00
Jo-Philipp Wich
d73dc3c9a2
[x86] fix grub installation on target images, regression caused by multi-libc support
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13936 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-01-08 16:51:01 +00:00
Steven Barth
c27370463e
Use VBoxManage instead of obsolete vditool to generate VirtualBox images.
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13821 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-01-02 14:35:18 +00:00
Florian Fainelli
dbc2b06751
Add support for creating VMware vmdk images #1317
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13158 3c298f89-4303-0410-b956-a3cf2f4a3e73
2008-11-09 17:39:09 +00:00
Felix Fietkau
3f198c6c0e
x86: don't attempt to compile grub on darwin
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11599 3c298f89-4303-0410-b956-a3cf2f4a3e73
2008-06-28 17:54:44 +00:00
Felix Fietkau
60760190c9
fix x86 image build order ( fixes #3317 )
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11359 3c298f89-4303-0410-b956-a3cf2f4a3e73
2008-06-04 21:55:25 +00:00
Florian Fainelli
f6477899ab
Add virtualbox images to x86 ( #3475 )
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11298 3c298f89-4303-0410-b956-a3cf2f4a3e73
2008-05-30 16:50:37 +00:00
Imre Kaloz
34df6484b6
fix image generation on x86
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10610 3c298f89-4303-0410-b956-a3cf2f4a3e73
2008-03-17 12:37:52 +00:00
Felix Fietkau
62ccdcedae
make the image filenames a bit shorter
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9533 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-11-10 23:08:11 +00:00
John Crispin
d1c7e5df36
fixed generation of iso images
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9317 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-10-14 13:39:35 +00:00
Felix Fietkau
6c533f0b92
move grub menu.lst to the right place
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9216 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-10-09 16:57:12 +00:00
Felix Fietkau
a1d7a399e4
move grub to package/
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9212 3c298f89-4303-0410-b956-a3cf2f4a3e73
2007-10-09 03:19:07 +00:00