r299 - in x86/trunk: . doc etc etc/X11 etc/sysconfig packages/Xorg packages/gzip packages/hotplug packages/linux packages/ppp packages/shadow packages/subversion packages/xfce root/.xchat2

justin at linuxfromscratch.org justin at linuxfromscratch.org
Wed Jul 6 12:42:49 PDT 2005


Author: justin
Date: 2005-07-06 13:42:47 -0600 (Wed, 06 Jul 2005)
New Revision: 299

Added:
   x86/trunk/etc/X11/xorg.conf
   x86/trunk/etc/ppp/
   x86/trunk/packages/hotplug/detect-video.hotplug
Modified:
   x86/trunk/TODO
   x86/trunk/doc/README
   x86/trunk/etc/issue
   x86/trunk/etc/sysconfig/mouse
   x86/trunk/packages/Xorg/Makefile
   x86/trunk/packages/gzip/Makefile
   x86/trunk/packages/hotplug/Makefile
   x86/trunk/packages/linux/debian-style-headers.sh
   x86/trunk/packages/ppp/Makefile
   x86/trunk/packages/shadow/Makefile
   x86/trunk/packages/subversion/Makefile
   x86/trunk/packages/xfce/Makefile
   x86/trunk/root/.xchat2/xchat.conf
Log:
Merged r282 - r293 into trunk.  All are small changes to configs, README or Makefiles.

Modified: x86/trunk/TODO
===================================================================
--- x86/trunk/TODO	2005-07-06 19:32:55 UTC (rev 298)
+++ x86/trunk/TODO	2005-07-06 19:42:47 UTC (rev 299)
@@ -8,7 +8,6 @@
 ** Background for xfce
 ** Add some Greek TrueType fonts.
 * Remove Bitstream Vera
-* Find out exact requirements for Intel framebuffer
 * Fonts is xterm *slightly* too big? Any harm in reducing size by a point or two?
 * Get the changes to the bootscripts installation changed upstream so that all we need is a make install-livecd again.
 * Upgrade the scripts to be more fluid, understandable, ie, use of functions (unpack seems to work well, would now like to improve downloading, allow for better use of previously downloaded sources as kept in one local directory and incorporate a logging system) 

Modified: x86/trunk/doc/README
===================================================================
--- x86/trunk/doc/README	2005-07-06 19:32:55 UTC (rev 298)
+++ x86/trunk/doc/README	2005-07-06 19:42:47 UTC (rev 299)
@@ -58,22 +58,23 @@
 
 CONFIGURING X
 ================
-Before you run X for the first time, you must issue this command:
+The Live CD attempts to configure X for your video card automatically. The
+process may fail if you have more than one video card, or if your video card
+doesn't support 24-bit color depth.
 
-Xorg -configure
+You still have to edit /etc/X11/xorg.conf using vim, joe or nano in order to
+configure the keyboard layout and available video modes (otherwise the US
+English keyboard layout and the highest resolution with 60 Hz refresh rate
+will be used). Instructions for doing that are found in the BLFS book, under
+the section Configuring Xorg:
 
-That will produce a file in your home dir called xorg.conf.new.  Edit that
-file using vim, nano or joe according to the instructions found in the BLFS
-book, under the section Configuring Xorg:
-
 http://www.linuxfromscratch.org/blfs/view/svn/x/installing.html#xorg
 
-When you are finished, move xorg.conf.new to /etc/X11/xorg.conf and run
-startx.
+When you are finished, run startx.
 
 NOTE: The default Window Manager is xfce which is intutive and graphically
 pleasing. If you prefer something more minimal, edit the file ~/.xinitrc to
-read 'exec ion'
+read 'exec ion' or 'exec twm'.
 
 CUSTOMIZING THE CD CONTENTS
 ================

Copied: x86/trunk/etc/X11/xorg.conf (from rev 293, x86/branches/6.1/etc/X11/xorg.conf)

Modified: x86/trunk/etc/issue
===================================================================
--- x86/trunk/etc/issue	2005-07-06 19:32:55 UTC (rev 298)
+++ x86/trunk/etc/issue	2005-07-06 19:42:47 UTC (rev 299)
@@ -1,18 +1,18 @@
 
-This is the Official Linux From Scratch LiveCD
-Created by
-Jeremy Huntwork, Project Leader
-Alexander Patrakov, Maintainer, i18n
-
+This is the Official Linux From Scratch LiveCD
+Created by:
+Jeremy Huntwork, Project Leader
+Alexander Patrakov, Maintainer, i18n
+
 Version:
