From 3dba613ca29249b89186b8e2ed21f32d263be1d3 Mon Sep 17 00:00:00 2001 From: Patrick Van der Veken Date: Wed, 24 Apr 2019 20:24:52 +0200 Subject: [PATCH] Fix & move build files --- .../linux/SPECS/hc-clusterware-platform.spec | 2 +- .../{ => linux}/ARCH/hc-exadata-platform/.install | 0 .../{ => linux}/ARCH/hc-exadata-platform/PKGBUILD | 0 .../{ => linux}/DEBIAN/hc-exadata-platform/control | 0 .../{ => linux}/DEBIAN/hc-exadata-platform/postinst | 0 .../{ => linux}/DEBIAN/hc-exadata-platform/postrm | 0 .../{ => linux}/SPECS/hc-exadata-platform.spec | 0 build/exadata/{ => linux}/hc_build_linux_rpms.sh | 0 .../hc_serviceguard_platform.psf | 12 +++++++----- .../linux/SPECS/hc-serviceguard-platform.spec | 2 +- 10 files changed, 9 insertions(+), 7 deletions(-) rename build/exadata/{ => linux}/ARCH/hc-exadata-platform/.install (100%) rename build/exadata/{ => linux}/ARCH/hc-exadata-platform/PKGBUILD (100%) rename build/exadata/{ => linux}/DEBIAN/hc-exadata-platform/control (100%) rename build/exadata/{ => linux}/DEBIAN/hc-exadata-platform/postinst (100%) mode change 100755 => 100644 rename build/exadata/{ => linux}/DEBIAN/hc-exadata-platform/postrm (100%) mode change 100755 => 100644 rename build/exadata/{ => linux}/SPECS/hc-exadata-platform.spec (100%) rename build/exadata/{ => linux}/hc_build_linux_rpms.sh (100%) diff --git a/build/clusterware/linux/SPECS/hc-clusterware-platform.spec b/build/clusterware/linux/SPECS/hc-clusterware-platform.spec index d9ccc8c..1f5a571 100644 --- a/build/clusterware/linux/SPECS/hc-clusterware-platform.spec +++ b/build/clusterware/linux/SPECS/hc-clusterware-platform.spec @@ -79,5 +79,5 @@ echo "INFO: finished post-uninstall script" %dir /etc/opt/hc/core/templates %changelog -* Sa Apr 20 2019 - 0.0.1 +* Sat Apr 20 2019 - 0.0.1 - Initial build diff --git a/build/exadata/ARCH/hc-exadata-platform/.install b/build/exadata/linux/ARCH/hc-exadata-platform/.install similarity index 100% rename from build/exadata/ARCH/hc-exadata-platform/.install rename to build/exadata/linux/ARCH/hc-exadata-platform/.install diff --git a/build/exadata/ARCH/hc-exadata-platform/PKGBUILD b/build/exadata/linux/ARCH/hc-exadata-platform/PKGBUILD similarity index 100% rename from build/exadata/ARCH/hc-exadata-platform/PKGBUILD rename to build/exadata/linux/ARCH/hc-exadata-platform/PKGBUILD diff --git a/build/exadata/DEBIAN/hc-exadata-platform/control b/build/exadata/linux/DEBIAN/hc-exadata-platform/control similarity index 100% rename from build/exadata/DEBIAN/hc-exadata-platform/control rename to build/exadata/linux/DEBIAN/hc-exadata-platform/control diff --git a/build/exadata/DEBIAN/hc-exadata-platform/postinst b/build/exadata/linux/DEBIAN/hc-exadata-platform/postinst old mode 100755 new mode 100644 similarity index 100% rename from build/exadata/DEBIAN/hc-exadata-platform/postinst rename to build/exadata/linux/DEBIAN/hc-exadata-platform/postinst diff --git a/build/exadata/DEBIAN/hc-exadata-platform/postrm b/build/exadata/linux/DEBIAN/hc-exadata-platform/postrm old mode 100755 new mode 100644 similarity index 100% rename from build/exadata/DEBIAN/hc-exadata-platform/postrm rename to build/exadata/linux/DEBIAN/hc-exadata-platform/postrm diff --git a/build/exadata/SPECS/hc-exadata-platform.spec b/build/exadata/linux/SPECS/hc-exadata-platform.spec similarity index 100% rename from build/exadata/SPECS/hc-exadata-platform.spec rename to build/exadata/linux/SPECS/hc-exadata-platform.spec diff --git a/build/exadata/hc_build_linux_rpms.sh b/build/exadata/linux/hc_build_linux_rpms.sh similarity index 100% rename from build/exadata/hc_build_linux_rpms.sh rename to build/exadata/linux/hc_build_linux_rpms.sh diff --git a/build/serviceguard/hpux/hc_serviceguard_platform/hc_serviceguard_platform.psf b/build/serviceguard/hpux/hc_serviceguard_platform/hc_serviceguard_platform.psf index e7b7d3a..f206e1e 100644 --- a/build/serviceguard/hpux/hc_serviceguard_platform/hc_serviceguard_platform.psf +++ b/build/serviceguard/hpux/hc_serviceguard_platform/hc_serviceguard_platform.psf @@ -17,12 +17,12 @@ bundle architecture HP-UX_B.11_32/64 machine_type ia64* vendor_tag KUDOS - contents HC-SERVICEGUARD-PLATFORM,r=,a=,v= + contents HC-SERVICEGUARD-PLATFORM-MAIN,r=,a=,v= end # Product definitions: product - tag HC-SERVICEGUARD-PLATFORM + tag HC-SERVICEGUARD-PLATFORM-MAIN revision %BUILD_DATE% category tools category_title Tools @@ -74,7 +74,7 @@ This is the OS/platform plugin package" is_reboot false is_sparse false is_patch false - prerequisite HC-SERVICEGUARD-PLATFORM.plugins + prerequisite HC-SERVICEGUARD-PLATFORM-MAIN.plugins file_permissions -u 0222 -o root -g sys @@ -87,16 +87,18 @@ This is the OS/platform plugin package" fileset tag templates - title UX Health Checker (OS/Platform plugins: templates) + title UX Health Checker (Serviceguard plugins: templates) is_kernel false is_locatable false is_reboot false is_sparse false is_patch false - prerequisite HC-SERVICEGUARD-PLATFORM.plugins + prerequisite HC-SERVICEGUARD-PLATFORM-MAIN.plugins file_permissions -u 0222 -o root -g sys directory ../../../etc/opt/hc/core/templates=/etc/opt/hc/core/templates + file -m 644 mail_body.tpl-check_hpux_sg_cluster_status + file -m 644 mail_body.tpl-check_hpux_sg_package_status end end diff --git a/build/serviceguard/linux/SPECS/hc-serviceguard-platform.spec b/build/serviceguard/linux/SPECS/hc-serviceguard-platform.spec index f06a486..bd8fc87 100644 --- a/build/serviceguard/linux/SPECS/hc-serviceguard-platform.spec +++ b/build/serviceguard/linux/SPECS/hc-serviceguard-platform.spec @@ -89,5 +89,5 @@ echo "INFO: finished post-uninstall script" %dir /etc/opt/hc/core/templates %changelog -* Sa Apr 20 2019 - 0.0.1 +* Sat Apr 20 2019 - 0.0.1 - Initial build