linux-from-scratch/glfs
1
0
Fork 0
mirror of https://github.com/Zeckmathederg/glfs.git synced 2025-01-25 07:42:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Minor changes to the OpenJDK/Icedtea page

Browse Source 
git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@14088 af4574ff-66df-0310-9fd7-8a98e5e911e0
This commit is contained in:
Pierre Labastie 2014-08-26 13:41:36 +00:00
parent cc2a12d2b7
commit b1129a10f9
2 changed files with 78 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
general.ent
View File

@ -1,12 +1,12 @@
<!-- $LastChangedBy$ $Date$ -->
<!ENTITY day "25"> <!-- Always 2 digits -->
<!ENTITY day "26"> <!-- Always 2 digits -->
<!ENTITY month "08"> <!-- Always 2 digits -->
<!ENTITY year "2014">
<!ENTITY copyrightdate "2001-&year;">
<!ENTITY copyholder "The BLFS Development Team">
<!ENTITY version "&year;-&month;-&day;">
<!ENTITY releasedate "August 25th, &year;">
<!ENTITY releasedate "August 26th, &year;">
<!ENTITY pubdate "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
<!ENTITY blfs-version "svn"> <!-- svn|[release #] -->
<!ENTITY lfs-version "development"> <!-- x.y|development] -->

111
general/prog/openjdk.xml
View File

