From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 13 Apr 2016 19:22:56 +0000 (+0200)
Subject: webapp: Prepare for x86_64
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6371bfda57324fd9958b47980a4bc61a630c1bba;p=ipfire.org.git

webapp: Prepare for x86_64

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/webapp/backend/releases.py b/webapp/backend/releases.py
index 48f7b5d2..6c556114 100644
--- a/webapp/backend/releases.py
+++ b/webapp/backend/releases.py
@@ -168,7 +168,7 @@ class File(Object):
 
 	@property
 	def arch(self):
-		known_arches = ("i586", "arm")
+		known_arches = ("x86_64", "i586", "arm")
 
 		for arch in known_arches:
 			if arch in self.basename:
@@ -366,11 +366,7 @@ class Release(Object):
 				f.close()
 
 	def supports_arch(self, arch):
-		# Currently there is nothing else than i586 supported
-		if arch == "i586":
-			return True
-
-		return False
+		return arch in ("x86_64", "i586")
 
 	def supports_platform(self, platform):
 		# Currently there is nothing else than pcbios supported
@@ -386,12 +382,18 @@ class Release(Object):
 		assert self.supports_arch(arch)
 		assert self.supports_platform(platform)
 
+		if self.sname >= "ipfire-2.19-core100":
+			return "http://downloads.ipfire.org/%s/images/%s/vmlinuz" % (self.path, arch)
+
 		return "http://downloads.ipfire.org/%s/images/vmlinuz" % self.path
 
 	def netboot_initrd_url(self, arch, platform):
 		assert self.supports_arch(arch)
 		assert self.supports_platform(platform)
 
+		if self.sname >= "ipfire-2.19-core100":
+			return "http://downloads.ipfire.org/%s/images/%s/instroot" % (self.path, arch)
+
 		return "http://downloads.ipfire.org/%s/images/instroot" % self.path
 
 	def netboot_args(self, arch, platform):
diff --git a/webapp/ui_modules.py b/webapp/ui_modules.py
index 514688fa..d70d1324 100644
--- a/webapp/ui_modules.py
+++ b/webapp/ui_modules.py
@@ -264,10 +264,10 @@ class SidebarReleaseModule(UIModule):
 
 class ReleaseItemModule(UIModule):
 	def render(self, release, latest=False):
-		arches = ("i586", "arm")
+		arches = ("x86_64", "i586", "arm")
 
 		downloads = []
-		for arch in ("i586", "arm"):
+		for arch in arches:
 			files = []
 
 			for file in release.files:
@@ -296,7 +296,8 @@ class DownloadButtonModule(UIModule):
 		best_image = None
 
 		for file in release.files:
-			if file.type == "iso":
+			if (release.sname < "ipfire-2.19-core100" or file.arch == "x86_64") \
+					and file.type == "iso":
 				best_image = file
 				break