Merge pull request #2896 from ohkinozomu/pigz

Add pigz for parallel decompression by containerd
bottlerocket-os · Mar 16, 2023 · 38d4f6a · 38d4f6a
2 parents 5837a6e + e2b7cfc
commit 38d4f6a
Show file tree

Hide file tree

Showing 8 changed files with 79 additions and 1 deletion.
diff --git a/packages/README.md b/packages/README.md
@@ -74,7 +74,7 @@ Our sample package has the following manifest.
 [package]
 name = "libwoof"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 publish = false
 build = "build.rs"
 

diff --git a/packages/containerd/Cargo.toml b/packages/containerd/Cargo.toml
@@ -22,3 +22,4 @@ glibc = { path = "../glibc" }
 # RPM Requires
 [dependencies]
 runc = { path = "../runc" }
+pigz = { path = "../pigz" }
diff --git a/packages/containerd/containerd.spec b/packages/containerd/containerd.spec
@@ -38,6 +38,7 @@ Source1000: clarify.toml
 BuildRequires: git
 BuildRequires: %{_cross_os}glibc-devel
 Requires: %{_cross_os}runc
+Requires: %{_cross_os}pigz
 
 %description
 %{summary}.

diff --git a/packages/pigz/Cargo.toml b/packages/pigz/Cargo.toml
@@ -0,0 +1,22 @@
+[package]
+name = "pigz"
+version = "0.1.0"
+edition = "2021"
+publish = false
+build = "build.rs"
+
+[lib]
+path = "pkg.rs"
+
+[[package.metadata.build-package.external-files]]
+url = "https://zlib.net/pigz/pigz-2.7.tar.gz"
+sha512 = "9f9f61de4a0307fc057dc4e31a98bd8d706d9e709ecde0be02a871534fddf6a1fe1321158aa72708603aaaece43f83d2423b127f7689b6219b23aea4f989e8f5"
+
+# RPM BuildRequires
+[build-dependencies]
+glibc = { path = "../glibc" }
+libz = { path = "../libz" }
+
+# RPM Requires
+[dependencies]
+# None
diff --git a/packages/pigz/build.rs b/packages/pigz/build.rs
@@ -0,0 +1,9 @@
+use std::process::{exit, Command};
+
+fn main() -> Result<(), std::io::Error> {
+    let ret = Command::new("buildsys").arg("build-package").status()?;
+    if !ret.success() {
+        exit(1);
+    }
+    Ok(())
+}
diff --git a/packages/pigz/pigz.spec b/packages/pigz/pigz.spec
@@ -0,0 +1,35 @@
+Name: %{_cross_os}pigz
+Version: 2.7
+Release: 1%{?dist}
+Summary: pigz is a parallel implementation of gzip which utilizes multiple cores
+License: Zlib AND Apache-2.0
+URL: http://www.zlib.net/pigz
+Source0: https://zlib.net/pigz/pigz-%{version}.tar.gz
+BuildRequires: %{_cross_os}glibc-devel
+BuildRequires: %{_cross_os}libz-devel
+
+%description
+%{summary}.
+
+%prep
+%autosetup -n pigz-%{version} -p1
+
+%global set_env \
+%set_cross_build_flags \\\
+export CC=%{_cross_target}-gcc \\\
+%{nil}
+
+%build
+%set_env
+%make_build CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+
+%install
+install -d %{buildroot}%{_cross_bindir}
+install -p -m 0755 unpigz %{buildroot}%{_cross_bindir}
+
+%files
+%license README zopfli/COPYING
+%{_cross_bindir}/unpigz
+%{_cross_attribution_file}
+
+%changelog
diff --git a/packages/pigz/pkg.rs b/packages/pigz/pkg.rs
@@ -0,0 +1 @@
+// not used
diff --git a/variants/Cargo.lock b/variants/Cargo.lock