main/zstd: split progs and force deflate on packaging

chimera-linux · Apr 23, 2024 · fdecbbf · fdecbbf
1 parent a2e7c60
commit fdecbbf
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/contrib/firmware-linux-steamdeck/template.py b/contrib/firmware-linux-steamdeck/template.py
@@ -2,7 +2,7 @@
 pkgver = "20231113.1"
 pkgrel = 1
 archs = ["x86_64"]
-hostmakedepends = ["zstd"]
+hostmakedepends = ["zstd-progs"]
 replaces = ["firmware-linux-qca"]
 pkgdesc = "Additional firmware for Steam Deck"
 maintainer = "q66 <q66@chimera-linux.org>"

diff --git a/main/base-kernel/template.py b/main/base-kernel/template.py
@@ -1,6 +1,6 @@
 pkgname = "base-kernel"
 pkgver = "0.1"
-pkgrel = 7
+pkgrel = 8
 depends = [
     "kmod",
     "procps",
@@ -116,7 +116,7 @@ def _baseloc(self):
         "gsed",
         "gtar",
         "xz",
-        "zstd",
+        "zstd-progs",
         "flex",
         "bison",
         "findutils",

diff --git a/main/firmware-linux-brcm-rpi/template.py b/main/firmware-linux-brcm-rpi/template.py
@@ -4,7 +4,7 @@
 _fw_rev = "88aa085bfa1a4650e1ccd88896f8343c22a24055"
 _bt_rev = "d9d4741caba7314d6500f588b1eaa5ab387a4ff5"
 archs = ["aarch64"]
-hostmakedepends = ["zstd"]
+hostmakedepends = ["zstd-progs"]
 replaces = ["firmware-linux-brcm", "firmware-rpi<=20220905-r0"]
 replaces_priority = 100  # always overrides files of firmware-linux-brcm
 pkgdesc = "Broadcom firmware for Raspberry Pi"

diff --git a/main/zstd/template.py b/main/zstd/template.py
@@ -1,6 +1,6 @@
 pkgname = "zstd"
 pkgver = "1.5.6"
-pkgrel = 0
+pkgrel = 1
 build_style = "meson"
 configure_args = [
     "-Db_ndebug=true",
@@ -21,6 +21,7 @@
 url = "http://www.zstd.net"
 source = f"https://github.com/facebook/{pkgname}/releases/download/v{pkgver}/{pkgname}-{pkgver}.tar.gz"
 sha256 = "8c29e06cf42aacc1eafc4077ae2ec6c6fcb96a626157e0593d5e82a34fd403c1"
+compression = "deflate"
 hardening = ["!cfi"]  # TODO
 # checkdepends not available yet
 options = ["!check"]
@@ -33,6 +34,13 @@ def post_install(self):
         self.rm(self.destdir / "usr/share/man/man1" / (tool + ".1"))
 
 
+@subpackage("zstd-progs")
+def _progs(self):
+    self.install_if = [f"{pkgname}={pkgver}-r{pkgrel}"]
+
+    return self.default_progs()
+
+
 @subpackage("zstd-devel")
 def _devel(self):
     self.provides = [f"libzstd-devel={pkgver}-r{pkgrel}"]