Hi, Attached are a moduleset for Xorg-7.6RC1 and a tinderwrap wrapper plug-in to build only Xorg-7.6 modules. The latter basically just adds a list of modules to skip to the call, so that the dependencies of the moduleset need not be modified.
There is also a (sloppy) plug-in to create such a moduleset. I did not realize that the packagename of pthread-stubs is actually libpthread-stubs when I created the xjh moduleset. A patch to fix that is attached, too, and necessary for the tagging script. -- Greetings, Dirk
Xorg-7.6RC1.modules.bz2
Description: BZip2 compressed data
#!/bin/sh
#xjh --callback tinderwrap start -s "
${XJHBUILD_CALLBACK} tinderwrap start -s "\
appres,\
beforelight,\
bitmap,\
cf,\
editres,\
font-bitstream-speedo,\
fontconfig,\
fonttosfnt,\
fslsfonts,\
fstobdf,\
gccmakedep,\
ico,\
imake,\
libdrm,\
libxkbui,\
listres,\
lndir,\
mesa,\
mesa-demos,\
mkcomposecache,\
modular,\
oclock,\
pixman,\
rendercheck,\
rgb,\
rstart,\
scripts,\
showfont,\
twm,\
viewres,\
xbiff,\
xcalc,\
xcb-util,\
xclipboard,\
xclock,\
xconsole,\
xdbedizzy,\
xditview,\
xdm,\
xedit,\
xeyes,\
xf86-input-penmount,\
xf86-video-impact,\
xf86-video-nouveau,\
xf86-video-qxl,\
xf86-video-radeonhd,\
xf86-video-sunbw2,\
xf86dga,\
xfd,\
xfontsel,\
xfs,\
xfsinfo,\
xgc,\
xinit,\
xkbprint,\
xkeyboard-config,\
xload,\
xlogo,\
xlsfonts,\
xmag,\
xman,\
xmessage,\
xmh,\
xmore,\
xscope,\
xsetmode,\
xsm,\
xstdcmap,\
xvidtune\
" xorg
#!/bin/bash
plugin_name=$(basename $0)
error() {
echo "ERROR ($plugin_name): $@"
exit
}
usage() {
cat << EOU
Sub-Command Usage : $plugin_name <output-file-path>
Use the module-list.txt file from the modular repo to generate a
moduleset with the corresponding tags at <output-file-path>.
EOU
}
if [ $# -lt 1 ] ; then
usage
echo
error "No output-file-path given"
fi
case "$1" in
-h|--help)
usage
exit 0
;;
esac
tagged_xjh_file="${1}"
# Account for changes in xjh versions greater-equal 0.2. Actually, the
# callback envvar is kept but deprecated.
#IS_XJH_VERSION_GE_0_2_0="nonempty-yes"
if [ -n "${IS_XJH_VERSION_GE_0_2_0}" ] ; then
modulardir=$(xjh --callback modinfo -f dir modular)
[[ $? -eq 0 ]] || error "I need the modular repo checked out."
cp -v ~/.x-jhbuild/.internal/lib/xjhbuild/distro-modulesets/xjh.modules
"${tagged_xjh_file}" || error "copying xjh.modules failed"
else
modulardir=$(${XJHBUILD_CALLBACK} modinfo -f dir modular)
[[ $? -eq 0 ]] || error "I need the modular repo checked out."
cp -v ~/.x-jhbuild/.internal/distro-modulesets/xjh.modules
"${tagged_xjh_file}" || error "copying xjh.modules failed"
fi
modulelist=${modulardir}/module-list.txt
for tag in $(cat ${modulelist}) ; do
# skip openchrome
[[ "${tag}" = xf86-video-openchrome* ]] && continue
echo $tag
pkgname=$(echo $tag | sed 's/-[0-9\.]*$//g')
version="${tag##${pkgname}-}"
[[ "${tag}" = xcb-proto* ]] && tag=${version}
[[ "${tag}" = libpthread-stubs* ]] && tag=${version}
[[ "${tag}" = libxcb* ]] && tag=${version}
[[ "${tag}" = xf86-video-intel* ]] && tag=${version}
match_string="checkoutdir=\".*/${pkgname}\""
[[ $(grep ${match_string} ${tagged_xjh_file} | wc -l) -eq 1 ]] || error
"not one match for ${pkgname} looking for \"${match_string}\""
sed -i "s...@${match_string}@\0 tag=\"${tag}\"@" "${tagged_xjh_file}"
done
# NOTE: need libpthread-stubs patch!!!
>From 92af6d0807a22d9c9e78b68f72a52ce5271d228d Mon Sep 17 00:00:00 2001 From: Dirk Wallenstein <[email protected]> Date: Fri, 12 Nov 2010 08:32:43 +0100 Subject: [PATCH] xjh.modules: Rename pthread-stubs to libpthread-stubs Missed that when changing module ids to package names. Signed-off-by: Dirk Wallenstein <[email protected]> --- modulesets/xjh.modules | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modulesets/xjh.modules b/modulesets/xjh.modules index d4a442b..035d481 100644 --- a/modulesets/xjh.modules +++ b/modulesets/xjh.modules @@ -20,8 +20,8 @@ When adding a module, please consider the following conventions: <!-- xcb ================================================================== --> <!-- ====================================================================== --> - <autotools id="pthread-stubs"> - <branch module="xcb/pthread-stubs" checkoutdir="xcb/pthread-stubs"/> + <autotools id="libpthread-stubs"> + <branch module="xcb/pthread-stubs" checkoutdir="xcb/libpthread-stubs"/> </autotools> <autotools id="xcb-proto"> @@ -31,7 +31,7 @@ When adding a module, please consider the following conventions: <autotools id="libxcb"> <dependencies> <dep package="xcb-proto"/> - <dep package="pthread-stubs"/> + <dep package="libpthread-stubs"/> <dep package="libXau"/> </dependencies> <branch module="xcb/libxcb" checkoutdir="xcb/libxcb"/> -- 1.7.1
_______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
