X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage4%2Fpackages-update;h=fe676be4bd7835a44e49e9a2f27a73d1a99b45fd;hb=44d3c1f9f0e8fc945206020c4bd7a15c5a457f55;hp=dac089bc619aaf4e786287771e3853a849c84c38;hpb=0315072ae3bd307eee71718e1a59f923edcbdaca;p=hvlinux.git diff --git a/stage4/packages-update b/stage4/packages-update index dac089b..fe676be 100755 --- a/stage4/packages-update +++ b/stage4/packages-update @@ -1,111 +1,77 @@ #!/bin/bash -USE_LFS_PATCHES=1 -USE_BLFS_PATCHES=1 -USE_HV_PATCHES=1 +source ../functions/main -# Reading system configuration informations, functions and package versions. -source ../config/sysinfos -source ../functions -source ../functions-fpkg -source ../config/packages-list +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 +XORG_MODULES_LIST="app driver font lib proto" -lpkg 3 ${PYTHON} - -XORG_MODULES_LIST="${XORG_APP} ${XORG_DRIVER} ${XORG_FONT} ${XORG_LIB} ${XORG_PROTO} ${XORG_UTIL}" +VERSIONS_DIR="${SCRDIR}/versions" 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} - - if [ "${MOD_NAME}" = "driver" ]; then - 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}/${MOD_NAME}/${module}.${ext} - sed -i -e '/.*xclock-.*/d' ${LFS_PKG_DIR}/${MOD_NAME}/${module}.${ext} - done - fi - SUBMODS="$(grep -v '^#' ${LFS_PKG_DIR}/${MOD_NAME}/${module}.wget | sed 's!\.tar\.bz2$!!')" + SUBMODS="$(grep -v '^#' ${VERSIONS_DIR}/${module}.md5 | \ + awk '{print $2}' | \ + 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} - # 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 + pushd ${LFS_PKG_DIR} >> ${LFS_LOG_FILE} + md5sum -c ${VERSIONS_DIR}/${module}.md5 >> ${LFS_LOG_FILE} + if [ $? -ne 0 ]; then + echo " md5sum error for ${module}" 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 ${XCB_PROTO} "http://xcb.freedesktop.org/dist" -fpkg_gnu ${GPERF} -fpkg ${XCB_UTIL} "http://xcb.freedesktop.org/dist" +fpkg -m xorg -s util ${XORG_UTIL_MACROS} +fpkg -m xorg -s lib ${LIBXAU} +fpkg -m xorg -s lib ${LIBXDMCP} +fpkg -m sf -e "tgz" -f "${MOTIF}-src" ${MOTIF} +fpkg -m xorg -s data ${XBITMAPS} -fpkg_hv ${LIBDRM} +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 fd -o "xcb" -s "dist" ${XCB_UTIL_KSYMS} + +fpkg ${LIBDRM} "http://dri.freedesktop.org/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_xorg ${XCURSOR_THEMES} data -fpkg ${XKEYBOARD_CONFIG} "http://xlibs.freedesktop.org/xkbdesc" -fpkg_xorg ${LUIT} app -fpkg -e "tar.gz" ${PIXMAN} "http://cairographics.org/releases" -fpkg -e "tar.gz" ${LIBFFI} "ftp://sourceware.org/pub/libffi" -fpkg ${DBUS} "http://dbus.freedesktop.org/releases/dbus" -fpkg_gnome ${GLIB} -fpkg_gnome ${GOBJECT_INSTROSPECTION} -fpkg -e "tar.gz" ${DBUS_GLIB} "http://dbus.freedesktop.org/releases/dbus-glib" -fpkg -e "tar.gz" ${EGGDBUS} "http://hal.freedesktop.org/releases" -fpkg -e "tar.gz" ${POLKIT} "http://hal.freedesktop.org/releases" -fpkg ${CONSOLEKIT} "http://www.freedesktop.org/software/ConsoleKit/dist" -fpkg -e "tar.gz" ${POLICYKIT} "http://hal.freedesktop.org/releases" -fpkg ${HAL} "http://hal.freedesktop.org/releases" -fpkg ${HAL_INFO} "http://hal.freedesktop.org/releases" - -fpkg_hv ${XORG_VIDEO_NOUVEAU} -fpkg_xorg ${XORG_SERVER} xserver -fpkg_xorg ${XDM} app +fpkg -e "tar.gz" -f "${LLVM}.src" -v 0 ${LLVM} "http://llvm.org/releases" +fpkg -v 0 ${MESALIB} "ftp://ftp.freedesktop.org/pub/mesa" +fpkg ${GLU} "ftp://ftp.freedesktop.org/pub/mesa/glu" +fpkg -m sf ${FREEGLUT} +fpkg -m xorg -s data ${XCURSOR_THEMES} +fpkg -s data/xkeyboard-config ${XKEYBOARD_CONFIG} ${XORG_URL} -fpkg -e "tgz" ${XTERM} "ftp://invisible-island.net/xterm" +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 ${LIBEPOXY} "http://crux.nu/files" +fpkg -e "tar.xz" ${LIBEVDEV} "http://www.freedesktop.org/software/libevdev" +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_sf ${TK} tcl -fpkg_gnu ${EMACS} -fpkg ${WINDOWMAKER} "http://windowmaker.info/pub/source/release" -fpkg -e "tar.gz" ${WINDOWMAKER_EXTRA} "http://windowmaker.info/pub/source/release" +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 $?