X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=meta-stx%2Frecipes-core%2Fstx-ha%2Fstx-ha.bb;h=b5c070c233410774d2f9e7ecc694e9442b233c3b;hb=0bf57ffd734c6148f234b8e140ecfb63b3291451;hp=cdbdeb3744957f0c495ac69b5fe8a6bc5afff856;hpb=57fdea704bd62af847872c40508f00aa1d7cac60;p=pti%2Frtp.git diff --git a/meta-stx/recipes-core/stx-ha/stx-ha.bb b/meta-stx/recipes-core/stx-ha/stx-ha.bb index cdbdeb3..b5c070c 100644 --- a/meta-stx/recipes-core/stx-ha/stx-ha.bb +++ b/meta-stx/recipes-core/stx-ha/stx-ha.bb @@ -22,20 +22,18 @@ SRCREV = "a7b7d35b9922a3f2a8462492b7f1958f135a612d" S = "${WORKDIR}/git" PV = "1.0.0" - -#TODO: -#3b83ef96387f14655fc854ddc3c6bd57 ./LICENSE -#3b83ef96387f14655fc854ddc3c6bd57 ./service-mgmt-api/sm-api/LICENSE -#3b83ef96387f14655fc854ddc3c6bd57 ./service-mgmt-client/LICENSE -#1dece7821bf3fd70fe1309eaa37d52a2 ./service-mgmt-client/sm-client/LICENSE -#3b83ef96387f14655fc854ddc3c6bd57 ./service-mgmt-tools/sm-tools/LICENSE -#3b83ef96387f14655fc854ddc3c6bd57 ./service-mgmt/LICENSE -#3b83ef96387f14655fc854ddc3c6bd57 ./service-mgmt/sm-common/LICENSE -#3b83ef96387f14655fc854ddc3c6bd57 ./service-mgmt/sm-db/LICENSE -#3b83ef96387f14655fc854ddc3c6bd57 ./service-mgmt/sm/LICENSE - LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" +LIC_FILES_CHKSUM = " \ + file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://service-mgmt-api/sm-api/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://service-mgmt-client/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://service-mgmt-client/sm-client/LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2 \ + file://service-mgmt-tools/sm-tools/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://service-mgmt/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://service-mgmt/sm-common/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://service-mgmt/sm-db/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://service-mgmt/sm/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + " SRC_URI = "git://opendev.org/starlingx/${SRCNAME}.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \ file://0001-Allow-user-to-define-destination-libdir.patch \ @@ -56,8 +54,7 @@ DEPENDS += " \ sqlite3 \ python \ python-pbr-native \ - glib-2.0 \ - sqlite3 \ + glib-2.0 \ " require sm-common.inc @@ -68,7 +65,6 @@ require sm-client.inc require sm-tools.inc require stx-ocf-scripts.inc -#TODO: Shouldn't have to do this LDFLAGS_remove = "-Wl,--as-needed" do_configure () { @@ -85,9 +81,6 @@ do_install () { FILES_${PN} = " " FILES_${PN}-dev += " \ - var/lib/sm/watchdog/modules/libsm_watchdog_nfs.so \ + ${localstatedir}/lib/sm/watchdog/modules/libsm_watchdog_nfs.so \ " -# var/lib/sm/watchdog/modules/libsm_watchdog_nfs.so.1 \ -# var/lib/sm/watchdog/modules/libsm_watchdog_nfs.so.0 \ -# ${libdir}/libsm_common.so.1 \ -# ${libdir}/libsm_common.so.0 +