diff --git a/common/packages.hcl b/common/packages.hcl index f3e6545f..ec8a4d88 100644 --- a/common/packages.hcl +++ b/common/packages.hcl @@ -207,17 +207,6 @@ target "_pkg-centos9" { } } -target "_pkg-fedora36" { - args = { - PKG_RELEASE = "fedora36" - PKG_TYPE = "rpm" - PKG_DISTRO = "fedora" - PKG_DISTRO_ID = "36" - PKG_DISTRO_SUITE = "36" - PKG_BASE_IMAGE = "fedora:36" - } -} - target "_pkg-fedora37" { args = { PKG_RELEASE = "fedora37" diff --git a/common/packages.mk b/common/packages.mk index a8fd940d..4c771fb0 100644 --- a/common/packages.mk +++ b/common/packages.mk @@ -16,7 +16,7 @@ # if you add a new release PKG_APK_RELEASES ?= alpine314 alpine315 alpine316 PKG_DEB_RELEASES ?= debian10 debian11 debian12 ubuntu2004 ubuntu2204 ubuntu2210 ubuntu2304 raspbian10 raspbian11 raspbian12 -PKG_RPM_RELEASES ?= centos7 centos8 centos9 fedora36 fedora37 fedora38 oraclelinux7 oraclelinux8 oraclelinux9 +PKG_RPM_RELEASES ?= centos7 centos8 centos9 fedora37 fedora38 oraclelinux7 oraclelinux8 oraclelinux9 # PKG_SUPPORTED_PLATFORMS could be replaced by: # docker buildx imagetools inspect centos:7 --format "{{json .Manifest}}" | jq -r '.manifests[] | "\(.platform.os)/\(.platform.architecture)/\(.platform.variant)"' | sed 's#/null$##' | tr '\n' ',' | sed 's#,$##' @@ -187,15 +187,6 @@ pkg-info-centos9: @# FIXME: packages look broken for linux/s390x on centos:stream9 $(eval PKG_SUPPORTED_PLATFORMS = linux/amd64 linux/arm64 linux/ppc64le) -.PHONY: pkg-info-fedora36 -pkg-info-fedora36: - $(eval PKG_TYPE = rpm) - $(eval PKG_DISTRO = fedora) - $(eval PKG_DISTRO_ID = 36) - $(eval PKG_DISTRO_SUITE = 36) - $(eval PKG_BASE_IMAGE = fedora:36) - $(eval PKG_SUPPORTED_PLATFORMS = linux/amd64 linux/arm64 linux/ppc64le linux/s390x) - .PHONY: pkg-info-fedora37 pkg-info-fedora37: $(eval PKG_TYPE = rpm)