From 19d06455612dd1ea8631d06eab42061a362f0bef Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Sat, 7 Dec 2024 15:59:54 +0530 Subject: [PATCH 01/10] packaging: have noarch defined for rpms This makes rpms arch-independent Signed-off-by: Rohit Yadav --- packaging/el8/cloud.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/packaging/el8/cloud.spec b/packaging/el8/cloud.spec index f9d6fd1ce873..2e2523d59e06 100644 --- a/packaging/el8/cloud.spec +++ b/packaging/el8/cloud.spec @@ -35,6 +35,7 @@ Group: System Environment/Libraries # FIXME do groups for every single one of the subpackages Source0: %{name}-%{_maventag}.tgz BuildRoot: %{_tmppath}/%{name}-%{_maventag}-%{release}-build +BuildArch: noarch BuildRequires: (java-11-openjdk-devel or java-17-openjdk-devel) #BuildRequires: ws-commons-util From 3637de0eb313acfe990a1482faf9bfa4bf4ca5be Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Sun, 8 Dec 2024 02:37:01 +0530 Subject: [PATCH 02/10] Update cloud.spec --- packaging/el8/cloud.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/packaging/el8/cloud.spec b/packaging/el8/cloud.spec index 2e2523d59e06..85a5bc46cfbc 100644 --- a/packaging/el8/cloud.spec +++ b/packaging/el8/cloud.spec @@ -17,6 +17,7 @@ %define __os_install_post %{nil} %global debug_package %{nil} +%define _binaries_in_noarch_packages_terminate_build 0 # DISABLE the post-percentinstall java repacking and line number stripping # we need to find a way to just disable the java repacking and line number stripping, but not the autodeps From 0b0c53c56a20147e0f3f659ca2753b739b00c72c Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Sun, 8 Dec 2024 10:44:04 +0530 Subject: [PATCH 03/10] Update cloud.spec --- packaging/el8/cloud.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/packaging/el8/cloud.spec b/packaging/el8/cloud.spec index 85a5bc46cfbc..2bf341a4bf13 100644 --- a/packaging/el8/cloud.spec +++ b/packaging/el8/cloud.spec @@ -18,6 +18,7 @@ %define __os_install_post %{nil} %global debug_package %{nil} %define _binaries_in_noarch_packages_terminate_build 0 +%define __requires_exclude libc.so.6 # DISABLE the post-percentinstall java repacking and line number stripping # we need to find a way to just disable the java repacking and line number stripping, but not the autodeps From 5934a12f1f1c25ddd799eb0334419b8de8fcfbef Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Sun, 8 Dec 2024 23:28:47 +0530 Subject: [PATCH 04/10] Update cloud.spec --- packaging/el8/cloud.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packaging/el8/cloud.spec b/packaging/el8/cloud.spec index 2bf341a4bf13..3c5653183d28 100644 --- a/packaging/el8/cloud.spec +++ b/packaging/el8/cloud.spec @@ -17,8 +17,8 @@ %define __os_install_post %{nil} %global debug_package %{nil} +%global __requires_exclude %__requires_exclude|^libc.so.* %define _binaries_in_noarch_packages_terminate_build 0 -%define __requires_exclude libc.so.6 # DISABLE the post-percentinstall java repacking and line number stripping # we need to find a way to just disable the java repacking and line number stripping, but not the autodeps @@ -48,6 +48,7 @@ BuildRequires: /usr/bin/mkisofs BuildRequires: python3-setuptools BuildRequires: wget BuildRequires: nodejs +AutoReqProv: no %description CloudStack is a highly-scalable elastic, open source, From a8bec24c3e73203476b0a7f16b0746cf0aa34954 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Sun, 8 Dec 2024 23:35:39 +0530 Subject: [PATCH 05/10] Update cloud.spec --- packaging/el8/cloud.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/el8/cloud.spec b/packaging/el8/cloud.spec index 3c5653183d28..a223048ee536 100644 --- a/packaging/el8/cloud.spec +++ b/packaging/el8/cloud.spec @@ -121,7 +121,7 @@ Requires: qemu-kvm Requires: cryptsetup Requires: rng-tools Requires: (libgcrypt > 1.8.3 or libgcrypt20) -Requires: (selinux-tools if qemu-tools) +Requires: ((selinux-tools if qemu-tools) or (qemu-img or qemu-tools)) Provides: cloud-agent Group: System Environment/Libraries %description agent From 5f2bcd26dcc240ac23535d08dcfc8fb4ba07b49f Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Sun, 8 Dec 2024 23:43:02 +0530 Subject: [PATCH 06/10] Update cloud.spec --- packaging/el8/cloud.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/el8/cloud.spec b/packaging/el8/cloud.spec index a223048ee536..1760ee417f26 100644 --- a/packaging/el8/cloud.spec +++ b/packaging/el8/cloud.spec @@ -17,7 +17,7 @@ %define __os_install_post %{nil} %global debug_package %{nil} -%global __requires_exclude %__requires_exclude|^libc.so.* +%global __requires_exclude ^libc.so.* %define _binaries_in_noarch_packages_terminate_build 0 # DISABLE the post-percentinstall java repacking and line number stripping From b2103cbb3f94a2481ec5318ead2b235e5a223662 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Sun, 8 Dec 2024 23:51:37 +0530 Subject: [PATCH 07/10] Update cloud.spec --- packaging/el8/cloud.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/el8/cloud.spec b/packaging/el8/cloud.spec index 1760ee417f26..4d0cafc5a3fc 100644 --- a/packaging/el8/cloud.spec +++ b/packaging/el8/cloud.spec @@ -121,7 +121,7 @@ Requires: qemu-kvm Requires: cryptsetup Requires: rng-tools Requires: (libgcrypt > 1.8.3 or libgcrypt20) -Requires: ((selinux-tools if qemu-tools) or (qemu-img or qemu-tools)) +Requires: (selinux-tools if selinux-tools) Provides: cloud-agent Group: System Environment/Libraries %description agent From 631a2912aa8293bcc9c07dda0a01d63aa6a42f5b Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Mon, 9 Dec 2024 20:34:55 +0530 Subject: [PATCH 08/10] Update cloud.spec --- packaging/el8/cloud.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/el8/cloud.spec b/packaging/el8/cloud.spec index 4d0cafc5a3fc..62d86bdfd7fb 100644 --- a/packaging/el8/cloud.spec +++ b/packaging/el8/cloud.spec @@ -48,7 +48,7 @@ BuildRequires: /usr/bin/mkisofs BuildRequires: python3-setuptools BuildRequires: wget BuildRequires: nodejs -AutoReqProv: no +AutoReq: no %description CloudStack is a highly-scalable elastic, open source, From 4f7fb62ed651f287d1fbd1173a6510c6b392e682 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Tue, 10 Dec 2024 14:24:30 +0530 Subject: [PATCH 09/10] Update cloud.spec --- packaging/el8/cloud.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packaging/el8/cloud.spec b/packaging/el8/cloud.spec index 62d86bdfd7fb..e9e730faa1bc 100644 --- a/packaging/el8/cloud.spec +++ b/packaging/el8/cloud.spec @@ -17,7 +17,7 @@ %define __os_install_post %{nil} %global debug_package %{nil} -%global __requires_exclude ^libc.so.* +%global __requires_exclude *libc.so.* %define _binaries_in_noarch_packages_terminate_build 0 # DISABLE the post-percentinstall java repacking and line number stripping @@ -48,7 +48,6 @@ BuildRequires: /usr/bin/mkisofs BuildRequires: python3-setuptools BuildRequires: wget BuildRequires: nodejs -AutoReq: no %description CloudStack is a highly-scalable elastic, open source, From f94afd3a3788c9f3a81577e2959bdf93e348a155 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Mon, 30 Dec 2024 13:35:34 +0530 Subject: [PATCH 10/10] Update packaging/el8/cloud.spec --- packaging/el8/cloud.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/el8/cloud.spec b/packaging/el8/cloud.spec index e9e730faa1bc..92d736e60fd0 100644 --- a/packaging/el8/cloud.spec +++ b/packaging/el8/cloud.spec @@ -17,7 +17,7 @@ %define __os_install_post %{nil} %global debug_package %{nil} -%global __requires_exclude *libc.so.* +%global __requires_exclude libc\\.so\\..* %define _binaries_in_noarch_packages_terminate_build 0 # DISABLE the post-percentinstall java repacking and line number stripping