diff options
| author | Andoni Morales Alastruey <ylatuya@gmail.com> | 2013-06-25 15:47:26 +0200 |
|---|---|---|
| committer | Andoni Morales Alastruey <ylatuya@gmail.com> | 2013-06-25 17:04:37 +0200 |
| commit | f1b21236cb4a235bcc24d4a8ec1fbaef58bde205 (patch) | |
| tree | b0340c63dd11c4676958622f02c4631efa99e483 | |
| parent | 44b23c534be70e43fd92a5f003b2552861bfe9e2 (diff) | |
Add support for CentOS and REHL 6.x
| -rw-r--r-- | cerbero/utils/__init__.py | 4 | ||||
| -rw-r--r-- | recipes/glib.recipe | 4 | ||||
| -rw-r--r-- | recipes/gtk.recipe | 2 | ||||
| -rw-r--r-- | recipes/libsoup.recipe | 4 |
4 files changed, 11 insertions, 3 deletions
diff --git a/cerbero/utils/__init__.py b/cerbero/utils/__init__.py index 81470e1..8d75708 100644 --- a/cerbero/utils/__init__.py +++ b/cerbero/utils/__init__.py @@ -152,7 +152,7 @@ def system_info(): distro_version = DistroVersion.DEBIAN_JESSIE else: raise FatalError("Distribution '%s' not supported" % str(d)) - elif d[0] in ['RedHat', 'Fedora']: + elif d[0] in ['RedHat', 'Fedora', 'CentOS']: distro = Distro.REDHAT if d[1] == '16': distro_version = DistroVersion.FEDORA_16 @@ -162,6 +162,8 @@ def system_info(): distro_version = DistroVersion.FEDORA_18 elif d[1] == '19': distro_version = DistroVersion.FEDORA_19 + elif d[1].startswith('6.'): + distro_version = DistroVersion.REDHAT_6 else: # FIXME Fill this raise FatalError("Distribution '%s' not supported" % str(d)) diff --git a/recipes/glib.recipe b/recipes/glib.recipe index b15852d..9a80b19 100644 --- a/recipes/glib.recipe +++ b/recipes/glib.recipe @@ -128,7 +128,9 @@ class Recipe(recipe.Recipe): elif self.config.target_distro_version in [DistroVersion.FEDORA_16, DistroVersion.FEDORA_17, DistroVersion.FEDORA_18, - DistroVersion.FEDORA_19]: + DistroVersion.FEDORA_19, + DistroVersion.REDHAT_6, + ]: if self.config.target_arch == Architecture.X86_64: path1 = '/usr/lib64/gio/modules/' # Suse diff --git a/recipes/gtk.recipe b/recipes/gtk.recipe index 4401d50..a316e1b 100644 --- a/recipes/gtk.recipe +++ b/recipes/gtk.recipe @@ -109,6 +109,8 @@ class Recipe(recipe.Recipe): DistroVersion.FEDORA_17, DistroVersion.FEDORA_18, DistroVersion.FEDORA_19, + DistroVersion.REDHAT_6, + ]: if self.config.target_arch == Architecture.X86_64: mod_path1 = '/usr/lib64/gtk-2.0' elif self.config.target_distro == Distro.SUSE: diff --git a/recipes/libsoup.recipe b/recipes/libsoup.recipe index 400a8b7..d2ef685 100644 --- a/recipes/libsoup.recipe +++ b/recipes/libsoup.recipe @@ -28,7 +28,9 @@ class Recipe(recipe.Recipe): DistroVersion.FEDORA_16, DistroVersion.FEDORA_17, DistroVersion.FEDORA_18, - DistroVersion.FEDORA_19]: + DistroVersion.FEDORA_19, + DistroVersion.REDHAT_6, + ]: self.deps += [ 'glib-networking' ] if self.config.target_platform in [Platform.WINDOWS, Platform.IOS]: self.configure_options += ' --disable-tls-check' |