Changeset aebc72fa for x


Ignore:
Timestamp:
04/16/2006 04:04:51 AM (18 years ago)
Author:
DJ Lucas <dj@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 6.2, 6.2.0, 6.2.0-rc1, 6.2.0-rc2, 6.3, 6.3-rc1, 6.3-rc2, 6.3-rc3, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal
Children:
51ee35b
Parents:
92896f88
Message:

added dir creation to xorg and xfre86 and made lnx_agp.c sed optional for xorg

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@5868 af4574ff-66df-0310-9fd7-8a98e5e911e0

Location:
x/installing
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • x/installing/xfree86.xml

    r92896f88 raebc72fa  
    395395      user:</para>
    396396
    397 <screen role="root"><userinput>ln -svn /usr/X11R6/lib/X11/fonts/OTF /usr/share/fonts/X11-OTF &amp;&amp;
     397<screen role="root"><userinput>install -d -m755 /usr/share/fonts &amp;&amp;
     398ln -svn /usr/X11R6/lib/X11/fonts/OTF /usr/share/fonts/X11-OTF &amp;&amp;
    398399ln -svn /usr/X11R6/lib/X11/fonts/TTF /usr/share/fonts/X11-TTF</userinput></screen>
    399400

  • x/installing/xorg.xml

    r92896f88 raebc72fa  
    201201      <para>The <application>Xorg</application> sources must be patched in
    202202      order to avoid a race condition with the <application>luit</application>
    203       program.  Additionally, recent <application>glibc</application> requires
    204       <filename>linux/types.h</filename> to be included prior to
    205       <filename>asm/types.h</filename>.  Finally, the server portion of
     203      program.  Additionally, the server portion of
    206204      <application>Xorg</application> contains a <ulink
    207205      url="http://wiki.x.org/wiki/SecurityPage">security vulnerability</ulink>.
    … …  
    209207
    210208<screen><userinput>patch -Np1 -i ../xorg-&xorg-version;-luit_race-1.patch &amp;&amp;
    211 sed -i '/CONFIG_H/i #include &lt;linux/types.h&gt;' \
    212     programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c &amp;&amp;
    213209sed -i 's/geteuid /geteuid() /' \
    214210    programs/Xserver/hw/xfree86/common/xf86Init.c</userinput></screen>
     211
     212
     213<!-- To be removed if/when proposed glibc patch is added to LFS SVN
     214     Leave in in for a couple of weeks with 'you may need' and a testcase
     215     around it to save the support list silly questions.  Should remove in
     216     a couple of weeks -->
     217      <para>Recent glibc may have a problem with it's installed sys/kd.h file.
     218      This has recently been fixed in LFS svn.  Execute the
     219      following commands to work around a broken kd.h file.  The commands will
     220      only make the modification if needed:</para>
     221
     222<screen><userinput>grep "__undef_LINUX" \
     223    /usr/include/sys/kd.h 2&gt;&amp;1 &gt; /dev/null || \
     224    sed -i.bak '/CONFIG_H/i #include &lt;linux/types.h&gt;' \
     225    programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c</userinput></screen>
     226<!-- End remove -->
     227
     228
    215229
    216230      <para>Additionally, if you choose to install
    … …  
    389403      user:</para>
    390404
    391 <screen role="root"><userinput>ln -svn /usr/X11R6/lib/X11/fonts/OTF /usr/share/fonts/X11-OTF &amp;&amp;
     405<screen role="root"><userinput>install -d -m755 /usr/share/fonts &amp;&amp;
     406ln -svn /usr/X11R6/lib/X11/fonts/OTF /usr/share/fonts/X11-OTF &amp;&amp;
    392407ln -svn /usr/X11R6/lib/X11/fonts/TTF /usr/share/fonts/X11-TTF</userinput></screen>
    393408

  • x/installing/xorg7.xml

    r92896f88 raebc72fa  
    491491      <systemitem class="username">root</systemitem> user:</para>
    492492
    493 <screen><userinput role="root">ln -svn $XORG_PREFIX/lib/X11/fonts/OTF /usr/share/fonts/X11-OTF &amp;&amp;
     493<screen><userinput role="root">install -d -m755 /usr/share/fonts &amp;&amp;
     494ln -svn $XORG_PREFIX/lib/X11/fonts/OTF /usr/share/fonts/X11-OTF &amp;&amp;
    494495ln -svn $XORG_PREFIX/lib/X11/fonts/TTF /usr/share/fonts/X11-TTF</userinput></screen>
    495496
    … …  
    525526      </note>
    526527
    527 <!-- To be removed if/when proposed glibc patch is added to LFS SVN-->
    528       <para>Execute the following sed command to work around a broken
    529       <application>glibc</application> header file:</para>
    530 
    531 <screen><userinput>sed -i.bak '/CONFIG_H/i #include &lt;linux/types.h&gt;' \
     528<!-- To be removed if/when proposed glibc patch is added to LFS SVN
     529     Leave in in for a couple of weeks with 'you may need' and a testcase
     530     around it to save the support list silly questions.  Should remove in
     531     a couple of weeks -->
     532      <para>Recent glibc may have a problem with it's installed sys/kd.h file. 
     533      This has recently been fixed in LFS svn.  Execute the
     534      following commands to work around a broken kd.h file.  The commands will
     535      only make the modification if needed:</para>
     536
     537<screen><userinput>grep "__undef_LINUX" \
     538    /usr/include/sys/kd.h 2&gt;&amp;1 &gt; /dev/null || \
     539    sed -i.bak '/CONFIG_H/i #include &lt;linux/types.h&gt;' \
    532540        hw/xfree86/os-support/linux/lnx_agp.c</userinput></screen>
    533541<!-- End remove -->
Note: See TracChangeset for help on using the changeset viewer.