From f6066ff61e9b04142792a0bc8983ce62019e16ca Mon Sep 17 00:00:00 2001 From: Alexander Filippov Date: Wed, 27 Oct 2021 16:18:26 +0300 Subject: meta-nicole: admin-account: Move to local.conf This refixes of 905072f5c1d2f1e2bd99fb3346ee2978428b992b commit as pure build without sstate-cache is still broken. This commit moves the admin account creation from the standalone package to the bitbake config file. Change-Id: I6d4cfe41b1e6e2f5e707f4e942a8e4df93277e93 Signed-off-by: Alexander Filippov --- meta-yadro/meta-nicole/conf/local.conf.sample | 6 ++++ .../images/obmc-phosphor-image.bbappend | 1 - .../recipes-phosphor/users/admin-account.bb | 38 ---------------------- 3 files changed, 6 insertions(+), 39 deletions(-) delete mode 100644 meta-yadro/meta-nicole/recipes-phosphor/users/admin-account.bb (limited to 'meta-yadro') diff --git a/meta-yadro/meta-nicole/conf/local.conf.sample b/meta-yadro/meta-nicole/conf/local.conf.sample index 8e426c7ae..4a91b28ff 100644 --- a/meta-yadro/meta-nicole/conf/local.conf.sample +++ b/meta-yadro/meta-nicole/conf/local.conf.sample @@ -256,3 +256,9 @@ CONF_VERSION = "2" # Set the root password to '0penBmc' # Defaults from meta-phosphor/conf/distro/include/phosphor-defaults.inc + +# Add default administrative account (login: admin, password: admin) +DEFAULT_ADMIN_PASSWORD = "'\$6\$Fze0kFe8\$YjEc0mvYcwZvjBtnVWQ4Os4gFMDj.ogBkg2jTSjpOgFQpT33hDitAUheGGJcSZ0PkzRuzOq/xhpJ5bmrFg46R.'" +EXTRA_USERS_PARAMS:append:pn-obmc-phosphor-image = "\ + useradd -p ${DEFAULT_ADMIN_PASSWORD} -g users -G priv-admin,ipmi -N admin; \ +" diff --git a/meta-yadro/meta-nicole/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/images/obmc-phosphor-image.bbappend index a18048d7f..2055e9992 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -1,5 +1,4 @@ OBMC_IMAGE_EXTRA_INSTALL:append = " \ - admin-account \ first-boot-set-hostname \ mboxd \ obmc-yadro-cli \ diff --git a/meta-yadro/meta-nicole/recipes-phosphor/users/admin-account.bb b/meta-yadro/meta-nicole/recipes-phosphor/users/admin-account.bb deleted file mode 100644 index 1bb0ae1a6..000000000 --- a/meta-yadro/meta-nicole/recipes-phosphor/users/admin-account.bb +++ /dev/null @@ -1,38 +0,0 @@ -SUMMARY = "Default administrative account" -DESCRIPTION = "Creating default account for system administrator" -PR = "r1" - -inherit useradd - -# License info -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -# Dependencies -RDEPENDS:${PN} = "\ - sudo \ - phosphor-ipmi-host \ - phosphor-user-manager \ -" - -# Groups -GROUP_ADMIN = "priv-admin" -GROUP_OPERATOR = "priv-operator" -GROUP_USER = "priv-user" -GROUP_IPMI = "ipmi" - -# Default administrative account (login: admin, password: admin) -ADMIN_LOGIN = "admin" -ADMIN_PASSW = "\$1\$Fze0kFe8\$sylEANC01t.osF8OewyB/1" -USERADD_PACKAGES = "${PN}" -USERADD_PARAM:${PN} = "--groups ${GROUP_ADMIN},${GROUP_IPMI} \ - --password '${ADMIN_PASSW}' \ - ${ADMIN_LOGIN}" - -# We don't have package body -ALLOW_EMPTY:${PN} = "1" - -# Workaround for meta-phosphor/classes/phosphor-rootfs-postcommands.bbclass. -# The bb-script cannot add root to non-empty groups (invalid sed command). -GROUPMEMS_PARAM:${PN} = "-a root -g ${GROUP_ADMIN}; \ - -a root -g ${GROUP_IPMI}" -- cgit v1.2.3 From 6e7f398ae7861dd9ee843b50c483f21b36b49a7e Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 3 Nov 2021 10:03:03 -0500 Subject: meta-yadro:meson: pkgconfig inherit required Upstream yocto made a change recently that brought to light a bug in some of our recipes. If your meson makefiles utilize the dependency() function then the recipe must also include pkgconfig. Signed-off-by: Andrew Geissler Change-Id: Ic6813d3ce906f68e7fec1754b4cc4efddae09ffb --- meta-yadro/recipes-yadro/cli/obmc-yadro-backup_git.bb | 2 +- meta-yadro/recipes-yadro/cli/obmc-yadro-fwupdate_git.bb | 2 +- meta-yadro/recipes-yadro/cli/obmc-yadro-lsinventory_git.bb | 2 +- meta-yadro/recipes-yadro/cli/obmc-yadro-lssensors_git.bb | 2 +- meta-yadro/recipes-yadro/cli/obmc-yadro-netconfig_git.bb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'meta-yadro') diff --git a/meta-yadro/recipes-yadro/cli/obmc-yadro-backup_git.bb b/meta-yadro/recipes-yadro/cli/obmc-yadro-backup_git.bb index ae167e3bf..b7055d29b 100644 --- a/meta-yadro/recipes-yadro/cli/obmc-yadro-backup_git.bb +++ b/meta-yadro/recipes-yadro/cli/obmc-yadro-backup_git.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/YADRO-KNS/obmc-yadro-backup" PR = "r1" PV = "1.0+git${SRCPV}" -inherit meson +inherit pkgconfig meson # License info LICENSE = "Apache-2.0" diff --git a/meta-yadro/recipes-yadro/cli/obmc-yadro-fwupdate_git.bb b/meta-yadro/recipes-yadro/cli/obmc-yadro-fwupdate_git.bb index 95eef8fc0..161c54bf0 100644 --- a/meta-yadro/recipes-yadro/cli/obmc-yadro-fwupdate_git.bb +++ b/meta-yadro/recipes-yadro/cli/obmc-yadro-fwupdate_git.bb @@ -6,7 +6,7 @@ PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -inherit meson +inherit pkgconfig meson DEPENDS += " \ sdbusplus \ diff --git a/meta-yadro/recipes-yadro/cli/obmc-yadro-lsinventory_git.bb b/meta-yadro/recipes-yadro/cli/obmc-yadro-lsinventory_git.bb index 89ceb1ee1..2e66a7d95 100644 --- a/meta-yadro/recipes-yadro/cli/obmc-yadro-lsinventory_git.bb +++ b/meta-yadro/recipes-yadro/cli/obmc-yadro-lsinventory_git.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/YADRO-KNS/obmc-yadro-lsinventory" PR = "r1" PV = "1.0+git${SRCPV}" -inherit meson +inherit pkgconfig meson # License info LICENSE = "Apache-2.0" diff --git a/meta-yadro/recipes-yadro/cli/obmc-yadro-lssensors_git.bb b/meta-yadro/recipes-yadro/cli/obmc-yadro-lssensors_git.bb index 5a08c7a3e..f202ab89f 100644 --- a/meta-yadro/recipes-yadro/cli/obmc-yadro-lssensors_git.bb +++ b/meta-yadro/recipes-yadro/cli/obmc-yadro-lssensors_git.bb @@ -7,7 +7,7 @@ PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -inherit meson +inherit pkgconfig meson DEPENDS += "sdbusplus" diff --git a/meta-yadro/recipes-yadro/cli/obmc-yadro-netconfig_git.bb b/meta-yadro/recipes-yadro/cli/obmc-yadro-netconfig_git.bb index 7ec34edfa..9f850cad5 100644 --- a/meta-yadro/recipes-yadro/cli/obmc-yadro-netconfig_git.bb +++ b/meta-yadro/recipes-yadro/cli/obmc-yadro-netconfig_git.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/YADRO-KNS/obmc-yadro-netconfig" PR = "r1" PV = "1.0+git${SRCPV}" -inherit meson +inherit pkgconfig meson # License info LICENSE = "Apache-2.0" -- cgit v1.2.3