r98 - in trunk: . packages/Xorg packages/firefox

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Sun Apr 17 16:39:05 PDT 2005


Author: jhuntwork
Date: 2005-04-17 17:39:04 -0600 (Sun, 17 Apr 2005)
New Revision: 98

Added:
   trunk/packages/firefox/firstrun
Modified:
   trunk/Makefile
   trunk/packages/Xorg/Makefile
   trunk/packages/firefox/Makefile
Log:
Added method to run firefox once after install

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2005-04-17 22:15:50 UTC (rev 97)
+++ trunk/Makefile	2005-04-17 23:39:04 UTC (rev 98)
@@ -158,6 +158,7 @@
 	@-mount -f -t ramfs ramfs $(MP)/dev
 	@-mount -f -t tmpfs tmpfs $(MP)/dev/shm
 	@-mount -f -t devpts -o gid=4,mode=620 devpts $(MP)/dev/pts
+	@if [ ! -f $(MP)/etc/X11/xorg.conf ] ; then if [ -f /etc/X11/xorg.conf ] ; then cp /etc/X11/xorg.conf $(PKG)/Xorg ; fi ; fi
 
 pre-bash: createdirs createfiles popdev ch-linux-libc-headers ch-man-pages ch-glibc ch-re-adjust-toolchain \
 	ch-binutils ch-gcc ch-coreutils ch-zlib ch-mktemp ch-iana-etc ch-findutils ch-gawk ch-ncurses \
@@ -1331,6 +1332,7 @@
 	@install -m755 scripts/{net-setup,greeting,ll} $(MP)/usr/bin/
 	@-mv $(MP)/bin/uname.real $(MP)/bin/uname
 	@-mkdir $(MP)/iso
+	@-rm /etc/X11/xorg.conf
 	@for i in bin boot etc lib sbin sources ; do cp -ra $(MP)/$$i $(MP)/iso ; done && \
 	 cd $(MP) && tar cjvf etc.tar.bz2 etc && cp etc.tar.bz2 iso/ && \
 	 if [ -f root/.bash_history ] ; then rm root/.bash_history ; fi && \

Modified: trunk/packages/Xorg/Makefile
===================================================================
--- trunk/packages/Xorg/Makefile	2005-04-17 22:15:50 UTC (rev 97)
+++ trunk/packages/Xorg/Makefile	2005-04-17 23:39:04 UTC (rev 98)
@@ -43,6 +43,7 @@
 	@echo "/tmp/.ICE-unix dir 1777 root root" >> /etc/sysconfig/createfiles
 	@cp $(ROOT)/etc/fonts/local.conf /etc/fonts/local.conf && \
 	 fc-cache
+	@if [ -f xorg.conf ] ; then mv xorg.conf /etc/X11/xorg.conf ; fi
 	@make clean
 
 clean:

Modified: trunk/packages/firefox/Makefile
===================================================================
--- trunk/packages/firefox/Makefile	2005-04-17 22:15:50 UTC (rev 97)
+++ trunk/packages/firefox/Makefile	2005-04-17 23:39:04 UTC (rev 98)
@@ -2,7 +2,7 @@
 
 # Package versions
 NM= firefox
-VRS= 1.0.2
+VRS= 1.0.3
 DIR= mozilla
 FILE= $(NM)-$(VRS)-source.tar.bz2
 URL= http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$(VRS)/source/$(FILE)
@@ -32,9 +32,10 @@
 	 --disable-ldap --disable-composer --disable-profilesharing && \
 	 make -j3 && make install && \
 	 install -d /usr/include/firefox-$(VRS)/nss && \
-	 cp -Lf dist/private/nss/*.h dist/public/nss/*.h /usr/include/firefox-$(VRS)/nss ; fi
-	@cp -ra $(ROOT)/root/.firefox /root
-	@cp -ra $(ROOT)/root/.mozilla /root
+	 cp -Lf dist/private/nss/*.h dist/public/nss/*.h /usr/include/firefox-$(VRS)/nss && \
+	 cd $(ROOT)/$(PKG)/$(NM) && ./firstrun ; fi
+	#@cp -ra $(ROOT)/root/.firefox /root
+	#@cp -ra $(ROOT)/root/.mozilla /root
 	@make clean
 
 clean:

Added: trunk/packages/firefox/firstrun
===================================================================
--- trunk/packages/firefox/firstrun	2005-04-17 22:15:50 UTC (rev 97)
+++ trunk/packages/firefox/firstrun	2005-04-17 23:39:04 UTC (rev 98)
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+if [ ! -f /etc/X11/xorg.conf ]
+then
+	Xorg -configure &&
+	sed -i 's@/dev/mouse@/dev/input/mice@' ~/xorg.conf.new &&
+	mv ~/xorg.conf.new /etc/X11/xorg.conf
+fi
+
+Xorg :3 &
+firefox --display=:3
+sleep 300
+PID=`pidof Xorg`
+kill $PID


Property changes on: trunk/packages/firefox/firstrun
___________________________________________________________________
Name: svn:executable
   + *




More information about the livecd mailing list