Difference between revisions of "Code/build-experimental-X"

From ThinkWiki
Jump to: navigation, search
(Add XCB (default off); fix share/X11/xkb/compiled.tmp issue; add MAKE_CLEAN; add font X.org modules)
(New and improved)
 
(5 intermediate revisions by 2 users not shown)
Line 1: Line 1:
 
#!/bin/bash
 
#!/bin/bash
−
# Script to fetch and build X.org, DRI, Mesa, synaptics and xkeyboard-config
+
# Script to fetch and build X.org (incl. XCB and pixman), DRI, Mesa and
−
# from CVS and GIT.
+
# xkeyboard-config from CVS and GIT, and save full git snapshots of their
−
# If you want to skip some tasks, comment them out at the bottom of the script.
+
# source and installation.
 +
#
 +
# Default action:
 +
# - Create/update a git repository for each module, under $HOME/3d-pit.
 +
# - Install all modules, under $HOME/3d-pit/install
 +
# - Make $HOME/3d-pit/install a git repository to track the installed binaries
 +
# - Make $HOME/3d-pit a git super-repository which tracks all of the above
 +
#  using the submodule mechanism of git >= 1.5.3.
 +
#
 +
# Each of these can be disabled via command line (see the code table below).
 +
#
 
# Source: http://thinkwiki.org/wiki/How_to_compile_an_experimental_X_server
 
# Source: http://thinkwiki.org/wiki/How_to_compile_an_experimental_X_server
 
# See also:
 
# See also:
Line 9: Line 19:
 
#  http://gitweb.freedesktop.org
 
#  http://gitweb.freedesktop.org
 
#  http://dri.freedesktop.org/wiki/Building
 
#  http://dri.freedesktop.org/wiki/Building
−
#  http://www.mesa3d.org/cvs_access.html
+
#  http://www.mesa3d.org/repository.html
 
#  http://www.mesa3d.org/install.html
 
#  http://www.mesa3d.org/install.html
 
#  http://web.telia.com/~u89404340/touchpad
 
#  http://web.telia.com/~u89404340/touchpad
 
#  http://www.freedesktop.org/wiki/Software_2fXKeyboardConfig
 
#  http://www.freedesktop.org/wiki/Software_2fXKeyboardConfig
 
#  http://gitweb.freedesktop.org/?p=xorg/util/modular.git;a=blob;f=build.sh
 
#  http://gitweb.freedesktop.org/?p=xorg/util/modular.git;a=blob;f=build.sh
 +
 +
#############################################
 +
# X.org setup
 +
# This is a list of modules that are in flux and likely to be related to
 +
# whatever you're testing (or are required for the build), sorted by
 +
# build order (see util/modular/build.sh for dependencies).
 +
# Check CVS and the above URLs for other modules.
 +
# For exhaustive list, see
 +
# get -qO - http://gitweb.freedesktop.org/ \
 +
# | perl -ne 'print "$1\n" if m!<a href="/\?p=([^;]+);a=summary">!' \
 +
# | egrep '^xcb/|^xorg/|^pixman/'
 +
 +
XORG_MODULES=(
 +
  xorg/util/macros
 +
  xorg/proto/{bigreqs,composite,fixes,damage,gl,input,kb,pm,randr,resource,xext,xcmisc}proto
 +
  xorg/proto/{fontcache,fonts,kb}proto
 +
  xorg/proto/{render,scrnsaver,video}proto
 +
  xorg/proto/{x11,xf86bigfont,xf86dga,xf86dri,xf86misc,xf86vidmode,xinerama}proto
 +
  xcb/proto
 +
  xorg/lib/lib{xtrans,Xau,Xdmcp}
 +
  xcb/libxcb
 +
  xorg/lib/lib{X11,ICE,SM,Xt,Xmu,Xcomposite,Xrender,Xdamage,Xcursor,Xi,Xinerama}
 +
  xorg/lib/lib{Xfont,Xfontcache,Xft}
 +
  xorg/lib/lib{xkbui,Xrandr,Xv,XvMC,Xxf86dga,Xxf86misc,Xxf86vm,pciaccess}
 +
  pixman
 +
  xorg/xserver
 +
  xorg/driver/xf86-video-ati
 +
  xorg/driver/xf86-input-{mouse,keyboard,joystick,evdev}
 +
  xorg/app/{xkbutils,xkbcomp,setxkbmap,xrandr,xsetpointer,xbacklight}
 +
)
  
 
#############################################
 
#############################################
 
# Init
 
# Init
 +
 +
FETCH=true
 +
BUILD=true
 +
RECONFIGURE=false      # Reconfigure everything even if unchanged from last run
 +
MAKE_CLEAN=false        # If true, run "make clean" before building.
 +
GIT_CLEAN=false        # Use "git clean" to delete all non-source files before building.
 +
SUPERMODULE=true        # Take meta-snapshots using Git super/submodule
 +
 +
for OPT in "$@"; do
 +
case "$OPT" in
 +
(--no-fetch)      FETCH=false ;;
 +
(--no-build)      BUILD=false ;;
 +
(--no-supermodule) SUPERMODULE=false ;;
 +
(--reconfigure)    RECONFIGURE=true ;;
 +
(--make-clean)    MAKE_CLEAN=true ;;
 +
(--git-clean)      GIT_CLEAN=true ;;
 +
(*) echo "Unknown option" >&2; exit 1 ;;
 +
esac
 +
done
  
 
PIT=$HOME/3d-pit      # Download and build here
 
