diff options
author | joe <joe@FreeBSD.org> | 2001-04-24 07:12:34 +0000 |
---|---|---|
committer | joe <joe@FreeBSD.org> | 2001-04-24 07:12:34 +0000 |
commit | 03a16368482b9c4fff998628b88e4314ad049269 (patch) | |
tree | b63da5e4982efbea941f4982903aa0de210cbfc7 /release/picobsd | |
parent | c788a710a7a4ffb1afff4761b3d65c729138c7f8 (diff) | |
download | FreeBSD-src-03a16368482b9c4fff998628b88e4314ad049269.zip FreeBSD-src-03a16368482b9c4fff998628b88e4314ad049269.tar.gz |
MF4S: Syncronise with Luigi's work in -stable.
Diffstat (limited to 'release/picobsd')
19 files changed, 201 insertions, 270 deletions
diff --git a/release/picobsd/bridge/config b/release/picobsd/bridge/config new file mode 100644 index 0000000..55c3303 --- /dev/null +++ b/release/picobsd/bridge/config @@ -0,0 +1,5 @@ +# configuration for picobsd build script. +# it should only contain variable definitions -- it is sourced +# by the shell much like rc.conf* files + +MY_DEVS="std tun2 vty10 fd0 ad0 pty0 cuaa0 cuaa1 bpf0 bpf1 bpf2" diff --git a/release/picobsd/bridge/crunch.conf b/release/picobsd/bridge/crunch.conf new file mode 100644 index 0000000..a635a3b --- /dev/null +++ b/release/picobsd/bridge/crunch.conf @@ -0,0 +1,168 @@ +# +# $FreeBSD$ +# +# configuration file for "bridge" floppy. +# Depending on your needs, almost surely you will need to +# modify your configuration to add/remove/change programs used in +# the floppy image. Remember that some programs also require +# matching kernel options to enable device drivers etc. +# +# Next to most of the programs i have tried to indicate the approximate +# space consumed, but beware that these values change from release +# to release, and might depend on the presence of other programs which +# share the same libraries. +# +# NOTE: the string "/usr/src" will be automatically replaced with the +# correct value set in 'build' script - you should change it there + +# Default build options. Basically tell the Makefiles which understand +# that to use the most compact possible version of the code. +# +buildopts -DNOPAM -DRELEASE_CRUNCH -DNONETGRAPH -DNOIPSEC -DNOINET6 + +# directories where to look for sources of various binaries. +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 +# Some programs are especially written for PicoBSD and reside here +srcdirs /usr/src/release/picobsd/tinyware +# +# And there are others (mostly ports) which reside in their specific +# directories. For them, we use the "special" commands to tell +# crunchgen where to look for sources, objects, which Makefile +# variables contain the list of sources and objects, and so on. + +# init is almost always necessary. +progs init # 4KB. +# 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 # 24KB. +# ifconfig is needed if you want to configure interfaces... +progs ifconfig # 4KB. +# +# 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; the +# libraries are already needed anyways, so they end up using almost +# no additional memory. +# There are a few exceptions such as 'less', which in 4.x is +# rather large. +progs sh # 36KB. +ln sh -sh +progs echo # 0KB. +progs pwd +progs mkdir rmdir +progs chmod chown +progs mv ln # 0KB. +progs mount +progs minigzip # 0KB. +ln minigzip gzip +progs cp # 0KB. +progs rm +progs ls +progs kill +progs df # 0KB. +progs ps # 4KB. +progs ns # 4KB. +ln ns netstat +progs vm # 0KB. +progs cat # 0KB. +progs test # 0KB. +ln test [ +progs hostname # 0KB. +progs login # 4KB. +progs getty # 4KB. +progs stty # 4KB. +progs w # 0KB. +progs msg # 0KB. +ln msg dmesg +progs kget # 0KB. +progs reboot # 0KB. +#progs less # 36KB +#ln less more +progs more # 12KB +special more srcdir /usr/ports/picobsd/more + +progs sysctl +progs swapon # 0KB. +progs pwd_mkdb # 0KB. +progs dev_mkdb # 0KB. +progs umount +progs mount_std +progs du # 0KB. +progs tail # 0KB. +progs tee # 0KB. +progs passwd # 0KB. + +progs route # 8KB +# progs mount_msdos +# progs comcontrol +# +# If you want to run natd, remember the alias library +#progs natd # 20KB +#libs -lalias # natd +# +# ppp is rather large. Note that as of Jan.01, RELEASE_CRUNCH +# makes ppp not use libalias, so you cannot have aliasing. +#progs ppp # 112KB + +# 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 # 32KB. +libs -lncurses +# progs vi # ?? +# libs -lcurses # for vi + +progs tcpdump # 100KB. +special tcpdump srcdir /usr/src/usr.sbin/tcpdump/tcpdump + +progs arp # 0KB. + +progs disklabel # 4KB. +progs fdisk # 4KB. +progs vnconfig # 0KB. + +progs grep # 16KB. +progs date # 4KB. +progs mount_nfs # 0KB. +ln mount_nfs nfs +progs ping # 4KB. +#progs routed # 32KB. +progs ipfw # 12KB. +progs traceroute # 0KB. +# progs mount_cd9660 # 4KB. +# ln mount_cd9660 cd9660 +# progs newfs # 12KB. +#ln newfs mount_mfs +ln chown chgrp +# ln mount_msdos msdos +ln mount_std procfs +ln mount_std mount_procfs + +# If you need to access the box remotely, and maybe copy files +# from/to it, you can use telnet, rsh or ssh. +# inetd is only needed for telnet and rshd +progs inetd # 12KB. +progs telnet # 20KB. +progs telnetd # 12KB. +#progs ftp # 28KB. +#progs tar # 32KB. + +# Check the ssh license! If you want to use this, +# go to /usr/ports/security/ssh-picobsd, do a make extract configure +#progs sshd # includes ssh and scp +special sshd objvar SSHD_OBJS +special sshd srcdir /usr/ports/picobsd/ssh-picobsd/work/ssh-1.2.27 +special sshd objdir /usr/ports/picobsd/ssh-picobsd/work/ssh-1.2.27 + +### ee uses ncurses instead of curses +libs -ledit -lutil -lmd -lcrypt -lmp -lgmp -lm -lkvm +libs -lmytinfo -lipx -lz -lpcap -lwrap +libs -ltermcap -lgnuregex -ltelnet # -lcurses diff --git a/release/picobsd/bridge/crunch1/crunch.conf b/release/picobsd/bridge/crunch1/crunch.conf deleted file mode 100644 index 7b38456..0000000 --- a/release/picobsd/bridge/crunch1/crunch.conf +++ /dev/null @@ -1,123 +0,0 @@ -# -# $FreeBSD$ -# -# NOTE: the string "/usr/src" will be automatically replaced with the -# correct value set in 'build' script - you should change it there - -# Default build options. -buildopts -DNOPAM -DRELEASE_CRUNCH -DNOSECURE -DNOCRYPT -DNONETGRAPH -DNOIPSEC - -# other sources -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 -# sources for ns & vm -srcdirs ../../tinyware - -progs init # 4KB. -progs fsck # 24KB. -progs ifconfig # 4KB. -progs sh # 36KB. -ln sh -sh -progs inetd # 12KB. -progs df # 0KB. -progs ps # 4KB. -progs ns # 4KB. -ln ns netstat -progs vm # 0KB. -progs cat # 0KB. -progs test # 0KB. -ln test [ -progs echo # 0KB. -progs hostname # 0KB. -progs ln # 0KB. -progs login # 4KB. -progs getty # 4KB. -progs stty # 4KB. -progs w # 0KB. -progs msg # 0KB. -ln msg dmesg -progs kget # 0KB. -progs reboot # 0KB. -progs cp # 0KB. (strange!) -progs rm -progs mkdir -progs rmdir -progs ls -progs chmod -progs chown -progs mv -progs sysctl -progs route -progs swapon # 0KB. -progs pwd_mkdb # 0KB. -progs dev_mkdb # 0KB. -progs mount -progs umount -# progs # mount_msdos umount # comcontrol -progs kill mount_std # natd - -progs minigzip # 0KB. -ln minigzip gzip -progs ee # 32KB. -libs -lncurses -progs tcpdump # 48KB. -special tcpdump srcdir /usr/src/usr.sbin/tcpdump/tcpdump -progs arp # 0KB. -progs disklabel # 4KB. -progs fdisk # 4KB. -progs vnconfig # 0KB. -progs du # 0KB. -progs tail # 0KB. -progs tee # 0KB. - -progs pwd less # pppd -ln less more -progs grep # 16KB. -progs passwd # 0KB. -progs date # 4KB. -progs mount_nfs # 0KB. -ln mount_nfs nfs -progs ping # 4KB. -progs routed # 28KB. -progs ipfw # 12KB. -progs traceroute # 0KB. -# progs mount_cd9660 # 4KB. -# ln mount_cd9660 cd9660 -# progs newfs # 12KB. -#ln newfs mount_mfs -ln chown chgrp -# ln mount_msdos msdos -ln mount_std procfs -ln mount_std mount_procfs - -# you can either use telnet/telnetd, or ssh -progs telnet # 20KB. -progs telnetd # 12KB. -#progs ftp # 28KB. -#progs tar # 32KB. - -### Check the ssh license! If you want to use this, -### go to /usr/ports/security/ssh, do a make extract configure -#progs sshd -#special sshd srcdir /usr/ports/security/ssh/work/ssh-1.2.27 -#special sshd objvar SSHD_OBJS -#progs ssh -#ln ssh ssh1 -#special ssh srcdir /usr/ports/security/ssh/work/ssh-1.2.27 -#special ssh objvar SSH_OBJS -#progs scp -#special scp srcdir /usr/ports/security/ssh/work/ssh-1.2.27 -#special scp objvar SCP_OBJS - -# progs vi # ?? -# libs -lcurses # for vi - -### ee uses ncurses instead of curses -libs -ledit -lutil -lmd -lcrypt -lmp -lgmp -lm -lkvm -libs -lmytinfo -lipx -lz -lpcap -lalias -lwrap -libs -ltermcap -lgnuregex -ltelnet # -lcurses diff --git a/release/picobsd/bridge/lang/motd.en b/release/picobsd/bridge/lang/motd.en deleted file mode 100644 index 2367587..0000000 --- a/release/picobsd/bridge/lang/motd.en +++ /dev/null @@ -1,9 +0,0 @@ -================================================== - [31m)\_)\[37m -PicoBSD @VER@ (bridge) [31m([37m[1mo,o[m[31m)[37m - [32m__ [31m\~/[37m -Welcome to PicoBSD! [32m-->=[41m===[40m[31m\[37m - [32m~~[37m [31md d[37m - -For more info contact the author (abial@freebsd.org). - diff --git a/release/picobsd/dial/Makefile.mfs b/release/picobsd/dial/Makefile.mfs deleted file mode 100644 index fa83cfa..0000000 --- a/release/picobsd/dial/Makefile.mfs +++ /dev/null @@ -1,75 +0,0 @@ -# -# $FreeBSD$ -# - -.ifndef (DESTDIR) -DESTDIR?=/mnt -.endif - -STAND_LINKS= bin sbin -USR_LINKS= bin sbin libexec -PL_LOCALE_LINKS= pl polish -US_LOCALE_LINKS= en english -MY_DEVS= std sysmouse tun2 cuaa0 cuaa1 cuaa2 vty10 fd0 pty0 \ - psm0 \ - wd0s1h wd0s2 wd0s3 wd0s4 wd1s1h wd1s2 wd1s3 wd1s4 - -.if ${LANGUAGE} == pl -LOCALE=pl_PL.ISO_8859-2 -LOCALE_LINKS=${PL_LOCALE_LINKS} -FONT=iso02-8x16.fnt -KBD=pl_PL.ISO_8859-2.kbd -.else -LOCALE=en_US.ISO_8859-1 -LOCALE_LINKS=${US_LOCALE_LINKS} -.endif - -all: tree links - -tree: - mtree -deU -f ../build/mfs.mtree -p ${DESTDIR} - -links: tree - (cd ${DESTDIR}; \ - for i in ${STAND_LINKS}; \ - do \ - ln -s /stand $${i}; \ - done; \ - cd var/run; \ - ln -s /dev/null log; \ - cd ../../usr; \ - for i in ${USR_LINKS}; \ - do \ - ln -s /stand $${i}; \ - done; \ - cd share/misc;\ - ln -s /etc/termcap termcap; \ - echo emacs >${DESTDIR}/usr/share/misc/init.ee; \ - cd ../; \ - cd locale; \ - for i in ${LOCALE_LINKS}; \ - do \ - ln -s ${LOCALE} $${i}; \ - done; \ - mkdir ${LOCALE}/; \ - cp /usr/share/locale/${LOCALE}/* ${LOCALE}/; \ - if [ "X${FONT}" != "X" ]; \ - then \ - cp /usr/share/syscons/fonts/${FONT} ../syscons/; \ - cp /usr/share/syscons/keymaps/${KBD} ../syscons/; \ - fi; \ - cd ../nls; \ - for i in ${LOCALE_LINKS}; \ - do \ - ln -s ${LOCALE} $${i}; \ - done;) - - -# We don't do it under 'all' because it's needed only on non-DEVFS systems -devnodes: tree - (cd ${DESTDIR}/dev; \ - ln -s /dev/MAKEDEV; \ - ./MAKEDEV ${MY_DEVS} ; \ - rm MAKEDEV) - -clean: diff --git a/release/picobsd/dial/config b/release/picobsd/dial/config new file mode 100644 index 0000000..14eb23a --- /dev/null +++ b/release/picobsd/dial/config @@ -0,0 +1,15 @@ +STAND_LINKS="bin sbin usr/bin usr/sbin usr/libexec" +#PL_LOCALE_LINKS= pl polish +#US_LOCALE_LINKS= en english +MY_DEVS="std sysmouse tun2 cuaa0 cuaa1 cuaa2 vty10 fd0 pty0 \ + psm0 \ + wd0s1h wd0s2 wd0s3 wd0s4 wd1s1h wd1s2 wd1s3 wd1s4" +#.if ${LANGUAGE} == pl +#LOCALE=pl_PL.ISO_8859-2 +#LOCALE_LINKS=${PL_LOCALE_LINKS} +#FONT=iso02-8x16.fnt +#KBD=pl_PL.ISO_8859-2.kbd +#.else +#LOCALE=en_US.ISO_8859-1 +#LOCALE_LINKS=${US_LOCALE_LINKS} +#.endif diff --git a/release/picobsd/dial/crunch1/crunch.conf b/release/picobsd/dial/crunch.conf index d7caf9e..b9d52aa 100644 --- a/release/picobsd/dial/crunch1/crunch.conf +++ b/release/picobsd/dial/crunch.conf @@ -16,7 +16,7 @@ srcdirs /usr/src/usr.sbin srcdirs /usr/src/libexec # ns, vm etc... -srcdirs ../../tinyware +srcdirs /usr/src/release/picobsd/tinyware progs ppp ftp telnet ee gzip less #progs ssh diff --git a/release/picobsd/dial/floppy.tree.exclude b/release/picobsd/dial/floppy.tree.exclude index 64c05e2..f64a991 100644 --- a/release/picobsd/dial/floppy.tree.exclude +++ b/release/picobsd/dial/floppy.tree.exclude @@ -12,5 +12,4 @@ etc/rc.serial etc/remote etc/shells etc/snmpd.conf -etc/sshd_config etc/ttys diff --git a/release/picobsd/isp/Makefile.mfs b/release/picobsd/isp/Makefile.mfs deleted file mode 100644 index 12eeab6..0000000 --- a/release/picobsd/isp/Makefile.mfs +++ /dev/null @@ -1,10 +0,0 @@ -# -# $FreeBSD$ -# - -MY_DEVS= std tun2 vty10 fd0 wd0s1h pty0 \ - cuaa0 cuaa1 cuaa2 cuaa3 cuaa4 \ - cuaa5 cuaa6 cuaa7 cuaa8 cuaa9 - -.include "../build/Makefile.mfs" - diff --git a/release/picobsd/isp/config b/release/picobsd/isp/config new file mode 100644 index 0000000..c3f95b4 --- /dev/null +++ b/release/picobsd/isp/config @@ -0,0 +1,4 @@ +MY_DEVS="std tun2 vty10 fd0 wd0s1h pty0 \ + cuaa0 cuaa1 cuaa2 cuaa3 cuaa4 \ + cuaa5 cuaa6 cuaa7 cuaa8 cuaa9" + diff --git a/release/picobsd/isp/crunch1/crunch.conf b/release/picobsd/isp/crunch.conf index ecbf65e..e0f87a3 100644 --- a/release/picobsd/isp/crunch1/crunch.conf +++ b/release/picobsd/isp/crunch.conf @@ -16,7 +16,7 @@ srcdirs /usr/src/gnu/usr.bin srcdirs /usr/src/usr.sbin srcdirs /usr/src/libexec # sources for ns & vm -srcdirs ../../tinyware +srcdirs /usr/src/release/picobsd/tinyware progs sh test echo hostname ln login getty progs inetd telnetd stty w msg kget natd reboot diff --git a/release/picobsd/isp/mfs.mtree b/release/picobsd/isp/mfs.mtree index b8057bb..3bf77d7 100644 --- a/release/picobsd/isp/mfs.mtree +++ b/release/picobsd/isp/mfs.mtree @@ -9,6 +9,8 @@ .. etc .. + fd + .. home user .. @@ -53,4 +55,6 @@ .. .. .. + wd + .. .. diff --git a/release/picobsd/net/Makefile.mfs b/release/picobsd/net/Makefile.mfs deleted file mode 100644 index e471061..0000000 --- a/release/picobsd/net/Makefile.mfs +++ /dev/null @@ -1,7 +0,0 @@ -# -# $FreeBSD$ -# - -MY_DEVS= std tun2 cuaa0 cuaa1 cuaa2 vty10 fd0 wd0s1h pty0 - -.include "../build/Makefile.mfs" diff --git a/release/picobsd/net/config b/release/picobsd/net/config new file mode 100644 index 0000000..2b9d021 --- /dev/null +++ b/release/picobsd/net/config @@ -0,0 +1 @@ +MY_DEVS="std tun2 cuaa0 cuaa1 cuaa2 vty10 fd0 ad0 pty0" diff --git a/release/picobsd/net/crunch1/crunch.conf b/release/picobsd/net/crunch.conf index 587296f..587296f 100644 --- a/release/picobsd/net/crunch1/crunch.conf +++ b/release/picobsd/net/crunch.conf diff --git a/release/picobsd/router/Makefile.mfs b/release/picobsd/router/Makefile.mfs deleted file mode 100644 index d9f96cc..0000000 --- a/release/picobsd/router/Makefile.mfs +++ /dev/null @@ -1,7 +0,0 @@ -# -# $FreeBSD$ -# - -MY_DEVS= std tun2 vty3 fd0 pty0 cuaa0 cuaa1 cuaa2 - -.include "../build/Makefile.mfs" diff --git a/release/picobsd/router/config b/release/picobsd/router/config new file mode 100644 index 0000000..65b65cd --- /dev/null +++ b/release/picobsd/router/config @@ -0,0 +1 @@ +MY_DEVS="std tun2 vty3 fd0 pty0 cuaa0 cuaa1 cuaa2" diff --git a/release/picobsd/router/crunch1/crunch.conf b/release/picobsd/router/crunch.conf index 5e655a2..3108d82 100644 --- a/release/picobsd/router/crunch1/crunch.conf +++ b/release/picobsd/router/crunch.conf @@ -1,4 +1,3 @@ -# # $FreeBSD$ # # NOTE: the string "/usr/src" will be automatically replaced with the @@ -16,7 +15,7 @@ srcdirs /usr/src/gnu/usr.bin srcdirs /usr/src/usr.sbin srcdirs /usr/src/libexec # sources for ns & vm -srcdirs ../../tinyware +srcdirs /usr/src/release/picobsd/tinyware progs hostname cat kget progs oinit ifconfig df sps ns vm msg diff --git a/release/picobsd/router/crunch1/Makefile b/release/picobsd/router/crunch1/Makefile deleted file mode 100644 index 7af56e7..0000000 --- a/release/picobsd/router/crunch1/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# -# $FreeBSD$ -# -SRC?=/usr/src - -all: crunch - -crunch: - @cat crunch.conf|sed -e "s@/usr/src@${SRC}@" >crunch1.conf - @crunchgen ./crunch1.conf - @${MAKE} -f crunch1.mk NOSECURE=yes NOCRYPT=yes all \ - "CFLAGS=${CFLAGS} -DRELEASE_CRUNCH" #2>&1 >/dev/null - -clean: - rm -f *.o *.stub *.lo *_stub.c *.mk \ - crunch.cache \ - crunch.mk \ - crunch.c \ - crunch1* \ - crunch \ - .tmp_* \ - *.gz - -install: - cp crunch1 ${MFS_MOUNTPOINT}/stand/crunch - chmod 555 ${MFS_MOUNTPOINT}/stand/crunch - for i in `crunchgen -l crunch1.conf` ; \ - do \ - ln ${MFS_MOUNTPOINT}/stand/crunch ${MFS_MOUNTPOINT}/stand/$${i}; \ - done - rm ${MFS_MOUNTPOINT}/stand/crunch - - -.include <bsd.prog.mk> |