curtin-dev team mailing list archive

[Dan Bungert <mp+419137@xxxxxxxxxxxxxxxxxx>]

Dan Bungert has proposed merging ~dbungert/curtin:server/jammy into curtin:ubuntu/jammy.

Commit message:
Create ubuntu/jammy branch
Cherry-pick two risc-v fixes: 1b612eb, 8c13139

Requested reviews:
  curtin developers (curtin-dev)

For more details, see:
https://code.launchpad.net/~dbungert/curtin/+git/curtin/+merge/419137
-- 
Your team curtin developers is requested to review the proposed merge of ~dbungert/curtin:server/jammy into curtin:ubuntu/jammy.

diff --git a/curtin/commands/apt_config.py b/curtin/commands/apt_config.py
index 262d653..1dc0233 100644
--- a/curtin/commands/apt_config.py
+++ b/curtin/commands/apt_config.py
@@ -40,7 +40,7 @@ PRIMARY_ARCH_MIRRORS = {"PRIMARY": "http://archive.ubuntu.com/ubuntu/";,
 PORTS_MIRRORS = {"PRIMARY": "http://ports.ubuntu.com/ubuntu-ports";,
                  "SECURITY": "http://ports.ubuntu.com/ubuntu-ports"}
 PRIMARY_ARCHES = ['amd64', 'i386']
-PORTS_ARCHES = ['s390x', 'arm64', 'armhf', 'powerpc', 'ppc64el']
+PORTS_ARCHES = ['s390x', 'arm64', 'armhf', 'powerpc', 'ppc64el', 'riscv64']
 
 APT_SOURCES_PROPOSED = (
     "deb $MIRROR $RELEASE-proposed main restricted universe multiverse")
diff --git a/curtin/commands/install_grub.py b/curtin/commands/install_grub.py
index ba46bd2..74ffdf1 100644
--- a/curtin/commands/install_grub.py
+++ b/curtin/commands/install_grub.py
@@ -62,6 +62,9 @@ def get_grub_package_name(target_arch, uefi, rhel_ver=None):
         elif target_arch == 'i386':
             grub_name = 'grub-efi-ia32'
             grub_target = 'i386-efi'
+        elif target_arch == 'riscv64':
+            grub_name = 'grub-efi-riscv64'
+            grub_target = 'riscv64-efi'
         else:
             raise ValueError('Unsupported UEFI arch: %s' % target_arch)
     else:
diff --git a/debian/control b/debian/control
index 9f0b71d..72bb6cc 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,8 @@ Build-Depends: debhelper (>= 7),
                python3-setuptools,
                python3-yaml
 Homepage: http://launchpad.net/curtin
+Vcs-Git: https://git.launchpad.net/curtin
+Vcs-Browser: https://git.launchpad.net/curtin
 X-Python3-Version: >= 3.2
 
 Package: curtin