Date: Wed, 12 Dec 2012 22:41:25 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r40370 - in projects/pkgng/en_US.ISO8859-1: articles/committers-guide articles/contributors articles/portbuild books books/arch-handbook/driverbasics books/arch-handbook/sound books/cor... Message-ID: <201212122241.qBCMfP2v068643@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Wed Dec 12 22:41:25 2012 New Revision: 40370 URL: http://svnweb.freebsd.org/changeset/doc/40370 Log: Merged /head/en_US.ISO8859-1:r40151-40365 to projects/pkgng/en_US.ISO8859-1 Added: projects/pkgng/en_US.ISO8859-1/htdocs/google6bb24ed0b804d5e9.html - copied unchanged from r40365, head/en_US.ISO8859-1/htdocs/google6bb24ed0b804d5e9.html Deleted: projects/pkgng/en_US.ISO8859-1/books/corp-net-guide/ Modified: projects/pkgng/en_US.ISO8859-1/articles/committers-guide/article.xml projects/pkgng/en_US.ISO8859-1/articles/contributors/contrib.additional.xml projects/pkgng/en_US.ISO8859-1/articles/contributors/contrib.committers.xml projects/pkgng/en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml projects/pkgng/en_US.ISO8859-1/articles/portbuild/article.xml projects/pkgng/en_US.ISO8859-1/books/Makefile projects/pkgng/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.xml projects/pkgng/en_US.ISO8859-1/books/arch-handbook/sound/chapter.xml projects/pkgng/en_US.ISO8859-1/books/developers-handbook/kernelbuild/chapter.xml projects/pkgng/en_US.ISO8859-1/books/faq/book.xml projects/pkgng/en_US.ISO8859-1/books/handbook/eresources/chapter.xml projects/pkgng/en_US.ISO8859-1/books/handbook/filesystems/chapter.xml projects/pkgng/en_US.ISO8859-1/books/handbook/mac/chapter.xml projects/pkgng/en_US.ISO8859-1/books/handbook/mail/chapter.xml projects/pkgng/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml projects/pkgng/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml projects/pkgng/en_US.ISO8859-1/books/porters-handbook/book.xml projects/pkgng/en_US.ISO8859-1/htdocs/Makefile projects/pkgng/en_US.ISO8859-1/htdocs/administration.xml projects/pkgng/en_US.ISO8859-1/htdocs/docs/books.xml projects/pkgng/en_US.ISO8859-1/htdocs/donations/index.xml projects/pkgng/en_US.ISO8859-1/htdocs/index.xsl projects/pkgng/en_US.ISO8859-1/htdocs/internal/bylaws.xml projects/pkgng/en_US.ISO8859-1/htdocs/internal/i18n.xml projects/pkgng/en_US.ISO8859-1/htdocs/layout/css/layout.css projects/pkgng/en_US.ISO8859-1/htdocs/layout/js/google.js projects/pkgng/en_US.ISO8859-1/htdocs/news/2012-compromise.xml projects/pkgng/en_US.ISO8859-1/htdocs/news/status/report-2001-08.xml projects/pkgng/en_US.ISO8859-1/htdocs/news/status/report-2002-05-2002-06.xml projects/pkgng/en_US.ISO8859-1/htdocs/platforms/arm.xml projects/pkgng/en_US.ISO8859-1/htdocs/releng/charter.xml projects/pkgng/en_US.ISO8859-1/htdocs/releng/index.xml projects/pkgng/en_US.ISO8859-1/htdocs/where.xml projects/pkgng/en_US.ISO8859-1/share/xml/mailing-lists.ent Directory Properties: projects/pkgng/en_US.ISO8859-1/ (props changed) Modified: projects/pkgng/en_US.ISO8859-1/articles/committers-guide/article.xml ============================================================================== --- projects/pkgng/en_US.ISO8859-1/articles/committers-guide/article.xml Wed Dec 12 22:41:03 2012 (r40369) +++ projects/pkgng/en_US.ISO8859-1/articles/committers-guide/article.xml Wed Dec 12 22:41:25 2012 (r40370) @@ -1883,37 +1883,20 @@ U stable/9/share/man/man4/netmap.4 <para>Don't remove and re-add the same file in a single commit as this will break the CVS exporter.</para> - <para>Speeding up checkouts and minimising network traffic is - possible with the following recipe:</para> + <para>Speeding up svn is + possible by adding the following to <filename>~/.ssh/config</filename>:</para> - <screen>&prompt.user; <userinput>svn co --depth=empty svn+ssh://svn.freebsd.org/base fbsvn</userinput> -&prompt.user; <userinput>cd fbsvn</userinput> -&prompt.user; <userinput>svn up --depth=empty stable</userinput> -&prompt.user; <userinput>svn up head</userinput> -&prompt.user; <userinput>cd stable</userinput> -&prompt.user; <userinput>cp -r ../head/ 7</userinput> -&prompt.user; <userinput>cd 7</userinput> -&prompt.user; <userinput>svn switch svn+ssh://svn.freebsd.org/base/stable/7</userinput> -&prompt.user; <userinput>cd ..</userinput> -&prompt.user; <userinput>cp -r 7/ 6</userinput> -&prompt.user; <userinput>cd 6</userinput> -&prompt.user; <userinput>svn switch svn+ssh://svn.freebsd.org/base/stable/6</userinput></screen> - - <para>What this bit of evil does is check out head, stable/7 and - stable/6. We create the empty checkout directories under - <acronym>SVN</acronym>'s control. In <acronym>SVN</acronym>, - subtrees are self identifying, like in <acronym>CVS</acronym>. - We check out head and clone it as stable/7. Except we don't - want the head version so we <quote>switch</quote> it to the - 7.x tree location. <acronym>SVN</acronym> downloads diffs to - convert the <quote>head</quote> files to - <quote>stable/7</quote> instead of doing a fresh checkout. - The same goes for stable/6. This does, however, definitely - count as abuse of the working copy client code!</para> + <screen>Host * +ControlPath ~/.ssh/sockets/master-%l-%r@%h:%p +ControlMaster auto +ControlPersist yes</screen> + + <para>and then typing</para> + <screen><userinput>mkdir ~/.ssh/sockets</userinput></screen> <para>Checking out a working copy with a stock Subversion client without &os;-specific patches - (<makevar>WITH_FREEBSD_TEMPLATE</makevar>) will mean that + (<makevar>OPTIONS_SET=FREEBSD_TEMPLATE</makevar>) will mean that <literal>$FreeBSD$</literal> tags will not be expanded. Once the correct version has been installed, trick Subversion into expanding them like so:</para> @@ -1921,8 +1904,7 @@ U stable/9/share/man/man4/netmap.4 <screen>&prompt.user; <userinput>svn propdel -R svn:keywords .</userinput> &prompt.user; <userinput>svn revert -R .</userinput></screen> - <para>This is not a good idea if uncommitted patches exist, - however.</para> + <para>This will wipe out uncommitted patches.</para> </sect2> </sect1> @@ -1950,7 +1932,7 @@ U stable/9/share/man/man4/netmap.4 <itemizedlist> <listitem> <para>Add your author entity to - <filename>head/en_US.ISO8859-1/share/xml/authors.ent</filename>; + <filename>head/share/xml/authors.ent</filename>; this should be done first since an omission of this commit will cause the next commits to break the doc/ build.</para> @@ -2463,14 +2445,13 @@ U stable/9/share/man/man4/netmap.4 <term>&a.committers;</term> <listitem> - <para>cvs-committers is the entity that the version control system uses to send you all your - commit messages. You should <emphasis>never</emphasis> send email - directly to this list. You should only send replies to this list - when they are short and are directly related to a commit.</para> - - <para>There is a similar list, svn-committers, which has a - similar purpose but is a normal list, i.e., you are free to - send any suitable message to this list.</para> + <para>&a.svn-src-all.name;, &a.svn-ports-all.name; and + &a.svn-doc-all.name; are the mailing lists that the + version control system uses to send commit messages to. + You should <emphasis>never</emphasis> send email directly + to these lists. You should only send replies to this list + when they are short and are directly related to a + commit.</para> </listitem> </varlistentry> Modified: projects/pkgng/en_US.ISO8859-1/articles/contributors/contrib.additional.xml ============================================================================== --- projects/pkgng/en_US.ISO8859-1/articles/contributors/contrib.additional.xml Wed Dec 12 22:41:03 2012 (r40369) +++ projects/pkgng/en_US.ISO8859-1/articles/contributors/contrib.additional.xml Wed Dec 12 22:41:25 2012 (r40370) @@ -1144,11 +1144,6 @@ </listitem> <listitem> - <para>Barbara</para> - <!-- (rene@) No email address per request. --> - </listitem> - - <listitem> <para>Barry Bierbauch <email>pivrnec@vszbr.cz</email></para> </listitem> Modified: projects/pkgng/en_US.ISO8859-1/articles/contributors/contrib.committers.xml ============================================================================== --- projects/pkgng/en_US.ISO8859-1/articles/contributors/contrib.committers.xml Wed Dec 12 22:41:03 2012 (r40369) +++ projects/pkgng/en_US.ISO8859-1/articles/contributors/contrib.committers.xml Wed Dec 12 22:41:25 2012 (r40370) @@ -500,6 +500,10 @@ </listitem> <listitem> + <para>&a.bar;</para> + </listitem> + + <listitem> <para>&a.jmg;</para> </listitem> @@ -1642,4 +1646,8 @@ <listitem> <para>&a.az;</para> </listitem> + + <listitem> + <para>&a.syuu;</para> + </listitem> </itemizedlist> Modified: projects/pkgng/en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml ============================================================================== --- projects/pkgng/en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml Wed Dec 12 22:41:03 2012 (r40369) +++ projects/pkgng/en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml Wed Dec 12 22:41:25 2012 (r40370) @@ -3,6 +3,10 @@ <itemizedlist> <listitem> + <para>&a.attilio; (2012)</para> + </listitem> + + <listitem> <para>&a.wilko; (2006 - 2012)</para> </listitem> Modified: projects/pkgng/en_US.ISO8859-1/articles/portbuild/article.xml ============================================================================== --- projects/pkgng/en_US.ISO8859-1/articles/portbuild/article.xml Wed Dec 12 22:41:03 2012 (r40369) +++ projects/pkgng/en_US.ISO8859-1/articles/portbuild/article.xml Wed Dec 12 22:41:25 2012 (r40370) @@ -301,7 +301,7 @@ CXX=clang++ .if !defined(CPP) || ${CPP} == "cpp" CPP=clang-cpp .endif -# Don't die on warnings +# Do not die on warnings NO_WERROR= WERROR= </programlisting> @@ -950,8 +950,8 @@ umount: pointyhat.freebsd.org:/var/portb umount: Cleanup of /x/tmp/8-exp/chroot/53837/compat/linux/proc failed! /x/tmp/8-exp/chroot/53837/compat/linux/proc: not a file system root directory</screen> - The former 2 mean that that client did not have those mounted; - the latter 2 are a bug.</para> + The former two mean that the client did not have those mounted; + the latter two are a bug.</para> <para>You may also see messages about <literal>procfs</literal>.</para> </note> @@ -1753,8 +1753,6 @@ inetd_enable="YES" linux_enable="YES" nfs_client_enable="YES" ntpd_enable="YES" -ntpdate_enable="YES" -ntpdate_flags="north-america.pool.ntp.org" sendmail_enable="NONE" sshd_enable="YES" sshd_program="/usr/local/sbin/sshd" @@ -1920,7 +1918,7 @@ scratchdir=<filename>/<replaceable>usr2< ln -sf ${scratchdir}/portbuild /var/ # Identify builds ready for use -cd /var/portbuild/<replaceable>${arch}</replaceable> +cd /var/portbuild/<replaceable>arch</replaceable> for i in */builds/*; do if [ -f ${i}/.ready ]; then mkdir /tmp/.setup-${i##*/} @@ -1979,13 +1977,11 @@ touch /tmp/.boot_finished</screen> </listitem> <listitem> - <para>Modify - <filename>usr/local/etc/sudoers</filename>:<screen> -38a39,42 -> -> # local changes for package building -> %wheel ALL=(ALL) ALL -> ports-<replaceable>${arch}</replaceable> ALL=(ALL) NOPASSWD: ALL</screen> + <para>Create + <filename>usr/local/etc/sudoers/sudoers.d/portbuild</filename>:<programlisting> +# local changes for package building +%wheel ALL=(ALL) ALL +ports-<replaceable>${arch}</replaceable> ALL=(ALL) NOPASSWD: ALL</programlisting> </para> </listitem> </itemizedlist> @@ -2043,23 +2039,24 @@ touch /tmp/.boot_finished</screen> </sect2> <sect2 id="pointyhat-configuration"> - <title>Configuration on <literal>pointyhat</literal></title> + <title>Configuration on the server</title> <para>These steps need to be taken by a <literal>portmgr</literal> acting as <literal>ports-<replaceable>${arch}</replaceable></literal> - on <hostid>pointyhat</hostid>. + on the server. </para> <procedure> <step> <para>If any of the default TCP ports is not available (see above), you will need to create an <command>ssh</command> - tunnel for it and include it in the + tunnel for them and include its invocation command in + <literal>ports-<replaceable>${arch}</replaceable></literal>'s <filename>crontab</filename>.</para> </step> <step> - <para>Add an entry to + <para>Unless you can use the defaults, add an entry to <filename>/home/ports-<replaceable>${arch}</replaceable>/.ssh/config</filename> to specify the public IP address, TCP port for <command>ssh</command>, username, and any other necessary @@ -2855,20 +2852,19 @@ apache_pidfile="/var/run/httpd.pid" gmetad_enable="YES" gmond_enable="YES" inetd_enable="YES" -# XXX MCL these do not work! -#inetd_flags="-R 10000 -lw" +# XXX MCL try these instead. +inetd_flags="-R 10000 -l -w" mountd_enable="YES" nfs_server_enable="YES" nfs_server_flags="-u -t -n 12" nfs_remote_port_only="YES" ntpd_enable="YES" -ntpdate_enable="YES" -ntpdate_flags="north-america.pool.ntp.org" rpcbind_enable="YES" rpc_lockd_enable="NO" rpc_statd_enable="YES" sendmail_enable="NONE" smartd_enable="YES" +zfs_enable="YES" </screen> </step> @@ -2924,7 +2920,7 @@ devel/subversion net/nc net/rsync sysutils/ganglia-monitor-core (with GMETAD off) -sysutils/ganglia-webfrontend (WITHOUT_X11) +sysutils/ganglia-webfrontend (compile with -DWITHOUT_X11) www/apache22 (with EXT_FILTER)</screen> </para> @@ -2951,7 +2947,8 @@ sysutils/screen</screen> benchmarks/bonnie++ ports-mgmt/pkg_tree sysutils/dmidecode -sysutils/smartmontools</screen> +sysutils/smartmontools +sysutils/zfs-stats</screen> </para> </step> @@ -2965,6 +2962,10 @@ sysutils/smartmontools</screen> <procedure> <step> + <para>Create <filename>/a</filename>.</para> + </step> + + <step> <para>Create a <application>zfs</application> volume named <filename>a</filename> and mount it on <filename>/a</filename>.</para> @@ -3126,7 +3127,7 @@ sysutils/smartmontools</screen> <step> <para>Copy the following files from - <filename>/var/portbuild/conf/etc/rc.d/</filename> to + <filename>/var/portbuild/etc/rc.d/</filename> to <filename>/usr/local/etc/rc.d/</filename>:<screen> buildproxy.sh pollmachine.sh @@ -3212,12 +3213,11 @@ qmanager.sh</screen> </step> <step> - <para>If not already created, add the following users:<screen> -squid:*:100:100::0:0:User &:/usr/local/squid:/bin/sh + <para>If not already created, add the following user:<screen> ganglia:*:102:102::0:0:User &:/usr/local/ganglia:/bin/sh</screen> </para> - <para>Add them to <filename>/etc/group</filename> as well.</para> + <para>Add it to <filename>/etc/group</filename> as well.</para> </step> <step> Modified: projects/pkgng/en_US.ISO8859-1/books/Makefile ============================================================================== --- projects/pkgng/en_US.ISO8859-1/books/Makefile Wed Dec 12 22:41:03 2012 (r40369) +++ projects/pkgng/en_US.ISO8859-1/books/Makefile Wed Dec 12 22:41:25 2012 (r40370) @@ -1,7 +1,6 @@ # $FreeBSD$ SUBDIR = arch-handbook -SUBDIR+= corp-net-guide SUBDIR+= design-44bsd SUBDIR+= dev-model SUBDIR+= developers-handbook Modified: projects/pkgng/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.xml ============================================================================== --- projects/pkgng/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.xml Wed Dec 12 22:41:03 2012 (r40369) +++ projects/pkgng/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.xml Wed Dec 12 22:41:25 2012 (r40370) @@ -48,13 +48,7 @@ <para>Most devices in a &unix;-like operating system are accessed through device-nodes, sometimes also called special files. These files are usually located under the directory - <filename>/dev</filename> in the filesystem hierarchy. - In releases of FreeBSD older than 5.0-RELEASE, where - &man.devfs.5; support is not integrated into FreeBSD, - each device node must be - created statically and independent of the existence of the - associated device driver. Most device nodes on the system are - created by running <command>MAKEDEV</command>.</para> + <filename>/dev</filename> in the filesystem hierarchy.</para> <para>Device drivers can roughly be broken down into two categories; character and network device drivers.</para> @@ -212,20 +206,19 @@ KMOD=skeleton <example> <title>Example of a Sample Echo Pseudo-Device Driver for - &os; 5.X</title> + &os; 10.X</title> <programlisting>/* - * Simple `echo' pseudo-device KLD + * Simple Echo pseudo-device KLD * * Murray Stokely - * - * Converted to 5.X by Søren (Xride) Straarup + * Søren (Xride) Straarup + * Eitan Adler */ #include <sys/types.h> #include <sys/module.h> #include <sys/systm.h> /* uprintf */ -#include <sys/errno.h> #include <sys/param.h> /* defines used in kernel.h */ #include <sys/kernel.h> /* types used in module initialization */ #include <sys/conf.h> /* cdevsw struct */ @@ -234,7 +227,6 @@ KMOD=skeleton #define BUFFERSIZE 256 - /* Function prototypes */ static d_open_t echo_open; static d_close_t echo_close; @@ -251,15 +243,14 @@ static struct cdevsw echo_cdevsw = { .d_name = "echo", }; -typedef struct s_echo { +struct s_echo { char msg[BUFFERSIZE]; int len; -} t_echo; +}; /* vars */ static struct cdev *echo_dev; -static int count; -static t_echo *echomsg; +static struct s_echo *echomsg; MALLOC_DECLARE(M_ECHOBUF); MALLOC_DEFINE(M_ECHOBUF, "echobuffer", "buffer for echo module"); @@ -270,20 +261,25 @@ MALLOC_DEFINE(M_ECHOBUF, "echobuffer", " */ static int -echo_loader(struct module *m, int what, void *arg) +echo_loader(struct module *m __unused, int what, void *arg __unused) { - int err = 0; + int error = 0; switch (what) { case MOD_LOAD: /* kldload */ - echo_dev = make_dev(<literal>&</literal>echo_cdevsw, + error = make_dev_p(MAKEDEV_CHECKNAME | MAKEDEV_WAITOK, + &echo_dev, + &echo_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, "echo"); + if (error != 0) + break; + /* kmalloc memory for use by this driver */ - echomsg = malloc(sizeof(t_echo), M_ECHOBUF, M_WAITOK); + echomsg = malloc(sizeof(*echomsg), M_ECHOBUF, M_WAITOK); printf("Echo device loaded.\n"); break; case MOD_UNLOAD: @@ -292,26 +288,27 @@ echo_loader(struct module *m, int what, printf("Echo device unloaded.\n"); break; default: - err = EOPNOTSUPP; + error = EOPNOTSUPP; break; } - return(err); + return (error); } static int -echo_open(struct cdev *dev, int oflags, int devtype, struct thread *p) +echo_open(struct cdev *dev __unused, int oflags __unused, int devtype __unused, struct thread *p __unused) { - int err = 0; + int error = 0; uprintf("Opened device \"echo\" successfully.\n"); - return(err); + return (error); } static int -echo_close(struct cdev *dev, int fflag, int devtype, struct thread *p) +echo_close(struct cdev *dev __unused, int fflag __unused, int devtype __unused, struct thread *p __unused) { - uprintf("Closing device \"echo.\"\n"); - return(0); + + uprintf("Closing device \"echo\".\n"); + return (0); } /* @@ -321,21 +318,21 @@ echo_close(struct cdev *dev, int fflag, */ static int -echo_read(struct cdev *dev, struct uio *uio, int ioflag) +echo_read(struct cdev *dev __unused, struct uio *uio, int ioflag __unused) { - int err = 0; - int amt; + int error, amt; /* * How big is this read operation? Either as big as the user wants, * or as big as the remaining data */ - amt = MIN(uio->uio_resid, (echomsg->len - uio->uio_offset > 0) ? - echomsg->len - uio->uio_offset : 0); - if ((err = uiomove(echomsg->msg + uio->uio_offset, amt, uio)) != 0) { + + amt = MIN(uio->uio_resid, echomsg->len - uio->uio_offset); + uio->uio_offset += amt; + if ((error = uiomove(echomsg->msg, amt, uio)) != 0) uprintf("uiomove failed!\n"); - } - return(err); + + return (error); } /* @@ -344,23 +341,42 @@ echo_read(struct cdev *dev, struct uio * */ static int -echo_write(struct cdev *dev, struct uio *uio, int ioflag) +echo_write(struct cdev *dev __unused, struct uio *uio, int ioflag __unused) { - int err = 0; + int error, amt; + + /* Copy the string in from user memory to kernel memory */ + + /* + * We either write from the beginning or are appending -- do + * not allow random access. + */ + if (uio->uio_offset != 0 && (uio->uio_offset != echomsg->len)) + return (EINVAL); + + /* + * This is new message, reset length + */ + if (uio->uio_offset == 0) + echomsg->len = 0; + + /* NULL charcter should be overriden */ + if (echomsg->len != 0) + echomsg->len--; /* Copy the string in from user memory to kernel memory */ - err = copyin(uio->uio_iov->iov_base, echomsg->msg, - MIN(uio->uio_iov->iov_len, BUFFERSIZE - 1)); + amt = MIN(uio->uio_resid, (BUFFERSIZE - echomsg->len)); + + error = uiomove(echomsg->msg + uio->uio_offset, amt, uio); /* Now we need to null terminate, then record the length */ - *(echomsg->msg + MIN(uio->uio_iov->iov_len, BUFFERSIZE - 1)) = 0; - echomsg->len = MIN(uio->uio_iov->iov_len, BUFFERSIZE); + echomsg->len += amt + 1; + uio->uio_offset += amt + 1; + echomsg->msg[echomsg->len - 1] = 0; - if (err != 0) { + if (error != 0) uprintf("Write failed: bad address!\n"); - } - count++; - return(err); + return (error); } DEV_MODULE(echo,echo_loader,NULL);</programlisting> @@ -371,23 +387,11 @@ DEV_MODULE(echo,echo_loader,NULL);</prog <screen>&prompt.root; <userinput>echo -n "Test Data" > /dev/echo</userinput> &prompt.root; <userinput>cat /dev/echo</userinput> -Test Data</screen> +Opened device "echo" successfully. +Test Data +Closing device "echo".</screen> <para>Real hardware devices are described in the next chapter.</para> - - <para>Additional Resources - <itemizedlist> - <listitem><simpara><ulink - url="http://ezine.daemonnews.org/200010/blueprints.html">Dynamic - Kernel Linker (KLD) Facility Programming Tutorial</ulink> - - <ulink url="http://www.daemonnews.org/">Daemonnews</ulink>; October 2000</simpara></listitem> - <listitem><simpara><ulink - url="http://ezine.daemonnews.org/200007/newbus-intro.html">How - to Write Kernel Drivers with NEWBUS</ulink> - <ulink - url="http://www.daemonnews.org/">Daemonnews</ulink>; July - 2000</simpara></listitem> - </itemizedlist> - </para> </sect1> <sect1 id="driverbasics-block"> Modified: projects/pkgng/en_US.ISO8859-1/books/arch-handbook/sound/chapter.xml ============================================================================== --- projects/pkgng/en_US.ISO8859-1/books/arch-handbook/sound/chapter.xml Wed Dec 12 22:41:03 2012 (r40369) +++ projects/pkgng/en_US.ISO8859-1/books/arch-handbook/sound/chapter.xml Wed Dec 12 22:41:25 2012 (r40370) @@ -82,16 +82,16 @@ <sect1 id="oss-files"> <title>Files</title> - <para>All the relevant code currently (FreeBSD 4.4) lives in + <para>All the relevant code lives in <filename>/usr/src/sys/dev/sound/</filename>, except for the public ioctl interface definitions, found in <filename>/usr/src/sys/sys/soundcard.h</filename></para> <para>Under <filename>/usr/src/sys/dev/sound/</filename>, the <filename>pcm/</filename> directory holds the central code, - while the <filename>isa/</filename> and - <filename>pci/</filename> directories have the drivers for ISA - and PCI boards.</para> + while the <filename>pci/</filename>, <filename>isa/</filename> + and <filename>usb/</filename> directories have the drivers + for PCI and ISA boards, and for USB audio devices.</para> </sect1> @@ -527,7 +527,7 @@ <function>channel_resetdone()</function>, and <function>channel_notify()</function> are for special purposes and should not be implemented in a driver without discussing - it with the authorities (&a.cg;).</para> + it on the &a.multimedia;.</para> <para><function>channel_setdir()</function> is deprecated.</para> </sect3> Modified: projects/pkgng/en_US.ISO8859-1/books/developers-handbook/kernelbuild/chapter.xml ============================================================================== --- projects/pkgng/en_US.ISO8859-1/books/developers-handbook/kernelbuild/chapter.xml Wed Dec 12 22:41:03 2012 (r40369) +++ projects/pkgng/en_US.ISO8859-1/books/developers-handbook/kernelbuild/chapter.xml Wed Dec 12 22:41:25 2012 (r40370) @@ -10,8 +10,80 @@ <para>Being a kernel developer requires understanding of the kernel build process. To debug the &os; kernel it is required to be able - to build one. This procedure is documented in the <ulink - url="../handbook/kernelconfig-building.html">Building and - Installing a Custom Kernel</ulink> chapter of the &os; - Handbook.</para> + to build one. There are two known ways to do so:</para> + + <itemizedlist> + <listitem> + <para>The <quote>Traditional</quote> Way</para> + </listitem> + + <listitem> + <para>The <quote>New</quote> Way</para> + </listitem> + </itemizedlist> + + <note> + <para>It is supposed that the reader of this chapter is familiar + with the information described in the <ulink + url="../handbook/kernelconfig-building.html">Building and + Installing a Custom Kernel</ulink> chapter of the &os; + Handbook. If this is not the case, please read through the above + mentioned chapter to understand how the build process + works.</para> + </note> + + <sect1 id="kernelbuild-traditional"> + <title>Building a Kernel the <quote>Traditional</quote> Way</title> + + <para>Up to version 4.X of &os; this was the recommended way to + build a new kernel. It can still be used on newer versions + (instead of the <quote>buildkernel</quote> target of the toplevel + <filename class="directory">/usr/src/</filename> makefiles). + Building the kernel this way may be useful when working on the + kernel code and it may actually be faster than the + <quote>New</quote> procedure when only a single option or two were + tweaked in the kernel configuration file. On the other hand, it + might lead to unexpected kernel build breakage when used by + beginners on newer versions of &os;.</para> + + <procedure> + <step> + <para>Run &man.config.8; to generate the kernel source + code:</para> + + <screen>&prompt.root; <userinput>/usr/sbin/config <replaceable>MYKERNEL</replaceable></userinput></screen> + </step> + + <step> + <para>Change into the build directory. &man.config.8; will + print the name of this directory after being run as + above.</para> + + <screen>&prompt.root; <userinput>cd ../compile/<replaceable>MYKERNEL</replaceable></userinput></screen> + </step> + + <step> + <para>Compile the kernel:</para> + + <screen>&prompt.root; <userinput>make depend</userinput> +&prompt.root; <userinput>make</userinput></screen> + </step> + + <step> + <para>Install the new kernel:</para> + + <screen>&prompt.root; <userinput>make install</userinput></screen> + </step> + </procedure> + </sect1> + + <sect1 id="kernelbuild-new"> + <title>Building a Kernel the <quote>New</quote> Way</title> + + <para>This procedure is well supported and recommended under the + latest &os; releases and is documented in the <ulink + url="../handbook/kernelconfig-building.html">Building and + Installing a Custom Kernel</ulink> chapter of the &os; + Handbook.</para> + </sect1> </chapter> Modified: projects/pkgng/en_US.ISO8859-1/books/faq/book.xml ============================================================================== --- projects/pkgng/en_US.ISO8859-1/books/faq/book.xml Wed Dec 12 22:41:03 2012 (r40369) +++ projects/pkgng/en_US.ISO8859-1/books/faq/book.xml Wed Dec 12 22:41:25 2012 (r40370) @@ -64,7 +64,6 @@ &tm-attrib.ibm; &tm-attrib.ieee; &tm-attrib.intel; - &tm-attrib.iomega; &tm-attrib.linux; &tm-attrib.microsoft; &tm-attrib.mips; @@ -87,14 +86,13 @@ unless otherwise noted. If you are interested in helping with this project, send email to the &a.doc;. The latest version of this document is always available from the <ulink - url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/faq/index.html">&os; World Wide Web server</ulink>. + url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/faq/index.html">&os; website</ulink>. It may also be downloaded as one large <ulink - url="book.html">HTML</ulink> file with HTTP or as plain text, - &postscript;, PDF, etc. from the <ulink + url="book.html">HTML</ulink> file with HTTP or as a variety + of other formats from the <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">&os; FTP server</ulink>. You may also want to <ulink - url="&url.base;/search/index.html">Search the FAQ</ulink>. - </para> + url="&url.base;/search/index.html">Search the FAQ</ulink>.</para> </abstract> </bookinfo> @@ -123,17 +121,18 @@ </question> <answer> - <para>Briefly, &os; is a &unix; like operating system for - AMD64 and &intel; EM64T, &i386; PC-98, IA-64, &arm;, - &powerpc; and &ultrasparc; platforms based on U.C. + <para>&os; is a modern operating system for desktops, + laptops, servers, and embedded systems with + support for a large number of <ulink + url="http://www.FreeBSD.org/platforms/">platforms</ulink>.</para>; + + <para>It is based on U.C. Berkeley's <quote>4.4BSD-Lite</quote> release, with some <quote>4.4BSD-Lite2</quote> enhancements. It is also based indirectly on William Jolitz's port of U.C. Berkeley's <quote>Net/2</quote> to the &i386;, known as <quote>386BSD</quote>, though very little of the 386BSD code - remains. A fuller description of what &os; is and how it - can work for you may be found on the <ulink - url="&url.base;/index.html">&os; home page</ulink>.</para> + remains.</para> <para>&os; is used by companies, Internet Service Providers, researchers, computer professionals, students and home users @@ -315,11 +314,6 @@ <para>What is the latest version of &os;?</para> </question> -<!-- - This answer is a hack to deal with the fact that for now there are - multiple "latest" versions of FreeBSD. ---> - <answer> <para>At any point in the development of &os;, there can be multiple parallel branches. &rel.relx; releases are @@ -389,17 +383,12 @@ url="&url.books.handbook;/index.html">Handbook</ulink> for details on running <emphasis>-CURRENT</emphasis>.</para> - <para>If you are not familiar with the operating system or are - not capable of identifying the difference between a real - problem and a temporary problem, you should not use + <para>If you are not familiar with &os; + you should not use &os.current;. This branch sometimes evolves quite quickly - and can be un-buildable sometimes. + and due to mistake can be un-buildable at times. People that use &os.current; are expected to be able to - analyze any problems and only report them if they are deemed - to be mistakes rather than <quote>glitches</quote>. - Questions such as <quote>make world produces some error - about groups</quote> on the &a.current; may be treated with - contempt.</para> + analyze, debug, and report problems.</para> <para>Every month, <ulink url="&url.base;/snapshots/">snapshot</ulink> @@ -613,19 +602,6 @@ an article on how to write good problem reports.</para> </answer> </qandaentry> - - <qandaentry> - <question id="other-info-sources"> - <para>What other sources of information are there?</para> - </question> - - <answer> - <para>Please check the <ulink - url="http://www.FreeBSD.org/docs.html">Documentation</ulink>; - list on the main <ulink - url="http://www.FreeBSD.org">&os;</ulink>; web site.</para> - </answer> - </qandaentry> </qandaset> </chapter> @@ -1146,8 +1122,8 @@ <answer> <para>On the - <ulink url="http://www.freebsd.org/where.html">Get &os; page</ulink> - select <literal>[iso]</literal> next to the + <ulink url="http://www.freebsd.org/where.html">Getting &os;</ulink> + page select <literal>[iso]</literal> next to the architecture you want to use.</para> <para>Any of the following can be used:</para> @@ -1171,11 +1147,11 @@ <row> <entry><filename>dvd1.iso</filename></entry> <entry>Similar to <filename>disc1.iso</filename> - but with addtional packages.</entry> + but with additional packages.</entry> </row> <row> - <entry><filename>memstick.iso</filename></entry> + <entry><filename>memstick.img</filename></entry> <entry>A bootable image sufficient for copying to a USB stick.</entry> </row> @@ -1262,8 +1238,11 @@ </question> <answer> - <para>Installation instructions can be found in the <ulink - url="&url.books.handbook;/install.html">Handbook entry on installing &os;</ulink>.</para> + <para>Installation instructions for versions since + &os; 9.0 can be found at <ulink + url="&url.books.handbook;/bsdinstall.html">Handbook entry on installing &os;</ulink>. + Older instructions can be found in the <ulink + url="&url.books.handbook;/install.html">legacy entry on installing &os;</ulink>.</para> </answer> </qandaentry> @@ -1283,7 +1262,7 @@ <qandaentry> <question id="custom-boot-floppy"> - <para>How can I make my own custom install disk?</para> + <para>How can I make my own custom release or install disk?</para> </question> <answer> @@ -1390,41 +1369,19 @@ <qandaentry> <question id="boot-floppy-strangeness"> - <para>Strange things happen when I boot the install floppy! + <para>Strange things happen when I boot the install disk! What is happening?</para> </question> <answer> <para>If you are seeing things like the machine grinding to a halt or spontaneously rebooting when you try to boot the - install floppy, here are three questions to ask - yourself:</para> - - <orderedlist> - <listitem> - <para>Did you use a new, freshly-formatted, error-free - floppy (preferably a brand-new one straight out of the - box, as opposed to the magazine cover disk that has been - lying under the bed for the last three years)?</para> - </listitem> - - <listitem> - <para>Did you download the floppy image in binary (or - image) mode? (do not be embarrassed, even the best of us - have accidentally downloaded a binary file in ASCII mode - at least once!)</para> - </listitem> - - <listitem> - <para>If you are using &windows; 95 or - &windows; 98 did you run <command>fdimage</command> - or <command>rawrite</command> in pure DOS mode? These - operating systems can interfere with programs that write - directly to hardware, which the disk creation program - does; even running it inside a DOS shell in the GUI can - cause this problem.</para> - </listitem> - </orderedlist> + &os; installer, make sure that the SHA256 hash of + the image matches the one on the website. If you + accidently downloaded the disk image in binary (or + image) mode the will be corrupted. (Do not be embarrassed, + even the best of us have accidentally downloaded a binary + file in ASCII mode at least once!)</para> </answer> </qandaentry> @@ -1483,22 +1440,6 @@ </qandaentry> <qandaentry> - <question id="stop-at-boot-manager"> - <para>Why can I not get past the boot manager's - <prompt>F?</prompt> prompt?</para> - </question> - - <answer> - <para>This is another symptom of the problem described in the - preceding question. Your BIOS geometry and &os; geometry - settings do not agree! If your controller or BIOS supports - cylinder translation (often marked as <quote>>1GB drive - support</quote>), try toggling its setting and reinstalling - &os;.</para> - </answer> - </qandaentry> - - <qandaentry> <question id="need-complete-sources"> <para>Do I need to install the source?</para> </question> @@ -1561,21 +1502,6 @@ </qandaentry> <qandaentry> - <question id="boot-floppy-hangs"> - <para>Why does the boot floppy start, but hang at the - <literal>Probing Devices...</literal> screen?</para> - </question> - - <answer> - <para>If you have a IDE &iomegazip; or &jaz; drive installed, - remove it and try again. The boot floppy can get confused by - the drives. After the system is installed you can reconnect - the drive. Hopefully this will be fixed in a later - release.</para> - </answer> - </qandaentry> - - <qandaentry> <question id="panic-on-install-reboot"> <para>Why do I get a <errorname>panic: can't mount root</errorname> error when rebooting the system after @@ -2074,118 +2000,6 @@ <qandaset> <qandaentry> - <question id="usbkbd"> - <para>Does &os; support my USB keyboard?</para> - </question> - - <answer> - <para>&os; supports USB keyboards out-of-the-box. Once you - have USB keyboard support enabled on your system, the AT - keyboard becomes <devicename>/dev/kbd0</devicename> and - the USB keyboard becomes - <devicename>/dev/kbd1</devicename>, if both are connected - to the system. If there is the USB keyboard only, it will - be <devicename>/dev/ukbd0</devicename>.</para> - - <para>If you want to use the USB keyboard in the console, - you have to explicitly tell the console driver to use the - existing USB keyboard. This can be done by running the - following command as a part of system - initialization.</para> - - <screen>&prompt.root; <userinput>kbdcontrol -k /dev/kbd1 < /dev/console > /dev/null</userinput></screen> - - <para>Note that if the USB keyboard is the only keyboard, it - is accessed as <devicename>/dev/ukbd0</devicename>, thus, - the command should look like:</para> - - <screen>&prompt.root; <userinput>kbdcontrol -k /dev/ukbd0 < /dev/console > /dev/null</userinput></screen> - - <note> - <para>To make this change permanent across reboots, add - <literal>keyboard="/dev/ukbd0"</literal> to - <filename>/etc/rc.conf</filename>.</para> - </note> - - <para>Once this is done, the USB keyboard should work in the - X environment as well without any special settings.</para> - - <para>If you want to switch back to the default keyboard, - use this command:</para> - - <screen>&prompt.root; <userinput>kbdcontrol -k /dev/kbd0 > /dev/null</userinput></screen> - - <para>To allow using both the second USB keyboard and the - first AT keyboard at the same time on a console via - &man.kbdmux.4; driver type the following commands:</para> - - <screen>&prompt.root; <userinput>kbdcontrol -K < /dev/console > /dev/null</userinput> -&prompt.root; <userinput>kbdcontrol -a atkbd0 < /dev/kbdmux0 > /dev/null</userinput> -&prompt.root; <userinput>kbdcontrol -a ukbd1 < /dev/kbdmux0 > /dev/null</userinput> -&prompt.root; <userinput>kbdcontrol -k /dev/kbdmux0 < /dev/console > /dev/null</userinput></screen> - - <para>See the &man.ukbd.4;, &man.kbdcontrol.1; and - &man.kbdmux.4; manual pages for more information.</para> - - <note> - <para>Hot-plugging and unplugging of the USB keyboard may - not work quite right yet. We recommend connecting the - keyboard before starting the system and leaving it - connected until the system is shutdown to avoid - issues.</para> - </note> - </answer> - </qandaentry> - - <qandaentry> - <question id="busmouse"> - <para>I have an unusual bus mouse. How do I set it *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212122241.qBCMfP2v068643>