diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-09-28 20:46:50 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-09-28 20:46:50 +0300 |
| commit | d73e39703a0260c8911cb439b579e1c2bada4b20 (patch) | |
| tree | 4fa9f965ae954c587ab773ecaced6b8f8e18d359 /meta-security/meta-hardening/recipes-core | |
| parent | 6f106a0a4ce15fe0678d4ffefd572e6978c72597 (diff) | |
| parent | 6d8c5d2c6204714ca6b7a43f04348162b683cdbc (diff) | |
| download | openbmc-d73e39703a0260c8911cb439b579e1c2bada4b20.tar.xz | |
Merge tag '0.75' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-security/meta-hardening/recipes-core')
4 files changed, 12 insertions, 11 deletions
diff --git a/meta-security/meta-hardening/recipes-core/base-files/base-files_%.bbappend b/meta-security/meta-hardening/recipes-core/base-files/base-files_%.bbappend index 395630460..0f0384fe3 100644 --- a/meta-security/meta-hardening/recipes-core/base-files/base-files_%.bbappend +++ b/meta-security/meta-hardening/recipes-core/base-files/base-files_%.bbappend @@ -1,4 +1,4 @@ -do_install_append_harden () { +do_install:append_harden () { sed -i 's/umask.*/umask 027/g' ${D}/${sysconfdir}/profile } diff --git a/meta-security/meta-hardening/recipes-core/images/harden-image-minimal.bb b/meta-security/meta-hardening/recipes-core/images/harden-image-minimal.bb index daed3fbcc..38771cdfb 100644 --- a/meta-security/meta-hardening/recipes-core/images/harden-image-minimal.bb +++ b/meta-security/meta-hardening/recipes-core/images/harden-image-minimal.bb @@ -1,7 +1,7 @@ SUMMARY = "A small image for an example hardening OE." IMAGE_INSTALL = "packagegroup-core-boot packagegroup-hardening" -IMAGE_INSTALL_append = " os-release" +IMAGE_INSTALL:append = " os-release" IMAGE_FEATURES = "" IMAGE_LINGUAS = " " @@ -10,7 +10,8 @@ LICENSE = "MIT" IMAGE_ROOTFS_SIZE ?= "8192" -inherit core-image extrausers +inherit core-image +IMAGE_CLASSES:append = " extrausers" ROOT_DEFAULT_PASSWORD ?= "1SimplePw!" DEFAULT_ADMIN_ACCOUNT ?= "myadmin" @@ -19,7 +20,7 @@ DEFAULT_ADMIN_ACCOUNT_PASSWORD ?= "1SimplePw!" EXTRA_USERS_PARAMS = "${@bb.utils.contains('DISABLE_ROOT', 'True', "usermod -L root;", "usermod -P '${ROOT_DEFAULT_PASSWORD}' root;", d)}" -EXTRA_USERS_PARAMS += "useradd ${DEFAULT_ADMIN_ACCOUNT};" -EXTRA_USERS_PARAMS += "groupadd ${DEFAULT_ADMIN_GROUP};" -EXTRA_USERS_PARAMS += "usermod -P '${DEFAULT_ADMIN_ACCOUNT_PASSWORD}' ${DEFAULT_ADMIN_ACCOUNT};" -EXTRA_USERS_PARAMS += "usermod -aG ${DEFAULT_ADMIN_GROUP} ${DEFAULT_ADMIN_ACCOUNT};" +EXTRA_USERS_PARAMS:append = " useradd ${DEFAULT_ADMIN_ACCOUNT};" +EXTRA_USERS_PARAMS:append = " groupadd ${DEFAULT_ADMIN_GROUP};" +EXTRA_USERS_PARAMS:append = " usermod -P '${DEFAULT_ADMIN_ACCOUNT_PASSWORD}' ${DEFAULT_ADMIN_ACCOUNT};" +EXTRA_USERS_PARAMS:append = " usermod -aG ${DEFAULT_ADMIN_GROUP} ${DEFAULT_ADMIN_ACCOUNT};" diff --git a/meta-security/meta-hardening/recipes-core/initscripts/initscripts_1.0.bbappend b/meta-security/meta-hardening/recipes-core/initscripts/initscripts_1.0.bbappend index f943cb371..b27dee9d0 100644 --- a/meta-security/meta-hardening/recipes-core/initscripts/initscripts_1.0.bbappend +++ b/meta-security/meta-hardening/recipes-core/initscripts/initscripts_1.0.bbappend @@ -1,8 +1,8 @@ -FILESEXTRAPATHS_prepend_harden := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend_harden := "${THISDIR}/files:" -SRC_URI_append_harden = " file://mountall.sh" +SRC_URI:append_harden = " file://mountall.sh" -do_install_append_harden() { +do_install:append_harden() { install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/mountall.sh ${D}${sysconfdir}/init.d } diff --git a/meta-security/meta-hardening/recipes-core/packagegroups/packagegroup-hardening.bb b/meta-security/meta-hardening/recipes-core/packagegroups/packagegroup-hardening.bb index 1dcd5fc3d..51676b22d 100644 --- a/meta-security/meta-hardening/recipes-core/packagegroups/packagegroup-hardening.bb +++ b/meta-security/meta-hardening/recipes-core/packagegroups/packagegroup-hardening.bb @@ -11,7 +11,7 @@ PACKAGES = "${PN} \ packagegroup-${PN} \ " -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ init-ifupdown \ ${VIRTUAL-RUNTIME_base-utils-syslog} \ sudo \ |