diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2011-08-24 22:58:51 (GMT) |
|---|---|---|
| committer | Daniel Drake <dsd@laptop.org> | 2011-08-25 09:35:59 (GMT) |
| commit | f9e5d933b56d7821657eef19c4400490c6c25ab3 (patch) | |
| tree | 5bc78926484d053c2d1174602d282afdb4f2939c | |
| parent | 99e5f723ffeb82509dba759bc9241aa26f823002 (diff) | |
repos: add ability to specify arch for fedora repos
Needed for ARM support.
| -rw-r--r-- | examples/f14-xo1.5.ini | 1 | ||||
| -rw-r--r-- | examples/f14-xo1.ini | 1 | ||||
| -rw-r--r-- | modules/repos/README | 6 | ||||
| -rw-r--r-- | modules/repos/ksmain.50.repos.py | 9 |
4 files changed, 12 insertions, 5 deletions
diff --git a/examples/f14-xo1.5.ini b/examples/f14-xo1.5.ini index a3460d4..97342c4 100644 --- a/examples/f14-xo1.5.ini +++ b/examples/f14-xo1.5.ini @@ -25,6 +25,7 @@ size_1=3865470566,zd4 size_2=1932735283,zd2 [repos] +fedora_arch=i386 fedora=fedora,fedora-updates,fedora-updates-testing olpc_publicrpms_1=1,f14 olpc_publicrpms_2=1,f14-xo1.5 diff --git a/examples/f14-xo1.ini b/examples/f14-xo1.ini index 813fcc0..9dfa12f 100644 --- a/examples/f14-xo1.ini +++ b/examples/f14-xo1.ini @@ -19,6 +19,7 @@ modules= gnome [repos] +fedora_arch=i386 fedora=fedora,fedora-updates,fedora-updates-testing olpc_publicrpms_1=1,f14 olpc_publicrpms_2=1,f14-xo1 diff --git a/modules/repos/README b/modules/repos/README index 3a52ddf..c35d859 100644 --- a/modules/repos/README +++ b/modules/repos/README @@ -8,15 +8,19 @@ release repository (and perhaps update) or equivalent is enabled. Everything is done through the configuration. -Firstly, the 'fedora' option: +Firstly, the 'fedora' and 'fedora_arch' options: [repos] +fedora_arch=i386 fedora=fedora,fedora-updates,fedora-updates-testing This is a comma-separated list of official Fedora repositories to enable for the build. The 4 possible options are fedora, fedora-updates, fedora-updates-testing and rawhide. +If using the fedora option, the fedora_arch option must be specified too. +This specifies the processor architecture to use for Fedora package selection. +See http://mirrors.fedoraproject.org/ for the available values. The olpc_frozen_ options: diff --git a/modules/repos/ksmain.50.repos.py b/modules/repos/ksmain.50.repos.py index 4f473ea..890369e 100644 --- a/modules/repos/ksmain.50.repos.py +++ b/modules/repos/ksmain.50.repos.py @@ -25,6 +25,7 @@ excludepkgs = set() addexcludes = ooblib.read_config('repos', 'add_excludes_to') fedora = ooblib.read_config('repos', 'fedora') fver = ooblib.read_config('global', 'fedora_release').strip() +farch = ooblib.read_config('repos', 'fedora_arch').strip() # clean up addexcludes list if addexcludes is not None: @@ -64,13 +65,13 @@ if fedora is not None: for repo in fedora.split(','): repo = repo.strip() if repo == "fedora": - repos["fedora"] = ("mirrorlist", "http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-%s&arch=i386" % fver) + repos["fedora"] = ("mirrorlist", "http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-%s&arch=%s" % (fver, farch)) elif repo == "fedora-updates": - repos["fedora-updates"] = ("mirrorlist", "http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f%s&arch=i386" % fver) + repos["fedora-updates"] = ("mirrorlist", "http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f%s&arch=%s" % (fver, farch)) elif repo == "fedora-updates-testing": - repos["fedora-updates-testing"] = ("mirrorlist", "http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f%s&arch=i386" % fver) + repos["fedora-updates-testing"] = ("mirrorlist", "http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f%s&arch=%s" % (fver, farch)) elif repo == "rawhide": - repos["rawhide"] = ("mirrorlist", "http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=i386") + repos["rawhide"] = ("mirrorlist", "http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=%s" % farch) # generate repo lines including excludes excludepkgs = list(excludepkgs) |