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

Revert "Specify seccomp target arch for CC"

Browse Source 
This reverts commit 969ec89493.

Signed-off-by: Derek McGowan <derek@mcg.dev>
This commit is contained in:
Derek McGowan 2021-04-29 15:05:54 -07:00
parent f0b4258904
commit 7942ae68b1
No known key found for this signature in database
GPG Key ID: F58C5D0A4405ACDB
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,7 +89,6 @@ 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
@ -174,7 +173,7 @@ jobs:
RUNC_FLAVOR: runc RUNC_FLAVOR: runc
run: | run: |
if [[ "${GOOS}" == "linux" ]]; then if [[ "${GOOS}" == "linux" ]]; then
sudo -E PATH=$PATH -E SECCOMP_ARCH="${SECCOMP_ARCH}" script/setup/install-seccomp sudo -E PATH=$PATH 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,11 +27,7 @@ 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"
host="" ./configure --prefix=/usr/local
if [ -v SECCOMP_ARCH ]; then
host="--host=${SECCOMP_ARCH}"
fi
./configure --prefix=/usr/local ${host}
make make
make install make install
ldconfig ldconfig