From 09b485fbb1289010ec2049c421e9e55a9d85f0e7 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Wed, 27 Apr 2022 14:14:31 -0700
Subject: [PATCH] fix cross compilation for cri-dockerd

---
 .../configs/minikube_aarch64_defconfig        | 113 ------------------
 .../cri-dockerd-aarch64/cri-dockerd.mk        |   4 +-
 .../x86_64/configs/minikube_x86_64_defconfig  | 111 -----------------
 3 files changed, 2 insertions(+), 226 deletions(-)
 delete mode 100644 deploy/iso/minikube-iso/arch/aarch64/configs/minikube_aarch64_defconfig
 delete mode 100644 deploy/iso/minikube-iso/arch/x86_64/configs/minikube_x86_64_defconfig

diff --git a/deploy/iso/minikube-iso/arch/aarch64/configs/minikube_aarch64_defconfig b/deploy/iso/minikube-iso/arch/aarch64/configs/minikube_aarch64_defconfig
deleted file mode 100644
index b463771f42..0000000000
--- a/deploy/iso/minikube-iso/arch/aarch64/configs/minikube_aarch64_defconfig
+++ /dev/null
@@ -1,113 +0,0 @@
-# Architecture
-BR2_aarch64=y
-
-# Toolchainmv
-BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
-
-# System
-BR2_SYSTEM_DHCP="eth0"
-BR2_TARGET_GENERIC_GETTY_PORT="tty1"
-BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
-
-# Required tools to create bootable media
-BR2_PACKAGE_HOST_DOSFSTOOLS=y
-BR2_PACKAGE_HOST_GENIMAGE=y
-BR2_PACKAGE_HOST_MTOOLS=y
-
-# Bootloader
-BR2_TARGET_GRUB2=y
-BR2_TARGET_GRUB2_ARM64_EFI=y
-BR2_TARGET_GRUB2_BUILTIN_CONFIG="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/minikube/aarch64/grub-stub.cfg"
-BR2_TARGET_GRUB2_BUILTIN_MODULES="boot linux ext2 fat squash4 part_msdos part_gpt normal efi_gop udf iso9660 search search_fs_file search_fs_uuid search_label"
-
-# Filesystem / image
-BR2_TARGET_ROOTFS_CPIO=y
-BR2_TARGET_ROOTFS_CPIO_LZ4=y
-# BR2_TARGET_ROOTFS_TAR is not set
-BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/minikube/aarch64/post-build.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/minikube/aarch64/post-image.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/minikube/aarch64/genimage.cfg"
-
-
-# Linux headers same as kernel, a 4.19 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
-
-# Kernel
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.202"
-BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
-BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
-BR2_LINUX_KERNEL_INSTALL_TARGET=y
-
-BR2_CCACHE=y
-
-# Packages
-BR2_PACKAGE_ACPID=y
-
-# Minikube
-
-BR2_PACKAGE_VBOX_GUEST=n
-
-BR2_OPTIMIZE_2=y
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/minikube/aarch64/patches"
-BR2_TOOLCHAIN_BUILDROOT_VENDOR="minikube"
-BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
-BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_GCC_ENABLE_LTO=y
-BR2_TARGET_GENERIC_HOSTNAME="minikube"
-BR2_TARGET_GENERIC_ISSUE="Welcome to minikube"
-BR2_TARGET_GENERIC_PASSWD_SHA512=y
-BR2_INIT_SYSTEMD=y
-BR2_ROOTFS_DEVICE_TABLE="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/minikube/aarch64/permissions"
-BR2_SYSTEM_BIN_SH_BASH=y
-BR2_ROOTFS_USERS_TABLES="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/minikube/aarch64/users"
-BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/minikube/aarch64/rootfs-overlay"
-BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/minikube/aarch64/linux_aarch64_defconfig"
-BR2_LINUX_KERNEL_LZ4=y
-BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
-BR2_PACKAGE_GZIP=y
-BR2_PACKAGE_XZ=y
-BR2_PACKAGE_STRACE=y
-BR2_PACKAGE_FINDUTILS=y
-BR2_PACKAGE_GIT=y
-BR2_PACKAGE_CIFS_UTILS=y
-BR2_PACKAGE_E2TOOLS=y
-BR2_PACKAGE_NFS_UTILS=y
-BR2_PACKAGE_SSHFS=y
-BR2_PACKAGE_XFSPROGS=y
-BR2_PACKAGE_PARTED=y
-BR2_PACKAGE_SYSSTAT=y
-BR2_PACKAGE_LUAJIT=y
-BR2_PACKAGE_LZ4=y
-BR2_PACKAGE_LZ4_PROGS=y
-BR2_PACKAGE_CA_CERTIFICATES=y
-BR2_PACKAGE_LIBOPENSSL_BIN=y
-BR2_PACKAGE_LIBCURL_CURL=y
-BR2_PACKAGE_BRIDGE_UTILS=y
-BR2_PACKAGE_CONNTRACK_TOOLS=y
-BR2_PACKAGE_EBTABLES=y
-BR2_PACKAGE_ETHTOOL=y
-BR2_PACKAGE_IPROUTE2=y
-BR2_PACKAGE_IPTABLES=y
-BR2_PACKAGE_RSYNC=y
-BR2_PACKAGE_SOCAT=y
-BR2_PACKAGE_SUDO=y
-BR2_PACKAGE_ACL=y
-BR2_PACKAGE_COREUTILS=y
-BR2_PACKAGE_HTOP=y
-BR2_PACKAGE_OPENVMTOOLS=y
-BR2_PACKAGE_PROCPS_NG=y
-BR2_PACKAGE_PSMISC=y
-BR2_PACKAGE_SYSTEMD_LOGIND=y
-BR2_PACKAGE_SYSTEMD_MACHINED=y
-BR2_PACKAGE_TAR=y
-BR2_PACKAGE_UTIL_LINUX_BINARIES=y
-BR2_PACKAGE_UTIL_LINUX_LOSETUP=y
-BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y
-BR2_PACKAGE_UTIL_LINUX_NSENTER=y
-BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS=y
-BR2_PACKAGE_HOST_E2TOOLS=y
-BR2_PACKAGE_HOST_PYTHON=y
-BR2_PACKAGE_LIBFUSE=y
diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk b/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk
index 124bc1ec39..c77a56c8dd 100644
--- a/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk
@@ -27,12 +27,12 @@ CRI_DOCKERD_COMPILE_SRC = $(CRI_DOCKERD_GOPATH)/src/github.com/Mirantis/cri-dock
 CRI_DOCKERD_BUILDFLAGS = "-ldflags '-X github.com/Mirantis/cri-dockerd/version.Version=$(CRI_DOCKERD_VER) -X github.com/Mirantis/cri-dockerd/version.GitCommit=$(CRI_DOCKERD_REV)'"
 
 define CRI_DOCKERD_BUILD_CMDS
