From fd18fefcfa57acde8b001828938b20c9c8cb3d07 Mon Sep 17 00:00:00 2001 From: Sibi Prabakaran Date: Fri, 6 Oct 2023 08:35:34 +0530 Subject: [PATCH] Update --- CHANGELOG.md | 5 +++++ Cargo.lock | 2 +- README.md | 7 +++++++ justfile | 38 ++++++++++++++++++++++++++++---------- pid1-exe/Cargo.toml | 2 +- 5 files changed, 42 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6cd9290..d701bf1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# v0.1.2 + +- Support binaries for more architectures +- Fix Cargo.lock to package it in nixpkgs. + # v0.1.1 - Fix cargo metadata diff --git a/Cargo.lock b/Cargo.lock index 3b79420..d26641b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -92,7 +92,7 @@ dependencies = [ [[package]] name = "pid1-exe" -version = "0.1.1" +version = "0.1.2" dependencies = [ "clap", "pid1", diff --git a/README.md b/README.md index c3a7c52..4655351 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,14 @@ # pid1-rs +[![Crates.io][crates-badge]][crates-url] +[![Crates.io][crates-badge-exe]][crates-url-exe] [![Rust](https://github.com/fpco/pid1-rs/actions/workflows/rust.yml/badge.svg)](https://github.com/fpco/pid1-rs/actions/workflows/rust.yml) +[crates-badge]: https://img.shields.io/crates/v/pid1.svg +[crates-url]: https://crates.io/crates/pid1 +[crates-badge-exe]: https://img.shields.io/crates/v/pid1-exe.svg +[crates-url-exe]: https://crates.io/crates/pid1-exe + pid1 handling library for proper signal and zombie reaping of the PID1 process. diff --git a/justfile b/justfile index 5368729..28d28be 100644 --- a/justfile +++ b/justfile @@ -27,27 +27,40 @@ exec-init-image: # Build binary for other architectures binaries clean='false': cross build --target x86_64-unknown-linux-gnu --release - {{clean}} && docker image rm ghcr.io/cross-rs/x86_64-unknown-linux-gnu:0.2.5 + -{{clean}} && docker image rm ghcr.io/cross-rs/x86_64-unknown-linux-gnu:0.2.5 cross build --target aarch64-unknown-linux-gnu --release - {{clean}} && docker image rm ghcr.io/cross-rs/aarch64-unknown-linux-gnu:0.2.5 + -{{clean}} && docker image rm ghcr.io/cross-rs/aarch64-unknown-linux-gnu:0.2.5 cross build --target aarch64-unknown-linux-musl --release - {{clean}} && docker image rm ghcr.io/cross-rs/aarch64-unknown-linux-musl:0.2.5 + -{{clean}} && docker image rm ghcr.io/cross-rs/aarch64-unknown-linux-musl:0.2.5 cross build --target arm-unknown-linux-musleabi --release - {{clean}} && docker image rm ghcr.io/cross-rs/arm-unknown-linux-musleabi:0.2.5 + -{{clean}} && docker image rm ghcr.io/cross-rs/arm-unknown-linux-musleabi:0.2.5 cross build --target arm-unknown-linux-musleabihf --release - {{clean}} && docker image rm ghcr.io/cross-rs/arm-unknown-linux-musleabihf:0.2.5 + -{{clean}} && docker image rm ghcr.io/cross-rs/arm-unknown-linux-musleabihf:0.2.5 cross build --target armv5te-unknown-linux-musleabi --release - {{clean}} && docker image rm ghcr.io/cross-rs/armv5te-unknown-linux-musleabi:0.2.5 + -{{clean}} && docker image rm ghcr.io/cross-rs/armv5te-unknown-linux-musleabi:0.2.5 cross build --target armv7-unknown-linux-musleabi --release - {{clean}} && docker image rm ghcr.io/cross-rs/armv7-unknown-linux-musleabi:0.2.5 + -{{clean}} && docker image rm ghcr.io/cross-rs/armv7-unknown-linux-musleabi:0.2.5 cross build --target armv7-unknown-linux-musleabihf --release - {{clean}} && docker image rm ghcr.io/cross-rs/armv7-unknown-linux-musleabihf:0.2.5 + -{{clean}} && docker image rm ghcr.io/cross-rs/armv7-unknown-linux-musleabihf:0.2.5 cross build --target i586-unknown-linux-musl --release - {{clean}} && docker image rm ghcr.io/cross-rs/i586-unknown-linux-musl:0.2.5 + -{{clean}} && docker image rm ghcr.io/cross-rs/i586-unknown-linux-musl:0.2.5 cross build --target i686-unknown-linux-musl --release - {{clean}} && docker image rm ghcr.io/cross-rs/i686-unknown-linux-musl:0.2.5 + -{{clean}} && docker image rm ghcr.io/cross-rs/i686-unknown-linux-musl:0.2.5 cross build --target mips64-unknown-linux-muslabi64 --release + -{{clean}} && docker image rm ghcr.io/cross-rs/mips64-unknown-linux-muslabi64:0.2.5 cross build --target mips64el-unknown-linux-muslabi64 --release + -{{clean}} && docker image rm ghcr.io/cross-rs/mips64el-unknown-linux-muslabi64:0.2.5 + cross build --target powerpc-unknown-linux-gnu --release + -{{clean}} && docker image rm ghcr.io/cross-rs/powerpc-unknown-linux-gnu:0.2.5 + cross build --target powerpc64-unknown-linux-gnu --release + -{{clean}} && docker image rm ghcr.io/cross-rs/powerpc64-unknown-linux-gnu:0.2.5 + cross build --target powerpc64le-unknown-linux-gnu --release + -{{clean}} && docker image rm ghcr.io/cross-rs/powerpc64le-unknown-linux-gnu:0.2.5 + cross build --target riscv64gc-unknown-linux-gnu --release + -{{clean}} && docker image rm ghcr.io/cross-rs/riscv64gc-unknown-linux-gnu:0.2.5 + cross build --target s390x-unknown-linux-gnu --release + -{{clean}} && docker image rm ghcr.io/cross-rs/s390x-unknown-linux-gnu:0.2.5 + # Copy binaries to artifacts directory cp-binaries: @@ -65,4 +78,9 @@ cp-binaries: cp target/i686-unknown-linux-musl/release/pid1 ./artifacts/pid1-i686-unknown-linux-musl cp target/mips64-unknown-linux-muslabi64/release/pid1 ./artifacts/pid1-mips64-unknown-linux-muslabi64 cp target/mips64el-unknown-linux-muslabi64/release/pid1 ./artifacts/pid1-mips64el-unknown-linux-muslabi64 + cp target/powerpc-unknown-linux-gnu/release/pid1 ./artifacts/pid1-powerpc-unknown-linux-gnu + cp target/powerpc64-unknown-linux-gnu/release/pid1 ./artifacts/pid1-powerpc64-unknown-linux-gnu + cp target/powerpc64le-unknown-linux-gnu/release/pid1 ./artifacts/pid1-powerpc64le-unknown-linux-gnu + cp target/riscv64gc-unknown-linux-gnu/release/pid1 ./artifacts/pid1-riscv64gc-unknown-linux-gnu + cp target/s390x-unknown-linux-gnu/release/pid1 ./artifacts/pid1-s390x-unknown-linux-gnu file artifacts/* diff --git a/pid1-exe/Cargo.toml b/pid1-exe/Cargo.toml index d393078..bcb116f 100644 --- a/pid1-exe/Cargo.toml +++ b/pid1-exe/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pid1-exe" -version = "0.1.1" +version = "0.1.2" edition = "2021" readme = "../README.md" homepage = "https://github.com/fpco/pid1-rs"