Add ARCH=armv7l version of iso #108
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Anders F Björklund <[email protected]>
Signed-off-by: Anders F Björklund <[email protected]>
Signed-off-by: Anders F Björklund <[email protected]>
jandubois
reviewed
Jun 27, 2023
| . | ||
|
|
||
| .PHONY: iso | ||
| iso: nerdctl-$(NERDCTL_VERSION)-$(ARCH) qemu-$(QEMU_VERSION)-copying cri-dockerd-$(CRI_DOCKERD_VERSION)-$(ARCH) | ||
| ALPINE_VERSION=$(ALPINE_VERSION) NERDCTL_VERSION=$(NERDCTL_VERSION) QEMU_VERSION=$(QEMU_VERSION) CRI_DOCKERD_VERSION=$(CRI_DOCKERD_VERSION) REPO_VERSION=$(REPO_VERSION) EDITION=$(EDITION) BUILD_ID=$(BUILD_ID) ARCH=$(ARCH) ARCH_ALIAS=$(ARCH_ALIAS) ./build.sh | ||
| ALPINE_VERSION=$(ALPINE_VERSION) NERDCTL_VERSION=$(NERDCTL_VERSION) QEMU_VERSION=$(QEMU_VERSION) CRI_DOCKERD_VERSION=$(CRI_DOCKERD_VERSION) REPO_VERSION=$(REPO_VERSION) EDITION=$(EDITION) BUILD_ID=$(BUILD_ID) ARCH=$(ARCH) ARCH_ALIAS=$(ARCH_ALIAS) ALPINE_ARCH=$(ALPINE_ARCH) DOCKER_ARCH=$(DOCKER_ARCH) ./build.sh |
There was a problem hiding this comment.
ARCH_ALIAS doesn't seem to be used by build.sh anymore:
Suggested change
| ALPINE_VERSION=$(ALPINE_VERSION) NERDCTL_VERSION=$(NERDCTL_VERSION) QEMU_VERSION=$(QEMU_VERSION) CRI_DOCKERD_VERSION=$(CRI_DOCKERD_VERSION) REPO_VERSION=$(REPO_VERSION) EDITION=$(EDITION) BUILD_ID=$(BUILD_ID) ARCH=$(ARCH) ARCH_ALIAS=$(ARCH_ALIAS) ALPINE_ARCH=$(ALPINE_ARCH) DOCKER_ARCH=$(DOCKER_ARCH) ./build.sh | |
| ALPINE_VERSION=$(ALPINE_VERSION) NERDCTL_VERSION=$(NERDCTL_VERSION) QEMU_VERSION=$(QEMU_VERSION) CRI_DOCKERD_VERSION=$(CRI_DOCKERD_VERSION) REPO_VERSION=$(REPO_VERSION) EDITION=$(EDITION) BUILD_ID=$(BUILD_ID) ARCH=$(ARCH) ALPINE_ARCH=$(ALPINE_ARCH) DOCKER_ARCH=$(DOCKER_ARCH) ./build.sh |
jandubois
reviewed
Jun 27, 2023
Comment on lines
+8
to
+11
| case "${ARCH}" in | ||
| x86_64) bios=true;; | ||
| *) bios=false;; | ||
| esac |
There was a problem hiding this comment.
I think we can drop setting legacyBIOS: true for all platforms now; it is no longer needed and has already been removed from the examples/alpine.yaml template in the lima.git repo.
jandubois
reviewed
Jun 27, 2023
jandubois
reviewed
Jun 27, 2023
Comment on lines
-226
to
+236
| ARCH=amd64 | ||
| if [ "$(uname -m)" == "x86_64" ]; then | ||
| ARCH=amd64 | ||
| fi | ||
| if [ "$(uname -m)" == "aarch64" ]; then | ||
| ARCH=arm64 | ||
| fi | ||
| if [ "$(uname -m)" == "armv7l" ]; then | ||
| ARCH=armv7 | ||
| fi |
There was a problem hiding this comment.
Why do we set ARCH here at all? It isn't being used anymore at all. It seems to be vestigial code from the time when this block ended with:
mkdir -p "${tmp}/usr/libexec/cni"
ln -s "flannel-${ARCH}" "${tmp}/usr/libexec/cni/flannel"
But that has since been removed because the cni-plugin-flannel package has since been fixed. So we can drop all the ARCH setting here.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The Ubuntu image for armv7 is over 1G, so make a smaller image for emulation.
It is slow, but it boots.
Not every dependency, such as nerdctl-full, is available for arm-v7. But most are...