X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage4%2Fpackages-update;h=65b82de55e3bc2b2eb8c34eb759d85109eeedf40;hb=f3c8db3027d5dc530e1f30c88e0235975211582e;hp=d209fee41acdbf9203d3e7e450f78d9dac36430e;hpb=00e8a130828a360dd654ff76cade992d846fc059;p=hvlinux.git diff --git a/stage4/packages-update b/stage4/packages-update index d209fee..65b82de 100755 --- a/stage4/packages-update +++ b/stage4/packages-update @@ -1,106 +1,106 @@ -#!/bin/sh +#!/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 3 ${PYTHON} -XORG_MODULES_LIST="${XORG_APP} ${XORG_DATA} ${XORG_DRIVER} ${XORG_FONT} ${XORG_LIB} ${XORG_PROTO} ${XORG_UTIL}" - -BLFS_XORG_URL=http://anduin.linuxfromscratch.org/files/BLFS/svn/xorg -XORG_URL=http://xorg.freedesktop.org/releases/individual +XORG_MODULES_LIST="${XORG_APP} ${XORG_DRIVER} ${XORG_FONT} ${XORG_LIB} ${XORG_PROTO} ${XORG_UTIL}" for module in ${XORG_MODULES_LIST}; do MOD_NAME=$(get_pkg_name ${module}) - DEST=${LFS_PKG_DIR}/${MOD_NAME} + DEST_DIR=${LFS_PKG_DIR}/${MOD_NAME} - ARCH_EXT=wget fpkg ${module} ${BLFS_XORG_URL} - ARCH_EXT=md5 fpkg ${module} ${BLFS_XORG_URL} - unset ARCH_EXT + fpkg -d ${DEST_DIR} -e wget ${module} ${BLFS_XORG_URL} + fpkg -d ${DEST_DIR} -e md5 ${module} ${BLFS_XORG_URL} if [ "${MOD_NAME}" = "driver" ]; then - # Remove unwanted drivers - for ext in wget md5; do - sed -i -e '/.*xf86-video-vmware.*/d' ${LFS_PKG_DIR}/${module}.${ext} - sed -i -e '/.*xf86-video-newport.*/d' ${LFS_PKG_DIR}/${module}.${ext} - sed -i -e '/.*xf86-video-xgixp.*/d' ${LFS_PKG_DIR}/${module}.${ext} - done + if [ -n "${XORG_VIDEO_DRIVER}" ]; then + # Install only specific driver + for ext in wget md5; do + sed -i -e "/xf86-video-${XORG_VIDEO_DRIVER}/!d" ${LFS_PKG_DIR}/${MOD_NAME}/${module}.${ext} + done + else + # 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} + done + done + fi fi if [ "${MOD_NAME}" = "app" ]; then # Remove unneeded apps for ext in wget md5; do - sed -i -e '/.*twm-.*/d' ${LFS_PKG_DIR}/${module}.${ext} - sed -i -e '/.*xclock-.*/d' ${LFS_PKG_DIR}/${module}.${ext} + sed -i -e '/.*twm-.*/d' ${LFS_PKG_DIR}/${MOD_NAME}/${module}.${ext} + sed -i -e '/.*xclock-.*/d' ${LFS_PKG_DIR}/${MOD_NAME}/${module}.${ext} done fi - SUBMODS="$(grep -v '^#' ${LFS_PKG_DIR}/${module}.wget | sed 's!\.tar\.bz2$!!')" - - mkdir -v -p ${DEST} >> ${LFS_LOG_FILE} 2>&1 + SUBMODS="$(grep -v '^#' ${LFS_PKG_DIR}/${MOD_NAME}/${module}.wget | sed 's!\.tar\.bz2$!!')" - export FETCH_DIR=${DEST} for submod in ${SUBMODS}; do - fpkg ${submod} ${XORG_URL}/${MOD_NAME} + fpkg -m xorg -s ${MOD_NAME} ${submod} done - unset FETCH_DIR - pushd ${DEST} >> ${LFS_LOG_FILE} - md5sum -c ${LFS_PKG_DIR}/${module}.md5 >> ${LFS_LOG_FILE} - if [ $? -ne 0 ]; then - echo " md5sum error for ${module}" + 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 + 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 ${LIBXAU} ${XORG_URL}/lib -fpkg ${LIBXDMCP} ${XORG_URL}/lib -fpkg_sf ${LESSTIF} -fpkg ${XBITMAPS} ${XORG_URL}/data -fpkg ${LIBPTHREAD_STUBS} http://xcb.freedesktop.org/dist -fpkg ${LIBDRM} http://dri.freedesktop.org/libdrm -fpkg ${MESALIB} ftp://ftp.freedesktop.org/pub/mesa/$(get_pkg_ver ${MESALIB}) -fpkg ${XCURSOR_THEMES} ${XORG_URL}/data -fpkg ${XKEYBOARD_CONFIG} http://xlibs.freedesktop.org/xkbdesc -fpkg ${LUIT} ${XORG_URL}/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_SERVER} ${XORG_URL}/xserver - -ARCH_EXT=tgz fpkg ${XTERM} ftp://invisible-island.net/xterm -unset ARCH_EXT - -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 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 gnu ${GPERF} + +fpkg -m hv ${LIBDRM} +fpkg -e "tar.gz" ${TALLOC} "http://samba.org/ftp/talloc" +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 -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 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 hv ${XORG_VIDEO_NOUVEAU} +fpkg -m xorg -s xserver ${XORG_SERVER} +fpkg -m xorg -s app ${XDM} + +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 -s "tcl" ${TK} +fpkg -m gnu ${EMACS} +fpkg ${WINDOWMAKER} ${WMAKER_URL} +fpkg -e "tar.gz" ${WINDOWMAKER_EXTRA} ${WMAKER_URL} exit $?