PIT=$HOME/3d-pit      # Download and build here
−
DEST=$PIT/install     # Install here
+
DEST_SUBDIR=install   # Install in this subdirectory of $PIT
−
# MESA_DATE=2006-06-29 # Set this to get a historical Mesa CVS snapshot
+
USE_XCB=false          # Use XCB?
 
FLAGS='-O2 -g -march=pentium-m'
 
FLAGS='-O2 -g -march=pentium-m'
−
RECONFIGURE=false      # Reconfigure everything even if unchanged from last run
+
 
−
MAKE_CLEAN=false      # If true, run "make clean" before building.
+
DEST=$PIT/$DEST_SUBDIR
−
USE_XCB=false          # Use XCB?
 
  
 
trap "echo Aborting.; exit 1" ERR
 
trap "echo Aborting.; exit 1" ERR
 +
set -E
 +
 +
#############################################
 +
# Support functions
  
 
die() {
 
die() {
Line 32: Line 94:
 
   exit 1
 
   exit 1
 
}
 
}
 +
 
run() {
 
run() {
−
   echo "@ $@"
+
   echo "@`pwd`:  $@"
 
   "$@" || { echo "ERROR: Command \"$*\" failed in `pwd`"; exit 1; }
 
   "$@" || { echo "ERROR: Command \"$*\" failed in `pwd`"; exit 1; }
 +
}
 +
 +
nothing_to_commit() {
 +
  git status > /dev/null  # Force check of files for which only the timestamp changed.
 +
  git diff --quiet HEAD > /dev/null
 
}
 
}
  
Line 42: Line 110:
 
   MODULE="$3"
 
   MODULE="$3"
 
   DIR="${4:-$MODULE}"
 
   DIR="${4:-$MODULE}"
−
   if [ -d "$PARENT_DIR/$DIR" ]; then  
+
  FULLDIR="$PARENT_DIR/$DIR"
−
     run cd "$PARENT_DIR/$DIR"
+
  RELDIR="${FULLDIR#$PIT/}"
 +
   if [ -d "$FULLDIR" ]; then  
 +
     cd "$FULLDIR"
 +
    ORIG_HEAD=`git rev-parse HEAD`
 
     run git pull
 
     run git pull
 +
    NEW_HEAD=`git rev-parse HEAD`
 +
    [[ "$ORIG_HEAD" == "$NEW_HEAD" ]] || run git shortlog ORIG_HEAD..HEAD | cat
 
   else
 
   else
 
     run cd "$PARENT_DIR"
 
     run cd "$PARENT_DIR"
 
     run git clone "$GIT_REP/$MODULE" "$DIR"
 
     run git clone "$GIT_REP/$MODULE" "$DIR"
 +
    cd "$DIR"
 +
    git gc
 +
  fi
 +
 +
  add_to_supermodule "$RELDIR"
 +
}
 +
 +
fetch_from_cvs() {
 +
  CVS_SERVER="$1"
 +
  DIR="$2"
 +
  GITIGNORES="$3"
 +
 +
  run cd $PIT
 +
  if [ ! -d $DIR ]; then
 +
    grep -qF $CVS_SERVER ~/.cvspass || run cvs -d $CVS_SERVER login
 +
    run cvs -z3 -d $CVS_SERVER co $DIR
 +
 +
    cd $PIT/$DIR
 +
    run git init
 
   fi
 
   fi
 +
 +
  cd $PIT/$DIR
 +
  run cvs -z3 update -ACPd -I .gitignore -I .git
 +
  find . -name .cvsignore | while read X; do cp "$X" "${X%/.cvsignore}/.gitignore"; done
 +
  echo -e "$GITIGNORES" >> .gitignore
 +
  run git add .
 +
  nothing_to_commit || run git commit -a -m "`date +'Fetched at %Y-%m-%d %H:%M:%S'`"
 +
 +
# We could use git-cvsimport instead, but that's way too slow:
 +
#  mkdir -p $PIT/$DIR
 +
#  cd $PIT/$DIR
 +
#  git-cvsimport -v -d "$CVS_SERVER" -r origin
 +
 +
  add_to_supermodule "$DIR"
 
}
 
}
  
−
LAST_HASH=last_dir_hash
+
#############################################
 +
# Handing git super/submodules
 +
 
 +
if $SUPERMODULE; then
 +
  which git-submodule >&/dev/null || \
 +
    die "Error: git >= 1.3.5 required for submodule support. Try --no-supermodule."
 +
 
 +
  run mkdir -p $PIT
 +
  cd $PIT
 +
  if [ ! -d .git ]; then
 +
    run git init
 +
    echo -e 'xorg/autoconf.cache' > .gitignore
 +
    run git add .gitignore
 +
    run git commit -m 'initial'
 +
  fi
 +
 
 +
  # Add new submodule's repository to the supermodule's .gitmodules
 +
  add_to_supermodule_gitmodules() {
 +
    SUBDIR="$1"
 +
    GIT_CONFIG=$PIT/.gitmodules git config "submodule.$SUBDIR.path" "$SUBDIR"
 +
    GIT_CONFIG=$PIT/.gitmodules git config "submodule.$SUBDIR.url" "$SUBDIR"
 +
  }
 +
 
 +
  add_to_supermodule() {
 +
    cd $PIT
 +
    # add_to_supermodule_alternates "$1"
 +
    add_to_supermodule_gitmodules "$1"
 +
    run git add "$1"
 +
  }
 +
else
 +
  add_to_supermodule() { true; }
 +
fi
 +
 
 +
 
 +
#############################################
 +
# Directory hashes for change detection
 +
 
 +
LAST_HASH=.last_dir_hash
 +
 
 
