[or-cvs] r13555: Added RTC drivers. Hopefully this will fix the HPET related (in incognito/trunk: . arch/x86 portage.config)

Mon Feb 18 12:54:48 UTC 2008

Author: anonym
Date: 2008-02-18 07:54:48 -0500 (Mon, 18 Feb 2008)
New Revision: 13555

Modified:
   incognito/trunk/arch/x86/kernel-2.6.23.config
   incognito/trunk/arch/x86/livecd-stage1.spec
   incognito/trunk/building.html
   incognito/trunk/portage.config/package.use
Log:
Added RTC drivers. Hopefully this will fix the HPET related freeze during boot when running under vmware.
Updated build instructions.
Made gadu USE-flag global.


Modified: incognito/trunk/arch/x86/kernel-2.6.23.config
===================================================================

--- incognito/trunk/arch/x86/kernel-2.6.23.config	2008-02-18 11:05:19 UTC (rev 13554)
+++ incognito/trunk/arch/x86/kernel-2.6.23.config	2008-02-18 12:54:48 UTC (rev 13555)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.23-gentoo-r3
-# Fri Jan 11 05:56:02 2008
+# Tue Feb 12 13:40:11 2008
 #
 CONFIG_X86_32=y
 CONFIG_GENERIC_TIME=y
@@ -1979,7 +1979,7 @@
 CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_DEV=y
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+CONFIG_RTC_INTF_DEV_UIE_EMUL=y
 # CONFIG_RTC_DRV_TEST is not set
 
 #
@@ -1989,13 +1989,13 @@
 #
 # Platform RTC drivers
 #
-# CONFIG_RTC_DRV_CMOS is not set
-# CONFIG_RTC_DRV_DS1553 is not set
-# CONFIG_RTC_DRV_STK17TA8 is not set
-# CONFIG_RTC_DRV_DS1742 is not set
+CONFIG_RTC_DRV_CMOS=m
+CONFIG_RTC_DRV_DS1553=m
+CONFIG_RTC_DRV_STK17TA8=m
+CONFIG_RTC_DRV_DS1742=m
 CONFIG_RTC_DRV_M48T86=m
-# CONFIG_RTC_DRV_M48T59 is not set
-# CONFIG_RTC_DRV_V3020 is not set
+CONFIG_RTC_DRV_M48T59=m
+CONFIG_RTC_DRV_V3020=m
 
 #
 # on-CPU RTC drivers

Modified: incognito/trunk/arch/x86/livecd-stage1.spec
===================================================================
--- incognito/trunk/arch/x86/livecd-stage1.spec	2008-02-18 11:05:19 UTC (rev 13554)
+++ incognito/trunk/arch/x86/livecd-stage1.spec	2008-02-18 12:54:48 UTC (rev 13555)
@@ -36,6 +36,7 @@
 	contactnotes
 	crypt
 	highlight
+	gadu 
 	irc
 	sms
 	texteffect

Modified: incognito/trunk/building.html
===================================================================
--- incognito/trunk/building.html	2008-02-18 11:05:19 UTC (rev 13554)
+++ incognito/trunk/building.html	2008-02-18 12:54:48 UTC (rev 13555)
@@ -18,25 +18,34 @@
 
 <ol>
 
-<li>Download <code>stage3-i686-*.tar.bz2</code> into <code>/var/tmp/catalyst/builds/incognito/</code>. You can find this tarball either at <a href="http://files1.cjb.net/incognito/">the official Incognito download site</a>.</li>
+<li><p>Pick version number from current date using YYYYMMDD format:</p>
+	<pre>
+	YYYYMMDD=$(date +%Y%m%d)
+	</pre>
+</li>
 
-<li>Pick version number from current date using YYYYMMDD format.</li>
-
-<li>Generate Portage snapshot.<pre>
+<li><p>Download the latest Incognito portage snapshot from <a href="http://files1.cjb.net/incognito/">the official Incognito download site</a> and place it in <code>/var/tmp/catalyst/snapshots</code>.</p>
+<p>Alternatively you can generate you own portage snapshot that is more up to date, but that will most likely require alot more modifications and ebuild hacking to get working.</p>
+	<pre>
 	emerge --sync
-	catalyst -s YYYYMMDD</pre>
+	catalyst -s ${YYYYMMDD}
+	</pre>
 </li>
 
