Changeset 1766

Show
Ignore:
Timestamp:
12/06/06 08:30:07 (2 years ago)
Author:
alexander
Message:

Updated bootscripts and the book. Adapted xorg to new autotools.

Location:
trunk
Files:
6 modified
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/Makefile

    r1764 r1766  
    251251        ch-screen ch-pkgconfig ch-libidn ch-libgpg-error ch-libgcrypt \ 
    252252        ch-gnutls ch-curl ch-zip ch-unzip ch-lynx ch-libxml2 ch-expat \ 
    253         ch-subversion stop-here ch-lfs-bootscripts ch-livecd-bootscripts ch-docbook-xml ch-libxslt \ 
     253        ch-subversion ch-lfs-bootscripts ch-livecd-bootscripts ch-docbook-xml ch-libxslt \ 
    254254        ch-docbook-xsl ch-html_tidy ch-LFS-BOOK ch-libpng \ 
    255255        ch-freetype ch-fontconfig \ 
    … …  
    269269        ch-dhcpcd ch-distcc ch-ppp ch-rp-pppoe ch-libaal ch-reiser4progs \ 
    270270        ch-cpio ch-mutt ch-msmtp ch-tin ch-mdadm ch-which ch-BRLTTY \ 
    271         ch-strace ch-iptables ch-eject ch-xlockmore ch-hdparm ch-linux \ 
     271        ch-strace ch-iptables ch-eject ch-xlockmore ch-hdparm stop-here ch-linux \ 
    272272        ch-sysfsutils ch-pcmcia-cs ch-pcmciautils ch-ddccontrol ch-ddccontrol-db \ 
    273273        ch-initramfs ch-blfs-bootscripts ch-oui-data \ 

  • trunk/etc/profile

    r1687 r1766  
    77XML_CATALOG_FILES="/usr/share/docbook/xsl-stylesheets-1.69.1/catalog.xml /etc/xml/catalog" 
    88 
    9 WWW_HOME="/usr/share/LFS-BOOK-6.2-HTML/index.html" 
     9WWW_HOME="/usr/share/LFS-BOOK-SVN-HTML/index.html" 
    1010 
    1111NNTPSERVER=news.gmane.org 

  • trunk/packages/LFS-BOOK/Makefile

    r1691 r1766  
    22 
    33NM= LFS-BOOK 
    4 VRS= 6.2 
     4VRS= SVN 
    55DIRBASE= $(NM)-$(VRS) 
    66DIR= $(DIRBASE)-XML 
    77HTMLDIR= $(DIRBASE)-HTML 
    88 
    9 FILE= $(DIR).tar.bz2 
    10 URL-$(FILE)= http://www.linuxfromscratch.org/lfs/downloads/6.2/$(FILE) 
    11 SHA-$(FILE)= 729bcf04d8e4ed0af3c58daf0d289e94d6385052 
     9#FILE= $(DIR).tar.bz2 
     10#URL-$(FILE)= http://www.linuxfromscratch.org/lfs/downloads/6.2/$(FILE) 
     11#SHA-$(FILE)= 729bcf04d8e4ed0af3c58daf0d289e94d6385052 
    1212 
    13 #REV= 7646 
    14 #REVPARM= -r $(REV) 
    15 # 
    16 #URL= svn://svn.linuxfromscratch.org/LFS/trunk/BOOK 
     13REV= 7882 
     14REVPARM= -r $(REV) 
     15 
     16URL= svn://svn.linuxfromscratch.org/LFS/trunk/BOOK 
    1717 
    1818SEAMONKEY_CONFIG= $(ROOT)/root/.mozilla/default/79exklwh.slt/prefs.js 
    … …  
    2828stage2: Makefile $(FILE) 
    2929        @$(call echo_message, Building) 
    30         #@svn co -q $(REVPARM) $(URL) $(DIR)-XML 
    31         tar xf $(FILE) 
     30        @svn co -q $(REVPARM) $(URL) $(DIR) 
     31        #tar xf $(FILE) 
    3232        @cd $(DIR) ; make BASEDIR=../$(HTMLDIR) 
    3333        cp -av $(DIR) $(HTMLDIR) /usr/share 

  • trunk/packages/lfs-bootscripts/Makefile

    r1745 r1766  
    22 
    33NM= lfs-bootscripts 
    4 VRS= 6.2 
     4VRS= 20060712 
    55DIR= $(NM)-$(VRS) 
    66 
    77FILE= $(DIR).tar.bz2 
    8 URL-$(FILE)= http://www.linuxfromscratch.org/lfs/downloads/6.2/$(FILE) 
    9 SHA-$(FILE)= 616ece5d67a79169e62547141f481ea5150e348c 
     8URL-$(FILE)= $(HTTP)/$(NM)/$(FILE) 
     9SHA-$(FILE)= cd3dec92a837f5e6520c91b3d53773bbd37026d0 
    1010 
    1111PATCH1= $(DIR)-livecd-1.patch 

  • trunk/packages/xorg-server/Makefile

    r1735 r1766  
    3636        patch -Np1 -i ../$(PATCH1) 
    3737        patch -Np1 -i ../$(PATCH2) 
    38         automake 
     38        autoreconf --force --install --verbose 
    3939        ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ 
    4040            --with-mesa-source=`pwd`/$(DIR1) --with-default-font-path=built-ins 

  • trunk/root/.mozilla/default/79exklwh.slt/prefs.js

    r1733 r1766  
    1212user_pref("browser.preferences.lastpanel", 0); 
    1313user_pref("browser.search.defaultengine", "engine:///usr/lib/seamonkey-1.0.5/searchplugins/google.src"); 
    14 user_pref("browser.startup.homepage", "file:///usr/share/LFS-BOOK-6.2-HTML/index.html"); 
     14user_pref("browser.startup.homepage", "file:///usr/share/LFS-BOOK-SVN-HTML/index.html"); 
    1515user_pref("browser.startup.homepage_override.mstone", "rv:1.8.0.7"); 
    1616user_pref("dom.disable_open_during_load", true);