svn commit: r40954 - head/en_US.ISO8859-1/articles/portbuild

Mark Linimon linimon at FreeBSD.org
Tue Feb 12 03:28:19 UTC 2013


Author: linimon
Date: Tue Feb 12 03:28:19 2013
New Revision: 40954
URL: http://svnweb.freebsd.org/changeset/doc/40954

Log:
  Collapse all the manual steps of "new architecture" into the addarch
  script.

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 Feb 11 23:41:16 2013	(r40953)
+++ head/en_US.ISO8859-1/articles/portbuild/article.xml	Tue Feb 12 03:28:19 2013	(r40954)
@@ -2273,51 +2273,25 @@ zfs destroy -r a/snap/src-<replaceable>o
     <sect2 id="new-arch-pre-qmanager">
       <title>Steps necessary before <application>qmanager</application> is started</title>
 
-<!-- XXX MCL addarch -->
       <note>
-	<para>The initial steps need to be done as
-	  <literal>root</literal>.</para>
+	<para>The next steps are most easily done as user
+	  <literal>portbuild</literal>.</para>
       </note>
 
-      <itemizedlist>
-	<listitem>
-	  <para>If it has not already been done, create the
-	    <literal>portbuild</literal>
-	    user and group.</para>
-	</listitem>
-
-	<listitem>
-	  <screen>mkdir /a/portbuild/<replaceable>arch</replaceable></screen>
-	</listitem>
-
-	<listitem>
-	  <para>Create a new <application>zfs</application> filesystem:</para>
-
-	  <screen>&prompt.root; zfs create -o mountpoint=/a/portbuild/<replaceable>arch</replaceable> a/portbuild/<replaceable>arch</replaceable></screen>
-      </listitem>
-
-	<listitem>
-	  <screen>&prompt.root; chown portbuild:portbuild /a/portbuild/<replaceable>arch</replaceable>;
-&prompt.root; chmod 775 /a/portbuild/<replaceable>arch</replaceable>;
-&prompt.root; cd /a/portbuild/<replaceable>arch</replaceable></screen>
-	</listitem>
-
-	<listitem>
-	  <para>Create the <filename>.ssh</filename> directory.</para>
-	</listitem>
-      </itemizedlist>
-
       <note>
-	<para>The next steps are most easily done as user
-	  <literal>portbuild</literal>.</para>
+	<para>The following assumes you have already run
+	  <literal>mkportbuild</literal>.</para>
       </note>
 
       <itemizedlist>
 	<listitem>
-	  <para>Create an archive directory for buildlogs and errorlogs
-	    under <filename>archive/</filename>.</para>
+	  <para>As the <literal>portbuild</literal> user, run</para>
+
+	  <screen>&prompt.user; /a/portbuild/admin/tools/addarch <replaceable>arch</replaceable></screen>
 	</listitem>
+      </itemizedlist>
 
+      <itemizedlist>
 	<listitem>
 	  <para>For each branch that will be supported, do the following:</para>
 
@@ -2361,8 +2335,10 @@ zfs destroy -r a/snap/src-<replaceable>o
 	</listitem>
 
 	<listitem>
-	  <para>Create a fresh <filename>portbuild.conf</filename> file
-	    from one of the ones for another architecture.</para>
+	  <para>Edit <filename>portbuild.conf</filename>
+	    from one of the ones for another architecture.
+	    <literal>addarch</literal> will have created a default
+	    one for you.</para>
 	</listitem>
 
 	<listitem>
@@ -2372,16 +2348,6 @@ zfs destroy -r a/snap/src-<replaceable>o
 	</listitem>
 
 	<listitem>
-	  <screen>&prompt.root; cd .ssh && ssh-keygen</screen>
-	</listitem>
-
-	<listitem>
-	  <para>If desired,
-	    edit the <filename>.ssh/config</filename> file for
-	    convenience in using <application>ssh</application>.</para>
-	</listitem>
-
-	<listitem>
 	  <para>If you need to create any tunnels:</para>
 
 	  <procedure>
@@ -2400,7 +2366,7 @@ zfs destroy -r a/snap/src-<replaceable>o
       </itemizedlist>
 
       <note>
-	<para>Once again as <literal>root</literal>:</para>
+	<para>As <literal>srcbuild</literal>:</para>
       </note>
 
       <itemizedlist>
@@ -2411,14 +2377,14 @@ zfs destroy -r a/snap/src-<replaceable>o
 
 	<listitem>
 	  <para>Add the <replaceable>arch</replaceable> directory to
-	    <filename>/a/portbuild/admin/scripts/zbackup</filename> and
-	    <filename>/a/portbuild/admin/scripts/zexpire</filename>.</para>
+	    <filename>/a/portbuild/admin/scripts/zbackup</filename>.
+	    (This is a hack and should go away.)</para>
 	</listitem>
       </itemizedlist>
 
       <itemizedlist>
 	<listitem>
-	  <para>Add an appropriate <replaceable>arch</replaceable> entry for
+	  <para>Enable the appropriate <replaceable>arch</replaceable> entry for
 	    <filename>/a/portbuild/scripts/dologs</filename> to the portbuild
 	    <filename>crontab</filename>.  (This is a hack and should go away.)</para>
 	</listitem>
@@ -2429,17 +2395,11 @@ zfs destroy -r a/snap/src-<replaceable>o
       <title>Steps necessary after <application>qmanager</application> is started</title>
 
       <note>
-	<para>Again as <literal>root</literal>:</para>
+	<para>Again as <literal>srcbuild</literal>:</para>
       </note>
 
       <itemizedlist>
 	<listitem>
-	  <para>Tell <application>qmanager</application> about the arch:</para>
-
-	  <screen>python <replaceable>path</replaceable>/qmanager/qclient add_acl name=ports-<replaceable>arch</replaceable> uidlist=ports-<replaceable>arch</replaceable> gidlist=portbuild sense=1</screen>
-	</listitem>
-
-	<listitem>
 	  <para>For each branch that will be supported, do the following:</para>
 
 	  <itemizedlist>


More information about the svn-doc-all mailing list