X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=meta-stx%2Frecipes-core%2Fstx-integ%2Fibsh_0.3e.bbappend;fp=meta-stx%2Frecipes-core%2Fstx-integ%2Fibsh_0.3e.bbappend;h=782d40cbb3b236782ef64ddca95f3b282b402195;hb=e6258c79f71b12c509c48f7fe149a3674926cd52;hp=6cd9673865f45cf9e467a1d0cb4791e180ae3013;hpb=ad3ab2d9d0a8964ff6393dfc43b88f2ff16a9484;p=pti%2Frtp.git

diff --git a/meta-stx/recipes-core/stx-integ/ibsh_0.3e.bbappend b/meta-stx/recipes-core/stx-integ/ibsh_0.3e.bbappend
index 6cd9673..782d40c 100644
--- a/meta-stx/recipes-core/stx-integ/ibsh_0.3e.bbappend
+++ b/meta-stx/recipes-core/stx-integ/ibsh_0.3e.bbappend
@@ -13,27 +13,30 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+PROTOCOL = "https"
+BRANCH = "r/stx.3.0"
+SRCNAME = "integ"
+SRCREV = "0bf4b546df8c7fdec8cfc6cb6f71b9609ee54306"
 
-SRC_URI += " \
-	file://${PN}/ibsh-0.3e.patch \
-	file://${PN}/ibsh-0.3e-cgcs.patch \
-	file://${PN}/ibsh-0.3e-cgcs-copyright.patch \
-	file://${PN}/admin.cmds \
-	file://${PN}/admin.xtns \
-	file://${PN}/LICENSE \
-	file://${PN}/operator.cmds \
-	file://${PN}/operator.xtns \
-	file://${PN}/secadmin.cmds \
-	file://${PN}/secadmin.xtns \
-	"
+SRC_URI += "git://opendev.org/starlingx/${SRCNAME}.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH};destsuffix=stx-patches;subpath=base/cgcs-users/cgcs-users-1.0"
+
+do_patch_append () {
+    bb.build.exec_func('stx_do_patch', d)
+}
+
+stx_do_patch () {
+	cd ${S}
+	patch -p1 < ${WORKDIR}/stx-patches/ibsh-0.3e.patch
+	patch -p1 < ${WORKDIR}/stx-patches/ibsh-0.3e-cgcs.patch
+	patch -p1 < ${WORKDIR}/stx-patches/ibsh-0.3e-cgcs-copyright.patch
+}
 
 do_install_append() {
-	cp ${WORKDIR}/${PN}/admin.cmds ${D}/${sysconfdir}/ibsh/cmds/
-	cp ${WORKDIR}/${PN}/admin.xtns ${D}/${sysconfdir}/ibsh/xtns/
-	cp ${WORKDIR}/${PN}/operator.cmds ${D}/${sysconfdir}/ibsh/cmds/
-	cp ${WORKDIR}/${PN}/operator.xtns ${D}/${sysconfdir}/ibsh/xtns/
-	cp ${WORKDIR}/${PN}/secadmin.cmds ${D}/${sysconfdir}/ibsh/cmds/
-	cp ${WORKDIR}/${PN}/secadmin.xtns ${D}/${sysconfdir}/ibsh/xtns/
+	cp ${WORKDIR}/stx-patches/admin.cmds ${D}/${sysconfdir}/ibsh/cmds/
+	cp ${WORKDIR}/stx-patches/admin.xtns ${D}/${sysconfdir}/ibsh/xtns/
+	cp ${WORKDIR}/stx-patches/operator.cmds ${D}/${sysconfdir}/ibsh/cmds/
+	cp ${WORKDIR}/stx-patches/operator.xtns ${D}/${sysconfdir}/ibsh/xtns/
+	cp ${WORKDIR}/stx-patches/secadmin.cmds ${D}/${sysconfdir}/ibsh/cmds/
+	cp ${WORKDIR}/stx-patches/secadmin.xtns ${D}/${sysconfdir}/ibsh/xtns/
 }