X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=meta-starlingx%2Fmeta-stx-integ%2Frecipes-extended%2Fsudo%2Fsudo_%25.bbappend;h=d2aa371e75b4791eab07a8f699af94bd4f9edf49;hb=8961614fdfd0c716b792a9d09c87ac69dd66127e;hp=94dd1a2bfcbebec64e292d4467b66b2b9dd3a8fb;hpb=e0634c6eaf2fe2641a0fb90e84a5defb880b1335;p=pti%2Frtp.git diff --git a/meta-starlingx/meta-stx-integ/recipes-extended/sudo/sudo_%.bbappend b/meta-starlingx/meta-stx-integ/recipes-extended/sudo/sudo_%.bbappend index 94dd1a2..d2aa371 100644 --- a/meta-starlingx/meta-stx-integ/recipes-extended/sudo/sudo_%.bbappend +++ b/meta-starlingx/meta-stx-integ/recipes-extended/sudo/sudo_%.bbappend @@ -5,18 +5,17 @@ DEPENDS += " \ libgcrypt \ " -SRCREV_FORMAT = "opendev" -SRCREV_opendev = "d778e862571957ece3c404c0c37d325769772fde" -SUBPATH0 = "sudo-config" -DSTSUFX0 = "stx-configfiles" +inherit stx-metadata + +STX_REPO = "config-files" +STX_SUBPATH = "sudo-config" LICENSE_append = "& Apache-2.0" LIC_FILES_CHKSUM += "\ - file://stx-configfiles-LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://${STX_METADATA_PATH}/files/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ " SRC_URI += " \ - git://opendev.org/starlingx/config-files.git;protocol=https;destsuffix=${DSTSUFX0};branch="r/stx.3.0";subpath=${SUBPATH0};name=opendev \ file://sudo-1.6.7p5-strip.patch \ file://sudo-1.7.2p1-envdebug.patch \ file://sudo-1.8.23-sudoldapconfman.patch \ @@ -39,18 +38,10 @@ EXTRA_OECONF += " \ --with-sssd \ " -do_unpack_append() { - bb.build.exec_func('do_copy_config_files', d) -} - -do_copy_config_files () { - cp -pf ${WORKDIR}/${DSTSUFX0}/files/LICENSE ${S}/stx-configfiles-LICENSE -} - do_install_append () { install -m755 -d ${D}/${sysconfdir}/openldap/schema install -m644 ${S}/doc/schema.OpenLDAP ${D}/${sysconfdir}/openldap/schema/sudo.schema - install -m 440 ${WORKDIR}/${DSTSUFX0}/files/sysadmin.sudo ${D}/${sysconfdir}/sudoers.d/sysadmin + install -m 440 ${STX_METADATA_PATH}/files/sysadmin.sudo ${D}/${sysconfdir}/sudoers.d/sysadmin } # This means sudo package only owns files