On 11/14/2016 11:55 AM, dmar...@redhat.com wrote:
I was looking at 01-override-yum-arch in diskimage-builder, and have a
question.
Is the following code correct in git, or should $arch be written into
/etc/dnf/vars/arch, similar to the yum path (for F22 and older) as
shown below?
--- a/elements/rpm-distro/pre-install.d/01-override-yum-arch
+++ b/elements/rpm-distro/pre-install.d/01-override-yum-arch
@@ -28,7 +28,7 @@ fi
if [[ $DISTRO_NAME == "fedora" && $DIB_RELEASE -ge 22 ]]; then
mkdir -p /etc/dnf/vars
echo $basearch > /etc/dnf/vars/basearch
- echo $arch > /etc/dnf/vars/basearch
+ echo $arch > /etc/dnf/vars/arch
else
echo $basearch > /etc/yum/vars/basearch
echo $arch > /etc/yum/vars/arch
Thank you,
d.marlin
In addition, I have created a small patch against git master (attached)
that will permit me to run disk-image-creator native on Fedora 25 Beta
AArch64, tested using the following command:
DIB_RELEASE=24 disk-image-create -o test.qcow2 fedora-minimal
Please let me know if this approach is acceptable, or if you have
suggestions for improvements.
Thank you,
d.marlin
diff --git a/elements/architecture-emulation-binaries/extra-data.d/01-copy-binary b/elements/architecture-emulation-binaries/extra-data.d/01-copy-binary
index 0140990..ee970b0 100755
--- a/elements/architecture-emulation-binaries/extra-data.d/01-copy-binary
+++ b/elements/architecture-emulation-binaries/extra-data.d/01-copy-binary
@@ -53,7 +53,7 @@ case "$ARCH" in
qemu_binary_file="/usr/bin/qemu-arm-static"
copy_binary $qemu_binary_file $ARCH
;;
- "arm64")
+ "arm64" | "aarch64")
qemu_binary_file="/usr/bin/qemu-aarch64-static"
copy_binary $qemu_binary_file $ARCH
;;
diff --git a/elements/rpm-distro/pre-install.d/01-override-yum-arch b/elements/rpm-distro/pre-install.d/01-override-yum-arch
index ff84375..4cda643 100755
--- a/elements/rpm-distro/pre-install.d/01-override-yum-arch
+++ b/elements/rpm-distro/pre-install.d/01-override-yum-arch
@@ -18,6 +18,9 @@ elif [[ "$ARCH" = "ppc64" ]]; then
elif [[ "$ARCH" = "ppc64el" ]]; then
basearch=ppc64el
arch=ppc64el
+elif [[ "$ARCH" = "aarch64" ]]; then
+ basearch=aarch64
+ arch=aarch64
else
echo "********************"
echo "Unknown arch '$ARCH'"
diff --git a/lib/common-defaults b/lib/common-defaults
index e047185..428f58f 100644
--- a/lib/common-defaults
+++ b/lib/common-defaults
@@ -26,6 +26,8 @@ else
"armv"*)
_ARCH="armhf"
;;
+ "aarch64")
+ ;;
*)
echo "WARNING: Unknown architecture: $_ARCH"
;;
__________________________________________________________________________
OpenStack Development Mailing List (not for usage questions)
Unsubscribe: openstack-dev-requ...@lists.openstack.org?subject:unsubscribe
http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev
