Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 7 Mar 2010 16:24:33 +0000 (UTC)
From:      Luigi Rizzo <luigi@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject:   svn commit: r204839 - stable/8/release/picobsd/qemu
Message-ID:  <201003071624.o27GOXve099467@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: luigi
Date: Sun Mar  7 16:24:33 2010
New Revision: 204839
URL: http://svn.freebsd.org/changeset/base/204839

Log:
  MFC qemu configuration

Added:
  stable/8/release/picobsd/qemu/
  stable/8/release/picobsd/qemu/PICOBSD   (contents, props changed)
  stable/8/release/picobsd/qemu/PICOBSD.hints   (contents, props changed)
  stable/8/release/picobsd/qemu/config   (contents, props changed)
  stable/8/release/picobsd/qemu/crunch.conf   (contents, props changed)
  stable/8/release/picobsd/qemu/floppy.tree.exclude
     - copied unchanged from r204836, stable/8/release/picobsd/bridge/floppy.tree.exclude

Added: stable/8/release/picobsd/qemu/PICOBSD
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/8/release/picobsd/qemu/PICOBSD	Sun Mar  7 16:24:33 2010	(r204839)
@@ -0,0 +1,122 @@
+#
+# $FreeBSD$
+# A configuration file to run tests on qemu.
+# We disable SMP because it does not work well with qemu, and set HZ=1000
+# to avoid it being overridden.
+#
+# Line starting with #PicoBSD contains PicoBSD build parameters
+#marker         def_sz  init    MFS_inodes      floppy_inodes
+#PicoBSD	18000	init	8192		32768
+options MD_ROOT_SIZE=18000      # same as def_sz
+
+hints	"PICOBSD.hints"
+
+# values accessible through getenv()
+# env		"PICOBSD.env"
+
+#cpu		I486_CPU
+cpu		I586_CPU
+cpu		I686_CPU
+ident		PICOBSD
+
+#options		SMP
+#device	apic
+
+options		SCHED_4BSD		# mandatory to have one scheduler
+#options	MATH_EMULATE		#Support for x87 emulation
+options 	INET			#InterNETworking
+#options	INET6
+options 	FFS			#Berkeley Fast Filesystem
+#options	BOOTP			#Use BOOTP to obtain IP address/hostname
+options 	MD_ROOT			#MD is a potential root device
+
+#options	NFS			#Network Filesystem
+#options	NFS_ROOT		#NFS usable as root device, NFS required
+
+#options 	MSDOSFS			#MSDOS Filesystem
+#options 	CD9660			#ISO 9660 Filesystem
+#options 	CD9660_ROOT		#CD-ROM usable as root, CD9660 required
+#options	DEVFS			#Device Filesystem
+#options 	PROCFS			#Process filesystem
+options		COMPAT_43		#Compatible with BSD 4.3 [KEEP THIS!]
+
+options		KDB
+options		DDB
+
+options		IPFIREWALL
+options		IPFIREWALL_DEFAULT_TO_ACCEPT
+options		IPDIVERT		# divert (for natd)
+
+# Support for bridging and bandwidth limiting
+options		DUMMYNET
+device		if_bridge
+# Running with less than 1000 seems to give poor timing on
+# qemu, so we set HZ explicitly.
+options		HZ=1000
+
+device		random			# used by ssh
+device		pci
+
+# Floppy drives
+device		fdc
+
+# ATA and ATAPI devices
+#device		ata
+#device		atadisk			# ATA disk drives
+#device		atapicd			# ATAPI CDROM drives
+#options		ATA_STATIC_ID		#Static device numbering
+
+# atkbdc0 controls both the keyboard and the PS/2 mouse
+device		atkbdc			# At keyboard controller
+device		atkbd
+#device		psm			# do we need the mouse ??
+
+device		vga			# VGA screen
+
+# syscons is the default console driver, resembling an SCO console
+device		sc
+
+# Serial (COM) ports
+device		uart
+
+# Audio support
+#device		pcm
+
+# PCCARD (PCMCIA) support
+#device		card		# pccard bus
+#device		pcic		# PCMCIA bridge
+
+# Parallel port
+#device		ppc
+#device		ppbus		# Parallel port bus (required)
+#device		lpt		# Printer
+#device		plip		# TCP/IP over parallel
+#device		ppi		# Parallel port interface device
+
+#
+# The following Ethernet NICs are all PCI devices.
+#
+device	miibus 
+device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
+device		nfe		# nVidia nForce MCP on-board Ethernet
+#device		xl		# 3Com
+device		rl		# RealTek 8129/8139
+device		re		# RealTek 8139C+/8169/8169S/8110S
+device		sis		# National/SiS
+device		dc		# DEC/Intel 21143 and various workalikes
+device		ed
+
+device		loop		# Network loopback
+device		ether		# Ethernet support
+device		tun		# Packet tunnel.
+device		pty		# Pseudo-ttys (telnet etc)
+device		md		# Memory "disks"
+#device		gif	4	# IPv6 and IPv4 tunneling
+#device		faith	1	# IPv6-to-IPv4 relaying (translation)
+device		tap
+
+#options               DEVICE_POLLING
+
+# The `bpf' device enables the Berkeley Packet Filter.
+# Be aware of the administrative consequences of enabling this!
+device		bpf		# Berkeley packet filter

