From 6c332e6f04d235bf77cdedde4833a7c8a64c0bc5 Mon Sep 17 00:00:00 2001 From: CloudBuilder Date: Fri, 26 Jun 2020 00:54:23 +0000 Subject: [PATCH] Imported 2.669 No reason for CPC update specified. --- debian/changelog | 6 ++++++ live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e5dc942b..343ce228 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.669) groovy; urgency=medium + + * chroot: disable amd64 codepath on riscv64 + + -- Dimitri John Ledkov Thu, 25 Jun 2020 18:02:51 +0100 + livecd-rootfs (2.668) groovy; urgency=medium [ Łukasz 'sil2100' Zemczak ] diff --git a/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot b/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot index bc516092..7817c430 100755 --- a/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot +++ b/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot @@ -116,8 +116,8 @@ fi case $arch in - # ARM, ppc and s390 images are special - armhf|arm64|powerpc|ppc64el|s390x) + # ARM, ppc, riscv64 and s390x images are special + armhf|arm64|powerpc|ppc64el|s390x|riscv64) exit 0 ;; esac