diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2016-05-10 02:16:01 -0300 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@parabola.nu> | 2019-03-10 01:08:41 -0500 |
| commit | 38d90eb4a1c3b67b0fa92bad7ebfbd80e2de35f3 (patch) | |
| tree | dfebe096f79f7818767a4deb8f41b825cca3294a | |
| parent | e43dc1266599265b9076d40664a458e4f7b29307 (diff) | |
Add armv7h support
| -rw-r--r-- | main/fixtures/arches.json | 11 | ||||
| -rw-r--r-- | packages/views/__init__.py | 2 | ||||
| -rw-r--r-- | templates/packages/details.html.jinja | 6 |
3 files changed, 18 insertions, 1 deletions
diff --git a/main/fixtures/arches.json b/main/fixtures/arches.json index 1ece16c9..2ceeea5a 100644 --- a/main/fixtures/arches.json +++ b/main/fixtures/arches.json @@ -13,7 +13,7 @@ "model": "main.arch", "fields": { "agnostic": false, - "name": "i686", + "name": "armv7h", "required_signoffs": 1 } }, @@ -22,6 +22,15 @@ "model": "main.arch", "fields": { "agnostic": false, + "name": "i686", + "required_signoffs": 1 + } +}, +{ + "pk": 4, + "model": "main.arch", + "fields": { + "agnostic": false, "name": "x86_64", "required_signoffs": 2 } diff --git a/packages/views/__init__.py b/packages/views/__init__.py index 6195e1f0..84ca37f2 100644 --- a/packages/views/__init__.py +++ b/packages/views/__init__.py @@ -109,11 +109,13 @@ def arch_differences(request): # TODO: we have some hardcoded magic here with respect to the arches. arch_a = Arch.objects.get(name=request.GET.get('arch_a', 'i686')) arch_b = Arch.objects.get(name=request.GET.get('arch_b', 'x86_64')) + arch_c = Arch.objects.get(name=request.GET.get('arch_c', 'armv7h')) differences = get_differences_info(arch_a, arch_b) multilib_diffs = multilib_differences() context = { 'arch_a': arch_a, 'arch_b': arch_b, + 'arch_c': arch_c, 'differences': differences, 'arches': Arch.objects.filter(agnostic=False), 'multilib_differences': multilib_diffs diff --git a/templates/packages/details.html.jinja b/templates/packages/details.html.jinja index 189fdb5e..80508392 100644 --- a/templates/packages/details.html.jinja +++ b/templates/packages/details.html.jinja @@ -29,11 +29,17 @@ <li><a href="unflag/all/" title="Unflag all matching pkgbase">Click here to unflag all split packages</a></li> {% endif %} {% else %} + {% if pkg.repo.name != "Core" and pkg.repo.name != "Extra" and pkg.repo.name != "Testing" and pkg.repo.name != "Community" and pkg.repo.name != "Community-Testing" and pkg.repo.name != "Multilib" and pkg.repo.name != "Multilib-testing" or pkg.arch.name == "mips64el" %} <li><a href="flag/" title="Flag {{ pkg.pkgname }} as out-of-date">Flag Package Out-of-Date</a> <a href="/packages/flaghelp/" title="Get help on package flagging" onclick="return !window.open('/packages/flaghelp/','FlagHelp', 'height=350,width=450,location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=no');">(?)</a></li> + {% elif pkg.arch.name == "i686" or pkg.arch.name == "x86_64" %} + <li>This package comes from Arch</li> + {% elif pkg.arch.name == "armv7h" %} + <li>This package comes from Arch ARM</li> + {% endif %} {% endif %} <li><a href="download/" rel="nofollow" title="Download {{ pkg.pkgname }} from mirror">Download From Mirror</a></li> </ul> |