Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
92fc7f18
Commit
92fc7f18
authored
Aug 09, 2018
by
Jeff Grafton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ensure qemu-ARCH-static binary is world readable and executable
parent
876e77ed
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
Makefile
build/debian-base/Makefile
+3
-1
image-util.sh
test/images/image-util.sh
+2
-0
No files found.
build/debian-base/Makefile
View file @
92fc7f18
...
...
@@ -57,9 +57,11 @@ ifeq ($(ARCH),amd64)
sed
"/CROSS_BUILD_/d"
$(TEMP_DIR)/Dockerfile.build
>
$(TEMP_DIR)/Dockerfile.build.tmp
else
# When cross-building, only the placeholder "CROSS_BUILD_" should be removed
# Register /usr/bin/qemu-ARCH-static as the handler for
ARM
binaries in the kernel
# Register /usr/bin/qemu-ARCH-static as the handler for
non-x86
binaries in the kernel
docker run --rm --privileged multiarch/qemu-user-static
:
register --reset
curl
-sSL
https://github.com/multiarch/qemu-user-static/releases/download/
$(QEMUVERSION)
/x86_64_qemu-
$(QEMUARCH)
-static
.tar.gz |
tar
-xz
-C
$(TEMP_DIR)
# Ensure we don't get surprised by umask settings
chmod
0755 qemu-
$(QEMUARCH)
-static
sed
"s/CROSS_BUILD_//g"
$(TEMP_DIR)
/Dockerfile.build
>
$(TEMP_DIR)
/Dockerfile.build.tmp
endif
mv
$(TEMP_DIR)/Dockerfile.build.tmp
$(TEMP_DIR)/Dockerfile.build
...
...
test/images/image-util.sh
View file @
92fc7f18
...
...
@@ -82,6 +82,8 @@ build() {
# Register qemu-*-static for all supported processors except the current one
docker run
--rm
--privileged
multiarch/qemu-user-static:register
--reset
curl
-sSL
https://github.com/multiarch/qemu-user-static/releases/download/
${
QEMUVERSION
}
/x86_64_qemu-
${
QEMUARCHS
[
$arch
]
}
-static
.tar.gz |
tar
-xz
-C
${
temp_dir
}
# Ensure we don't get surprised by umask settings
chmod
0755
"
${
temp_dir
}
/qemu-
${
QEMUARCHS
[
$arch
]
}
-static"
${
SED
}
-i
"s/CROSS_BUILD_//g"
Dockerfile
fi
fi
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment