starlingx/meta-starlingx
Code Issues Proposed changes

stx-ha: 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 19:43:43 -07:00
parent 3c99985a46
commit 39e7a41f9e
8 changed files with 26 additions and 26 deletions

8
meta-stx-flock/stx-ha/ha-common.inc

@ -1,14 +1,16 @@
DESCRIPTION = "stx-ha"
PROTOCOL = "https"
BRANCH = "r/stx.3.0"
SRCNAME = "ha"
SRCREV = "a7b7d35b9922a3f2a8462492b7f1958f135a612d"
S_DIR = "${WORKDIR}/git"
SRCREV_opendev = "a7b7d35b9922a3f2a8462492b7f1958f135a612d"
DESTSUFFIX = "${PN}-${PV}"
PV = "1.0.0"
SRC_URI = "git://opendev.org/starlingx/${SRCNAME}.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH}"
SRC_URI = " \
git://opendev.org/starlingx/${SRCNAME}.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH};destsuffix=${DESTSUFFIX};subpath=${SUBPATH0};name=opendev \
"
inherit systemd

4
meta-stx-flock/stx-ha/libsm-common.bb

@ -1,9 +1,9 @@
PACKAGES += " sm-common-libs"
PACKAGES += " sm-eru"
S = "${S_DIR}/service-mgmt/sm-common"
require ha-common.inc
SUBPATH0 = "service-mgmt/sm-common"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"

4
meta-stx-flock/stx-ha/sm-api.bb

@ -1,7 +1,5 @@
S = "${S_DIR}/service-mgmt-api/sm-api"
require ha-common.inc
SUBPATH0 = "service-mgmt-api/sm-api"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"

5
meta-stx-flock/stx-ha/sm-client.bb

@ -1,12 +1,9 @@
S = "${S_DIR}/service-mgmt-client/sm-client"
require ha-common.inc
SUBPATH0 = "service-mgmt-client/sm-client"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = " \
file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2 \
file://${S_DIR}/service-mgmt-client/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
"
RDEPENDS_${PN}_append = " \

4
meta-stx-flock/stx-ha/sm-db.bb

@ -1,7 +1,5 @@
S = "${S_DIR}/service-mgmt/sm-db"
require ha-common.inc
SUBPATH0 = "service-mgmt/sm-db"
DEPENDS_append = " \
sqlite3-native \

4
meta-stx-flock/stx-ha/sm-tools.bb

@ -1,7 +1,5 @@
S = "${S_DIR}/service-mgmt-tools/sm-tools"
require ha-common.inc
SUBPATH0 = "service-mgmt-tools/sm-tools"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"

4
meta-stx-flock/stx-ha/sm.bb

@ -1,7 +1,5 @@
S = "${S_DIR}/service-mgmt/sm"
require ha-common.inc
SUBPATH0 = "service-mgmt/sm"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"

19
meta-stx-flock/stx-ha/stx-ocf-scripts.bb

@ -1,19 +1,28 @@
S = "${S_DIR}/stx-ocf-scripts/src/ocf"
require ha-common.inc
SUBPATH0 = "stx-ocf-scripts/src/ocf"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${S_DIR}/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
RDEPENDS_${PN} = " \
bash \
openstack-ras \
"
do_unpack_append() {
bb.build.exec_func('do_restore_license_file', d)
}
do_restore_license_file () {
cd ${S}
git reset HEAD LICENSE
git checkout LICENSE
}
do_install_append () {
install -d -m 755 ${D}/usr/lib/ocf/resource.d/openstack
install -p -D -m 755 $(find . -type f) ${D}/usr/lib/ocf/resource.d/openstack/
install -p -D -m 755 $(find . -type f -not -path './.git/*') ${D}/usr/lib/ocf/resource.d/openstack/
}
FILES_${PN}_append = " \