Dimitri John Ledkov

Merge ~xnox/+git/kteam-tools:fix-chroot-setup-ports-arches into ~canonical-kernel/+git/kteam-tools:master

  1. Git
  2. lp:~xnox/+git/kteam-tools
  3. fix-chroot-setup-ports-arches
  4. Merge into master
Proposed by Dimitri John Ledkov
Status: Merged
Merge reported by: Dimitri John Ledkov
Merged at revision: 8ee978d5b7085660dfc1d44e5853a0a57f0bab4e
Proposed branch: ~xnox/+git/kteam-tools:fix-chroot-setup-ports-arches
Merge into: ~canonical-kernel/+git/kteam-tools:master
Diff against target: 15 lines (+2/-2)
1 file modified
chroot-setup/scripts/chroot-defs.conf (+2/-2)
Reviewer Review Type Date Requested Status
Canonical Kernel Pending
Review via email: mp+402326@code.launchpad.net

Commit message

    chroot-setup: invert ports_arches check

    riscv64 had a typpo, missing 'c'. arm64 was missing. Ports arches are
    not special snowflakes, only i386/amd64 are. Invert the check to mark
    everything as a ports arch, and only keep i386/amd64 as non-ports.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/chroot-setup/scripts/chroot-defs.conf b/chroot-setup/scripts/chroot-defs.conf
2index 04b528a..516cedb 100755
3--- a/chroot-setup/scripts/chroot-defs.conf
4+++ b/chroot-setup/scripts/chroot-defs.conf
5@@ -230,8 +230,8 @@ function ports_arch ()
6 local es
7
8 case "${ARCH}" in
9- armel|armhf|lpia|ppc64el|s390x|risv64) es=0 ;;
10- *) es=1 ;;
11+ amd64|i386) es=1 ;;
12+ *) es=0 ;;
13 esac
14
15 return $es

Subscribers

People subscribed via source and target branches