[Lunar-commits] CVS: moonbase/x11/XOrg BUILD, 1.2, 1.3 DETAILS, 1.1, 1.2

[Auke Kok]

Update of /var/cvs/lunar/moonbase/x11/XOrg
In directory dbguin.lunar-linux.org:/tmp/cvs-serv20953

Modified Files:
	BUILD DETAILS 
Log Message:
Fix for XOrg: 1) don't do this if not needed and 2) devoke installwatch while doing this!


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/x11/XOrg/BUILD,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- BUILD	26 Apr 2004 02:31:18 -0000	1.2
+++ BUILD	29 Jun 2004 08:54:50 -0000	1.3
@@ -1,23 +1,21 @@
-install_drm()  {
-
-  DRM_DIR="programs/Xserver/hw/xfree86/os-support/linux/drm/kernel"
-  DRM_DEST="/lib/modules/`uname -r`/kernel/drivers"
-  mkdir   -p                $DRM_DEST
-  cp          $DRM_DIR/*.o  $DRM_DEST  2>/dev/null
-  depmod  -a
-  true
-
-}
+(
 
-if [ -e /etc/X11/xinit/xinitrc ]; then
-   cp /etc/X11/xinit/xinitrc /etc/X11/xinit/xinitrc.orig
-   echo "Your master xinitrc file has been backed up as /etc/X11/xinit/xinitrc.orig"
-fi
+  install_drm()  {
+    DRM_DIR="programs/Xserver/hw/xfree86/os-support/linux/drm/kernel"
+    DRM_DEST="/lib/modules/`uname -r`/kernel/drivers"
+    mkdir   -p                $DRM_DEST
+    cp          $DRM_DIR/*.o  $DRM_DEST  2>/dev/null
+    depmod  -a
+    true
+  }
 
-message  "Building XOrg takes a very long time."
+  if [ -e /etc/X11/xinit/xinitrc ]; then
+    cp /etc/X11/xinit/xinitrc /etc/X11/xinit/xinitrc.orig
+    echo "Your master xinitrc file has been backed up as /etc/X11/xinit/xinitrc.orig"
+  fi
 
+  message  "Building XOrg takes a very long time."
 
-( 
 
   echo  "#define  InstallXdmConfig    YES"  >>  config/cf/site.def
   echo  "#define  InstallXinitConfig  YES"  >>  config/cf/site.def
@@ -34,9 +32,14 @@
   fi                                    &&
 
   cp $CONFIG_CACHE/host.def config/cf/host.def &&
-  # This must happen or it will cause the module to break
-  # claiming "Kernel only header included in userspace"
-  cp -rL /usr/src/linux/include/linux/{autoconf.h,config.h} /usr/include/linux &&
+
+	if grep -q "Compilation aborted" /usr/include/linux/config.h ; then
+	  # This must happen or it will cause the module to break
+    # claiming "Kernel only header included in userspace"
+		devoke_installwatch &&
+    cp -rL /usr/src/linux/include/linux/{autoconf.h,config.h} /usr/include/linux &&
+		invoke_installwatch
+	fi
 
   make World                            &&
   prepare_install                       &&

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/x11/XOrg/DETAILS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- DETAILS	7 Apr 2004 17:51:22 -0000	1.1
+++ DETAILS	29 Jun 2004 08:54:50 -0000	1.2
@@ -15,13 +15,6 @@
   SOURCE5_URL[0]=http://freedesktop.org/~xorg/X11R${VERSION}/src/$SOURCE5
   SOURCE6_URL[0]=http://freedesktop.org/~xorg/X11R${VERSION}/src/$SOURCE6
   SOURCE7_URL[0]=http://freedesktop.org/~xorg/X11R${VERSION}/src/$SOURCE7
-      SOURCE_VFY=md5:22465263bae7a2e9f5ad77e172cf1ab5
-     SOURCE2_VFY=md5:6ef4e8f7647a28f080c10ea1bcf01f79
-     SOURCE3_VFY=md5:4c7144786522bbce383b21ace72bf669
-     SOURCE4_VFY=md5:4f2ed6fe4378fe60b58b8b4c8487cab0
-     SOURCE5_VFY=md5:87177e6e6ac5b2d7de6a032ee8641ec1
-     SOURCE6_VFY=md5:f52fe308e14525e3fa1eeb9dcd6d83a6
-     SOURCE7_VFY=md5:69aa33d9faa5d324c84943c2025f9d8e
         WEB_SITE=http://xorg.freedesktop.org
          ENTERED=20040325
          UPDATED=20040407