-<li>Update arch/*/*.spec files with new version number. Note that 20070413 will need
-to be changed to the current setting in the spec files.
-	<pre>sed -i 's/20070413/YYYYMMDD/' arch/*/*.spec</pre>
+<li>Update arch/*/*.spec files with new version number. Note that 20080109 or whatever number that's there currently will need to be changed to the current setting in the spec files.
+	<pre>
+	sed -i 's/20080109/${YYYYMMDD}/' arch/*/*.spec
+	</pre>
 </li>
 
-<li>(Optional) Check and update software in portage.overlay to the latest versions.</li>
+<li>Here there are two path's to go. Either you can generate a stage3 tarball yourself or simply download the one I made. If you have generated your own portage snapshot you probably should generate your own stage1 to stage3, but if your using the snapshots of the current Incognito version you can save time by skipping that step. Choose any <b>one</b> of the following alternatives:
 
-<li>Generate stage3 seed stage. After this step any caches in /var/tmp/catalyst
-related to stage1, stage2 or stage3 may be removed. Only the stage3 tarball
-needs to be kept.
+<ol type="a">
+
+<li>Download the current Incognito stage3 tarball from <a href="http://files1.cjb.net/incognito/">the official Incognito download site</a> and place it in <code>/var/tmp/catalyst/build/incognito</code>.</li>
+<li><p>Download an official Gentoo <code>stage3-i686-*.tar.bz2</code> and place it in <code>/var/tmp/catalyst/builds/default/</code>. You can find this tarball on any of <a href=http://www.gentoo.org/main/en/mirrors2.xml>the Gentoo mirrors</a> (choose one that's close to you). The file can usually be found under <code>releases/x86/current/stages/</code>.</p>
+
+<p>Generate stage3 seed stage. After this step any caches in <code>/var/tmp/catalyst</code> related to stage1, stage2 or stage3 may be removed. Only the stage3 tarball needs to be kept.</p>
 	<pre>
 	./build-stage.sh arch/x86/stage1.spec
 	./build-stage.sh arch/x86/stage2.spec
@@ -44,14 +53,16 @@
 	</pre>
 </li>
 
-<li>Generate full version.
+</ol>
+
+<li>Generate full version:
 	<pre>
 	./build-stage.sh arch/x86/livecd-stage1.spec
 	./livecd-stage2.sh arch/x86/livecd-stage2.spec
 	</pre>
 </li>
 
-<li>Generate tiny version.
+<li>Generate tiny version: (currently not under development)
 	<pre>
 	./build-stage.sh arch/x86/livecd-stage1-tiny.spec
 	./livecd-stage2.sh arch/x86/livecd-stage2-tiny.spec
@@ -68,14 +79,14 @@
 <ol>
 <li>Update ebuilds in portage.overlay to desired versions.</li>
 
-<li>Generate full version. (~2 hours)
+<li>Generate full version: (~2 hours)
 	<pre>
 	./build-stage.sh arch/x86/livecd-stage1.spec
 	./livecd-stage2.sh arch/x86/livecd-stage2.spec
 	</pre>
 </li>
 
-<li>Generate tiny version. (~30 minutes)
+<li>Generate tiny version: (~30 minutes) (currently not under development)
 	<pre>
 	./build-stage.sh arch/x86/livecd-stage1-tiny.spec
 	./livecd-stage2.sh arch/x86/livecd-stage2-tiny.spec

Modified: incognito/trunk/portage.config/package.use
===================================================================
--- incognito/trunk/portage.config/package.use	2008-02-18 11:05:19 UTC (rev 13554)
+++ incognito/trunk/portage.config/package.use	2008-02-18 12:54:48 UTC (rev 13555)
@@ -8,15 +8,8 @@
 net-www/mplayerplug-in divx gmedia realmedia wmp
 www-servers/lighttpd minimal
 
-# pt causes Firefox 2.0.0.3 to fail
-www-client/mozilla-firefox-bin -linguas_pt
+net-im/pidgin groupwise meanwhile msn ncurses qq zephyr
 
-# gadu support requires no SSL, I think not! 2007-07-13
-net-im/pidgin -gadu groupwise meanwhile msn ncurses qq zephyr
-
-# Need this here instead of global since we can't use pidgin with gadu, see above
-kde-base/kopete gadu
-
 # 'build' causes some required files to be removed
 dev-lang/perl -build
 