-____________________________________________________________
-
+____________________________________________________________
+
 All the source packages you will need to build an LFS system
-are located in /sources and you can find the book in
-/usr/share/LFS-BOOK-6.1-HTML.
+are located in /sources and you can find the book in
+/usr/share/LFS-BOOK-6.1-HTML.
 
 Support questions concerning this cd should be directed to
-livecd at linuxfromscratch.org
+livecd at linuxfromscratch.org
 
-Type "greeting" at any time to view this message again.
+Type "greeting" at any time to view this message again.
 

Copied: x86/trunk/etc/ppp (from rev 293, x86/branches/6.1/etc/ppp)

Modified: x86/trunk/etc/sysconfig/mouse
===================================================================
--- x86/trunk/etc/sysconfig/mouse	2005-07-06 19:32:55 UTC (rev 298)
+++ x86/trunk/etc/sysconfig/mouse	2005-07-06 19:42:47 UTC (rev 299)
@@ -1,3 +1,3 @@
-MDEVICE="/dev/psaux"
+MDEVICE="/dev/input/mice"
 PROTOCOL="imps2"
 GPMOPTS=""

Modified: x86/trunk/packages/Xorg/Makefile
===================================================================
--- x86/trunk/packages/Xorg/Makefile	2005-07-06 19:32:55 UTC (rev 298)
+++ x86/trunk/packages/Xorg/Makefile	2005-07-06 19:42:47 UTC (rev 299)
@@ -41,6 +41,9 @@
 	 ln -sf ../X11R6/include/X11 /usr/include/X11 && \
 	 /sbin/ldconfig ; fi
 	@echo "/tmp/.ICE-unix dir 1777 root root" >> /etc/sysconfig/createfiles
+	@echo -e "#!/bin/sh\nexec /usr/X11R6/bin/X -nolisten tcp" >/etc/X11/xinit/xserverrc
+	@chmod 755 /etc/X11/xinit/xserverrc
+	@install -m644 $(ROOT)/etc/X11/xorg.conf /etc/X11/xorg.conf
 	@cp $(ROOT)/etc/fonts/local.conf /etc/fonts/local.conf && \
 	 fc-cache
 	@make clean

Modified: x86/trunk/packages/gzip/Makefile
===================================================================
--- x86/trunk/packages/gzip/Makefile	2005-07-06 19:32:55 UTC (rev 298)
+++ x86/trunk/packages/gzip/Makefile	2005-07-06 19:42:47 UTC (rev 299)
@@ -41,9 +41,10 @@
 	 make -j3 && make install && \
 	 mv /usr/bin/gzip /bin && \
 	 rm /usr/bin/{gunzip,zcat} && \
-	 ln -s gzip /bin/gunzip && \
-	 ln -s gzip /bin/zcat && \
-	 ln -s gunzip /bin/uncompress ; fi
+	 ln -sf gzip /bin/gunzip && \
+	 ln -sf gzip /bin/zcat && \
+	 ln -sf gzip /bin/compress && \
+	 ln -sf gunzip /bin/uncompress ; fi
 	@make clean
 	
 clean:

Modified: x86/trunk/packages/hotplug/Makefile
===================================================================
--- x86/trunk/packages/hotplug/Makefile	2005-07-06 19:32:55 UTC (rev 298)
+++ x86/trunk/packages/hotplug/Makefile	2005-07-06 19:42:47 UTC (rev 299)
@@ -31,6 +31,8 @@
 	 touch /var/log/hotplug/events && \
 	 echo eepro100 >>/etc/hotplug/blacklist && \
 	 echo 8139cp >>/etc/hotplug/blacklist && \
+	 mkdir /etc/hotplug.d/pci && \
+	 install -m755 ../detect-video.hotplug /etc/hotplug.d/pci && \
 	 mkdir -p /lib/firmware ; fi
 	@make clean
 	 

Copied: x86/trunk/packages/hotplug/detect-video.hotplug (from rev 293, x86/branches/6.1/packages/hotplug/detect-video.hotplug)

