diff options
| -rw-r--r-- | commands/sysdeps.py | 3 | ||||
| -rw-r--r-- | config/modulesets/glucose-external.modules | 7 | ||||
| -rw-r--r-- | config/modulesets/glucose.modules | 1 | ||||
| -rw-r--r-- | config/modulesets/tools.modules | 7 | ||||
| -rw-r--r-- | config/sysdeps/olpc-3.xml | 60 |
5 files changed, 70 insertions, 8 deletions
diff --git a/commands/sysdeps.py b/commands/sysdeps.py index 4830bfa..b398cff 100644 --- a/commands/sysdeps.py +++ b/commands/sysdeps.py @@ -7,6 +7,9 @@ scripts_dir = os.path.dirname(__file__) base_dir = os.path.dirname(scripts_dir) def get_distribution(): + if 'SJH_DISTRIBUTION' in os.environ: + return os.environ['SJH_DISTRIBUTION'].split('-') + # Fedora if os.path.exists('/etc/fedora-release'): name = 'fedora' diff --git a/config/modulesets/glucose-external.modules b/config/modulesets/glucose-external.modules index 07765ed..9429f1d 100644 --- a/config/modulesets/glucose-external.modules +++ b/config/modulesets/glucose-external.modules @@ -197,11 +197,4 @@ <dep package="poppler"/> </dependencies> </autotools> - <tarball id="GConf-dbus"> - <source href="http://ftp.gnome.org/pub/gnome/sources/GConf-dbus/2.16/GConf-dbus-2.16.0.tar.bz2" - version="2.16.0" size="1363876" md5sum="3e7d648f75949b5362af807f5408546b"/> - <patches> - <patch file="gconf-dbus-defaultpath.patch" strip="0"/> - </patches> - </tarball> </moduleset> diff --git a/config/modulesets/glucose.modules b/config/modulesets/glucose.modules index 32b0a22..dfc0d51 100644 --- a/config/modulesets/glucose.modules +++ b/config/modulesets/glucose.modules @@ -24,7 +24,6 @@ <autotools id="sugar"> <branch/> <dependencies> - <dep package="GConf-dbus"/> <dep package="sugar-base"/> <dep package="sugar-toolkit"/> <dep package="artwork"/> diff --git a/config/modulesets/tools.modules b/config/modulesets/tools.modules index f566e92..f9fbd38 100644 --- a/config/modulesets/tools.modules +++ b/config/modulesets/tools.modules @@ -26,6 +26,13 @@ <dep package="logilab-common"/> </dependencies> </distutils> + <tarball id="GConf-dbus"> + <source href="http://ftp.gnome.org/pub/gnome/sources/GConf-dbus/2.16/GConf-dbus-2.16.0.tar.bz2" + version="2.16.0" size="1363876" md5sum="3e7d648f75949b5362af807f5408546b"/> + <patches> + <patch file="gconf-dbus-defaultpath.patch" strip="0"/> + </patches> + </tarball> <metamodule id="meta-tools"> <dependencies> <dep package="pylint"/> diff --git a/config/sysdeps/olpc-3.xml b/config/sysdeps/olpc-3.xml new file mode 100644 index 0000000..8376f5f --- /dev/null +++ b/config/sysdeps/olpc-3.xml @@ -0,0 +1,60 @@ +<?xml version="1.0"?> +<dependencies> + <package name="intltool"/> + <package name="libtool"/> + <package name="python-devel"/> + <package name="gcc"/> + <package name="gcc-c++"/> + <package name="gtk2-devel"/> + <package name="pygtk2-devel"/> + <package name="libcroco-devel"/> + <package name="libgsf-devel"/> + <package name="enchant-devel"/> + <package name="fribidi-devel"/> + <package name="boost-devel"/> + <package name="libXt-devel"/> + <package name="gnome-doc-utils"/> + <package name="expat-devel"/> + <package name="gettext-devel"/> + <package name="wv-devel"/> + <package name="zlib-devel"/> + <package name="gnome-common"/> + <package name="numpy"/> + <package name="gnome-python2-libwnck"/> + <package name="xorg-x11-server-Xephyr"/> + <package name="make"/> + <package name="gnome-python2-rsvg"/> + <package name="python-cjson"/> + <package name="subversion"/> + <package name="GConf2-devel"/> + <package name="libglade2-devel"/> + <package name="popt-devel"/> + <package name="gnome-vfs2-devel"/> + <package name="librsvg2-devel"/> + <package name="gnome-icon-theme"/> + <package name="icon-naming-utils"/> + <package name="xorg-x11-utils"/> + <package name="dejavu-fonts"/> + <package name="gstreamer-python"/> + <package name="icon-slicer"/> + <package name="pygtksourceview"/> + <package name="alsa-lib-devel"/> + <package name="xapian-bindings-python"/> + <package name="xapian-core-libs"/> + <package name="gnome-python2-gconf"/> + + <package name="dbus-python" + source="dbus-python"/> + <package name="dbus-devel" + source="dbus"/> + <package name="dbus-glib-devel" + source="dbus-glib"/> + <package name="loudmouth-devel" + source="loudmouth"/> + <package name="avahi" + source="avahi"/> + <package name="avahi-gobject-devel" + source="avahi"/> + <package name="avahi-tools" + source="avahi"/> +</dependencies> |