update_packages_init ${*}
-lpkg 3 ${PYTHON}
+lpkg 2 ${PYTHON}
lpkg 2 ${GLIB}
XORG_MODULES_LIST="${XORG_APP} ${XORG_DRIVER} ${XORG_FONT} ${XORG_LIB} ${XORG_PROTO}"
if [ "${MOD_NAME}" = "driver" ]; then
if [ -n "${XORG_VIDEO_DRIVER}" ]; then
- # Install only specified video driver
+ # Install only specified video driver, with also VESA
for ext in wget md5; do
# Comment all xf86-video entries, except for specified driver:
sed -e "/xf86-video-${XORG_VIDEO_DRIVER}/!s/\(.*xf86-video.*\)/#\1/" -i ${LFS_PKG_DIR}/${MOD_NAME}/${module}.${ext}
+ # Re-add VESA if necessary
+ sed -e "s/#\(.*xf86-video-vesa.*\)/\1/" -i ${LFS_PKG_DIR}/${MOD_NAME}/${module}.${ext}
done
else
# Install all drivers, except some unwanted drivers
fpkg ${LIBDRM} "http://dri.freedesktop.org/libdrm"
fpkg -e "tar.gz" ${TALLOC} "http://samba.org/ftp/talloc"
-fpkg -e "tar.gz" ${LLVM} "http://llvm.org/releases/3.0"
+fpkg -e "tar.gz" -f "${LLVM}.src" ${LLVM} "http://llvm.org/releases/$(get_pkg_ver ${LLVM})"
fpkg -s "$(get_pkg_ver ${MESALIB})" ${MESALIB} \
ftp://ftp.freedesktop.org/pub/mesa
fpkg -m xorg -s data ${XCURSOR_THEMES}
-fpkg -m fd -o "xlibs" -s "xkbdesc" -e "tar.bz2" ${XKEYBOARD_CONFIG}
+fpkg -s data/xkeyboard-config ${XKEYBOARD_CONFIG} ${XORG_URL}
fpkg -m xorg -s app ${LUIT}
fpkg -e "tar.gz" ${PIXMAN} ${CAIRO_URL}
fpkg -m fd -s "releases/dbus" ${DBUS}
fpkg -m gnome ${GOBJECT_INSTROSPECTION}
fpkg -m fd -o "dbus" -s "releases/dbus-glib" ${DBUS_GLIB}
-######fpkg -m fd -o "hal" ${EGGDBUS}
-#######fpkg -m fd -o "hal" ${POLKIT}
-#fpkg ${CONSOLEKIT} "http://www.freedesktop.org/software/ConsoleKit/dist"
-###fpkg -m fd -o "hal" ${POLICYKIT}
-#####fpkg -m fd ${HAL}
-#####fpkg -m fd -o "hal" ${HAL_INFO}
if [ "x${XORG_VIDEO_DRIVER}" = "xnouveau" ]; then
fpkg ${XORG_VIDEO_NOUVEAU} "http://anduin.linuxfromscratch.org/sources/BLFS/svn/Xorg"