starlingx/meta-starlingx
Code Issues Proposed changes

stx-utilities: set and limit checkouts to subpaths

Browse Source 
Signed-off-by: Babak Sarashki <Babak.SarAshki@windriver.com>
This commit is contained in:
Babak Sarashki 2020-09-22 20:02:41 -07:00
parent 497905225d
commit 5130da8af1
15 changed files with 70 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meta-stx-flock/stx-utilities/build-info.bb
View File

@ -1,4 +1,3 @@
DESCRIPTION = "Build Info"
SUMMARY = "Build Info"

23
meta-stx-flock/stx-utilities/ceph-manager.bb
View File

@ -1,4 +1,3 @@
DESCRIPTION_ceph-manager = " \
Handle Ceph API calls and provide status updates via alarms. \
Handle sysinv RPC calls for long running Ceph API operations: \
@ -9,7 +8,7 @@ Handle sysinv RPC calls for long running Ceph API operations: \
require utilities-common.inc
S = "${S_DIR}/ceph/ceph-manager/ceph-manager"
SUBPATH0 = "ceph/ceph-manager/ceph-manager"
LICENSE = "Apache-2.0"
@ -23,6 +22,18 @@ SYSTEMD_PACKAGES += "${PN}"
SYSTEMD_SERVICE_${PN} = " ceph-manager.service"
SYSTEMD_AUTO_ENABLE_${PN} = "disable"
do_unpack_append() {
bb.build.exec_func('do_restore_files', d)
}
do_restore_files() {
cd ${S}
git reset ${SRCREV} ceph/ceph-manager/scripts
git reset ${SRCREV} ceph/ceph-manager/files
git checkout ceph/ceph-manager/scripts
git checkout ceph/ceph-manager/files
}
do_install_append() {
install -d -m0755 ${D}/${bindir}
@ -30,8 +41,8 @@ do_install_append() {
install -d -m0755 ${D}/${sysconfdir}/logrotate.d
install -d -m0755 ${D}/${systemd_system_unitdir}
install -p -m0700 ${S_DIR}/ceph/ceph-manager/scripts/bin/ceph-manager ${D}/${bindir}
install -p -m0700 ${S_DIR}/ceph/ceph-manager/scripts/init.d/ceph-manager ${D}/${sysconfdir}/rc.d/init.d
install -p -m0700 ${S_DIR}/ceph/ceph-manager/files/ceph-manager.logrotate ${D}/${sysconfdir}/logrotate.d
install -p -m0700 ${S_DIR}/ceph/ceph-manager/files/ceph-manager.service ${D}/${systemd_system_unitdir}
install -p -m0700 ${S}/ceph/ceph-manager/scripts/bin/ceph-manager ${D}/${bindir}
install -p -m0700 ${S}/ceph/ceph-manager/scripts/init.d/ceph-manager ${D}/${sysconfdir}/rc.d/init.d
install -p -m0700 ${S}/ceph/ceph-manager/files/ceph-manager.logrotate ${D}/${sysconfdir}/logrotate.d
install -p -m0700 ${S}/ceph/ceph-manager/files/ceph-manager.service ${D}/${systemd_system_unitdir}
}

3
meta-stx-flock/stx-utilities/collect-engtools.bb
View File

@ -1,4 +1,3 @@
DESCRIPTION = " \
This package contains data collection tools to monitor host performance. \
Tools are general purpose engineering and debugging related. Includes \
@ -8,7 +7,7 @@ io. \
SUMMARY = "Host performance data collection tools package"
require utilities-common.inc
S = "${S_DIR}/tools/engtools/hostdata-collectors/scripts"
SUBPATH0 = "tools/engtools/hostdata-collectors/scripts"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"

5
meta-stx-flock/stx-utilities/collector.bb
View File

@ -1,5 +1,3 @@
DESCRIPTION = " \
This packages scripts that implement data and log collection that field \
support can execute to gather current state and runtime history for off \
@ -7,7 +5,8 @@ platform analysis and debug. \
"
require utilities-common.inc
S = "${S_DIR}/tools/collector/scripts"
SUBPATH0 = "tools/collector/scripts"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"

15
meta-stx-flock/stx-utilities/logmgmt.bb
View File

@ -1,9 +1,7 @@
DESCRIPTION = "Management of /var/log filesystem"
require utilities-common.inc
S = "${S_DIR}/utilities/logmgmt/logmgmt/"
SUBPATH0 = "utilities/logmgmt/logmgmt/"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
@ -19,10 +17,19 @@ SYSTEMD_SERVICE_${PN} = "logmgmt.service"
SYSTEMD_AUTO_ENABLE_${PN} = "enable"
DISTRO_FEATURES_BACKFILL_CONSIDERED_remove = "sysvinit"
do_unpack_append() {
bb.build.exec_func('do_restore_files', d)
}
do_restore_files() {
cd ${S}
git reset ${SRCREV} utilities/logmgmt/scripts
git checkout utilities/logmgmt/scripts
}
do_install_append() {
cd ${S}/../scripts
cd ${S}/utilities/logmgmt/scripts
install -d -m0755 ${D}/${bindir}
install -m0700 bin/logmgmt ${D}/${bindir}
install -m0700 bin/logmgmt_postrotate ${D}/${bindir}

4
meta-stx-flock/stx-utilities/namespace-utils.bb
View File

@ -1,10 +1,8 @@
DESCRIPTION = "Titanium Cloud namespace utilities"
SUMMARY = "namespace utils"
require utilities-common.inc
S = "${S_DIR}/utilities/namespace-utils/namespace-utils"
SUBPATH0 = "utilities/namespace-utils/namespace-utils"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"

5
meta-stx-flock/stx-utilities/nfscheck.bb
View File

@ -1,11 +1,8 @@
DESCRIPTION = "NFS Audit"
SUMMARY = "NFS Audit"
require utilities-common.inc
S = "${S_DIR}/utilities/nfscheck/files/"
SUBPATH0 = "utilities/nfscheck/files/"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"

16
meta-stx-flock/stx-utilities/pci-irq-affinity.bb
View File

@ -1,10 +1,9 @@
DESCRIPTION = "StarlingX PCI Interrupt Affinity Agent Package"
SUMMARY = "StarlingX PCI Interrupt Affinity Agent Package"
require utilities-common.inc
S = "${S_DIR}/utilities/pci-irq-affinity-agent/pci_irq_affinity"
SUBPATH0 = "utilities/pci-irq-affinity-agent/pci_irq_affinity"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://setup.py;md5=6980f60051ba4d376975eefc777fb8ae"
@ -16,9 +15,20 @@ DISTRO_FEATURES_BACKFILL_CONSIDERED_remove = "sysvinit"
SYSTEMD_PACKAGES += "${PN}"
SYSTEMD_SERVICE_${PN} = "${PN}-agent.service"
do_unpack_append() {
bb.build.exec_func('do_restore_files', d)
}
do_restore_files() {
cd ${S}
git reset ${SRCREV} utilities/pci-irq-affinity-agent/files
git checkout utilities/pci-irq-affinity-agent/files
}
do_install_append() {
cd ${S_DIR}/utilities/pci-irq-affinity-agent/files
cd ${S}/utilities/pci-irq-affinity-agent/files
install -p -d -m0755 ${D}/${sysconfdir}/init.d
install -p -d -m0755 ${D}/${sysconfdir}/pmon.d

15
meta-stx-flock/stx-utilities/platform-util.bb
View File

@ -1,10 +1,9 @@
DESCRIPTION = "platform-util"
SUMMARY = "StarlingX Platform utilities installed only on controllers"
require utilities-common.inc
S = "${S_DIR}/utilities/platform-util/platform-util"
SUBPATH0 = "utilities/platform-util/platform-util"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
@ -17,9 +16,19 @@ SYSTEMD_PACKAGES += " ${PN}"
SYSTEMD_SERVICE_${PN} = "opt-platform.service"
SYSTEMD_AUTO_ENABLE_${PN} = "disable"
do_unpack_append() {
bb.build.exec_func('do_restore_files', d)
}
do_restore_files() {
cd ${S}
git reset ${SRCREV} utilities/platform-util/scripts
git checkout utilities/platform-util/scripts
}
do_install_append() {
cd ${S_DIR}/utilities/platform-util/scripts
cd ${S}/utilities/platform-util/scripts
install -d -m0755 ${D}/${bindir}
install -m0755 tc_setup.sh ${D}/${bindir}/tc_setup.sh

4
meta-stx-flock/stx-utilities/python-cephclient.bb
View File

@ -1,4 +1,3 @@
DESCRIPTION = " \
A client library in Python for Ceph Mgr RESTful plugin providing REST API \
access to the cluster over an SSL-secured connection. Python API is compatible \
@ -8,8 +7,7 @@ mimic because Ceph REST API component was removed. \
"
require utilities-common.inc
S = "${S_DIR}/ceph/python-cephclient/python-cephclient"
SUBPATH0 = "ceph/python-cephclient/python-cephclient"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=41687b590435621fc0676ac02c51154f"

3
meta-stx-flock/stx-utilities/stx-extensions.bb
View File

@ -1,10 +1,9 @@
DESCRIPTION = "TIS Extensions to thirdparty pkgs"
SUMMARY = "TIS Extensions to thirdparty pkgs"
require utilities-common.inc
S = "${S_DIR}/utilities/stx-extensions/files"
SUBPATH0 = "utilities/stx-extensions/files"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"

5
meta-stx-flock/stx-utilities/stx-ssl.bb
View File

@ -1,9 +1,8 @@
DESCRIPTION = " Wind River Security"
require utilities-common.inc
SUBPATH0 = "security/stx-ssl/"
S = "${S_DIR}/security/stx-ssl/"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
RDEPENDS_${PN}_append = " bash"
@ -24,6 +23,6 @@ do_install() {
${D}/${sysconfdir}/ssl/private/self-signed-server-cert.pem
install -p -d -m0755 ${D}/${sbindir}
install -m0700 ${S}files/tpmdevice-setup ${D}/${sbindir}/tpmdevice-setup
install -m0700 ${S}/files/tpmdevice-setup ${D}/${sbindir}/tpmdevice-setup
}

4
meta-stx-flock/stx-utilities/update-motd.bb
View File

@ -1,10 +1,8 @@
DESCRIPTION = "dynamic MOTD generation"
SUMMARY = "dynamic MOTD generation"
require utilities-common.inc
S = "${S_DIR}/utilities/update-motd/files"
SUBPATH0 = "utilities/update-motd/files"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"

31
meta-stx-flock/stx-utilities/utilities-common.inc
View File

@ -5,34 +5,15 @@ PROTOCOL = "https"
SRCNAME = "utilities"
BRANCH = "r/stx.3.0"
SRCREV = "cbad6b792157d066dd601f0f9ce62dc177d4c848"
S_DIR = "${WORKDIR}/git"
SRCREV_opendev = "cbad6b792157d066dd601f0f9ce62dc177d4c848"
DESTSUFFIX = "${PN}-${PV}"
PV = "1.0.0"
#LICENSE = "Apache-2.0"
SRC_URI = " \
git://opendev.org/starlingx/${SRCNAME}.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH};destsuffix=${DESTSUFFIX};subpath=${SUBPATH0};name=opendev \
"
#e7b3e2a120f5d4c0f6f562a52b6badf4 ./security/tpm2-openssl-engine/tpm2-openssl-engine/LICENSE
#3b83ef96387f14655fc854ddc3c6bd57 ./utilities/build-info/build-info-1.0/LICENSE
#3b83ef96387f14655fc854ddc3c6bd57 ./utilities/namespace-utils/LICENSE
#3b83ef96387f14655fc854ddc3c6bd57 ./utilities/namespace-utils/namespace-utils/LICENSE
#3b83ef96387f14655fc854ddc3c6bd57 ./utilities/nfscheck/LICENSE #3b83ef96387f14655fc854ddc3c6bd57 ./utilities/nfscheck/files/LICENSE
#3b83ef96387f14655fc854ddc3c6bd57 ./utilities/pci-irq-affinity-agent/files/LICENSE
#3b83ef96387f14655fc854ddc3c6bd57 ./utilities/platform-util/scripts/LICENSE
#3b83ef96387f14655fc854ddc3c6bd57 ./utilities/update-motd/LICENSE
#3b83ef96387f14655fc854ddc3c6bd57 ./utilities/update-motd/files/LICENSE
#3b83ef96387f14655fc854ddc3c6bd57 ./utilities/worker-utils/worker-utils/LICENSE
ALIC_FILES_CHKSUM = " \
file://ceph/ceph-manager/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://ceph/python-cephclient/python-cephclient/LICENSE;md5=41687b590435621fc0676ac02c51154f \
file://security/stx-ssl/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://tools/collector/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://tools/collector/scripts/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://tools/engtools/hostdata-collectors/scripts/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://utilities/logmgmt/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
"
SRC_URI = "git://opendev.org/starlingx/${SRCNAME}.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
#git://opendev.org/starlingx/${SRCNAME}.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
DEPENDS = " \
python-pip \

4
meta-stx-flock/stx-utilities/worker-utils.bb
View File

@ -1,10 +1,8 @@
DESCRIPTION = "Initial worker node resource reservation and misc. utilities"
SUMMARY = "dynamic MOTD generation"
require utilities-common.inc
S = "${S_DIR}/utilities/worker-utils/worker-utils"
SUBPATH0 = "utilities/worker-utils/worker-utils"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"