From b3f2bb8d832e4dc7873eaeef23be2fd38409d6f9 Mon Sep 17 00:00:00 2001 From: Adriana Kobylak Date: Wed, 6 May 2020 13:14:28 -0500 Subject: phosphor-software-manager: Move to meson (From meta-phosphor rev: 2badcf923f4666c9c83842d0c0bc08132c6ef1c5) Change-Id: I124b014509e2370f65c24a1c3b3672932f156717 Signed-off-by: Adriana Kobylak Signed-off-by: Andrew Geissler --- .../flash/phosphor-software-manager_git.bb | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb') diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb index d83945ea4..e0314c050 100644 --- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb @@ -23,18 +23,17 @@ DBUS_PACKAGES = "${SOFTWARE_MGR_PACKAGES}" # handles the rest. SYSTEMD_PACKAGES = "" -PACKAGECONFIG[verify_signature] = "--enable-verify_signature,--disable-verify_signature" -PACKAGECONFIG[sync_bmc_files] = "--enable-sync_bmc_files,--disable-sync_bmc_files" -PACKAGECONFIG[ubifs_layout] = "--enable-ubifs_layout" -PACKAGECONFIG[flash_bios] = "--enable-host_bios_upgrade" +PACKAGECONFIG[verify_signature] = "-Dverify-signature=enabled, -Dverify-signature=disabled" +PACKAGECONFIG[sync_bmc_files] = "-Dsync-bmc-files=enabled, -Dsync-bmc-files=disabled" +PACKAGECONFIG[ubifs_layout] = "-Dbmc-layout=ubi" +PACKAGECONFIG[flash_bios] = "-Dhost-bios-upgrade=enabled, -Dhost-bios-upgrade=disabled" -inherit autotools pkgconfig +inherit meson pkgconfig inherit obmc-phosphor-dbus-service inherit python3native inherit ${@bb.utils.contains('DISTRO_FEATURES', 'obmc-ubi-fs', 'phosphor-software-manager-ubi-fs', '', d)} DEPENDS += " \ - autoconf-archive-native \ openssl \ phosphor-dbus-interfaces \ phosphor-logging \ @@ -46,10 +45,6 @@ RDEPENDS_${PN}-updater += " \ bash \ virtual-obmc-image-manager \ " -EXTRA_OECONF += " \ - ACTIVE_BMC_MAX_ALLOWED=1 \ - MEDIA_DIR=/run/media \ -" RPROVIDES_${PN}-version += " \ virtual-obmc-image-manager \ -- cgit v1.2.3 From 27583a26f26873988ca746e370507deede0c2b1b Mon Sep 17 00:00:00 2001 From: Adriana Kobylak Date: Fri, 29 May 2020 12:57:11 -0500 Subject: Add phosphor-image-signing if verify_signature is enabled The phosphor-image-signing adds the public key to the BMC rootfs and it was added if the UBI distro was enabled. The phosphor-software-manager supports signature verification regardless of the choice of BMC layout, so add it based if the signature verification config (verify_signture) is enabled. Otherwise the user would need to know that the package phosphor-image-signing needed to be added if the signature verification config was enabled, which is not intuitive. This way it's done automatically. Tested: Verified that adding verify_signature resulted in the /etc/activationdata/ directory being added to the BMC rootfs, and without it no directory was created. (From meta-phosphor rev: 379f327e91542e7b2c3c4fb6b41b325b1a0a3412) Change-Id: If0137b75f6de3b3087389c98229c85c346804912 Signed-off-by: Adriana Kobylak Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb | 1 + meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb') diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb index e0314c050..0ab2a7515 100644 --- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb @@ -44,6 +44,7 @@ DEPENDS += " \ RDEPENDS_${PN}-updater += " \ bash \ virtual-obmc-image-manager \ + ${@bb.utils.contains('PACKAGECONFIG', 'verify_signature', 'phosphor-image-signing', '', d)} \ " RPROVIDES_${PN}-version += " \ diff --git a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb index 8e6fe769c..81895ebc3 100644 --- a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb +++ b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb @@ -105,7 +105,6 @@ RDEPENDS_${PN}-sensors = " \ ${PN}-software-extras = "" ${PN}-software-extras_df-obmc-ubi-fs = " \ - phosphor-image-signing \ phosphor-software-manager-updater-ubi \ " -- cgit v1.2.3 From 88ec2af69064687ea417a44f176fab11336b3aac Mon Sep 17 00:00:00 2001 From: Adriana Kobylak Date: Thu, 4 Jun 2020 14:03:03 -0500 Subject: phosphor-software-manager: Create a new mmc bbclass Add a bbclass for the mmc configuration option. (From meta-phosphor rev: 7df4aa01e4d35e6ec7294f08e4bd3f1d18e61f01) Change-Id: I6602362e511bcffae1e185a72861ae1edec050f9 Signed-off-by: Adriana Kobylak Signed-off-by: Andrew Geissler --- meta-phosphor/classes/phosphor-software-manager-mmc.bbclass | 7 +++++++ .../recipes-phosphor/flash/phosphor-software-manager_git.bb | 3 +++ .../recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb | 4 ++++ 3 files changed, 14 insertions(+) create mode 100644 meta-phosphor/classes/phosphor-software-manager-mmc.bbclass (limited to 'meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb') diff --git a/meta-phosphor/classes/phosphor-software-manager-mmc.bbclass b/meta-phosphor/classes/phosphor-software-manager-mmc.bbclass new file mode 100644 index 000000000..955e65e5b --- /dev/null +++ b/meta-phosphor/classes/phosphor-software-manager-mmc.bbclass @@ -0,0 +1,7 @@ +# eMMC-specific configuration for the phosphor-manager-software package + +PACKAGECONFIG_append = " mmc_layout" + +EXTRA_OEMESON += "-Dactive-bmc-max-allowed=2" +EXTRA_OEMESON += "-Dmedia-dir='/media'" + diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb index 0ab2a7515..d561eba48 100644 --- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb @@ -12,6 +12,7 @@ SOFTWARE_MGR_PACKAGES = " \ ${PN}-download-mgr \ ${PN}-updater \ ${PN}-updater-ubi \ + ${PN}-updater-mmc \ ${PN}-sync \ " PACKAGE_BEFORE_PN += "${SOFTWARE_MGR_PACKAGES}" @@ -26,12 +27,14 @@ SYSTEMD_PACKAGES = "" PACKAGECONFIG[verify_signature] = "-Dverify-signature=enabled, -Dverify-signature=disabled" PACKAGECONFIG[sync_bmc_files] = "-Dsync-bmc-files=enabled, -Dsync-bmc-files=disabled" PACKAGECONFIG[ubifs_layout] = "-Dbmc-layout=ubi" +PACKAGECONFIG[mmc_layout] = "-Dbmc-layout=mmc" PACKAGECONFIG[flash_bios] = "-Dhost-bios-upgrade=enabled, -Dhost-bios-upgrade=disabled" inherit meson pkgconfig inherit obmc-phosphor-dbus-service inherit python3native inherit ${@bb.utils.contains('DISTRO_FEATURES', 'obmc-ubi-fs', 'phosphor-software-manager-ubi-fs', '', d)} +inherit ${@bb.utils.contains('DISTRO_FEATURES', 'phosphor-mmc', 'phosphor-software-manager-mmc', '', d)} DEPENDS += " \ openssl \ diff --git a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb index 81895ebc3..186fdbe57 100644 --- a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb +++ b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb @@ -108,6 +108,10 @@ ${PN}-software-extras_df-obmc-ubi-fs = " \ phosphor-software-manager-updater-ubi \ " +${PN}-software-extras_df-phosphor-mmc = " \ + phosphor-software-manager-updater-mmc \ + " + SUMMARY_${PN}-software = "Software applications" RDEPENDS_${PN}-software = " \ ${VIRTUAL-RUNTIME_obmc-bmc-download-mgr} \ -- cgit v1.2.3