summaryrefslogtreecommitdiffstats
path: root/source-builder/sb/linux.py
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2013-04-25 15:30:48 +1000
committerChris Johns <chrisj@rtems.org>2013-04-25 15:30:48 +1000
commit40fec60c2a73b36ffd9064f7b7131e68aec416ea (patch)
tree3a3f21d36c3ec7c4db69564861c8e9ee471f6920 /source-builder/sb/linux.py
parentUndefine all possible patches. (diff)
downloadrtems-source-builder-40fec60c2a73b36ffd9064f7b7131e68aec416ea.tar.bz2
Update for Fedora 17 changes.
Diffstat (limited to 'source-builder/sb/linux.py')
-rw-r--r--source-builder/sb/linux.py15
1 files changed, 12 insertions, 3 deletions
diff --git a/source-builder/sb/linux.py b/source-builder/sb/linux.py
index 4fcb088..c5c7977 100644
--- a/source-builder/sb/linux.py
+++ b/source-builder/sb/linux.py
@@ -69,21 +69,28 @@ def load():
# Works for LSB distros
distro = platform.dist()[0]
+ distro_ver = platform.dist()[2]
# Non LSB - fail over to issue
if distro == '':
try:
issue = open('/etc/issue').read()
distro = issue.split(' ')[0]
+ distro_ver = issue.split(' ')[2]
except:
pass
# Manage distro aliases
- if distro in ['centos', 'fedora']:
+ if distro in ['centos']:
distro = 'redhat'
- if distro in ['Ubuntu', 'ubuntu']:
+ elif distro in ['fedora']:
+ if distro_ver < 17:
+ distro = 'redhat'
+ elif distro in ['centos', 'fedora']:
+ distro = 'redhat'
+ elif distro in ['Ubuntu', 'ubuntu']:
distro = 'debian'
- if distro in ['Arch']:
+ elif distro in ['Arch']:
distro = 'arch'
variations = {
@@ -99,6 +106,8 @@ def load():
'__grep': ('exe', 'required', '/bin/grep'),
'__sed': ('exe', 'required', '/bin/sed'),
'__touch': ('exe', 'required', '/bin/touch') },
+ 'fedora' : { '__chown': ('exe', 'required', '/usr/bin/chown'),
+ '__install_info': ('exe', 'required', '/usr/sbin/install-info') },
'arch' : { '__gzip': ('exe', 'required', '/usr/bin/gzip'),
'__chown': ('exe', 'required', '/usr/bin/chown') },
}