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} ${XORG_UTIL}"
+XORG_MODULES_LIST="${XORG_APP} ${XORG_DRIVER} ${XORG_FONT} ${XORG_LIB} ${XORG_PROTO}"
for module in ${XORG_MODULES_LIST}; do
MOD_NAME=$(get_pkg_name ${module})
DEST_DIR=${LFS_PKG_DIR}/${MOD_NAME}
- fpkg -d ${DEST_DIR} -e wget ${module} ${BLFS_XORG_URL}
- fpkg -d ${DEST_DIR} -e md5 ${module} ${BLFS_XORG_URL}
+ fpkg -d ${DEST_DIR} -e wget -w ${module} ${BLFS_XORG_URL}
+ fpkg -d ${DEST_DIR} -e md5 -w ${module} ${BLFS_XORG_URL}
if [ "${MOD_NAME}" = "driver" ]; then
if [ -n "${XORG_VIDEO_DRIVER}" ]; then
- # Install only specific driver
+ # Install only specified video driver, with also VESA
for ext in wget md5; do
- sed -i -e "/xf86-video-${XORG_VIDEO_DRIVER}/!d" ${LFS_PKG_DIR}/${MOD_NAME}/${module}.${ext}
+ # 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
- # Remove unwanted drivers
+ # Install all drivers, except some unwanted drivers
for ext in wget md5; do
for excldrv in vmware newport xgixp geode; do
- sed -i -e "/.*xf86-video-${excldrv}.*/d" ${LFS_PKG_DIR}/${MOD_NAME}/${module}.${ext}
+ sed -i -e "/.*xf86-video-${excldrv}.*/d" \
+ ${LFS_PKG_DIR}/${MOD_NAME}/${module}.${ext}
done
done
fi
+
+ # Always install synaptics driver
+ for ext in wget md5; do
+ sed -e "s/#\(.*xf86-input-synaptics.*\)/\1/" -i ${LFS_PKG_DIR}/${MOD_NAME}/${module}.${ext}
+ done
fi
if [ "${MOD_NAME}" = "app" ]; then
# Remove unneeded apps
pushd ${DEST_DIR} >> ${LFS_LOG_FILE}
# The "driver" md5 file maybe empty if the nouveau driver was selected
- if cat ${LFS_PKG_DIR}/${MOD_NAME}/${module}.md5 | grep "[0-9]" 1> /dev/null 2>&1; then
+ if cat ${LFS_PKG_DIR}/${MOD_NAME}/${module}.md5 | grep -q "[0-9]"; then
md5sum -c ${LFS_PKG_DIR}/${MOD_NAME}/${module}.md5 >> ${LFS_LOG_FILE}
if [ $? -ne 0 ]; then
echo " md5sum error for ${module}"
popd >> ${LFS_LOG_FILE}
done
+fpkg -m xorg -s util ${XORG_UTIL_MACROS}
+fpkg -m xorg -s util ${XORG_MAKEDEPEND}
fpkg -m xorg -s lib ${LIBXAU}
fpkg -m xorg -s lib ${LIBXDMCP}
fpkg -m sf ${LESSTIF}
fpkg -m xorg -s data ${XBITMAPS}
-fpkg -m fd -o "dist" -s "xcb" ${LIBPTHREAD_STUBS}
-fpkg -m fd -o "dist" -s "xcb" ${XCB_PROTO}
-fpkg -m fd -o "dist" -s "xcb" ${XCB_UTIL}
+fpkg -m fd -o "xcb" -s "dist" ${LIBPTHREAD_STUBS}
+fpkg -m fd -o "xcb" -s "dist" ${XCB_PROTO}
+fpkg -m fd -o "xcb" -s "dist" ${LIBXCB}
+fpkg -m fd -o "xcb" -s "dist" ${XCB_UTIL}
fpkg -m gnu ${GPERF}
-fpkg -m hv ${LIBDRM}
+fpkg ${LIBDRM} "http://dri.freedesktop.org/libdrm"
fpkg -e "tar.gz" ${TALLOC} "http://samba.org/ftp/talloc"
+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" ${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 -e "tar.gz" ${LIBFFI} "ftp://sourceware.org/pub/libffi"
-fpkg -m fd -o "releases/dbus" ${DBUS}
-fpkg -m gnome ${GLIB}
+fpkg -m fd -s "releases/dbus" ${DBUS}
fpkg -m gnome ${GOBJECT_INSTROSPECTION}
-fpkg -m fd -o "dbus" ${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}
+fpkg -m fd -o "dbus" -s "releases/dbus-glib" ${DBUS_GLIB}
if [ "x${XORG_VIDEO_DRIVER}" = "xnouveau" ]; then
- fpkg -m hv ${XORG_VIDEO_NOUVEAU}
+ fpkg ${XORG_VIDEO_NOUVEAU} "http://anduin.linuxfromscratch.org/sources/BLFS/svn/Xorg"
fi
fpkg -m xorg -s xserver ${XORG_SERVER}
fpkg -m xorg -s app ${XDM}
+fpkg ${MTDEV} "http://bitmath.org/code/mtdev"
fpkg -e "tgz" ${XTERM} "ftp://invisible-island.net/xterm"
fpkg -e "tar.gz" ${T1LIB} "http://www.ibiblio.org/pub/Linux/libs/graphics"
+fpkg -m sf -e "tar.bz2" -s "dejavu" ${DEJAVUFONTS}
+
fpkg -m sf -s "tcl" ${TK}
-fpkg -m gnu ${EMACS}
-fpkg ${WINDOWMAKER} ${WMAKER_URL}
+
+fpkg ${XDG_UTILS} "http://portland.freedesktop.org/download"
+fpkg -e "tar.gz" ${WINDOWMAKER} ${WMAKER_URL}
fpkg -e "tar.gz" ${WINDOWMAKER_EXTRA} ${WMAKER_URL}
exit $?