Commit c3b72c6c authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

Merge branch 'next'



And kickoff 2012.02 cycle.

Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parents c29253ef e3c6b385
Loading
Loading
Loading
Loading
+16 −1
Original line number Diff line number Diff line
@@ -36,6 +36,18 @@ config BR2_LOCALFILES
	string "Local files retrieval command"
	default "cp"

config BR2_SCP
	string "Secure copy (scp) command"
	default "scp"

config BR2_SSH
	string "Secure shell (ssh) command"
	default "ssh"

config BR2_HG
	string "Mercurial (hg) command"
	default "hg"

config BR2_ZCAT
	string "zcat command"
	default "gzip -d -c"
@@ -102,7 +114,10 @@ config BR2_PRIMARY_SITE
	  Primary site to download from. If this option is set then buildroot
	  will try to download package source first from this site and try the
	  default if the file is not found.
	  NOTE: This only works for packages using the Makefile.autotools.in
	  Valid URIs are URIs recognized by $(WGET) and scp URIs of the form
	  scp://[user@]host:path.
	  NOTE: This works for all packages using the central package
	  infrastructure (generic, autotools, cmake, ...)

config BR2_BACKUP_SITE
	string "Backup download site"
+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@
#--------------------------------------------------------------

# Set and export the version string
export BR2_VERSION:=2011.11
export BR2_VERSION:=2012.02-git

# This top-level Makefile can *not* be executed in parallel
.NOTPARALLEL:
+7 −0
Original line number Diff line number Diff line
Run the emulation with:

  qemu-system-sparc -M SS-10 -kernel output/images/zImage -drive file=output/images/rootfs.ext2 -append "root=/dev/sda console=ttyS0,115200" -serial stdio

The login prompt will appear in the terminal that started Qemu.
The graphical window is the framebuffer.
+5 −0
Original line number Diff line number Diff line
Run the emulation with:

  qemu-system-x86_64 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=ide -append root=/dev/sda

The login prompt will appear in the graphical window.
Loading