From e6a7fff91e3f979900dff8ef4902bc6616ba432a Mon Sep 17 00:00:00 2001 From: babak sarashki Date: Tue, 9 Jul 2019 22:00:46 -0700 Subject: [PATCH] Staging starlingx Added stx-config, stx-fault, and stx-metal. --- README | 39 +- conf/layer.conf | 26 +- recipes-core/images/starlingx-image-aio.bb | 25 ++ .../packagegroups/packagegroup-stx-metal.bb | 6 +- recipes-core/stx-config/config-gate.bb | 39 -- recipes-core/stx-config/config-gate.inc | 15 + recipes-core/stx-config/controllerconfig.bb | 61 --- recipes-core/stx-config/controllerconfig.inc | 55 +++ recipes-core/stx-config/pm-qos-mgr.bb | 44 --- recipes-core/stx-config/pm-qos-mgr.inc | 24 ++ recipes-core/stx-config/puppet-manifests.bb | 41 -- recipes-core/stx-config/puppet-manifests.inc | 36 ++ ...-modules-wrs.bb => puppet-modules-wrs.inc} | 46 +-- recipes-core/stx-config/storageconfig.inc | 14 + .../fm-api.bb => stx-config/stx-config.bb} | 37 +- .../stx-config/stx-config.bb.DONOTUSE | 209 ----------- recipes-core/stx-config/sysinv.bb | 58 --- recipes-core/stx-config/sysinv.inc | 50 +++ recipes-core/stx-config/worker-utils.bb | 40 -- recipes-core/stx-config/worker-utils.inc | 31 ++ recipes-core/stx-config/workerconfig.bb | 37 -- recipes-core/stx-config/workerconfig.inc | 16 + .../0001-Honor-the-build-system-LDFLAGS.patch | 0 .../0001-Use-build-systems-LDFLAGS.patch | 25 ++ ...1-snmp-ext-use-build-systems-LDFLAGS.patch | 25 ++ recipes-core/stx-fault/fm-api.inc | 21 ++ recipes-core/stx-fault/fm-common.bb | 56 --- recipes-core/stx-fault/fm-common.inc | 43 +++ recipes-core/stx-fault/fm-doc.bb | 44 --- recipes-core/stx-fault/fm-doc.inc | 20 + recipes-core/stx-fault/fm-mgr.bb | 45 --- recipes-core/stx-fault/fm-mgr.inc | 31 ++ recipes-core/stx-fault/fm-rest-api.bb | 43 --- recipes-core/stx-fault/fm-rest-api.inc | 28 ++ recipes-core/stx-fault/python-fmclient.bb | 42 --- recipes-core/stx-fault/python-fmclient.inc | 26 ++ recipes-core/stx-fault/snmp-audittrail.bb | 44 --- recipes-core/stx-fault/snmp-audittrail.inc | 25 ++ recipes-core/stx-fault/snmp-ext.bb | 46 --- recipes-core/stx-fault/snmp-ext.inc | 25 ++ recipes-core/stx-fault/stx-fault.bb | 62 ++++ recipes-core/stx-fault/stx-fault.bb.DONTUSE | 197 ---------- recipes-core/stx-fault/stx-fault.inc | 3 - recipes-core/stx-ha/{sm-api.bb => sm-api.inc} | 31 +- recipes-core/stx-ha/sm-client.bb | 39 -- recipes-core/stx-ha/sm-client.inc | 20 + recipes-core/stx-ha/sm-common.bb | 43 --- recipes-core/stx-ha/sm-common.inc | 56 +++ recipes-core/stx-ha/sm-db.bb | 40 -- recipes-core/stx-ha/sm-db.inc | 26 ++ recipes-core/stx-ha/sm-tools.bb | 37 -- recipes-core/stx-ha/sm-tools.inc | 23 ++ recipes-core/stx-ha/sm.bb | 51 --- recipes-core/stx-ha/sm.inc | 34 ++ recipes-core/stx-ha/stx-ha.bb | 57 +++ recipes-core/stx-ha/stx-ha.inc | 2 - .../filesystem-scripts.bb | 46 +++ .../iscsi-initiator-utils-config.bb | 45 +++ .../stx-integ-filesystem/nfs-utils-config.bb | 56 +++ .../nfscheck.bb} | 23 +- .../stx-integ-filesystem.inc | 2 + .../cloud-provider-openstack.bb | 46 +++ .../stx-integ-kubernetes.inc | 2 + .../stx-integ-config-files.inc | 2 + ...-linking-and-pass-flags-down-to-subm.patch | 199 ++++++++++ ...ntf-to-avoid-overflowing-amon.tx_buf.patch | 26 ++ ...t-install-empty-directory-unless-nee.patch | 24 ++ ...t-install-empty-directory-unless-nee.patch | 23 ++ ...t-install-empty-directory-unless-nee.patch | 31 ++ .../stx-metal/{inventory.bb => inventory.inc} | 53 ++- .../{mtce-common.bb => mtce-common.inc} | 71 +--- recipes-core/stx-metal/mtce-compute.bb | 47 --- recipes-core/stx-metal/mtce-compute.inc | 31 ++ recipes-core/stx-metal/mtce-control.bb | 47 --- recipes-core/stx-metal/mtce-control.inc | 33 ++ recipes-core/stx-metal/mtce-storage.bb | 45 --- recipes-core/stx-metal/mtce-storage.inc | 29 ++ recipes-core/stx-metal/{mtce.bb => mtce.inc} | 130 +++++-- .../stx-metal/python-inventoryclient.bb | 46 --- .../stx-metal/python-inventoryclient.inc | 31 ++ recipes-core/stx-metal/stx-metal.bb | 65 ++++ recipes-core/stx-metal/stx-metal.bb.DONOTUSE | 350 ------------------ recipes-core/stx-metal/stx-metal.inc | 2 - recipes-core/stx/distributedcloud.bb | 64 ---- recipes-core/stx/stx-integ.bb | 29 -- recipes-core/stx/stx-upstream.bb | 28 -- recipes-dbs/mysql/mariadb_10.1_bb_ | 48 +++ .../linux/linux-yocto-rt_%.bbappend | 11 + recipes-kernel/linux/linux-yocto_%.bbappend | 10 + 89 files changed, 1795 insertions(+), 2159 deletions(-) create mode 100644 recipes-core/images/starlingx-image-aio.bb delete mode 100644 recipes-core/stx-config/config-gate.bb create mode 100644 recipes-core/stx-config/config-gate.inc delete mode 100644 recipes-core/stx-config/controllerconfig.bb create mode 100644 recipes-core/stx-config/controllerconfig.inc delete mode 100644 recipes-core/stx-config/pm-qos-mgr.bb create mode 100644 recipes-core/stx-config/pm-qos-mgr.inc delete mode 100644 recipes-core/stx-config/puppet-manifests.bb create mode 100644 recipes-core/stx-config/puppet-manifests.inc rename recipes-core/stx-config/{puppet-modules-wrs.bb => puppet-modules-wrs.inc} (67%) create mode 100644 recipes-core/stx-config/storageconfig.inc rename recipes-core/{stx-fault/fm-api.bb => stx-config/stx-config.bb} (56%) delete mode 100644 recipes-core/stx-config/stx-config.bb.DONOTUSE delete mode 100644 recipes-core/stx-config/sysinv.bb create mode 100644 recipes-core/stx-config/sysinv.inc delete mode 100644 recipes-core/stx-config/worker-utils.bb create mode 100644 recipes-core/stx-config/worker-utils.inc delete mode 100644 recipes-core/stx-config/workerconfig.bb create mode 100644 recipes-core/stx-config/workerconfig.inc rename {patches/stx-fault => recipes-core/stx-fault/files}/0001-Honor-the-build-system-LDFLAGS.patch (100%) create mode 100644 recipes-core/stx-fault/files/0001-Use-build-systems-LDFLAGS.patch create mode 100644 recipes-core/stx-fault/files/0001-snmp-ext-use-build-systems-LDFLAGS.patch create mode 100644 recipes-core/stx-fault/fm-api.inc delete mode 100644 recipes-core/stx-fault/fm-common.bb create mode 100644 recipes-core/stx-fault/fm-common.inc delete mode 100644 recipes-core/stx-fault/fm-doc.bb create mode 100644 recipes-core/stx-fault/fm-doc.inc delete mode 100644 recipes-core/stx-fault/fm-mgr.bb create mode 100644 recipes-core/stx-fault/fm-mgr.inc delete mode 100644 recipes-core/stx-fault/fm-rest-api.bb create mode 100644 recipes-core/stx-fault/fm-rest-api.inc delete mode 100644 recipes-core/stx-fault/python-fmclient.bb create mode 100644 recipes-core/stx-fault/python-fmclient.inc delete mode 100644 recipes-core/stx-fault/snmp-audittrail.bb create mode 100644 recipes-core/stx-fault/snmp-audittrail.inc delete mode 100644 recipes-core/stx-fault/snmp-ext.bb create mode 100644 recipes-core/stx-fault/snmp-ext.inc create mode 100644 recipes-core/stx-fault/stx-fault.bb delete mode 100644 recipes-core/stx-fault/stx-fault.bb.DONTUSE delete mode 100644 recipes-core/stx-fault/stx-fault.inc rename recipes-core/stx-ha/{sm-api.bb => sm-api.inc} (56%) delete mode 100644 recipes-core/stx-ha/sm-client.bb create mode 100644 recipes-core/stx-ha/sm-client.inc delete mode 100644 recipes-core/stx-ha/sm-common.bb create mode 100644 recipes-core/stx-ha/sm-common.inc delete mode 100644 recipes-core/stx-ha/sm-db.bb create mode 100644 recipes-core/stx-ha/sm-db.inc delete mode 100644 recipes-core/stx-ha/sm-tools.bb create mode 100644 recipes-core/stx-ha/sm-tools.inc delete mode 100644 recipes-core/stx-ha/sm.bb create mode 100644 recipes-core/stx-ha/sm.inc create mode 100644 recipes-core/stx-ha/stx-ha.bb delete mode 100644 recipes-core/stx-ha/stx-ha.inc create mode 100644 recipes-core/stx-integ-filesystem/filesystem-scripts.bb create mode 100644 recipes-core/stx-integ-filesystem/iscsi-initiator-utils-config.bb create mode 100644 recipes-core/stx-integ-filesystem/nfs-utils-config.bb rename recipes-core/{stx-config/storageconfig.bb => stx-integ-filesystem/nfscheck.bb} (54%) create mode 100644 recipes-core/stx-integ-filesystem/stx-integ-filesystem.inc create mode 100644 recipes-core/stx-integ-kubernetes/cloud-provider-openstack.bb create mode 100644 recipes-core/stx-integ-kubernetes/stx-integ-kubernetes.inc create mode 100644 recipes-core/stx-integ-puppet/stx-integ-config-files.inc create mode 100644 recipes-core/stx-metal/files/0001-Use-LDFLAGS-when-linking-and-pass-flags-down-to-subm.patch create mode 100644 recipes-core/stx-metal/files/0001-Use-snprintf-to-avoid-overflowing-amon.tx_buf.patch create mode 100644 recipes-core/stx-metal/files/0001-mtce-compute-dont-install-empty-directory-unless-nee.patch create mode 100644 recipes-core/stx-metal/files/0001-mtce-control-dont-install-empty-directory-unless-nee.patch create mode 100644 recipes-core/stx-metal/files/0001-mtce-storage-dont-install-empty-directory-unless-nee.patch rename recipes-core/stx-metal/{inventory.bb => inventory.inc} (62%) rename recipes-core/stx-metal/{mtce-common.bb => mtce-common.inc} (51%) delete mode 100644 recipes-core/stx-metal/mtce-compute.bb create mode 100644 recipes-core/stx-metal/mtce-compute.inc delete mode 100644 recipes-core/stx-metal/mtce-control.bb create mode 100644 recipes-core/stx-metal/mtce-control.inc delete mode 100644 recipes-core/stx-metal/mtce-storage.bb create mode 100644 recipes-core/stx-metal/mtce-storage.inc rename recipes-core/stx-metal/{mtce.bb => mtce.inc} (72%) delete mode 100644 recipes-core/stx-metal/python-inventoryclient.bb create mode 100644 recipes-core/stx-metal/python-inventoryclient.inc create mode 100644 recipes-core/stx-metal/stx-metal.bb delete mode 100644 recipes-core/stx-metal/stx-metal.bb.DONOTUSE delete mode 100644 recipes-core/stx-metal/stx-metal.inc delete mode 100644 recipes-core/stx/distributedcloud.bb delete mode 100644 recipes-core/stx/stx-integ.bb delete mode 100644 recipes-core/stx/stx-upstream.bb create mode 100644 recipes-dbs/mysql/mariadb_10.1_bb_ create mode 100644 recipes-kernel/linux/linux-yocto-rt_%.bbappend create mode 100644 recipes-kernel/linux/linux-yocto_%.bbappend diff --git a/README b/README index 85e7582..4877167 100644 --- a/README +++ b/README @@ -3,7 +3,12 @@ Staging: This is an initial layer to port starlingx to yocto linux, and not ready for consumption yet. -To use this layer: +########################################################### +************************************************************ + setup build environment +************************************************************ +########################################################### + mkdir -p layers cd layers @@ -31,7 +36,6 @@ Next steps: bblayers, local.conf, and setup starlinX repo: bblayers.conf: ************************************************************ ########################################################### -git checkout the thud branch of the layers below Then start a project and edit the bblayers.conf file to include the following layers : PATH_TO_LOCAL_REPO/layers/poky/meta @@ -49,22 +53,18 @@ to include the following layers : PATH_TO_LOCAL_REPO/layers/meta-cloud-services/meta-openstack PATH_TO_LOCAL_REPO/layers/meta-cloud-services/meta-openstack-aio-deploy PATH_TO_LOCAL_REPO/layers/meta-cloud-services/meta-openstack-compute-deploy - PATH_TO_LOCAL_REPO/layers/meta-cloud-services/meta-openstack-compute-test-config PATH_TO_LOCAL_REPO/layers/meta-cloud-services/meta-openstack-controller-deploy - PATH_TO_LOCAL_REPO/layers/meta-cloud-services/meta-openstack-controller-test-config PATH_TO_LOCAL_REPO/layers/meta-cloud-services/meta-openstack-qemu PATH_TO_LOCAL_REPO/layers/meta-cloud-services/meta-openstack-swift-deploy - PATH_TO_LOCAL_REPO/layers/meta-measured + PATH_TO_LOCAL_REPO/layers/meta-secure-core/meta + PATH_TO_LOCAL_REPO/layers/meta-secure-core/meta-tpm2 PATH_TO_LOCAL_REPO/layers/meta-secure-core/meta-signing-key PATH_TO_LOCAL_REPO/layers/meta-secure-core/meta-efi-secure-boot PATH_TO_LOCAL_REPO/layers/meta-secure-core/meta-encrypted-storage PATH_TO_LOCAL_REPO/layers/meta-secure-core/meta-integrity - PATH_TO_LOCAL_REPO/layers/meta-secure-core/meta-tpm2 - PATH_TO_LOCAL_REPO/layers/meta-secure-core/meta PATH_TO_LOCAL_REPO/layers/meta-security/meta-tpm PATH_TO_LOCAL_REPO/layers/meta-selinux PATH_TO_LOCAL_REPO/layers/meta-intel - PATH_TO_LOCAL_REPO/layers/meta-iot-cloud PATH_TO_LOCAL_REPO/layers/meta-starlingX ########################################################### @@ -76,26 +76,3 @@ to include the following layers : # Set distro features DISTRO_FEATURES_append = " virtualization" DISTRO_FEATURES_append = " openstack" - -# set external repo -EXTERNALREPO="/path/to/starlingx/external_repo/cgcs-root/stx" - - -########################################################### -************************************************************ - StarlingX: -************************************************************ -########################################################### -mkdir -p /path/to/starlingx/external_repo" -cd /path/to/starlingx/external_repo" - -repo init -u https://opendev.org/starlingx/manifest -b master -repo sync --force-sync - -########################################################### -************************************************************ - StarlingX Build Patches -************************************************************ -########################################################### -Apply patches under meta-starlingX/patches/stx-{ha,fault,metal} -directly onto the starlingX source diff --git a/conf/layer.conf b/conf/layer.conf index a00b0e7..61d28b9 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -23,9 +23,7 @@ LAYERDEPENDS_starlingX-layer = "\ openstack-layer \ openstack-aio-deploy-layer \ openstack-compute-deploy-layer \ - openstack-compute-test-config-layer \ openstack-controller-deploy-layer \ - openstack-controller-test-config-layer \ openstack-qemu-layer \ openstack-swift-deploy-layer \ measured \ @@ -39,9 +37,31 @@ LAYERDEPENDS_starlingX-layer = "\ selinux \ " +# openstack-compute-test-config-layer +## openstack-controller-test-config-layer + # This should only be incremented on significant changes that will # cause compatibility issues with other layers LAYERVERSION_starlingX-version = "1" LAYERSERIES_COMPAT_starlingX-layer = "thud" -DISTRO_FEATURES_append += " systemd" +VIRTUAL-RUNTIME_init_manager = "systemd" +DISTRO_FEATURES_append = " systemd" +DISTRO_FEATURES_BACKFILL_CONSIDERED += "sysvinit" + +DISTRO_FEATURES_append = " bluez pam largefile opengl" +DISTRO_FEATURES_append = " virtualization" +DISTRO_FEATURES_append = " openstack" +DISTRO_FEATURES_append = " selinux" +DISTRO_FEATURES_append = " kvm" + +PREFERRED_PROVIDER_virtual/containerd = "containerd-opencontainers" +PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" + +PREFERRED_VERSION_keyutils = "1.5.10" + +IMAGE_INSTALL_append += " \ + packagegroup-stx-config \ + packagegroup-stx-fault \ + packagegroup-stx-metal \ + " diff --git a/recipes-core/images/starlingx-image-aio.bb b/recipes-core/images/starlingx-image-aio.bb new file mode 100644 index 0000000..b98c8a8 --- /dev/null +++ b/recipes-core/images/starlingx-image-aio.bb @@ -0,0 +1,25 @@ +SUMMARY = " StarlingX Single Server" + +LICENSE = "MIT" + +IMAGE_INSTALL_append = " \ + ${CORE_IMAGE_BASE_INSTALL} \ + packagegroup-core-full-cmdline \ + packagegroup-core-security \ + packagegroup-core-selinux \ + packagegroup-cloud-compute \ + packagegroup-cloud-controller \ + packagegroup-cloud-network \ + packagegroup-cloud-debug \ + packagegroup-cloud-extras \ + " +IMAGE_FEATURES += "ssh-server-openssh" + +inherit core-image +inherit openstack-base +inherit identity +inherit monitor + +# check for 5G of free space, so we use 5G as a starting point. +# IMAGE_ROOTFS_EXTRA_SPACE_append += "+ 5000000" +# POST_KEYSTONE_SETUP_COMMAND = "/etc/keystone/hybrid-backend-setup" diff --git a/recipes-core/packagegroups/packagegroup-stx-metal.bb b/recipes-core/packagegroups/packagegroup-stx-metal.bb index 1c08240..243194e 100644 --- a/recipes-core/packagegroups/packagegroup-stx-metal.bb +++ b/recipes-core/packagegroups/packagegroup-stx-metal.bb @@ -14,12 +14,16 @@ PACKAGES = " \ packagegroup-stx-metal \ " +# The mtce-common contains dev components only and since +# the dev components endup in stx-metal-dev package, not +# adding mtce-common to packagegroup. + RDEPENDS_packagegroup-stx-metal = " \ inventory \ mtce \ - mtce-common \ mtce-compute \ mtce-control \ mtce-storage \ python-inventoryclient \ " + diff --git a/recipes-core/stx-config/config-gate.bb b/recipes-core/stx-config/config-gate.bb deleted file mode 100644 index 2077bc0..0000000 --- a/recipes-core/stx-config/config-gate.bb +++ /dev/null @@ -1,39 +0,0 @@ -DESCRIPTION = "config-gate" - -STABLE = "starlingx/master" -PROTOCOL = "https" -BRANCH = "master" -SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4" -S = "${WORKDIR}/git" -PV = "19.05" - -LICENSE = "Apache-2.0" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}" - -inherit externalsrc -EXTERNALSRC_pn-${PN}="${EXTERNALREPO}/stx-config" - -RDEPENDS_${PN} += " bash" - -do_configure () { - : -} - -do_compile() { - : -} - -do_install () { - cd ${S}/config-gate/files - oe_runmake -e \ - SBINDIR=${D}/${sbindir} SYSTEMDDIR=${D}/${systemd_system_unitdir} -} - -FILES_${PN}_append += " ${baselib} \ - ${sysconfdir} \ - ${bindir} \ - ${sbindir} \ - " diff --git a/recipes-core/stx-config/config-gate.inc b/recipes-core/stx-config/config-gate.inc new file mode 100644 index 0000000..a67cda3 --- /dev/null +++ b/recipes-core/stx-config/config-gate.inc @@ -0,0 +1,15 @@ +PACKAGES += " config-gate" +RDEPENDS_config-gate += " bash" + +do_install_prepend() { + cd ${S}/config-gate/files + oe_runmake -e \ + SBINDIR=${D}/${sbindir} SYSTEMDDIR=${D}/${systemd_system_unitdir} +} + +FILES_config-gate = " \ + ${sbindir}/wait_for_worker_config_init.sh \ + ${sbindir}/wait_for_config_init.sh \ + ${systemd_system_unitdir}/worker-config-gate.service \ + ${systemd_system_unitdir}/config.service \ + " diff --git a/recipes-core/stx-config/controllerconfig.bb b/recipes-core/stx-config/controllerconfig.bb deleted file mode 100644 index 9b3c73e..0000000 --- a/recipes-core/stx-config/controllerconfig.bb +++ /dev/null @@ -1,61 +0,0 @@ -DESCRIPTION = "controllerconfig" - -STABLE = "starlingx/master" -PROTOCOL = "https" -BRANCH = "master" -SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4" -S = "${WORKDIR}/git" -PV = "19.05" - -LICENSE = "Apache-2.0" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}" - -inherit setuptools externalsrc -EXTERNALSRC_pn-${PN}="${EXTERNALREPO}/stx-config" - -RDEPENDS_${PN} += " bash" - -do_configure () { - cd ${S}/controllerconfig/controllerconfig - distutils_do_configure -} - -do_compile() { - cd ${S}/controllerconfig/controllerconfig - distutils_do_compile -} - -do_install () { - cd ${S}/controllerconfig/controllerconfig - distutils_do_install - - # TBD - # install -d -m 755 ${D}/wheels - # install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/ - - - install -p -D -m 700 scripts/keyringstaging ${D}/${bindir} - install -p -D -m 700 scripts/openstack_update_admin_password ${D}/${bindir} - install -p -D -m 700 scripts/install_clone.py ${D}/${bindir} - install -p -D -m 700 scripts/finish_install_clone.sh ${D}/${bindir} - - install -p -D -m 700 scripts/config_goenabled_check.sh ${D}/${sysconfdir}/goenabled.d - install -p -D -m 755 scripts/controller_config ${D}/${sysconfdir}/init.d - - ## Install Upgrade scripts - install -d -m 755 ${D}/${sysconfdir}/upgrade.d - install -p -D -m 755 upgrade-scripts/* ${D}/${sysconfdir}/upgrade.d - - install -p -D -m 664 scripts/controllerconfig.service ${D}/${systemd_system_unitdir} -} - -FILES_${PN}_append += " ${baselib} \ - ${sysconfdir} \ - ${bindir} \ - ${sbindir} \ - " - - diff --git a/recipes-core/stx-config/controllerconfig.inc b/recipes-core/stx-config/controllerconfig.inc new file mode 100644 index 0000000..46f8253 --- /dev/null +++ b/recipes-core/stx-config/controllerconfig.inc @@ -0,0 +1,55 @@ +PACKAGES += " controllerconfig" +RDEPENDS_controllerconfig += " bash" + +do_configure_prepend() { + cd ${S}/controllerconfig/controllerconfig + distutils_do_configure +} + +do_compile_prepend() { + cd ${S}/controllerconfig/controllerconfig + distutils_do_compile +} + +do_install_prepend () { + cd ${S}/controllerconfig/controllerconfig + distutils_do_install + + install -p -D -m 700 scripts/keyringstaging ${D}/${bindir} + install -p -D -m 700 scripts/openstack_update_admin_password ${D}/${bindir} + install -p -D -m 700 scripts/install_clone.py ${D}/${bindir} + install -p -D -m 700 scripts/finish_install_clone.sh ${D}/${bindir} + + install -p -D -m 700 scripts/config_goenabled_check.sh ${D}/${sysconfdir}/goenabled.d + install -p -D -m 755 scripts/controller_config ${D}/${sysconfdir}/init.d/controller_config + + ## Install Upgrade scripts + install -d -m 755 ${D}/${sysconfdir}/upgrade.d + install -p -m 755 upgrade-scripts/* ${D}/${sysconfdir}/upgrade.d + + install -p -D -m 664 scripts/controllerconfig.service ${D}/${systemd_system_unitdir}/controllerconfig.service +} + + +FILES_controllerconfig = " \ + ${sysconfdir}/goenabled.d \ + ${sysconfdir}/goenabled.d/config_goenabled_check.sh \ + ${sysconfdir}/upgrade.d/* \ + ${sysconfdir}/init.d/controller_config \ + ${bindir}/keysringstaging \ + ${bindir}/openstack_update_admin_password \ + ${bindir}/install_clone.py \ + ${bindir}/finish_install_clone.sh \ + ${bindir}/finish_install_clone.sh \ + ${bindir}/upgrade_controller \ + ${bindir}/config_region \ + ${bindir}/config_subcloud \ + ${bindir}/config_management \ + ${bindir}/keyringstaging \ + ${bindir}/tidy_storage_post_restore \ + ${bindir}/config_controller \ + ${bindir}/upgrade_controller_simplex \ + ${systemd_system_unitdir}/controllerconfig.service \ + ${libdir}/python2.7/site-packages/controllerconfig*.egg-info/ \ + ${libdir}/python2.7/site-packages/controllerconfig/ \ + " diff --git a/recipes-core/stx-config/pm-qos-mgr.bb b/recipes-core/stx-config/pm-qos-mgr.bb deleted file mode 100644 index 0cf98e0..0000000 --- a/recipes-core/stx-config/pm-qos-mgr.bb +++ /dev/null @@ -1,44 +0,0 @@ -DESCRIPTION = "pm-qos-mgr" - -STABLE = "starlingx/master" -PROTOCOL = "https" -BRANCH = "master" -SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4" -S = "${WORKDIR}/git" -PV = "19.05" - -LICENSE = "Apache-2.0" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}" - -inherit setuptools externalsrc -EXTERNALSRC_pn-${PN}="${EXTERNALREPO}/stx-config" - -DEPENDS = "\ - python \ - python-pbr-native \ - " - -RDEPENDS_${PN} += " bash" - -do_configure () { - cd ${S}/pm-qos-mgr/src - distutils_do_configure -} - -do_compile() { - cd ${S}/pm-qos-mgr/src - distutils_do_compile -} - -do_install () { - cd ${S}/pm-qos-mgr/src - distutils_do_install - install -p -D -m 664 pm-qos-mgr.service ${D}/${systemd_system_unitdir} -} - -FILES_${PN}_append += " ${systemd_system_unitdir}" - - diff --git a/recipes-core/stx-config/pm-qos-mgr.inc b/recipes-core/stx-config/pm-qos-mgr.inc new file mode 100644 index 0000000..6ffa003 --- /dev/null +++ b/recipes-core/stx-config/pm-qos-mgr.inc @@ -0,0 +1,24 @@ +PACKAGES += " pm-qos-mgr" + +do_configure_prepend () { + cd ${S}/pm-qos-mgr/src + distutils_do_configure +} + +do_compile_prepend() { + cd ${S}/pm-qos-mgr/src + distutils_do_compile +} + +do_install_prepend () { + cd ${S}/pm-qos-mgr/src + distutils_do_install + install -p -D -m 664 pm-qos-mgr.service ${D}/${systemd_system_unitdir}/pm-qos-mgr.service +} + +FILES_pm-qos-mgr = " \ + ${bindir}/pm-qos-mgr \ + ${systemd_system_unitdir}/pm-qos-mgr.service \ + ${libdir}/python2.7/site-packages/pm_qos_mgr*egg-info/ \ + ${libdir}/python2.7/site-packages/pm_qos_mgr/ \ + " diff --git a/recipes-core/stx-config/puppet-manifests.bb b/recipes-core/stx-config/puppet-manifests.bb deleted file mode 100644 index 12f4757..0000000 --- a/recipes-core/stx-config/puppet-manifests.bb +++ /dev/null @@ -1,41 +0,0 @@ -DESCRIPTION = "puppet-manifests" - -STABLE = "starlingx/master" -PROTOCOL = "https" -BRANCH = "master" -SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4" -S = "${WORKDIR}/git" -PV = "19.05" - -LICENSE = "Apache-2.0" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}" - -inherit externalsrc -EXTERNALSRC_pn-${PN}="${EXTERNALREPO}/stx-config" - -DEPENDS = " \ - puppet \ - " -RDEPENDS_${PN} += " bash" - -do_configure () { - : -} - -do_compile() { - : -} - -do_install () { - cd ${S}/puppet-manifests/src - oe_runmake BINDIR=${D}/${bindir} \ - CONFIGDIR=${D}/${sysconfdir}/puppet/ \ - MODULEDIR=${D}/${datadir}/puppet/modules -f Makefile install -} - -FILES_${PN}_append += " ${sysconfdir} \ - ${datadir} \ - " diff --git a/recipes-core/stx-config/puppet-manifests.inc b/recipes-core/stx-config/puppet-manifests.inc new file mode 100644 index 0000000..6848ba7 --- /dev/null +++ b/recipes-core/stx-config/puppet-manifests.inc @@ -0,0 +1,36 @@ +PACKAGES += " puppet-manifests" +RDEPENDS_puppet-manifests += " bash" + +do_install_append () { + cd ${S}/puppet-manifests/src + oe_runmake BINDIR=${D}/${bindir} \ + CONFIGDIR=${D}/${sysconfdir}/puppet/ \ + MODULEDIR=${D}/${datadir}/puppet/modules -f Makefile install +} + +FILES_puppet-manifests = "\ + ${sysconfdir}/puppet/hiera.yaml \ + ${sysconfdir}/puppet/hieradata \ + ${sysconfdir}/puppet/hieradata/worker.yaml \ + ${sysconfdir}/puppet/hieradata/storage.yaml \ + ${sysconfdir}/puppet/hieradata/global.yaml \ + ${sysconfdir}/puppet/hieradata/controller.yaml \ + ${sysconfdir}/puppet/manifests/worker.pp \ + ${sysconfdir}/puppet/manifests/ansible_bootstrap.pp \ + ${sysconfdir}/puppet/manifests/bootstrap.pp \ + ${sysconfdir}/puppet/manifests/runtime.pp \ + ${sysconfdir}/puppet/manifests/storage.pp \ + ${sysconfdir}/puppet/manifests/upgrade.pp \ + ${sysconfdir}/puppet/manifests/controller.pp \ + ${datadir}/puppet/modules/openstack/manifests \ + ${datadir}/puppet/modules/openstack/templates \ + ${datadir}/puppet/modules/platform/manifests \ + ${datadir}/puppet/modules/platform/templates \ + ${datadir}/puppet/modules/platform/files \ + ${datadir}/puppet/modules/platform/lib/facter \ + ${datadir}/puppet/modules/platform/lib/puppet \ + ${bindir}/puppet-manifest-apply.sh \ + ${bindir}/apply_network_config.sh \ + " + + diff --git a/recipes-core/stx-config/puppet-modules-wrs.bb b/recipes-core/stx-config/puppet-modules-wrs.inc similarity index 67% rename from recipes-core/stx-config/puppet-modules-wrs.bb rename to recipes-core/stx-config/puppet-modules-wrs.inc index 6bc09e3..d2893f7 100644 --- a/recipes-core/stx-config/puppet-modules-wrs.bb +++ b/recipes-core/stx-config/puppet-modules-wrs.inc @@ -1,37 +1,8 @@ -DESCRIPTION = "puppet-modules-wrs" +PACKAGES += "puppet-modules-wrs" -STABLE = "starlingx/master" -PROTOCOL = "https" -BRANCH = "master" -SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4" -S = "${WORKDIR}/git" -PV = "19.05" - -LICENSE = "Apache-2.0" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}" - -inherit externalsrc -EXTERNALSRC_pn-${PN}="${EXTERNALREPO}/stx-config" - -DEPENDS = " \ - puppet \ - " - -do_configure () { - : -} - -do_compile() { - : -} - -do_install () { +do_install_prepend () { install -d -m 0755 ${D}/${datadir}/puppet/modules/dcdbsync - install -d -m 0755 ${D}/${datadir}/puppet/modules/dcocrch install -d -m 0755 ${D}/${datadir}/puppet/modules/mtce install -d -m 0755 ${D}/${datadir}/puppet/modules/patching install -d -m 0755 ${D}/${datadir}/puppet/modules/sshd @@ -53,4 +24,15 @@ do_install () { } -FILES_${PN}_append += " ${datadir}" +FILES_puppet-modules-wrs_prepend += " \ + ${datadir}/puppet/modules/dcdbsync \ + ${datadir}/puppet/modules/dcmanager \ + ${datadir}/puppet/modules/patching \ + ${datadir}/puppet/modules/mtce \ + ${datadir}/puppet/modules/dcorch \ + ${datadir}/puppet/modules/sshd \ + ${datadir}/puppet/modules/nfv \ + ${datadir}/puppet/modules/fm \ + ${datadir}/puppet/modules/smapi \ + ${datadir}/puppet/modules/sysinv \ + " diff --git a/recipes-core/stx-config/storageconfig.inc b/recipes-core/stx-config/storageconfig.inc new file mode 100644 index 0000000..c1aceea --- /dev/null +++ b/recipes-core/stx-config/storageconfig.inc @@ -0,0 +1,14 @@ +PACKAGES += "storageconfig" +RDEPENDS_storageconfig += " bash" + +do_install_prepend () { + cd ${S}/storageconfig/storageconfig/ + oe_runmake GOENABLEDDIR=${D}/${sysconfdir}/goenabled.d INITDDIR=${D}/${sysconfdir}/init.d \ + SYSTEMDDIR=${D}/${systemd_system_unitdir} install +} + +FILES_storageconfig = " \ + ${sysconfdir}/init.d/storage_config \ + ${sysconfdir}/goenabled.d/config_goenabled_check.sh \ + ${systemd_system_unitdir}/storageconfig.service \ + " diff --git a/recipes-core/stx-fault/fm-api.bb b/recipes-core/stx-config/stx-config.bb similarity index 56% rename from recipes-core/stx-fault/fm-api.bb rename to recipes-core/stx-config/stx-config.bb index 178bc30..1e57217 100644 --- a/recipes-core/stx-fault/fm-api.bb +++ b/recipes-core/stx-config/stx-config.bb @@ -1,6 +1,4 @@ -DESCRIPTION = "fm-api" - -# INSANE_SKIP_${PN} = "ldflags" +DESCRIPTION = "stx-config" STABLE = "starlingx/master" PROTOCOL = "https" @@ -15,25 +13,34 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}" -require stx-fault.inc -inherit setuptools - -DEPENDS = " \ +DEPENDS = "\ + puppet \ python \ python-pbr-native \ " -do_configure () { - cd ${S}/fm-api - distutils_do_configure +inherit setuptools + +require config-gate.inc +require controllerconfig.inc +require pm-qos-mgr.inc +require puppet-modules-wrs.inc +require puppet-manifests.inc +require storageconfig.inc +require sysinv.inc +require workerconfig.inc +require worker-utils.inc + +do_configure() { + : } do_compile() { - cd ${S}/fm-api - distutils_do_compile + : } -do_install () { - cd ${S}/fm-api - distutils_do_install +do_install() { + : } + +FILES_${PN} = " " diff --git a/recipes-core/stx-config/stx-config.bb.DONOTUSE b/recipes-core/stx-config/stx-config.bb.DONOTUSE deleted file mode 100644 index e1fab07..0000000 --- a/recipes-core/stx-config/stx-config.bb.DONOTUSE +++ /dev/null @@ -1,209 +0,0 @@ -DESCRIPTION = "stx-config" - -STABLE = "starlingx/master" -PROTOCOL = "https" -BRANCH = "master" -SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4" -S = "${WORKDIR}/git" -PV = "19.05" - -LICENSE = "Apache-2.0" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}" - -# DEPENDS = " python-pbr -DEPENDS = " \ - python-pyinotify \ - python-pbr-native \ - puppet \ - " -RDEPENDS_${PN} = " bash" - -inherit setuptools - -do_configure () { - -# config-gate: Do Nothing -# puppet-namifests: DO Nothing -# puppet-modules-wrs: DO Nothing -# storeageconfig: DO Nothing -# workerconfig: DO Nothing -# worker-utils: DO Nothing - - -# TODO: -# kubernetes: Requires openstack-helm -# cd ${S}/kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm -# distutils_do_configure - -# controllerconfig - cd ${S}/controllerconfig/controllerconfig - distutils_do_configure - -# pm-qos-mgr: - cd ${S}/pm-qos-mgr/src - distutils_do_configure - -# sysinv: - cd ${S}/sysinv/cgts-client/cgts-client - distutils_do_configure - cd ${S}/sysinv/sysinv/sysinv - distutils_do_configure - -} - -do_compile() { - -# config-gate: Do Nothing -# puppet-namifests: DO Nothing -# puppet-modules-wrs: DO Nothing -# storeageconfig: DO Nothing -# workerconfig: DO Nothing - -# controllerconfig - cd ${S}/controllerconfig/controllerconfig - distutils_do_compile - -# pm-qos-mgr: - cd ${S}/pm-qos-mgr/src - distutils_do_compile -# sysinv: - cd ${S}/sysinv/cgts-client/cgts-client - distutils_do_compile - cd ${S}/sysinv/sysinv/sysinv - distutils_do_compile - -# worker-utils: - cd ${S}/worker-utils/worker-utils - oe_runmake all -} - -do_install () { - - install -d -m 755 ${D}/${sbindir} - install -d -m 755 ${D}/${systemd_system_unitdir} - install -d -m 755 ${D}/${bindir} - install -d -m 755 ${D}/${sysconfdir}/goenabled.d - install -d -m 755 ${D}/${sysconfdir}/init.d - install -d -m 755 ${D}/${sysconfdir}/upgrade.d - install -d -m 755 ${D}/${sysconfdir}/systemd/system - -# config-gate: - cd ${S}/config-gate/files - install -p -D -m 555 wait_for_config_init.sh ${D}/${sbindir} - install -p -D -m 555 wait_for_worker_config_init.sh ${D}/${sbindir} - install -p -D -m 444 config.service ${D}/${systemd_system_unitdir} - install -p -D -m 444 worker-config-gate.service ${D}/${systemd_system_unitdir} - -# controllerconfig - - cd ${S}/controllerconfig/controllerconfig - distutils_do_install - # TBD - # install -d -m 755 ${D}/wheels - # install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/ - - - install -p -D -m 700 scripts/keyringstaging ${D}/${bindir} - install -p -D -m 700 scripts/openstack_update_admin_password ${D}/${bindir} - install -p -D -m 700 scripts/install_clone.py ${D}/${bindir} - install -p -D -m 700 scripts/finish_install_clone.sh ${D}/${bindir} - - install -p -D -m 700 scripts/config_goenabled_check.sh ${D}/${sysconfdir}/goenabled.d - install -p -D -m 755 scripts/controller_config ${D}/${sysconfdir}/init.d - - ## Install Upgrade scripts - install -p -D -m 755 upgrade-scripts/* ${D}/${sysconfdir}/upgrade.d - - install -p -D -m 664 scripts/controllerconfig.service ${D}/${systemd_system_unitdir} - -# pm-qos-mgr: - cd ${S}/pm-qos-mgr/src - distutils_do_install - install -p -D -m 664 pm-qos-mgr.service ${D}/${systemd_system_unitdir} - -# puppet-manifests: - - cd ${S}/puppet-manifests/src - oe_runmake BINDIR=${D}/${bindir} \ - CONFIGDIR=${D}/${sysconfdir}/puppet/ \ - MODULEDIR=${D}/${datadir}/puppet/modules -f Makefile install - -# puppet-modules-wrs: - install -d -m 0755 ${D}/${datadir}/puppet/modules/dcdbsync - install -d -m 0755 ${D}/${datadir}/puppet/modules/dcocrch - install -d -m 0755 ${D}/${datadir}/puppet/modules/mtce - install -d -m 0755 ${D}/${datadir}/puppet/modules/patching - install -d -m 0755 ${D}/${datadir}/puppet/modules/sshd - install -d -m 0755 ${D}/${datadir}/puppet/modules/dcmanager - install -d -m 0755 ${D}/${datadir}/puppet/modules/fm - install -d -m 0755 ${D}/${datadir}/puppet/modules/nfv - install -d -m 0755 ${D}/${datadir}/puppet/modules/smapi - install -d -m 0755 ${D}/${datadir}/puppet/modules/sysinv - cp -R ${S}/puppet-modules-wrs/puppet-dcdbsync/src/dcdbsync ${D}/${datadir}/puppet/modules - cp -R ${S}/puppet-modules-wrs/puppet-dcorch/src/dcorch ${D}/${datadir}/puppet/modules - cp -R ${S}/puppet-modules-wrs/puppet-patching/src/patching ${D}/${datadir}/puppet/modules - cp -R ${S}/puppet-modules-wrs/puppet-sshd/src/sshd ${D}/${datadir}/puppet/modules - cp -R ${S}/puppet-modules-wrs/puppet-dcmanager/src/dcmanager ${D}/${datadir}/puppet/modules - cp -R ${S}/puppet-modules-wrs/puppet-fm/src/fm ${D}/${datadir}/puppet/modules - cp -R ${S}/puppet-modules-wrs/puppet-nfv/src/nfv ${D}/${datadir}/puppet/modules - cp -R ${S}/puppet-modules-wrs/puppet-smapi/src/smapi ${D}/${datadir}/puppet/modules - cp -R ${S}/puppet-modules-wrs/puppet-sysinv/src/sysinv ${D}/${datadir}/puppet/modules - -# storeageconfig: - cd ${S}/storageconfig/storageconfig/ - oe_runmake GOENABLEDDIR=${D}/${sysconfdir}/goenabled.d INITDDIR=${D}/${sysconfdir}/init.d \ - SYSTEMDDIR=${D}/${systemd_system_unitdir} install - - #install -d -m 755 ${D}/${sysconfdir}/init.d - #install -d -m 755 ${D}/${sysconfdir}/goenabled.d/ - - #install -p -D -m 700 ${S}/storageconfig/storageconfig/storage_config \ - # ${D}/${sysconfdir}/init.d/storage_config - - #install -p -D -m 755 ${S}/storageconfig/storageconfig/config_goenabled_check.sh \ - # ${D}/${sysconfdir}/goenabled.d/ - - #install -p -D -m 755 ${S}/storageconfig/storageconfig/storageconfig.service ${D}/${systemd_system_unitdir} - -# sysinv: - cd ${S}/sysinv/cgts-client/cgts-client - distutils_do_install - cd ${S}/sysinv/sysinv/sysinv - distutils_do_install - - install -d -m 755 ${D}/${sysconfdir}/init.d - install -d -m 755 ${D}/${sysconfdir}/pmon.d - install -p -D -m 755 ${S}/sysinv/sysinv-agent/sysinv-agent ${D}/${sysconfdir}/init.d/ - install -p -D -m 644 ${S}/sysinv/sysinv-agent/sysinv-agent.conf ${D}/${sysconfdir}/pmon.d/ - install -p -D -m 644 ${S}/sysinv/sysinv-agent/sysinv-agent.service ${D}/${systemd_system_unitdir} - -# workerconfig: - cd ${S}/workerconfig/workerconfig/ - oe_runmake GOENABLEDDIR=${D}/${sysconfdir}/goenabled.d INITDDIR=${D}/${sysconfdir}/init.d \ - SYSTEMDDIR=${D}/${systemd_system_unitdir} install - - -# worker-utils: - - cd ${S}/worker-utils/worker-utils - oe_runmake BINDIR=${D}/${bindir} GOENABLEDDIR=${D}/${sysconfdir}/goenabled.d \ - INITDDIR=${D}/${sysconfdir}/init.d PLATFORMCONFDIR=${D}/${sysconfdir}/platform \ - SYSTEMDDIR=${D}/${systemd_system_unitdir} install - -} - -FILES_${PN}_append += " ${baselib} \ - ${systemd_unitdir} \ - ${systemd_system_unitdir} \ - ${systemd_system_unitdir}/worker-config-gate.service \ - ${systemd_system_unitdir}/config.service \ - ${datadir}/puppet/* \ - " - -inherit externalsrc -# EXTERNALSRC="${TMPDIR}/work-shared/starlingX/stx-config-${PV}/git" -# S = "${TMPDIR}/work-shared/starlingX/stx-config-${PV}/git" -#B = "${WORKDIR}/config-gate-${PV}/build" diff --git a/recipes-core/stx-config/sysinv.bb b/recipes-core/stx-config/sysinv.bb deleted file mode 100644 index a0c910d..0000000 --- a/recipes-core/stx-config/sysinv.bb +++ /dev/null @@ -1,58 +0,0 @@ -DESCRIPTION = "pm-qos-mgr" - -STABLE = "starlingx/master" -PROTOCOL = "https" -BRANCH = "master" -SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4" -S = "${WORKDIR}/git" -PV = "19.05" - -LICENSE = "Apache-2.0" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}" - -inherit setuptools externalsrc -EXTERNALSRC_pn-${PN}="${EXTERNALREPO}/stx-config" - -DEPENDS = "\ - python \ - python-pbr-native \ - " - - -do_configure () { - cd ${S}/sysinv/cgts-client/cgts-client - distutils_do_configure - cd ${S}/sysinv/sysinv/sysinv - distutils_do_configure -} - -do_compile() { - cd ${S}/sysinv/cgts-client/cgts-client - distutils_do_compile - cd ${S}/sysinv/sysinv/sysinv - distutils_do_compile -} - -do_install () { - - cd ${S}/sysinv/cgts-client/cgts-client - distutils_do_install - cd ${S}/sysinv/sysinv/sysinv - distutils_do_install - - install -d -m 755 ${D}/${sysconfdir}/init.d - install -d -m 755 ${D}/${sysconfdir}/pmon.d - install -p -D -m 755 ${S}/sysinv/sysinv-agent/sysinv-agent ${D}/${sysconfdir}/init.d/ - install -p -D -m 644 ${S}/sysinv/sysinv-agent/sysinv-agent.conf ${D}/${sysconfdir}/pmon.d/ - install -p -D -m 644 ${S}/sysinv/sysinv-agent/sysinv-agent.service ${D}/${systemd_system_unitdir} -} - -FILES_${PN}_append += " \ - ${sysconfdir} \ - ${systemd_system_unitdir} \ - " - - diff --git a/recipes-core/stx-config/sysinv.inc b/recipes-core/stx-config/sysinv.inc new file mode 100644 index 0000000..0a3b9c1 --- /dev/null +++ b/recipes-core/stx-config/sysinv.inc @@ -0,0 +1,50 @@ +PACKAGES += " sysinv" + +do_configure_prepend() { + echo "Configure sysinv..." + cd ${S}/sysinv/cgts-client/cgts-client + distutils_do_configure + cd ${S}/sysinv/sysinv/sysinv + distutils_do_configure +} + +do_compile_prepend() { + echo "Building sysinv..." + cd ${S}/sysinv/cgts-client/cgts-client + distutils_do_compile + cd ${S}/sysinv/sysinv/sysinv + distutils_do_compile +} + +do_install_prepend() { + + echo "Installing sysinv..." + cd ${S}/sysinv/cgts-client/cgts-client + distutils_do_install + cd ${S}/sysinv/sysinv/sysinv + distutils_do_install + + install -p -D -m 755 ${S}/sysinv/sysinv-agent/sysinv-agent ${D}/${sysconfdir}/init.d/sysinv-agent + install -p -D -m 644 ${S}/sysinv/sysinv-agent/sysinv-agent.conf ${D}/${sysconfdir}/pmon.d/sysinv-agent.conf + install -p -D -m 644 ${S}/sysinv/sysinv-agent/sysinv-agent.service ${D}/${systemd_system_unitdir}/sysinv-agent.service +} + +FILES_sysinv = " \ + ${bindir}/sysinv-agent \ + ${bindir}/system \ + ${bindir}/sysinv-conductor \ + ${bindir}/sysinv-api \ + ${bindir}/sysinv-helm \ + ${bindir}/sysinv-dbsync \ + ${bindir}/sysinv-dnsmasq-lease-update \ + ${bindir}/sysinv-puppet \ + ${bindir}/sysinv-rootwrap \ + ${bindir}/sysinv-upgrade \ + ${systemd_system_unitdir}/sysinv-agent.service \ + ${sysconfdir}/pmon.d/sysinv-agent.conf \ + ${sysconfdir}/init.d/sysinv-agent \ + ${libdir}/python2.7/site-packages/sysinv/ \ + ${libdir}/python2.7/site-packages/cgtsclient/ \ + ${libdir}/python2.7/site-packages/cgtsclient-*.egg-info \ + ${libdir}/python2.7/site-packages/sysinv-*.egg-info \ + " diff --git a/recipes-core/stx-config/worker-utils.bb b/recipes-core/stx-config/worker-utils.bb deleted file mode 100644 index 39a8fba..0000000 --- a/recipes-core/stx-config/worker-utils.bb +++ /dev/null @@ -1,40 +0,0 @@ -DESCRIPTION = "woker-utils" - -STABLE = "starlingx/master" -PROTOCOL = "https" -BRANCH = "master" -SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4" -S = "${WORKDIR}/git" -PV = "19.05" - -LICENSE = "Apache-2.0" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}" - -inherit externalsrc -EXTERNALSRC_pn-${PN}="${EXTERNALREPO}/stx-config" - -RDEPENDS_${PN} += " bash" - -do_configure () { - : -} - -do_compile() { - cd ${S}/worker-utils/worker-utils - oe_runmake all -} - -do_install () { - cd ${S}/worker-utils/worker-utils - oe_runmake BINDIR=${D}/${bindir} GOENABLEDDIR=${D}/${sysconfdir}/goenabled.d \ - INITDDIR=${D}/${sysconfdir}/init.d PLATFORMCONFDIR=${D}/${sysconfdir}/platform \ - SYSTEMDDIR=${D}/${systemd_system_unitdir} install -} - -FILES_${PN}_append += " ${bindir} \ - ${sysconfdir} \ - ${systemd_system_unitdir} \ - " diff --git a/recipes-core/stx-config/worker-utils.inc b/recipes-core/stx-config/worker-utils.inc new file mode 100644 index 0000000..9810f00 --- /dev/null +++ b/recipes-core/stx-config/worker-utils.inc @@ -0,0 +1,31 @@ +PACKAGES += " worker-utils" +RDEPENDS_worker-utils += " bash" + +do_compile_prepend () { + cd ${S}/worker-utils/worker-utils + oe_runmake all +} + +do_install_append () { + cd ${S}/worker-utils/worker-utils + oe_runmake BINDIR=${D}/${bindir} GOENABLEDDIR=${D}/${sysconfdir}/goenabled.d \ + INITDDIR=${D}/${sysconfdir}/init.d PLATFORMCONFDIR=${D}/${sysconfdir}/platform \ + SYSTEMDDIR=${D}/${systemd_system_unitdir} install +} + +FILES_worker-utils = " \ + ${bindir}/ps-sched.sh \ + ${bindir}/topology.py \ + ${bindir}/set-cpu-wakeup-latency.sh \ + ${bindir}/affine-interrupts.sh \ + ${bindir}/topology \ + ${bindir}/topology.pyc \ + ${systemd_system_unitdir}/affine-tasks.service \ + ${systemd_system_unitdir}/affine-platform.sh.service \ + ${sysconfdir}/goenabled.d/worker-goenabled.sh \ + ${sysconfdir}/platform/worker_reserved.conf \ + ${sysconfdir}/init.d/affine-platform.sh \ + ${sysconfdir}/init.d/task_affinity_functions.sh \ + ${sysconfdir}/init.d/cpumap_functions.sh \ + ${sysconfdir}/init.d/affine-tasks.sh \ + " diff --git a/recipes-core/stx-config/workerconfig.bb b/recipes-core/stx-config/workerconfig.bb deleted file mode 100644 index f572815..0000000 --- a/recipes-core/stx-config/workerconfig.bb +++ /dev/null @@ -1,37 +0,0 @@ -DESCRIPTION = "wokerconfig" - -STABLE = "starlingx/master" -PROTOCOL = "https" -BRANCH = "master" -SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4" -S = "${WORKDIR}/git" -PV = "19.05" - -LICENSE = "Apache-2.0" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}" - -inherit externalsrc -EXTERNALSRC_pn-${PN}="${EXTERNALREPO}/stx-config" - -RDEPENDS_${PN} += " bash" - -do_configure () { - : -} - -do_compile() { -} - -do_install () { - cd ${S}/workerconfig/workerconfig/ - oe_runmake GOENABLEDDIR=${D}/${sysconfdir}/goenabled.d INITDDIR=${D}/${sysconfdir}/init.d \ - SYSTEMDDIR=${D}/${systemd_system_unitdir} install -} - -FILES_${PN}_append += " \ - ${sysconfdir} \ - ${systemd_system_unitdir} \ - " diff --git a/recipes-core/stx-config/workerconfig.inc b/recipes-core/stx-config/workerconfig.inc new file mode 100644 index 0000000..46c047e --- /dev/null +++ b/recipes-core/stx-config/workerconfig.inc @@ -0,0 +1,16 @@ +PACKAGES += " workerconfig" +RDEPENDS_workerconfig += " bash" + +do_install_append () { + cd ${S}/workerconfig/workerconfig/ + oe_runmake GOENABLEDDIR=${D}/${sysconfdir}/goenabled.d INITDDIR=${D}/${sysconfdir}/init.d \ + SYSTEMDDIR=${D}/${systemd_system_unitdir} install +} + +FILES_workerconfig += " \ + ${systemd_system_unitdir}/config/workerconfig-standalone.service \ + ${systemd_system_unitdir}/config/workerconfig-combined.service \ + ${sysconfdir}/goenabled.d/config_goenabled_check.sh \ + ${sysconfdir}/init.d/worker_config \ + ${sysconfdir}/init.d/worker_services \ + " diff --git a/patches/stx-fault/0001-Honor-the-build-system-LDFLAGS.patch b/recipes-core/stx-fault/files/0001-Honor-the-build-system-LDFLAGS.patch similarity index 100% rename from patches/stx-fault/0001-Honor-the-build-system-LDFLAGS.patch rename to recipes-core/stx-fault/files/0001-Honor-the-build-system-LDFLAGS.patch diff --git a/recipes-core/stx-fault/files/0001-Use-build-systems-LDFLAGS.patch b/recipes-core/stx-fault/files/0001-Use-build-systems-LDFLAGS.patch new file mode 100644 index 0000000..bdca16f --- /dev/null +++ b/recipes-core/stx-fault/files/0001-Use-build-systems-LDFLAGS.patch @@ -0,0 +1,25 @@ +From ee51474dd6756492d1487304ce83b878b8867f6b Mon Sep 17 00:00:00 2001 +From: babak sarashki +Date: Mon, 8 Jul 2019 21:50:24 -0700 +Subject: [PATCH] Use build systems LDFLAGS + +--- + snmp-audittrail/sources/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/snmp-audittrail/sources/Makefile b/snmp-audittrail/sources/Makefile +index 6f7469c..bb55765 100644 +--- a/snmp-audittrail/sources/Makefile ++++ b/snmp-audittrail/sources/Makefile +@@ -16,7 +16,7 @@ build: lib + $(CXX) $(CCFLAGS) $(INCLUDES) -c $< -o $@ + + lib: $(OBJS) +- $(CXX) $(OBJS) $(LDLIBS) -o $(LIBCGTSAGENT_SO).$(MAJOR).$(MINOR).$(PATCH) -shared ++ $(LDCXXSHARED) $(OBJS) $(LDFLAGS) $(LDLIBS) -o $(LIBCGTSAGENT_SO).$(MAJOR).$(MINOR).$(PATCH) + ln -sf $(LIBCGTSAGENT_SO).$(MAJOR).$(MINOR).$(PATCH) $(LIBCGTSAGENT_SO).$(MAJOR) + ln -sf $(LIBCGTSAGENT_SO).$(MAJOR).$(MINOR).$(PATCH) $(LIBCGTSAGENT_SO) + +-- +2.17.1 + diff --git a/recipes-core/stx-fault/files/0001-snmp-ext-use-build-systems-LDFLAGS.patch b/recipes-core/stx-fault/files/0001-snmp-ext-use-build-systems-LDFLAGS.patch new file mode 100644 index 0000000..5bb780b --- /dev/null +++ b/recipes-core/stx-fault/files/0001-snmp-ext-use-build-systems-LDFLAGS.patch @@ -0,0 +1,25 @@ +From e452f7eaf630f7ab5de240c51ddce14c9329d580 Mon Sep 17 00:00:00 2001 +From: babak sarashki +Date: Mon, 8 Jul 2019 21:56:11 -0700 +Subject: [PATCH] snmp-ext use build systems LDFLAGS + +--- + snmp-ext/sources/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/snmp-ext/sources/Makefile b/snmp-ext/sources/Makefile +index 408ea34..c00febe 100644 +--- a/snmp-ext/sources/Makefile ++++ b/snmp-ext/sources/Makefile +@@ -23,7 +23,7 @@ LIBCGTSAGENT_SO := libcgtsAgentPlugin.so + $(CXX) $(CCFLAGS) $(INCLUDES) -c $< -o $@ + + lib: $(OBJS) +- $(CXX) $(OBJS) $(LDLIBS) -o $(LIBCGTSAGENT_SO).$(MAJOR).$(MINOR).$(PATCH) -shared ++ $(LDCXXSHARED) $(OBJS) $(LDFLAGS) $(LDLIBS) -o $(LIBCGTSAGENT_SO).$(MAJOR).$(MINOR).$(PATCH) + ln -sf $(LIBCGTSAGENT_SO).$(MAJOR).$(MINOR).$(PATCH) $(LIBCGTSAGENT_SO).$(MAJOR) + ln -sf $(LIBCGTSAGENT_SO).$(MAJOR).$(MINOR).$(PATCH) $(LIBCGTSAGENT_SO) + +-- +2.17.1 + diff --git a/recipes-core/stx-fault/fm-api.inc b/recipes-core/stx-fault/fm-api.inc new file mode 100644 index 0000000..a73a119 --- /dev/null +++ b/recipes-core/stx-fault/fm-api.inc @@ -0,0 +1,21 @@ +PACKAGES += " fm-api" + +do_configure_append () { + cd ${S}/fm-api + distutils_do_configure +} + +do_compile_append() { + cd ${S}/fm-api + distutils_do_compile +} + +do_install_append() { + cd ${S}/fm-api + distutils_do_install +} + +FILES_fm-api_append += " \ + ${libdir}/python2.7/site-packages/fm_api-1.0.0-py2.7.egg-info/ \ + ${libdir}/python2.7/site-packages/fm_api \ + " diff --git a/recipes-core/stx-fault/fm-common.bb b/recipes-core/stx-fault/fm-common.bb deleted file mode 100644 index 215c6cd..0000000 --- a/recipes-core/stx-fault/fm-common.bb +++ /dev/null @@ -1,56 +0,0 @@ -DESCRIPTION = "fm-common" - -# INSANE_SKIP_${PN} = "ldflags" - -STABLE = "starlingx/master" -PROTOCOL = "https" -BRANCH = "master" -SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4" -S = "${WORKDIR}/git" -PV = "19.05" - -LICENSE = "Apache-2.0" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}" - -require stx-fault.inc -inherit setuptools - -DEPENDS = " \ - postgresql \ - python \ - python-pbr \ - python-pbr-native \ - " - -# RDEPENDS_${PN} += " bash" - -do_configure () { - cd ${S}/fm-common/sources - distutils_do_configure -} - -do_compile() { - cd ${S}/fm-common/sources - oe_runmake -e BINDIR=${bindir} \ - INCLUDES="-I./ " \ - EXTRACCFLAGS=" " \ - CCFLAGS="${CXXFLAGS} ${CCSHARED}" \ - LIBDIR=${libdir} INCDIR=${includedir} \ - CGCS_DOC_DEPLOY=${cgcs_doc_deploy} - distutils_do_compile -} - -do_install () { - cd ${S}/fm-common/sources - oe_runmake -e DESTDIR=${D} BINDIR=${bindir} \ - LIBDIR=${libdir} INCDIR=${includedir} \ - CGCS_DOC_DEPLOY=${cgcs_doc_deploy} install - distutils_do_install -} - - -FILES_${PN}_append += " ${cgcs_doc_deploy} " - diff --git a/recipes-core/stx-fault/fm-common.inc b/recipes-core/stx-fault/fm-common.inc new file mode 100644 index 0000000..8edc2a8 --- /dev/null +++ b/recipes-core/stx-fault/fm-common.inc @@ -0,0 +1,43 @@ +PACKAGES += " fm-common" +RDEPENDS_fm-common = " python" + +do_configure_append () { + cd ${S}/fm-common/sources + distutils_do_configure +} + +do_compile_append() { + cd ${S}/fm-common/sources + oe_runmake -e BINDIR=${bindir} \ + INCLUDES="-I./ " \ + EXTRACCFLAGS=" " \ + CCFLAGS="${CXXFLAGS} ${CCSHARED}" \ + LIBDIR=${libdir} INCDIR=${includedir} \ + CGCS_DOC_DEPLOY=${cgcs_doc_deploy} + distutils_do_compile +} + +do_install_append() { + cd ${S}/fm-common/sources + oe_runmake -e DESTDIR=${D} BINDIR=${bindir} \ + LIBDIR=${libdir} INCDIR=${includedir} \ + CGCS_DOC_DEPLOY=${cgcs_doc_deploy} install + distutils_do_install +} + + +FILES_fm-common = " \ + ${cgcs_doc_deploy}/fmAlarm.h \ + ${bindir}/fm_db_sync_event_suppression.py \ + ${bindir}/fmClientCli \ + ${libdir}/python2.7/site-packages/fm_core*.egg-info \ + ${libdir}/python2.7/site-packages/fm_core.so \ + ${libdir}/libfmcommon.so.1.0 \ + ${libdir}/libfmcommon.so.1 \ + ${includedir}/fmConfig.h \ + ${includedir}/fmLog.h \ + ${includedir}/fmThread.h \ + ${includedir}/fmDbAPI.h \ + ${includedir}/fmAPI.h \ + ${includedir}/fmAlarm.h \ + " diff --git a/recipes-core/stx-fault/fm-doc.bb b/recipes-core/stx-fault/fm-doc.bb deleted file mode 100644 index 33141ec..0000000 --- a/recipes-core/stx-fault/fm-doc.bb +++ /dev/null @@ -1,44 +0,0 @@ -DESCRIPTION = "fm-doc" - -STABLE = "starlingx/master" -PROTOCOL = "https" -BRANCH = "master" -SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4" -S = "${WORKDIR}/git" -PV = "19.05" - -LICENSE = "Apache-2.0" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}" - -inherit externalsrc -EXTERNALSRC_pn-${PN}="${EXTERNALREPO}/stx-fault" - -require stx-fault.inc - -# DEPENDS = " " -# RDEPENDS_${PN} += " bash" - -do_configure () { - : -} - -do_compile() { - : -} - -do_install () { - cd ${S}/fm-doc/fm_doc/ - install -d -m 755 ${D}/${cgcs_doc_deploy} - install -d -m 755 ${D}/${sysconfdir}/fm - install -m 744 events.yaml ${D}/${sysconfdir}/fm/ - install -m 644 events.yaml ${D}/${cgcs_doc_deploy} - install -m 755 checkEventYaml ${D}/${cgcs_doc_deploy} - install -m 644 parseEventYaml.py ${D}/${cgcs_doc_deploy} - install -m 644 check_missing_alarms.py ${D}/${cgcs_doc_deploy} -} - -FILES_${PN}_append += " ${cgcs_doc_deploy} " - diff --git a/recipes-core/stx-fault/fm-doc.inc b/recipes-core/stx-fault/fm-doc.inc new file mode 100644 index 0000000..249cba1 --- /dev/null +++ b/recipes-core/stx-fault/fm-doc.inc @@ -0,0 +1,20 @@ +PACKAGES += "fm-doc" + +do_install_append () { + cd ${S}/fm-doc/fm_doc/ + install -d -m 755 ${D}/${cgcs_doc_deploy} + install -d -m 755 ${D}/${sysconfdir}/fm + install -m 744 events.yaml ${D}/${sysconfdir}/fm/ + install -m 644 events.yaml ${D}/${cgcs_doc_deploy} + install -m 755 checkEventYaml ${D}/${cgcs_doc_deploy} + install -m 644 parseEventYaml.py ${D}/${cgcs_doc_deploy} + install -m 644 check_missing_alarms.py ${D}/${cgcs_doc_deploy} +} + +FILES_fm-doc = " \ + ${sysconfdir}/fm/events.yaml \ + ${cgcs_doc_deploy}/events.yaml \ + ${cgcs_doc_deploy}/checkEventYaml \ + ${cgcs_doc_deploy}/parseEventYaml.py \ + ${cgcs_doc_deploy}/check_missing_alarms.py \ + " diff --git a/recipes-core/stx-fault/fm-mgr.bb b/recipes-core/stx-fault/fm-mgr.bb deleted file mode 100644 index 4ace301..0000000 --- a/recipes-core/stx-fault/fm-mgr.bb +++ /dev/null @@ -1,45 +0,0 @@ -DESCRIPTION = "fm-doc" - -STABLE = "starlingx/master" -PROTOCOL = "https" -BRANCH = "master" -SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4" -S = "${WORKDIR}/git" -PV = "19.05" - -LICENSE = "Apache-2.0" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}" - -inherit externalsrc -EXTERNALSRC_pn-${PN}="${EXTERNALREPO}/stx-fault" - -require stx-fault.inc - -DEPENDS = " fm-common" -# RDEPENDS_${PN} += " bash" - -do_configure () { - : -} - -do_compile() { - cd ${S}/fm-mgr/sources/ - oe_runmake -e -} - -do_install () { - cd ${S}/fm-mgr/sources/ - install -d -m0755 ${D}/${systemd_system_unitdir} - oe_runmake -e DESTDIR=${D} BINDIR=${bindir} \ - LIBDIR=${libdir} UNITDIR=${systemd_system_unitdir} \ - SYSCONFDIR=${sysconfdir} \ - install -} - -FILES_${PN}_append += " ${libdir} \ - ${systemd_system_unitdir} \ - " - diff --git a/recipes-core/stx-fault/fm-mgr.inc b/recipes-core/stx-fault/fm-mgr.inc new file mode 100644 index 0000000..d4742bd --- /dev/null +++ b/recipes-core/stx-fault/fm-mgr.inc @@ -0,0 +1,31 @@ +PACKAGES += " fm-mgr" + +################### +# DEPENDS = " fm-common" +################### + +do_compile_append() { + cd ${S}/fm-mgr/sources/ + oe_runmake -e \ + LDFLAGS="${LDFLAGS} -L${S}/fm-common/sources" \ + CCFLAGS="${CXXFLAGS}" \ + INCLUDES="-I. -I${S}/fm-common/sources" \ + build +} + +do_install_append () { + cd ${S}/fm-mgr/sources/ + install -d -m0755 ${D}/${systemd_system_unitdir} + oe_runmake -e DESTDIR=${D} BINDIR=${bindir} \ + LIBDIR=${libdir} UNITDIR=${systemd_system_unitdir} \ + SYSCONFDIR=${sysconfdir} \ + install + rm -rf ${D}/usr/lib/systemd +} + +FILES_fm-mgr = " \ + ${bindir}/fmManager \ + ${systemd_system_unitdir}/fminit.service \ + ${sysconfdir}/init.d/fminit \ + ${sysconfdir}/logrotate.d/fm.logrotate \ + " diff --git a/recipes-core/stx-fault/fm-rest-api.bb b/recipes-core/stx-fault/fm-rest-api.bb deleted file mode 100644 index 8c60b51..0000000 --- a/recipes-core/stx-fault/fm-rest-api.bb +++ /dev/null @@ -1,43 +0,0 @@ -DESCRIPTION = "fm-rest-api" - -STABLE = "starlingx/master" -PROTOCOL = "https" -BRANCH = "master" -SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4" -S = "${WORKDIR}/git" -PV = "19.05" - -LICENSE = "Apache-2.0" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}" - -inherit externalsrc -EXTERNALSRC_pn-${PN}="${EXTERNALREPO}/stx-fault" - -inherit setuptools - -require stx-fault.inc - -do_configure () { - cd ${S}/fm-rest-api/fm - distutils_do_configure -} - -do_compile() { - cd ${S}/fm-rest-api/fm - distutils_do_compile -} - -do_install () { - cd ${S}/fm-rest-api/fm - distutils_do_compile - install -p -D -m 644 scripts/fm-api.service ${D}/${systemd_system_unitdir} - install -p -D -m 755 scripts/fm-api ${D}/${sysconfdir}/init.d/fm-api - install -p -D -m 644 fm-api-pmond.conf ${D}/${sysconfdir}/pmon.d/fm-api.conf - -} - -FILES_${PN}_append = " ${systemd_system_unitdir}" - diff --git a/recipes-core/stx-fault/fm-rest-api.inc b/recipes-core/stx-fault/fm-rest-api.inc new file mode 100644 index 0000000..888d17a --- /dev/null +++ b/recipes-core/stx-fault/fm-rest-api.inc @@ -0,0 +1,28 @@ +PACKAGES += " fm-rest-api" + +do_configure_append () { + cd ${S}/fm-rest-api/fm + distutils_do_configure +} + +do_compile_append() { + cd ${S}/fm-rest-api/fm + distutils_do_compile +} + +do_install_append() { + cd ${S}/fm-rest-api/fm + distutils_do_compile + install -d -m 755 ${D}/${systemd_system_unitdir} + install -p -D -m 644 scripts/fm-api.service ${D}/${systemd_system_unitdir} + install -p -D -m 755 scripts/fm-api ${D}/${sysconfdir}/init.d/fm-api + install -p -D -m 644 fm-api-pmond.conf ${D}/${sysconfdir}/pmon.d/fm-api.conf + +} + +FILES_fm-rest-api = " \ + ${systemd_system_unitdir}/fm-api.service \ + ${sysconfdir}/init.d/fm-api \ + ${sysconfdir}/pmon.d/fm-api.conf \ + " + diff --git a/recipes-core/stx-fault/python-fmclient.bb b/recipes-core/stx-fault/python-fmclient.bb deleted file mode 100644 index a071a97..0000000 --- a/recipes-core/stx-fault/python-fmclient.bb +++ /dev/null @@ -1,42 +0,0 @@ -DESCRIPTION = "python-fmclient" - -# INSANE_SKIP_${PN} = "ldflags" - -STABLE = "starlingx/master" -PROTOCOL = "https" -BRANCH = "master" -SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4" -S = "${WORKDIR}/git" -PV = "19.05" - -LICENSE = "Apache-2.0" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}" - -require stx-fault.inc -inherit setuptools - -DEPENDS = " \ - python \ - python-pbr-native \ - " - -do_configure () { - cd ${S}/python-fmclient/fmclient - distutils_do_configure -} - -do_compile() { - cd ${S}/python-fmclient/fmclient - distutils_do_compile -} - -do_install () { - cd ${S}/python-fmclient/fmclient - distutils_do_install - - install -d -m 0755 ${D}/${sysconfdir}/bash_completion.d/ - install -p -D -m 664 tools/fm.bash_completion ${D}/${sysconfdir}/bash_completion.d/fm.bash_completion -} diff --git a/recipes-core/stx-fault/python-fmclient.inc b/recipes-core/stx-fault/python-fmclient.inc new file mode 100644 index 0000000..8a2d61d --- /dev/null +++ b/recipes-core/stx-fault/python-fmclient.inc @@ -0,0 +1,26 @@ +PACKAGES += " python-fmclient" + +do_configure_append () { + cd ${S}/python-fmclient/fmclient + distutils_do_configure +} + +do_compile_append() { + cd ${S}/python-fmclient/fmclient + distutils_do_compile +} + +do_install_append() { + cd ${S}/python-fmclient/fmclient + distutils_do_install + + install -d -m 0755 ${D}/${sysconfdir}/bash_completion.d/ + install -p -D -m 664 tools/fm.bash_completion ${D}/${sysconfdir}/bash_completion.d/fm.bash_completion +} + +FILES_python-fmclient = " \ + ${bindir}/fm \ + ${libdir}/python2.7/site-packages/fmclient-*.egg-info/ \ + ${libdir}/python2.7/site-packages/fmclient/ \ + ${sysconfdir}/bash_completion.d/fm.bash_completion \ + " diff --git a/recipes-core/stx-fault/snmp-audittrail.bb b/recipes-core/stx-fault/snmp-audittrail.bb deleted file mode 100644 index c9d9616..0000000 --- a/recipes-core/stx-fault/snmp-audittrail.bb +++ /dev/null @@ -1,44 +0,0 @@ -DESCRIPTION = "snmp-audittrail" - -STABLE = "starlingx/master" -PROTOCOL = "https" -BRANCH = "master" -SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4" -S = "${WORKDIR}/git" -PV = "19.05" - -LICENSE = "Apache-2.0" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}" - -inherit externalsrc -EXTERNALSRC_pn-${PN}="${EXTERNALREPO}/stx-fault" - -require stx-fault.inc - -DEPENDS = " \ - fm-common \ - net-snmp \ - " - -do_configure () { - : -} - -do_compile() { - cd ${S}/snmp-audittrail/sources - oe_runmake -e \ - INCLUDES="-I. " \ - LDFLAGS="${LDFLAGS}" \ - CCFLAGS="${CXXFLAGS} -fPIC" -} - -do_install () { - cd ${S}/snmp-audittrail/sources - oe_runmake -e DESTDIR=${D} LIB_DIR=${libdir} MIBVER=0 PATCH=0 install -} - -FILES_${PN}_append = " ${systemd_system_unitdir}" - diff --git a/recipes-core/stx-fault/snmp-audittrail.inc b/recipes-core/stx-fault/snmp-audittrail.inc new file mode 100644 index 0000000..3261fe5 --- /dev/null +++ b/recipes-core/stx-fault/snmp-audittrail.inc @@ -0,0 +1,25 @@ +PACKAGES += " snmp-audittrail" + +################## +# DEPENDS = " fm-common net-snmp" +################## + +do_compile_append() { + cd ${S}/snmp-audittrail/sources + oe_runmake -e \ + LDFLAGS="${LDFLAGS} -L${S}/fm-common/sources" \ + CCFLAGS="${CXXFLAGS} -fPIC" \ + INCLUDES="-I. -I${S}/fm-common/sources" \ + build +} + +do_install_append () { + cd ${S}/snmp-audittrail/sources + oe_runmake -e DESTDIR=${D} LIB_DIR=${libdir} MIBVER=0 PATCH=0 install +} + +FILES_snmp-audittrail = " \ + ${libdir}/libsnmpAuditPlugin.so.1.0.0 \ + ${libdir}/libsnmpAuditPlugin.so.1 \ + " + diff --git a/recipes-core/stx-fault/snmp-ext.bb b/recipes-core/stx-fault/snmp-ext.bb deleted file mode 100644 index 7f25e9d..0000000 --- a/recipes-core/stx-fault/snmp-ext.bb +++ /dev/null @@ -1,46 +0,0 @@ -DESCRIPTION = "snmp-ext" - -STABLE = "starlingx/master" -PROTOCOL = "https" -BRANCH = "master" -SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4" -S = "${WORKDIR}/git" -PV = "19.05" - -LICENSE = "Apache-2.0" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}" - -inherit externalsrc -EXTERNALSRC_pn-${PN}="${EXTERNALREPO}/stx-fault" - -require stx-fault.inc - -DEPENDS = " \ - fm-common \ - snmp-audittrail \ - " - -do_configure () { - : -} - -do_compile() { - cd ${S}/snmp-ext/sources - oe_runmake -e PATCH=0 \ - INCLUDES="-I. " \ - LDFLAGS="${LDFLAGS}" \ - CCFLAGS="${CXXFLAGS} -fPIC" -} - -do_install () { - cd ${S}/snmp-ext/sources - oe_runmake -e DEST_DIR=${D} LIB_DIR=${libdir} MIBVER=0 PATCH=0 install -} - -FILES_${PN}_append = " \ - ${systemd_system_unitdir} \ - ${datadir} \ - " diff --git a/recipes-core/stx-fault/snmp-ext.inc b/recipes-core/stx-fault/snmp-ext.inc new file mode 100644 index 0000000..d8c3541 --- /dev/null +++ b/recipes-core/stx-fault/snmp-ext.inc @@ -0,0 +1,25 @@ +PACKAGES += " snmp-ext" + +#################### +# DEPENDS = " fm-common snmp-audittrail" +#################### + +do_compile_append() { + cd ${S}/snmp-ext/sources + oe_runmake -e PATCH=0 \ + INCLUDES="-I. -I${S}/fm-common/sources" \ + LDFLAGS="${LDFLAGS} -L${S}/fm-common/sources" \ + CCFLAGS="${CXXFLAGS} -fPIC" lib +} + +do_install_append () { + cd ${S}/snmp-ext/sources + oe_runmake -e DEST_DIR=${D} LIB_DIR=${libdir} MIBVER=0 PATCH=0 install +} + +FILES_snmp-ext_append = " \ + ${datadir}/snmp/mibs/wrsAlarmMib.mib.txt \ + ${datadir}/snmp/mibs/wrsEnterpriseReg.mib.txt \ + ${libdir}/libcgtsAgentPlugin.so.1.0.0 \ + ${libdir}/libcgtsAgentPlugin.so.1 \ + " diff --git a/recipes-core/stx-fault/stx-fault.bb b/recipes-core/stx-fault/stx-fault.bb new file mode 100644 index 0000000..adc44cf --- /dev/null +++ b/recipes-core/stx-fault/stx-fault.bb @@ -0,0 +1,62 @@ +DESCRIPTION = "stx-fault" + +INSANE_SKIP_${PN} = "ldflags" + + +STABLE = "starlingx/master" +PROTOCOL = "https" +BRANCH = "master" +SRCREV = "eeb2dee9023347f73d7153325190550a5dc87e7a" +S = "${WORKDIR}/git" +PV = "19.05" + +LICENSE = "Apache-2.0" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +SRC_URI = "git://opendev.org/starlingx/fault.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \ + file://0001-Honor-the-build-system-LDFLAGS.patch \ + file://0001-Use-build-systems-LDFLAGS.patch \ + file://0001-snmp-ext-use-build-systems-LDFLAGS.patch \ + " + +DEPENDS = " \ + util-linux \ + postgresql \ + python \ + python-pbr-native \ + python-six \ + python-oslo.i18n \ + python-oslo.utils \ + python-requests \ + bash \ + net-snmp \ +" + +RDEPENDS_${PN} += " bash" + +inherit setuptools +cgcs_doc_deploy = "/opt/deploy/cgcs_doc" + +require fm-common.inc +require fm-mgr.inc +require fm-api.inc +require fm-doc.inc +require fm-rest-api.inc +require python-fmclient.inc +require snmp-audittrail.inc +require snmp-ext.inc + +do_configure() { + : +} + +do_compile() { + : +} + +do_install() { + : +} + +FILES_${PN} = " " diff --git a/recipes-core/stx-fault/stx-fault.bb.DONTUSE b/recipes-core/stx-fault/stx-fault.bb.DONTUSE deleted file mode 100644 index a30d657..0000000 --- a/recipes-core/stx-fault/stx-fault.bb.DONTUSE +++ /dev/null @@ -1,197 +0,0 @@ -DESCRIPTION = "stx-fault" - -INSANE_SKIP_${PN} = "ldflags" - - -STABLE = "starlingx/master" -PROTOCOL = "https" -BRANCH = "master" -SRCREV = "eeb2dee9023347f73d7153325190550a5dc87e7a" -S = "${WORKDIR}/git" -PV = "19.05" - -LICENSE = "Apache-2.0" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - - - -SRC_URI = "git://opendev.org/starlingx/fault.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \ - file://0001-Fix-compile-errors.patch \ - " - -DEPENDS = " \ - util-linux \ - postgresql \ - python \ - python-pbr-native \ - python-six \ - python-oslo.i18n \ - python-oslo.utils \ - python-requests \ - bash \ - net-snmp \ -" - -RDEPENDS_${PN} += " bash" - -inherit setuptools - - -cgcs_doc_deploy = "/opt/deploy/cgcs_doc" - -do_configure () { -# fm-doc: Do Nothing -# fm-mgr: Do Nothing -# fm-rest-api: Do Nothing -# snmp-ext: Do Nothing -# snmp-audittrail: Do Nothing - -# fm-api - cd ${S}/fm-api - distutils_do_configure - -# fm-common: - cd ${S}/fm-common/sources/ - distutils_do_configure - -#fm-rest-api: - cd ${S}/fm-rest-api/fm/ - distutils_do_configure - -# python-fmclient: - cd ${S}/python-fmclient/fmclient - distutils_do_configure -} - -do_compile() { - -# fm-doc: Do Nothing - -# fm-api - cd ${S}/fm-api - distutils_do_compile - -# fm-common: - cd ${S}/fm-common/sources/ - oe_runmake -e BINDIR=${bindir} \ - LIBDIR=${libdir} INCDIR=${includedir} \ - CGCS_DOC_DEPLOY=${cgcs_doc_deploy} - distutils_do_compile - -# fm-mgr: - cd ${S}/fm-mgr/sources/ - oe_runmake -e \ - INCLUDES="-I. -I../../fm-common/sources" \ - LDFLAGS="$LDFLAGS -L../../fm-common/sources" - -#fm-rest-api: - cd ${S}/fm-rest-api/fm/ - distutils_do_configure - -# python-fmclient: - cd ${S}/python-fmclient/fmclient - distutils_do_compile - -# snmp-audittrail: - cd ${S}/snmp-audittrail/sources/ - oe_runmake -e LDFLAGS="$LDFLAGS -L../../fm-common/sources" - -# snmp-ext: - cd ${S}/snmp-ext/sources/ - # PATCH=${tis_patch_ver} - # tis_patch_ver = "0" - # mib_ver = "2.0" - oe_runmake -e PATCH=0 \ - INCLUDES="-I. -I../../fm-common/sources" \ - LDFLAGS="$LDFLAGS -L../../fm-common/sources -L../../snmp-audittrail/sources/" - -} - -do_install () { - install -d -m 0755 ${D}/${systemd_system_unitdir} -# fm-api - cd ${S}/fm-api - distutils_do_install - -# fm-common: - cd ${S}/fm-common/sources/ - oe_runmake -e DESTDIR=${D} BINDIR=${bindir} \ - LIBDIR=${libdir} INCDIR=${includedir} \ - CGCS_DOC_DEPLOY=${cgcs_doc_deploy} install - distutils_do_install - -#fm-doc: - cd ${S}/fm-doc/fm_doc/ - install -d -m 755 ${D}/${cgcs_doc_deploy} - install -d -m 755 ${D}/${sysconfdir}/fm - install -m 744 events.yaml ${D}/${sysconfdir}/fm/ - install -m 644 events.yaml ${D}/${cgcs_doc_deploy} - install -m 755 checkEventYaml ${D}/${cgcs_doc_deploy} - install -m 644 parseEventYaml.py ${D}/${cgcs_doc_deploy} - install -m 644 check_missing_alarms.py ${D}/${cgcs_doc_deploy} - -#fm-mgr: - cd ${S}/fm-mgr/sources/ - oe_runmake -e DESTDIR=${D} BINDIR=${bindir} \ - LIBDIR=${libdir} UNITDIR=${systemd_system_unitdir} \ - SYSCONFDIR=${sysconfdir} \ - INCLUDES="-I. -I../../fm-common/sources" install -#fm-rest-api: - cd ${S}/fm-rest-api/fm/ - distutils_do_install - install -p -D -m 644 scripts/fm-api.service ${D}/${systemd_system_unitdir} - install -d -m 0755 ${D}/${sysconfdir}/init.d - install -d -m 0755 ${D}/${sysconfdir}/pmon.d/ - install -p -D -m 755 scripts/fm-api ${D}/${sysconfdir}/init.d/fm-api - install -p -D -m 644 fm-api-pmond.conf ${D}/${sysconfdir}/pmon.d/fm-api.conf - - -# python-fmclient: - cd ${S}/python-fmclient/fmclient - distutils_do_install - - install -d -m 0755 ${D}/${sysconfdir}/bash_completion.d/ - install -p -D -m 664 tools/fm.bash_completion ${D}/${sysconfdir}/bash_completion.d/fm.bash_completion - -# snmp-audittrail: - cd ${S}/snmp-audittrail/sources/ - # tis_patch_ver = "0" - # PATCH=${tis_patch_ver} - oe_runmake -e DESTDIR=${D} LIB_DIR=${libdir} PATCH=0 install - -# snmp-ext: - cd ${S}/snmp-ext/sources/ - #tis_patch_ver = "0" - #mib_ver = "2.0" - oe_runmake -e DEST_DIR=${D} LIB_DIR=${libdir} \ - MIBVER=0 \ - PATCH=0 install -} - -# TODO: -# post install scripts -# fm-doc: constants.py and fmAPI.h -# fm-rest-api: oslo-config-generator -pkg_postinst_ontarget_${PN} () { - -# fm-rest-api: -# cd oslo-config-generator --config-file fm/config-generator.conf \ -# --output-file /tmp/fm.conf.sample -# install -p -D -m 644 /tmp/fm.conf.sample /etc/fm/fm.conf -# fm-doc: -# cd ${datadir}/ -# cp .../constants.py .../fmAlarm.h . -# ./checkEventYaml -# rm constants.py* fmAlarm.h* - -} - -FILES_${PN}_append += " ${baselib} \ - ${systemd_unitdir} \ - ${systemd_system_unitdir} \ - ${systemd_system_unitdir}/worker-config-gate.service \ - ${systemd_system_unitdir}/config.service \ - ${datadir}/* \ - opt/* \ - " diff --git a/recipes-core/stx-fault/stx-fault.inc b/recipes-core/stx-fault/stx-fault.inc deleted file mode 100644 index 53b749c..0000000 --- a/recipes-core/stx-fault/stx-fault.inc +++ /dev/null @@ -1,3 +0,0 @@ -inherit externalsrc -EXTERNALSRC_pn-${PN}="${EXTERNALREPO}/stx-fault" -cgcs_doc_deploy = "/opt/deploy/cgcs_doc" diff --git a/recipes-core/stx-ha/sm-api.bb b/recipes-core/stx-ha/sm-api.inc similarity index 56% rename from recipes-core/stx-ha/sm-api.bb rename to recipes-core/stx-ha/sm-api.inc index ba644fa..d3b0244 100644 --- a/recipes-core/stx-ha/sm-api.bb +++ b/recipes-core/stx-ha/sm-api.inc @@ -1,37 +1,16 @@ -DESCRIPTION = "sm-api" +PACKAGES += " sm-api" -STABLE = "starlingx/master" -PROTOCOL = "https" -BRANCH = "master" -SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4" -S = "${WORKDIR}/git" -PV = "19.05" - -LICENSE = "Apache-2.0" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}" - -require stx-ha.inc -inherit setuptools - -DEPENDS = " \ - python \ - python-pbr-native \ - " - -do_configure () { +do_configure_prepend () { cd ${S}/service-mgmt-api/sm-api distutils_do_configure } -do_compile() { +do_compile_prepend () { cd ${S}/service-mgmt-api/sm-api distutils_do_compile } -do_install () { +do_install_prepend () { cd ${S}/service-mgmt-api/sm-api distutils_do_install install -d -m 0755 ${D}/${sysconfdir}/sm @@ -46,4 +25,4 @@ do_install () { install -m 644 etc/sm-api/policy.json ${D}/${sysconfdir}/sm-api } -FILES_${PN}_append = " ${systemd_unitdir}/* " +FILES_sm-api = " ${systemd_unitdir}/* " diff --git a/recipes-core/stx-ha/sm-client.bb b/recipes-core/stx-ha/sm-client.bb deleted file mode 100644 index 74ebb99..0000000 --- a/recipes-core/stx-ha/sm-client.bb +++ /dev/null @@ -1,39 +0,0 @@ -DESCRIPTION = "sm-client" - -STABLE = "starlingx/master" -PROTOCOL = "https" -BRANCH = "master" -SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4" -S = "${WORKDIR}/git" -PV = "19.05" - -LICENSE = "Apache-2.0" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}" - -require stx-ha.inc -inherit setuptools - -DEPENDS = " \ - python \ - python-pbr-native \ - " - -do_configure () { - cd ${S}/service-mgmt-client/sm-client - distutils_do_configure -} - -do_compile() { - cd ${S}/service-mgmt-client/sm-client - distutils_do_compile -} - -do_install () { - cd ${S}/service-mgmt-client/sm-client - distutils_do_install - install -d -m 0755 ${D}/${bindir} - install -m 755 usr/bin/smc ${D}/${bindir} -} diff --git a/recipes-core/stx-ha/sm-client.inc b/recipes-core/stx-ha/sm-client.inc new file mode 100644 index 0000000..b356807 --- /dev/null +++ b/recipes-core/stx-ha/sm-client.inc @@ -0,0 +1,20 @@ +PACKAGES += " sm-client" + +do_configure_prepend () { + cd ${S}/service-mgmt-client/sm-client + distutils_do_configure +} + +do_compile_prepend() { + cd ${S}/service-mgmt-client/sm-client + distutils_do_compile +} + +do_install_prepend () { + cd ${S}/service-mgmt-client/sm-client + distutils_do_install + install -d -m 0755 ${D}/${bindir} + install -m 755 usr/bin/smc ${D}/${bindir} +} + +FILES_sm-client = " " diff --git a/recipes-core/stx-ha/sm-common.bb b/recipes-core/stx-ha/sm-common.bb deleted file mode 100644 index 3914b92..0000000 --- a/recipes-core/stx-ha/sm-common.bb +++ /dev/null @@ -1,43 +0,0 @@ -DESCRIPTION = "sm-common" - -STABLE = "starlingx/master" -PROTOCOL = "https" -BRANCH = "master" -SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4" -# S = "${WORKDIR}/git" -PV = "19.05" - -LICENSE = "Apache-2.0" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}" - -require stx-ha.inc - -inherit pkgconfig - -DEPENDS += " \ - glib-2.0 \ - sqlite3 \ - " - -do_configure () { - : -} - -do_compile() { - cd ${S}/service-mgmt/sm-common-1.0.0/src - oe_runmake -e VER=0 VER_MJR=1 \ - INCLUDES="-I. $(pkg-config --cflags glib-2.0)" \ - CCFLAGS="${CXXFLAGS} -fPIC" LDFLAGS="${LDFLAGS} -shared -rdynamic" - -} - -do_install () { - cd ${S}/service-mgmt/sm-common-1.0.0/src - oe_runmake -e DEST_DIR=${D} BIN_DIR=${bindir} UNIT_DIR=${systemd_system_unitdir} \ - LIB_DIR=${libdir} INC_DIR=${includedir} VER=0 VER_MJR=1 install -} - -FILES_${PN}-dev_append = " var/lib/sm/watchdog/modules/libsm_watchdog_nfs.so" diff --git a/recipes-core/stx-ha/sm-common.inc b/recipes-core/stx-ha/sm-common.inc new file mode 100644 index 0000000..5e5af5b --- /dev/null +++ b/recipes-core/stx-ha/sm-common.inc @@ -0,0 +1,56 @@ +PACKAGES += " sm-common" + +#DEPENDS += " \ +# glib-2.0 \ +# sqlite3 \ +# " + +do_configure_prepend () { + : +} + +do_compile_prepend () { + cd ${S}/service-mgmt/sm-common-1.0.0/src + oe_runmake -e VER=0 VER_MJR=1 \ + INCLUDES="-I. $(pkg-config --cflags glib-2.0)" \ + CCFLAGS="${CXXFLAGS} -fPIC" LDFLAGS="${LDFLAGS} -shared -rdynamic" + +} + +do_install_prepend () { + cd ${S}/service-mgmt/sm-common-1.0.0/src + oe_runmake -e DEST_DIR=${D} BIN_DIR=${bindir} UNIT_DIR=${systemd_system_unitdir} \ + LIB_DIR=${libdir} INC_DIR=${includedir} VER=0 VER_MJR=1 install +} + +#FILES_sm-common-dev_append = " var/lib/sm/watchdog/modules/libsm_watchdog_nfs.so" +FILES_sm-common = " \ + ${libdir}/libsm_common.so.0 \ + var/lib/sm/watchdog/modules/libsm_watchdog_nfs.so.0 \ + " +FILES_sm-common-dev = " \ + ${includedir}/sm_trap_thread.h \ + ${includedir}/sm_time.h \ + ${includedir}/sm_watchdog_nfs.h \ + ${includedir}/sm_debug.h \ + ${includedir}/sm_uuid.h \ + ${includedir}/sm_timer.h \ + ${includedir}/sm_node_stats.h \ + ${includedir}/sm_limits.h \ + ${includedir}/sm_trap.h \ + ${includedir}/sm_watchdog_process.h \ + ${includedir}/sm_netlink.h \ + ${includedir}/sm_list.h \ + ${includedir}/sm_utils.h \ + ${includedir}/sm_selobj.h \ + ${includedir}/sm_debug_thread.h \ + ${includedir}/sm_node_utils.h \ + ${includedir}/sm_util_types.h \ + ${includedir}/sm_sha512.h \ + ${includedir}/sm_thread_health.h \ + ${includedir}/sm_eru_db.h \ + ${includedir}/sm_types.h \ + ${includedir}/sm_hw.h \ + ${includedir}/sm_eru_process.h \ + ${includedir}/sm_watchdog_module.h \ + " diff --git a/recipes-core/stx-ha/sm-db.bb b/recipes-core/stx-ha/sm-db.bb deleted file mode 100644 index 4f66d3a..0000000 --- a/recipes-core/stx-ha/sm-db.bb +++ /dev/null @@ -1,40 +0,0 @@ -DESCRIPTION = "sm-db" - -STABLE = "starlingx/master" -PROTOCOL = "https" -BRANCH = "master" -SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4" -# S = "${WORKDIR}/git" -PV = "19.05" - -LICENSE = "Apache-2.0" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}" - -require stx-ha.inc - -inherit pkgconfig - -DEPENDS += " \ - sm-common \ - " - -do_configure () { - : -} - -do_compile() { - cd ${S}/service-mgmt/sm-db-1.0.0/src - oe_runmake -e VER=0 VER_MJR=1 \ - INCLUDES="-I. $(pkg-config --cflags glib-2.0)" \ - CCFLAGS="${CXXFLAGS} -fPIC" LDFLAGS="${LDFLAGS} -shared -rdynamic" - -} - -do_install () { - cd ${S}/service-mgmt/sm-db-1.0.0/src - oe_runmake -e DEST_DIR=${D} BIN_DIR=${bindir} UNIT_DIR=${systemd_system_unitdir} \ - LIB_DIR=${libdir} INC_DIR=${includedir} VER=0 VER_MJR=1 install -} diff --git a/recipes-core/stx-ha/sm-db.inc b/recipes-core/stx-ha/sm-db.inc new file mode 100644 index 0000000..8f092d7 --- /dev/null +++ b/recipes-core/stx-ha/sm-db.inc @@ -0,0 +1,26 @@ +PACKAGES += " sm-db" + +# inherit pkgconfig +#DEPENDS += " \ +# sm-common \ +# " + +do_configure_prepend () { + : +} + +do_compile_prepend () { + cd ${S}/service-mgmt/sm-db-1.0.0/src + oe_runmake -e VER=0 VER_MJR=1 \ + INCLUDES="-I. $(pkg-config --cflags glib-2.0)" \ + CCFLAGS="${CXXFLAGS} -fPIC" LDFLAGS="${LDFLAGS} -shared -rdynamic" + +} + +do_install_prepend () { + cd ${S}/service-mgmt/sm-db-1.0.0/src + oe_runmake -e DEST_DIR=${D} BIN_DIR=${bindir} UNIT_DIR=${systemd_system_unitdir} \ + LIB_DIR=${libdir} INC_DIR=${includedir} VER=0 VER_MJR=1 install +} + +FILES_sm-db = " " diff --git a/recipes-core/stx-ha/sm-tools.bb b/recipes-core/stx-ha/sm-tools.bb deleted file mode 100644 index 3eed675..0000000 --- a/recipes-core/stx-ha/sm-tools.bb +++ /dev/null @@ -1,37 +0,0 @@ -DESCRIPTION = "sm-tools" - -STABLE = "starlingx/master" -PROTOCOL = "https" -BRANCH = "master" -SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4" -S = "${WORKDIR}/git" -PV = "19.05" - -LICENSE = "Apache-2.0" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}" - -require stx-ha.inc -inherit setuptools - -DEPENDS = " \ - python \ - python-pbr-native \ - " - -do_configure () { - cd ${S}/service-mgmt-tools/sm-tools - distutils_do_configure -} - -do_compile() { - cd ${S}/service-mgmt-tools/sm-tools - distutils_do_compile -} - -do_install () { - cd ${S}/service-mgmt-tools/sm-tools - distutils_do_install -} diff --git a/recipes-core/stx-ha/sm-tools.inc b/recipes-core/stx-ha/sm-tools.inc new file mode 100644 index 0000000..26811d5 --- /dev/null +++ b/recipes-core/stx-ha/sm-tools.inc @@ -0,0 +1,23 @@ +PACKAGES += " sm-tools" + +# DEPENDS = " \ +# python \ +# python-pbr-native \ +# " + +do_configure_prepend () { + cd ${S}/service-mgmt-tools/sm-tools + distutils_do_configure +} + +do_compile_prepend() { + cd ${S}/service-mgmt-tools/sm-tools + distutils_do_compile +} + +do_install_prepend () { + cd ${S}/service-mgmt-tools/sm-tools + distutils_do_install +} + +FILES_sm-tools = " " diff --git a/recipes-core/stx-ha/sm.bb b/recipes-core/stx-ha/sm.bb deleted file mode 100644 index a7fe72d..0000000 --- a/recipes-core/stx-ha/sm.bb +++ /dev/null @@ -1,51 +0,0 @@ -DESCRIPTION = "sm" - -STABLE = "starlingx/master" -PROTOCOL = "https" -BRANCH = "master" -SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4" -# S = "${WORKDIR}/git" -PV = "19.05" - -LICENSE = "Apache-2.0" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}" - -require stx-ha.inc - -inherit pkgconfig - -DEPENDS += " \ - sm-common \ - sm-db \ - fm-api \ - mtce \ - sqlite3 \ - " - -#TODO: Shouldn't have to do this -LDFLAGS_remove = "-Wl,--as-needed" -do_configure () { - : -} - -do_compile() { - cd ${S}/service-mgmt/sm-1.0.0/src - oe_runmake -e -j1 VER=0 VER_MJR=1 \ - INCLUDES="-I. $(pkg-config --cflags glib-2.0)" \ - CCFLAGS="${CXXFLAGS} -std=c++11" LDFLAGS="${LDFLAGS} -rdynamic" - -} - -do_install () { - cd ${S}/service-mgmt/sm-1.0.0/src - oe_runmake -e DEST_DIR=${D} BIN_DIR=${bindir} UNIT_DIR=${systemd_system_unitdir} \ - LIB_DIR=${libdir} INC_DIR=${includedir} VER=0 VER_MJR=1 install -} - -pkg_postinst_ontarget_${PN} () { - /usr/bin/systemctl enable sm.service >/dev/null 2>&1 - /usr/bin/systemctl enable sm-shutdown.service >/dev/null 2>&1 -} diff --git a/recipes-core/stx-ha/sm.inc b/recipes-core/stx-ha/sm.inc new file mode 100644 index 0000000..4ed6f21 --- /dev/null +++ b/recipes-core/stx-ha/sm.inc @@ -0,0 +1,34 @@ +PACKAGES += " sm" + +DEPENDS += " \ +sm-common \ +sm-db \ +fm-api \ +mtce \ +sqlite3 \ +" + +do_configure_prepend () { + : +} + +do_compile_prepend() { + cd ${S}/service-mgmt/sm-1.0.0/src + oe_runmake -e -j1 VER=0 VER_MJR=1 \ + INCLUDES="-I. $(pkg-config --cflags glib-2.0)" \ + CCFLAGS="${CXXFLAGS} -std=c++11" LDFLAGS="${LDFLAGS} -rdynamic" +} + +do_install_prepend () { + cd ${S}/service-mgmt/sm-1.0.0/src + oe_runmake -e DEST_DIR=${D} BIN_DIR=${bindir} UNIT_DIR=${systemd_system_unitdir} \ + LIB_DIR=${libdir} INC_DIR=${includedir} VER=0 VER_MJR=1 install +} + +FILES_sm = " \ +" + +pkg_postinst_ontarget_${PN}_append () { + /usr/bin/systemctl enable sm.service >/dev/null 2>&1 + /usr/bin/systemctl enable sm-shutdown.service >/dev/null 2>&1 +} diff --git a/recipes-core/stx-ha/stx-ha.bb b/recipes-core/stx-ha/stx-ha.bb new file mode 100644 index 0000000..6bf6d12 --- /dev/null +++ b/recipes-core/stx-ha/stx-ha.bb @@ -0,0 +1,57 @@ +DESCRIPTION = "stx-ha" + +STABLE = "starlingx/master" +PROTOCOL = "https" +BRANCH = "master" +SRCREV = "73b77366b32eac3be1caaab2e44a1f02ee5c1980" +S = "${WORKDIR}/git" +PV = "19.05" + +LICENSE = "Apache-2.0" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +SRC_URI = "git://opendev.org/starlingx/ha.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}" + + +inherit setuptools +inherit pkgconfig + +# sm-common sm-db +# mtce + +DEPENDS += " \ + stx-fault \ + sqlite3 \ + python \ + python-pbr-native \ + glib-2.0 \ + sqlite3 \ + " + +require sm-common.inc +#require sm-api.inc +#require sm-client.inc +#require sm-common.inc +#require sm-db.inc +#require sm-tools.inc +#require sm.inc + +#TODO: Shouldn't have to do this +LDFLAGS_remove = "-Wl,--as-needed" +do_configure () { + : +} + +do_compile() { + : +} + +do_install () { + : +} + +pkg_postinst_ontarget_${PN} () { +} + +FILES_${PN} = " " diff --git a/recipes-core/stx-ha/stx-ha.inc b/recipes-core/stx-ha/stx-ha.inc deleted file mode 100644 index 27357b6..0000000 --- a/recipes-core/stx-ha/stx-ha.inc +++ /dev/null @@ -1,2 +0,0 @@ -inherit externalsrc -EXTERNALSRC_pn-${PN}="${EXTERNALREPO}/stx-ha" diff --git a/recipes-core/stx-integ-filesystem/filesystem-scripts.bb b/recipes-core/stx-integ-filesystem/filesystem-scripts.bb new file mode 100644 index 0000000..e79f9bb --- /dev/null +++ b/recipes-core/stx-integ-filesystem/filesystem-scripts.bb @@ -0,0 +1,46 @@ +DESCRIPTION = "filesystem-scripts" + +STABLE = "starlingx/master" +PROTOCOL = "https" +BRANCH = "master" +SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4" +S = "${WORKDIR}/git" +PV = "19.05" + +LICENSE = "Apache-2.0" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}" + +require stx-integ-filesystem.inc + +RDEPENDS_${PN} += " bash" + +do_configure () { + : +} + +do_compile() { + : +} + +do_install () { + + cd ${S}/filesystem/filesystem-scripts/filesystem-scripts-1.0 + install -d -m755 ${D}/${sysconfdir}/init.d + install -d -m755 ${D}/${libdir}/ocf/resource.d/platform + install -d -m755 ${D}/${bindir} + install -d -m755 ${D}/${systemd_system_unitdir} + + install -D -m644 uexportfs ${D}/${sysconfdir}/init.d + install -D -m644 nfsserver-mgmt ${D}/${libdir}/ocf/resource.d/platform + install -D -m644 nfs-mount ${D}/${bindir} + install -D -m644 uexportfs.service ${D}/${systemd_system_unitdir} + +} + +FILES_${PN}_append += " \ + ${systemd_system_unitdir} \ + ${libdir} \ + " diff --git a/recipes-core/stx-integ-filesystem/iscsi-initiator-utils-config.bb b/recipes-core/stx-integ-filesystem/iscsi-initiator-utils-config.bb new file mode 100644 index 0000000..72ad197 --- /dev/null +++ b/recipes-core/stx-integ-filesystem/iscsi-initiator-utils-config.bb @@ -0,0 +1,45 @@ +DESCRIPTION = "iscsi-initiator-utils-config" + +STABLE = "starlingx/master" +PROTOCOL = "https" +BRANCH = "master" +SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4" +S = "${WORKDIR}/git" +PV = "19.05" + +LICENSE = "Apache-2.0" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}" + +require stx-integ-filesystem.inc + +RDEPENDS_${PN} += " bash" + +do_configure () { + : +} + +do_compile() { + : +} + +do_install () { + + cd ${S}/filesystem/iscsi-initiator-utils-config/ + install -d -m755 ${D}/${libdir}/tempfiles.d + install -d -m755 ${D}/${systemd_system_unitdir} + install -d -m755 ${D}/${datadir}/starlingx + + install -D -m644 files/iscsi-cache.volatiles ${D}/${libdir}/tempfiles.d + install -D -m644 files/iscsi-shutdown.service ${D}/${systemd_system_unitdir} + + install -m 0644 files/iscsid.conf ${D}/${datadir}/starlingx/stx.iscsid.conf +} + +FILES_${PN}_append += " \ + ${systemd_system_unitdir} \ + ${datadir} \ + ${libdir} \ + " diff --git a/recipes-core/stx-integ-filesystem/nfs-utils-config.bb b/recipes-core/stx-integ-filesystem/nfs-utils-config.bb new file mode 100644 index 0000000..483a14a --- /dev/null +++ b/recipes-core/stx-integ-filesystem/nfs-utils-config.bb @@ -0,0 +1,56 @@ +DESCRIPTION = "nfs-utils-config" + +STABLE = "starlingx/master" +PROTOCOL = "https" +BRANCH = "master" +SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4" +S = "${WORKDIR}/git" +PV = "19.05" + +LICENSE = "Apache-2.0" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}" + +require stx-integ-filesystem.inc + +RDEPENDS_${PN} += " bash" + +do_configure () { + : +} + +do_compile() { + : +} + +do_install () { + + cd ${S}/filesystem/nfs-utils-config/ + install -d -m755 ${D}/${sysconfdir}/init.d + install -d -m755 ${D}/${datadir}/starlingx + install -d -m755 ${D}/${systemd_system_unitdir} + + install -D -m644 files/nfscommon ${D}/${sysconfdir}/init.d/ + install -D -m644 files/nfscommon.service ${D}/${systemd_system_unitdir}/ + install -D -m644 files/nfsserver ${D}/${sysconfdir}/init.d/ + install -D -m644 files/nfsserver.service ${D}/${systemd_system_unitdir}/ + install -D -m644 files/nfsmount.conf ${D}/${datadir}/starlingx/stx.nfsmount.conf + install -D -m644 files/nfsmount.conf ${D}/${sysconfdir}/ + +} + +pkg_postinst_ontarget_${PN} () { + systemctl disable rpc-statd.service + systemctl disable rpc-statd-notify.service + systemctl disable nfs-lock.service + systemctl disable nfslock.service + + systemctl enable nfscommon.service >/dev/null 2>&1 || : + systemctl enable nfsserver.service >/dev/null 2>&1 || : +} + +FILES_${PN}_append += " \ + ${systemd_system_unitdir} \ + " diff --git a/recipes-core/stx-config/storageconfig.bb b/recipes-core/stx-integ-filesystem/nfscheck.bb similarity index 54% rename from recipes-core/stx-config/storageconfig.bb rename to recipes-core/stx-integ-filesystem/nfscheck.bb index cedf804..b2c808a 100644 --- a/recipes-core/stx-config/storageconfig.bb +++ b/recipes-core/stx-integ-filesystem/nfscheck.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "storageconfig" +DESCRIPTION = "nfscheck" STABLE = "starlingx/master" PROTOCOL = "https" @@ -13,8 +13,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}" -inherit externalsrc -EXTERNALSRC_pn-${PN}="${EXTERNALREPO}/stx-config" +require stx-integ-filesystem.inc RDEPENDS_${PN} += " bash" @@ -27,11 +26,21 @@ do_compile() { } do_install () { - cd ${S}/storageconfig/storageconfig/ - oe_runmake GOENABLEDDIR=${D}/${sysconfdir}/goenabled.d INITDDIR=${D}/${sysconfdir}/init.d \ - SYSTEMDDIR=${D}/${systemd_system_unitdir} install + + cd ${S}/filesystem/nfscheck/ + install -d -m755 ${D}/${bindir} + install -d -m755 ${D}/${systemd_system_unitdir} + + install -D -m644 files/nfscheck.sh ${D}/${bindir} + install -D -m644 files/nfscheck.service ${D}/${systemd_system_unitdir} + + } -FILES_${PN}_append += " ${sysconfdir} \ +pkg_postinst_ontarget_${PN} () { + /usr/bin/systemctl enable nfscheck.service> +} + +FILES_${PN}_append += " \ ${systemd_system_unitdir} \ " diff --git a/recipes-core/stx-integ-filesystem/stx-integ-filesystem.inc b/recipes-core/stx-integ-filesystem/stx-integ-filesystem.inc new file mode 100644 index 0000000..35e3e9a --- /dev/null +++ b/recipes-core/stx-integ-filesystem/stx-integ-filesystem.inc @@ -0,0 +1,2 @@ +inherit externalsrc +EXTERNALSRC_pn-${PN}="${EXTERNALREPO}/stx-integ/" diff --git a/recipes-core/stx-integ-kubernetes/cloud-provider-openstack.bb b/recipes-core/stx-integ-kubernetes/cloud-provider-openstack.bb new file mode 100644 index 0000000..cba019f --- /dev/null +++ b/recipes-core/stx-integ-kubernetes/cloud-provider-openstack.bb @@ -0,0 +1,46 @@ +DESCRIPTION = "cloud-provider-openstack" + +STABLE = "starlingx/master" +PROTOCOL = "https" +BRANCH = "master" +SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4" +S = "${WORKDIR}/git" +PV = "19.05" + +LICENSE = "Apache-2.0" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}" + +require stx-integ-kubernetes.inc + +RDEPENDS_${PN} += " bash" + +do_configure () { + : +} + +do_compile() { + : +} + +do_install () { + + cd ${S}/filesystem/cloud-provider-openstack/ + install -d -m755 ${D}/${bindir} + install -d -m755 ${D}/${systemd_system_unitdir} + + install -D -m644 files/cloud-provider-openstack.sh ${D}/${bindir} + install -D -m644 files/cloud-provider-openstack.service ${D}/${systemd_system_unitdir} + + +} + +pkg_postinst_ontarget_${PN} () { + /usr/bin/systemctl enable cloud-provider-openstack.service> +} + +FILES_${PN}_append += " \ + ${systemd_system_unitdir} \ + " diff --git a/recipes-core/stx-integ-kubernetes/stx-integ-kubernetes.inc b/recipes-core/stx-integ-kubernetes/stx-integ-kubernetes.inc new file mode 100644 index 0000000..35e3e9a --- /dev/null +++ b/recipes-core/stx-integ-kubernetes/stx-integ-kubernetes.inc @@ -0,0 +1,2 @@ +inherit externalsrc +EXTERNALSRC_pn-${PN}="${EXTERNALREPO}/stx-integ/" diff --git a/recipes-core/stx-integ-puppet/stx-integ-config-files.inc b/recipes-core/stx-integ-puppet/stx-integ-config-files.inc new file mode 100644 index 0000000..35e3e9a --- /dev/null +++ b/recipes-core/stx-integ-puppet/stx-integ-config-files.inc @@ -0,0 +1,2 @@ +inherit externalsrc +EXTERNALSRC_pn-${PN}="${EXTERNALREPO}/stx-integ/" diff --git a/recipes-core/stx-metal/files/0001-Use-LDFLAGS-when-linking-and-pass-flags-down-to-subm.patch b/recipes-core/stx-metal/files/0001-Use-LDFLAGS-when-linking-and-pass-flags-down-to-subm.patch new file mode 100644 index 0000000..91cd83e --- /dev/null +++ b/recipes-core/stx-metal/files/0001-Use-LDFLAGS-when-linking-and-pass-flags-down-to-subm.patch @@ -0,0 +1,199 @@ +From 0db72ac0c57a9f15ae6999e4ccf85a9db1e752fd Mon Sep 17 00:00:00 2001 +From: babak sarashki +Date: Thu, 27 Jun 2019 22:25:15 -0700 +Subject: [PATCH] Use LDFLAGS when linking and pass flags down to submakes + +--- + mtce/src/Makefile | 27 +++++++++++++++------------ + mtce/src/alarm/Makefile | 2 +- + mtce/src/fsmon/Makefile | 2 +- + mtce/src/fsync/Makefile | 2 +- + mtce/src/heartbeat/Makefile | 7 +++++-- + mtce/src/hostw/Makefile | 2 +- + mtce/src/hwmon/Makefile | 2 +- + mtce/src/lmon/Makefile | 2 +- + mtce/src/maintenance/Makefile | 4 ++-- + mtce/src/mtclog/Makefile | 2 +- + mtce/src/pmon/Makefile | 2 +- + 11 files changed, 30 insertions(+), 24 deletions(-) + +diff --git a/mtce/src/Makefile b/mtce/src/Makefile +index a9ec0e2..8c256f1 100755 +--- a/mtce/src/Makefile ++++ b/mtce/src/Makefile +@@ -8,18 +8,21 @@ VER=1 + VER_MJR=1 + + build: +- (cd public ; make lib VER=$(VER) VER_MJR=$(VER_MJR)) +- (cd common ; make lib VER=$(VER) VER_MJR=$(VER_MJR)) +- (cd alarm ; make build VER=$(VER) VER_MJR=$(VER_MJR)) +- (cd heartbeat ; make build VER=$(VER) VER_MJR=$(VER_MJR)) +- (cd maintenance ; make build VER=$(VER) VER_MJR=$(VER_MJR)) +- (cd hwmon ; make build VER=$(VER) VER_MJR=$(VER_MJR)) +- (cd mtclog ; make build VER=$(VER) VER_MJR=$(VER_MJR)) +- (cd lmon ; make build VER=$(VER) VER_MJR=$(VER_MJR)) +- (cd pmon ; make build VER=$(VER) VER_MJR=$(VER_MJR)) +- (cd fsmon ; make build VER=$(VER) VER_MJR=$(VER_MJR)) +- (cd hostw ; make build VER=$(VER) VER_MJR=$(VER_MJR)) +- (cd fsync ; make build VER=$(VER) VER_MJR=$(VER_MJR)) ++ ( \ ++ cd public;\ ++ make -e CCFLAGS="$(CCFLAGS) -fPIC" LDFLAGS="$(LDFLAGS) -shared" INCLUDES="$(INCLUDES)" lib VER=$(VER) VER_MJR=$(VER_MJR) \ ++ ) ++ (cd common ; make -e LDFLAGS="$(LDFLAGS)" CCFLAGS="$(CCFLAGS)" INCLUDES="$(INCLUDES)" lib VER=$(VER) VER_MJR=$(VER_MJR)) ++ (cd alarm ; make -e LDFLAGS="$(LDFLAGS)" CCFLAGS="$(CCFLAGS)" INCLUDES="$(INCLUDES)" build VER=$(VER) VER_MJR=$(VER_MJR)) ++ (cd heartbeat ; make -e LDFLAGS="$(LDFLAGS)" CCFLAGS="$(CCFLAGS)" INCLUDES="$(INCLUDES)" build VER=$(VER) VER_MJR=$(VER_MJR)) ++ (cd maintenance ; make -e LDFLAGS="$(LDFLAGS)" CCFLAGS="$(CCFLAGS)" INCLUDES="$(INCLUDES)" build VER=$(VER) VER_MJR=$(VER_MJR)) ++ (cd hwmon ; make -e LDFLAGS="$(LDFLAGS)" CCFLAGS="$(CCFLAGS)" INCLUDES="$(INCLUDES)" build VER=$(VER) VER_MJR=$(VER_MJR)) ++ (cd mtclog ; make -e LDFLAGS="$(LDFLAGS)" CCFLAGS="$(CCFLAGS)" INCLUDES="$(INCLUDES)" build VER=$(VER) VER_MJR=$(VER_MJR)) ++ (cd lmon ; make -e LDFLAGS="$(LDFLAGS)" CCFLAGS="$(CCFLAGS)" INCLUDES="$(INCLUDES)" build VER=$(VER) VER_MJR=$(VER_MJR)) ++ (cd pmon ; make -e LDFLAGS="$(LDFLAGS)" CCFLAGS="$(CCFLAGS)" INCLUDES="$(INCLUDES)" build VER=$(VER) VER_MJR=$(VER_MJR)) ++ (cd fsmon ; make -e LDFLAGS="$(LDFLAGS)" CCFLAGS="$(CCFLAGS)" INCLUDES="$(INCLUDES)" build VER=$(VER) VER_MJR=$(VER_MJR)) ++ (cd hostw ; make -e LDFLAGS="$(LDFLAGS)" CCFLAGS="$(CCFLAGS)" INCLUDES="$(INCLUDES)" build VER=$(VER) VER_MJR=$(VER_MJR)) ++ (cd fsync ; make -e LDFLAGS="$(LDFLAGS)" CCFLAGS="$(CCFLAGS)" INCLUDES="$(INCLUDES)" build VER=$(VER) VER_MJR=$(VER_MJR)) + + clean: + @( cd common ; make clean ) +diff --git a/mtce/src/alarm/Makefile b/mtce/src/alarm/Makefile +index a27b0fb..cff233c 100755 +--- a/mtce/src/alarm/Makefile ++++ b/mtce/src/alarm/Makefile +@@ -43,7 +43,7 @@ library: + ar rcs libalarm.a alarm.o $(EXTRAARFLAGS) + + process: $(OBJS) +- $(CXX) $(CCFLAGS) ${OBJS} -L../daemon -L../common $(LDLIBS) $(EXTRALDFLAGS) -o mtcalarmd ++ $(CXX) $(CCFLAGS) $(LDFLAGS) ${OBJS} -L../daemon -L../common $(LDLIBS) $(EXTRALDFLAGS) -o mtcalarmd + + clean_bins: + @rm -v -f $(BINS) +diff --git a/mtce/src/fsmon/Makefile b/mtce/src/fsmon/Makefile +index b53cce0..33256ab 100644 +--- a/mtce/src/fsmon/Makefile ++++ b/mtce/src/fsmon/Makefile +@@ -28,7 +28,7 @@ else + endif + + build: clean static_analysis $(OBJS) +- $(CXX) $(CCFLAGS) $(OBJS) -L../daemon -L../common $(LDLIBS) $(EXTRALDFLAGS) -o fsmond ++ $(CXX) $(CCFLAGS) $(LDFLAGS) $(OBJS) -L../daemon -L../common $(LDLIBS) $(EXTRALDFLAGS) -o fsmond + + common: + ( cd ../common ; make clean ; make lib VER=$(VER) VER_MJR=$(VER_MJR)) +diff --git a/mtce/src/fsync/Makefile b/mtce/src/fsync/Makefile +index b041f15..85c1543 100644 +--- a/mtce/src/fsync/Makefile ++++ b/mtce/src/fsync/Makefile +@@ -16,7 +16,7 @@ all: build + $(CC) $(INCLUDES) $(CCFLAGS) $(EXTRACCFLAGS) -c $< -o $@ + + build: $(OBJS) +- $(CC) $(OBJS) $(LDLIBS) -o fsync ++ $(CC) $(CCFLAGS) $(LDFLAGS) $(OBJS) $(LDLIBS) -o fsync + + clean: + @rm -v -f $(OBJS) fsync +diff --git a/mtce/src/heartbeat/Makefile b/mtce/src/heartbeat/Makefile +index a625f20..b8deda7 100755 +--- a/mtce/src/heartbeat/Makefile ++++ b/mtce/src/heartbeat/Makefile +@@ -33,8 +33,11 @@ endif + all: static_analysis common agent client + + build: static_analysis $(OBJS) +- $(CXX) $(CCFLAGS) hbsAlarm.o hbsAgent.o hbsUtil.o hbsCluster.o hbsStubs.o ../common/nodeClass.o -L../public -L../alarm $(LDLIBS) $(EXTRALDFLAGS) -o hbsAgent +- $(CXX) $(CCFLAGS) hbsClient.o hbsPmon.o hbsUtil.o -L../public -L../alarm $(LDLIBS) $(EXTRALDFLAGS) -o hbsClient ++ $(CXX) $(CCFLAGS) $(LDFLAGS) \ ++ hbsAlarm.o hbsAgent.o hbsUtil.o hbsCluster.o hbsStubs.o ../common/nodeClass.o -L../public -L../alarm \ ++ $(LDLIBS) $(EXTRALDFLAGS) -o hbsAgent ++ ++ $(CXX) $(CCFLAGS) $(LDFLAGS) hbsClient.o hbsPmon.o hbsUtil.o -L../public -L../alarm $(LDLIBS) $(EXTRALDFLAGS) -o hbsClient + + common: + ( cd ../common ; make clean ; make lib VER=$(VER) VER_MJR=$(VER_MJR)) +diff --git a/mtce/src/hostw/Makefile b/mtce/src/hostw/Makefile +index d72708c..af18059 100755 +--- a/mtce/src/hostw/Makefile ++++ b/mtce/src/hostw/Makefile +@@ -28,7 +28,7 @@ else + endif + + build: clean static_analysis $(OBJS) +- $(CXX) $(CCFLAGS) $(OBJS) -L../daemon -L../common $(LDLIBS) $(EXTRALDFLAGS) -o hostwd ++ $(CXX) $(CCFLAGS) $(LDFLAGS) $(OBJS) -L../daemon -L../common $(LDLIBS) $(EXTRALDFLAGS) -o hostwd + + common: + ( cd ../common ; make clean ; make -j1 lib VER=$(VER) VER_MJR=$(VER_MJR)) +diff --git a/mtce/src/hwmon/Makefile b/mtce/src/hwmon/Makefile +index 6d7cee3..c168c43 100644 +--- a/mtce/src/hwmon/Makefile ++++ b/mtce/src/hwmon/Makefile +@@ -45,7 +45,7 @@ else + endif + + build: clean static_analysis $(OBJS) +- $(CXX) $(CCFLAGS) $(OBJS) -L../daemon -L../common $(LDLIBS) $(EXTRALDFLAGS) -o $(BIN) ++ $(CXX) $(CCFLAGS) $(LDFLAGS) $(OBJS) -L../daemon -L../common $(LDLIBS) $(EXTRALDFLAGS) -o $(BIN) + + common: + ( cd ../common ; make lib VER=$(VER) VER_MJR=$(VER_MJR)) +diff --git a/mtce/src/lmon/Makefile b/mtce/src/lmon/Makefile +index 9e328a4..a1a8519 100755 +--- a/mtce/src/lmon/Makefile ++++ b/mtce/src/lmon/Makefile +@@ -29,7 +29,7 @@ else + endif + + build: clean static_analysis $(OBJS) +- $(CXX) $(CCFLAGS) $(OBJS) $(LDPATH) $(LDLIBS) $(EXTRALDFLAGS) -o lmond ++ $(CXX) $(CCFLAGS) $(LDFLAGS) $(OBJS) $(LDPATH) $(LDLIBS) $(EXTRALDFLAGS) -o lmond + + clean: + @rm -v -f $(OBJ) lmond *.o *.a +diff --git a/mtce/src/maintenance/Makefile b/mtce/src/maintenance/Makefile +index 85c2db6..e6a8892 100755 +--- a/mtce/src/maintenance/Makefile ++++ b/mtce/src/maintenance/Makefile +@@ -77,10 +77,10 @@ common: + ( cd ../common ; make clean ; make lib VER=$(VER) VER_MJR=$(VER_MJR)) + + mtcAgent: $(OBJS) +- $(CXX) $(CONTROL_OBJS) -L../public -L../alarm $(LDLIBS) $(EXTRALDFLAGS) -o mtcAgent ++ $(CXX) $(CCFLAGS) $(LDFLAGS) $(CONTROL_OBJS) -L../public -L../alarm $(LDLIBS) $(EXTRALDFLAGS) -o mtcAgent + + mtcClient: $(OBJS) +- $(CXX) $(COMPUTE_OBJS) -L../public -L../alarm $(LDLIBS) $(EXTRALDFLAGS) -o mtcClient ++ $(CXX) $(CCFLAGS) $(LDFLAGS) $(COMPUTE_OBJS) -L../public -L../alarm $(LDLIBS) $(EXTRALDFLAGS) -o mtcClient + + remove_bins: + @rm -v -f $(BINS) +diff --git a/mtce/src/mtclog/Makefile b/mtce/src/mtclog/Makefile +index 1d49aa4..fb513d9 100644 +--- a/mtce/src/mtclog/Makefile ++++ b/mtce/src/mtclog/Makefile +@@ -30,7 +30,7 @@ else + endif + + build: clean static_analysis $(OBJS) +- $(CXX) $(CCFLAGS) $(OBJS) -L../daemon -L../common $(LDLIBS) $(EXTRALDFLAGS) -o mtclogd ++ $(CXX) $(CCFLAGS) $(LDFLAGS) $(OBJS) -L../daemon -L../common $(LDLIBS) $(EXTRALDFLAGS) -o mtclogd + + common: + ( cd ../common ; make clean ; make lib VER=$(VER) VER_MJR=$(VER_MJR)) +diff --git a/mtce/src/pmon/Makefile b/mtce/src/pmon/Makefile +index f75f2be..c34e204 100755 +--- a/mtce/src/pmon/Makefile ++++ b/mtce/src/pmon/Makefile +@@ -29,7 +29,7 @@ else + endif + + build: clean static_analysis $(OBJS) +- $(CXX) $(CCFLAGS) $(OBJS) -L../daemon -L../common $(LDLIBS) $(EXTRALDFLAGS) -o pmond ++ $(CXX) $(CCFLAGS) $(LDFLAGS) $(OBJS) -L../daemon -L../common $(LDLIBS) $(EXTRALDFLAGS) -o pmond + + common: + ( cd ../common ; make clean ; make lib VER=$(VER) VER_MJR=$(VER_MJR)) +-- +2.17.1 + diff --git a/recipes-core/stx-metal/files/0001-Use-snprintf-to-avoid-overflowing-amon.tx_buf.patch b/recipes-core/stx-metal/files/0001-Use-snprintf-to-avoid-overflowing-amon.tx_buf.patch new file mode 100644 index 0000000..6afb971 --- /dev/null +++ b/recipes-core/stx-metal/files/0001-Use-snprintf-to-avoid-overflowing-amon.tx_buf.patch @@ -0,0 +1,26 @@ +From 3060369f60b2dc9e6d138cabd18d7f206c7bb0f5 Mon Sep 17 00:00:00 2001 +From: babak sarashki +Date: Thu, 27 Jun 2019 21:40:34 -0700 +Subject: [PATCH] Use snprintf to avoid overflowing amon.tx_buf + +--- + mtce/src/public/amon.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/mtce/src/public/amon.c b/mtce/src/public/amon.c +index b9146a2..941f905 100644 +--- a/mtce/src/public/amon.c ++++ b/mtce/src/public/amon.c +@@ -257,7 +257,8 @@ int active_monitor_dispatch ( void ) + } + + memset ( amon.tx_buf, 0 , AMON_MAX_LEN ); +- sprintf( amon.tx_buf, "%s %8x %d%c", str, magic, seq, '\0' ); ++ if (snprintf( amon.tx_buf, AMON_MAX_LEN, "%s %8x %d%c", str, magic, seq, '\0' ) < 0) ++ fprintf(stderr,"%s:%d amon.txbuf overflow detected!\n", __func__, __LINE__); + + if ( strcmp ( str, amon.name ) ) + { +-- +2.17.1 + diff --git a/recipes-core/stx-metal/files/0001-mtce-compute-dont-install-empty-directory-unless-nee.patch b/recipes-core/stx-metal/files/0001-mtce-compute-dont-install-empty-directory-unless-nee.patch new file mode 100644 index 0000000..37b2456 --- /dev/null +++ b/recipes-core/stx-metal/files/0001-mtce-compute-dont-install-empty-directory-unless-nee.patch @@ -0,0 +1,24 @@ +From 90d95ca75997a935587ff3c774d0f5375c3f505a Mon Sep 17 00:00:00 2001 +From: babak sarashki +Date: Tue, 9 Jul 2019 12:42:53 -0700 +Subject: [PATCH] mtce-compute dont install empty directory unless needed + +--- + mtce-compute/src/Makefile | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/mtce-compute/src/Makefile b/mtce-compute/src/Makefile +index 9aea4b0..ed9a8a9 100755 +--- a/mtce-compute/src/Makefile ++++ b/mtce-compute/src/Makefile +@@ -16,7 +16,6 @@ install: + # # Compute-Only Init Scripts (source group x) + install -m 755 -p -D scripts/$(SOURCE1) $(buildroot)/$(_sysconfdir)/init.d/goenabledWorker + # # Compute-Only Process Monitor Config files (source group 1x) +- install -m 755 -d $(buildroot)/$(local_etc_pmond) + # # Compute-Only Go Enabled Test (source group 2x) + install -m 755 -d $(buildroot)/$(local_etc_goenabledd) + install -m 755 -p -D scripts/$(SOURCE22) $(buildroot)/$(local_etc_goenabledd)/virt-support-goenabled.sh +-- +2.17.1 + diff --git a/recipes-core/stx-metal/files/0001-mtce-control-dont-install-empty-directory-unless-nee.patch b/recipes-core/stx-metal/files/0001-mtce-control-dont-install-empty-directory-unless-nee.patch new file mode 100644 index 0000000..bb84cfd --- /dev/null +++ b/recipes-core/stx-metal/files/0001-mtce-control-dont-install-empty-directory-unless-nee.patch @@ -0,0 +1,23 @@ +From e00a8a4ad31c696d2f5dc866f178af0a9f987c12 Mon Sep 17 00:00:00 2001 +From: babak sarashki +Date: Tue, 9 Jul 2019 13:35:35 -0700 +Subject: [PATCH] mtce-control dont install empty directory unless needed + +--- + mtce-control/src/Makefile | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/mtce-control/src/Makefile b/mtce-control/src/Makefile +index aaa3de7..cb225ce 100755 +--- a/mtce-control/src/Makefile ++++ b/mtce-control/src/Makefile +@@ -27,6 +27,3 @@ install: + # Controller-Only Heartbeat Service file + install -m 644 -p -D scripts/$(SOURCE5) $(buildroot)/$(_unitdir)/hbsAgent.service + +- # Controller-Only Go Enabled Test +- install -m 755 -d $(buildroot)/$(local_etc_goenabledd) +- +-- +2.17.1 + diff --git a/recipes-core/stx-metal/files/0001-mtce-storage-dont-install-empty-directory-unless-nee.patch b/recipes-core/stx-metal/files/0001-mtce-storage-dont-install-empty-directory-unless-nee.patch new file mode 100644 index 0000000..454827a --- /dev/null +++ b/recipes-core/stx-metal/files/0001-mtce-storage-dont-install-empty-directory-unless-nee.patch @@ -0,0 +1,31 @@ +From 5d180eb6a5b60d75b4b8ba5af265fc973b6776ca Mon Sep 17 00:00:00 2001 +From: babak sarashki +Date: Tue, 9 Jul 2019 13:51:46 -0700 +Subject: [PATCH] mtce-storage dont install empty directory unless needed + +--- + mtce-storage/src/Makefile | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/mtce-storage/src/Makefile b/mtce-storage/src/Makefile +index 842a76c..85c14e0 100755 +--- a/mtce-storage/src/Makefile ++++ b/mtce-storage/src/Makefile +@@ -12,11 +12,11 @@ install: + # Storage-Only Init Scripts + install -m 755 -p -D scripts/$(SOURCE1) $(buildroot)/$(_sysconfdir)/init.d/goenabledStorage + # Storage-Only Process Monitor Config files +- install -m 755 -d $(buildroot)/$(local_etc_pmond) ++ # install -m 755 -d $(buildroot)/$(local_etc_pmond) + # Storage-Only Go Enabled Tests +- install -m 755 -d $(buildroot)/$(local_etc_goenabledd) ++ # install -m 755 -d $(buildroot)/$(local_etc_goenabledd) + # Storage-Only Services +- install -m 755 -d $(buildroot)/$(local_etc_servicesd)/storage ++ # install -m 755 -d $(buildroot)/$(local_etc_servicesd)/storage + # Install systemd dir + install -m 644 -p -D scripts/$(SOURCE2) $(buildroot)/$(_unitdir)/goenabled-storage.service + # for license +-- +2.17.1 + diff --git a/recipes-core/stx-metal/inventory.bb b/recipes-core/stx-metal/inventory.inc similarity index 62% rename from recipes-core/stx-metal/inventory.bb rename to recipes-core/stx-metal/inventory.inc index ea867c9..d4bd7df 100644 --- a/recipes-core/stx-metal/inventory.bb +++ b/recipes-core/stx-metal/inventory.inc @@ -1,39 +1,23 @@ -DESCRIPTION = "inventory" +PACKAGES += " inventory" -STABLE = "starlingx/master" -PROTOCOL = "https" -BRANCH = "master" -SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4" -S = "${WORKDIR}/git" -PV = "19.05" +#DEPENDS = " \ +# python \ +# python-pbr-native \ +# " -LICENSE = "Apache-2.0" +RDEPENDS_inventory += " bash" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}" - -require stx-metal.inc -inherit setuptools - - -DEPENDS = " \ - python \ - python-pbr-native \ - " -RDEPENDS_${PN}_append = " bash" - -do_configure () { +do_configure_prepend () { cd ${S}/inventory/inventory distutils_do_configure } -do_compile() { +do_compile_prepend () { cd ${S}/inventory/inventory distutils_do_compile } -do_install () { +do_install_prepend () { cd ${S}/inventory/inventory distutils_do_install @@ -58,9 +42,24 @@ do_install () { } -#pkg_postinst_ontarget_${PN} () { +#pkg_postinst_ontarget_inventory () { # install default config files #cd ${_builddir}/${name}-${version} && oslo-config-generator --config-file inventory/config-generator.conf --output-file ${_builddir}/${name}-${version}/inventory.conf.sample #} -FILES_${PN}_append += " ${systemd_unitdir}/* " +FILES_inventory = " \ + ${systemd_system_unitdir}/inventory-api.service \ + ${systemd_system_unitdir}/inventory-conductor.service \ + ${bindir}/inventory-api \ + ${bindir}/inventory-conductor \ + ${bindir}/inventory-dnsmasq-lease-update \ + ${bindir}/inventory-agent \ + ${bindir}/inventory-dbsync \ + ${libdir}/ocf/resource.d/platform/inventory-api \ + ${libdir}/ocf/resource.d/platform/inventory-conductor \ + ${libdir}/python2.7/site-packages/inventory*.egg-info/ \ + ${libdir}/python2.7/site-packages/inventory/ \ + ${sysconfdir}/goenabled.d/inventory_goenabled_check.sh \ + ${sysconfdir}/motd.d/10-system-config \ + ${sysconfdir}/inventory/policy.json \ + " diff --git a/recipes-core/stx-metal/mtce-common.bb b/recipes-core/stx-metal/mtce-common.inc similarity index 51% rename from recipes-core/stx-metal/mtce-common.bb rename to recipes-core/stx-metal/mtce-common.inc index 735a89e..fe65c09 100644 --- a/recipes-core/stx-metal/mtce-common.bb +++ b/recipes-core/stx-metal/mtce-common.inc @@ -1,54 +1,25 @@ -DESCRIPTION = "mtce-common" +PACKAGES += " mtce-common" -STABLE = "starlingx/master" -PROTOCOL = "https" -BRANCH = "master" -SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4" -S = "${WORKDIR}/git" -PV = "19.05" - -LICENSE = "Apache-2.0" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}" - -require stx-metal.inc - - -DEPENDS = " \ - fm-common \ - openssl \ - libevent \ - json-c \ - " -RDEPENDS_${PN}_append = " " - -do_configure () { +do_configure_prepend () { : } -do_compile() { +do_compile_prepend () { cd ${S}/mtce-common/src/ oe_runmake clean oe_runmake -e build VER=0 VER_MJR=1 \ CCFLAGS="${CXXFLAGS} -DBUILDINFO=\"\\\"\$\$(date)\\\"\"" } -do_install () { +do_install_prepend () { cd ${S}/mtce-common/src/daemon install -m 755 -d ${D}/${libdir} install -m 755 -d ${D}/${includedir}/mtce-daemon install -m 644 -p -D libdaemon.a ${D}/${libdir} # TODO: -# See next TODO on line 64 about mtce-common. Same is true -# for mtce-daemon. We need pkgconfig files and then rewrite -# the packages Makefiles. -# -# install -m 644 -p -D daemon_ini.h ${D}/${includedir}/mtce-daemon -# install -m 644 -p -D daemon_common.h ${D}/${includedir}/mtce-daemon -# install -m 644 -p -D daemon_option.h ${D}/${includedir}/mtce-daemon +# See next TODO about mtce-common. Same is true for mtce-daemon. +# We need pkgconfig files and then rewrite the packages Makefiles. # install -m 644 -p -D daemon_ini.h ${D}/${includedir} install -m 644 -p -D daemon_common.h ${D}/${includedir} @@ -74,29 +45,6 @@ do_install () { # The correct fix is to generate pkg_config files which then the # Makefiles can query for the c and ld flags. # -# install -m 644 -p -D fitCodes.h ${D}/${includedir}/mtce-common -# install -m 644 -p -D logMacros.h ${D}/${includedir}/mtce-common -# install -m 644 -p -D returnCodes.h ${D}/${includedir}/mtce-common -# install -m 644 -p -D nodeTimers.h ${D}/${includedir}/mtce-common -# install -m 644 -p -D hostClass.h ${D}/${includedir}/mtce-common -# install -m 644 -p -D httpUtil.h ${D}/${includedir}/mtce-common -# install -m 644 -p -D jsonUtil.h ${D}/${includedir}/mtce-common -# install -m 644 -p -D msgClass.h ${D}/${includedir}/mtce-common -# install -m 644 -p -D nodeBase.h ${D}/${includedir}/mtce-common -# install -m 644 -p -D nodeEvent.h ${D}/${includedir}/mtce-common -# install -m 644 -p -D nodeMacro.h ${D}/${includedir}/mtce-common -# install -m 644 -p -D nodeUtil.h ${D}/${includedir}/mtce-common -# install -m 644 -p -D timeUtil.h ${D}/${includedir}/mtce-common -# install -m 644 -p -D alarmUtil.h ${D}/${includedir}/mtce-common -# install -m 644 -p -D hostUtil.h ${D}/${includedir}/mtce-common -# install -m 644 -p -D ipmiUtil.h ${D}/${includedir}/mtce-common -# install -m 644 -p -D nlEvent.h ${D}/${includedir}/mtce-common -# install -m 644 -p -D pingUtil.h ${D}/${includedir}/mtce-common -# install -m 644 -p -D regexUtil.h ${D}/${includedir}/mtce-common -# install -m 644 -p -D threadUtil.h ${D}/${includedir}/mtce-common -# install -m 644 -p -D tokenUtil.h ${D}/${includedir}/mtce-common -# install -m 644 -p -D secretUtil.h ${D}/${includedir}/mtce-common - install -m 644 -p -D fitCodes.h ${D}/${includedir}/ install -m 644 -p -D logMacros.h ${D}/${includedir}/ @@ -122,6 +70,9 @@ do_install () { install -m 644 -p -D secretUtil.h ${D}/${includedir}/ } -#pkg_postinst_ontarget_${PN} () { } +pkg_postinst_ontarget_mtce-common_prepend () { +} -FILES_${PN}_append += " " +# Headers, and static devs go into stx-mtce-dev +# and stx-mtce-staticdev packages respecitively +FILES_mtce-common = " " diff --git a/recipes-core/stx-metal/mtce-compute.bb b/recipes-core/stx-metal/mtce-compute.bb deleted file mode 100644 index 275e5c9..0000000 --- a/recipes-core/stx-metal/mtce-compute.bb +++ /dev/null @@ -1,47 +0,0 @@ -DESCRIPTION = "mtce-compute" - -STABLE = "starlingx/master" -PROTOCOL = "https" -BRANCH = "master" -SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4" -S = "${WORKDIR}/git" -PV = "19.05" - -LICENSE = "Apache-2.0" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}" - -require stx-metal.inc - - -DEPENDS = " " -RDEPENDS_${PN}_append = " bash" - -do_configure () { - : -} - -do_compile() { - : -} - -do_install () { - cd ${S}/mtce-compute/src/ - oe_runmake buildroot=${D} \ - _sysconfdir=${sysconfdir} _unitdir=${systemd_system_unitdir} _datarootdir=${datadir} \ - install - -} - -pkg_postinst_ontarget_${PN} () { - /bin/systemctl enable goenabled-worker.service - /bin/systemctl enable qemu_clean.service - -} - -FILES_${PN}_append = " \ - ${systemd_unitdir} \ - ${datadir} \ - " diff --git a/recipes-core/stx-metal/mtce-compute.inc b/recipes-core/stx-metal/mtce-compute.inc new file mode 100644 index 0000000..cd670b8 --- /dev/null +++ b/recipes-core/stx-metal/mtce-compute.inc @@ -0,0 +1,31 @@ +PACKAGES += " mtce-compute" + +RDEPENDS_mtce-compute_append = " bash" + +do_configure_prepend () { + : +} + +do_compile_prepend () { + : +} + +do_install_prepend () { + cd ${S}/mtce-compute/src/ + oe_runmake buildroot=${D} \ + _sysconfdir=${sysconfdir} _unitdir=${systemd_system_unitdir} _datarootdir=${datadir} \ + install +} + +pkg_postinst_ontarget_mtce-compute_prepend () { + /bin/systemctl enable goenabled-worker.service + /bin/systemctl enable qemu_clean.service + +} + +FILES_mtce-compute = " \ + ${datadir}/licenses/mtce-compute-1.0/LICENSE \ + ${systemd_system_unitdir}/goenabled-worker.service \ + ${sysconfdir}/goenabled.d/virt-support-goenabled.sh \ + ${sysconfdir}/init.d/goenabledWorker \ + " diff --git a/recipes-core/stx-metal/mtce-control.bb b/recipes-core/stx-metal/mtce-control.bb deleted file mode 100644 index 03816a1..0000000 --- a/recipes-core/stx-metal/mtce-control.bb +++ /dev/null @@ -1,47 +0,0 @@ -DESCRIPTION = "mtce-control" - -STABLE = "starlingx/master" -PROTOCOL = "https" -BRANCH = "master" -SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4" -S = "${WORKDIR}/git" -PV = "19.05" - -LICENSE = "Apache-2.0" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}" - -require stx-metal.inc - - -DEPENDS = " " -RDEPENDS_${PN}_append = " bash" - -do_configure () { - : -} - -do_compile() { - : -} - -do_install () { - cd ${S}/mtce-control/src/ - oe_runmake buildroot=${D} \ - _sysconfdir=${sysconfdir} _unitdir=${systemd_system_unitdir} _datarootdir=${datadir} \ - install - -} - -pkg_postinst_ontarget_${PN} () { - /bin/systemctl enable lighttpd.service - /bin/systemctl enable qemu_clean.service - /bin/systemctl enable hbsAgent.service -} - -FILES_${PN}_append = " \ - ${systemd_unitdir} \ - ${datadir} \ - " diff --git a/recipes-core/stx-metal/mtce-control.inc b/recipes-core/stx-metal/mtce-control.inc new file mode 100644 index 0000000..e330676 --- /dev/null +++ b/recipes-core/stx-metal/mtce-control.inc @@ -0,0 +1,33 @@ +PACKAGES += " mtce-control" + +RDEPENDS_mtce-control_append = " bash" + +do_configure_prepend () { + : +} + +do_compile_prepend () { + : +} + +do_install_prepend () { + cd ${S}/mtce-control/src/ + oe_runmake buildroot=${D} \ + _sysconfdir=${sysconfdir} _unitdir=${systemd_system_unitdir} _datarootdir=${datadir} \ + install + +} + +pkg_postinst_ontarget_mtce-control_prepend () { + /bin/systemctl enable lighttpd.service + /bin/systemctl enable qemu_clean.service + /bin/systemctl enable hbsAgent.service +} + +FILES_mtce-control = " \ + ${datadir}/licenses/mtce-control-1.0/LICENSE \ + ${systemd_system_unitdir}/hbsAgent.service \ + ${sysconfdir}/pmon.d/hbsAgent.conf \ + ${sysconfdir}/init.d/hbsAgent \ + ${sysconfdir}/init.d/goenabledControl \ + " diff --git a/recipes-core/stx-metal/mtce-storage.bb b/recipes-core/stx-metal/mtce-storage.bb deleted file mode 100644 index efbe61e..0000000 --- a/recipes-core/stx-metal/mtce-storage.bb +++ /dev/null @@ -1,45 +0,0 @@ -DESCRIPTION = "mtce-compute" - -STABLE = "starlingx/master" -PROTOCOL = "https" -BRANCH = "master" -SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4" -S = "${WORKDIR}/git" -PV = "19.05" - -LICENSE = "Apache-2.0" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}" - -require stx-metal.inc - - -DEPENDS = " " -RDEPENDS_${PN}_append = " bash" - -do_configure () { - : -} - -do_compile() { - : -} - -do_install () { - cd ${S}/mtce-storage/src/ - oe_runmake buildroot=${D} \ - _sysconfdir=${sysconfdir} _unitdir=${systemd_system_unitdir} _datarootdir=${datadir} \ - install - -} - -pkg_postinst_ontarget_${PN} () { - /bin/systemctl enable goenabled-storage.service -} - -FILES_${PN}_append = " \ - ${systemd_unitdir} \ - ${datadir} \ - " diff --git a/recipes-core/stx-metal/mtce-storage.inc b/recipes-core/stx-metal/mtce-storage.inc new file mode 100644 index 0000000..8a20ced --- /dev/null +++ b/recipes-core/stx-metal/mtce-storage.inc @@ -0,0 +1,29 @@ +PACKAGES += " mtce-storage" + +RDEPENDS_mtce-storage_append = " bash" + +do_configure_prepend () { + : +} + +do_compile_prepend () { + : +} + +do_install_prepend () { + cd ${S}/mtce-storage/src/ + oe_runmake buildroot=${D} \ + _sysconfdir=${sysconfdir} _unitdir=${systemd_system_unitdir} _datarootdir=${datadir} \ + install + +} + +pkg_postinst_ontarget_mtce-storage_prepend () { + /bin/systemctl enable goenabled-storage.service +} + +FILES_mtce-storage = " \ + ${datadir}/licenses/mtce-storage-1.0/LICENSE \ + ${systemd_system_unitdir}/goenabled-storage.service \ + ${sysconfdir}/init.d/goenabledStorage \ + " diff --git a/recipes-core/stx-metal/mtce.bb b/recipes-core/stx-metal/mtce.inc similarity index 72% rename from recipes-core/stx-metal/mtce.bb rename to recipes-core/stx-metal/mtce.inc index 2faa461..6f6fedb 100644 --- a/recipes-core/stx-metal/mtce.bb +++ b/recipes-core/stx-metal/mtce.inc @@ -1,38 +1,27 @@ -DESCRIPTION = "mtce" +PACKAGES += " mtce" -STABLE = "starlingx/master" -PROTOCOL = "https" -BRANCH = "master" -SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4" -S = "${WORKDIR}/git" -PV = "19.05" +#DEPENDS = " \ +# mtce-common \ +# " +# +RDEPENDS_mtce_append = " bash" +# -LICENSE = "Apache-2.0" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}" - -require stx-metal.inc - -DEPENDS = " \ - mtce-common \ - " - -RDEPENDS_${PN}_append = " bash" - -do_configure () { +do_configure_prepend () { : } -do_compile() { +do_compile_prepend () { cd ${S}/mtce/src/ oe_runmake -e VER=1 VER_MJR=1 INCLUDES=" -I. -I../alarm -I../heartbeat -I../maintenance \ - -I../hostw -I../public -I../smash -I../common -I../hwmon" \ - CCFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" build + -I../hostw -I../public -I../smash -I../common -I../hwmon \ + -I${S}/mtce-common/src/common \ + -I${S}/mtce-common/src/daemon " \ + CCFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS} -L${S}/mtce-common/src/common \ + -L${S}/mtce-common/src/daemon " build } -do_install () { +do_install_prepend () { # TODO: # Really need to fix the package;s Makefile @@ -45,7 +34,6 @@ do_install () { install -m 755 -d ${D}/${sysconfdir} install -m 755 -d ${D}/${sysconfdir}/mtc/tmp - install -m 755 -d ${D}/${sysconfdir}/goenabled.d install -m 755 -d ${D}/${sysconfdir}/bmc/server_profiles.d install -m 755 -d ${D}/${sysconfdir}/init.d install -m 755 -d ${D}/${sysconfdir}/pmon.d @@ -56,10 +44,6 @@ do_install () { install -m 755 -d ${D}/${sysconfdir}/serverices.d/worker install -m 755 -d ${D}/${sysconfdir}/serverices.d/storage - install -m 755 -d ${D}/var - install -m 755 -d ${D}/var/run - - cd ${S}/mtce/src/ install -m 644 -p -D scripts/mtcAgent ${D}/${libdir}/ocf/resource.d/platform install -m 755 -p -D hwmon/scripts/ocf/hwmon ${D}/${libdir}/ocf/resource.d/platform @@ -172,18 +156,88 @@ do_install () { install -m 755 -p -D public/libamon.so.1 ${D}/${libdir}/ #cd ${D}/%{_libdir} ; ln -s libamon.so.$MAJOR libamon.so.$MAJOR.$MINOR #cd ${D}/%{_libdir} ; ln -s libamon.so.$MAJOR libamon.so - } -pkg_postinst_ontarget_${PN} () { +pkg_postinst_ontarget_mtce_prepend () { /bin/systemctl enable lighttpd.service /bin/systemctl enable qemu_clean.service /bin/systemctl enable hbsAgent.service } -FILES_${PN}_append = " \ - /run \ - ${libdir} \ - ${systemd_unitdir} \ - ${datadir} \ +FILES_mtce = " \ + ${bindir}/lmond \ + ${bindir}/hostwd \ + ${bindir}/hwmond \ + ${bindir}/mtcAgent \ + ${bindir}/mtcClient \ + ${bindir}/fsmond \ + ${bindir}/hbsAgent \ + ${bindir}/wipedisk \ + ${bindir}/hbsClient \ + ${bindir}/mtcalarmd \ + ${bindir}/pmond \ + ${bindir}/mtclogd \ + ${sbindir}/pmon-stop \ + ${sbindir}/fsync \ + ${sbindir}/dmemchk.sh \ + ${sbindir}/pmon-restart \ + ${sbindir}/pmon-start \ + ${libdir}/ocf/resource.d/platform/mtcAgent \ + ${libdir}/ocf/resource.d/platform/hwmon \ + ${libdir}/libamon.so.1 \ + ${systemd_system_unitdir}/mtcalarm.service \ + ${systemd_system_unitdir}/goenabled.service \ + ${systemd_system_unitdir}/mtclog.service \ + ${systemd_system_unitdir}/hostw.service \ + ${systemd_system_unitdir}/mtcClient.service \ + ${systemd_system_unitdir}/fsmon.service \ + ${systemd_system_unitdir}/hbsClient.service \ + ${systemd_system_unitdir}/hwmon.service \ + ${systemd_system_unitdir}/pmon.service \ + ${systemd_system_unitdir}/hwclock.service \ + ${systemd_system_unitdir}/runservices.service \ + ${systemd_system_unitdir}/lmon.service \ + ${sysconfdir}/pmon.d/nslcd.conf \ + ${sysconfdir}/pmon.d/lmon.conf \ + ${sysconfdir}/pmon.d/mtclogd.conf \ + ${sysconfdir}/pmon.d/mtcalarm.conf \ + ${sysconfdir}/pmon.d/syslog-ng.conf \ + ${sysconfdir}/pmon.d/acpid.conf \ + ${sysconfdir}/pmon.d/sshd.conf \ + ${sysconfdir}/pmon.d/fsmon.conf \ + ${sysconfdir}/pmon.d/hbsClient.conf \ + ${sysconfdir}/pmon.d/mtcClient.conf \ + ${sysconfdir}/init.d/runservices \ + ${sysconfdir}/init.d/hostw \ + ${sysconfdir}/init.d/goenabled \ + ${sysconfdir}/init.d/mtcClient \ + ${sysconfdir}/init.d/hwclock.sh \ + ${sysconfdir}/init.d/mtclog \ + ${sysconfdir}/init.d/mtcalarm \ + ${sysconfdir}/init.d/lmon \ + ${sysconfdir}/init.d/hbsClient \ + ${sysconfdir}/init.d/fsmon \ + ${sysconfdir}/init.d/pmon \ + ${sysconfdir}/init.d/hwmon \ + ${sysconfdir}/mtc.conf \ + ${sysconfdir}/bmc/server_profiles.d/sensor_hp380_v1_ilo_v4.profile \ + ${sysconfdir}/bmc/server_profiles.d/sensor_hp360_v1_ilo_v4.profile \ + ${sysconfdir}/bmc/server_profiles.d/sensor_quanta_v1_ilo_v4.profile \ + ${sysconfdir}/serverices.d/worker/mtcTest \ + ${sysconfdir}/serverices.d/controller/mtcTest \ + ${sysconfdir}/serverices.d/storage/mtcTest \ + ${sysconfdir}/mtc/hostwd.conf \ + ${sysconfdir}/mtc/fsmond.conf \ + ${sysconfdir}/mtc/pmond.conf \ + ${sysconfdir}/mtc/lmond.conf \ + ${sysconfdir}/mtc/hwmond.conf \ + ${sysconfdir}/mtc/tmp/ \ + ${sysconfdir}/mtc.ini \ + ${sysconfdir}/logrotate.d/lmon.logrotate \ + ${sysconfdir}/logrotate.d/fsmon.logrotate \ + ${sysconfdir}/logrotate.d/pmon.logrotate \ + ${sysconfdir}/logrotate.d/hwmon.logrotate \ + ${sysconfdir}/logrotate.d/hostw.logrotate \ + ${sysconfdir}/logrotate.d/mtcalarm.logrotate \ + ${sysconfdir}/logrotate.d/mtce.logrotate \ " diff --git a/recipes-core/stx-metal/python-inventoryclient.bb b/recipes-core/stx-metal/python-inventoryclient.bb deleted file mode 100644 index f08b937..0000000 --- a/recipes-core/stx-metal/python-inventoryclient.bb +++ /dev/null @@ -1,46 +0,0 @@ -DESCRIPTION = "python-inventoryclient" - -STABLE = "starlingx/master" -PROTOCOL = "https" -BRANCH = "master" -SRCREV = "70609a3d55e5b7d2be82667fc35792505f9013c4" -S = "${WORKDIR}/git" -PV = "19.05" - -LICENSE = "Apache-2.0" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRC_URI = "git://opendev.org/starlingx/config.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}" - -require stx-metal.inc -inherit setuptools - - -DEPENDS = " \ - python \ - python-pbr-native \ - " -#RDEPENDS_${PN}_append = " bash" - -do_configure () { - cd ${S}/python-inventoryclient/inventoryclient - distutils_do_configure -} - -do_compile() { - cd ${S}/python-inventoryclient/inventoryclient - distutils_do_compile -} - -do_install () { - cd ${S}/python-inventoryclient/inventoryclient - distutils_do_install - - install -d -m 755 ${D}/${sysconfdir}/bash_completion.d - install -p -D -m 664 tools/inventory.bash_completion ${D}/${sysconfdir}/bash_completion.d - -} - -# pkg_postinst_ontarget_${PN} () { } -FILES_${PN}_append += " ${systemd_unitdir}/* " diff --git a/recipes-core/stx-metal/python-inventoryclient.inc b/recipes-core/stx-metal/python-inventoryclient.inc new file mode 100644 index 0000000..9710a84 --- /dev/null +++ b/recipes-core/stx-metal/python-inventoryclient.inc @@ -0,0 +1,31 @@ +PACKAGES += " python-inventoryclient" + +RDEPENDS_python-inventoryclient_append = " bash" + +do_configure_prepend () { + cd ${S}/python-inventoryclient/inventoryclient + distutils_do_configure +} + +do_compile_prepend () { + cd ${S}/python-inventoryclient/inventoryclient + distutils_do_compile +} + +do_install_prepend () { + cd ${S}/python-inventoryclient/inventoryclient + distutils_do_install + + install -d -m 755 ${D}/${sysconfdir}/bash_completion.d + install -p -D -m 664 tools/inventory.bash_completion ${D}/${sysconfdir}/bash_completion.d + +} + +# pkg_postinst_ontarget_python-inventoryclient () { } + +FILES_python-inventoryclient = " \ + ${bindir}/inventory \ + ${sysconfdir}/bash_completion.d/inventory.bash_completion \ + ${libdir}/python2.7/site-packages/inventoryclient-*.egg-info/ \ + ${libdir}/python2.7/site-packages/inventoryclient/ \ + " diff --git a/recipes-core/stx-metal/stx-metal.bb b/recipes-core/stx-metal/stx-metal.bb new file mode 100644 index 0000000..1fd93f7 --- /dev/null +++ b/recipes-core/stx-metal/stx-metal.bb @@ -0,0 +1,65 @@ +DESCRIPTION = "stx-metal" + +STABLE = "starlingx/master" +PROTOCOL = "https" +BRANCH = "master" +SRCREV = "d599a0f4cec538b60f7d953cd89e0603cc1bdb5a" +S = "${WORKDIR}/git" +PV = "19.05" + +LICENSE = "Apache-2.0" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +SRC_URI = "git://opendev.org/starlingx/metal.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \ + file://0001-mtce-compute-dont-install-empty-directory-unless-nee.patch \ + file://0001-mtce-control-dont-install-empty-directory-unless-nee.patch \ + file://0001-mtce-storage-dont-install-empty-directory-unless-nee.patch \ + file://0001-Use-snprintf-to-avoid-overflowing-amon.tx_buf.patch \ + file://0001-Use-LDFLAGS-when-linking-and-pass-flags-down-to-subm.patch \ + " + +inherit setuptools + + +DEPENDS = " \ + python \ + python-pbr-native \ + stx-fault \ + openssl \ + libevent \ + json-c \ + " +RDEPENDS_${PN}_append = " bash" + +# mtce depends on mtce-common +# TODO: Define tasks and handle dependencies accordingly + +require mtce.inc +require inventory.inc +require mtce-common.inc +require mtce-compute.inc +require mtce-control.inc +require mtce-storage.inc +require python-inventoryclient.inc + +do_configure () { + : +} + +do_compile() { + : +} + +do_install () { + : +} + +pkg_postinst_ontarget_${PN} () { +# install default config files +} + +FILES_${PN} = " " +FILES_${PN}-dbg_append += " " +FILES_${PN}-staticdev_append = " " +FILES_${PN}-dev_append = " " diff --git a/recipes-core/stx-metal/stx-metal.bb.DONOTUSE b/recipes-core/stx-metal/stx-metal.bb.DONOTUSE deleted file mode 100644 index 2326034..0000000 --- a/recipes-core/stx-metal/stx-metal.bb.DONOTUSE +++ /dev/null @@ -1,350 +0,0 @@ -DESCRIPTION = "stx-metal" -# TODO: -# Fix the packaging on this. These packages depend on each other -# and need to be present in sysroot. One possible solution: -# Unpack the source in work-shared And built packages individually -# That way dependencies and sysroots can be accounted for in the recipes. - -INSANE_SKIP_${PN} = "ldflags" - -STABLE = "starlingx/master" -PROTOCOL = "https" -BRANCH = "master" -SRCREV = "fb019447503cc9e5bb8d290311a8c5d38d53a108" -S = "${WORKDIR}/git" -PV = "19.05" - -LICENSE = "Apache-2.0" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - - -SRC_URI = "git://opendev.org/starlingx/metal.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \ - file://0001-Make-sure-objects-are-present-befor-archiving-into-..patch \ - file://0001-Use-LLDFLAGS-to-avoid-collusion-with-LDFLAGS.patch \ - file://0001-Make-fallthroughs-explicit-for-Poky-CFLAGS-Werror-im.patch \ - file://0001-Remove-Wall-and-family-to-compile-the-code.patch \ - file://0001-Remove-Wall-and-family-from-heartbeat-to-compile-the.patch \ - " - -inherit setuptools - -DEPENDS = "\ - python-pbr \ - python-pbr-native \ - libevent \ - json-c \ - " - -# Builds: -# mtce-common/src/daemon -# mtce-common/src/common -# mtce-compute -# mtce-control -# mtce-storage -# mtce - -# Skips: -# installer/pxe-network-installer -# kickstart - - - -do_configure () { -# installer/pxe-network-installer: Do Nothing -# kickstart: Do Nothing -# mtce-common/src/daemon: Do Nothing -# mtce-common/src/common: Do Nothing -# mtce-compute: Do Nothing -# mtce-control: Do Nothing -# mtce-storage: Do Nothing -# mtce: Do Nothing - -# inventory/inventory: - cd ${S}/inventory/inventory - distutils_do_configure - -# python-inventoryclient: - cd ${S}/python-inventoryclient/inventoryclient - distutils_do_configure -} - - -do_compile () { -# installer/pxe-network-installer: Do Nothing -# kickstart: Do Nothing -# mtce-compute: Do Nothing -# mtce-control: Do Nothing -# mtce-storage: Do Nothing - -# inventory/inventory: - cd ${S}/inventory/inventory - distutils_do_compile - -# mtce-common/src/daemon: - cd ${S}/mtce-common/src/daemon - oe_runmake clean - oe_runmake -e lib VER=1 VER_MJR=1 - -# mtce-common/src/common: - cd ${S}/mtce-common/src/common - oe_runmake clean - oe_runmake -e lib VER=1 VER_MJR=1 CCFLAGS="-fPIC -g -O2 -std=c++11" - -# mtce: - cd ${S}/mtce/src/ - oe_runmake -e VER=1 VER_MJR=1 \ - INCLUDES="-I${S}/mtce-common/src/common -I${S}/mtce-common/src/daemon \ - -I../alarm -I../heartbeat -I../maintenance \ - -I../hostw -I../public -I../smash -I../common -I../hwmon \ - " \ - EXTRALDFLAGS="-L${S}/mtce-common/src/common -L${S}/mtce-common/src/daemon" \ - build - -# python-inventoryclient: - cd ${S}/python-inventoryclient/inventoryclient - distutils_do_compile -} - -do_install () { -# installer/pxe-network-installer: Do Nothing -# kickstart: Do Nothing - -# inventory/inventory: -# See todo.txt - cd ${S}/inventory/inventory - distutils_do_install - -# mtce-common/src/daemon: - cd ${S}/mtce-common/src/daemon - install -m 755 -d ${D}/${libdir} - install -m 755 -d ${D}/${includedir}/mtce-daemon - - install -m 644 -p -D libdaemon.a ${D}/${libdir} - install -m 644 -p -D daemon_ini.h ${D}/${includedir}/mtce-daemon - install -m 644 -p -D daemon_common.h ${D}/${includedir}/mtce-daemon - install -m 644 -p -D daemon_option.h ${D}/${includedir}/mtce-daemon -# mtce-common/src/common: - cd ${S}/mtce-common/src/common - install -m 755 -d ${D}/${includedir}/mtce-common - install -m 644 -p -D libcommon.a ${D}/${libdir} - install -m 644 -p -D libthreadUtil.a ${D}/${libdir} - install -m 644 -p -D libipmiUtil.a ${D}/${libdir} - install -m 644 -p -D libpingUtil.a ${D}/${libdir} - install -m 644 -p -D libnodeBase.a ${D}/${libdir} - install -m 644 -p -D libregexUtil.a ${D}/${libdir} - install -m 644 -p -D libhostUtil.a ${D}/${libdir} - - install -m 644 -p -D fitCodes.h ${D}/${includedir}/mtce-common - install -m 644 -p -D logMacros.h ${D}/${includedir}/mtce-common - install -m 644 -p -D returnCodes.h ${D}/${includedir}/mtce-common - install -m 644 -p -D nodeTimers.h ${D}/${includedir}/mtce-common - install -m 644 -p -D hostClass.h ${D}/${includedir}/mtce-common - install -m 644 -p -D httpUtil.h ${D}/${includedir}/mtce-common - install -m 644 -p -D jsonUtil.h ${D}/${includedir}/mtce-common - install -m 644 -p -D msgClass.h ${D}/${includedir}/mtce-common - install -m 644 -p -D nodeBase.h ${D}/${includedir}/mtce-common - install -m 644 -p -D nodeEvent.h ${D}/${includedir}/mtce-common - install -m 644 -p -D nodeMacro.h ${D}/${includedir}/mtce-common - install -m 644 -p -D nodeUtil.h ${D}/${includedir}/mtce-common - install -m 644 -p -D timeUtil.h ${D}/${includedir}/mtce-common - install -m 644 -p -D alarmUtil.h ${D}/${includedir}/mtce-common - install -m 644 -p -D hostUtil.h ${D}/${includedir}/mtce-common - install -m 644 -p -D ipmiUtil.h ${D}/${includedir}/mtce-common - install -m 644 -p -D nlEvent.h ${D}/${includedir}/mtce-common - install -m 644 -p -D pingUtil.h ${D}/${includedir}/mtce-common - install -m 644 -p -D regexUtil.h ${D}/${includedir}/mtce-common - install -m 644 -p -D threadUtil.h ${D}/${includedir}/mtce-common - install -m 644 -p -D tokenUtil.h ${D}/${includedir}/mtce-common - install -m 644 -p -D secretUtil.h ${D}/${includedir}/mtce-common - -# mtce-compute: - cd ${S}/mtce-compute/src/ - oe_runmake buildroot=${D} \ - _sysconfdir=${sysconfdir} _unitdir=${systemd_system_unitdir} _datarootdir=${datadir} \ - install -# mtce-control: - cd ${S}/mtce-control/src/ - oe_runmake buildroot=${D} \ - _sysconfdir=${sysconfdir} _unitdir=${systemd_system_unitdir} _datarootdir=${datadir} \ - install -# mtce-storage: - cd ${S}/mtce-storage/src/ - oe_runmake buildroot=${D} \ - _sysconfdir=${sysconfdir} _unitdir=${systemd_system_unitdir} _datarootdir=${datadir} \ - install -# mtce: - install -m 755 -d ${D}/${bindir} - install -m 755 -d ${D}/${sbindir} - install -m 755 -d ${D}/${libdir} - install -m 755 -d ${D}/${libdir}/ocf/resource.d/platform - install -m 755 -d ${D}/${systemd_system_unitdir} - - install -m 755 -d ${D}/${sysconfdir} - install -m 755 -d ${D}/${sysconfdir}/mtc/tmp - install -m 755 -d ${D}/${sysconfdir}/goenabled.d - install -m 755 -d ${D}/${sysconfdir}/bmc/server_profiles.d - install -m 755 -d ${D}/${sysconfdir}/init.d - install -m 755 -d ${D}/${sysconfdir}/pmon.d - install -m 755 -d ${D}/${sysconfdir}/logrotate.d - - install -m 755 -d ${D}/${sysconfdir}/serverices.d - install -m 755 -d ${D}/${sysconfdir}/serverices.d/controller - install -m 755 -d ${D}/${sysconfdir}/serverices.d/worker - install -m 755 -d ${D}/${sysconfdir}/serverices.d/storage - - install -m 755 -d ${D}/var - install -m 755 -d ${D}/var/run - - - cd ${S}/mtce/src/ - install -m 644 -p -D scripts/mtcAgent ${D}/${libdir}/ocf/resource.d/platform - install -m 755 -p -D hwmon/scripts/ocf/hwmon ${D}/${libdir}/ocf/resource.d/platform - - # Config files - install -m 644 -p -D scripts/mtc.ini ${D}/${sysconfdir}/mtc.ini - install -m 644 -p -D scripts/mtc.conf ${D}/${sysconfdir}/mtc.conf - install -m 644 -p -D fsmon/scripts/fsmond.conf ${D}/${sysconfdir}/mtc/fsmond.conf - install -m 644 -p -D hwmon/scripts/hwmond.conf ${D}/${sysconfdir}/mtc/hwmond.conf - install -m 644 -p -D pmon/scripts/pmond.conf ${D}/${sysconfdir}/mtc/pmond.conf - install -m 644 -p -D lmon/scripts/lmond.conf ${D}/${sysconfdir}/mtc/lmond.conf - install -m 644 -p -D hostw/scripts/hostwd.conf ${D}/${sysconfdir}/mtc/hostwd.conf - - install -m 644 -p -D scripts/sensor_hp360_v1_ilo_v4.profile ${D}/${sysconfdir}/bmc/server_profiles.d/ - install -m 644 -p -D scripts/sensor_hp380_v1_ilo_v4.profile ${D}/${sysconfdir}/bmc/server_profiles.d/ - install -m 644 -p -D scripts/sensor_quanta_v1_ilo_v4.profile ${D}/${sysconfdir}/bmc/server_profiles.d/ - - - # binaries - install -m 755 -p -D maintenance/mtcAgent ${D}/${bindir}/mtcAgent - install -m 755 -p -D maintenance/mtcClient ${D}/${bindir}/mtcClient - install -m 755 -p -D heartbeat/hbsAgent ${D}/${bindir}/hbsAgent - install -m 755 -p -D heartbeat/hbsClient ${D}/${bindir}/hbsClient - install -m 755 -p -D pmon/pmond ${D}/${bindir}/pmond - install -m 755 -p -D lmon/lmond ${D}/${bindir}/lmond - install -m 755 -p -D hostw/hostwd ${D}/${bindir}/hostwd - install -m 755 -p -D fsmon/fsmond ${D}/${bindir}/fsmond - install -m 755 -p -D hwmon/hwmond ${D}/${bindir}/hwmond - install -m 755 -p -D mtclog/mtclogd ${D}/${bindir}/mtclogd - install -m 755 -p -D alarm/mtcalarmd ${D}/${bindir}/mtcalarmd - install -m 755 -p -D scripts/wipedisk ${D}/${bindir}/wipedisk - install -m 755 -p -D fsync/fsync ${D}/${sbindir}/fsync - install -m 700 -p -D pmon/scripts/pmon-restart ${D}/${sbindir}/pmon-restart - install -m 700 -p -D pmon/scripts/pmon-start ${D}/${sbindir}/pmon-start - install -m 700 -p -D pmon/scripts/pmon-stop ${D}/${sbindir}/pmon-stop - - # init script files - install -m 755 -p -D scripts/mtcClient ${D}/${sysconfdir}/init.d/mtcClient - install -m 755 -p -D scripts/hbsClient ${D}/${sysconfdir}/init.d/hbsClient - install -m 755 -p -D hwmon/scripts/lsb/hwmon ${D}/${sysconfdir}/init.d/hwmon - install -m 755 -p -D fsmon/scripts/fsmon ${D}/${sysconfdir}/init.d/fsmon - install -m 755 -p -D scripts/mtclog ${D}/${sysconfdir}/init.d/mtclog - install -m 755 -p -D pmon/scripts/pmon ${D}/${sysconfdir}/init.d/pmon - install -m 755 -p -D lmon/scripts/lmon ${D}/${sysconfdir}/init.d/lmon - install -m 755 -p -D hostw/scripts/hostw ${D}/${sysconfdir}/init.d/hostw - install -m 755 -p -D alarm/scripts/mtcalarm.init ${D}/${sysconfdir}/init.d/mtcalarm - # install -m 755 -p -D scripts/config ${D}/${sysconfdir}/init.d/config - - # TODO: Init hack. Should move to proper module - install -m 755 -p -D scripts/hwclock.sh ${D}/${sysconfdir}/init.d/hwclock.sh - install -m 644 -p -D scripts/hwclock.service ${D}/${systemd_system_unitdir}/hwclock.service - - - # systemd service files - install -m 644 -p -D fsmon/scripts/fsmon.service ${D}/${systemd_system_unitdir}/fsmon.service - install -m 644 -p -D hwmon/scripts/hwmon.service ${D}/${systemd_system_unitdir}/hwmon.service - install -m 644 -p -D pmon/scripts/pmon.service ${D}/${systemd_system_unitdir}/pmon.service - install -m 644 -p -D hostw/scripts/hostw.service ${D}/${systemd_system_unitdir}/hostw.service - install -m 644 -p -D scripts/mtcClient.service ${D}/${systemd_system_unitdir}/mtcClient.service - install -m 644 -p -D scripts/hbsClient.service ${D}/${systemd_system_unitdir}/hbsClient.service - install -m 644 -p -D scripts/mtclog.service ${D}/${systemd_system_unitdir}/mtclog.service - install -m 644 -p -D scripts/hbsClient.service ${D}/${systemd_system_unitdir}/hbsClient.service - install -m 644 -p -D scripts/mtclog.service ${D}/${systemd_system_unitdir}/mtclog.service - install -m 644 -p -D scripts/goenabled.service ${D}/${systemd_system_unitdir}/goenabled.service - install -m 644 -p -D scripts/runservices.service ${D}/${systemd_system_unitdir}/runservices.service - install -m 644 -p -D alarm/scripts/mtcalarm.service ${D}/${systemd_system_unitdir}/mtcalarm.service - install -m 644 -p -D lmon/scripts/lmon.service ${D}/${systemd_system_unitdir}/lmon.service - - - # go enabled stuff - install -m 755 -p -D scripts/goenabled ${D}/${sysconfdir}/init.d/goenabled - - # start or stop services test script - install -m 755 -p -D scripts/mtcTest ${D}/${sysconfdir}/serverices.d/worker - install -m 755 -p -D scripts/mtcTest ${D}/${sysconfdir}/serverices.d/controller - install -m 755 -p -D scripts/mtcTest ${D}/${sysconfdir}/serverices.d/storage - install -m 755 -p -D scripts/runservices ${D}/${sysconfdir}/init.d/runservices - - - # test tools - install -m 755 -p -D scripts/dmemchk.sh ${D}/${sbindir} - - # process monitor config files - install -m 644 -p -D scripts/mtcClient.conf ${D}/${sysconfdir}/pmon.d/mtcClient.conf - install -m 644 -p -D scripts/hbsClient.conf ${D}/${sysconfdir}/pmon.d/hbsClient.conf - install -m 644 -p -D pmon/scripts/acpid.conf ${D}/${sysconfdir}/pmon.d/acpid.conf - install -m 644 -p -D pmon/scripts/sshd.conf ${D}/${sysconfdir}/pmon.d/sshd.conf - install -m 644 -p -D pmon/scripts/syslog-ng.conf ${D}/${sysconfdir}/pmon.d/syslog-ng.conf - install -m 644 -p -D pmon/scripts/nslcd.conf ${D}/${sysconfdir}/pmon.d/nslcd.conf - install -m 644 -p -D fsmon/scripts/fsmon.conf ${D}/${sysconfdir}/pmon.d/fsmon.conf - install -m 644 -p -D scripts/mtclogd.conf ${D}/${sysconfdir}/pmon.d/mtclogd.conf - install -m 644 -p -D alarm/scripts/mtcalarm.pmon.conf ${D}/${sysconfdir}/pmon.d/mtcalarm.conf - install -m 644 -p -D lmon/scripts/lmon.pmon.conf ${D}/${sysconfdir}/pmon.d/lmon.conf - - # log rotation - install -m 644 -p -D scripts/mtce.logrotate ${D}/${sysconfdir}/logrotate.d/mtce.logrotate - install -m 644 -p -D hostw/scripts/hostw.logrotate ${D}/${sysconfdir}/logrotate.d/hostw.logrotate - install -m 644 -p -D pmon/scripts/pmon.logrotate ${D}/${sysconfdir}/logrotate.d/pmon.logrotate - install -m 644 -p -D lmon/scripts/lmon.logrotate ${D}/${sysconfdir}/logrotate.d/lmon.logrotate - install -m 644 -p -D fsmon/scripts/fsmon.logrotate ${D}/${sysconfdir}/logrotate.d/fsmon.logrotate - install -m 644 -p -D hwmon/scripts/hwmon.logrotate ${D}/${sysconfdir}/logrotate.d/hwmon.logrotate - install -m 644 -p -D alarm/scripts/mtcalarm.logrotate ${D}/${sysconfdir}/logrotate.d/mtcalarm.logrotate - - # software development files - install -m 644 -p -D heartbeat/mtceHbsCluster.h ${D}/${includedir}/mtceHbsCluster.h - install -m 755 -p -D public/libamon.so.1 ${D}/${libdir}/ - #cd ${D}/%{_libdir} ; ln -s libamon.so.$MAJOR libamon.so.$MAJOR.$MINOR - #cd ${D}/%{_libdir} ; ln -s libamon.so.$MAJOR libamon.so - -# python-inventoryclient: - cd ${S}/python-inventoryclient/inventoryclient - distutils_do_install - - install -d -m 755 ${D}/${sysconfdir}/bash_completion.d - install -p -D -m 664 tools/inventory.bash_completion ${D}/${sysconfdir}/bash_completion.d -} - -pkg_postinst_ontarget_${PN} () { -# mtce-compute: - /bin/systemctl enable goenabled-worker.service - /bin/systemctl enable qemu_clean.service -# mtce-control: - /bin/systemctl enable lighttpd.service - /bin/systemctl enable qemu_clean.service - /bin/systemctl enable hbsAgent.service -# mtce-storage: - /bin/systemctl enable goenabled-storage.service - -# mtce: - /bin/systemctl enable fsmon.service - /bin/systemctl enable mtcClient.service - /bin/systemctl enable hbsClient.service - /bin/systemctl enable mtclog.service - /bin/systemctl enable iscsid.service - /bin/systemctl enable rsyncd.service - /bin/systemctl enable goenabled.service - /bin/systemctl enable mtcalarm.service -# mtce/mtce-hostw - /bin/systemctl enable hostw.service -# mtce/mtce-pmon - /bin/systemctl enable pmon.service -# mtce/mtce-lmon - /bin/systemctl enable lmon.service - -} - -FILES_${PN}_append += " ${datadir} \ - ${systemd_unitdir}/* \ - ${libdir} \ - run \ - " diff --git a/recipes-core/stx-metal/stx-metal.inc b/recipes-core/stx-metal/stx-metal.inc deleted file mode 100644 index e291f78..0000000 --- a/recipes-core/stx-metal/stx-metal.inc +++ /dev/null @@ -1,2 +0,0 @@ -inherit externalsrc -EXTERNALSRC_pn-${PN}="${EXTERNALREPO}/stx-metal" diff --git a/recipes-core/stx/distributedcloud.bb b/recipes-core/stx/distributedcloud.bb deleted file mode 100644 index 309783e..0000000 --- a/recipes-core/stx/distributedcloud.bb +++ /dev/null @@ -1,64 +0,0 @@ -DESCRIPTION = "distributedcloud" - - - -STABLE = "starlingx/master" -PROTOCOL = "https" -BRANCH = "master" -SRCREV = "fd498c843c95519acf6296b9ddcf4f684d92a9be" -S = "${WORKDIR}/git" -PV = "19.05" - -LICENSE = "Apache-2.0" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" - - - -SRC_URI = "git://opendev.org/starlingx/distcloud.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}" - -DEPENDS = " \ - python-crypto \ - python-cryptography \ - python2-devel \ - python-eventlet \ - python-setuptools \ - python2-pip \ - python2-wheel \ - python-jsonschema >= 2.0.0 \ - python-keyring \ - python-keystonemiddleware \ - python-keystoneauth1 >= 3.1.0 \ - python-netaddr \ - python-oslo-concurrency \ - python-oslo-config \ - python-oslo-context \ - python-oslo-db \ - python-oslo-i18n \ - python-oslo-log \ - python-oslo-messaging \ - python-oslo-middleware \ - python-oslo-policy \ - python-oslo-rootwrap \ - python-oslo-serialization \ - python-oslo-service \ - python-oslo-utils \ - python-oslo-versionedobjects \ - python-pbr >= 1.8 \ - python-pecan >= 1.0.0 \ - python-routes >= 1.12.3 \ - python-sphinx \ - python-sphinxcontrib-httpdomain \ - pyOpenSSL \ - systemd \ - python-babel \ - " - -#AUTOTOOLS_SCRIPT_PATH = "" -#inherit autotools -#inherit pkgconfig -#inherit python-dir -#EXTRA_OECONF = "" -#do_configure_append () { } -#do_install_append() { } -#pkg_postinst_ontarget_${PN} () { } diff --git a/recipes-core/stx/stx-integ.bb b/recipes-core/stx/stx-integ.bb deleted file mode 100644 index 7c67bf4..0000000 --- a/recipes-core/stx/stx-integ.bb +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION = "stx-integ" - - - -STABLE = "starlingx/master" -PROTOCOL = "https" -BRANCH = "master" -SRCREV = "8decb63402ae185f7110845bcca845e0b3bd7447" -S = "${WORKDIR}/git" -PV = "19.05" - -LICENSE = "Apache-2.0" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -#AUTOTOOLS_SCRIPT_PATH = "" - - -SRC_URI = "git://opendev.org/starlingx/integ.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}" -#DEPENDS = "" - - -#inherit autotools -#inherit pkgconfig -#inherit python-dir -#EXTRA_OECONF = "" -#do_configure_append () { } -#do_install_append() { } -#pkg_postinst_ontarget_${PN} () { } diff --git a/recipes-core/stx/stx-upstream.bb b/recipes-core/stx/stx-upstream.bb deleted file mode 100644 index 349659a..0000000 --- a/recipes-core/stx/stx-upstream.bb +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION = "stx-upstream" - - - -STABLE = "starlingx/master" -PROTOCOL = "https" -BRANCH = "master" -SRCREV = "835fc2d68dd4c09da35e71e8d038b2878c59e65a" -S = "${WORKDIR}/git" -PV = "19.05" - -LICENSE = "Apache-2.0" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - - - -SRC_URI = "git://opendev.org/starlingx/upstream.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}" - -#AUTOTOOLS_SCRIPT_PATH = "" -#DEPENDS = "" -#inherit autotools -#inherit pkgconfig -#inherit python-dir -#EXTRA_OECONF = "" -#do_configure_append () { } -#do_install_append() { } -#pkg_postinst_ontarget_${PN} () { } diff --git a/recipes-dbs/mysql/mariadb_10.1_bb_ b/recipes-dbs/mysql/mariadb_10.1_bb_ new file mode 100644 index 0000000..a297766 --- /dev/null +++ b/recipes-dbs/mysql/mariadb_10.1_bb_ @@ -0,0 +1,48 @@ +SRC_URI += "https://github.com/MariaDB/server/tree/10.1" +PATCHES at cgcs-root/stx/stx-integ/database/mariadb/centos/files + + + +cmake.\ +-DBUILD_CONFIG=mysql_release\ +-DFEATURE_SET="community"\ +-DINSTALL_LAYOUT=RPM\ +-DDAEMON_NAME="%{daemon_name}"\ +-DDAEMON_NO_PREFIX="%{daemon_no_prefix}"\ +-DLOG_LOCATION="%{logfile}"\ +-DPID_FILE_DIR="%{pidfiledir}"\ +-DNICE_PROJECT_NAME="MariaDB"\ +-DRPM="%{?rhel:rhel%{rhel}}%{!?rhel:fedora%{fedora}}"\ +-DCMAKE_INSTALL_PREFIX="%{_prefix}"\ +-DINSTALL_SYSCONFDIR="%{_sysconfdir}"\ +-DINSTALL_SYSCONF2DIR="%{_sysconfdir}/my.cnf.d"\ +-DINSTALL_DOCDIR="share/doc/%{_pkgdocdirname}"\ +-DINSTALL_DOCREADMEDIR="share/doc/%{_pkgdocdirname}"\ +-DINSTALL_INCLUDEDIR=include/mysql\ +-DINSTALL_INFODIR=share/info\ +-DINSTALL_LIBDIR="%{_lib}/mysql"\ +-DINSTALL_MANDIR=share/man\ +-DINSTALL_MYSQLSHAREDIR=share/%{pkg_name}\ +-DINSTALL_MYSQLTESTDIR=share/mysql-test\ +-DINSTALL_PLUGINDIR="%{_lib}/mysql/plugin"\ +-DINSTALL_SBINDIR=libexec\ +-DINSTALL_SCRIPTDIR=bin\ +-DINSTALL_SQLBENCHDIR=share\ +-DINSTALL_SUPPORTFILESDIR=share/%{pkg_name}\ +-DMYSQL_DATADIR="%{dbdatadir}"\ +-DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock"\ +-DENABLED_LOCAL_INFILE=ON\ +-DENABLE_DTRACE=ON\ +-DWITH_EMBEDDED_SERVER=ON\ +-DWITH_SSL=system\ +-DWITH_ZLIB=system\ +%{?with_pcre:-DWITH_PCRE=system}\ +-DWITH_JEMALLOC=no\ +%{!?with_tokudb:-DWITHOUT_TOKUDB=ON}\ +%{!?with_mroonga:-DWITHOUT_MROONGA=ON}\ +%{!?with_oqgraph:-DWITHOUT_OQGRAPH=ON}\ +-DTMPDIR=/var/tmp\ +%{?with_debug:-DCMAKE_BUILD_TYPE=Debug}\ +%{?_hardened_build:-DWITH_MYSQLD_LDFLAGS="-pie-Wl,-z,relro,-z,now"} + +make%{?_smp_mflags}VERBOSE=1 diff --git a/recipes-kernel/linux/linux-yocto-rt_%.bbappend b/recipes-kernel/linux/linux-yocto-rt_%.bbappend new file mode 100644 index 0000000..9619428 --- /dev/null +++ b/recipes-kernel/linux/linux-yocto-rt_%.bbappend @@ -0,0 +1,11 @@ +# Enable: +# drbd +# IMA +# intel-e1000e +# intel-i40e +# intel-i40evf +# intel-ixgbe +# intel-ixgbevf +# qat17 +# tpmdd +# Preempt_rt diff --git a/recipes-kernel/linux/linux-yocto_%.bbappend b/recipes-kernel/linux/linux-yocto_%.bbappend new file mode 100644 index 0000000..a7768de --- /dev/null +++ b/recipes-kernel/linux/linux-yocto_%.bbappend @@ -0,0 +1,10 @@ +# Enable: +# drbd +# IMA +# intel-e1000e +# intel-i40e +# intel-i40evf +# intel-ixgbe +# intel-ixgbevf +# qat17 +# tpmdd