projects
/
hvlinux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Blacklist pygobject patch
[hvlinux.git]
/
stage4
/
packages-update
diff --git
a/stage4/packages-update
b/stage4/packages-update
index
42470b1
..
1b164cf
100755
(executable)
--- a/
stage4/packages-update
+++ b/
stage4/packages-update
@@
-1,6
+1,7
@@
#!/bin/bash
USE_LFS_PATCHES=1
#!/bin/bash
USE_LFS_PATCHES=1
+USE_LFS_OLD_PATCHES=1
USE_BLFS_PATCHES=1
USE_HV_PATCHES=1
USE_BLFS_PATCHES=1
USE_HV_PATCHES=1
@@
-8,7
+9,7
@@
source ../functions/main
update_packages_init ${*}
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}"
lpkg 2 ${GLIB}
XORG_MODULES_LIST="${XORG_APP} ${XORG_DRIVER} ${XORG_FONT} ${XORG_LIB} ${XORG_PROTO}"
@@
-22,10
+23,12
@@
for module in ${XORG_MODULES_LIST}; do
if [ "${MOD_NAME}" = "driver" ]; then
if [ -n "${XORG_VIDEO_DRIVER}" ]; then
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}
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
done
else
# Install all drivers, except some unwanted drivers
@@
-36,6
+39,11
@@
for module in ${XORG_MODULES_LIST}; do
done
done
fi
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
fi
if [ "${MOD_NAME}" = "app" ]; then
# Remove unneeded apps
@@
-77,11
+85,11
@@
fpkg -m gnu ${GPERF}
fpkg ${LIBDRM} "http://dri.freedesktop.org/libdrm"
fpkg -e "tar.gz" ${TALLOC} "http://samba.org/ftp/talloc"
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 -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 xorg -s app ${LUIT}
fpkg -e "tar.gz" ${PIXMAN} ${CAIRO_URL}
@@
-89,24
+97,23
@@
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 -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"
fi
fpkg -m xorg -s xserver ${XORG_SERVER}
fpkg -m xorg -s app ${XDM}
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 -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 sf -s "tcl" ${TK}
-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 $?
fpkg -e "tar.gz" ${WINDOWMAKER_EXTRA} ${WMAKER_URL}
exit $?