dir_hash() {
 
dir_hash() {
 
   find . \( -name $LAST_HASH -o -path ./.git -prune \) -o -type f -ls | sort | md5sum
 
   find . \( -name $LAST_HASH -o -path ./.git -prune \) -o -type f -ls | sort | md5sum
 
}
 
}
 +
 
dir_hash_changed() {
 
dir_hash_changed() {
 
   $RECONFIGURE || [ ! -f $LAST_HASH ] || [ "`dir_hash`" != "`cat $LAST_HASH`" ]
 
   $RECONFIGURE || [ ! -f $LAST_HASH ] || [ "`dir_hash`" != "`cat $LAST_HASH`" ]
 
}
 
}
 +
 
save_dir_hash() {
 
save_dir_hash() {
 
   dir_hash > $LAST_HASH
 
   dir_hash > $LAST_HASH
Line 74: Line 220:
 
   echo "########### Build libdrm ###########"
 
   echo "########### Build libdrm ###########"
 
   run cd $PIT/drm
 
   run cd $PIT/drm
 +
  ! $GIT_CLEAN  || run git clean -x -d
 
   if dir_hash_changed; then
 
   if dir_hash_changed; then
 
     run ./autogen.sh
 
     run ./autogen.sh
Line 89: Line 236:
 
   echo "########### Build DRM kernel modules ###########"
 
   echo "########### Build DRM kernel modules ###########"
 
   run cd $PIT/drm/linux-core
 
   run cd $PIT/drm/linux-core
 +
  ! $GIT_CLEAN  || run git clean -x -d
 
   ! $MAKE_CLEAN || run make clean
 
   ! $MAKE_CLEAN || run make clean
 
   run make DRM_MODULES="radeon"
 
   run make DRM_MODULES="radeon"
Line 102: Line 250:
 
fetch_mesa() {
 
fetch_mesa() {
 
   echo "########### Fetching Mesa ###########"
 
   echo "########### Fetching Mesa ###########"
−
   MESA_CVS=:pserver:anonymous@anoncvs.freedesktop.org:2401/cvs/mesa
+
   MESA_GIT=git://anongit.freedesktop.org/git/mesa
 
   run mkdir -p $PIT
 
   run mkdir -p $PIT
 
   run cd $PIT
 
   run cd $PIT
−
   grep -qF $MESA_CVS ~/.cvspass || run cvs -d $MESA_CVS login
+
   fetch_from_git "$PIT" "$MESA_GIT" mesa
−
  [ -d Mesa ] || run cvs -z3 -d $MESA_CVS co ${MESA_DATE:+-D $MESA_DATE} Mesa
 
−
  run cd $PIT/Mesa
 
−
  run cvs -z3 update -ACPd ${MESA_DATE:+-D $MESA_DATE}
 
−
}
 
−
 
 
−
patch_mesa() {
 
−
  # patch to make Google Earth use acceleration:
 
−
  run perl -i -pe 'print "//DISABLE " if m/^\s*FALLBACK_IF.*Line\.SmoothFlag/' \
 
−
    $PIT/Mesa/src/mesa/drivers/dri/r300/r300_render.c
 
 
}
 
}
  
Line 123: Line 262:
 
   echo "########### Building Mesa ###########"
 
   echo "########### Building Mesa ###########"
 
   # This uses both old-style and new-style vars, to support older Mesa snapshots.
 
   # This uses both old-style and new-style vars, to support older Mesa snapshots.
−
   run cd $PIT/Mesa
+
   run cd $PIT/mesa
 
   export DRM_SOURCE_PATH=$PIT/drm
 
   export DRM_SOURCE_PATH=$PIT/drm
 
   export PKG_CONFIG_PATH="$DEST/lib/pkgconfig:$PKG_CONFIG_PATH"
 
   export PKG_CONFIG_PATH="$DEST/lib/pkgconfig:$PKG_CONFIG_PATH"
Line 133: Line 272:
 
   export PATH="$DEST/bin:$PATH"
 
   export PATH="$DEST/bin:$PATH"
 
   run mkdir -p $DRI_DRIVER_INSTALL_DIR
 
   run mkdir -p $DRI_DRIVER_INSTALL_DIR
 +
  ! $GIT_CLEAN  || run git clean -x -d
 
   ! $MAKE_CLEAN || run make clean
 
   ! $MAKE_CLEAN || run make clean
 
   if [ -e configs/current ]; then
 
   if [ -e configs/current ]; then
Line 142: Line 282:
 
   run cp -v lib/*_dri.so $DRI_DRIVER_INSTALL_DIR
 
   run cp -v lib/*_dri.so $DRI_DRIVER_INSTALL_DIR
 
) }
 
) }
−
 
−
#############################################
 
−
# X.org setup
 
−
# This is a list of modules that are in flux and likely to be related to
 
−
# whatever you're testing (or are required for the build), sorted by
 
−
# build order (see util/modular/build.sh for dependencies).
 
−
# Check CVS and the above URLs for other modules.
 
−
 
−
XORG_DIRS=(
 
−
  xorg/util/macros
 
−
  xorg/proto/{bigreqs,composite,fixes,damage,gl,input,kb,pm,randr,resource,xext,xcmisc}proto
 
−
  xorg/proto/{fontcache,fonts,kb}proto
 
−
  xorg/proto/{render,scrnsaver,video}proto
 
−
  xorg/proto/{x11,xf86dga,xf86dri,xf86misc,xf86vidmode,xinerama}proto
 
−
  xcb/proto
 
−
  xorg/lib/lib{xtrans,Xau,Xdmcp}
 
−
  xcb/libxcb
 
−
  xorg/lib/lib{X11,ICE,SM,Xt,Xmu,Xcomposite,Xrender,Xdamage,Xcursor,Xi,Xinerama}
 
−
  xorg/lib/lib{Xfont,Xfontcache,Xft}
 
−
  xorg/lib/lib{xkbui,Xrandr,Xv,XvMC,Xxf86dga,Xxf86misc,Xxf86vm}
 
−
  xorg/xserver
 
−
  xorg/driver/xf86-video-ati
 
−
  xorg/driver/xf86-input-mouse driver/xf86-input-keyboard
 
−
  xorg/app/{xkbutils,xkbcomp,setxkbmap}
 
−
)
 
  
 
#############################################
 
#############################################
Line 175: Line 290:
 
   XORG_GIT=git://anongit.freedesktop.org/git
 
   XORG_GIT=git://anongit.freedesktop.org/git
 
   run mkdir -p $PIT/xorg
 
   run mkdir -p $PIT/xorg
−
   for D in "${XORG_DIRS[@]}"; do
+
   for D in "${XORG_MODULES[@]}"; do
 
     if [[ $D == xcb/* ]] && ! $USE_XCB; then continue; fi
 
     if [[ $D == xcb/* ]] && ! $USE_XCB; then continue; fi
 
     fetch_from_git $PIT/xorg "$XORG_GIT" "$D" "${D#xorg/}"
 
     fetch_from_git $PIT/xorg "$XORG_GIT" "$D" "${D#xorg/}"
Line 192: Line 307:
 
   export ACLOCAL="${AC_LOCAL:-aclocal} -I $DEST/share/aclocal"
 
   export ACLOCAL="${AC_LOCAL:-aclocal} -I $DEST/share/aclocal"
 
   export LD_LIBRARY_PATH="$DEST/lib:$LD_LIBRARY_PATH"
 
   export LD_LIBRARY_PATH="$DEST/lib:$LD_LIBRARY_PATH"
 +
 
   if [ $D == "xserver" ]; then
 
   if [ $D == "xserver" ]; then
−
     CONF_OPT="--with-mesa-source=$PIT/Mesa --enable-xorg --disable-dmx --disable-xvfb --disable-xnest --disable-xprint"
+
     CONF_OPT="--with-mesa-source=$PIT/mesa --enable-xorg --disable-dmx --disable-xvfb --disable-xnest --disable-xprint --disable-freetype --disable-xselinux"
 
   elif [ $D == "lib/libX11" ] && ! $USE_XCB; then
 
   elif [ $D == "lib/libX11" ] && ! $USE_XCB; then
 
     CONF_OPT="--with-xcb=no"
 
     CONF_OPT="--with-xcb=no"
Line 199: Line 315:
 
     CONF_OPT=
 
     CONF_OPT=
 
   fi
 
   fi
 +
 
   run cd $PIT/xorg/$D
 
   run cd $PIT/xorg/$D
 +
  ! $GIT_CLEAN  || run git clean -x -d
 
   if dir_hash_changed; then
 
   if dir_hash_changed; then
−
     CFLAGS="$FLAGS" run sh autogen.sh --prefix=$DEST --quiet --cache-file=$PIT/xorg/autoconf.cache $CONF_OPT
+
     CFLAGS="$FLAGS" run sh autogen.sh --prefix=$DEST --quiet $CONF_OPT
 +
      # --cache-file=$PIT/xorg/autoconf.cache  
 
     save_dir_hash
 
     save_dir_hash
 
   fi
 
   fi
Line 209: Line 328:
 
   run make install
 
   run make install
 
   save_dir_hash
 
   save_dir_hash
 +
 +
  if [ $D == "pixman" ]; then # as of 2007-08-07 pixman needs this hack:
 +
    [ -e $DEST/include/pixman.h ] || run ln -fs pixman-1/pixman.h $DEST/include/pixman.h
 +
  fi
 
) }
 
) }
  
Line 215: Line 338:
 
   run mkdir -p $DEST/share/aclocal
 
   run mkdir -p $DEST/share/aclocal
 
   run mkdir -p $DEST/var/log
 
   run mkdir -p $DEST/var/log
−
   for D in "${XORG_DIRS[@]}"; do
+
   for D in "${XORG_MODULES[@]}"; do
 
     if [[ $D == xcb/* ]] && ! $USE_XCB; then continue; fi
 
     if [[ $D == xcb/* ]] && ! $USE_XCB; then continue; fi
 
     build_x_module $D || return 1
 
     build_x_module $D || return 1
Line 228: Line 351:
 
fetch_xkeyboard_config() {
 
fetch_xkeyboard_config() {
 
   echo "########### Fetching xkeyboard-config ###########"
 
   echo "########### Fetching xkeyboard-config ###########"
−
   XKBC_CVS=:pserver:anoncvs@cvs.freedesktop.org:2401/cvs/xlibs
+
   XKBC_CVS=":pserver:anoncvs@cvs.freedesktop.org:2401/cvs/xkeyboard-config"
−
   run cd $PIT
+
   XKBC_DIR=xkeyboard-config
−
   grep -qF $XKBC_CVS ~/.cvspass || run cvs -d $XKBC_CVS login
+
   XKBC_GITIGNORES='install-sh\nmissing\npo/stamp-it'
−
   [ -d xkbdesc ] || run cvs -z3 -d $XKBC_CVS co xkbdesc
+
   fetch_from_cvs "$XKBC_CVS" "$XKBC_DIR" "$XKBC_GITIGNORES"
−
  run cd $PIT/xkbdesc
 
−
  run cvs -z3 update -ACPd
 
 
}
 
}
  
 
build_xkeyboard_config() { (
 
build_xkeyboard_config() { (
 
   echo "########### Building xkeyboard-config ###########"
 
   echo "########### Building xkeyboard-config ###########"
−
   run cd $PIT/xkbdesc
+
   run cd $PIT/xkeyboard-config
 
   run ./autogen.sh
 
   run ./autogen.sh
 
   export PKG_CONFIG_PATH="$DEST/lib/pkgconfig:$PKG_CONFIG_PATH"
 
   export PKG_CONFIG_PATH="$DEST/lib/pkgconfig:$PKG_CONFIG_PATH"
 
   export PATH="$DEST/bin:$PATH"
 
   export PATH="$DEST/bin:$PATH"
 
   CFLAGS="$FLAGS" run ./configure --quiet --prefix=$DEST \
 
   CFLAGS="$FLAGS" run ./configure --quiet --prefix=$DEST \
−
     --with-xkb-base=$DEST/share/X11/xkb --with-xkb-rules-symlink=xorg  
+
     --with-xkb-base=$DEST/share/X11/xkb --with-xkb-rules-symlink=xorg
 
   run make
 
   run make
 
   # "make install" replaces share/X11/xkb/compiled.tmp with a junk symlink, so override it:
 
   # "make install" replaces share/X11/xkb/compiled.tmp with a junk symlink, so override it:
Line 266: Line 387:
 
   export PKG_CONFIG_PATH="$DEST/lib/pkgconfig:$PKG_CONFIG_PATH"
 
   export PKG_CONFIG_PATH="$DEST/lib/pkgconfig:$PKG_CONFIG_PATH"
 
   export PATH="$DEST/bin:$PATH"
 
   export PATH="$DEST/bin:$PATH"
 +
  export CPATH="$DEST/include:$CPATH"
 +
  ! $GIT_CLEAN  || run git clean -x -d
 
   ! $MAKE_CLEAN || run make clean
 
   ! $MAKE_CLEAN || run make clean
 
   run make
 
   run make
−
   run cp -v synaptics_drv.so $DEST/lib/xorg/modules/input/
+
   run make install PREFIX="$DEST" MANDIR="$DEST/share/man"
 +
  #run cp -v synaptics_drv.so $DEST/lib/xorg/modules/input/
 
) }
 
) }
  
Line 275: Line 399:
  
 
create_xsetenv() {
 
create_xsetenv() {
 +
  echo "Creating $DEST/bin/xsetenv"
 
   cat <<EOF > $DEST/bin/xsetenv || die "Can't create $DEST/bin/xsetenv"
 
   cat <<EOF > $DEST/bin/xsetenv || die "Can't create $DEST/bin/xsetenv"
 
export PATH="$DEST/bin:$PATH"  
 
export PATH="$DEST/bin:$PATH"  
Line 280: Line 405:
 
export LIBGL_DRIVERS_PATH=$DEST/lib/dri
 
export LIBGL_DRIVERS_PATH=$DEST/lib/dri
 
EOF
 
EOF
−
  echo -e "\nRun '. $DEST/bin/xsetenv' to point env vars to this installation."
 
 
}
 
}
  
 
#############################################
 
#############################################
−
# Do it:
+
# Actual fetching and building:
−
 
 
−
FETCH=true
 
−
BUILD=true
 
  
 
if $FETCH; then
 
if $FETCH; then
 
   fetch_drm
 
   fetch_drm
 
   fetch_mesa
 
   fetch_mesa
−
  # patch_mesa
 
 
   fetch_xorg
 
   fetch_xorg
 
   fetch_xkeyboard_config
 
   fetch_xkeyboard_config
Line 307: Line 427:
 
fi
 
fi
  
−
echo 'Done.'
+
#############################################
 +
# Saving install and super state to git commits:
 +
 
 +
if $BUILD; then
 +
  echo "########### Record installation dir commit ###########"
 +
  cd $DEST
 +
  if [ ! -d .git ]; then
 +
    run git init
 +
    echo '/var/log' > .gitignore
 +
    run git add .gitignore
 +
    run git commit -a -m "initial"
 +
  fi
 +
  run git add .
 +
  if ! nothing_to_commit; then
 +
    run git commit -a -m "`date +'Installed at %Y-%m-%d %H:%M:%S'`"
 +
    run git gc
 +
  fi
 +
  add_to_supermodule "$DEST_SUBDIR"
 +
fi
 +
 
 +
if $SUPERMODULE; then
 +
  echo "########### Record supermodule commit ###########"
 +
  cd $PIT
 +
  nothing_to_commit || run git commit -m "`date +'Snapshot at %Y-%m-%d %H:%M:%S'` `$FETCH && echo fetch` `$BUILD && echo build`"
 +
fi
 +
 
 +
#############################################
 +
 
 +
echo
 +
echo "Done."
 +
! $FETCH || echo "Run '. $DEST/bin/xsetenv' to point env vars to this installation."

Latest revision as of 10:17, 7 November 2007

  1. !/bin/bash
  2. Script to fetch and build X.org (incl. XCB and pixman), DRI, Mesa and
  3. xkeyboard-config from CVS and GIT, and save full git snapshots of their
  4. source and installation.
  6. Default action:
  7. - Create/update a git repository for each module, under $HOME/3d-pit.
  8. - Install all modules, under $HOME/3d-pit/install
  9. - Make $HOME/3d-pit/install a git repository to track the installed binaries
  10. - Make $HOME/3d-pit a git super-repository which tracks all of the above
  11. using the submodule mechanism of git >= 1.5.3.
  13. Each of these can be disabled via command line (see the code table below).
  15. Source: http://thinkwiki.org/wiki/How_to_compile_an_experimental_X_server
  16. See also:
  17. http://wiki.x.org/wiki/ModularDevelopersGuide
  18. http://wiki.x.org/wiki/GitPage
  19. http://gitweb.freedesktop.org
  20. http://dri.freedesktop.org/wiki/Building
  21. http://www.mesa3d.org/repository.html
  22. http://www.mesa3d.org/install.html
  23. http://web.telia.com/~u89404340/touchpad
  24. http://www.freedesktop.org/wiki/Software_2fXKeyboardConfig
  25. http://gitweb.freedesktop.org/?p=xorg/util/modular.git;a=blob;f=build.sh
  2. X.org setup
  3. This is a list of modules that are in flux and likely to be related to
  4. whatever you're testing (or are required for the build), sorted by
  5. build order (see util/modular/build.sh for dependencies).
  6. Check CVS and the above URLs for other modules.
  7. For exhaustive list, see
  8. get -qO - http://gitweb.freedesktop.org/ \
  9. | perl -ne 'print "$1\n" if m!<a href="/\?p=([^;]+);a=summary">!' \
  10. | egrep '^xcb/|^xorg/|^pixman/'

XORG_MODULES=( 

 xorg/util/macros
 xorg/proto/{bigreqs,composite,fixes,damage,gl,input,kb,pm,randr,resource,xext,xcmisc}proto
 xorg/proto/{fontcache,fonts,kb}proto
 xorg/proto/{render,scrnsaver,video}proto
 xorg/proto/{x11,xf86bigfont,xf86dga,xf86dri,xf86misc,xf86vidmode,xinerama}proto
 xcb/proto
 xorg/lib/lib{xtrans,Xau,Xdmcp}
 xcb/libxcb
 xorg/lib/lib{X11,ICE,SM,Xt,Xmu,Xcomposite,Xrender,Xdamage,Xcursor,Xi,Xinerama}
 xorg/lib/lib{Xfont,Xfontcache,Xft}
 xorg/lib/lib{xkbui,Xrandr,Xv,XvMC,Xxf86dga,Xxf86misc,Xxf86vm,pciaccess}
 pixman
 xorg/xserver
 xorg/driver/xf86-video-ati
 xorg/driver/xf86-input-{mouse,keyboard,joystick,evdev}
 xorg/app/{xkbutils,xkbcomp,setxkbmap,xrandr,xsetpointer,xbacklight}

)

  2. Init

FETCH=true BUILD=true RECONFIGURE=false # Reconfigure everything even if unchanged from last run MAKE_CLEAN=false # If true, run "make clean" before building. GIT_CLEAN=false # Use "git clean" to delete all non-source files before building. SUPERMODULE=true # Take meta-snapshots using Git super/submodule

for OPT in "$@"; do case "$OPT" in (--no-fetch) FETCH=false ;; (--no-build) BUILD=false ;; (--no-supermodule) SUPERMODULE=false ;; (--reconfigure) RECONFIGURE=true ;; (--make-clean) MAKE_CLEAN=true ;; (--git-clean) GIT_CLEAN=true ;; (*) echo "Unknown option" >&2; exit 1 ;; esac done

PIT=$HOME/3d-pit # Download and build here DEST_SUBDIR=install # Install in this subdirectory of $PIT USE_XCB=false # Use XCB? FLAGS='-O2 -g -march=pentium-m'

DEST=$PIT/$DEST_SUBDIR

trap "echo Aborting.; exit 1" ERR set -E

  2. Support functions

die() { 

 echo "$*"
 exit 1

}

run() { 

 echo "@`pwd`:  $@"
 "$@" || { echo "ERROR: Command \"$*\" failed in `pwd`"; exit 1; }

}

nothing_to_commit() { 

 git status > /dev/null   # Force check of files for which only the timestamp changed.
 git diff --quiet HEAD > /dev/null

}

fetch_from_git() { 

 PARENT_DIR="$1"
 GIT_REP="$2"
 MODULE="$3"
 DIR="${4:-$MODULE}"
 FULLDIR="$PARENT_DIR/$DIR"
 RELDIR="${FULLDIR#$PIT/}"
 if [ -d "$FULLDIR" ]; then 
   cd "$FULLDIR"
   ORIG_HEAD=`git rev-parse HEAD`
   run git pull
   NEW_HEAD=`git rev-parse HEAD`
   "$ORIG_HEAD" == "$NEW_HEAD"  || run git shortlog ORIG_HEAD..HEAD | cat
 else
   run cd "$PARENT_DIR"
   run git clone "$GIT_REP/$MODULE" "$DIR"
   cd "$DIR"
   git gc
 fi

 add_to_supermodule "$RELDIR"

}

fetch_from_cvs() { 

 CVS_SERVER="$1"
 DIR="$2"
 GITIGNORES="$3"

 run cd $PIT
 if [ ! -d $DIR ]; then
   grep -qF $CVS_SERVER ~/.cvspass || run cvs -d $CVS_SERVER login
   run cvs -z3 -d $CVS_SERVER co $DIR

   cd $PIT/$DIR
   run git init
 fi

 cd $PIT/$DIR
 run cvs -z3 update -ACPd -I .gitignore -I .git
 find . -name .cvsignore | while read X; do cp "$X" "${X%/.cvsignore}/.gitignore"; done
 echo -e "$GITIGNORES" >> .gitignore
 run git add .
 nothing_to_commit || run git commit -a -m "`date +'Fetched at %Y-%m-%d %H:%M:%S'`"
  1. We could use git-cvsimport instead, but that's way too slow:
  2. mkdir -p $PIT/$DIR
  3. cd $PIT/$DIR
  4. git-cvsimport -v -d "$CVS_SERVER" -r origin
 add_to_supermodule "$DIR"

}

  2. Handing git super/submodules

if $SUPERMODULE; then 

 which git-submodule >&/dev/null || \
   die "Error: git >= 1.3.5 required for submodule support. Try --no-supermodule."

 run mkdir -p $PIT
 cd $PIT
 if [ ! -d .git ]; then
    run git init
    echo -e 'xorg/autoconf.cache' > .gitignore
    run git add .gitignore
    run git commit -m 'initial'
 fi

 # Add new submodule's repository to the supermodule's .gitmodules
 add_to_supermodule_gitmodules() {
   SUBDIR="$1"
   GIT_CONFIG=$PIT/.gitmodules git config "submodule.$SUBDIR.path" "$SUBDIR"
   GIT_CONFIG=$PIT/.gitmodules git config "submodule.$SUBDIR.url" "$SUBDIR"
 }

 add_to_supermodule() {
   cd $PIT
   # add_to_supermodule_alternates "$1"
   add_to_supermodule_gitmodules "$1"
   run git add "$1"
 }

else 

 add_to_supermodule() { true; }

fi


  2. Directory hashes for change detection

LAST_HASH=.last_dir_hash

dir_hash() { 

 find . \( -name $LAST_HASH -o -path ./.git -prune \) -o -type f -ls | sort | md5sum

}

dir_hash_changed() { 

 $RECONFIGURE || [ ! -f $LAST_HASH ] || [ "`dir_hash`" != "`cat $LAST_HASH`" ]

}

save_dir_hash() { 

 dir_hash > $LAST_HASH

}

  2. Fetching and building libDRM and DRM kernel drivers

fetch_drm() { 

 echo "########### Fetch DRM ###########"
 DRM_GIT=git://anongit.freedesktop.org/git/mesa
 fetch_from_git "$PIT" "$DRM_GIT" drm

}

build_libdrm() { 

 echo "########### Build libdrm ###########"
 run cd $PIT/drm
 ! $GIT_CLEAN  || run git clean -x -d
 if dir_hash_changed; then
   run ./autogen.sh
   CFLAGS="$FLAGS" run ./configure --prefix=$DEST --quiet
   save_dir_hash
 fi
 ! $MAKE_CLEAN || run make clean
 run make
 save_dir_hash
 run make install
 save_dir_hash

}

build_drm_modules() { 

 echo "########### Build DRM kernel modules ###########"
 run cd $PIT/drm/linux-core
 ! $GIT_CLEAN  || run git clean -x -d
 ! $MAKE_CLEAN || run make clean
 run make DRM_MODULES="radeon"
 run sudo sh -c \
   'rm -fv /lib/modules/`uname -r`/kernel/drivers/char/drm/*.ko; \
    cp -v *.ko /lib/modules/`uname -r`/extra/; \
    /sbin/depmod -a'

}

  2. Fetching Mesa

fetch_mesa() { 

 echo "########### Fetching Mesa ###########"
 MESA_GIT=git://anongit.freedesktop.org/git/mesa
 run mkdir -p $PIT
 run cd $PIT
 fetch_from_git "$PIT" "$MESA_GIT" mesa

}

  2. Building Mesa (do this after installing base X.org libraries

build_mesa() { ( 

 echo "########### Building Mesa ###########"
 # This uses both old-style and new-style vars, to support older Mesa snapshots.
 run cd $PIT/mesa
 export DRM_SOURCE_PATH=$PIT/drm
 export PKG_CONFIG_PATH="$DEST/lib/pkgconfig:$PKG_CONFIG_PATH"
 export DRM_SOURCE_PATH="$PIT/drm"
 export DESTDIR=$DEST  INSTALL_DIR=$DEST
 export DRI_DRIVER_INSTALL_DIR=$DEST/lib/dri
 export DRI_DIRS='r300 r200 r128 radeon'
 export OPT_FLAGS="$FLAGS"
 export PATH="$DEST/bin:$PATH"
 run mkdir -p $DRI_DRIVER_INSTALL_DIR
 ! $GIT_CLEAN  || run git clean -x -d
 ! $MAKE_CLEAN || run make clean
 if [ -e configs/current ]; then
   run make -e
 else
   run make -e linux-dri-x86
 fi
 run make -e install
 run cp -v lib/*_dri.so $DRI_DRIVER_INSTALL_DIR

) }

  2. Fetching X.org

fetch_xorg() { 

 echo "########### Fetching (selected) X.org modules ###########"
 XORG_GIT=git://anongit.freedesktop.org/git
 run mkdir -p $PIT/xorg
 for D in "${XORG_MODULES[@]}"; do
   if $D == xcb/*  && ! $USE_XCB; then continue; fi
   fetch_from_git $PIT/xorg "$XORG_GIT" "$D" "${D#xorg/}"
 done

}

  2. Building and installing X.org
  3. (On repeated runs we avoid rerunning autotools if nothing changed.)

build_x_module() { ( 

 D="${1#xorg/}"
 echo "########### Building xorg/$D ###########"
 export PATH="$DEST/bin:$PATH"
 export PKG_CONFIG_PATH="$DEST/lib/pkgconfig:$PKG_CONFIG_PATH"
 export ACLOCAL="${AC_LOCAL:-aclocal} -I $DEST/share/aclocal"
 export LD_LIBRARY_PATH="$DEST/lib:$LD_LIBRARY_PATH"

 if [ $D == "xserver" ]; then
   CONF_OPT="--with-mesa-source=$PIT/mesa --enable-xorg --disable-dmx --disable-xvfb --disable-xnest --disable-xprint --disable-freetype --disable-xselinux"
 elif [ $D == "lib/libX11" ] && ! $USE_XCB; then
   CONF_OPT="--with-xcb=no"
 else
   CONF_OPT=
 fi

 run cd $PIT/xorg/$D
 ! $GIT_CLEAN  || run git clean -x -d
 if dir_hash_changed; then
   CFLAGS="$FLAGS" run sh autogen.sh --prefix=$DEST --quiet $CONF_OPT
     # --cache-file=$PIT/xorg/autoconf.cache 
   save_dir_hash
 fi
 ! $MAKE_CLEAN || run make clean
 run make
 save_dir_hash
 run make install
 save_dir_hash

 if [ $D == "pixman" ]; then # as of 2007-08-07 pixman needs this hack:
   [ -e $DEST/include/pixman.h ] || run ln -fs pixman-1/pixman.h $DEST/include/pixman.h
 fi

) }

build_xorg() { 

 run cd $PIT/xorg
 run mkdir -p $DEST/share/aclocal
 run mkdir -p $DEST/var/log
 for D in "${XORG_MODULES[@]}"; do
   if $D == xcb/*  && ! $USE_XCB; then continue; fi
   build_x_module $D || return 1
 done
 run sudo sh -c "chown -v root $DEST/bin/Xorg; \
                 chmod -v 4750 $DEST/bin/Xorg"

}

  2. Fetching and building xkeyboard-config

fetch_xkeyboard_config() { 

 echo "########### Fetching xkeyboard-config ###########"
 XKBC_CVS=":pserver:anoncvs@cvs.freedesktop.org:2401/cvs/xkeyboard-config"
 XKBC_DIR=xkeyboard-config
 XKBC_GITIGNORES='install-sh\nmissing\npo/stamp-it'
 fetch_from_cvs "$XKBC_CVS" "$XKBC_DIR" "$XKBC_GITIGNORES"

}

build_xkeyboard_config() { ( 

 echo "########### Building xkeyboard-config ###########"
 run cd $PIT/xkeyboard-config
 run ./autogen.sh
 export PKG_CONFIG_PATH="$DEST/lib/pkgconfig:$PKG_CONFIG_PATH"
 export PATH="$DEST/bin:$PATH"
 CFLAGS="$FLAGS" run ./configure --quiet --prefix=$DEST \
   --with-xkb-base=$DEST/share/X11/xkb --with-xkb-rules-symlink=xorg
 run make
 # "make install" replaces share/X11/xkb/compiled.tmp with a junk symlink, so override it:
 mv $DEST/share/X11/xkb/compiled $DEST/share/X11/xkb/compiled.tmp
 run make install
 rm -f $DEST/share/X11/xkb/compiled
 mv $DEST/share/X11/xkb/compiled.tmp $DEST/share/X11/xkb/compiled

) }

  2. Fetching and building the synaptics driver

fetch_synaptics() { 

 echo "########### Fetch synaptics ###########"
 SYN_GIT=http://web.telia.com/~u89404340/touchpad/synaptics/.git
 fetch_from_git "$PIT" "$SYN_GIT"  synaptics

}

build_synaptics() { ( 

 echo "########### Build synaptics ###########"
 run cd $PIT/synaptics
 export PKG_CONFIG_PATH="$DEST/lib/pkgconfig:$PKG_CONFIG_PATH"
 export PATH="$DEST/bin:$PATH"
 export CPATH="$DEST/include:$CPATH"
 ! $GIT_CLEAN  || run git clean -x -d
 ! $MAKE_CLEAN || run make clean
 run make
 run make install PREFIX="$DEST" MANDIR="$DEST/share/man"
 #run cp -v synaptics_drv.so $DEST/lib/xorg/modules/input/

) }

  2. Creating a script which sets env vars

create_xsetenv() { 

 echo "Creating $DEST/bin/xsetenv"
 cat <<EOF > $DEST/bin/xsetenv || die "Can't create $DEST/bin/xsetenv"

export PATH="$DEST/bin:$PATH" export LD_LIBRARY_PATH="$DEST/lib:$LD_LIBRARY_PATH" export LIBGL_DRIVERS_PATH=$DEST/lib/dri EOF }

  2. Actual fetching and building:

if $FETCH; then 

  fetch_drm
  fetch_mesa
  fetch_xorg
  fetch_xkeyboard_config
  fetch_synaptics

fi if $BUILD; then 

  build_libdrm
  build_drm_modules
  build_xorg
  build_mesa
  build_xkeyboard_config
  build_synaptics
  create_xsetenv

fi

  2. Saving install and super state to git commits:

if $BUILD; then 

 echo "########### Record installation dir commit ###########"
 cd $DEST
 if [ ! -d .git ]; then
   run git init
   echo '/var/log' > .gitignore
   run git add .gitignore
   run git commit -a -m "initial"
 fi
 run git add .
 if ! nothing_to_commit; then
   run git commit -a -m "`date +'Installed at %Y-%m-%d %H:%M:%S'`"
   run git gc
 fi
 add_to_supermodule "$DEST_SUBDIR"

fi

if $SUPERMODULE; then 

 echo "########### Record supermodule commit ###########"
 cd $PIT
 nothing_to_commit || run git commit -m "`date +'Snapshot at %Y-%m-%d %H:%M:%S'` `$FETCH && echo fetch` `$BUILD && echo build`"

fi

echo echo "Done." ! $FETCH || echo "Run '. $DEST/bin/xsetenv' to point env vars to this installation."

Retrieved from "https://www.thinkwiki.org/w/index.php?title=Code/build-experimental-X&oldid=34342"