sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Add aarch64 support for rhel"

Browse Source
This commit is contained in:
Zuul 2021-03-09 01:52:31 +00:00 committed by Gerrit Code Review
commit 739b529a33
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
diskimage_builder/elements/rhel-common/pre-install.d/00-rhel-registration
View File

@ -9,17 +9,18 @@ set -o pipefail
opts= opts=
attach_opts= attach_opts=
arch=$(uname -m)
if [ "${DIB_RELEASE:-7}" == "7" ]; then if [ "${DIB_RELEASE:-7}" == "7" ]; then
repos="repos --enable rhel-7-server-rpms" repos="repos --enable rhel-7-server-rpms"
satellite_repo="rhel-7-server-rh-common-rpms" satellite_repo="rhel-7-server-rh-common-rpms"
elif [ "${DIB_RELEASE}" == "8" ]; then elif [ "${DIB_RELEASE}" == "8" ]; then
if [ -n "${REG_RELEASE:-}" ]; then if [ -n "${REG_RELEASE:-}" ]; then
repos="repos --enable rhel-8-for-x86_64-appstream-eus-rpms --enable rhel-8-for-x86_64-baseos-eus-rpms" repos="repos --enable rhel-8-for-${arch}-appstream-eus-rpms --enable rhel-8-for-${arch}-baseos-eus-rpms"
else else
repos="repos --enable rhel-8-for-x86_64-appstream-rpms --enable rhel-8-for-x86_64-baseos-rpms" repos="repos --enable rhel-8-for-${arch}-appstream-rpms --enable rhel-8-for-${arch}-baseos-rpms"
fi fi
satellite_repo="satellite-tools-6.5-for-rhel-8-x86_64-rpms" satellite_repo="satellite-tools-6.5-for-rhel-8-${arch}-rpms"
fi fi
REG_SAT_CERT=${REG_SAT_CERT:-"katello-ca-consumer-latest.noarch.rpm"} REG_SAT_CERT=${REG_SAT_CERT:-"katello-ca-consumer-latest.noarch.rpm"}

4
diskimage_builder/elements/rhel/root.d/10-rhel-cloud-image
View File

@ -11,11 +11,13 @@ set -o pipefail
if [[ "amd64 x86_64" =~ "$ARCH" ]]; then if [[ "amd64 x86_64" =~ "$ARCH" ]]; then
ARCH="x86_64" ARCH="x86_64"
elif [[ "$ARCH" =~ (arm64|aarch64) ]]; then
ARCH="aarch64"
elif [[ "ppc64le" =~ "$ARCH" ]]; then elif [[ "ppc64le" =~ "$ARCH" ]]; then
# We don't need to do anything here other than avoid the else clause # We don't need to do anything here other than avoid the else clause
: :
else else
echo 'rhel root element only supports x86_64 and ppc64le values for $ARCH' echo 'rhel root element only supports x86_64, aarch64 and ppc64le values for $ARCH'
exit 1 exit 1
fi fi

4
releasenotes/notes/add-aarch64-support-for-rhel-c62a0e02b1ad9033.yaml Normal file
View File

@ -0,0 +1,4 @@
---
features:
- |
Add aarch64 support for ''rhel''.