[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#777748: grub-installer: x32 port



Package: grub-installer
Version: 1.105
Severity: wishlist
Tags: d-i patch
User: debian-x32@lists.debian.org
Usertags: port-x32 di-x32

Hi!
Please apply the attached patch.  It adds support for the x32 architecture.
This uses in every case amd64 code paths, as x32 in an ABI atop the amd64
kernel.

If you want to test, as the patch-set for x32 in d-i involves around twenty
packages, you'll want ready packages from the repository at debian-x32.org.
Complete d-i isos are available at http://debian-x32.org/#debian-installer 
while debs/udebs/modified sources at http://ftp.debian-x32.org/debian/


-- System Information:
Debian Release: 8.0
  APT prefers unstable
  APT policy: (600, 'unstable'), (500, 'unreleased'), (50, 'experimental')
Architecture: x32 (x86_64)

Kernel: Linux 3.19.0-x32 (SMP w/6 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: sysvinit (via /sbin/init)
>From ae118c2291de0eb8a5ccb783c87c00783756c514 Mon Sep 17 00:00:00 2001
From: Adam Borowski <kilobyte@angband.pl>
Date: Thu, 12 Feb 2015 07:11:26 +0100
Subject: [PATCH] Add support for x32.

This is identical to amd64, as x32 uses amd64 kernels.
---
 debian/control       | 2 +-
 debian/isinstallable | 2 +-
 grub-installer       | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index 89538b7..8662673 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=d-i/grub-installer.git
 Vcs-Git: git://anonscm.debian.org/d-i/grub-installer.git
 
 Package: grub-installer
-Architecture: i386 hurd-i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc ppc64el mipsel arm64
+Architecture: i386 hurd-i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc ppc64el mipsel arm64 x32
 XB-Subarchitecture: ${subarch}
 Provides: bootable-system
 Depends: ${shlibs:Depends}, ${misc:Depends}, kernel-installer, created-fstab, di-utils (>= 1.15), di-utils-mapdevfs, os-prober, partman-utils
diff --git a/debian/isinstallable b/debian/isinstallable
index 9956321..7dab8ff 100755
--- a/debian/isinstallable
+++ b/debian/isinstallable
@@ -8,7 +8,7 @@ log() {
 ARCH="$(archdetect)"
 
 case $ARCH in
-    i386/mac|amd64/mac)
+    i386/mac|amd64/mac|x32/mac)
 	# Note: depends on partman-efi to load the efivars module!
 	if [ -d /sys/firmware/efi ]; then
 		log "GRUB not yet usable on Intel-based Macs booted using EFI"
diff --git a/grub-installer b/grub-installer
index a531d69..e1ce949 100755
--- a/grub-installer
+++ b/grub-installer
@@ -319,7 +319,7 @@ case $ARCH in
     arm64/efi)
 	grub_package="grub-efi-arm64"
 	;;
-    i386/mac|amd64/mac)
+    i386/mac|amd64/mac|x32/mac)
 	# Note: depends on partman-efi to load the efivars module!
 	if [ -d /sys/firmware/efi ]; then
 		# This point can't be reached (yet).  See debian/isinstallable.
@@ -328,7 +328,7 @@ case $ARCH in
 		grub_package="grub-pc"
 	fi
 	;;
-    i386/efi|amd64/efi)
+    i386/efi|amd64/efi|x32/efi)
 	if [ -f /var/lib/partman/ignore_uefi ]; then
 		grub_package="grub-pc"
 	else
@@ -345,7 +345,7 @@ case $ARCH in
 		fi
 	fi
 	;;
-    i386/*|amd64/*)
+    i386/*|amd64/*|x32/*)
 	grub_package="grub-pc"
 	;;
     powerpc/*)
@@ -863,7 +863,7 @@ else
 	case $(archdetect) in
 	    i386/*)
 		stagedir=i386-pc ;;
-	    amd64/*)
+	    amd64/*|x32/*)
 		stagedir=x86_64-pc ;;
 	    *)
 		error "Unsupported architecture for SATA RAID/multipath installation"
-- 
2.1.4


Reply to: