starlingx/meta-starlingx
Code Issues Proposed changes

sudo: update for stx 5.0

Browse Source 
* inherit stx-metadata to help install updated files
  from stx 'config-files' repo

* remove do_copy_config_files since it's not
  needed after using stx-metadata

Story: 2008952
Task: 42576

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Change-Id: I0e3d13e4e7774de367d15364ecf85e51448702e8
This commit is contained in:
Jackie Huang
2021-05-12 16:26:46 +08:00
parent 276533913f
commit d2f4559468
1 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
meta-stx-integ/recipes-extended/sudo/sudo_%.bbappend
View File

@@ -5,18 +5,17 @@ DEPENDS += " \
libgcrypt \ libgcrypt \
" "
SRCREV_FORMAT = "opendev" inherit stx-metadata
SRCREV_opendev = "d778e862571957ece3c404c0c37d325769772fde"
SUBPATH0 = "sudo-config" STX_REPO = "config-files"
DSTSUFX0 = "stx-configfiles" STX_SUBPATH = "sudo-config"
LICENSE_append = "& Apache-2.0" LICENSE_append = "& Apache-2.0"
LIC_FILES_CHKSUM += "\ LIC_FILES_CHKSUM += "\
file://stx-configfiles-LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${STX_METADATA_PATH}/files/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
" "
SRC_URI += " \ 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.6.7p5-strip.patch \
file://sudo-1.7.2p1-envdebug.patch \ file://sudo-1.7.2p1-envdebug.patch \
file://sudo-1.8.23-sudoldapconfman.patch \ file://sudo-1.8.23-sudoldapconfman.patch \
@@ -39,18 +38,10 @@ EXTRA_OECONF += " \
--with-sssd \ --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 () { do_install_append () {
install -m755 -d ${D}/${sysconfdir}/openldap/schema install -m755 -d ${D}/${sysconfdir}/openldap/schema
install -m644 ${S}/doc/schema.OpenLDAP ${D}/${sysconfdir}/openldap/schema/sudo.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 # This means sudo package only owns files