Added: stable/8/release/picobsd/qemu/PICOBSD.hints
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/8/release/picobsd/qemu/PICOBSD.hints	Sun Mar  7 16:24:33 2010	(r204839)
@@ -0,0 +1,39 @@
+# $FreeBSD$
+hint.fdc.0.at="isa"
+hint.fdc.0.port="0x3F0"
+hint.fdc.0.irq="6"
+hint.fdc.0.drq="2"
+hint.fd.0.at="fdc0"
+hint.fd.0.drive="0"
+hint.ata.0.at="isa"
+hint.ata.0.port="0x1F0"
+hint.ata.0.irq="14"
+hint.ata.1.at="isa"
+hint.ata.1.port="0x170"
+hint.ata.1.irq="15"
+hint.atkbdc.0.at="isa"
+hint.atkbdc.0.port="0x060"
+hint.atkbd.0.at="atkbdc"
+hint.atkbd.0.irq="1"
+hint.psm.0.at="atkbdc"
+hint.psm.0.irq="12"
+hint.vga.0.at="isa"
+hint.sc.0.at="isa"
+hint.npx.0.at="nexus"
+hint.npx.0.port="0x0F0"
+hint.npx.0.irq="13"
+hint.uart.0.at="isa"
+hint.uart.0.port="0x3F8"
+hint.uart.0.flags="0x10"
+hint.uart.0.irq="4"
+hint.uart.1.at="isa"
+hint.uart.1.port="0x2F8"
+hint.uart.1.irq="3"
+hint.ed.0.at="isa"
+hint.ed.0.port="0x280"
+hint.ed.0.irq="5"
+hint.ed.0.maddr="0xd8000"
+hint.ed.1.at="isa"
+hint.ed.1.port="0x300"
+hint.ed.1.irq="5"
+hint.ed.1.maddr="0xd0000"

Added: stable/8/release/picobsd/qemu/config
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/8/release/picobsd/qemu/config	Sun Mar  7 16:24:33 2010	(r204839)
@@ -0,0 +1,26 @@
+# configuration for picobsd build script.
+# $FreeBSD$
+# it should only contain variable definitions -- it is sourced
+# by the shell much like rc.conf* files
+
+fd_size="8192"
+
+# To copy individual files you can use the function  do_copyfiles_user
+# as below (find_progs locates the programs and their libraries,
+# then you manually copy them.
+#copy_files="
+#"
+do_copyfiles_user() {
+	local dst=$1 # the destination root
+	log "--- put the libraries in /usr/lib to avoid conflicts"
+	mkdir -p ${dst}/usr/lib
+	log "-- import dropbear from its build directory --"
+	find_progs -L / -P /usr/ports/security/dropbear/work/dropbear-0.52 \
+		dbclient dropbear
+	cp -p ${u_progs} ${dst}/bin
+	cp -p ${u_libs} ${dst}/usr/lib
+	log "--- also import ssh, scp and sshd ---"
+	find_progs -L / /usr/bin/ssh /usr/bin/scp /usr/sbin/sshd
+	cp -p ${u_progs} ${dst}/bin
+	cp -p ${u_libs} ${dst}/usr/lib
+}

