From owner-p4-projects@FreeBSD.ORG Tue Nov 17 11:25:29 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C5A11065676; Tue, 17 Nov 2009 11:25:29 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 405E1106566C for ; Tue, 17 Nov 2009 11:25:29 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2CEB88FC18 for ; Tue, 17 Nov 2009 11:25:29 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAHBPTlF094372 for ; Tue, 17 Nov 2009 11:25:29 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAHBPTwi094370 for perforce@freebsd.org; Tue, 17 Nov 2009 11:25:29 GMT (envelope-from rene@FreeBSD.org) Date: Tue, 17 Nov 2009 11:25:29 GMT Message-Id: <200911171125.nAHBPTwi094370@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170696 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Nov 2009 11:25:29 -0000 http://p4web.freebsd.org/chv.cgi?CH=170696 Change 170696 by rene@rene_self on 2009/11/17 11:24:47 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/mailing-list-faq/article.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/portbuild/article.sgml#16 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/releng/article.sgml#5 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#11 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/jails/chapter.sgml#16 integrate .. //depot/projects/docproj_nl/share/images/articles/checkpoint/networks.pic#2 integrate .. //depot/projects/docproj_nl/www/en/cgi/query-pr.cgi#4 integrate .. //depot/projects/docproj_nl/www/share/sgml/events.xml#23 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#56 integrate .. //depot/projects/docproj_nl/www/share/sgml/press.xml#18 integrate .. //depot/projects/docproj_nl/www/share/sgml/release.ent#18 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/mailing-list-faq/article.sgml#2 (text+ko) ==== @@ -1,4 +1,4 @@ - + - $FreeBSD: doc/en_US.ISO8859-1/articles/mailing-list-faq/article.sgml,v 1.7 2005/10/26 12:14:47 keramida Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/mailing-list-faq/article.sgml,v 1.8 2009/11/14 22:20:12 manolis Exp $ 2004 @@ -283,7 +283,7 @@ Please use an appropriate human language for a particular mailing list. Many non-English mailing lists are - + available. For the ones that are not, we do appreciate that many ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/portbuild/article.sgml#16 (text+ko) ==== @@ -11,7 +11,7 @@ The &os; Ports Management Team - $FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.44 2009/08/05 01:48:18 linimon Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.47 2009/11/13 03:24:31 linimon Exp $ 2003 @@ -47,14 +47,14 @@ otherwise specified, all paths will be relative to this location. ${arch} will be used to specify one of the package architectures - (amd64, &i386;, and &sparc64;), and + (amd64, &i386;, ia64, powerpc, and &sparc64;), and ${branch} will be used - to specify the build branch (6, 6-exp, 7, 7-exp, 8, 8-exp). + to specify the build branch (6, 7, 7-exp, 8, 8-exp, 9, 9-exp). Packages are no longer built for Release 4 or 5, nor - for the alpha nor ia64 architectures. + for the alpha architecture. The scripts that control all of this live in @@ -141,7 +141,6 @@ /var/portbuild&prompt.root; scripts/mkbindist ${arch} ${branch} ${buildid} - The per-machine tarballs are located in ${arch}/clients. @@ -180,13 +179,6 @@ - dopackages.6-exp - Perform - a 6.X build with experimental patches - (6-exp branch) - - - - dopackages.7 - Perform a 7.X build @@ -476,6 +468,15 @@ + build create arch + branch + [newid] - Creates + newid (or a datestamp if not specified). + Only needed when bringing up a new branch or a new architecture. + + + + build clone arch branch oldid [newid] - Clones @@ -633,7 +634,7 @@ To free up resources, you will need to clean up client machines by running build cleanup command. For example: - &prompt.user; /var/portbuild/scripts/build cleanup i386 6-exp 20080714120411 -full + &prompt.user; /var/portbuild/scripts/build cleanup i386 8-exp 20080714120411 -full If you forget to do this, then the old build chroots will not be cleaned up for 24 hours, and no @@ -656,8 +657,8 @@ will get you a df, and -allgohans "umount -f pointyhat.freebsd.org:/var/portbuild/i386/6-exp/ports" -allgohans "umount -f pointyhat.freebsd.org:/var/portbuild/i386/6-exp/src" +allgohans "umount -f pointyhat.freebsd.org:/var/portbuild/i386/8-exp/ports" +allgohans "umount -f pointyhat.freebsd.org:/var/portbuild/i386/8-exp/src" are supposed to get rid of the hanging mounts. You will have to keep doing them since there can be multiple mounts. @@ -665,10 +666,10 @@ Ignore the following: -umount: pointyhat.freebsd.org:/var/portbuild/i386/6-exp/ports: statfs: No such file or directory -umount: pointyhat.freebsd.org:/var/portbuild/i386/6-exp/ports: unknown file system -umount: Cleanup of /x/tmp/6-exp/chroot/53837/compat/linux/proc failed! -/x/tmp/6-exp/chroot/53837/compat/linux/proc: not a file system root directory +umount: pointyhat.freebsd.org:/var/portbuild/i386/8-exp/ports: statfs: No such file or directory +umount: pointyhat.freebsd.org:/var/portbuild/i386/8-exp/ports: unknown file system +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 The former 2 mean that that client did not have those mounted; the latter 2 are a bug. @@ -925,7 +926,11 @@ - packages-8-current + packages-8-stable + + + + packages-9-current @@ -1000,7 +1005,7 @@ new features or bugfixes to the ports infrastructure (i.e. bsd.port.mk), or to test large sweeping upgrades. The current experimental patches branch is - 7-exp on the amd64 + 8-exp on the amd64 architecture. In general, an experimental patches build is run the same @@ -1048,21 +1053,21 @@ Once the build finishes, compare the control build failures to those of the experimental patches build. Use the following - commands to facilitate this (this assumes the 7 - branch is the control branch, and the 7-exp + commands to facilitate this (this assumes the 8 + branch is the control branch, and the 8-exp branch is the experimental patches branch): - &prompt.user; cd /var/portbuild/i386/7-exp/errors -&prompt.user; find . -name \*.log\* | sort > /tmp/7-exp-errs -&prompt.user; cd /var/portbuild/i386/7/errors -&prompt.user; find . -name \*.log\* | sort > /tmp/7-errs + &prompt.user; cd /var/portbuild/i386/8-exp/errors +&prompt.user; find . -name \*.log\* | sort > /tmp/8-exp-errs +&prompt.user; cd /var/portbuild/i386/8/errors +&prompt.user; find . -name \*.log\* | sort > /tmp/8-errs If it has been a long time since one of the builds finished, the logs may have been automatically compressed with bzip2. In that case, you must use sort | sed 's,\.bz2,,g' instead. - &prompt.user; comm -3 /tmp/7-errs /tmp/7-exp-errs | less + &prompt.user; comm -3 /tmp/8-errs /tmp/8-exp-errs | less This last command will produce a two-column report. The first column is ports that failed on the control build but not in @@ -1117,7 +1122,7 @@ To differentiate between [1] and [2] above, you can do a rebuild of the affected packages under the control branch: - &prompt.user; cd /var/portbuild/i386/7/ports + &prompt.user; cd /var/portbuild/i386/8/ports Be sure to cvs update this tree to the same date as the experimental patches tree. @@ -1125,14 +1130,14 @@ The following command will set up the control branch for the partial build: - &prompt.user; /var/portbuild/scripts/dopackages.7 -noportscvs -nobuild -nocvs -nofinish + &prompt.user; /var/portbuild/scripts/dopackages.8 -noportscvs -nobuild -nocvs -nofinish The builds must be performed from the packages/All directory. This directory should initially be empty except for the Makefile symlink. If this symlink does not exist, it must be created: - &prompt.user; cd /var/portbuild/i386/7/packages/All + &prompt.user; cd /var/portbuild/i386/8/packages/All &prompt.user; ln -sf ../../Makefile . &prompt.user; make -k -j<#> <list of packages to build> @@ -1298,11 +1303,16 @@ Generate a kernel config file. Include GENERIC (or, if you are using more than 3.5G on &i386;, PAE). + + + Required options: +options NULLFS +options TMPFS + + Suggested options: options GEOM_CONCAT options GEOM_STRIPE -options NULLFS -options TMPFS options SHMMAXPGS=65536 options SEMMNI=40 options SEMMNS=240 @@ -1314,7 +1324,8 @@ For PAE, it is not currently possible - to load modules. Therefore, you will need to add: + to load modules. Therefore, if you are running an architecture + that supports Linux emulation, you will need to add: options COMPAT_LINUX options LINPROCFS @@ -1532,12 +1543,16 @@ Create - usr/local/etc/rc.d/portbuild.sh: + usr/local/etc/rc.d/portbuild.sh, + using the appropriate value for + scratchdir: #!/bin/sh # -# Configure the system post-boot +# Configure a package build system post-boot + +scratchdir=/usr2 -ln -sf /usr2/portbuild /var/portbuild +ln -sf ${scratchdir}/portbuild /var/portbuild # Identify builds ready for use cd /var/portbuild/${arch} @@ -1550,11 +1565,20 @@ # Flag that we are ready to accept jobs touch /tmp/.boot_finished + - - If there are machines from more than one cluster in the - same multicast domain (basically = LAN) then change the - multicast groups to different values (.71, .72, etc). + + Modify + usr/local/etc/rc.d/squid: +40c40 +< squid_chdir=${squid_chdir:-"/usr/local/squid/logs"} +--- +> squid_chdir=${squid_chdir:-"/usr2/squid/logs"} +43c43 +< squid_pidfile=${squid_pidfile:-"/usr/local/squid/logs/squid.pid"} +--- +> squid_pidfile=${squid_pidfile:-"/usr2/squid/logs/squid.pid"} + ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/releng/article.sgml#5 (text+ko) ==== @@ -37,7 +37,7 @@ - $FreeBSD: doc/en_US.ISO8859-1/articles/releng/article.sgml,v 1.83 2009/06/24 22:25:26 keramida Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/releng/article.sgml,v 1.84 2009/11/13 10:21:30 remko Exp $ &tm-attrib.freebsd; @@ -798,6 +798,17 @@ should be made bootable so that users of modern PCs do not need to create installation floppy disks. + If a custom kernel of &os; is to be included, then + &man.sysinstall.8; and &man.release.7; must be updated to + include installation instructions. The relevant code is contained + in src/release and src/usr.sbin/sysinstall. + Specifically, the file src/release/Makefile, and + dist.c, dist.h, + menus.c, install.c, and + Makefile will need to be updated under + src/usr.sbin/sysinstall. Optionally, you may choose + to update sysinstall.8. + If an alternate version of &xfree86; is to be provided, then &man.sysinstall.8; must be updated to reflect the new location and installation instructions. The relevant code is contained ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#11 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -477,16 +477,28 @@ &prompt.root; Xorg -config xorg.conf.new -retro If a black and grey grid and an X mouse cursor appear, - the configuration was successful. To exit the test, just press + the configuration was successful. To exit the test, switch to the + virtual console used to start it by pressing Ctrl Alt - Backspace - simultaneously. + Fn + (F1 for the first virtual console) + and press + + Ctrl + C + . - This key combination was enabled by default up to - &xorg; version 7.3. To enable it in + In &xorg; versions up to 7.3, + the + + Ctrl + Alt + Backspace + key combination could be used to break out of + &xorg;. To enable it in version 7.4 and later, you can either type the following command from any X terminal emulator: @@ -511,6 +523,13 @@ You will have to reboot your machine to force hald to read this file. + + The following line will also have to be added to + xorg.conf.new, in the + ServerLayout or ServerFlags + section: + + Option "DontZap" "off" If the mouse does not work, you will need to first ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/jails/chapter.sgml#16 (text+ko) ==== @@ -1,7 +1,7 @@ +