projects
/
hvlinux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upgrade to gnumeric-1.12.18 and goffice-0.10.18
[hvlinux.git]
/
stage4
/
hv-install-1
diff --git
a/stage4/hv-install-1
b/stage4/hv-install-1
index
9ca6f6a
..
cdfdc50
100755
(executable)
--- a/
stage4/hv-install-1
+++ b/
stage4/hv-install-1
@@
-6,6
+6,8
@@
source /etc/profile
check_for_root_user
init_log_file
check_for_root_user
init_log_file
+VERSIONS_DIR="${SCRDIR}/versions"
+
export XORG_CONFIG="\
--mandir=/usr/share/man \
--localstatedir=/var"
export XORG_CONFIG="\
--mandir=/usr/share/man \
--localstatedir=/var"
@@
-16,41
+18,36
@@
ipkg_xorg()
{
local MODULE=${1}
shift
{
local MODULE=${1}
shift
- local CONFIGURE_OPTS=${*}
+ local
MY_
CONFIGURE_OPTS=${*}
- ipkg ${MODULE} ${XORG_CONFIG} ${CONFIGURE_OPTS}
+ ipkg ${MODULE} ${XORG_CONFIG} ${
MY_
CONFIGURE_OPTS}
}
# Install all submodules in a module
#
}
# Install all submodules in a module
#
-# Arg #1: module name and version
-# Arg #2: optional configure arguments
+# Arg #1: module name
install_xorg_modules()
{
local MODULE=${1}
install_xorg_modules()
{
local MODULE=${1}
- shift
- local CONFIGURE_OPTS=${*}
-
- local MY_XORG_CONFIG
- for package in $(grep -v '^#' ${
LFS_PKG_DIR}/${MODULE}.wget); do
- SUBMOD="$(echo ${package} | sed 's!\.tar\.bz2$!!')"
- ipkg_xorg ${
SUBMOD} ${MY_XORG_CONFIG} ${CONFIGURE_OPTS
}
+ for package in $(grep -v '^#' ${
VERSIONS_DIR}/${MODULE}.md5 | \
+ awk '{print $2}' | sed 's!\.tar\.bz2$!!'); do
+ ipkg_xorg ${
package
}
done
}
ipkg_xorg ${XORG_UTIL_MACROS}
done
}
ipkg_xorg ${XORG_UTIL_MACROS}
-install_xorg_modules ${XORG_PROTO}
-ipkg_xorg ${XORG_MAKEDEPEND}
+install_xorg_modules proto
ipkg_xorg ${LIBXAU}
ipkg_xorg ${LIBXDMCP}
ipkg ${LIBPTHREAD_STUBS} ${XORG_CONFIG}
ipkg ${XCB_PROTO} ${XORG_CONFIG}
ipkg ${LIBXCB} ${XORG_CONFIG}
ipkg_xorg ${LIBXAU}
ipkg_xorg ${LIBXDMCP}
ipkg ${LIBPTHREAD_STUBS} ${XORG_CONFIG}
ipkg ${XCB_PROTO} ${XORG_CONFIG}
ipkg ${LIBXCB} ${XORG_CONFIG}
-install_xorg_modules
${XORG_LIB}
+install_xorg_modules
lib
ipkg ${XCB_UTIL} ${XORG_CONFIG}
ipkg ${XCB_UTIL} ${XORG_CONFIG}
-ipkg
-m acnb ${LESSTIF
}
+ipkg
${XCB_UTIL_KSYMS} ${XORG_CONFIG
}
ipkg_xorg ${XBITMAPS}
ipkg_xorg ${XBITMAPS}
+ipkg -m acnb -j ${MOTIF}
ipkg ${LIBDRM} "\
--enable-udev \
--enable-nouveau-experimental-api"
ipkg ${LIBDRM} "\
--enable-udev \
--enable-nouveau-experimental-api"
@@
-65,40
+62,42
@@
ipkg -m acnb ${LLVM} "\
--enable-optimized"
ipkg -m acnb ${MESALIB}
--enable-optimized"
ipkg -m acnb ${MESALIB}
-install_xorg_modules ${XORG_APP}
+ipkg ${GLU}
+ipkg ${FREEGLUT}
+install_xorg_modules app
ipkg_xorg ${XCURSOR_THEMES}
ipkg_xorg ${XCURSOR_THEMES}
-install_xorg_modules
${XORG_FONT}
+install_xorg_modules
font
ipkg ${XKEYBOARD_CONFIG} ${XORG_CONFIG} --with-xkb-rules-symlink=xorg
ipkg ${XKEYBOARD_CONFIG} ${XORG_CONFIG} --with-xkb-rules-symlink=xorg
-ipkg_xorg ${LUIT}
ipkg ${PIXMAN}
ipkg ${DBUS}
ipkg ${PIXMAN}
ipkg ${DBUS}
-ipkg ${GLIB}
+ipkg ${GLIB}
"--with-pcre=system"
ipkg ${GOBJECT_INSTROSPECTION} "--disable-tests"
ipkg -m acnb ${DBUS_GLIB} \
--disable-tests \
--libexecdir=/usr/lib/dbus-1.0/dbus-1
ipkg ${GOBJECT_INSTROSPECTION} "--disable-tests"
ipkg -m acnb ${DBUS_GLIB} \
--disable-tests \
--libexecdir=/usr/lib/dbus-1.0/dbus-1
+ipkg -m acnb -j ${LIBEPOXY}
ipkg_xorg ${XORG_SERVER} "\
ipkg_xorg ${XORG_SERVER} "\
- --with-module-dir=/usr/lib/X11/modules \
--with-xkb-output=/var/lib/xkb \
--with-xkb-output=/var/lib/xkb \
+ --enable-dmx \
+ --enable-glamor \
--enable-install-setuid \
--enable-install-setuid \
- --
disable-config-hal
"
+ --
enable-suid-wrapper
"
ipkg -m acnb ${MTDEV} "--disable-static"
ipkg -m acnb ${MTDEV} "--disable-static"
-install_xorg_modules ${XORG_DRIVER} --with-xorg-module-dir=/usr/lib/X11/modules
-
-if [ "x${XORG_VIDEO_DRIVER}" = "xnouveau" ]; then
- ipkg ${XORG_VIDEO_NOUVEAU} ${XORG_CONFIG} --with-xorg-module-dir=/usr/lib/X11/modules
-fi
+ipkg ${LIBEVDEV} ${XORG_CONFIG}
+install_xorg_modules driver
-ipkg_xorg ${XDM}
+ipkg_xorg ${XDM}
"--with-xdmlibdir=/usr/lib/xorg/xdm"
rscr once "Configuring X.org" configure-xorg
ipkg ${XTERM}
ipkg -m acnb ${T1LIB}
rscr once "Configuring X.org" configure-xorg
ipkg ${XTERM}
ipkg -m acnb ${T1LIB}
-ipkg -s tk ${TK}
+ipkg -s tk -d unix ${TK} "\
+ --enable-threads \
+ --mandir=/usr/share/man"
# Re-installing python now that tk is present???
ipkg ${PYTHON} "--enable-shared"
# Re-installing python now that tk is present???
ipkg ${PYTHON} "--enable-shared"