Updated Branches: refs/heads/4.1 d2579045b -> 3d37f2a6e
CLOUDSTACK-1: adding revised Debian packaging info to the build from source docs in install guide. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3d37f2a6 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3d37f2a6 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3d37f2a6 Branch: refs/heads/4.1 Commit: 3d37f2a6e84694618228d364e5ba5a4cbcbaf877 Parents: d257904 Author: Joe Brockmeier <j...@zonker.net> Authored: Thu Apr 18 23:04:00 2013 -0500 Committer: Joe Brockmeier <j...@zonker.net> Committed: Thu Apr 18 23:04:00 2013 -0500 ---------------------------------------------------------------------- docs/en-US/Release_Notes.xml | 5 +- docs/en-US/build-deb.xml | 163 +++++++++++++++++-------------------- 2 files changed, 75 insertions(+), 93 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3d37f2a6/docs/en-US/Release_Notes.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/Release_Notes.xml b/docs/en-US/Release_Notes.xml index 2783730..d46339b 100644 --- a/docs/en-US/Release_Notes.xml +++ b/docs/en-US/Release_Notes.xml @@ -5586,7 +5586,6 @@ service cloudstack-agent start <row> <entry><para><command>addTrafficMonitor</command></para></entry> <entry><para>New request parameters: <command>excludezones</command> (optional), <command>includezones</command> (optional)</para> - <para>Removed response parameters: <command>privateinterface</command>, <command>privatezone</command>, <command>publicinterface</command>, <command>publiczone</command>, <command>usageinterface</command>, <command>username</command></para> </entry> </row> <row> @@ -5597,7 +5596,6 @@ service cloudstack-agent start </row> <row> <entry><para><command>listTrafficMonitors</command></para></entry> - <entry><para>Removed response parameters: <command>privateinterface</command>, <command>privatezone</command>, <command>publicinterface</command>, <command>publiczone</command>, <command>usageinterface</command>, <command>username</command></para></entry> </row> <row> <entry><para><command>registerSSHKeyPair</command></para></entry> @@ -5748,8 +5746,7 @@ service cloudstack-agent start </row> <row> <entry><para><command>deleteUser</command></para></entry> - <entry><para>New response parameters: <command>displaytext</command>, <command>success</command></para> - <para>Removed parameters: <command>id</command>, <command>account</command>, <command>accountid</command>, <command>accounttype</command>, <command>apikey</command>, <command>created</command>, <command>domain</command>, <command>domainid</command>, <command>email</command>, <command>firstname</command>, <command>lastname</command>, <command>secretkey</command>, <command>state</command>, <command>timezone</command>, <command>username</command></para></entry> + <entry><para>New response parameters: <command>displaytext</command>, <command>success</command></para></entry> </row> <row> <entry><para><command>listVlanIpRanges</command></para></entry> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3d37f2a6/docs/en-US/build-deb.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/build-deb.xml b/docs/en-US/build-deb.xml index 37e5a7d..0defb6e 100644 --- a/docs/en-US/build-deb.xml +++ b/docs/en-US/build-deb.xml @@ -5,119 +5,104 @@ ]> <!-- Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. --> <section id="sect-source-builddebs"> <title>Building DEB packages</title> <para> - In addition to the bootstrap dependencies, you'll also need to install - several other dependencies. Note that we recommend using Maven 3, which - is not currently available in 12.04.1 LTS. So, you'll also need to add a - PPA repository that includes Maven 3. After running the command - <command>add-apt-repository</command>, you will be prompted to continue and - a GPG key will be added. - </para> -<screen> -<command>$ sudo apt-get update</command> -<command>$ sudo apt-get install python-software-properties</command> -<command>$ sudo add-apt-repository ppa:natecarlson/maven3</command> -<command>$ sudo apt-get update</command> -<command>$ sudo apt-get install ant debhelper openjdk-6-jdk tomcat6 libws-commons-util-java genisoimage python-mysqldb libcommons-codec-java libcommons-httpclient-java liblog4j1.2-java maven3</command> -</screen> + In addition to the bootstrap dependencies, you'll also need to install + several other dependencies. Note that we recommend using Maven 3, which + is not currently available in 12.04.1 LTS. So, you'll also need to add a + PPA repository that includes Maven 3. After running the command + <command>add-apt-repository</command>, you will be prompted to continue and + a GPG key will be added. + </para> + <screen> + <command>$ sudo apt-get update</command> + <command>$ sudo apt-get install python-software-properties</command> + <command>$ sudo add-apt-repository ppa:natecarlson/maven3</command> + <command>$ sudo apt-get update</command> + <command>$ sudo apt-get install ant debhelper openjdk-6-jdk tomcat6 libws-commons-util-java genisoimage python-mysqldb libcommons-codec-java libcommons-httpclient-java liblog4j1.2-java maven3</command> + </screen> <para> - While we have defined, and you have presumably already installed the - bootstrap prerequisites, there are a number of build time prerequisites - that need to be resolved. &PRODUCT; uses maven for dependency resolution. - You can resolve the buildtime depdencies for CloudStack by running:</para> + Now that we have resolved the dependencies we can move on to building &PRODUCT; + and packaging them into DEBs. + </para> + <screen> + <command>mvn clean install -P developer,systemvm</command> + <command>$ dpkg-buildpackge -uc -us</command> + </screen> -<screen><command>$ mvn3 -P deps</command></screen> <para> - Now that we have resolved the dependencies we can move on to building &PRODUCT; - and packaging them into DEBs by issuing the following command. + This command will build seven Debian packages. You should have the following: </para> -<screen> -<command>$ dpkg-buildpackge -uc -us</command> -</screen> - -<para> - This command will build 16 Debian packages. You should have all of the following: -</para> -<programlisting> -cloud-agent_4.0.0-incubating_amd64.deb -cloud-agent-deps_4.0.0-incubating_amd64.deb -cloud-agent-libs_4.0.0-incubating_amd64.deb -cloud-awsapi_4.0.0-incubating_amd64.deb -cloud-cli_4.0.0-incubating_amd64.deb -cloud-client_4.0.0-incubating_amd64.deb -cloud-client-ui_4.0.0-incubating_amd64.deb -cloud-core_4.0.0-incubating_amd64.deb -cloud-deps_4.0.0-incubating_amd64.deb -cloud-python_4.0.0-incubating_amd64.deb -cloud-scripts_4.0.0-incubating_amd64.deb -cloud-server_4.0.0-incubating_amd64.deb -cloud-setup_4.0.0-incubating_amd64.deb -cloud-system-iso_4.0.0-incubating_amd64.deb -cloud-usage_4.0.0-incubating_amd64.deb -cloud-utils_4.0.0-incubating_amd64.deb -</programlisting> + <itemizedlist> + <listitem><para>cloudstack-agent_4.1.0_all.deb</para></listitem> + <listitem><para>cloudstack-awsapi_4.1.0_all.deb</para></listitem> + <listitem><para>cloudstack-cli_4.1.0_all.deb</para></listitem> + <listitem><para>cloudstack-common_4.1.0_all.deb</para></listitem> + <listitem><para>cloudstack-docs_4.1.0_all.deb</para></listitem> + <listitem><para>cloudstack-management_4.1.0_all.deb</para></listitem> + <listitem><para>cloudstack-usage_4.1.0_all.deb</para></listitem> + </itemizedlist> <section id="sect-source-builddebs-repo"> - <title>Setting up an APT repo</title> + <title>Setting up an APT repo</title> - <para>After you've created the packages, you'll want to copy them to a system where you can serve the packages over HTTP. You'll create a directory for the packages and then use <code>dpkg-scanpackages</code> to create <filename>Packages.gz</filename>, which holds information about the archive structure. Finally, you'll add the repository to your system(s) so you can install the packages using APT.</para> + <para>After you've created the packages, you'll want to copy them to a system where you can serve the packages over HTTP. You'll create a directory for the packages and then use <code>dpkg-scanpackages</code> to create <filename>Packages.gz</filename>, which holds information about the archive structure. Finally, you'll add the repository to your system(s) so you can install the packages using APT.</para> - <para>The first step is to make sure that you have the <application>dpkg-dev</application> package installed. This should have been installed when you pulled in the <application>debhelper</application> application previously, but if you're generating <filename>Packages.gz</filename> on a different system, be sure that it's installed there as well.</para> + <para>The first step is to make sure that you have the <application>dpkg-dev</application> package installed. This should have been installed when you pulled in the <application>debhelper</application> application previously, but if you're generating <filename>Packages.gz</filename> on a different system, be sure that it's installed there as well.</para> -<screen><command>$ sudo apt-get install dpkg-dev</command></screen> + <screen><command>$ sudo apt-get install dpkg-dev</command></screen> -<para>The next step is to copy the DEBs to the directory where they can be served over HTTP. We'll use <filename>/var/www/cloudstack/repo</filename> in the examples, but change the directory to whatever works for you.</para> + <para>The next step is to copy the DEBs to the directory where they can be served over HTTP. We'll use <filename>/var/www/cloudstack/repo</filename> in the examples, but change the directory to whatever works for you.</para> -<screen> -<command>sudo mkdir -p /var/www/cloudstack/repo/binary</command> -<command>sudo cp *.deb /var/www/cloudstack/repo/binary</command> -<command>sudo cd /var/www/cloudstack/repo/binary</command> -<command>sudo dpkg-scanpackages . /dev/null | tee Packages | gzip -9 > Packages.gz</command> -</screen> + <screen> + <command>sudo mkdir -p /var/www/cloudstack/repo/binary</command> + <command>sudo cp *.deb /var/www/cloudstack/repo/binary</command> + <command>sudo cd /var/www/cloudstack/repo/binary</command> + <command>sudo dpkg-scanpackages . /dev/null | tee Packages | gzip -9 > Packages.gz</command> + </screen> -<note><title>Note: Override Files</title> - <para>You can safely ignore the warning about a missing override file.</para> -</note> + <note><title>Note: Override Files</title> + <para>You can safely ignore the warning about a missing override file.</para> + </note> -<para>Now you should have all of the DEB packages and <filename>Packages.gz</filename> in the <filename>binary</filename> directory and available over HTTP. (You may want to use <command>wget</command> or <command>curl</command> to test this before moving on to the next step.)</para> + <para>Now you should have all of the DEB packages and <filename>Packages.gz</filename> in the <filename>binary</filename> directory and available over HTTP. (You may want to use <command>wget</command> or <command>curl</command> to test this before moving on to the next step.)</para> </section> <section id="sect-source-builddebs-repo2"> - <title>Configuring your machines to use the APT repository</title> - <para> - Now that we have created the repository, you need to configure your machine - to make use of the APT repository. You can do this by adding a repository file - under <filename>/etc/apt/sources.list.d</filename>. Use your preferred editor to - create <filename>/etc/apt/sources.list.d/cloudstack.list</filename> with this - line:</para> - - <programlisting>deb http://<replaceable>server.url</replaceable>/cloudstack/repo binary ./</programlisting> - + <title>Configuring your machines to use the APT repository</title> + <para> + Now that we have created the repository, you need to configure your machine + to make use of the APT repository. You can do this by adding a repository file + under <filename>/etc/apt/sources.list.d</filename>. Use your preferred editor to + create <filename>/etc/apt/sources.list.d/cloudstack.list</filename> with this + line:</para> + + <programlisting>deb http://<replaceable>server.url</replaceable>/cloudstack/repo binary ./</programlisting> + <para>Now that you have the repository info in place, you'll want to run another update so that APT knows where to find the &PRODUCT; packages.</para> -<screen><command>$ sudo apt-get update</command></screen> + <screen><command>$ sudo apt-get update</command></screen> -<para>You can now move on to the instructions under Install on Ubuntu.</para> + <para>You can now move on to the instructions under Install on Ubuntu.</para> - </section> + </section> </section>
