Ignore:
Timestamp:
04/13/2021 09:31:15 PM (3 years ago)
Author:
Xi Ruoyao <xry111@…>
Branches:
kde5-14269
Parents:
1ec0251
git-author:
Krejzi <krejzi@…> (09/13/2014 05:36:06 PM)
git-committer:
Xi Ruoyao <xry111@…> (04/13/2021 09:31:15 PM)
Message:

Begin manually (while modifying stuff) merging trunk and systemd branches since revision 14087.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/kde5@14270 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:
1 edited

Legend:

Unmodified
Added
Removed

  • general/prog/openjdk.xml

    r1ec0251 r64135787  
    55  %general-entities;
    66
    7   <!ENTITY anduin-download               "http://anduin.linuxfromscratch.org/files/BLFS/OpenJDK-&openjdk-version;">
     7  <!ENTITY anduin-download               "http://anduin.linuxfromscratch.org/files/BLFS/OpenJDK-&openjdk-version;-&icedtea-version;">
    88  <!ENTITY icedtea-download              "http://icedtea.classpath.org/download/source/icedtea-&icedtea-version;.tar.xz">
    99
    10   <!ENTITY icedtea-md5sum                "de88ab45dcea7a4c2088f845b0dfe542">
     10  <!ENTITY icedtea-md5sum                "6c57b54ab8b7916425d567dbb478ad73">
    1111  <!ENTITY icedtea-size                  "1.9 MB">
    1212
    1313  <!ENTITY corba-download                "&anduin-download;/corba.tar.bz2">
    14   <!ENTITY corba-md5sum                  "381f9c3694b302064520b603feb8aba3">
     14  <!ENTITY corba-md5sum                  "86cf23060d726aa55d77bffedb8b6a99">
    1515  <!ENTITY corba-size                    "1.0 MB">
    1616
    1717  <!ENTITY hotspot-download              "&anduin-download;/hotspot.tar.bz2">
    18   <!ENTITY hotspot-md5sum                "79442639a24fedefe0ca5c3a66f87fe1">
     18  <!ENTITY hotspot-md5sum                "026bb8ca9e764fe53b8a19f1ddad1479">
    1919  <!ENTITY hotspot-size                  "7.4 MB">
    2020
    2121  <!ENTITY jaxp-download                 "&anduin-download;/jaxp.tar.bz2">
    22   <!ENTITY jaxp-md5sum                   "0c11aeb494fb76143ccf0b58b0b6ac96">
     22  <!ENTITY jaxp-md5sum                   "cbd3226b916fe9e6c7e9f1cd15e54d55">
    2323  <!ENTITY jaxp-size                     "2.6 MB">
    2424
    2525  <!ENTITY jaxws-download                "&anduin-download;/jaxws.tar.bz2">
    26   <!ENTITY jaxws-md5sum                  "ab102f6a0e4bb56a5153d0a005451566">
     26  <!ENTITY jaxws-md5sum                  "84b921fc3e328eea770dc1a092e240dc">
    2727  <!ENTITY jaxws-size                    "1.9 MB">
    2828
    2929  <!ENTITY jdk-download                  "&anduin-download;/jdk.tar.bz2">
    30   <!ENTITY jdk-md5sum                    "5183620f97e366267568f4e613b71f28">
     30  <!ENTITY jdk-md5sum                    "b5a4703501bf4a6adeaa614e6d2345b3">
    3131  <!ENTITY jdk-size                      "30.2 MB">
    3232
    3333  <!ENTITY langtools-download            "&anduin-download;/langtools.tar.bz2">
    34   <!ENTITY langtools-md5sum              "04b5c20b2320f75c1f510e0b53f6480c">
     34  <!ENTITY langtools-md5sum              "e104e60e44aba0a8bc60c48df1d859b9">
    3535  <!ENTITY langtools-size                "1.6 MB">
    3636
    3737  <!ENTITY openjdk-download              "&anduin-download;/openjdk.tar.bz2">
    38   <!ENTITY openjdk-md5sum                "9a599c97007df0f6156767e914063956">
     38  <!ENTITY openjdk-md5sum                "f48d6f8b748f869a5624d2c44998d54c">
    3939  <!ENTITY openjdk-size                  "122 KB">
    4040
    … …  
    4343  <!ENTITY rhino-size                    "6.2 MB">
    4444
     45  <!ENTITY icedtea-web-download          "http://icedtea.classpath.org/download/source/icedtea-web-&icedtea-web-version;.tar.gz">
     46
    4547  <!ENTITY openjdk-buildsize             "8-10 GB">
    46   <!ENTITY openjdk-time                  "26-27 SBU (an additional 90 SBU for testsuite)">
     48  <!ENTITY openjdk-time                  "28-36 SBU (an additional 100 SBU for testsuite)">
    4749]>
    4850
    49 <sect1 id="openjdk" xreflabel="OpenJDK-&openjdk-version;/IcedTea-&icedtea-version;">
     51<sect1 id="openjdk"
     52       xreflabel="OpenJDK-&openjdk-version;/IcedTea-&icedtea-version;">
    5053  <?dbhtml filename="openjdk.html" ?>
    5154
    … …  
    7578    programs.</para>
    7679
    77     &lfs76_checked;
     80    &lfs75_checked;
    7881
    7982    <note><para>The browser plugin and webstart implementation have been split
    … …  
    8891    General Public License, version 2, with the Classpath Exception</ulink>
    8992    allows third party programs to use classes provided by free software
    90     without the requirement that the third party software also be free.  As with
     93    without the requirement that the third party software also be free. As with
    9194    the LGPL, any modifications made to the free software portions of a
    9295    third party application, must also be made freely available.</para>
    … …  
    215218    <itemizedlist spacing='compact'>
    216219      <listitem>
    217         <para><ulink
    218         url="&patch-root;/icedtea-&icedtea-version;-add_cacerts-1.patch"/></para>
    219       </listitem>
    220       <listitem>
    221         <para><ulink
    222         url="&patch-root;/icedtea-&icedtea-version;-fixed_paths-1.patch"/></para>
    223       </listitem>
    224       <listitem>
    225         <para><ulink
    226         url="&patch-root;/icedtea-&icedtea-version;-fix_new_giflib-1.patch"/></para>
    227       </listitem>
    228       <listitem>
    229         <para><ulink
    230         url="&patch-root;/icedtea-&icedtea-version;-fix_tests-1.patch"/></para>
     220        <para>
     221          <ulink
     222            url="&patch-root;/icedtea-&icedtea-version;-add_cacerts-1.patch"/>
     223        </para>
     224      </listitem>
     225      <listitem>
     226        <para>
     227          <ulink
     228            url="&patch-root;/icedtea-&icedtea-version;-fixed_paths-1.patch"/>
     229        </para>
     230      </listitem>
     231      <listitem>
     232        <para>
     233          <ulink
     234            url="&patch-root;/icedtea-&icedtea-version;-fix_new_giflib-1.patch"/>
     235        </para>
     236      </listitem>
     237      <listitem>
     238        <para>
     239          <ulink
     240            url="&patch-root;/icedtea-&icedtea-version;-fix_tests-1.patch"/>
     241        </para>
    231242      </listitem>
    232243    </itemizedlist>
    … …  
    241252            <member>Download Size: &rhino-size;</member>
    242253          </simplelist>
     254        </para>
     255      </listitem>
     256    </itemizedlist>
     257
     258    <bridgehead renderas="sect4">Optional package (to obtain an icon for the
     259      <filename>openjdk-7-policytool.desktop</filename> file)</bridgehead>
     260    <itemizedlist spacing='compact'>
     261      <listitem>
     262        <para>
     263          <ulink url="&icedtea-web-download;"/>
    243264        </para>
    244265      </listitem>
    … …  
    272293    <bridgehead renderas="sect4">Optional</bridgehead>
    273294    <para role="optional">
    274       <xref linkend="icedtea-web"/> (to obtain icon file for the
    275       <command>policytool</command> menu entry),
    276295      <xref linkend="libxslt"/>,
    277296      <xref linkend="lsb-release"/>,
    … …  
    316335    <application>JDK</application> that have been relicensed under an open
    317336    source license.  If you have already downloaded all of the individual
    318     components, place them into the source tree with the following commands:</para>
     337    components, place them into the source tree with the following
     338    commands:</para>
    319339
    320340<screen><userinput>cp -v ../corba.tar.bz2     . &amp;&amp;
    … …  
    340360<screen><userinput>patch -Np1 -i ../icedtea-&icedtea-version;-fix_new_giflib-1.patch</userinput></screen>
    341361
    342     <para>Apply a patch to exclude known broken tests from the test suite:</para>
     362    <para>Apply a patch to exclude known broken tests from the test
     363    suite:</para>
    343364
    344365<screen><userinput>patch -Np1 -i ../icedtea-&icedtea-version;-fix_tests-1.patch</userinput></screen>
    345366
     367    <note>
     368      <para>
     369         Before proceeding, you should ensure that your environment is
     370         properly set for building <application>OpenJDK</application>. First,
     371         review the content of the <envar>ANT_HOME</envar> variable.
     372         Second, the <envar>PATH</envar> variable should contain the paths to
     373         the <command>java</command> and <command>ant</command> executables.
     374         Last, the <envar>CLASSPATH</envar> variable should be set as
     375         explained on the <xref linkend="java"/> and <xref linkend="junit"/>
     376         pages.
     377       </para>
     378    </note>
    346379    <para>Configure and build the package with the following commands
    347380    (--with-pkgversion and --with-version-suffix values can be modified to fit
    … …  
    392425chown -R root:root /opt/OpenJDK-&openjdk-version;</userinput></screen>
    393426
    394     <para>If desired, you may install a <filename class="extension">.desktop</filename>
    395     file so <command>policytool</command> can be accessed from a desktop menu. First,
    396     you need to obtain an icon from the <xref linkend="icedtea-web"/>
    397     tarball:</para>
    398 
    399 <screen role="root"><userinput>tar -xf icedtea-web-&icedtea-web-version;.tar.gz     \
     427    <para>If desired, you may install a .desktop file corresponding to an entry
     428    in a desktop menu for <command>policytool</command>. First, you need to
     429    obtain an icon from <xref linkend="icedtea-web"/>:</para>
     430
     431<screen><userinput>tar -xf ../icedtea-web-&icedtea-web-version;.tar.gz  \
    400432        icedtea-web-&icedtea-web-version;/javaws.png \
    401433        --strip-components=1</userinput></screen>
    … …  
    403435    <para>Now, as <systemitem class="username">root</systemitem> user:</para>
    404436
    405 <screen role="root"><userinput>cat ;&gt; /usr/share/applications/openjdk-7-policytool.desktop &lt;&lt; "EOF" &amp;&amp;
     437<screen role="root"><userinput>mkdir -pv /usr/share/applications &amp;&amp;
     438
     439cat &gt; /usr/share/applications/openjdk-7-policytool.desktop &lt;&lt; "EOF" &amp;&amp;
    406440<literal>[Desktop Entry]
    407441Name=OpenJDK Java 7 Policy Tool
    … …  
    416450EOF
    417451
    418 install -v -Dm644 javaws.png /usr/share/pixmaps/javaws.png</userinput></screen>
    419 
    420     <para>The choice of pt_BR is just an example. You can delete those lines
    421     or replace them by corresponding ones in your locale, e.g. fr_FR, with the
    422     "Name[fr_FR]" and "Comment[fr_FR]" values given by your translations.</para>
     452install -v -Dm0644 javaws.png /usr/share/pixmaps/javaws.png</userinput></screen>
     453
     454    <para>The choice of pt_BR is just an example. You can add any translation
     455    by adding lines corresponding to your locale, e.g. for fr_FR,
     456    <quote>Name[fr_FR]=</quote> and <quote>Comment[fr_FR]=</quote> with the
     457    appropriate text as values.</para>
    423458
    424459  </sect2>
    … …  
    443478    security provider.</para>
    444479
    445     <para><parameter>--disable-system-kerberos</parameter>: Remove this switch
     480    <para><parameter>--disable-system-kerberos</parameter>: Remove this switch,
    446481    if <xref linkend="mitkrb"/> is installed.</para>
    447482
    … …  
    464499  </sect2>
    465500
    466   <sect2 role="configuration" id="openjdk-config" xreflabel="Configuring OpenJDK" >
     501  <sect2 role="configuration"
     502         id="openjdk-config"
     503         xreflabel="Configuring OpenJDK">
    467504    <title>Configuring OpenJDK</title>
    468505
    … …  
    476513      the <systemitem class="username">root</systemitem> user:</para>
    477514
    478 <screen role="root"><userinput>ln -sfv OpenJDK-&openjdk-version;-bin /opt/jdk</userinput></screen>
     515<screen role="root"><userinput>ln -v -nsf OpenJDK-&openjdk-version;-bin /opt/jdk</userinput></screen>
    479516
    480517      <para>The information below assumes your system is set up using the
    … …  
    489526      user:</para>
    490527
    491 <screen role="root"><userinput>cat &gt;&gt; /etc/profile.d/openjdk.sh &lt;&lt; "EOF"
     528<screen role="root"><userinput>cat &gt; /etc/profile.d/openjdk.sh &lt;&lt; "EOF"
    492529<literal># Begin /etc/profile.d/openjdk.sh
    493530
    … …  
    495532JAVA_HOME=/opt/jdk
    496533
     534# Set ANT_HOME directory
     535ANT_HOME=/opt/ant
     536
    497537# Adjust PATH
    498538pathappend $JAVA_HOME/bin PATH
     539pathappend $ANT_HOME/bin PATH
    499540
    500541pathappend $JAVA_HOME/include       C_INCLUDE_PATH
    … …  
    545586mandb -c /opt/jdk/man</userinput></screen>
    546587
    547     <para>To test the man pages are correctly installed, issue <command>source /etc/profile</command> and <command>man java</command> to display the respective man page.</para>
     588    <para>To test if the man pages are correctly installed, issue
     589    <command>source /etc/profile</command> and <command>man java</command> to
     590    display the respective man page.</para>
    548591
    549592    </sect3>
    550593
    551594    <sect3 id='ojdk-certs'>
    552       <title>Install or update the JRE Certificate Authority Certificates (cacerts) file</title>
     595      <title>Install or update the JRE Certificate Authority Certificates
     596      (cacerts) file</title>
    553597
    554598      <para>Use the following procedure to check if the
    … …  
    661705        echo "`basename ${0}` creates a valid cacerts file for use with IcedTea."
    662706        echo ""
    663         echo "        -f  --cafile        The path to a file containing PEM formated CA"
    664         echo "                            certificates.  May not be used with -d/--cadir."
    665         echo "        -d  --cadir         The path to a diectory of PEM formatted CA"
    666         echo "                            certificates.  May not be used with -f/--cafile."
    667         echo "        -o  --outfile       The path to the output file."
     707        echo "        -f  --cafile     The path to a file containing PEM"
     708        echo "                         formated CA certificates. May not be"
     709        echo "                         used with -d/--cadir."
    668710        echo ""
    669         echo "        -k  --keytool       The path to the java keytool utility."
     711        echo "        -d  --cadir      The path to a directory of PEM formatted"
     712        echo "                         CA certificates. May not be used with"
     713        echo "                         -f/--cafile."
    670714        echo ""
    671         echo "        -s  --openssl       The path to the openssl utility."
     715        echo "        -o  --outfile    The path to the output file."
    672716        echo ""
    673         echo "        -h  --help          Show this help message and exit."
     717        echo "        -k  --keytool    The path to the java keytool utility."
     718        echo ""
     719        echo "        -s  --openssl    The path to the openssl utility."
     720        echo ""
     721        echo "        -h  --help       Show this help message and exit."
    674722        echo ""
    675723        echo ""
    … …  
    769817    certend=`grep -n "^-----END" "${cert}" | cut -d ":" -f 1`
    770818    sed -n "${certbegin},${certend}p" "${cert}" > "${tempfile}"
    771     echo yes | env LC_ALL=C "${KEYTOOL}" -import -alias `basename "${cert}"` -keystore \
    772                    "${OUTFILE}" -storepass 'changeit' -file "${tempfile}"
     819    echo yes | env LC_ALL=C "${KEYTOOL}" -import                     \
     820                                         -alias `basename "${cert}"` \
     821                                         -keystore "${OUTFILE}"      \
     822                                         -storepass 'changeit'       \
     823                                         -file "${tempfile}"
    773824    rm "${tempfile}"
    774825done
    … …  
    795846    <systemitem class="username">root</systemitem> user:</para>
    796847
    797 <screen role="root"><userinput>/opt/jdk/bin/mkcacerts -d "/etc/ssl/certs/"  -k "/opt/jdk/bin/keytool" \
    798                        -s "/usr/bin/openssl" -o "/opt/jdk/jre/lib/security/cacerts"</userinput></screen>
     848<screen role="root"><userinput>/opt/jdk/bin/mkcacerts            \
     849        -d "/etc/ssl/certs/"      \
     850        -k "/opt/jdk/bin/keytool" \
     851        -s "/usr/bin/openssl"     \
     852        -o "/opt/jdk/jre/lib/security/cacerts"</userinput></screen>
    799853
    800854    </sect3>
    … …  
    814868        jarsigner, java, javac, javadoc, javah, javap, java-rmi.cgi,
    815869        jcmd, jconsole, jdb, jhat, jinfo, jmap, jps,
    816         jrunscript, jsadebugd, jstack, jstat, jstatd, keytool,
     870        jrunscript, jsadebugd, jstack, jstat, jstatd, keytool, mkcacerts,
    817871        native2ascii, orbd, pack200, policytool, rmic, rmid, rmiregistry,
    818872        schemagen, serialver, servertool, tnameserv, unpack200,
    … …  
    10981152      </varlistentry>
    10991153
     1154      <varlistentry id="mkcacerts">
     1155        <term><command>mkcacerts</command></term>
     1156        <listitem>
     1157          <para> is a simple script to extract x509 certificates and create
     1158          a JRE cacerts file using <command>keytool</command>.</para>
     1159          <indexterm zone="openjdk mkcacerts">
     1160            <primary sortas="b-mkcacerts">mkcacerts</primary>
     1161          </indexterm>
     1162        </listitem>
     1163      </varlistentry>
     1164
    11001165      <varlistentry id="native2ascii">
    11011166        <term><command>native2ascii</command></term>
Note: See TracChangeset for help on using the changeset viewer.