diff options
| author | Andoni Morales Alastruey <ylatuya@gmail.com> | 2013-05-06 13:34:19 +0200 |
|---|---|---|
| committer | Andoni Morales Alastruey <ylatuya@gmail.com> | 2013-05-06 13:37:15 +0200 |
| commit | c403c74a4340f5c4c8d9459e817f1b0f319258ae (patch) | |
| tree | b57d202aff65a333e9580491ca557d7e38471f55 | |
| parent | be6e6c9df1172e6567e147726c1499c341c94fa5 (diff) | |
Add support for Ubuntu Raring
| -rw-r--r-- | cerbero/enums.py | 1 | ||||
| -rw-r--r-- | cerbero/utils/__init__.py | 2 | ||||
| -rw-r--r-- | recipes/glib.recipe | 4 | ||||
| -rw-r--r-- | recipes/gtk.recipe | 4 | ||||
| -rw-r--r-- | recipes/libsoup.recipe | 1 |
5 files changed, 10 insertions, 2 deletions
diff --git a/cerbero/enums.py b/cerbero/enums.py index 8fb00b6..c109368 100644 --- a/cerbero/enums.py +++ b/cerbero/enums.py @@ -57,6 +57,7 @@ class DistroVersion: UBUNTU_ONEIRIC = 'ubuntu_oneiric' UBUNTU_PRECISE = 'ubuntu_precise' UBUNTU_QUANTAL = 'ubuntu_quantal' + UBUNTU_RARING = 'ubuntu_raring' FEDORA_16 = 'fedora_16' FEDORA_17 = 'fedora_17' FEDORA_18 = 'fedora_18' diff --git a/cerbero/utils/__init__.py b/cerbero/utils/__init__.py index 338e9f3..f5cc16b 100644 --- a/cerbero/utils/__init__.py +++ b/cerbero/utils/__init__.py @@ -142,6 +142,8 @@ def system_info(): distro_version = DistroVersion.UBUNTU_PRECISE elif d[2] == 'quantal': distro_version = DistroVersion.UBUNTU_QUANTAL + elif d[2] == 'raring': + distro_version = DistroVersion.UBUNTU_RARING elif d[1].startswith('6.'): distro_version = DistroVersion.DEBIAN_SQUEEZE elif d[1].startswith('7.') or d[1].startswith('wheezy'): diff --git a/recipes/glib.recipe b/recipes/glib.recipe index 31d3d29..9baf5f6 100644 --- a/recipes/glib.recipe +++ b/recipes/glib.recipe @@ -97,7 +97,9 @@ class Recipe(recipe.Recipe): elif self.config.target_platform == Platform.LINUX: if self.config.target_distro == Distro.DEBIAN and self.config.target_distro_version in [DistroVersion.DEBIAN_SQUEEZE, DistroVersion.UBUNTU_LUCID, DistroVersion.UBUNTU_MAVERICK]: self.config_sh = 'CFLAGS="%s" ./configure' % self._gio_flags('/usr/lib/gio/modules/', None, True) - elif self.config.target_distro == Distro.DEBIAN and self.config.target_distro_version in [DistroVersion.UBUNTU_NATTY, DistroVersion.UBUNTU_ONEIRIC, DistroVersion.UBUNTU_PRECISE, DistroVersion.UBUNTU_QUANTAL]: + elif self.config.target_distro == Distro.DEBIAN and self.config.target_distro_version in [DistroVersion.UBUNTU_NATTY, + DistroVersion.UBUNTU_ONEIRIC, DistroVersion.UBUNTU_PRECISE, + DistroVersion.UBUNTU_QUANTAL, DistroVersion.UBUNTU_RARING]: if self.config.target_arch == Architecture.X86: self.config_sh = 'CFLAGS="%s" ./configure' % self._gio_flags('/usr/lib/gio/modules/', '/usr/lib/i386-linux-gnu/gio/modules') elif self.config.target_arch == Architecture.X86_64: diff --git a/recipes/gtk.recipe b/recipes/gtk.recipe index 3dc1001..b25c439 100644 --- a/recipes/gtk.recipe +++ b/recipes/gtk.recipe @@ -80,7 +80,9 @@ class Recipe(recipe.Recipe): self.can_use_configure_cache = False if self.config.target_distro == Distro.DEBIAN and self.config.target_distro_version in [DistroVersion.DEBIAN_SQUEEZE, DistroVersion.UBUNTU_LUCID, DistroVersion.UBUNTU_MAVERICK]: self.config_sh = 'CFLAGS="%s" ./configure' % self._gtk_flags('/usr/lib/gtk-2.0', None, '/usr/share/themes') - elif self.config.target_distro == Distro.DEBIAN and self.config.target_distro_version in [DistroVersion.UBUNTU_NATTY, DistroVersion.UBUNTU_ONEIRIC, DistroVersion.UBUNTU_PRECISE, DistroVersion.UBUNTU_QUANTAL]: + elif self.config.target_distro == Distro.DEBIAN and self.config.target_distro_version in [DistroVersion.UBUNTU_NATTY, + DistroVersion.UBUNTU_ONEIRIC, DistroVersion.UBUNTU_PRECISE, + DistroVersion.UBUNTU_QUANTAL, DistroVersion.UBUNTU_RARING]: if self.config.target_arch == Architecture.X86: self.config_sh = 'CFLAGS="%s" ./configure' % self._gtk_flags('/usr/lib/gtk-2.0', '/usr/lib/i386-linux-gnu/gtk-2.0', '/usr/share/themes') elif self.config.target_arch == Architecture.X86_64: diff --git a/recipes/libsoup.recipe b/recipes/libsoup.recipe index a7583a8..4b908ba 100644 --- a/recipes/libsoup.recipe +++ b/recipes/libsoup.recipe @@ -23,6 +23,7 @@ class Recipe(recipe.Recipe): DistroVersion.UBUNTU_ONEIRIC, DistroVersion.UBUNTU_PRECISE, DistroVersion.UBUNTU_QUANTAL, + DistroVersion.UBUNTU_RARING, DistroVersion.FEDORA_16, DistroVersion.FEDORA_17, DistroVersion.FEDORA_18, |