@ -42,11 +42,14 @@
<!ENTITY rhino-md5sum "ad67a3dff135e3a70f0c3528a2d6edf2">
<!ENTITY rhino-size "6.2 MB">
<!ENTITY icedtea-web-download "http://icedtea.classpath.org/download/source/icedtea-web-&icedtea-web-version;.tar.gz">
<!ENTITY openjdk-buildsize "8-10 GB">
<!ENTITY openjdk-time "26-27 SBU (an additional 90 SBU for testsuite)">
]>
<sect1 id="openjdk" xreflabel="OpenJDK-&openjdk-version;/IcedTea-&icedtea-version;">
<sect1 id="openjdk"
xreflabel="OpenJDK-&openjdk-version;/IcedTea-&icedtea-version;">
<?dbhtml filename="openjdk.html" ?>
<sect1info>
@ -87,7 +90,7 @@
the <ulink url="http://openjdk.java.net/legal/gplv2+ce.html">GNU
General Public License, version 2, with the Classpath Exception</ulink>
allows third party programs to use classes provided by free software
without the requirement that the third party software also be free. As with
without the requirement that the third party software also be free. As with
the LGPL, any modifications made to the free software portions of a
third party application, must also be made freely available.</para>
@ -214,20 +217,28 @@
<bridgehead renderas="sect4">Required Patches</bridgehead>
<itemizedlist spacing='compact'>
<listitem>
<para><ulink
url="&patch-root;/icedtea-&icedtea-version;-add_cacerts-1.patch"/></para>
<para>
<ulink
url="&patch-root;/icedtea-&icedtea-version;-add_cacerts-1.patch"/>
</para>
</listitem>
<listitem>
<para><ulink
url="&patch-root;/icedtea-&icedtea-version;-fixed_paths-1.patch"/></para>
<para>
<ulink
url="&patch-root;/icedtea-&icedtea-version;-fixed_paths-1.patch"/>
</para>
</listitem>
<listitem>
<para><ulink
url="&patch-root;/icedtea-&icedtea-version;-fix_new_giflib-1.patch"/></para>
<para>
<ulink
url="&patch-root;/icedtea-&icedtea-version;-fix_new_giflib-1.patch"/>
</para>
</listitem>
<listitem>
<para><ulink
url="&patch-root;/icedtea-&icedtea-version;-fix_tests-1.patch"/></para>
<para>
<ulink
url="&patch-root;/icedtea-&icedtea-version;-fix_tests-1.patch"/>
</para>
</listitem>
</itemizedlist>
@ -243,6 +254,16 @@
</para>
</listitem>
</itemizedlist>
<bridgehead renderas="sect4">Optional package (to obtain an icon for the
<filename>openjdk-7-policytool.desktop</filename> file)</bridgehead>
<itemizedlist spacing='compact'>
<listitem>
<para>
<ulink url="&icedtea-web-download;"/>
</para>
</listitem>
</itemizedlist>
<bridgehead renderas="sect3">OpenJDK Dependencies</bridgehead>
<bridgehead renderas="sect4">Required Dependencies</bridgehead>
@ -271,8 +292,6 @@
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional">
<xref linkend="icedtea-web"/> (to obtain one icon for the
<filename>openjdk-7-policytool.desktop</filename> file),
<xref linkend="libxslt"/>,
<xref linkend="lsb-release"/>,
<xref linkend="mercurial"/>,
@ -315,7 +334,8 @@ install -v -m755 rhino1_7R4/*.jar /usr/share/java</userinput></screen>
composed of several individual projects of the proprietary
<application>JDK</application> that have been relicensed under an open
source license. If you have already downloaded all of the individual
components, place them into the source tree with the following commands:</para>
components, place them into the source tree with the following
commands:</para>
<screen><userinput>cp -v ../corba.tar.bz2 . &amp;&amp;
cp -v ../hotspot.tar.bz2 . &amp;&amp;
@ -339,7 +359,8 @@ cp -v ../openjdk.tar.bz2 .</userinput></screen>
<screen><userinput>patch -Np1 -i ../icedtea-&icedtea-version;-fix_new_giflib-1.patch</userinput></screen>
<para>Apply a patch to exclude known broken tests from the test suite:</para>
<para>Apply a patch to exclude known broken tests from the test
suite:</para>
<screen><userinput>patch -Np1 -i ../icedtea-&icedtea-version;-fix_tests-1.patch</userinput></screen>
@ -395,13 +416,15 @@ chown -R root:root /opt/OpenJDK-&openjdk-version;</userinput></screen>
in a desktop menu for <command>policytool</command>. First, you need to
obtain an icon from <xref linkend="icedtea-web"/>:</para>
<screen role="root"><userinput>tar -xf ../icedtea-web-&icedtea-web-version;.tar.gz \
<screen><userinput>tar -xf ../icedtea-web-&icedtea-web-version;.tar.gz \
icedtea-web-&icedtea-web-version;/javaws.png \
--strip-components=1</userinput></screen>
<para>Now, as <systemitem class="username">root</systemitem> user:</para>
<screen role="root"><userinput>cat &gt;&gt; /usr/share/applications/openjdk-7-policytool.desktop &lt;&lt; "EOF" &amp;&amp;
<screen role="root"><userinput>mkdir -pv /usr/share/applications &amp;&amp;
cat &gt; /usr/share/applications/openjdk-7-policytool.desktop &lt;&lt; "EOF" &amp;&amp;
<literal>[Desktop Entry]
Name=OpenJDK Java 7 Policy Tool
Name[pt_BR]=OpenJDK Java 7 - Ferramenta de Pol&#237;tica
@ -416,9 +439,10 @@ EOF
install -v -Dm0644 javaws.png /usr/share/pixmaps/javaws.png</userinput></screen>
<para>The choice of pt_BR is just an example. You can delete those lines
or replace them by corresponding ones in your locale, e.g. fr_FR, with the
"Name[fr_FR]" and "Comment[fr_FR]" values given by your translations.</para>
<para>The choice of pt_BR is just an example. You can add any translation
by adding lines corresponding to your locale, e.g. for fr_FR,
"Name[fr_FR]=" and "Comment[fr_FR]=" with the appropriate text as
values.</para>
</sect2>
@ -462,7 +486,9 @@ install -v -Dm0644 javaws.png /usr/share/pixmaps/javaws.png</userinput></screen>
</sect2>
<sect2 role="configuration" id="openjdk-config" xreflabel="Configuring OpenJDK" >
<sect2 role="configuration"
id="openjdk-config"
xreflabel="Configuring OpenJDK">
<title>Configuring OpenJDK</title>
<sect3>
@ -487,14 +513,18 @@ install -v -Dm0644 javaws.png /usr/share/pixmaps/javaws.png</userinput></screen>
following commands as the <systemitem class="username">root</systemitem>
user:</para>
<screen role="root"><userinput>cat &gt;&gt; /etc/profile.d/openjdk.sh &lt;&lt; "EOF"
<screen role="root"><userinput>cat &gt; /etc/profile.d/openjdk.sh &lt;&lt; "EOF"
<literal># Begin /etc/profile.d/openjdk.sh
# Set JAVA_HOME directory
JAVA_HOME=/opt/jdk
# Set ANT_HOME directory
ANT_HOME=/opt/ant
# Adjust PATH
pathappend $JAVA_HOME/bin PATH
pathappend $ANT_HOME/bin PATH
# Auto Java CLASSPATH
# Copy jar files to, or create symlinks in this directory
@ -511,7 +541,7 @@ for jar in `find ${AUTO_CLASSPATH_DIR} -name "*.jar" 2>/dev/null`; do
pathappend $jar CLASSPATH
done
export JAVA_HOME CLASSPATH
export JAVA_HOME ANT_HOME CLASSPATH
unset AUTO_CLASSPATH_DIR dir jar
# End /etc/profile.d/openjdk.sh</literal>
@ -545,7 +575,8 @@ mandb -c /opt/jdk/man</userinput></screen>
</sect3>
<sect3 id='ojdk-certs'>
<title>Install or update the JRE Certificate Authority Certificates (cacerts) file</title>
<title>Install or update the JRE Certificate Authority Certificates
(cacerts) file</title>
<para>Use the following procedure to check if the
<filename>cacerts</filename> file was successfully installed during the
@ -656,17 +687,21 @@ function showhelp()
{
echo "`basename ${0}` creates a valid cacerts file for use with IcedTea."
echo ""
echo " -f --cafile The path to a file containing PEM formated CA"
echo " certificates. May not be used with -d/--cadir."
echo " -d --cadir The path to a diectory of PEM formatted CA"
echo " certificates. May not be used with -f/--cafile."
echo " -o --outfile The path to the output file."
echo " -f --cafile The path to a file containing PEM"
echo " formated CA certificates. May not be"
echo " used with -d/--cadir."
echo ""
echo " -k --keytool The path to the java keytool utility."
echo " -d --cadir The path to a directory of PEM formatted"
echo " CA certificates. May not be used with"
echo " -f/--cafile."
echo ""
echo " -s --openssl The path to the openssl utility."
echo " -o --outfile The path to the output file."
echo ""
echo " -h --help Show this help message and exit."
echo " -k --keytool The path to the java keytool utility."
echo ""
echo " -s --openssl The path to the openssl utility."
echo ""
echo " -h --help Show this help message and exit."
echo ""
echo ""
}
@ -764,8 +799,11 @@ do
certbegin=`grep -n "^-----BEGIN" "${cert}" | cut -d ":" -f 1`
certend=`grep -n "^-----END" "${cert}" | cut -d ":" -f 1`
sed -n "${certbegin},${certend}p" "${cert}" > "${tempfile}"
echo yes | env LC_ALL=C "${KEYTOOL}" -import -alias `basename "${cert}"` -keystore \
"${OUTFILE}" -storepass 'changeit' -file "${tempfile}"
echo yes | env LC_ALL=C "${KEYTOOL}" -import \
-alias `basename "${cert}"` \
-keystore "${OUTFILE}" \
-storepass 'changeit' \
-file "${tempfile}"
rm "${tempfile}"
done
@ -790,8 +828,11 @@ chmod -c 0755 /opt/jdk/bin/mkcacerts</userinput></screen>
is better to make a backup. Then, you can create a new one, as the
<systemitem class="username">root</systemitem> user:</para>
<screen role="root"><userinput>/opt/jdk/bin/mkcacerts -d "/etc/ssl/certs/" -k "/opt/jdk/bin/keytool" \
-s "/usr/bin/openssl" -o "/opt/jdk/jre/lib/security/cacerts"</userinput></screen>
<screen role="root"><userinput>/opt/jdk/bin/mkcacerts \
-d "/etc/ssl/certs/" \
-k "/opt/jdk/bin/keytool" \
-s "/usr/bin/openssl" \
-o "/opt/jdk/jre/lib/security/cacerts"</userinput></screen>
</sect3>