-Replaced ffmpeg-svn by ffmpeg-git

-Now download nouveau video driver only if using it
-Now using nouveau linux kernel for amd64 system
-Modified main function to include packages list before sysinfos, so that users can override some package versions if needed.

diff --git a/config/packages-list b/config/packages-list
index b1a89f14eaa0566a7b7dcf48995483e71803bad7..0bbbc64507b14af79e33a34e68da48fe08a3dddc 100644 (file)
--- a/config/packages-list
+++ b/config/packages-list
@@ -47,6 +47,7 @@ CURL="curl-7.19.7"
 CVS="cvs-1.11.23"
 
 DBUS="dbus-1.2.24"
+# dbus-glib-0.92 has some compilation problems
 DBUS_GLIB="dbus-glib-0.88"
 DDCLIENT="ddclient-3.6.7"
 DEJAGNU="dejagnu-1.4.4"
@@ -78,7 +79,7 @@ EXPAT="expat-2.0.1"
 
 FCRON="fcron-3.0.6"
 FETCHMAIL="fetchmail-6.3.12"
-FFMPEG="ffmpeg-svn-20539"
+FFMPEG="ffmpeg-git-20110310"
 FIREFOX="firefox-3.6.13"
 FILE_PKG="file-5.04"
 FINDUTILS="findutils-4.4.2"

diff --git a/config/sysinfos.amd64 b/config/sysinfos.amd64
index 25bebd5b77031dd5ec922ed37a45f1f930f945cd..ff6b1ed3949e2de77b0c41e86c71b4a7511be90a 100644 (file)
--- a/config/sysinfos.amd64
+++ b/config/sysinfos.amd64
@@ -5,7 +5,7 @@
 
 INST_TYPE="workstation"
 HVL_TARGET="x86_64"
-MAKEJOBS=4
+MAKEJOBS=2
 
 # Destination path where to install new Linux-HV system. This is usually where
 # you have mounted your new LFS partition, but it can also be any directory.
@@ -35,3 +35,6 @@ BOOTPROTO[0]="dhcp"
 
 # Samba support
 USE_SAMBA="no"
+
+# Override some packages
+KERNEL="linux-2.6-nouveau-git-20110310"

diff --git a/functions/main b/functions/main
index c3c14e5210e3366c43572fd7f5c8052ba2a739d0..ae0d16303d5b6ba962f18b0b9d868db5cc29c1a9 100644 (file)
--- a/functions/main
+++ b/functions/main
@@ -23,6 +23,10 @@ hvtrap_int()
     exit 1
 }
 
+# Load list of packages and versions.
+# They may be overridden in sysinfos.
+source ../config/packages-list
+
 # Load default values
 source ../config/sysinfos.default
 
@@ -46,9 +50,6 @@ source ./stage.def
 # Load functions
 source ../functions/fpkg
 
-# Load list of packages and versions
-source ../config/packages-list
-
 # Constants for return codes
 EXIT_SUCCESS=0
 EXIT_WARNING=1

diff --git a/stage4/packages-update b/stage4/packages-update
index 65b82de55e3bc2b2eb8c34eb759d85109eeedf40..e18e1c9954a6106c90b13b3abc9e16cff3b175f9 100755 (executable)
--- a/stage4/packages-update
+++ b/stage4/packages-update
@@ -91,7 +91,9 @@ fpkg -m fd -o "hal" ${POLICYKIT}
 fpkg -m fd ${HAL}
 fpkg -m fd -o "hal" ${HAL_INFO}
 
-fpkg -m hv ${XORG_VIDEO_NOUVEAU}
+if [ "x${XORG_VIDEO_DRIVER}" = "xnouveau" ]; then
+    fpkg -m hv ${XORG_VIDEO_NOUVEAU}
+fi
 fpkg -m xorg -s xserver ${XORG_SERVER}
 fpkg -m xorg -s app ${XDM}