From 4c78613c4c345640bd6ff2cb9ef531c6a467d8a9 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Mon, 18 Nov 2024 07:53:05 +0100 Subject: [PATCH] package/curios-*: add latest symlinks for easy upgrades This patch adds latest symlinks to the curiOS containers to make system upgrades easier. I.e., a user can now reference the bundled image with: set image oci-archive:/lib/oci/curios-httpd-latest.tar.gz So that when they upgrade to the latest Infix, which might include an update of curiOS httpd, they will get a seamless upgrade also of the container(s) running. Signed-off-by: Joachim Wiberg --- package/curios-httpd/curios-httpd.mk | 4 +++- package/curios-nftables/curios-nftables.mk | 4 +++- test/infamy/container.py | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/package/curios-httpd/curios-httpd.mk b/package/curios-httpd/curios-httpd.mk index 05946c03..f360ef10 100644 --- a/package/curios-httpd/curios-httpd.mk +++ b/package/curios-httpd/curios-httpd.mk @@ -13,7 +13,9 @@ CURIOS_HTTPD_LICENSE_FILES = COPYING define CURIOS_HTTPD_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/lib/oci cp $(CURIOS_HTTPD_DL_DIR)/$(CURIOS_HTTPD_SOURCE) \ - $(TARGET_DIR)/lib/oci/$(notdir $(@D)).tar.gz + $(TARGET_DIR)/lib/oci/$(CURIOS_HTTPD_NAME)-$(CURIOS_HTTPD_VERSION).tar.gz + ln -sf $(CURIOS_HTTPD_NAME)-$(CURIOS_HTTPD_VERSION).tar.gz \ + $(TARGET_DIR)/lib/oci/$(CURIOS_HTTPD_NAME)-latest.tar.gz endef $(eval $(generic-package)) diff --git a/package/curios-nftables/curios-nftables.mk b/package/curios-nftables/curios-nftables.mk index 43b9745d..39fda9c1 100644 --- a/package/curios-nftables/curios-nftables.mk +++ b/package/curios-nftables/curios-nftables.mk @@ -14,7 +14,9 @@ CURIOS_NFTABLES_INSTALL_TARGET = YES define CURIOS_NFTABLES_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/lib/oci cp $(CURIOS_NFTABLES_DL_DIR)/$(CURIOS_NFTABLES_SOURCE) \ - $(TARGET_DIR)/lib/oci/$(notdir $(@D)).tar.gz + $(TARGET_DIR)/lib/oci/$(CURIOS_NFTABLES_NAME)-$(CURIOS_NFTABLES_VERSION).tar.gz + ln -sf $(CURIOS_NFTABLES_NAME)-$(CURIOS_NFTABLES_VERSION).tar.gz \ + $(TARGET_DIR)/lib/oci/$(CURIOS_NFTABLES_NAME)-latest.tar.gz endef $(eval $(generic-package)) diff --git a/test/infamy/container.py b/test/infamy/container.py index 9989cf38..7b0392e5 100644 --- a/test/infamy/container.py +++ b/test/infamy/container.py @@ -5,8 +5,8 @@ from infamy.util import warn class Container: """Helper methods""" - HTTPD_IMAGE = "curios-httpd-v24.05.0.tar.gz" - NFTABLES_IMAGE = "curios-nftables-v24.05.0.tar.gz" + HTTPD_IMAGE = "curios-httpd-latest.tar.gz" + NFTABLES_IMAGE = "curios-nftables-latest.tar.gz" def __init__(self, target): self.system = target