From owner-svn-doc-all@FreeBSD.ORG Mon Dec 24 09:14:25 2012 Return-Path: Delivered-To: svn-doc-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0B043F62; Mon, 24 Dec 2012 09:14:25 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id E1E518FC0C; Mon, 24 Dec 2012 09:14:24 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBO9EOtA075236; Mon, 24 Dec 2012 09:14:24 GMT (envelope-from hrs@svn.freebsd.org) Received: (from hrs@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBO9EO71075235; Mon, 24 Dec 2012 09:14:24 GMT (envelope-from hrs@svn.freebsd.org) Message-Id: <201212240914.qBO9EO71075235@svn.freebsd.org> From: Hiroki Sato Date: Mon, 24 Dec 2012 09:14:24 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r40466 - head/en_US.ISO8859-1/articles/portbuild X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire doc trees \(except for " user" , " projects" , and " translations" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Dec 2012 09:14:25 -0000 Author: hrs Date: Mon Dec 24 09:14:24 2012 New Revision: 40466 URL: http://svnweb.freebsd.org/changeset/doc/40466 Log: Clean up visible whitespaces and around and . Modified: head/en_US.ISO8859-1/articles/portbuild/article.xml Modified: head/en_US.ISO8859-1/articles/portbuild/article.xml ============================================================================== --- head/en_US.ISO8859-1/articles/portbuild/article.xml Mon Dec 24 09:02:50 2012 (r40465) +++ head/en_US.ISO8859-1/articles/portbuild/article.xml Mon Dec 24 09:14:24 2012 (r40466) @@ -284,8 +284,7 @@ (For this case, the contents are also identical for both server and client.) - -.if !defined(CC) || ${CC} == "cc" + .if !defined(CC) || ${CC} == "cc" CC=clang .endif .if !defined(CXX) || ${CXX} == "c++" @@ -296,8 +295,7 @@ CPP=clang-cpp .endif # Do not die on warnings NO_WERROR= -WERROR= - +WERROR= @@ -599,22 +597,19 @@ PKG_BIN=/usr/local/sbin/pkg Update the i386-7 tree and do a complete build - -&prompt.user; dopackages.wrapper i386 7 -nosrc -norestr -nofinish + &prompt.user; dopackages.wrapper i386 7 -nosrc -norestr -nofinish Restart an interrupted amd64-8 build without updating - -&prompt.user; dopackages.wrapper amd64 8 -nosrc -noports -norestr -continue -noindex -noduds -nofinish + &prompt.user; dopackages.wrapper amd64 8 -nosrc -noports -norestr -continue -noindex -noduds -nofinish Post-process a completed sparc64-7 tree - -&prompt.user; dopackages.wrapper sparc64 7 -finish + &prompt.user; dopackages.wrapper sparc64 7 -finish Hint: it is usually best to run the dopackages @@ -812,6 +807,7 @@ PKG_BIN=/usr/local/sbin/pkgTo 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 8-exp 20080714120411 -full If you forget to do this, then the old build @@ -831,11 +827,12 @@ PKG_BIN=/usr/local/sbin/pkgallgohans script to run an &man.ssh.1; command across all clients for that buildenv. For example: -&prompt.user; ssh gohan24 df + + &prompt.user; ssh gohan24 df will get you a df, and -&prompt.user; allgohans "umount -f pointyhat.freebsd.org:/var/portbuild/i386/8-exp/ports" + &prompt.user; allgohans "umount -f pointyhat.freebsd.org:/var/portbuild/i386/8-exp/ports" &prompt.user; 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 @@ -844,7 +841,7 @@ PKG_BIN=/usr/local/sbin/pkg Ignore the following: -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: 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 @@ -1212,10 +1209,10 @@ umount: Cleanup of /x/tmp/8-exp/chroot/5 The following example is obsolete - - &prompt.user; cvs -R update -dP > update.out + &prompt.user; cvs -R update -dP > update.out &prompt.user; date > .updated - This will most closely simulate what the dopackages + + This will most closely simulate what the dopackages script does. (While .updated is merely informative, it can be a help.) @@ -1520,13 +1517,13 @@ umount: Cleanup of /x/tmp/8-exp/chroot/5 Required options: - -options NULLFS + + options NULLFS options TMPFS Suggested options: - -options GEOM_CONCAT + + options GEOM_CONCAT options GEOM_STRIPE options SHMMAXPGS=65536 options SEMMNI=40 @@ -1539,26 +1536,27 @@ options ALT_BREAK_TO_DEBUGGER

For PAE, it is not currently possible to load modules. Therefore, if you are running an architecture that supports Linux emulation, you will need to add: - -options COMPAT_LINUX + + options COMPAT_LINUX options LINPROCFS Also for PAE, as of 20110912 you need the following. This needs to be investigated: - -nooption NFSD # New Network Filesystem Server + + nooption NFSD # New Network Filesystem Server options NFSCLIENT # Network Filesystem Client options NFSSERVER # Network Filesystem Server - As root, do the usual build steps, e.g.: -&prompt.root; make -j4 buildworld + As root, do the usual build steps, e.g.: + + &prompt.root; make -j4 buildworld &prompt.root; make buildkernel KERNCONF=${kernconf} &prompt.root; make installkernel KERNCONF=${kernconf} &prompt.root; make installworld - The install steps use DESTDIR. - + + The install steps use DESTDIR. @@ -1598,9 +1596,10 @@ options NFSSERVER Also add the following users: - -squid:*:100:100::0:0:User &:/usr/local/squid:/bin/sh + + squid:*:100:100::0:0:User &:/usr/local/squid:/bin/sh ganglia:*:102:102::0:0:User &:/usr/local/ganglia:/bin/sh + Add them to etc/group as well. @@ -1611,7 +1610,8 @@ ganglia:*:102:102::0:0:User &:/usr/l In etc/crontab: add - * * * * * root /var/portbuild/scripts/client-metrics + + * * * * * root /var/portbuild/scripts/client-metrics @@ -1623,14 +1623,15 @@ ganglia:*:102:102::0:0:User &:/usr/l In etc/inetd.conf: add - infoseek stream tcp nowait nobody /var/portbuild/scripts/reportload + + infoseek stream tcp nowait nobody /var/portbuild/scripts/reportload You should run the cluster on UTC. If you have not set the clock - to UTC: - &prompt.root; cp -p /usr/share/zoneinfo/Etc/UTC etc/localtime - + to UTC: + + &prompt.root; cp -p /usr/share/zoneinfo/Etc/UTC etc/localtime @@ -1640,8 +1641,9 @@ ganglia:*:102:102::0:0:User &:/usr/l different, machines, you will need to put those in the override directories.) - Recommended entries for physical nodes: -hostname="${hostname}" + Recommended entries for physical nodes: + + hostname="${hostname}" inetd_enable="YES" linux_enable="YES" nfs_client_enable="YES" @@ -1653,18 +1655,16 @@ sshd_program="/usr/local/sbin/sshd" gmond_enable="YES" squid_enable="YES" squid_chdir="/usr2/squid/logs" -squid_pidfile="/usr2/squid/logs/squid.pid" - - +squid_pidfile="/usr2/squid/logs/squid.pid" - Required entries for VMWare-based nodes: -vmware_guest_vmmemctl_enable="YES" -vmware_guest_guestd_enable="YES" - - + Required entries for VMWare-based nodes: + + vmware_guest_vmmemctl_enable="YES" +vmware_guest_guestd_enable="YES" + + Recommended entries for VMWare-based nodes: - Recommended entries for VMWare-based nodes: -hostname="" + hostname="" ifconfig_em0="DHCP" fsck_y_enable="YES" @@ -1678,9 +1678,7 @@ sshd_program="/usr/local/sbin/sshd" gmond_enable="YES" squid_enable="YES" squid_chdir="/usr2/squid/logs" -squid_pidfile="/usr2/squid/logs/squid.pid" - - +squid_pidfile="/usr2/squid/logs/squid.pid" &man.ntpd.8; should not be enabled for VMWare instances. @@ -1701,8 +1699,9 @@ squid_pidfile="/u - Modify etc/sysctl.conf: -9a10,30 + Modify etc/sysctl.conf: + + 9a10,30 > kern.corefile=/usr2/%N.core > kern.sugid_coredump=1 > #debug.witness_ddb=0 @@ -1724,7 +1723,6 @@ squid_pidfile="/u > security.jail.enforce_statfs=1 > > vfs.lookup_shared=1 - @@ -1745,13 +1743,13 @@ squid_pidfile="/u - Install the following ports: -net/rsync + Install the following ports: + + net/rsync security/openssh-portable (with HPN on) security/sudo sysutils/ganglia-monitor-core (with GMETAD off) -www/squid (with SQUID_AUFS on) - +www/squid (with SQUID_AUFS on) There is a WIP to create a meta-port, but it is not yet complete. @@ -1777,8 +1775,9 @@ www/squid (with SQUID_AUFS on) Modify - usr/local/etc/gmond.conf: -21,22c21,22 + usr/local/etc/gmond.conf: + + 21,22c21,22 < name = "unspecified" < owner = "unspecified" --- @@ -1788,7 +1787,6 @@ www/squid (with SQUID_AUFS on) < url = "unspecified" --- > url = "http://pointyhat.freebsd.org" - If there are machines from more than one cluster in the @@ -1801,8 +1799,9 @@ www/squid (with SQUID_AUFS on) Create usr/local/etc/rc.d/portbuild.sh, using the appropriate value for - scratchdir: -#!/bin/sh + scratchdir: + + #!/bin/sh # # Configure a package build system post-boot @@ -1820,13 +1819,13 @@ done # Flag that we are ready to accept jobs touch /tmp/.boot_finished - Modify - usr/local/etc/squid/squid.conf: -288,290c288,290 + usr/local/etc/squid/squid.conf: + + 288,290c288,290 < #auth_param basic children 5 < #auth_param basic realm Squid proxy-caching web server < #auth_param basic credentialsttl 2 hours @@ -1842,7 +1841,6 @@ touch /tmp/.boot_finished - Also, change usr/local to usr2 in @@ -1875,11 +1873,11 @@ touch /tmp/.boot_finished Create - usr/local/etc/sudoers/sudoers.d/portbuild: -# local changes for package building + usr/local/etc/sudoers/sudoers.d/portbuild: + + # local changes for package building %wheel ALL=(ALL) ALL ports-${arch} ALL=(ALL) NOPASSWD: ALL - @@ -1899,8 +1897,9 @@ ports-${arch} - As root: -&prompt.root; mkdir portbuild + As root: + + &prompt.root; mkdir portbuild &prompt.root; chown ports-${arch}:ports-${arch} portbuild &prompt.root; mkdir pkgbuild &prompt.root; chown ports-${arch}:ports-${arch} pkgbuild @@ -1908,7 +1907,6 @@ ports-${arch} &prompt.root; mkdir squid/cache &prompt.root; mkdir squid/logs &prompt.root; chown -R squid:squid squid - @@ -1928,8 +1926,9 @@ ports-${arch} As root, initialize the squid - directories: - squid -z + directories: + + squid -z @@ -1980,15 +1979,15 @@ ports-${arch} of MASTER_SITE_BACKUP must be common to all nodes, but the first entry in MASTER_SITE_OVERRIDE should be the - nearest local FTP mirror. Example: -.if defined(FETCH_ORIGINAL) + nearest local FTP mirror. Example: + + .if defined(FETCH_ORIGINAL) MASTER_SITE_BACKUP= .else MASTER_SITE_OVERRIDE= \ ftp://friendly-local-ftp-mirror/pub/FreeBSD/ports/distfiles/${DIST_SUBDIR}/ \ ftp://${BACKUP_FTP_SITE}/pub/FreeBSD/distfiles/${DIST_SUBDIR}/ .endif - tar it up and move it to the right @@ -2010,8 +2009,9 @@ MASTER_SITE_OVERRIDE= \ file contains overrides to /var/portbuild/${arch}/portbuild.conf. - Suggested values: -disconnected=1 + Suggested values: + + disconnected=1 http_proxy="http://localhost:3128/" squid_dir=/usr2/squid scratchdir=/usr2/pkgbuild @@ -2021,16 +2021,14 @@ rsync_gzip=-z infoseek_host=localhost infoseek_port=${tunelled-tcp-port} - - Possible other values: -use_md_swap=1 + Possible other values: + + use_md_swap=1 md_size=9g use_zfs=1 scp_cmd="/usr/local/bin/scp" -ssh_cmd="/usr/local/bin/ssh" - - +ssh_cmd="/usr/local/bin/ssh" @@ -2049,7 +2047,7 @@ ssh_cmd="/usr/local/bin/ssh" Add an appropriate data_source entry to /usr/local/etc/gmetad.conf: - data_source "arch/location Package Build Cluster" 30 hostname + data_source "arch/location Package Build Cluster" 30 hostname You will need to restart gmetad. @@ -2206,6 +2204,7 @@ ssh_cmd="/usr/local/bin/ssh" Kick-start the build for the branch with: + build create arch branch @@ -2372,14 +2371,13 @@ dopackages without -n - Create a new zfs filesystem: + Create a new zfs filesystem: + &prompt.root; zfs create -o mountpoint=/a/portbuild/arch a/portbuild/arch - - -&prompt.root; chown ports-arch:portbuild /var/portbuild/arch; + &prompt.root; chown ports-arch:portbuild /var/portbuild/arch; &prompt.root; chmod 775 /var/portbuild/arch; &prompt.root; cd /var/portbuild/arch @@ -2406,8 +2404,9 @@ dopackages without -n - Kick-start the build for the branch with - &prompt.root; build create arch branch + Kick-start the build for the branch with + + &prompt.root; build create arch branch @@ -2472,7 +2471,7 @@ dopackages without -n Make a private configuration directory: - &prompt.root; mkdir /var/portbuild/conf/arch + &prompt.root; mkdir /var/portbuild/conf/arch @@ -2529,8 +2528,9 @@ dopackages without -n - Tell qmanager about the arch: - python path/qmanager/qclient add_acl name=ports-arch uidlist=ports-arch gidlist=portbuild sense=1 + Tell qmanager about the arch: + + python path/qmanager/qclient add_acl name=ports-arch uidlist=ports-arch gidlist=portbuild sense=1 @@ -2575,35 +2575,36 @@ dopackages without -n - Export that value for a later initialization step: - &prompt.root; export PORTBUILD_USER=portbuild - + Export that value for a later initialization step: + + &prompt.root; export PORTBUILD_USER=portbuild - Add the following to /boot/loader.conf: -console="vidconsole,comconsole" - + Add the following to /boot/loader.conf: + + console="vidconsole,comconsole" You should run the cluster on UTC. If you have not set the clock - to UTC: - &prompt.root; cp -p /usr/share/zoneinfo/Etc/UTC /etc/localtime - + to UTC: + + &prompt.root; cp -p /usr/share/zoneinfo/Etc/UTC /etc/localtime Create the appropriate /etc/rc.conf. - Required entries: -hostname="${hostname}" -sshd_enable="YES" - + Required entries: + + hostname="${hostname}" +sshd_enable="YES" + + Recommended entries: -Recommended entries: -background_fsck="NO" + background_fsck="NO" clear_tmp_enable="YES" dumpdev="AUTO" fsck_y_enable="YES" @@ -2626,8 +2627,7 @@ rpc_lockd_enable="NO" rpc_statd_enable="YES" sendmail_enable="NONE" smartd_enable="YES" -zfs_enable="YES" - +zfs_enable="YES" @@ -2641,12 +2641,12 @@ zfs_enable="YES" - Add the following to /etc/sysctl.conf: -kern.maxfiles=40000 + Add the following to /etc/sysctl.conf: + + kern.maxfiles=40000 kern.maxfilesperproc=38000 sysctl vfs.usermount=1 sysctl vfs.zfs.super_owner=1 - @@ -2674,8 +2674,9 @@ ttyu0 "/usr/libexec/getty std.9600" - The following ports (or their latest successors) are required: -databases/py-sqlite3 + The following ports (or their latest successors) are required: + + databases/py-sqlite3 databases/py-sqlalchemy (only SQLITE is needed) devel/git (WITH_SVN) devel/py-configobj @@ -2686,16 +2687,16 @@ net/rsync sysutils/ganglia-monitor-core (with GMETAD off) sysutils/ganglia-webfrontend (compile with -DWITHOUT_X11) www/apache22 (with EXT_FILTER) - - Expect those to bring in, among others: -databases/sqlite3 + Expect those to bring in, among others: + + databases/sqlite3 lang/perl-5.14 (or successor) lang/python27 (or sucessor) - - The following ports (or their latest successors) are strongly suggested: -devel/ccache + The following ports (or their latest successors) are strongly suggested: + + devel/ccache mail/postfix net/isc-dhcp41-server ports-mgmt/pkg @@ -2705,15 +2706,14 @@ security/sudo shells/bash shells/zsh sysutils/screen - - The following ports (or their latest successors) are handy: -benchmarks/bonnie++ + The following ports (or their latest successors) are handy: + + benchmarks/bonnie++ ports-mgmt/pkg_tree sysutils/dmidecode sysutils/smartmontools sysutils/zfs-stats - @@ -2729,21 +2729,22 @@ sysutils/zfs-stats Pick a zfs volume name and export - it. We have used a so far to date. - &prompt.root; export ZFS_VOLUME=a - + it. We have used a so far to date. + + &prompt.root; export ZFS_VOLUME=a Pick a mountpoint and export it. We have used - /a so far to date. - &prompt.root; export ZFS_MOUNTPOINT=/a - + /a so far to date. + + &prompt.root; export ZFS_MOUNTPOINT=/a Create the mountpoint. - &prompt.root; mkdir -p ${ZFS_MOUNTPOINT} + + &prompt.root; mkdir -p ${ZFS_MOUNTPOINT} @@ -2753,7 +2754,7 @@ sysutils/zfs-stats Creating a <application>zfs</application> volume for portbuild -&prompt.root; zpool create ${ZFS_VOLUME} mirror da1 da2 mirror da3 da4 mirror da5 da6 mirror da7 da8 + &prompt.root; zpool create ${ZFS_VOLUME} mirror da1 da2 mirror da3 da4 mirror da5 da6 mirror da7 da8 @@ -2779,32 +2780,30 @@ sysutils/zfs-stats Select an svn repository and export it. See the &os; Handbook - for the currently supported list. - &prompt.root; export VCS_REPOSITORY=svn://svn0.us-east.FreeBSD.org - + for the currently supported list. + + &prompt.root; export VCS_REPOSITORY=svn://svn0.us-east.FreeBSD.org - Create the portbuild directory: -&prompt.root; mkdir -p ${ZFS_MOUNTPOINT}/portbuild - - + Create the portbuild directory: + + &prompt.root; mkdir -p ${ZFS_MOUNTPOINT}/portbuild Create and mount a new zfs - filesystem on it: - zfs create -o mountpoint=${ZFS_MOUNTPOINT}/portbuild ${ZFS_VOLUME}/portbuild - + filesystem on it: + + zfs create -o mountpoint=${ZFS_MOUNTPOINT}/portbuild ${ZFS_VOLUME}/portbuild - Set up the directory: -&prompt.root; chown ${PORTBUILD_USER}:${PORTBUILD_USER} ${ZFS_MOUNTPOINT}/portbuild + Set up the directory: + + &prompt.root; chown ${PORTBUILD_USER}:${PORTBUILD_USER} ${ZFS_MOUNTPOINT}/portbuild &prompt.root; chmod 775 ${ZFS_MOUNTPOINT}/portbuild -&prompt.root; ln -sf ${ZFS_MOUNTPOINT}/portbuild /var/portbuild - - +&prompt.root; ln -sf ${ZFS_MOUNTPOINT}/portbuild /var/portbuild The ln is necessary due to a number @@ -2820,10 +2819,9 @@ sysutils/zfs-stats - set up the repository: -&prompt.user; svn checkout ${VCS_REPOSITORY}/base/projects/portbuild ${ZFS_MOUNTPOINT}/portbuild - - + set up the repository: + + &prompt.user; svn checkout ${VCS_REPOSITORY}/base/projects/portbuild ${ZFS_MOUNTPOINT}/portbuild @@ -2931,9 +2929,9 @@ sysutils/zfs-stats As euid root, set up the zfs - permission set: - &prompt.root; ${ZFS_MOUNTPOINT}/tools/zfsadmin - + permission set: + + &prompt.root; ${ZFS_MOUNTPOINT}/tools/zfsadmin @@ -2953,11 +2951,11 @@ sysutils/zfs-stats Copy the following files from /var/portbuild/etc/rc.d/ to - /usr/local/etc/rc.d/: -buildproxy.sh + /usr/local/etc/rc.d/: + + buildproxy.sh pollmachine.sh qmanager.sh - As root, start each one of them. You may find it handy to start each under screen for @@ -2973,9 +2971,7 @@ qmanager.sh the first build command. - -&prompt.root; python /a/portbuild/qmanager/qclient add_acl name=deny_all uidlist= gidlist= sense=0 - + &prompt.root; python /a/portbuild/qmanager/qclient add_acl name=deny_all uidlist= gidlist= sense=0 @@ -2991,10 +2987,10 @@ qmanager.sh As the portbuild user, run the following commands manually to create the src and ports - repositories, respectively: -&prompt.user; /a/portbuild/scripts/updatesnap.ports -&prompt.user; /a/portbuild/scripts/updatesnap - + repositories, respectively: + + &prompt.user; /a/portbuild/scripts/updatesnap.ports +&prompt.user; /a/portbuild/scripts/updatesnap These will be periodically run from the portbuild @@ -3047,9 +3043,9 @@ qmanager.sh - If not already created, add the following user: -ganglia:*:102:102::0:0:User &:/usr/local/ganglia:/bin/sh - + If not already created, add the following user: + + ganglia:*:102:102::0:0:User &:/usr/local/ganglia:/bin/sh Add it to /etc/group as well. @@ -3077,9 +3073,9 @@ ganglia:*:102:102::0:0:User &:/usr/l At some point, you will probably find it handy to append the following to the PATH definition for - the portbuild user: - /a/portbuild/scripts:/a/portbuild/tools - + the portbuild user: + + /a/portbuild/scripts:/a/portbuild/tools