Added: stable/8/release/picobsd/qemu/crunch.conf
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/8/release/picobsd/qemu/crunch.conf	Sun Mar  7 16:24:33 2010	(r204839)
@@ -0,0 +1,191 @@
+#
+# $FreeBSD$
+#
+# Configuration file for "qemu" images..
+#
+# Depending on your needs, you will almost surely need to
+# add/remove/change programs according to your needs.
+# Remember that some programs require matching kernel options to
+# enable device drivers etc.
+#
+# To figure out how much space is used by each program, do
+#
+#	size build_dir-bridge/crunch/*lo
+#
+# Remember that programs require libraries, which add up to the
+# total size. The final binary is build_dir-bridge/mfs.tree/stand/crunch
+# and you can check which libraries it uses with
+#
+#	ldd build_dir-bridge/mfs.tree/stand/crunch
+
+# crunchgen configuration to build the crunched binary, see "man crunchgen"
+# We need to specify generic build options, the places where to look
+# for sources, and the list of program and libraries we want to put
+# in the crunched binary.
+#
+# NOTE: the string "/usr/src" below will be automatically replaced with
+# the path set in the 'build' script.
+
+# Default build options. Basically tell the Makefiles
+# that to use the most compact possible version of the code.
+
+buildopts -DNO_PAM -DRELEASE_CRUNCH -DPPP_NO_NETGRAPH
+buildopts -DTRACEROUTE_NO_IPSEC -DNO_INET6
+buildopts -DWITHOUT_IPX
+
+# Directories where to look for sources of various binaries.
+# @__CWD__@ is a magic keyword in the picobsd's (Makefile.conf)
+# which is replaced with the directory with the picobsd configuration
+# corresponding to your image. This way you can have custom sources
+# in that directory overriding system programs.
+
+srcdirs @__CWD__@/src
+
+# Some programs are especially written for PicoBSD and reside in
+# release/picobsd/tinyware.
+# Put this entry near the head of the list to override standard binaries.
+
+srcdirs /usr/src/release/picobsd/tinyware
+
+# Other standard locations for sources.
+# If a program uses its own source directory, add
+
+srcdirs /usr/src/bin
+srcdirs /usr/src/sbin/i386
+srcdirs /usr/src/sbin
+srcdirs /usr/src/usr.bin
+srcdirs /usr/src/gnu/usr.bin
+srcdirs /usr/src/usr.sbin
+srcdirs /usr/src/libexec
+
+# For programs that reside in different places, the best option
+# is to use the command "special XXX srcdir YYY" where XXX is the
+# program name and YYY is the directory path.
+# "special XXX ..." can be used to specify more options, see again
+# the crunchgen manpage.
+
+#--- Basic configuraton
+# init is always necessary (unless you have a replacement, oinit)
+progs init
+
+# fsck is almost always necessary, unless you have everything on the
+# image and use 'tar' or something similar to read/write raw blocks
+# from the floppy.
+
+progs fsck
+
+# ifconfig is needed if you want to configure interfaces.
+progs ifconfig
+
+# You will also need a shell and a bunch of utilities.
+# The standard shell is not that large, but you need many
+# external programs. In fact most of them do not take much space
+# as they merely issue a system call, and print the result.
+# For a more compact version of shell and utilities, you could
+# try busybox, however most system management commands in busybox
+# will not work as they use linux-specific interfaces.
+
+progs sh
+ln sh -sh
+
+# the small utilities
+progs echo
+progs pwd mkdir rmdir
+progs chmod chown
+ln chown chgrp
+progs mv ln cp rm ls
+progs cat tail tee
+progs test
+ln test [
+
+progs less
+ln less more
+progs mount
+progs minigzip
+ln minigzip gzip
+progs kill
+progs df
+progs ps
+progs ns	# this is the picobsd version
+ln ns netstat
+progs vm
+progs hostname
+progs login
+progs getty
+progs stty
+progs w
+progs msg
+ln msg dmesg
+progs reboot
+
+progs sysctl
+progs swapon
+progs pwd_mkdb
+progs umount
+progs du
+progs passwd
+
+progs route
+
+# If you want to run natd, remember the alias library
+progs natd
+libs_so -lalias # natd
+progs tcpdump
+special tcpdump srcdir /usr/src/usr.sbin/tcpdump/tcpdump
+libs_so -lpcap # used by tcpdump
+
+# ppp is rather large. Note that as of Jan.01, RELEASE_CRUNCH
+# makes ppp not use libalias, so you cannot have aliasing.
+#progs ppp
+
+# You need an editor. ee is relatively small, though there are
+# smaller ones. vi is much larger.
+# The editor also usually need a curses library.
+progs ee
+
+progs arp
+
+# these require libgeom
+# progs bsdlabel fdisk mdconfig
+
+progs kldload kldunload kldstat
+progs kldxref
+progs grep
+libs_so -lgnuregex -lbz2
+# dhclient-script requires 'sed'
+progs dhclient
+progs sed
+progs date
+progs time
+progs ping
+#progs routed
+progs ipfw
+progs traceroute
+progs mdmfs
+ln mdmfs mount_mfs
+# Various filesystem support -- remember to enable the kernel parts
+# progs mount_msdosfs
+progs mount_nfs
+# progs mount_cd9660
+ln mount_nfs nfs
+ln mount_cd9660 cd9660
+#progs newfs
+#ln newfs mount_mfs
+# ln mount_msdosfs msdos
+
+# For a small ssh client/server use dropbear
+
+# Now the libraries
+libs_so	-lc		# the C library
+libs_so -ll		# used by sh (really ?)
+libs_so -lufs		# used by mount
+### ee uses ncurses but as a dependency
+#libs_so -lncurses
+libs_so -lm
+libs_so -ledit -lutil
+libs_so -lcrypt
+libs_so -lkvm
+libs_so -lz
+libs_so -lbsdxml
+libs_so -lsbuf
+libs_so -ljail	# used by ifconfig

Copied: stable/8/release/picobsd/qemu/floppy.tree.exclude (from r204836, stable/8/release/picobsd/bridge/floppy.tree.exclude)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/8/release/picobsd/qemu/floppy.tree.exclude	Sun Mar  7 16:24:33 2010	(r204839, copy of r204836, stable/8/release/picobsd/bridge/floppy.tree.exclude)
@@ -0,0 +1,2 @@
+etc/snmpd.conf
+etc/ppp



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201003071624.o27GOXve099467>