github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Specify seccomp target arch for CC

Browse Source 
seccomp's build scripts require setting the target arch that will be
built when cross compiling.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
This commit is contained in:
Brian Goff 2021-04-27 16:47:27 +00:00
parent b0fb8a5a04
commit 969ec89493
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/release.yml vendored
View File

@ -89,6 +89,7 @@ jobs:
[[ "${MARCH}" == "arm64" ]] && { [[ "${MARCH}" == "arm64" ]] && {
echo "CGO_ENABLED=1" >> $GITHUB_ENV echo "CGO_ENABLED=1" >> $GITHUB_ENV
echo "CC=aarch64-linux-gnu-gcc" >> $GITHUB_ENV echo "CC=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
echo "SECCOMP_ARCH=aarch64" >> $GITHUB_ENV
} }
echo "${{ github.workspace }}/bin" >> $GITHUB_PATH echo "${{ github.workspace }}/bin" >> $GITHUB_PATH
@ -173,7 +174,7 @@ jobs:
RUNC_FLAVOR: runc RUNC_FLAVOR: runc
run: | run: |
if [[ "${GOOS}" == "linux" ]]; then if [[ "${GOOS}" == "linux" ]]; then
sudo -E PATH=$PATH script/setup/install-seccomp sudo -E PATH=$PATH -E SECCOMP_ARCH="${SECCOMP_ARCH}" script/setup/install-seccomp
fi fi
make cri-cni-release make cri-cni-release
working-directory: src/github.com/containerd/containerd working-directory: src/github.com/containerd/containerd

6
script/setup/install-seccomp
View File

@ -27,7 +27,11 @@ export SECCOMP_PATH=$(mktemp -d)
curl -fsSL "https://github.com/seccomp/libseccomp/releases/download/v${SECCOMP_VERSION}/libseccomp-${SECCOMP_VERSION}.tar.gz" | tar -xzC "$SECCOMP_PATH" --strip-components=1 curl -fsSL "https://github.com/seccomp/libseccomp/releases/download/v${SECCOMP_VERSION}/libseccomp-${SECCOMP_VERSION}.tar.gz" | tar -xzC "$SECCOMP_PATH" --strip-components=1
( (
cd "$SECCOMP_PATH" cd "$SECCOMP_PATH"
./configure --prefix=/usr/local host=""
if [ -v SECCOMP_ARCH ]; then
host="--host=${SECCOMP_ARCH}"
fi
./configure --prefix=/usr/local ${host}
make make
make install make install
ldconfig ldconfig