Revert "Revert "oran-shell-release: release image for F""

[pti/rtp.git] / meta-starlingx / meta-stx-cloud / recipes-support / puppet / puppetlabs-stdlib_git.bbappend

diff --git a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppetlabs-stdlib_git.bbappend b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppetlabs-stdlib_git.bbappend
index 49241a3..a93d7eb 100644 (file)
--- a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppetlabs-stdlib_git.bbappend
+++ b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/puppetlabs-stdlib_git.bbappend
@@ -5,13 +5,21 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
 SRCREV = "b89d5f388ca701e38a0e0337408f5ccb7e68565f"
 PROTOCOL = "https"
-BRANCH = "master"
+BRANCH = "main"
 PV = "4.18.0"
 
+inherit stx-metadata
+
+STX_REPO = "integ"
+STX_SUBPATH = "config/puppet-modules/puppet-stdlib-4.12.0/centos/patches"
+
+SRC_URI_STX += " \
+       file://0001-Filter-password-in-logs.patch \
+       "
+
 SRC_URI = " \
        git://github.com/puppetlabs/puppetlabs-stdlib.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
        file://puppetlabs-stdlib/Add-gemspec.patch \
-       file://puppetlabs-stdlib/0001-Filter-password-in-logs.patch \
        "
 
 S = "${WORKDIR}/git"