From dccf206a98ebb292fb75977db0e55baf2eea21ebdec7261bcfd5a1a10afb4cd2 Mon Sep 17 00:00:00 2001 From: Nicolas Belouin Date: Fri, 21 Feb 2025 15:27:28 +0100 Subject: [PATCH 1/2] Fix obsinfo tar issues Signed-off-by: Nicolas Belouin --- baremetal-operator/_service | 8 +++----- baremetal-operator/baremetal-operator.spec | 2 +- cosign/_service | 6 ++---- cosign/cosign.spec | 2 +- edge-image-builder/_service | 6 ++---- edge-image-builder/edge-image-builder.spec | 2 +- endpoint-copier-operator/_service | 6 ++---- endpoint-copier-operator/endpoint-copier-operator.spec | 2 +- frr-k8s/_service | 6 ++---- frr-k8s/frr-k8s.spec | 2 +- hauler/_service | 6 ++---- hauler/hauler.spec | 2 +- kube-rbac-proxy/_service | 6 ++---- kube-rbac-proxy/kube-rbac-proxy.spec | 2 +- metallb/_service | 6 ++---- metallb/metallb.spec | 2 +- nm-configurator/_service | 4 +++- upgrade-controller/_service | 6 ++---- upgrade-controller/upgrade-controller.spec | 2 +- 19 files changed, 31 insertions(+), 47 deletions(-) diff --git a/baremetal-operator/_service b/baremetal-operator/_service index 2628004..c45ecc3 100644 --- a/baremetal-operator/_service +++ b/baremetal-operator/_service @@ -12,10 +12,8 @@ yes \1 - - - *.tar - gz + + baremetal-operator.obsinfo @@ -23,7 +21,7 @@ baremetal-operator.spec SOURCE_COMMIT - SOURCE_COMMIT=$(grep commit *.obsinfo | cut -d" " -f2) + SOURCE_COMMIT=$(grep commit baremetal-operator.obsinfo | cut -d" " -f2) 1 diff --git a/baremetal-operator/baremetal-operator.spec b/baremetal-operator/baremetal-operator.spec index 66c6108..94d7ec5 100644 --- a/baremetal-operator/baremetal-operator.spec +++ b/baremetal-operator/baremetal-operator.spec @@ -22,7 +22,7 @@ Release: 0.8.0 Summary: Implements a Kubernetes API for managing bare metal hosts License: Apache-2.0 URL: https://github.com/metal3-io/baremetal-operator -Source: baremetal-operator-%{version}.tar.gz +Source: baremetal-operator-%{version}.tar Source1: vendor.tar.gz BuildRequires: golang(API) = 1.22 ExcludeArch: s390 diff --git a/cosign/_service b/cosign/_service index 94a6556..1233d4a 100644 --- a/cosign/_service +++ b/cosign/_service @@ -8,10 +8,8 @@ v(.*) enable - - - *.tar - gz + + cosign.obsinfo diff --git a/cosign/cosign.spec b/cosign/cosign.spec index 753cb1b..850a003 100644 --- a/cosign/cosign.spec +++ b/cosign/cosign.spec @@ -24,7 +24,7 @@ Release: 0 Summary: Container Signing, Verification and Storage in an OCI registry License: Apache-2.0 URL: https://github.com/rancher-government-carbide/cosign -Source: cosign-%{version}.tar.gz +Source: cosign-%{version}.tar Source1: vendor.tar.gz BuildRequires: golang-packaging diff --git a/edge-image-builder/_service b/edge-image-builder/_service index 534bd18..63b3ac7 100644 --- a/edge-image-builder/_service +++ b/edge-image-builder/_service @@ -9,10 +9,8 @@ \1.\2.\3 enable - - - *.tar - gz + + edge-image-builder.obsinfo diff --git a/edge-image-builder/edge-image-builder.spec b/edge-image-builder/edge-image-builder.spec index c1e10bd..e1c1f77 100644 --- a/edge-image-builder/edge-image-builder.spec +++ b/edge-image-builder/edge-image-builder.spec @@ -22,7 +22,7 @@ Release: 0 Summary: Edge Image Builder License: Apache-2.0 URL: https://github.com/suse-edge/edge-image-builder -Source: edge-image-builder-%{version}.tar.gz +Source: edge-image-builder-%{version}.tar Source1: vendor.tar.gz BuildRequires: golang(API) go1.22 BuildRequires: golang-packaging diff --git a/endpoint-copier-operator/_service b/endpoint-copier-operator/_service index 81fb0fb..a6877c9 100644 --- a/endpoint-copier-operator/_service +++ b/endpoint-copier-operator/_service @@ -12,10 +12,8 @@ yes \1 - - - *.tar - gz + + endpoint-copier-operator.obsinfo diff --git a/endpoint-copier-operator/endpoint-copier-operator.spec b/endpoint-copier-operator/endpoint-copier-operator.spec index 0466fc1..b1f390e 100644 --- a/endpoint-copier-operator/endpoint-copier-operator.spec +++ b/endpoint-copier-operator/endpoint-copier-operator.spec @@ -22,7 +22,7 @@ Release: 0.2.0 Summary: Implements a Kubernetes API for copying endpoint resources License: Apache-2.0 URL: https://github.com/suse-edge/endpoint-copier-operator -Source: endpoint-copier-operator-%{version}.tar.gz +Source: endpoint-copier-operator-%{version}.tar Source1: vendor.tar.gz BuildRequires: golang(API) = 1.20 ExcludeArch: s390 diff --git a/frr-k8s/_service b/frr-k8s/_service index 10c03d5..f83862b 100644 --- a/frr-k8s/_service +++ b/frr-k8s/_service @@ -12,10 +12,8 @@ yes \1 - - - *.tar - gz + + frr-k8s.obsinfo diff --git a/frr-k8s/frr-k8s.spec b/frr-k8s/frr-k8s.spec index 9342812..3d97a10 100644 --- a/frr-k8s/frr-k8s.spec +++ b/frr-k8s/frr-k8s.spec @@ -22,7 +22,7 @@ Release: 0.0.14 Summary: A kubernetes based daemonset that exposes a subset of the FRR API in a kubernetes compliant manner. License: Apache-2.0 URL: https://github.com/metallb/frr-k8s -Source: frr-k8s-%{version}.tar.gz +Source: frr-k8s-%{version}.tar Source1: vendor.tar.gz BuildRequires: golang(API) = 1.22 ExcludeArch: s390 diff --git a/hauler/_service b/hauler/_service index 54563fb..a7d11ad 100644 --- a/hauler/_service +++ b/hauler/_service @@ -8,10 +8,8 @@ v(.*) enable - - - *.tar - gz + + hauler.obsinfo diff --git a/hauler/hauler.spec b/hauler/hauler.spec index cbee7c0..79b5052 100644 --- a/hauler/hauler.spec +++ b/hauler/hauler.spec @@ -23,7 +23,7 @@ Release: 0 Summary: Airgap Swiss Army Knife License: Apache-2.0 URL: https://github.com/hauler-dev/hauler -Source: hauler-%{version}.tar.gz +Source: hauler-%{version}.tar Source1: vendor.tar.gz BuildRequires: golang-packaging BuildRequires: cosign diff --git a/kube-rbac-proxy/_service b/kube-rbac-proxy/_service index 99268e7..40083f2 100644 --- a/kube-rbac-proxy/_service +++ b/kube-rbac-proxy/_service @@ -12,10 +12,8 @@ yes \1 - - - *.tar - gz + + kube-rbac-proxy.obsinfo diff --git a/kube-rbac-proxy/kube-rbac-proxy.spec b/kube-rbac-proxy/kube-rbac-proxy.spec index 9d8075a..ead43b6 100644 --- a/kube-rbac-proxy/kube-rbac-proxy.spec +++ b/kube-rbac-proxy/kube-rbac-proxy.spec @@ -22,7 +22,7 @@ Release: 0.18.1 Summary: The kube-rbac-proxy is a small HTTP proxy for a single upstream License: Apache-2.0 URL: https://github.com/brancz/kube-rbac-proxy -Source: kube-rbac-proxy-%{version}.tar.gz +Source: kube-rbac-proxy-%{version}.tar Source1: vendor.tar.gz BuildRequires: golang(API) = 1.23 ExcludeArch: s390 diff --git a/metallb/_service b/metallb/_service index 5066257..e709ca2 100644 --- a/metallb/_service +++ b/metallb/_service @@ -12,10 +12,8 @@ yes \1 - - - *.tar - gz + + metallb.obsinfo diff --git a/metallb/metallb.spec b/metallb/metallb.spec index f59d4db..17316a4 100644 --- a/metallb/metallb.spec +++ b/metallb/metallb.spec @@ -22,7 +22,7 @@ Release: 0.14.8 Summary: Load Balancer for bare metal Kubernetes clusters License: Apache-2.0 URL: https://github.com/metallb/metallb -Source: %{name}-%{version}.tar.gz +Source: %{name}-%{version}.tar Source1: vendor.tar.gz BuildRequires: golang(API) = 1.22 ExcludeArch: s390 diff --git a/nm-configurator/_service b/nm-configurator/_service index a83f874..5a481e9 100644 --- a/nm-configurator/_service +++ b/nm-configurator/_service @@ -9,7 +9,9 @@ \1 enable - + + nm-configurator.obsinfo + nm-configurator diff --git a/upgrade-controller/_service b/upgrade-controller/_service index 251bb05..3610179 100644 --- a/upgrade-controller/_service +++ b/upgrade-controller/_service @@ -9,10 +9,8 @@ \1.\2.\3 enable - - - *.tar - gz + + upgrade-controller.obsinfo gz diff --git a/upgrade-controller/upgrade-controller.spec b/upgrade-controller/upgrade-controller.spec index 2d7d586..d7cf993 100644 --- a/upgrade-controller/upgrade-controller.spec +++ b/upgrade-controller/upgrade-controller.spec @@ -22,7 +22,7 @@ Release: 0 Summary: Upgrade Controller License: Apache-2.0 URL: https://github.com/suse-edge/upgrade-controller -Source: upgrade-controller-%{version}.tar.gz +Source: upgrade-controller-%{version}.tar Source1: vendor.tar.gz BuildRequires: golang(API) go1.22 BuildRequires: golang-packaging -- 2.45.2 From 98c4be017dedba902725aaf844fb38031f92065657e30171b66a13fdadce95da Mon Sep 17 00:00:00 2001 From: Nicolas Belouin Date: Mon, 24 Feb 2025 13:47:52 +0100 Subject: [PATCH 2/2] Add ipcalc, crudini and fakeroot for aarch64 build Signed-off-by: Nicolas Belouin --- _config | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/_config b/_config index c2e903a..9de1f11 100644 --- a/_config +++ b/_config @@ -54,35 +54,39 @@ BuildFlags: onlybuild:release-manifest-image # Exclude the images selected by the following section # as the standard repository is a dependency %ifarch aarch64 + BuildFlags: excludebuild:baremetal-operator-image BuildFlags: excludebuild:endpoint-copier-operator-image + BuildFlags: excludebuild:ironic-image + BuildFlags: excludebuild:ironic-ipa-downloader-image + BuildFlags: excludebuild:kube-rbac-proxy-image BuildFlags: excludebuild:metallb-controller-image BuildFlags: excludebuild:metallb-speaker-image - BuildFlags: excludebuild:baremetal-operator-image - BuildFlags: excludebuild:ironic-ipa-downloader-image - BuildFlags: excludebuild:ironic-image - BuildFlags: excludebuild:kube-rbac-proxy-image %endif %else # Only a subset of stack is arm64 ready %ifarch aarch64 + BuildFlags: onlybuild:autoconf + BuildFlags: onlybuild:baremetal-operator + BuildFlags: onlybuild:baremetal-operator-image BuildFlags: onlybuild:ca-certificates-suse BuildFlags: onlybuild:cosign + BuildFlags: onlybuild:crudini BuildFlags: onlybuild:edge-image-builder BuildFlags: onlybuild:edge-image-builder-image BuildFlags: onlybuild:endpoint-copier-operator BuildFlags: onlybuild:endpoint-copier-operator-image + BuildFlags: onlybuild:fakeroot BuildFlags: onlybuild:hauler + BuildFlags: onlybuild:ipcalc + BuildFlags: onlybuild:ironic-image + BuildFlags: onlybuild:ironic-ipa-downloader-image + BuildFlags: onlybuild:ironic-ipa-ramdisk + BuildFlags: onlybuild:kube-rbac-proxy + BuildFlags: onlybuild:kube-rbac-proxy-image BuildFlags: onlybuild:metallb BuildFlags: onlybuild:metallb-controller-image BuildFlags: onlybuild:metallb-speaker-image BuildFlags: onlybuild:nm-configurator - BuildFlags: onlybuild:baremetal-operator - BuildFlags: onlybuild:baremetal-operator-image - BuildFlags: onlybuild:ironic-ipa-ramdisk - BuildFlags: onlybuild:ironic-ipa-downloader-image - BuildFlags: onlybuild:ironic-image - BuildFlags: onlybuild:kube-rbac-proxy - BuildFlags: onlybuild:kube-rbac-proxy-image %endif %endif -- 2.45.2