summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-05-10 02:16:01 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-05-10 02:19:34 -0300
commit59e4850d2a0427b3598a66d612b1812a37d2e002 (patch)
tree5baa5999356df4ed4e8fa80a5db1af285f018176
parent24ed07fa64e56f7095083c5cc2d01890c6a80623 (diff)
Add armv7h supportparabolaweb-2016-05-10
-rw-r--r--main/fixtures/arches.json11
-rw-r--r--packages/views/__init__.py2
-rw-r--r--templates/packages/details.html.jinja2
3 files changed, 14 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 047bd8f6..80508392 100644
--- a/templates/packages/details.html.jinja
+++ b/templates/packages/details.html.jinja
@@ -37,6 +37,8 @@
'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>