From 6743223b29bbe0de26b360ded58b43736fdf52d7 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Mon, 7 Oct 2024 12:30:48 +0200 Subject: [PATCH] package/curios-httpd: install unmodified OCI tarball in image Before: $ ls -lah output/target/lib/oci drwxr-xr-x 2 jacky users 4,0K Oct 7 12:26 . drwxr-xr-x 27 jacky users 20K Aug 29 06:45 .. -rw-r--r-- 1 jacky users 1,8M Oct 7 12:19 curios-httpd-v24.05.0.tar.gz After: $ ls -lah output/target/lib/oci drwxr-xr-x 2 jacky users 4,0K Oct 7 12:26 . drwxr-xr-x 27 jacky users 20K Aug 29 06:45 .. -rw-r--r-- 1 jacky users 281K Oct 7 12:28 curios-httpd-v24.05.0.tar.gz Signed-off-by: Joachim Wiberg --- package/curios-httpd/Config.in | 6 +++--- package/curios-httpd/curios-httpd.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/curios-httpd/Config.in b/package/curios-httpd/Config.in index c2dbfa25..2b9565e8 100644 --- a/package/curios-httpd/Config.in +++ b/package/curios-httpd/Config.in @@ -2,8 +2,8 @@ config BR2_PACKAGE_CURIOS_HTTPD bool "curiOS-httpd" help Example of how to bundle an OCI archive of curiOS-httpd in - /lib/oci for the given target architecture. OCI archives - can also be bundled in post-build.sh, but with packaging - the "source" is bundled in SDK builds. + /lib/oci for the given target architecture. OCI archives can + also be bundled in post-build.sh, but with packaging all the + "source" tarballs are bundled for SDK builds (archiving). https://github.com/kernelkit/curiOS diff --git a/package/curios-httpd/curios-httpd.mk b/package/curios-httpd/curios-httpd.mk index 02983904..05946c03 100644 --- a/package/curios-httpd/curios-httpd.mk +++ b/package/curios-httpd/curios-httpd.mk @@ -9,11 +9,11 @@ CURIOS_HTTPD_SOURCE = curios-httpd-oci-$(GO_GOARCH)-$(CURIOS_HTTPD_VERSION).tar. CURIOS_HTTPD_SITE = https://github.com/kernelkit/curiOS/releases/download/$(CURIOS_HTTPD_VERSION) CURIOS_HTTPD_LICENSE = GPL CURIOS_HTTPD_LICENSE_FILES = COPYING -CURIOS_HTTPD_INSTALL_TARGET = YES define CURIOS_HTTPD_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/lib/oci - (cd $(@D)/.. && $(TAR) cfz $(TARGET_DIR)/lib/oci/$(notdir $(@D)).tar.gz $(notdir $(@D))) + cp $(CURIOS_HTTPD_DL_DIR)/$(CURIOS_HTTPD_SOURCE) \ + $(TARGET_DIR)/lib/oci/$(notdir $(@D)).tar.gz endef $(eval $(generic-package))