Date: Wed, 8 Feb 2006 00:18:33 GMT From: soc-andrew <soc-andrew@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 91352 for review Message-ID: <200602080018.k180IXBY025709@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=91352 Change 91352 by soc-andrew@soc-andrew_serv on 2006/02/08 00:18:26 Catch up with HEAD Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/lib/Makefile#8 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#26 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#5 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#9 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#4 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#4 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/share/misc/dev.archlist.txt#8 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#4 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/picobsd/bridge/config#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/picobsd/bridge/crunch.conf#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/picobsd/build/picobsd#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/usr.bin/Makefile#3 integrate .. //depot/projects/soc2005/bsdinstaller/src/usr.sbin/Makefile#12 integrate Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/lib/Makefile#8 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.209 2005/12/29 14:40:20 dfr Exp $ +# $FreeBSD: src/lib/Makefile,v 1.211 2006/02/02 10:05:39 rwatson Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -22,11 +22,11 @@ # # Otherwise, the SUBDIR list should be in alphabetical order. -SUBDIR= ${_csu} libcom_err libcrypt libkvm msun libmd libncurses \ +SUBDIR= ${_csu} libbsm libcom_err libcrypt libkvm msun libmd libncurses \ libnetgraph libradius librpcsvc libsbuf libtacplus libutil \ ${_libypclnt} libalias libarchive ${_libatm} \ libbegemot ${_libbluetooth} libbsnmp libbz2 libc ${_libc_r} \ - libcalendar libcam libcompat libdevinfo libdevstat ${_libdisk} \ + libcalendar libcam libcompat libdevinfo libdevstat libdisk \ libedit libexpat libfetch libform libftpio libgeom ${_libgpib} \ libgssapi ${_libio} libipsec \ libipx libkiconv libmagic libmemstat libmenu ${_libmilter} ${_libmp} \ @@ -69,10 +69,6 @@ _libc_r= .endif -.if ${MACHINE_ARCH} != "arm" -_libdisk= libdisk -.endif - .if ${MACHINE_ARCH} == "alpha" _libio= libio .endif ==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#26 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.896 2006/01/04 18:02:56 jhb Exp $ +# $FreeBSD: src/release/Makefile,v 1.898 2006/01/30 14:24:31 kensmith Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -228,6 +228,7 @@ MFSSIZE= 4096 MFSINODE= 8192 MFSLABEL= auto +SPLIT_MFSROOT= .elif ${TARGET_ARCH} == "powerpc" DISKLABEL= "" MFSSIZE= 4096 @@ -1032,11 +1033,11 @@ @mv ${CD_DISC1}/INSTALLATION.TXT ${CD_DISC1}/INSTALL.TXT @mv ${CD_DISC1}/INSTALLATION.HTM ${CD_DISC1}/INSTALL.HTM .endif - @echo "CD_VOLUME = 1" >> ${CD_DISC1}/cdrom.inf .if defined(SEPARATE_LIVEFS) @cp -Rp ${CD_LIVEFS}/boot ${CD_DISC1} @echo "CD_VERSION = ${BUILDNAME}" > ${CD_DISC1}/cdrom.inf .endif + @echo "CD_VOLUME = 1" >> ${CD_DISC1}/cdrom.inf @echo "Building CDROM disc2 filesystem image" @mkdir -p ${CD_DISC2} @echo "CD_VERSION = ${BUILDNAME}" > ${CD_DISC2}/cdrom.inf ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#5 (text+ko) ==== @@ -29,7 +29,7 @@ <sect1 id="support"> <sect1info> - <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.292 2005/12/01 17:36:39 jhb Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.295 2006/02/07 03:32:22 marcel Exp $</pubdate> </sect1info> <title>Supported Devices</title> @@ -356,6 +356,8 @@ <sect2 id="misc-network"> <title>Miscellaneous Networks</title> + &hwlist.ce; + &hwlist.cx; &hwlist.cp; @@ -470,14 +472,10 @@ <sect2 id="serial"> <title>Serial Interfaces</title> - <para arch="i386,alpha,ia64,amd64"><quote>PC standard</quote> 8250, 16450, and 16550-based serial ports (&man.sio.4; driver)</para> + <para arch="i386,alpha,amd64"><quote>PC standard</quote> 8250, 16450, and 16550-based serial ports (&man.sio.4; driver)</para> - <para arch="sparc64">Serial ports based on the SAB82532 serial - chip, console only (&man.sab.4; driver)</para> + &hwlist.uart; - <para arch="sparc64">Serial ports based on the Zilog 8530 dual uart, - console only (zs driver)</para> - <para arch="i386,alpha,amd64">AST 4 port serial card using shared IRQ</para> <para arch="i386">ARNET serial cards (&man.ar.4; driver) @@ -535,7 +533,7 @@ <para>Decision Computers PCCOM 4-port serial and dual port RS232/422/485</para> </listitem> <listitem arch="ia64"> - <para>Diva Serial (GSP) Multiport UART (development branch only)</para> + <para>Diva Serial (GSP) Multiport UART</para> </listitem> <listitem arch="i386,amd64"> <para>Dolphin Peripherals 4025/4035/4036</para> @@ -660,8 +658,6 @@ <sect2 id="sound"> <title>Sound Devices</title> - &hwlist.sound; - &hwlist.snd.ad1816; &hwlist.snd.als4000; @@ -748,18 +744,18 @@ <sect2 id="usb"> <title>USB Devices</title> - <para arch="alpha,i386,pc98,amd64">A range of USB peripherals are supported; devices known to + <para arch="alpha,i386,ia64,pc98,amd64">A range of USB peripherals are supported; devices known to work are listed in this section. Owing to the generic nature of most USB devices, with some exceptions any device of a given class will be supported, even if not explicitly listed here.</para> - <note arch="alpha,i386,pc98,amd64"> + <note arch="alpha,i386,ia64,pc98,amd64"> <para>USB Ethernet adapters can be found in the section listing <link linkend="ethernet">Ethernet interfaces</link>.</para> </note> - <note arch="alpha,i386,pc98,amd64"> + <note arch="alpha,i386,ia64,pc98,amd64"> <para>USB Bluetooth adapters can be found in <link linkend="bluetooth">Bluetooth</link> section.</para> </note> @@ -771,9 +767,9 @@ <para arch="i386,ia64,pc98,amd64">USB 2.0 controllers using the EHCI interface (&man.ehci.4; driver)</para> - <para arch="i386,pc98,alpha,amd64">Hubs + <para arch="i386,ia64,pc98,alpha,amd64">Hubs </para> - <para arch="i386,pc98,alpha,amd64">Keyboards (&man.ukbd.4; driver) + <para arch="i386,ia64,pc98,alpha,amd64">Keyboards (&man.ukbd.4; driver) </para> <para arch="i386,pc98,amd64">Miscellaneous <itemizedlist> @@ -799,7 +795,7 @@ &hwlist.umodem; - <para arch="i386,pc98,alpha,amd64">Mice (&man.ums.4; driver) + <para arch="i386,ia64,pc98,alpha,amd64">Mice (&man.ums.4; driver) </para> &hwlist.ulpt; @@ -870,7 +866,7 @@ <para arch="i386,pc98,alpha,amd64">Floppy drives (&man.fdc.4; driver)</para> - <para arch="i386,alpha,ia64,amd64">VGA-compatible video cards + <para arch="i386,alpha,amd64">VGA-compatible video cards (&man.vga.4; driver) <note> @@ -887,13 +883,13 @@ <listitem arch="i386,alpha"> <para>AT-style keyboards (&man.atkbd.4; driver)</para> </listitem> - <listitem arch="i386,alpha,ia64,amd64"> + <listitem arch="i386,alpha,amd64"> <para>PS/2 keyboards (&man.atkbd.4; driver)</para> </listitem> <listitem arch="pc98"> <para>Standard keyboards</para> </listitem> - <listitem arch="i386,pc98,alpha,amd64"> + <listitem arch="i386,pc98,alpha,ia64,amd64"> <para>USB keyboards (&man.ukbd.4; driver)</para> </listitem> </itemizedlist> @@ -904,14 +900,14 @@ <listitem arch="i386,pc98,amd64"> <para>Bus mice and compatible devices (&man.mse.4; driver)</para> </listitem> - <listitem arch="i386,alpha,ia64,amd64"> + <listitem arch="i386,alpha,amd64"> <para>PS/2 mice and compatible devices, including many laptop pointing devices (&man.psm.4; driver)</para> </listitem> <listitem> <para>Serial mice and compatible devices</para> </listitem> - <listitem arch="i386,pc98,alpha,amd64"> + <listitem arch="i386,pc98,alpha,ia64,amd64"> <para>USB mice (&man.ums.4; driver)</para> </listitem> </itemizedlist> ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml#2 (text+ko) ==== @@ -1,23 +1,21 @@ <!-- - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml,v 1.9 2004/07/07 13:11:59 den Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml,v 1.10 2006/02/07 03:34:28 marcel Exp $ --> <sect1 id="proc-ia64"> <title>Supported Processors and Motherboards</title> - <para>Currently supported processors are the - <ulink url="http://www.intel.com/design/itanium/itanium/index.htm">Itanium</ulink>; - and the <ulink url="http://www.intel.com/design/itanium2/index.htm">Itanium 2</ulink>.</para> + <para>Currently supported processors are the + <ulink url="http://people.freebsd.org/~marcel/refs/ia64/itanium/24532003.pdf">; + Itanium</ulink> and the + <ulink url="http://people.freebsd.org/~marcel/refs/ia64/itanium2/25111003.pdf">; + Itanium 2</ulink>.</para> <para>Supported chipsets include:</para> <itemizedlist> <listitem> - <para>HP zx1 (only on development branch, see the - <ulink url="http://perforce.FreeBSD.org/">Perforce repository</ulink>)</para> + <para>HP zx1</para> </listitem> <listitem> - <para>HP i2000</para> - </listitem> - <listitem> <para>Intel 460GX</para> </listitem> <listitem> @@ -26,58 +24,17 @@ </itemizedlist> <para>Both Uniprocessor (UP) and Symmetric Multi-processor (SMP) - configurations are under active development. At this time, - SMP-enabled systems are considered less stable. The current - priorities are UP fixes to improve stability.</para> + configurations are supported.</para> <sect2> <title>Supported Devices Overview</title> - <para>This section contains additional information about what - devices may or may not be supported by &os;/&arch;.</para> - - <para>Except for the PC chipset embedded &man.ata.4; controllers, - most should work out of the box. Eventually, all - &arch;-compatible ATA controllers are expected to be fully - supported. Refer to the following sections for various disk - controllers and their current status.</para> - - <para>In general, <quote>PC standard</quote> serial ports - supported by the &man.sio.4; driver are expected to work on - Intel legacy machines, but not PA legacy machines. The reason - is that all devices on HP machines are memory-mapped and there - is <emphasis>no</emphasis> ISA device support other than the PCI - dictated VGA legacy.</para> - - <para>In addition to &man.sio.4; devices, the following devices - fail on non-Intel legacy machines (but should work on boxes with - an Intel legacy) because their drivers make ISA-specific - assumptions that do not hold:</para> - - <informaltable frame="none"> - <tgroup cols="2"> - <tbody> - <row> - <entry>&man.sio.4;</entry> - <entry>No support for memory-mapped I/O</entry> - </row> - - <row> - <entry>&man.syscons.4;</entry> - <entry>Expect BIOS, VGA probes, etc.</entry> - </row> - - <row> - <entry>&man.pcm.4;</entry> - <entry>Probes MSS ISA ports <emphasis>ad nauseum</emphasis></entry> - </row> - - <row> - <entry>&man.atkbd.4;, &man.psm.4;</entry> - <entry>Fixed ISA port locations</entry> - </row> - </tbody> - </tgroup> - </informaltable> + <para>Most devices that can be found in or are compatible with + &arch; machines are fully supported. The notable exception + is the VGA console. The &os; support for VGA consoles is at + this time too much based on PC hardware and not all &arch; + machines have chipsets that provide sufficient PC legacy + support. As such &man.syscons.4; can not be enabled and the + use of a serial console is required.</para> </sect2> </sect1> ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#9 (text+ko) ==== @@ -3,7 +3,7 @@ <corpauthor>The &os; Project</corpauthor> - <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.897 2005/10/31 16:52:11 hrs Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.898 2006/02/05 20:54:53 bmah Exp $</pubdate> <copyright> <year>2000</year> @@ -12,6 +12,7 @@ <year>2003</year> <year>2004</year> <year>2005</year> + <year>2006</year> <holder role="mailto:doc@FreeBSD.org">The &os; Documentation Project</holder> </copyright> @@ -113,7 +114,43 @@ <sect2 id="security"> <title>Security Advisories</title> - <para></para> + <para>A temporary file vulnerability in &man.texindex.1;, which + could allow a local attacker to overwrite files in the context + of a user running the &man.texindex.1; utility, has been fixed. + For more details see security advisory <ulink + url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-06:01.texindex.asc">FreeBSD-SA-06:01.texindex</ulink>. &merged</para> + + <para>A temporary file vulnerability in the &man.ee.1; text + editor, which could allow a local attacker to overwrite files in + the context of a user running &man.ee.1;, has been fixed. For + more details see security advisory <ulink + url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-06:02.ee.asc">FreeBSD-SA-06:02.ee</ulink>. &merged</para> + + <para>Several vulnerabilities in the &man.cpio.1; utility have + been corrected. For more + details see security advisory <ulink + url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-06:03.cpio.asc">FreeBSD-SA-06:03.cpio</ulink>. &merged</para> + + <para>An error in &man.ipfw.4; IP fragment handling, which could + cause a crash, has been fixed. For more + details see security advisory <ulink + url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-06:04.ipfw.asc">FreeBSD-SA-06:04.ipfw</ulink>. &merged</para> + + <para>A potential buffer overflow in the IEEE 802.11 scanning code + has been corrected. For more + details see security advisory <ulink + url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-06:05.80211.asc">FreeBSD-SA-06:05.80211</ulink>. &merged</para> + + <para>Two instances in which portions of kernel memory could be + disclosed to users have been fixed. For more details see + security advisory <ulink + url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-06:06.kmem.asc">FreeBSD-SA-06:06.kmem</ulink>. &merged</para> + + <para>A logic bug in the IP fragment handling in &man.pf.4;, which + could cause a crash under certain circumstances, has been fixed. + For more details see security advisory <ulink + url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-06:07.pf.asc">FreeBSD-SA-06:07.pf</ulink>. &merged</para> + </sect2> <sect2 id="kernel"> ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#4 (text+ko) ==== @@ -26,13 +26,13 @@ this file to fix "missed" conversions are likely to break the build. - $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml,v 1.30 2005/08/28 08:20:41 simon Exp $ + $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml,v 1.31 2006/01/26 09:37:24 brd Exp $ Original revision: 1.282 --> <sect1 id="support"> <sect1info> - <pubdate>$FreeBSD: src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml,v 1.30 2005/08/28 08:20:41 simon Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml,v 1.31 2006/01/26 09:37:24 brd Exp $</pubdate> </sect1info> <title>Âбþ¥Ï¡¼¥É¥¦¥§¥¢</title> @@ -668,8 +668,6 @@ <sect2 id="sound"> <title>¥µ¥¦¥ó¥É¥Ç¥Ð¥¤¥¹</title> - &hwlist.sound; - &hwlist.snd.ad1816; &hwlist.snd.als4000; ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#4 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Russian Documentation Project - $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml,v 1.15 2005/08/28 08:20:41 simon Exp $ + $FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml,v 1.16 2006/01/26 09:37:24 brd Exp $ $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml,v 1.18 2005/06/30 11:12:31 den Exp $ Original revision: 1.282 @@ -37,7 +37,7 @@ <sect1 id="support"> <sect1info> - <pubdate>$FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml,v 1.15 2005/08/28 08:20:41 simon Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml,v 1.16 2006/01/26 09:37:24 brd Exp $</pubdate> </sect1info> <title>ðÏÄÄÅÒÖÉ×ÁÅÍÙÅ ÕÓÔÒÏÊÓÔ×Á</title> @@ -683,8 +683,6 @@ <sect2 id="sound"> <title>ú×ÕËÏ×ÙÅ ÕÓÔÒÏÊÓÔ×Á</title> - &hwlist.sound; - &hwlist.snd.ad1816; &hwlist.snd.als4000; ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/share/misc/dev.archlist.txt#8 (text+ko) ==== @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.74 2005/12/28 08:35:30 simon Exp $ +# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.77 2006/02/07 03:25:18 marcel Exp $ # # @@ -54,6 +54,7 @@ bt i386,amd64 cdce i386,pc98,ia64,amd64 ciss i386,ia64,amd64 +ce i386,pc98 cm i386 cnw i386,pc98,amd64 cp i386,pc98 @@ -127,7 +128,6 @@ snd_via8233 i386,amd64 snd_via82c686 i386,amd64 snd_vibes i386,amd64 -sound i386,alpha,amd64 sr i386 ste i386,pc98,alpha,amd64 stg i386,pc98 @@ -137,6 +137,7 @@ twa i386,amd64 twe i386,amd64 txp i386,pc98,alpha,ia64,amd64 +uart alpha,amd64,i386,ia64,sparc64 ubsa i386,pc98,amd64 ubsec i386,pc98,amd64 ubser i386,pc98,amd64 ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#4 (text+ko) ==== @@ -35,7 +35,7 @@ <sect1 id="support"> <sect1info> - <pubdate>$FreeBSD: src/release/doc/zh_CN.GB2312/hardware/common/dev.sgml,v 1.5 2005/10/12 20:30:39 delphij Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/zh_CN.GB2312/hardware/common/dev.sgml,v 1.6 2006/01/26 09:37:24 brd Exp $</pubdate> </sect1info> <title>Ö§³ÖµÄÓ²¼þ</title> @@ -654,8 +654,6 @@ <sect2 id="sound"> <title>ÉùÒôÉ豸</title> - &hwlist.sound; - &hwlist.snd.ad1816; &hwlist.snd.als4000; ==== //depot/projects/soc2005/bsdinstaller/src/release/picobsd/bridge/config#2 (text+ko) ==== @@ -1,6 +1,7 @@ # configuration for picobsd build script. +# $FreeBSD: src/release/picobsd/bridge/config,v 1.5 2006/01/31 20:36:01 luigi Exp $ # it should only contain variable definitions -- it is sourced # by the shell much like rc.conf* files o_no_devfs="" # we have devfs. -#fd_size="2880" +fd_size="2880" ==== //depot/projects/soc2005/bsdinstaller/src/release/picobsd/bridge/crunch.conf#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/release/picobsd/bridge/crunch.conf,v 1.18 2004/12/21 12:49:24 ru Exp $ +# $FreeBSD: src/release/picobsd/bridge/crunch.conf,v 1.19 2006/01/31 20:36:01 luigi Exp $ # # configuration file for "bridge" floppy. # Depending on your needs, almost surely you will need to @@ -133,7 +133,7 @@ progs arp # 0KB. -progs disklabel # 4KB. +progs bsdlabel # 4KB. progs fdisk # 4KB. progs vnconfig # 0KB. @@ -181,3 +181,4 @@ libs -ledit -lutil -lmd -lcrypt -lmp -lm -lkvm libs -lmytinfo -lipx -lz -lpcap -lwrap libs -ltermcap -lgnuregex # -lcurses +libs -lgeom ==== //depot/projects/soc2005/bsdinstaller/src/release/picobsd/build/picobsd#2 (text+ko) ==== @@ -1,6 +1,7 @@ #!/bin/sh - # -# $FreeBSD: src/release/picobsd/build/picobsd,v 1.37 2004/12/21 12:21:26 ru Exp $ +# $FreeBSD: src/release/picobsd/build/picobsd,v 1.38 2006/01/31 20:24:43 luigi Exp $ +# This file requires sysutils/makefs to run # # The new PicoBSD build script. Invoked as # @@ -111,34 +112,33 @@ o_do_modules="" # do not build modules SRC="/usr/src" # default location for sources - c_startdir=`pwd` # directory where we start - # used to lookup config and create BUILDDIR + c_startdir=`pwd` # directory where we start + # used to lookup config and create BUILDDIR + + # XXX 6.x/7.x have a single /boot/boot block, which is the concatenation + # of the old two. For the time being, we keep these, but this should + # be fixed at some point. + # blocks c_boot1=/boot/boot1 # boot blocks (in case you want custom ones) c_boot2=/boot/boot2 c_reply=${c_reply:-`mktemp "/tmp/reply.XXXXXXXXXX"`} - # file where User replies will be put + # file where User replies will be put c_mnt=`mktemp -d "/tmp/picobsd.XXXXXXXXXX"` - # mountpoint used to build memory filesystems - c_fs=fs.PICOBSD # filename used for the memory filesystem - c_img=picobsd.bin # filename used for the picobsd image + # mountpoint used to build memory filesystems + c_fs=fs.PICOBSD # filename used for the memory filesystem + c_img=picobsd.bin # filename used for the picobsd image # select the right memory disk name case `uname -r` in - 5.*) - l_vn="md" - l_makedev="${SRC}/etc/MAKEDEV" + 7.*|6.*|5.*) + l_label="bsdlabel" ;; *) - l_vn="vn" - l_makedev="/dev/MAKEDEV" + l_label="disklabel" ;; esac - l_newfs="-m 0 -o space -f 512 -b 4096" - # Find a suitable vnode - l_vnum=`mount | awk "/${l_vn}/ { num++ } END { printf \"%d\", num }"` - l_vndev=${l_vn}${l_vnum} set -e @@ -146,15 +146,21 @@ #trap fail 3 #trap fail 6 trap fail 15 - free_vnode # cleanup old vnodes } create_includes_and_libraries2() { + local no log "create_includes_and_libraries2() for ${SRC}" + if [ ${OSVERSION} -ge 600000 ] ; then + no="-DNO_CLEAN -DNO_PROFILE -DNO_GAMES -DNO_LIBC_R" + else + no="-DNOCLEAN -DNOPROFILE -DNOGAMES -DNOLIBC_R" + fi MAKEOBJDIRPREFIX=${l_objtree} export MAKEOBJDIRPREFIX ( cd ${SRC}; - make -DNO_CLEAN -DNO_PROFILE -DNO_GAMES -DNO_LIBC_R -DPICOBSD buildworld + # make -DNOCLEAN -DNOPROFILE -DNOGAMES -DNOLIBC_R -DPICOBSD buildworld + make _+_= $no toolchain ) } @@ -178,11 +184,12 @@ (cd ${SRC} # $e is the invocation of make with correct environment + # XXX check the NO* options below, maybe system dependent. e="MAKEOBJDIRPREFIX=${l_objtree}/picobsd/libraries \ BINOWN=`id -un` BINGRP=`id -gn` \ DESTDIR=${l_usrtree}/.. \ make -m ${SRC}/share/mk \ - -DNO_HTML -DNO_INFO -DNO_MAN -DNO_SHARE -DNO_FSCHG " + -DNOHTML -DNOINFO -DNOMAN -DNOSHARE -DNOFSCHG " log "do a 'make obj' in a few places." # This is very version-specific... The following works for 5.0 for i in lib secure/lib gnu/lib usr.sbin/pcvt/keycap \ @@ -190,7 +197,7 @@ (cd ${i}; eval $e obj) done log "now make the static libraries" - eval $e -DNO_PROFILE -DNO_PIC libraries + eval $e -DNOPROFILE -DNOPIC libraries (cd ${SRC}/usr.sbin/config eval $e # build binary eval $e install # install it @@ -239,18 +246,6 @@ rm -rf ${BUILDDIR} } -# free as much as possible from the vnode -free_vnode() { - log "free_vnode() ${l_vndev} " - umount ${c_mnt} 2> /dev/null || true - umount /dev/${l_vndev} 2> /dev/null || true - if [ "${l_vn}" = "vn" ] ; then - vnconfig -u ${l_vndev} 2> /dev/null || true - else - mdconfig -d -u ${l_vnum} 2> /dev/null || true - fi -} - # prepare a message to be printed in the dialog menus. set_msgs() { # OK log "set_msgs()" @@ -433,7 +428,7 @@ if [ "${o_interactive}" = "NO" ] ; then echo "+++ Build completed +++" - cat .build.reply + cat .build.reply || true return fi dialog --title "Build ${THETYPE} completed" --inputbox \ @@ -529,30 +524,6 @@ ) || true } -create_mfs() { # OK - log "create_mfs() Preparing MFS filesystem..." - - free_vnode - - # zero-fill the MFS image - init_fs_image ${BUILDDIR}/${c_fs} ${MFS_SIZE} - - log "Labeling MFS image" - # Disklabel "auto" behaves strangely for sizes < 1024K. Basically - # it fails to install a label on the system. On the other hand, - # if you provide a specific disk type, the boot code is not - # installed so you have more space on the disk... - # For small image sizes, use std disktypes - if [ ${MFS_SIZE} -lt 1024 ] ; then - disklabel -rw ${l_vndev} fd${MFS_SIZE} || fail $? mfs_disklabel - else - disklabel -rw ${l_vndev} auto || fail $? mfs_disklabel - fi - newfs -i ${mfs_inodes} ${l_newfs} /dev/${l_vndev}c > /dev/null - mount /dev/${l_vndev}c ${c_mnt} || fail $? no_mount - log "`df /dev/${l_vndev}c`" -} - # Populate the memory filesystem with binaries and non-variable # configuration files. # First do an mtree pass, then create directory links and device entries, @@ -564,16 +535,10 @@ local a dst log "populate_mfs_tree()" - early_mfs_mount=0 - if [ "${early_mfs_mount}" = "1" ] ; then - create_mfs - dst=${c_mnt} - else - dst=${BUILDDIR}/mfs.tree - # clean relics from old compilations. - rm -rf ${dst} || true - mkdir ${dst} - fi + dst=${BUILDDIR}/mfs.tree + # clean relics from old compilations. + rm -rf ${dst} || true + mkdir ${dst} log "pwd=`pwd`, Populating MFS tree..." @@ -636,38 +601,23 @@ if [ "${o_all_in_mfs}" = "yes" ]; then log "Copy generic floppy_tree into MFS..." - cp -Rp ${BUILDDIR}/floppy.tree/* ${dst}/fd + # this may fail in case the floppy is empty + cp -Rp ${BUILDDIR}/floppy.tree/* ${dst}/fd || true fi - [ "`id -u`" = "0" ] || cat <<__EOF - -### ------------------------------------------------------------------- -### -### WARNING: You are not running with root permissions, so the next -### stages are likely to fail because they call commands such as -### chown, {vn|md}config, mount/umount which need adequate rights. -### -### The results of the compilation so far is in directory -### ${BUILDDIR} -### which has the following content: - -`ls -l ${BUILDDIR}` - -### -### ------------------------------------------------------------------- - -__EOF - if [ "${o_no_devfs}" != "" ] ; then # create device entries using MAKEDEV (cd ${dst}/dev - ln -s ${l_makedev} ; chmod 555 MAKEDEV - ./MAKEDEV ${MY_DEVS} + ln -s ${SRC}/etc/MAKEDEV ; chmod 555 MAKEDEV + # log `pwd` + sh ./MAKEDEV ${MY_DEVS} rm MAKEDEV ) fi - log "Fixing permissions" - (cd ${dst}; chown -R root . ) + if [ "`id -u`" = "0" ] ; then + log "Fixing permissions" + (cd ${dst}; chown -R root . ) + fi if [ -n "${import_files}" ] ; then log "importing ${import_files} into mfs" @@ -679,22 +629,19 @@ rm ${dst}/my_copy_of_tar fi - if [ "${early_mfs_mount}" != "1" ] ; then - create_mfs - log "Copy mfs tree into file" - (cd ${dst} ; tar cf - . ) | ( cd ${c_mnt} ; tar xf - ) - fi - # now umount and fsck the filesystem. - log "Status of mfs image" - df -ik ${c_mnt} - umount ${c_mnt} - fsck -p /dev/${l_vndev}c - free_vnode + (cd ${BUILDDIR} + # override the owner + echo "/set uid=0 gid=0" > mtree.out + mtree -c -p ${dst} -k "" >> mtree.out + log "mtre.out at ${BUILDDIR}/mtree.out" + makefs -t ffs -o bsize=4096 -o fsize=512 \ + -s ${MFS_SIZE}k -f 100 -F mtree.out ${c_fs} ${dst} + ls -l ${c_fs} ) + log "done mfs image" } final_cleanup() { log "final_cleanup()" - free_vnode rm -rf ${c_mnt} ${c_reply} 2> /dev/null || true rm -f ${c_reply} } @@ -710,26 +657,12 @@ where=$3 echo "---> fail: Error <${errno}> error code <${errcode}> in <${where}>" case ${errcode} in - no_vnconfig) - echo "Error in vnconfig on /dev/${l_vndev}..." - echo "Either you are not running as root or your running kernel" - echo "does not have the ${l_vn}(4) device." - ;; - mfs_disklabel) - echo "Error while labeling ${c_fs} size ${MFS_SIZE}" - ;; - no_mount) - echo "Error while mounting ${c_fs} (/dev/${l_vndev}c) on ${c_mnt}" - ;; mtree) echo "Error while making hierarchy in ${c_mnt}" ;; crunch) echo "Error while building ${name}." ;; - floppy_disklabel) - echo "Error while doing disklabel on of floppy.img size $fd_size" - ;; missing_kernel) echo "Error: you must build PICOBSD${suffix} kernel first" ;; @@ -762,90 +695,91 @@ exit 2 } -# -# Create a zero-filled disk image with a boot sector, and vnconfig it. -# - -init_fs_image() { # filename size_in_kbytes - local imgname imgsize - - log "init_fs_image() $1 $2" - imgname=$1 ; imgsize=$2 - dd if=/dev/zero of=${imgname} count=${imgsize} bs=1k 2> /dev/null - dd if=${c_boot1} of=${imgname} conv=notrunc 2> /dev/null - - if [ "${l_vn}" = "vn" ] ; then - vnconfig -c -s labels ${l_vndev} ${imgname} || fail $? no_vnconfig - else - mdconfig -a -t vnode -u ${l_vnum} -f ${imgname} || fail $? no_vnconfig - fi -} - - fill_floppy_image() { - local blocks sectors dst + local blocks dst mfs_start mfs_end mfs_size img_size log "fill_floppy_image()" dst=${c_mnt} # where to create the image log "Preparing ${fd_size}kB floppy filesystem..." - # correct block and number of sectors according to size. - blocks=${fd_size}; sectors=18 + # correct blocks according to size. + blocks=${fd_size}; if [ "${blocks}" = "1720" ]; then - blocks=1722 ; sectors=21 + blocks=1722 elif [ "${blocks}" = "1480" ]; then - blocks=1476 ; + blocks=1476 fi - init_fs_image ${BUILDDIR}/${c_img} ${blocks} - log "Labeling floppy image" + log "patch ${c_boot2} to boot /kernel right away" b2=${BUILDDIR}/boot2 # modified boot2 - cp ${c_boot2} ${b2} + cp -f ${c_boot2} ${b2} chmod 0644 ${b2} + set `strings -at d ${b2} | grep "/boot/loader"` - echo -e "/kernel\0\0\0\0\0" | dd of=${b2} obs=$1 oseek=1 conv=notrunc + echo -e "/kernel\0\0\0\0\0" | \ + dd of=${b2} obs=$1 oseek=1 conv=notrunc 2>/dev/null chmod 0444 ${b2} - # create a disklabel ... - disklabel -Brw -b ${c_boot1} -s ${b2} ${l_vndev} auto || \ - fail $? floppy_disklabel - - # and copy partition c: into partition a: using some sed magic - disklabel ${l_vndev} | sed -e '/ c:/{p;s/c:/a:/;}' | \ - disklabel -R ${l_vndev} /dev/stdin - - log "Newfs floppy image" - newfs -i ${fd_inodes} ${l_newfs} /dev/${l_vndev}a > /dev/null - - log "Mounting floppy image" - mount /dev/${l_vndev}a ${dst} - + dst=${BUILDDIR}/image.tree + rm -rf ${dst} + mkdir -p ${dst} ( cd ${BUILDDIR} + set 0 0 # reset variables # $1 takes the offset of the MFS filesystem set `strings -at d kernel | grep "MFS Filesystem goes here"` - mfs_ofs=$(($1 + 8192)) - log "Preload kernel with file ${c_fs} at ${mfs_ofs}" - dd if=${c_fs} ibs=8192 iseek=1 of=kernel obs=${mfs_ofs} \ - oseek=1 conv=notrunc + mfs_start=$1 + set 0 0 # reset variables + set `strings -at d kernel | grep "MFS Filesystem had better"` + mfs_end=$1 + mfs_size="$((${mfs_end} - ${mfs_start}))" + set -- `ls -l ${c_fs}`; imgsize="$5" + if [ ${mfs_start} -gt 0 -a ${mfs_size} -ge ${imgsize} ] ; then + mfs_ofs=$((${mfs_start} + 8192)) + log "Preload kernel with file ${c_fs} at ${mfs_ofs}" + dd if=${c_fs} ibs=8192 iseek=1 of=kernel obs=${mfs_ofs} \ + oseek=1 conv=notrunc 2> /dev/null + else + log "not loading mfs, size ${mfs_size} img ${imgsize}" + fi log "Compress with kgzip and copy to floppy image" kgzip -o kernel.gz kernel cp -p kernel.gz ${dst}/kernel || fail $? no_space "copying kernel" - log "now transfer floppy tree if needed" + log "Now transfer floppy tree if not already in MFS image" # now transfer the floppy tree. If it is already in mfs, dont bother. if [ "${o_all_in_mfs}" != "yes" ] ; then cp -Rp floppy.tree/* ${dst} || \ fail $? no_space "copying floppy tree" fi ) - (log "Fixing permissions"; cd ${dst}; chown -R root *) - # rm -rf ${BUILDDIR}/floppy.tree || true # cleanup + (cd ${BUILDDIR} + makefs -t ffs -o bsize=4096 -o fsize=512 \ + -s ${blocks}k -f 50 ${c_img} ${dst} + # ${l_label} -f `pwd`/${c_img} + ${l_label} -w -f `pwd`/${c_img} auto # write in a label + # copy partition c: into a: with some sed magic + ${l_label} -f `pwd`/${c_img} | sed -e '/ c:/{p;s/c:/a:/;}' | \ + ${l_label} -R -f `pwd`/${c_img} /dev/stdin + ${l_label} -f `pwd`/${c_img} + ls -l ${c_img} + logverbose "after disklabel" + ) + # dump the primary and secondary boot + # XXX primary is 512 bytes + dd if=${c_boot1} of=${BUILDDIR}/${c_img} conv=notrunc 2>/dev/null + # XXX secondary starts after the 0x114 = dec 276 bytes of the label + # so we skip 276 from the source, and 276+512=788 from dst + # the old style blocks used 512 and 1024 respectively - df -ik ${dst} | colrm 70 > .build.reply - free_vnode + dd if=${b2} iseek=1 ibs=276 2> /dev/null | \ + dd of=${BUILDDIR}/${c_img} oseek=1 obs=788 conv=notrunc 2>/dev/null + logverbose "done floppy image" + # XXX (log "Fixing permissions"; cd ${dst}; chown -R root *) + rm -rf ${BUILDDIR}/floppy.tree || true # cleanup + # df -ik ${dst} | colrm 70 > .build.reply rm -rf ${dst} rm ${BUILDDIR}/kernel.gz ${BUILDDIR}/${c_fs} } ==== //depot/projects/soc2005/bsdinstaller/src/usr.bin/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.3 (Berkeley) 1/7/94 -# $FreeBSD: src/usr.bin/Makefile,v 1.285 2005/09/19 08:13:43 imura Exp $ +# $FreeBSD: src/usr.bin/Makefile,v 1.287 2006/01/05 05:58:16 grehan Exp $ # XXX MISSING: deroff diction graph learn plot # spell spline struct xsend @@ -228,8 +228,7 @@ ${_ypmatch} \ ${_ypwhich} -.if ${MACHINE_ARCH} != "arm" && \ - ${MACHINE_ARCH} != "powerpc" >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200602080018.k180IXBY025709>