Modified: x86/trunk/packages/linux/debian-style-headers.sh
===================================================================
--- x86/trunk/packages/linux/debian-style-headers.sh	2005-07-06 19:32:55 UTC (rev 298)
+++ x86/trunk/packages/linux/debian-style-headers.sh	2005-07-06 19:42:47 UTC (rev 299)
@@ -7,8 +7,8 @@
 
 rm -rf "$DSTDIR"
 mkdir "$DSTDIR"
-cp -av "$SRCDIR/include" "$SRCDIR/scripts" "$DSTDIR"
-cp -av "$SRCDIR/.config" "$SRCDIR/Makefile" "$SRCDIR/Module.symvers" "$DSTDIR"
+cp -rv "$SRCDIR/include" "$SRCDIR/scripts" "$DSTDIR"
+cp -rv "$SRCDIR/.config" "$SRCDIR/Makefile" "$SRCDIR/Module.symvers" "$DSTDIR"
 ( cd "$SRCDIR" ; find -type d ) | (
 	while read dir ; do
 	    mkdir -p "$DSTDIR/$dir"

Modified: x86/trunk/packages/ppp/Makefile
===================================================================
--- x86/trunk/packages/ppp/Makefile	2005-07-06 19:32:55 UTC (rev 298)
+++ x86/trunk/packages/ppp/Makefile	2005-07-06 19:42:47 UTC (rev 299)
@@ -21,7 +21,9 @@
 	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
 	@if [ ! -f /usr/sbin/pppd ] ; then unpack $(FILE) && cd $(DIR) && \
 	 ./configure --prefix=/usr && \
-	 make -j3 && make install ; fi
+	 make -j3 && make install && \
+	 cp -a $(ROOT)/etc/ppp /etc && \
+	 chown -R 0:0 /etc/ppp ; fi
 	@make clean
 
 clean:

Modified: x86/trunk/packages/shadow/Makefile
===================================================================
--- x86/trunk/packages/shadow/Makefile	2005-07-06 19:32:55 UTC (rev 298)
+++ x86/trunk/packages/shadow/Makefile	2005-07-06 19:42:47 UTC (rev 299)
@@ -40,8 +40,7 @@
 	 rm /lib/libshadow.so && \
 	 ln -sf ../../lib/libshadow.so.0 /usr/lib/libshadow.so && \
 	 mkdir /etc/default && \
-	 pwconv && grpconv && \
-	 echo "root:" | chpasswd ; fi
+	 pwconv && grpconv ; fi
 	@make clean
 	 
 

Modified: x86/trunk/packages/subversion/Makefile
===================================================================
--- x86/trunk/packages/subversion/Makefile	2005-07-06 19:32:55 UTC (rev 298)
+++ x86/trunk/packages/subversion/Makefile	2005-07-06 19:42:47 UTC (rev 299)
@@ -23,7 +23,7 @@
 	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
 	@if [ ! -f /usr/bin/svn ] ; then unpack $(FILE) && cd $(DIR) && \
 	 ./configure --prefix=/usr && \
-	 make -j3 && make install ; fi
+	 make -j3 && make install && chown -R 0:0 /usr/include/apr-0 ; fi
 	@make clean
 
 clean:

Modified: x86/trunk/packages/xfce/Makefile
===================================================================
--- x86/trunk/packages/xfce/Makefile	2005-07-06 19:32:55 UTC (rev 298)
+++ x86/trunk/packages/xfce/Makefile	2005-07-06 19:42:47 UTC (rev 299)
@@ -29,6 +29,7 @@
 	-sed -i -e 's/Mozilla/Firefox/' /etc/xdg/xfce4/desktop/menu.xml*
 	-rm -f `grep -L 'include type="system"' /etc/xdg/xfce4/desktop/menu.xml*`
 	-for f in /etc/xdg/xfce4/panel/contents.xml* ; do ./cleanup-panel.pl $$f ; done
+	-sed -i -e '/Xft.dpi/d' /etc/xdg/xfce4/xinitrc
 	@make clean
 
 clean:

Modified: x86/trunk/root/.xchat2/xchat.conf
===================================================================
--- x86/trunk/root/.xchat2/xchat.conf	2005-07-06 19:32:55 UTC (rev 298)
+++ x86/trunk/root/.xchat2/xchat.conf	2005-07-06 19:42:47 UTC (rev 299)
@@ -7,7 +7,7 @@
 away_show_once = 1
 away_size_max = 300
 away_timeout = 60
-away_track = 1
+away_track = 0
 completion_amount = 5
 completion_auto = 0
 completion_suffix = ,




More information about the livecd mailing list