-	$(CRI_DOCKERD_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) LDFLAGS=$(CRI_DOCKERD_BUILDFLAGS) GO_VERSION=$(GO_VERSION) -C $(@D) VERSION=$(CRI_DOCKERD_VER) REVISION=$(CRI_DOCKERD_REV) static-linux
+	$(CRI_DOCKERD_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) LDFLAGS=$(CRI_DOCKERD_BUILDFLAGS) GO_VERSION=$(GO_VERSION) -C $(@D)/packaging/statuc VERSION=$(CRI_DOCKERD_VER) REVISION=$(CRI_DOCKERD_REV) cross-arm
 endef
 
 define CRI_DOCKERD_INSTALL_TARGET_CMDS
 	$(INSTALL) -Dm755 \
-		$(@D)/packaging/static/build/linux/cri-dockerd/cri-dockerd \
+		$(@D)/packaging/static/build/arm/cri-dockerd/cri-dockerd \
 		$(TARGET_DIR)/usr/bin/cri-dockerd
 endef
 
diff --git a/deploy/iso/minikube-iso/arch/x86_64/configs/minikube_x86_64_defconfig b/deploy/iso/minikube-iso/arch/x86_64/configs/minikube_x86_64_defconfig
deleted file mode 100644
index 1019e65ba5..0000000000
--- a/deploy/iso/minikube-iso/arch/x86_64/configs/minikube_x86_64_defconfig
+++ /dev/null
@@ -1,111 +0,0 @@
-# Architecture
-BR2_x86_64=y
-
-# Toolchain
-BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
-
-# System
-BR2_SYSTEM_DHCP="eth0"
-BR2_TARGET_GENERIC_GETTY_PORT="tty1"
-BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
-
-# Required tools to create bootable media
-BR2_PACKAGE_HOST_DOSFSTOOLS=y
-BR2_PACKAGE_HOST_GENIMAGE=y
-BR2_PACKAGE_HOST_MTOOLS=y
-
-# Bootloader
-BR2_TARGET_GRUB2=y
-BR2_TARGET_GRUB2_X86_64_EFI=y
-BR2_TARGET_GRUB2_BUILTIN_CONFIG="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/minikube/x86_64/grub-stub.cfg"
-BR2_TARGET_GRUB2_BUILTIN_MODULES="boot linux ext2 fat squash4 part_msdos part_gpt normal efi_gop udf iso9660 search search_fs_file search_fs_uuid search_label"
-
-# Filesystem / image
-BR2_TARGET_ROOTFS_CPIO=y
-BR2_TARGET_ROOTFS_CPIO_GZIP=y
-BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/minikube/x86_64/post-build.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/minikube/x86_64/post-image.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/minikube/x86_64/genimage.cfg"
-
-# Linux headers same as kernel, a 4.19 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
-
-# Kernel
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.202"
-BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
-BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
-BR2_LINUX_KERNEL_INSTALL_TARGET=y
-
-BR2_CCACHE=y
-
-# Packages
-BR2_PACKAGE_ACPID=y
-
-# Minikube
-
-config BR2_PACKAGE_VBOX_GUEST=y
-
-BR2_OPTIMIZE_2=y
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/minikube/x86_64/patches"
-BR2_TOOLCHAIN_BUILDROOT_VENDOR="minikube"
-BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
-BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_GCC_ENABLE_LTO=y
-BR2_TARGET_GENERIC_HOSTNAME="minikube"
-BR2_TARGET_GENERIC_ISSUE="Welcome to minikube"
-BR2_TARGET_GENERIC_PASSWD_SHA512=y
-BR2_INIT_SYSTEMD=y
-BR2_ROOTFS_DEVICE_TABLE="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/minikube/x86_64/permissions"
-BR2_SYSTEM_BIN_SH_BASH=y
-BR2_ROOTFS_USERS_TABLES="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/minikube/x86_64/users"
-BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/minikube/x86_64/rootfs-overlay"
-BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/minikube/x86_64/linux_x86_64_defconfig"
-BR2_LINUX_KERNEL_LZ4=y
-BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
-BR2_PACKAGE_GZIP=y
-BR2_PACKAGE_XZ=y
-BR2_PACKAGE_STRACE=y
-BR2_PACKAGE_FINDUTILS=y
-BR2_PACKAGE_GIT=y
-BR2_PACKAGE_CIFS_UTILS=y
-BR2_PACKAGE_E2TOOLS=y
-BR2_PACKAGE_NFS_UTILS=y
-BR2_PACKAGE_SSHFS=y
-BR2_PACKAGE_XFSPROGS=y
-BR2_PACKAGE_PARTED=y
-BR2_PACKAGE_SYSSTAT=y
-BR2_PACKAGE_LUAJIT=y
-BR2_PACKAGE_LZ4=y
-BR2_PACKAGE_LZ4_PROGS=y
-BR2_PACKAGE_CA_CERTIFICATES=y
-BR2_PACKAGE_LIBOPENSSL_BIN=y
-BR2_PACKAGE_LIBCURL_CURL=y
-BR2_PACKAGE_BRIDGE_UTILS=y
-BR2_PACKAGE_CONNTRACK_TOOLS=y
-BR2_PACKAGE_EBTABLES=y
-BR2_PACKAGE_ETHTOOL=y
-BR2_PACKAGE_IPROUTE2=y
-BR2_PACKAGE_IPTABLES=y
-BR2_PACKAGE_RSYNC=y
-BR2_PACKAGE_SOCAT=y
-BR2_PACKAGE_SUDO=y
-BR2_PACKAGE_ACL=y
-BR2_PACKAGE_COREUTILS=y
-BR2_PACKAGE_HTOP=y
-BR2_PACKAGE_OPENVMTOOLS=y
-BR2_PACKAGE_PROCPS_NG=y
-BR2_PACKAGE_PSMISC=y
-BR2_PACKAGE_SYSTEMD_LOGIND=y
-BR2_PACKAGE_SYSTEMD_MACHINED=y
-BR2_PACKAGE_TAR=y
-BR2_PACKAGE_UTIL_LINUX_BINARIES=y
-BR2_PACKAGE_UTIL_LINUX_LOSETUP=y
-BR2_PACKAGE_UTIL_LINUX_NOLOGIN=y
-BR2_PACKAGE_UTIL_LINUX_NSENTER=y
-BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS=y
-BR2_PACKAGE_HOST_E2TOOLS=y
-BR2_PACKAGE_HOST_PYTHON=y
-BR2_PACKAGE_LIBFUSE=y