X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage4%2Fpackages-update;h=c5af9dc3faafe5ae6f11a9d9a1793add960dc4af;hb=b996d3c2b81d7ec21d29583f6b2b840ea7760bc6;hp=475957f3d7b8877225d092384434baa2a874036a;hpb=591aeb71a230c5f32d30da6a3e8f05cc3f47b855;p=hvlinux.git diff --git a/stage4/packages-update b/stage4/packages-update index 475957f..c5af9dc 100755 --- a/stage4/packages-update +++ b/stage4/packages-update @@ -1,43 +1,46 @@ #!/bin/bash -LFS_STAGE="stage4" USE_LFS_PATCHES=1 USE_BLFS_PATCHES=1 -USE_HV_PATCHES=1 -# Reading system configuration informations, functions and package versions. -source ../sysinfos -source ../functions -source ../functions-update -source ../packages-list +source ../functions/main -# Execute a return statement instead of exit, to be able to continue with -# downloading other packages -export RCMD_NO_EXIT=1 +update_packages_init ${*} -update_packages_init +lpkg 2 ${PYTHON} +lpkg 2 ${GLIB} -if [ ${#} -eq 1 -a "x${1}" = "xtest" ]; then - export TEST_INTEGRITY=1 -fi - -lpkg 3 ${PYTHON} - -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 - # Remove 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} + if [ -n "${XORG_VIDEO_DRIVER}" ]; then + # 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 + 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} + 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 @@ -49,53 +52,65 @@ for module in ${XORG_MODULES_LIST}; do fi SUBMODS="$(grep -v '^#' ${LFS_PKG_DIR}/${MOD_NAME}/${module}.wget | sed 's!\.tar\.bz2$!!')" - + for submod in ${SUBMODS}; do - fpkg_xorg ${submod} ${MOD_NAME} + fpkg -m xorg -s ${MOD_NAME} ${submod} done pushd ${DEST_DIR} >> ${LFS_LOG_FILE} - md5sum -c ${LFS_PKG_DIR}/${MOD_NAME}/${module}.md5 >> ${LFS_LOG_FILE} - if [ $? -ne 0 ]; then - echo " md5sum error for ${module}" + # The "driver" md5 file maybe empty if the nouveau driver was selected + 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}" + fi fi popd >> ${LFS_LOG_FILE} done -fpkg_xorg ${LIBXAU} lib -fpkg_xorg ${LIBXDMCP} lib -fpkg_sf ${LESSTIF} -fpkg_xorg ${XBITMAPS} data -fpkg ${LIBPTHREAD_STUBS} "http://xcb.freedesktop.org/dist" -fpkg ${LIBDRM} "http://dri.freedesktop.org/libdrm" -fpkg -s "$(get_pkg_ver ${MESALIB})" ${MESALIB} ftp://ftp.freedesktop.org/pub/mesa -fpkg_xorg ${XCURSOR_THEMES} data -fpkg ${XKEYBOARD_CONFIG} "http://xlibs.freedesktop.org/xkbdesc" -fpkg_xorg ${LUIT} app -fpkg ${PIXMAN} "http://cairographics.org/releases" -fpkg ${LIBFFI} "ftp://sourceware.org/pub/libffi" -fpkg ${DBUS} "http://dbus.freedesktop.org/releases/dbus" -fpkg_gnome ${GLIB} -fpkg_gnome ${GOBJECT_INSTROSPECTION} -fpkg ${DBUS_GLIB} "http://dbus.freedesktop.org/releases/dbus-glib" -fpkg ${EGGDBUS} "http://hal.freedesktop.org/releases" -fpkg ${POLKIT} "http://hal.freedesktop.org/releases" -fpkg ${CONSOLEKIT} "http://www.freedesktop.org/software/ConsoleKit/dist" -fpkg ${POLICYKIT} "http://hal.freedesktop.org/releases" -fpkg ${HAL} "http://hal.freedesktop.org/releases" -fpkg ${HAL_INFO} "http://hal.freedesktop.org/releases" - -fpkg_xorg ${XORG_SERVER} xserver -fpkg_xorg ${XDM} app - -fpkg -e tgz ${XTERM} "ftp://invisible-island.net/xterm" - -fpkg ${T1LIB} "http://www.ibiblio.org/pub/Linux/libs/graphics" - -fpkg_sf ${TK} tcl - -fpkg_gnu ${EMACS} -fpkg ${WINDOWMAKER} "http://windowmaker.info/pub/source/release" -fpkg ${WINDOWMAKER_EXTRA} "http://windowmaker.info/pub/source/release" +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 "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 ${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 -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} + +if [ "x${XORG_VIDEO_DRIVER}" = "xnouveau" ]; then + 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 ${XDG_UTILS} "http://portland.freedesktop.org/download" +fpkg -e "tar.gz" ${WINDOWMAKER} ${WMAKER_URL} +fpkg -e "tar.gz" ${WINDOWMAKER_EXTRA} ${WMAKER_URL} exit $?