diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-11-04 00:19:32 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-11-04 00:19:32 +0300 |
commit | 901ced0812b458fdc599fe40b0a4233d422d6df9 (patch) | |
tree | b0918e0606da0b1925b5fc9aba5e065e0a5a2f0e /meta-yadro | |
parent | ffe6d597d9e3d4407cf8062b5d6505a80ce08f41 (diff) | |
parent | 459d47e59bfb3f80542f17c7eb54ba1f6c1a44f3 (diff) | |
download | openbmc-901ced0812b458fdc599fe40b0a4233d422d6df9.tar.xz |
Merge tag '0.77' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-yadro')
-rw-r--r-- | meta-yadro/meta-nicole/conf/local.conf.sample | 4 | ||||
-rw-r--r-- | meta-yadro/meta-nicole/recipes-phosphor/users/admin-account.bb | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/meta-yadro/meta-nicole/conf/local.conf.sample b/meta-yadro/meta-nicole/conf/local.conf.sample index 041114d79..8e426c7ae 100644 --- a/meta-yadro/meta-nicole/conf/local.conf.sample +++ b/meta-yadro/meta-nicole/conf/local.conf.sample @@ -83,8 +83,8 @@ DISTRO ?= "openbmc-openpower" # - 'package_ipk' for ipk files are used by opkg (a debian style embedded package manager) # - 'package_rpm' for rpm style packages # E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk" -# We default to rpm: -PACKAGE_CLASSES ?= "package_rpm" +# We default to ipk: +PACKAGE_CLASSES ?= "package_ipk" # # SDK target architecture diff --git a/meta-yadro/meta-nicole/recipes-phosphor/users/admin-account.bb b/meta-yadro/meta-nicole/recipes-phosphor/users/admin-account.bb index dbdabb8c9..1bb0ae1a6 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/users/admin-account.bb +++ b/meta-yadro/meta-nicole/recipes-phosphor/users/admin-account.bb @@ -9,9 +9,11 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" # Dependencies -DEPENDS = "sudo \ - phosphor-ipmi-host \ - phosphor-user-manager" +RDEPENDS:${PN} = "\ + sudo \ + phosphor-ipmi-host \ + phosphor-user-manager \ +" # Groups GROUP_ADMIN = "priv-admin" |