Merge "Remove i386 amphora build support"

This commit is contained in:
Zuul 2023-01-04 12:00:44 +00:00 committed by Gerrit Code Review
commit c47bc0d90c
3 changed files with 5 additions and 6 deletions

View File

@ -99,7 +99,7 @@ Command syntax:
.. code-block::
$ diskimage-create.sh
[-a i386 | **amd64** | armhf | aarch64 | ppc64le ]
[-a **amd64** | armhf | aarch64 | ppc64le ]
[-b **haproxy** ]
[-c **~/.cache/image-create** | <cache directory> ]
[-d **focal**/**9-stream**/**9** | <other release id> ]

View File

@ -20,7 +20,7 @@ set -e
usage() {
echo
echo "Usage: $(basename "$0")"
echo " [-a i386 | **amd64** | armhf | aarch64 | ppc64le]"
echo " [-a **amd64** | armhf | aarch64 | ppc64le]"
echo " [-b **haproxy** ]"
echo " [-c **~/.cache/image-create** | <cache directory> ]"
echo " [-d **focal**/**9-stream**/**9** | <other release id> ]"
@ -96,8 +96,7 @@ while getopts "a:b:c:d:efg:hi:k:l:no:pt:r:s:vw:xy" opt; do
case $opt in
a)
AMP_ARCH=$OPTARG
if [ "$AMP_ARCH" != "i386" ] && \
[ "$AMP_ARCH" != "amd64" ] && \
if [ "$AMP_ARCH" != "amd64" ] && \
[ "$AMP_ARCH" != "ppc64le" ] && \
[ "$AMP_ARCH" != "aarch64" ] && \
[ "$AMP_ARCH" != "armhf" ]; then

View File

@ -21,7 +21,7 @@ acl:
acpid-ppc64le:
arch: ppc64le, ppc64el
acpid:
arch: i386, amd64, aarch64, arm64, s390x
arch: amd64, aarch64, arm64, s390x
apparmor:
apt-transport-https:
at:
@ -49,7 +49,7 @@ netbase:
netcat-openbsd:
network-scripts:
open-vm-tools:
arch: i386, amd64
arch: amd64
openssh-client:
openssh-server:
pollinate: