From c189951e1391145586bc848d774356317bc752cd Mon Sep 17 00:00:00 2001 From: xenago Date: Sat, 1 Jun 2024 04:55:40 -0400 Subject: [PATCH 1/2] Remove unnecessary volume mount from local build command in README.md; move `cross` config in Cargo.toml --- Cargo.toml | 4 ++++ README.md | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 230463e..020e16d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -48,3 +48,7 @@ assets = [ ] post_install_script = "debian/postinst" post_uninstall_script = "debian/postrm" + +# Required by `cross` tool for glibc 2.17 CentOS-compatible cross-compilation +[workspace.metadata.cross.target.aarch64-unknown-linux-gnu] +image = "ghcr.io/cross-rs/aarch64-unknown-linux-gnu:main-centos" diff --git a/README.md b/README.md index 594044b..4cfdd43 100755 --- a/README.md +++ b/README.md @@ -361,9 +361,9 @@ I generally find it easiest to run `build.sh` inside a temporary container: 3. Run the build script inside a temporary container, setting `LIBNSS_SHIM_VERSION` and the cloned repo path as desired: - sudo docker run -e "LIBNSS_SHIM_VERSION=0.0.0" -v /path/to/cloned/libnss_shim:/libnss_shim -v /var/run/docker.sock:/var/run/docker.sock --rm -it quay.io/pypa/manylinux2014_x86_64:latest bash /libnss_shim/build.sh + sudo docker run -e "LIBNSS_SHIM_VERSION=0.0.0" -v /path/to/cloned/libnss_shim:/libnss_shim --rm -it quay.io/pypa/manylinux2014_x86_64:latest bash /libnss_shim/build.sh - Note that this requires + Note: [the `manylinux2014` container](https://github.com/pypa/manylinux) is available for various architectures. 4. The build script will output packages in the following subdirectories of the cloned repo: From ffd02432fb4c2ce0573530b29fc937be452976ec Mon Sep 17 00:00:00 2001 From: xenago Date: Sat, 1 Jun 2024 04:58:52 -0400 Subject: [PATCH 2/2] Revert actions/checkout to v2 --- .github/workflows/ci.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 9d6361d..36a38de 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -14,7 +14,7 @@ jobs: steps: - name: Checkout # Clone repository - uses: actions/checkout@v4 + uses: actions/checkout@v2 with: fetch-depth: 0 @@ -48,8 +48,8 @@ jobs: cargo generate-rpm --payload-compress none ls -lah target/generate-rpm - - uses: uraimo/run-on-arch-action@v2 # Cross-build (arm64/aarch64) - name: Cross-build (arm64/aarch64) + - uses: uraimo/run-on-arch-action@v2 # Build for arm64/aarch64 by emulating in QEMU + name: QEMU ARM build (arm64/aarch64) with: base_image: quay.io/pypa/manylinux2014_aarch64 env: |