cvs commit: ALFS/profiles/BLFS/chapter25 xorg.xml

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Fri May 21 14:29:54 PDT 2004


thomasp     04/05/21 15:29:54

  Modified:    profiles/BLFS/chapter22 rsync.xml
  Added:       profiles/BLFS/chapter25 xorg.xml
  Log:
  fixed error in rsync, added missing X.org file (Oops)
  
  Revision  Changes    Path
  1.2       +1 -1      ALFS/profiles/BLFS/chapter22/rsync.xml
  
  Index: rsync.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter22/rsync.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- rsync.xml	19 May 2004 15:42:43 -0000	1.1
  +++ rsync.xml	21 May 2004 21:29:54 -0000	1.2
  @@ -39,7 +39,7 @@
   		</make>
   		
   		<textdump base="/etc">
  -        		<file>/etc/rsync.conf</file>
  +        		<file>/etc/rsyncd.conf</file>
   			<content>
   			=# This is a basic rsync configuration file
   			=# It exports a single module without user authentification.
  
  
  
  1.1                  ALFS/profiles/BLFS/chapter25/xorg.xml
  
  Index: xorg.xml
  ===================================================================
  <package name="xorg" version="&xorg-version;">
  	<stage name="Unpacking.">
  		<unpack>
  			<archive>&packages_dir;/&xorg-package1;</archive>
  			<destination>&build_dir;</destination>
  		</unpack>
  		<unpack>
                          <archive>&packages_dir;/&xorg-package2;</archive>
                          <destination>&build_dir;</destination>
                  </unpack>
  		<unpack>
                          <archive>&packages_dir;/&xorg-package3;</archive>
                          <destination>&build_dir;</destination>
                  </unpack>
  		<unpack>
                          <archive>&packages_dir;/&xorg-package4;</archive>
                          <destination>&build_dir;</destination>
                  </unpack>
  		<unpack>
                          <archive>&packages_dir;/&xorg-package5;</archive>
                          <destination>&build_dir;</destination>
                  </unpack>
  		<unpack>
                          <archive>&packages_dir;/&xorg-package6;</archive>
                          <destination>&build_dir;</destination>
                  </unpack>
  		<unpack>
                          <archive>&packages_dir;/&xorg-package7;</archive>
                          <destination>&build_dir;</destination>
                  </unpack>
  	</stage>
  
  	<stage name="Installing lndir.">
  		<stageinfo>
  			<base>&build_dir;/&xorg-directory;/config/util</base>
  		</stageinfo>
  
  		<make>
  			<param>-f Makefile.ini</param>
  			<param>lndir</param>
  		</make>
  
  		<copy>
  			<source>lndir</source>
  			<destination>/usr/bin</destination>
  		</copy>
  	</stage>
  
  	<stage name="Creating Build Directory.">
  		<stageinfo>
  			<base>&build_dir;/&xorg-directory;</base>
  		</stageinfo>
  
  		<mkdir>
  			<name>../xcbuild</name>
  		</mkdir>
  	</stage>
  
  	<stage name="Populating build directory.">
  		<stageinfo>
  			<base>&build_dir;/xcbuild</base>
  		</stageinfo>
  
  		<execute command="lndir">
  			<param>../xc</param>
  		</execute>
  	</stage>
  
  	<stage name="Creating Configuration File.">
  		<stageinfo>
                          <base>&build_dir;/xcbuild</base>
                  </stageinfo>
  
  		<textdump base="&build_dir;/xcbuild/config/cf">
  			<file>host.def</file>
  			<content>
  			=/* Begin Xorg host.def file */
  			=		
  			=/* System Related Information.  If you read and configure only one
  			= * section then it should be this one.  The Intel architecture defaults are
  			= * set for a i686 and higher.  Axp is for the Alpha architecture and Ppc is
  			= * for the Power PC.  AMD64 is for the Opteron processor. Note that there have 
  			= * been reports that the Ppc optimization line causes segmentation faults during 
  			= * build.  If that happens, try building without the DefaultGcc2PpcOpt line.  ***********/
  			= 
  			=/* #define DefaultGcc2i386Opt -O2 -fno-strength-reduce -fno-strict-aliasing -march=i686 */
  			=/* #define DefaultGccAMD64Opt -O2 -fno-strength-reduce -fno-strict-aliasing */
  			=/* #define DefaultGcc2AxpOpt  -O2 -mcpu=ev6 */
  			=/* #define DefaultGcc2PpcOpt  -O2 -mcpu=750 */
  			=
  			=#define HasFreetype2             YES
  			=#define HasFontconfig            YES
  			=#define HasExpat                 YES
  			=#define HasLibpng                YES
  			=#define HasZlib                  YES
  			=
  			=/*
  			= * Which drivers to build.  When building a static server, each of these
  			= * will be included in it.  When building the loadable server each of these
  			= * modules will be built.
  			= *
  			=#define XF86CardDrivers         mga glint nv tga s3virge sis rendition \
  			=                                neomagic i740 tdfx savage \
  			=                                cirrus vmware tseng trident chips apm \
  			=                                GlideDriver fbdev i128 \
  			=                                ati AgpGartDrivers DevelDrivers ark cyrix \
  			=                                siliconmotion \
  			=                                vesa vga XF86OSCardDrivers XF86ExtraCardDrivers
  			=*/
  			=
  			=/*
  			= * Select the XInput devices you want by uncommenting this.
  			= *
  			=#define XInputDrivers           mouse keyboard acecad calcomp citron \
  			=                                digitaledge dmc dynapro elographics \
  			=                                microtouch mutouch penmount spaceorb summa \
  			=                                wacom void magictouch aiptek
  			= */
  			=
  			=/* Most installs will only need this */
  			=
  			=#define XInputDrivers           mouse keyboard
  			=
  			=
  			=/* End Xorg host.def file */
  			</content>
  		</textdump>
  	</stage>
  
  	<stage name="Installing Xorg.">
  		<stageinfo>
  			<base>&build_dir;/xcbuild</base>
  		</stageinfo>
  
  		<make>
  			<param>World</param>
  		</make>
  
  		<make>
  			<param>install</param>
  		</make>
  
  		<make>
  			<param>install.man</param>
  		</make>
  
  		<link>
  			<option>force</option>
  			<target>../X11R6/bin</target>
  			<name>/usr/bin/X11</name>
  		</link>
  
  		<link>
  			<option>force</option>
  			<target>../X11R6/lib/X11</target>
  			<name>/usr/lib/X11</name>
  		</link>
  
  		<link>
  			<option>force</option>
  			<target>../X11R6/include/X11</target>
  			<name>/usr/include/X11</name>
  		</link>
  
  		<textdump mode="append" base="/etc">
  			<file>ld.so.conf</file>
  			<content>
  				=/usr/X11R6/lib
  			</content>
  		</textdump>
  
  		<execute command="ldconfig" />
  
  		<textdump mode="append" base="/etc/sysconfig">
  			<file>createfiles</file>
  			<content>
  				=/tmp/.ICE-unix dir 1777 root root
  			</content>
  		</textdump>
  	</stage>
  
  	<stage name="Cleaning up.">
  		<remove>&build_dir;/&xorg-directory;</remove>
  	</stage>
  </package>
  
  
  



More information about the alfs-log mailing list