diff options
Diffstat (limited to 'meta-phosphor')
107 files changed, 887 insertions, 616 deletions
diff --git a/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/files/0006-aspeed-Enable-SPI-master-mode-by-default.patch b/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/files/0006-aspeed-Enable-SPI-master-mode-by-default.patch new file mode 100644 index 000000000..bdb9a0c8f --- /dev/null +++ b/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/files/0006-aspeed-Enable-SPI-master-mode-by-default.patch @@ -0,0 +1,34 @@ +From 7947dbbfb21e10e8fb0f852a14485cedf5df1d36 Mon Sep 17 00:00:00 2001 +From: Chanh Nguyen <chanh@os.amperecomputing.com> +Date: Sun, 10 Oct 2021 11:57:20 +0700 +Subject: [PATCH] aspeed: Enable SPI master mode by default + +The ast2500 share the RGMII1 pin and the hw strap pins +for SPI interface mode selection ( pin[12:13] ). +In some systems, the RGMII/NCSI interface will use the pin. +It makes the SPI interface mode setting is not correct. + +This patch will enable the SPI master mode by default. + +Signed-off-by: Chanh Nguyen <chanh@os.amperecomputing.com> +--- + board/aspeed/ast-g5/ast-g5.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/board/aspeed/ast-g5/ast-g5.c b/board/aspeed/ast-g5/ast-g5.c +index e67a4bf8b2..82e9f81acc 100644 +--- a/board/aspeed/ast-g5/ast-g5.c ++++ b/board/aspeed/ast-g5/ast-g5.c +@@ -21,6 +21,9 @@ int board_init(void) + gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100; + gd->flags = 0; + ++ //pin switch by trap[13:12] -- [0:1] Enable SPI Master ++ ast_scu_spi_master(1); /* enable SPI master */ ++ + return 0; + } + +-- +2.17.1 + diff --git a/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/u-boot-aspeed.inc b/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/u-boot-aspeed.inc index 69b50d6d2..5a0b7e66f 100644 --- a/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/u-boot-aspeed.inc +++ b/meta-phosphor/aspeed-layer/recipes-bsp/u-boot/u-boot-aspeed.inc @@ -15,7 +15,9 @@ SRC_URI:append:aspeed:df-isolate-bmc = " \ SRC_URI:append:aspeed:df-aspeednic-use-mac2 = " \ file://0002-board-aspeed-aspeednic-Use-MAC2-for-networking.patch \ " - +SRC_URI:append:aspeed:df-aspeed-spi-master = " \ + file://0006-aspeed-Enable-SPI-master-mode-by-default.patch \ + " do_patch[depends] += "os-release:do_populate_sysroot" python do_patch:append:aspeed:df-obmc-ubi-fs () { diff --git a/meta-phosphor/classes/dbus-dir.bbclass b/meta-phosphor/classes/dbus-dir.bbclass index f66346399..a8ed3e7ec 100644 --- a/meta-phosphor/classes/dbus-dir.bbclass +++ b/meta-phosphor/classes/dbus-dir.bbclass @@ -1,2 +1,2 @@ -dbus_system_confdir="${sysconfdir}/dbus-1/system.d/" +dbus_system_confdir="${datadir}/dbus-1/system.d/" dbus_system_servicesdir="${datadir}/dbus-1/system-services/" diff --git a/meta-phosphor/classes/image_types_phosphor.bbclass b/meta-phosphor/classes/image_types_phosphor.bbclass index be3bbdf50..64fec000b 100644 --- a/meta-phosphor/classes/image_types_phosphor.bbclass +++ b/meta-phosphor/classes/image_types_phosphor.bbclass @@ -502,11 +502,13 @@ def get_pubkey_path(d): python do_generate_phosphor_manifest() { purpose = d.getVar('VERSION_PURPOSE', True) version = do_get_version(d) + build_id = do_get_buildID(d) target_machine = d.getVar('MACHINE', True) extended_version = (d.getVar('EXTENDED_VERSION', True) or "") with open('MANIFEST', 'w') as fd: fd.write('purpose={}\n'.format(purpose)) fd.write('version={}\n'.format(version.strip('"'))) + fd.write('BuildId={}\n'.format(build_id.strip('"'))) fd.write('ExtendedVersion={}\n'.format(extended_version)) fd.write('KeyType={}\n'.format(get_pubkey_type(d))) fd.write('HashType=RSA-SHA256\n') diff --git a/meta-phosphor/classes/image_version.bbclass b/meta-phosphor/classes/image_version.bbclass index 56ebe665c..17f324e2e 100644 --- a/meta-phosphor/classes/image_version.bbclass +++ b/meta-phosphor/classes/image_version.bbclass @@ -7,7 +7,7 @@ def do_get_version(d): import io path = d.getVar('STAGING_DIR_TARGET', True) + d.getVar('sysconfdir', True) path = os.path.join(path, 'os-release') - parser = configparser.SafeConfigParser(strict=False) + parser = configparser.ConfigParser(strict=False) parser.optionxform = str version = '' try: @@ -26,3 +26,21 @@ def do_get_versionID(d): version = version.strip('"') version_id = (hashlib.sha512(version.encode('utf-8')).hexdigest())[:8] return version_id + +def do_get_buildID(d): + import configparser + import io + path = d.getVar('STAGING_DIR_TARGET', True) + d.getVar('sysconfdir', True) + path = os.path.join(path, 'os-release') + parser = configparser.ConfigParser(strict=False) + parser.optionxform = str + build_id = '' + try: + with open(path, 'r') as fd: + buf = '[root]\n' + fd.read() + fd = io.StringIO(buf) + parser.readfp(fd) + build_id = parser['root']['BUILD_ID'] + except: + pass + return build_id diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass index 80c16d22e..4143f34eb 100644 --- a/meta-phosphor/classes/obmc-phosphor-image.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass @@ -72,6 +72,11 @@ FEATURE_PACKAGES_obmc-user-mgmt-ldap ?= "packagegroup-obmc-apps-user-mgmt-ldap" # tree under phosphor-ipmi-host FEATURE_PACKAGES_obmc-net-ipmi:qemuall = "" +# EVB systems do not have a managed system. +FEATURE_PACKAGES_obmc-system-mgmt:phosphor-evb = "" +# QEMU systems are like EVBs and do not have a managed system. +FEATURE_PACKAGES_obmc-system-mgmt:qemuall = "" + # Add new packages to be installed to a package group in # packagegroup-obmc-apps, not here. OBMC_IMAGE_BASE_INSTALL = " \ diff --git a/meta-phosphor/classes/obmc-phosphor-systemd.bbclass b/meta-phosphor/classes/obmc-phosphor-systemd.bbclass index c67fc021f..b1398e007 100644 --- a/meta-phosphor/classes/obmc-phosphor-systemd.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-systemd.bbclass @@ -99,7 +99,7 @@ def SystemdUnit(unit): def systemd_parse_unit(d, path): import configparser - parser = configparser.SafeConfigParser(strict=False) + parser = configparser.ConfigParser(strict=False) parser.optionxform = str parser.read('%s' % path) return parser diff --git a/meta-phosphor/classes/phosphor-deploy-ssh-keys.bbclass b/meta-phosphor/classes/phosphor-deploy-ssh-keys.bbclass index a85d2ac2d..277a55c08 100644 --- a/meta-phosphor/classes/phosphor-deploy-ssh-keys.bbclass +++ b/meta-phosphor/classes/phosphor-deploy-ssh-keys.bbclass @@ -1,13 +1,16 @@ #### # Copyright 2020 Hewlett Packard Enterprise Development LP. -# +# Copyright 2021 Intel Corporation # # Add a basic class to add a privileged user from an ssh # standpoint and a public key passed as an input parameter # from the local.conf file # Example: # INHERIT += "phosphor-deploy-ssh-keys" -# SSH_KEYS = "vejmarie:/home/openbmc/openbmc/meta-hpe/keys/test.pub;" +# +# SSH_KEYS = "vejmarie:/home/openbmc/openbmc/meta-hpe/keys/test.pub" +# or +# SSH_KEYS = "vejmarie:/home/openbmc/openbmc/meta-hpe/keys/test.pub;root:/path/to/id_rsa.pub" #### inherit useradd_base @@ -15,48 +18,46 @@ inherit useradd_base IMAGE_PREPROCESS_COMMAND += "deploy_local_user;" deploy_local_user () { - if [ "${SSH_KEYS}" != "" ]; then - group_settings="${SSH_KEYS}" - current_setting=`echo $group_settings | cut -d ';' -f1` - remaining=`echo $group_settings | cut -d ';' -f2-` - while test "x$current_setting" != "x"; do + if [ "${SSH_KEYS}" == "" ]; then + bbwarn "Trying to deploy SSH keys but input variable is empty (SSH_KEYS)" + return + fi - username=`echo ${SSH_KEYS} | awk -F":" '{ print $1}'` - key_path=`echo ${SSH_KEYS} | awk -F":" '{ print $2}'` + ssh_keys="${SSH_KEYS}" + while [ "${ssh_keys}" != "" ]; do + current_key=`echo "$ssh_keys" | cut -d ';' -f1` + ssh_keys=`echo "$ssh_keys" | cut -s -d ';' -f2-` - if [ ! -d ${IMAGE_ROOTFS}/home/${username} ]; then - perform_useradd "${IMAGE_ROOTFS}" "-R ${IMAGE_ROOTFS} -p '' ${username}" - fi + username=`echo "$current_key" | awk -F":" '{ print $1}'` + key_path=`echo "$current_key" | awk -F":" '{ print $2}'` - if [ ! -d ${IMAGE_ROOTFS}/home/${username}.ssh/ ]; then - install -d ${IMAGE_ROOTFS}/home/${username}/.ssh/ - fi + if [ ! -d ${IMAGE_ROOTFS}/home/${username} ]; then + perform_useradd "${IMAGE_ROOTFS}" "-R ${IMAGE_ROOTFS} -p '' ${username}" + fi - if [ ! -f ${IMAGE_ROOTFS}/home/${username}/.ssh/authorized_keys ]; then - install -m 0600 ${key_path} ${IMAGE_ROOTFS}/home/${username}/.ssh/authorized_keys - else - cat ${key_path} >> ${IMAGE_ROOTFS}/home/${username}/.ssh/authorized_keys - fi + if [ ! -d ${IMAGE_ROOTFS}/home/${username}.ssh/ ]; then + install -d ${IMAGE_ROOTFS}/home/${username}/.ssh/ + fi - uid=`cat ${IMAGE_ROOTFS}/etc/passwd | grep "${username}:" | awk -F ":" '{print $3}'` - guid=`cat ${IMAGE_ROOTFS}/etc/passwd | grep "${username}:" | awk -F ":" '{print $4}'` + if [ ! -f ${IMAGE_ROOTFS}/home/${username}/.ssh/authorized_keys ]; then + install -m 0600 ${key_path} ${IMAGE_ROOTFS}/home/${username}/.ssh/authorized_keys + else + cat ${key_path} >> ${IMAGE_ROOTFS}/home/${username}/.ssh/authorized_keys + fi - chown -R ${uid}:${guid} ${IMAGE_ROOTFS}/home/${username}/.ssh - chmod 600 ${IMAGE_ROOTFS}/home/${username}/.ssh/authorized_keys - chmod 700 ${IMAGE_ROOTFS}/home/${username}/.ssh + uid=`cat ${IMAGE_ROOTFS}/etc/passwd | grep "${username}:" | awk -F ":" '{print $3}'` + guid=`cat ${IMAGE_ROOTFS}/etc/passwd | grep "${username}:" | awk -F ":" '{print $4}'` - is_group=`grep "priv-admin" ${IMAGE_ROOTFS}/etc/group || true` + chown -R ${uid}:${guid} ${IMAGE_ROOTFS}/home/${username}/.ssh + chmod 600 ${IMAGE_ROOTFS}/home/${username}/.ssh/authorized_keys + chmod 700 ${IMAGE_ROOTFS}/home/${username}/.ssh - if [ -z "${is_group}" ]; then - perform_groupadd "${IMAGE_ROOTFS}" "-R ${IMAGE_ROOTFS} priv-admin" - fi + is_group=`grep "priv-admin" ${IMAGE_ROOTFS}/etc/group || true` - perform_usermod "${IMAGE_ROOTFS}" "-R ${IMAGE_ROOTFS} -a -G priv-admin ${username}" + if [ -z "${is_group}" ]; then + perform_groupadd "${IMAGE_ROOTFS}" "-R ${IMAGE_ROOTFS} priv-admin" + fi - current_setting=`echo $remaining | cut -d ";" -f1` - remaining=`echo $remaining | cut -d ';' -f2-` - done - else - bbwarn "Trying to deploy SSH keys but input variable is empty (SSH_KEYS)" - fi + perform_usermod "${IMAGE_ROOTFS}" "-R ${IMAGE_ROOTFS} -a -G priv-admin ${username}" + done } diff --git a/meta-phosphor/classes/skeleton-rev.bbclass b/meta-phosphor/classes/skeleton-rev.bbclass index 75648b004..5e43c34f7 100644 --- a/meta-phosphor/classes/skeleton-rev.bbclass +++ b/meta-phosphor/classes/skeleton-rev.bbclass @@ -1,4 +1,4 @@ -SRCREV ?= "81100ae9ee2bb9929989f0fc813e1ac91f8e7ab0" +SRCREV ?= "77b241c472efc5af618a839493aa8357544ea213" SKELETON_URI ?= "git://github.com/openbmc/skeleton" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" diff --git a/meta-phosphor/conf/distro/include/phosphor-aspeed-spi-master-mode.inc b/meta-phosphor/conf/distro/include/phosphor-aspeed-spi-master-mode.inc new file mode 100644 index 000000000..9c1b48945 --- /dev/null +++ b/meta-phosphor/conf/distro/include/phosphor-aspeed-spi-master-mode.inc @@ -0,0 +1,2 @@ +DISTRO_FEATURES += "obmc-aspeed-spi-master" +DISTROOVERRIDES .= ":df-aspeed-spi-master" diff --git a/meta-phosphor/conf/distro/include/phosphor-base.inc b/meta-phosphor/conf/distro/include/phosphor-base.inc index 731f9f11f..64f293cf0 100644 --- a/meta-phosphor/conf/distro/include/phosphor-base.inc +++ b/meta-phosphor/conf/distro/include/phosphor-base.inc @@ -110,10 +110,6 @@ DISTRO_FEATURES += " \ ${DISTRO_FEATURES_OBMC} \ " -MACHINE_FEATURES += " \ - ${OBMC_MACHINE_FEATURES} \ - " - DISTRO_EXTRA_RDEPENDS:remove:qemuarm = "packagegroup-core-device-devel" include conf/distro/include/openbmc-phosphor/${MACHINE}.inc diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc index 8673a15c1..948a09051 100644 --- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc +++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc @@ -97,8 +97,6 @@ VIRTUAL-RUNTIME_obmc-dump-manager ?= "phosphor-debug-collector-manager" # Provide support for monitoring BMC core dumps VIRTUAL-RUNTIME_obmc-dump-monitor ?= "phosphor-debug-collector-monitor" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt ??= "obmc-phosphor-sysd" - # phosphor-hwmon-config # # The phosphor-hwmon package can have its configuration generated diff --git a/meta-phosphor/conf/machine/include/obmc-evb-common.inc b/meta-phosphor/conf/machine/include/obmc-evb-common.inc new file mode 100644 index 000000000..0d41a1b97 --- /dev/null +++ b/meta-phosphor/conf/machine/include/obmc-evb-common.inc @@ -0,0 +1,4 @@ +# EVB systems have different packages they can support, due to not having a +# managed host. Enable this machine override to allow other recipes to know +# that the machine is a special type. +MACHINEOVERRIDES =. "phosphor-evb:" diff --git a/meta-phosphor/recipes-connectivity/jsnbd/jsnbd_git.bb b/meta-phosphor/recipes-connectivity/jsnbd/jsnbd_git.bb index 7381b3171..3461a9b8b 100644 --- a/meta-phosphor/recipes-connectivity/jsnbd/jsnbd_git.bb +++ b/meta-phosphor/recipes-connectivity/jsnbd/jsnbd_git.bb @@ -15,7 +15,7 @@ RDEPENDS:${PN} += "nbd-client" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/jsnbd" -SRCREV = "164fef38b703032045803f05301b256ed045a094" +SRCREV = "7b7c29369cfeb267efa7f45b271aca6910687461" NBD_PROXY_CONFIG_JSON ??= "${S}/config.sample.json" diff --git a/meta-phosphor/recipes-core/os-release/os-release.bbappend b/meta-phosphor/recipes-core/os-release/os-release.bbappend index 7e90ab3fb..c1dda480f 100644 --- a/meta-phosphor/recipes-core/os-release/os-release.bbappend +++ b/meta-phosphor/recipes-core/os-release/os-release.bbappend @@ -28,7 +28,6 @@ DISTRO_VERSION ??= "${PHOSPHOR_OS_RELEASE_DISTRO_VERSION}" VERSION = "${@'-'.join(d.getVar('VERSION_ID').split('-')[0:2])}" -BUILD_ID := "${@run_git(d, 'describe --abbrev=0')}" OPENBMC_TARGET_MACHINE = "${MACHINE}" OS_RELEASE_FIELDS:append = " BUILD_ID OPENBMC_TARGET_MACHINE EXTENDED_VERSION" diff --git a/meta-phosphor/recipes-core/systemd/systemd/0001-conf-parse-make-config_parse_many-optionally-save-st.patch b/meta-phosphor/recipes-core/systemd/systemd/0001-conf-parse-make-config_parse_many-optionally-save-st.patch new file mode 100644 index 000000000..fedb42d9b --- /dev/null +++ b/meta-phosphor/recipes-core/systemd/systemd/0001-conf-parse-make-config_parse_many-optionally-save-st.patch @@ -0,0 +1,379 @@ +From 819333d81964fd110565d35a33993b831ba60725 Mon Sep 17 00:00:00 2001 +From: Yu Watanabe <watanabe.yu+github@gmail.com> +Date: Mon, 25 Oct 2021 11:13:27 +0900 +Subject: [PATCH] conf-parse: make config_parse_many() optionally save 'struct + stat' for each file + +Fixes #21113. +--- + src/core/load-dropin.c | 18 +++--- + src/network/networkd-network.c | 38 +++++++++--- + src/network/networkd-network.h | 2 +- + src/shared/conf-parser.c | 103 +++++++++++++++++++++++++-------- + src/shared/conf-parser.h | 8 ++- + 5 files changed, 127 insertions(+), 42 deletions(-) + +diff --git a/src/core/load-dropin.c b/src/core/load-dropin.c +index 3bb48564cc..080a63bc7e 100644 +--- a/src/core/load-dropin.c ++++ b/src/core/load-dropin.c +@@ -113,14 +113,16 @@ int unit_load_dropin(Unit *u) { + } + + u->dropin_mtime = 0; +- STRV_FOREACH(f, u->dropin_paths) +- (void) config_parse( +- u->id, *f, NULL, +- UNIT_VTABLE(u)->sections, +- config_item_perf_lookup, load_fragment_gperf_lookup, +- 0, +- u, +- &u->dropin_mtime); ++ STRV_FOREACH(f, u->dropin_paths) { ++ struct stat st; ++ ++ r = config_parse(u->id, *f, NULL, ++ UNIT_VTABLE(u)->sections, ++ config_item_perf_lookup, load_fragment_gperf_lookup, ++ 0, u, &st); ++ if (r > 0) ++ u->dropin_mtime = MAX(u->dropin_mtime, timespec_load(&st.st_mtim)); ++ } + + return 0; + } +diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c +index 850b4f449e..32d76e29e4 100644 +--- a/src/network/networkd-network.c ++++ b/src/network/networkd-network.c +@@ -480,7 +480,7 @@ int network_load_one(Manager *manager, OrderedHashmap **networks, const char *fi + config_item_perf_lookup, network_network_gperf_lookup, + CONFIG_PARSE_WARN, + network, +- &network->timestamp); ++ &network->stats_by_path); + if (r < 0) + return r; + +@@ -527,6 +527,28 @@ int network_load(Manager *manager, OrderedHashmap **networks) { + return 0; + } + ++static bool stats_by_path_equal(Hashmap *a, Hashmap *b) { ++ struct stat *st_a, *st_b; ++ const char *path; ++ ++ assert(a); ++ assert(b); ++ ++ if (hashmap_size(a) != hashmap_size(b)) ++ return false; ++ ++ HASHMAP_FOREACH_KEY(st_a, path, a) { ++ st_b = hashmap_get(b, path); ++ if (!st_b) ++ return false; ++ ++ if (!stat_inode_unmodified(st_a, st_b)) ++ return false; ++ } ++ ++ return true; ++} ++ + int network_reload(Manager *manager) { + OrderedHashmap *new_networks = NULL; + Network *n, *old; +@@ -540,14 +562,15 @@ int network_reload(Manager *manager) { + + ORDERED_HASHMAP_FOREACH(n, new_networks) { + r = network_get_by_name(manager, n->name, &old); +- if (r < 0) +- continue; /* The .network file is new. */ +- +- if (n->timestamp != old->timestamp) +- continue; /* The .network file is modified. */ ++ if (r < 0) { ++ log_debug("Found new .network file: %s", n->filename); ++ continue; ++ } + +- if (!streq(n->filename, old->filename)) ++ if (!stats_by_path_equal(n->stats_by_path, old->stats_by_path)) { ++ log_debug("Found updated .network file: %s", n->filename); + continue; ++ } + + r = ordered_hashmap_replace(new_networks, old->name, old); + if (r < 0) +@@ -573,6 +596,7 @@ static Network *network_free(Network *network) { + return NULL; + + free(network->filename); ++ hashmap_free(network->stats_by_path); + + net_match_clear(&network->match); + condition_free_list(network->conditions); +diff --git a/src/network/networkd-network.h b/src/network/networkd-network.h +index b39063fe8a..c8d24a415f 100644 +--- a/src/network/networkd-network.h ++++ b/src/network/networkd-network.h +@@ -72,7 +72,7 @@ struct Network { + + char *name; + char *filename; +- usec_t timestamp; ++ Hashmap *stats_by_path; + char *description; + + /* [Match] section */ +diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c +index d0ac1b2660..9a367d757f 100644 +--- a/src/shared/conf-parser.c ++++ b/src/shared/conf-parser.c +@@ -264,21 +264,18 @@ int config_parse( + const void *table, + ConfigParseFlags flags, + void *userdata, +- usec_t *latest_mtime) { ++ struct stat *ret_stat) { + + _cleanup_free_ char *section = NULL, *continuation = NULL; + _cleanup_fclose_ FILE *ours = NULL; + unsigned line = 0, section_line = 0; + bool section_ignored = false, bom_seen = false; ++ struct stat st; + int r, fd; +- usec_t mtime; + + assert(filename); + assert(lookup); + +- /* latest_mtime is an input-output parameter: it will be updated if the mtime of the file we're +- * looking at is later than the current *latest_mtime value. */ +- + if (!f) { + f = ours = fopen(filename, "re"); + if (!f) { +@@ -287,22 +284,28 @@ int config_parse( + if ((flags & CONFIG_PARSE_WARN) || errno == ENOENT) + log_full_errno(errno == ENOENT ? LOG_DEBUG : LOG_ERR, errno, + "Failed to open configuration file '%s': %m", filename); +- return errno == ENOENT ? 0 : -errno; ++ ++ if (errno == ENOENT) { ++ if (ret_stat) ++ *ret_stat = (struct stat) {}; ++ ++ return 0; ++ } ++ ++ return -errno; + } + } + + fd = fileno(f); + if (fd >= 0) { /* stream might not have an fd, let's be careful hence */ +- struct stat st; + + if (fstat(fd, &st) < 0) + return log_full_errno(FLAGS_SET(flags, CONFIG_PARSE_WARN) ? LOG_ERR : LOG_DEBUG, errno, + "Failed to fstat(%s): %m", filename); + + (void) stat_warn_permissions(filename, &st); +- mtime = timespec_load(&st.st_mtim); + } else +- mtime = 0; ++ st = (struct stat) {}; + + for (;;) { + _cleanup_free_ char *buf = NULL; +@@ -422,12 +425,43 @@ int config_parse( + } + } + +- if (latest_mtime) +- *latest_mtime = MAX(*latest_mtime, mtime); ++ if (ret_stat) ++ *ret_stat = st; + + return 1; + } + ++static int hashmap_put_stats_by_path(Hashmap **stats_by_path, const char *path, const struct stat *st) { ++ _cleanup_free_ struct stat *st_copy = NULL; ++ _cleanup_free_ char *path_copy = NULL; ++ int r; ++ ++ assert(stats_by_path); ++ assert(path); ++ assert(st); ++ ++ r = hashmap_ensure_allocated(stats_by_path, &path_hash_ops_free_free); ++ if (r < 0) ++ return r; ++ ++ st_copy = newdup(struct stat, st, 1); ++ if (!st_copy) ++ return -ENOMEM; ++ ++ path_copy = strdup(path); ++ if (!path) ++ return -ENOMEM; ++ ++ r = hashmap_put(*stats_by_path, path_copy, st_copy); ++ if (r < 0) ++ return r; ++ ++ assert(r > 0); ++ TAKE_PTR(path_copy); ++ TAKE_PTR(st_copy); ++ return 0; ++} ++ + static int config_parse_many_files( + const char* const* conf_files, + char **files, +@@ -436,30 +470,53 @@ static int config_parse_many_files( + const void *table, + ConfigParseFlags flags, + void *userdata, +- usec_t *ret_mtime) { ++ Hashmap **ret_stats_by_path) { + +- usec_t mtime = 0; ++ _cleanup_hashmap_free_ Hashmap *stats_by_path = NULL; ++ struct stat st; + char **fn; + int r; + ++ if (ret_stats_by_path) { ++ stats_by_path = hashmap_new(&path_hash_ops_free_free); ++ if (!stats_by_path) ++ return -ENOMEM; ++ } ++ + /* First read the first found main config file. */ + STRV_FOREACH(fn, (char**) conf_files) { +- r = config_parse(NULL, *fn, NULL, sections, lookup, table, flags, userdata, &mtime); ++ r = config_parse(NULL, *fn, NULL, sections, lookup, table, flags, userdata, &st); + if (r < 0) + return r; +- if (r > 0) +- break; ++ if (r == 0) ++ continue; ++ ++ if (ret_stats_by_path) { ++ r = hashmap_put_stats_by_path(&stats_by_path, *fn, &st); ++ if (r < 0) ++ return r; ++ } ++ ++ break; + } + + /* Then read all the drop-ins. */ + STRV_FOREACH(fn, files) { +- r = config_parse(NULL, *fn, NULL, sections, lookup, table, flags, userdata, &mtime); ++ r = config_parse(NULL, *fn, NULL, sections, lookup, table, flags, userdata, &st); + if (r < 0) + return r; ++ if (r == 0) ++ continue; ++ ++ if (ret_stats_by_path) { ++ r = hashmap_put_stats_by_path(&stats_by_path, *fn, &st); ++ if (r < 0) ++ return r; ++ } + } + +- if (ret_mtime) +- *ret_mtime = mtime; ++ if (ret_stats_by_path) ++ *ret_stats_by_path = TAKE_PTR(stats_by_path); + + return 0; + } +@@ -473,7 +530,7 @@ int config_parse_many_nulstr( + const void *table, + ConfigParseFlags flags, + void *userdata, +- usec_t *ret_mtime) { ++ Hashmap **ret_stats_by_path) { + + _cleanup_strv_free_ char **files = NULL; + int r; +@@ -484,7 +541,7 @@ int config_parse_many_nulstr( + + return config_parse_many_files(STRV_MAKE_CONST(conf_file), + files, sections, lookup, table, flags, userdata, +- ret_mtime); ++ ret_stats_by_path); + } + + /* Parse each config file in the directories specified as strv. */ +@@ -497,7 +554,7 @@ int config_parse_many( + const void *table, + ConfigParseFlags flags, + void *userdata, +- usec_t *ret_mtime) { ++ Hashmap **ret_stats_by_path) { + + _cleanup_strv_free_ char **dropin_dirs = NULL; + _cleanup_strv_free_ char **files = NULL; +@@ -513,7 +570,7 @@ int config_parse_many( + if (r < 0) + return r; + +- return config_parse_many_files(conf_files, files, sections, lookup, table, flags, userdata, ret_mtime); ++ return config_parse_many_files(conf_files, files, sections, lookup, table, flags, userdata, ret_stats_by_path); + } + + #define DEFINE_PARSER(type, vartype, conv_func) \ +diff --git a/src/shared/conf-parser.h b/src/shared/conf-parser.h +index c3a138274d..f893a53aa0 100644 +--- a/src/shared/conf-parser.h ++++ b/src/shared/conf-parser.h +@@ -6,8 +6,10 @@ + #include <stddef.h> + #include <stdio.h> + #include <syslog.h> ++#include <sys/stat.h> + + #include "alloc-util.h" ++#include "hashmap.h" + #include "log.h" + #include "macro.h" + #include "time-util.h" +@@ -89,7 +91,7 @@ int config_parse( + const void *table, + ConfigParseFlags flags, + void *userdata, +- usec_t *latest_mtime); /* input/output, possibly NULL */ ++ struct stat *ret_stat); /* possibly NULL */ + + int config_parse_many_nulstr( + const char *conf_file, /* possibly NULL */ +@@ -99,7 +101,7 @@ int config_parse_many_nulstr( + const void *table, + ConfigParseFlags flags, + void *userdata, +- usec_t *ret_mtime); /* possibly NULL */ ++ Hashmap **ret_stats_by_path); /* possibly NULL */ + + int config_parse_many( + const char* const* conf_files, /* possibly empty */ +@@ -110,7 +112,7 @@ int config_parse_many( + const void *table, + ConfigParseFlags flags, + void *userdata, +- usec_t *ret_mtime); /* possibly NULL */ ++ Hashmap **ret_stats_by_path); /* possibly NULL */ + + CONFIG_PARSER_PROTOTYPE(config_parse_int); + CONFIG_PARSER_PROTOTYPE(config_parse_unsigned); +-- +2.33.0.1079.g6e70778dc9-goog + diff --git a/meta-phosphor/recipes-core/systemd/systemd/0001-journal-network-timesync-fix-segfault-on-32bit-timev.patch b/meta-phosphor/recipes-core/systemd/systemd/0001-journal-network-timesync-fix-segfault-on-32bit-timev.patch deleted file mode 100644 index c3af62e15..000000000 --- a/meta-phosphor/recipes-core/systemd/systemd/0001-journal-network-timesync-fix-segfault-on-32bit-timev.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 83676e4278cecb44316e6ae88e1365e6fcfdd4ff Mon Sep 17 00:00:00 2001 -From: Yu Watanabe <watanabe.yu+github@gmail.com> -Date: Wed, 15 Sep 2021 23:29:11 +0900 -Subject: [PATCH] journal,network,timesync: fix segfault on 32bit - timeval/timespec systems - -Fixes #20741. ---- - src/journal/journald-server.c | 7 +++++-- - src/libsystemd-network/icmp6-util.c | 3 ++- - src/timesync/timesyncd-manager.c | 3 ++- - 3 files changed, 9 insertions(+), 4 deletions(-) - -diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c -index abd52f7c14..2d1d9e66d7 100644 ---- a/src/journal/journald-server.c -+++ b/src/journal/journald-server.c -@@ -1275,11 +1275,14 @@ int server_process_datagram( - /* We use NAME_MAX space for the SELinux label here. The kernel currently enforces no limit, but - * according to suggestions from the SELinux people this will change and it will probably be - * identical to NAME_MAX. For now we use that, but this should be updated one day when the final -- * limit is known. */ -+ * limit is known. -+ * -+ * Here, we need to explicitly initialize the buffer with zero, as glibc has a bug in -+ * __convert_scm_timestamps(), which assumes the buffer is initialized. See #20741. */ - CMSG_BUFFER_TYPE(CMSG_SPACE(sizeof(struct ucred)) + - CMSG_SPACE_TIMEVAL + - CMSG_SPACE(sizeof(int)) + /* fd */ -- CMSG_SPACE(NAME_MAX) /* selinux label */) control; -+ CMSG_SPACE(NAME_MAX) /* selinux label */) control = {}; - - union sockaddr_union sa = {}; - -diff --git a/src/libsystemd-network/icmp6-util.c b/src/libsystemd-network/icmp6-util.c -index 823be0f275..3832bbd920 100644 ---- a/src/libsystemd-network/icmp6-util.c -+++ b/src/libsystemd-network/icmp6-util.c -@@ -148,8 +148,9 @@ int icmp6_send_router_solicitation(int s, const struct ether_addr *ether_addr) { - int icmp6_receive(int fd, void *buffer, size_t size, struct in6_addr *ret_dst, - triple_timestamp *ret_timestamp) { - -+ /* This needs to be initialized with zero. See #20741. */ - CMSG_BUFFER_TYPE(CMSG_SPACE(sizeof(int)) + /* ttl */ -- CMSG_SPACE_TIMEVAL) control; -+ CMSG_SPACE_TIMEVAL) control = {}; - struct iovec iov = {}; - union sockaddr_union sa = {}; - struct msghdr msg = { -diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c -index 648e804105..e37db1c570 100644 ---- a/src/timesync/timesyncd-manager.c -+++ b/src/timesync/timesyncd-manager.c -@@ -412,7 +412,8 @@ static int manager_receive_response(sd_event_source *source, int fd, uint32_t re - .iov_base = &ntpmsg, - .iov_len = sizeof(ntpmsg), - }; -- CMSG_BUFFER_TYPE(CMSG_SPACE_TIMESPEC) control; -+ /* This needs to be initialized with zero. See #20741. */ -+ CMSG_BUFFER_TYPE(CMSG_SPACE_TIMESPEC) control = {}; - union sockaddr_union server_addr; - struct msghdr msghdr = { - .msg_iov = &iov, --- -2.33.0.309.g3052b89438-goog - diff --git a/meta-phosphor/recipes-core/systemd/systemd/0001-socket-util-introduce-CMSG_SPACE_TIMEVAL-TIMESPEC-ma.patch b/meta-phosphor/recipes-core/systemd/systemd/0001-socket-util-introduce-CMSG_SPACE_TIMEVAL-TIMESPEC-ma.patch deleted file mode 100644 index 3e376ed3a..000000000 --- a/meta-phosphor/recipes-core/systemd/systemd/0001-socket-util-introduce-CMSG_SPACE_TIMEVAL-TIMESPEC-ma.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff --git a/src/basic/socket-util.h b/src/basic/socket-util.h -index f92e425fd6..09e606614c 100644 ---- a/src/basic/socket-util.h -+++ b/src/basic/socket-util.h -@@ -277,6 +277,28 @@ static inline int getsockopt_int(int fd, int level, int optname, int *ret) { - int socket_bind_to_ifname(int fd, const char *ifname); - int socket_bind_to_ifindex(int fd, int ifindex); - -+/* Define a 64bit version of timeval/timespec in any case, even on 32bit userspace. */ -+struct timeval_large { -+ uint64_t tvl_sec, tvl_usec; -+}; -+struct timespec_large { -+ uint64_t tvl_sec, tvl_nsec; -+}; -+ -+/* glibc duplicates timespec/timeval on certain 32bit archs, once in 32bit and once in 64bit. -+ * See __convert_scm_timestamps() in glibc source code. Hence, we need additional buffer space for them -+ * to prevent from recvmsg_safe() returning -EXFULL. */ -+#define CMSG_SPACE_TIMEVAL \ -+ ((sizeof(struct timeval) == sizeof(struct timeval_large)) ? \ -+ CMSG_SPACE(sizeof(struct timeval)) : \ -+ CMSG_SPACE(sizeof(struct timeval)) + \ -+ CMSG_SPACE(sizeof(struct timeval_large))) -+#define CMSG_SPACE_TIMESPEC \ -+ ((sizeof(struct timespec) == sizeof(struct timespec_large)) ? \ -+ CMSG_SPACE(sizeof(struct timespec)) : \ -+ CMSG_SPACE(sizeof(struct timespec)) + \ -+ CMSG_SPACE(sizeof(struct timespec_large))) -+ - ssize_t recvmsg_safe(int sockfd, struct msghdr *msg, int flags); - - int socket_get_family(int fd, int *ret); -diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c -index a0695ec519..abd52f7c14 100644 ---- a/src/journal/journald-server.c -+++ b/src/journal/journald-server.c -@@ -1277,7 +1277,7 @@ int server_process_datagram( - * identical to NAME_MAX. For now we use that, but this should be updated one day when the final - * limit is known. */ - CMSG_BUFFER_TYPE(CMSG_SPACE(sizeof(struct ucred)) + -- CMSG_SPACE(sizeof(struct timeval)) + -+ CMSG_SPACE_TIMEVAL + - CMSG_SPACE(sizeof(int)) + /* fd */ - CMSG_SPACE(NAME_MAX) /* selinux label */) control; - -diff --git a/src/libsystemd-network/icmp6-util.c b/src/libsystemd-network/icmp6-util.c -index 67c6b55d84..823be0f275 100644 ---- a/src/libsystemd-network/icmp6-util.c -+++ b/src/libsystemd-network/icmp6-util.c -@@ -149,7 +149,7 @@ int icmp6_receive(int fd, void *buffer, size_t size, struct in6_addr *ret_dst, - triple_timestamp *ret_timestamp) { - - CMSG_BUFFER_TYPE(CMSG_SPACE(sizeof(int)) + /* ttl */ -- CMSG_SPACE(sizeof(struct timeval))) control; -+ CMSG_SPACE_TIMEVAL) control; - struct iovec iov = {}; - union sockaddr_union sa = {}; - struct msghdr msg = { -@@ -186,7 +186,6 @@ int icmp6_receive(int fd, void *buffer, size_t size, struct in6_addr *ret_dst, - - /* namelen == 0 only happens when running the test-suite over a socketpair */ - -- assert(!(msg.msg_flags & MSG_CTRUNC)); - assert(!(msg.msg_flags & MSG_TRUNC)); - - CMSG_FOREACH(cmsg, &msg) { -diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c -index 9d874cfc8a..648e804105 100644 ---- a/src/timesync/timesyncd-manager.c -+++ b/src/timesync/timesyncd-manager.c -@@ -412,7 +412,7 @@ static int manager_receive_response(sd_event_source *source, int fd, uint32_t re - .iov_base = &ntpmsg, - .iov_len = sizeof(ntpmsg), - }; -- CMSG_BUFFER_TYPE(CMSG_SPACE(sizeof(struct timespec))) control; -+ CMSG_BUFFER_TYPE(CMSG_SPACE_TIMESPEC) control; - union sockaddr_union server_addr; - struct msghdr msghdr = { - .msg_iov = &iov, -@@ -467,6 +467,8 @@ static int manager_receive_response(sd_event_source *source, int fd, uint32_t re - - switch (cmsg->cmsg_type) { - case SCM_TIMESTAMPNS: -+ assert(cmsg->cmsg_len == CMSG_LEN(sizeof(struct timespec))); -+ - recv_time = (struct timespec *) CMSG_DATA(cmsg); - break; - } diff --git a/meta-phosphor/recipes-core/systemd/systemd_249.3.bbappend b/meta-phosphor/recipes-core/systemd/systemd_249.3.bbappend index 1a58ca139..41bdcf908 100644 --- a/meta-phosphor/recipes-core/systemd/systemd_249.3.bbappend +++ b/meta-phosphor/recipes-core/systemd/systemd_249.3.bbappend @@ -1,10 +1,5 @@ -# Backport a fix that is only in main, otherwise all received RAs will fail -# to be parsed. -SRC_URI += "file://0001-socket-util-introduce-CMSG_SPACE_TIMEVAL-TIMESPEC-ma.patch" +# Pin to v249.5 to fix systemd-networkd issues. +SRCREV = "00b0393e65252bf631670604f58b844780b08c50" -# Pin to v249.4 to fix systemd-networkd segfaults. -SRCREV = "4d8fd88b9641fce81272f60f556543f713175403" - -# Additional unsubmitted PR #20752 required to fix additional systemd-networkd -# segfaults. -SRC_URI += "file://0001-journal-network-timesync-fix-segfault-on-32bit-timev.patch" +# Fix https://github.com/systemd/systemd/issues/21113 +SRC_URI += "file://0001-conf-parse-make-config_parse_many-optionally-save-st.patch" diff --git a/meta-phosphor/recipes-devtools/python/pyphosphor_git.bb b/meta-phosphor/recipes-devtools/python/pyphosphor_git.bb index ad11a078d..39fb2925b 100644 --- a/meta-phosphor/recipes-devtools/python/pyphosphor_git.bb +++ b/meta-phosphor/recipes-devtools/python/pyphosphor_git.bb @@ -50,6 +50,6 @@ FILES:${PN}-dbus = "${PYTHON_SITEPACKAGES_DIR}/obmc/dbuslib" SRC_URI += "git://github.com/openbmc/pyphosphor" -SRCREV = "d2aadf1220b03580ab5f93fd15e068040cdb895b" +SRCREV = "cb240aa1ed95799d2ea8bde951c6ed443839a7e0" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-extended/gpioplus/gpioplus_git.bb b/meta-phosphor/recipes-extended/gpioplus/gpioplus_git.bb index 00944f798..9e8c9968a 100644 --- a/meta-phosphor/recipes-extended/gpioplus/gpioplus_git.bb +++ b/meta-phosphor/recipes-extended/gpioplus/gpioplus_git.bb @@ -14,6 +14,6 @@ EXTRA_OEMESON = " \ " SRC_URI += "git://github.com/openbmc/gpioplus" -SRCREV = "71e795a279f1d30b6aca2509dd80c9b072f15efa" +SRCREV = "8944f2e24ad8152793af010906faf06607f0e04b" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-extended/pam/pam-ipmi_git.bb b/meta-phosphor/recipes-extended/pam/pam-ipmi_git.bb index a2bcb909c..e246ee7d2 100644 --- a/meta-phosphor/recipes-extended/pam/pam-ipmi_git.bb +++ b/meta-phosphor/recipes-extended/pam/pam-ipmi_git.bb @@ -8,7 +8,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI += "git://github.com/openbmc/pam-ipmi" -SRCREV = "1ea8be7fe6afbb1c5c94e90e49412f6553295be7" +SRCREV = "08be868a6d18bca99d3580f4b3247c0c953f0f84" S = "${WORKDIR}/git" inherit autotools pkgconfig diff --git a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc index c2d045c97..787e17325 100644 --- a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc +++ b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc @@ -3,4 +3,4 @@ PR = "r1" PV = "1.0+git${SRCPV}" SRC_URI += "git://github.com/openbmc/sdbusplus" -SRCREV = "dfb5642201699dc42a7dda12d72718a8b9568151" +SRCREV = "6d83cf539ac0613e5639ec484c4865317795cd75" diff --git a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb index b4b101936..454ca6097 100644 --- a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb +++ b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb @@ -1,7 +1,7 @@ SUMMARY = "C++ bindings for systemd dbus APIs" DESCRIPTION = "C++ bindings for systemd dbus APIs." -inherit meson +inherit pkgconfig meson inherit python3native include sdbusplus-rev.inc diff --git a/meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb b/meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb index aa05a40c2..be827ad85 100644 --- a/meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb +++ b/meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb @@ -20,6 +20,6 @@ EXTRA_OEMESON = " \ " SRC_URI += "git://github.com/openbmc/sdeventplus" -SRCREV = "dce7381a71d1b62ed16f001a73824fd486243cf2" +SRCREV = "afe64c8c9fd430d60a57830c1571e1d04f63f814" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-extended/stdplus/stdplus_git.bb b/meta-phosphor/recipes-extended/stdplus/stdplus_git.bb index 9306b6f8b..abd989513 100644 --- a/meta-phosphor/recipes-extended/stdplus/stdplus_git.bb +++ b/meta-phosphor/recipes-extended/stdplus/stdplus_git.bb @@ -20,6 +20,6 @@ EXTRA_OEMESON = " \ " SRC_URI += "git://github.com/openbmc/stdplus" -SRCREV = "17759263274090e4f8e4b8e52f99f0a9cc095ba8" +SRCREV = "8b70ecc79add4fd22efe9b41dc3c991a2b13b810" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-graphics/obmc-ikvm/obmc-ikvm_git.bb b/meta-phosphor/recipes-graphics/obmc-ikvm/obmc-ikvm_git.bb index 05e0926b0..7dfee1c84 100644 --- a/meta-phosphor/recipes-graphics/obmc-ikvm/obmc-ikvm_git.bb +++ b/meta-phosphor/recipes-graphics/obmc-ikvm/obmc-ikvm_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=75859989545e37968a99b631ef42722e" DEPENDS = " libvncserver systemd sdbusplus phosphor-logging phosphor-dbus-interfaces" SRC_URI = "git://github.com/openbmc/obmc-ikvm" -SRCREV = "2d2f3dab4253a3d6edf6bef98c5f880f51d2394b" +SRCREV = "f90f68d1e9bc6c53f49ebac6d0b8e11257de77a9" PV = "1.0+git${SRCPV}" @@ -14,4 +14,4 @@ SYSTEMD_SERVICE:${PN} += "start-ipkvm.service" S = "${WORKDIR}/git" -inherit meson systemd +inherit pkgconfig meson systemd diff --git a/meta-phosphor/recipes-phosphor/bios/biosconfig-manager_git.bb b/meta-phosphor/recipes-phosphor/bios/biosconfig-manager_git.bb index ff874969c..bb433d677 100644 --- a/meta-phosphor/recipes-phosphor/bios/biosconfig-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/bios/biosconfig-manager_git.bb @@ -13,7 +13,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=bcd9ada3a943f58551867d72893cc9ab" SRC_URI = "git://github.com/openbmc/bios-settings-mgr" -SRCREV = "b5984b87eb93f57f8bc2c123717527076a560753" +SRCREV = "29656f07b7e81c0bb13ca119b4c6ef62f5e79a18" inherit meson pkgconfig systemd diff --git a/meta-phosphor/recipes-phosphor/certificate/phosphor-bmcweb-cert-config.bb b/meta-phosphor/recipes-phosphor/certificate/phosphor-bmcweb-cert-config.bb deleted file mode 100644 index 1d9f5a3b1..000000000 --- a/meta-phosphor/recipes-phosphor/certificate/phosphor-bmcweb-cert-config.bb +++ /dev/null @@ -1,30 +0,0 @@ -SUMMARY = "Phosphor certificate manager configuration for a bmcweb service" - -PR = "r1" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -RDEPENDS:${PN} = "phosphor-certificate-manager" - -inherit allarch - -SRC_URI = "file://env" - -FILES:${PN} = "${datadir}" - -do_install() { - install -D ${WORKDIR}/env ${D}/${datadir}/phosphor-certificate-manager/bmcweb -} - -pkg_postinst:${PN}() { - LINK="$D$systemd_system_unitdir/multi-user.target.wants/phosphor-certificate-manager@bmcweb.service" - TARGET="../phosphor-certificate-manager@.service" - mkdir -p $D$systemd_system_unitdir/multi-user.target.wants - ln -s $TARGET $LINK -} - -pkg_prerm:${PN}() { - LINK="$D$systemd_system_unitdir/multi-user.target.wants/phosphor-certificate-manager@bmcweb.service" - rm $LINK -} diff --git a/meta-phosphor/recipes-phosphor/certificate/phosphor-bmcweb-cert-config/env b/meta-phosphor/recipes-phosphor/certificate/phosphor-bmcweb-cert-config/env deleted file mode 100644 index af4899a30..000000000 --- a/meta-phosphor/recipes-phosphor/certificate/phosphor-bmcweb-cert-config/env +++ /dev/null @@ -1,12 +0,0 @@ -#D-Bus object path -#example: /xyz/openbmc_project/certs/server/https -ENDPOINT=https - -#Path for the certificate file -CERTPATH=/etc/ssl/certs/https/server.pem - -#Units to restart -UNIT=bmcweb.service - -#Type of the service client/server -TYPE=server diff --git a/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager/phosphor-certificate-manager@.service b/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager/phosphor-certificate-manager@.service deleted file mode 100644 index 255906fab..000000000 --- a/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager/phosphor-certificate-manager@.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Phosphor certificate manager for %I - -[Service] -EnvironmentFile=/usr/share/phosphor-certificate-manager/%I -ExecStart=/usr/bin/env phosphor-certificate-manager --endpoint=${{ENDPOINT}} --path=${{CERTPATH}} --unit=${{UNIT}} --type=${{TYPE}} -SyslogIdentifier=phosphor-certificate-manager -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb b/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb index 30730a4e3..b858958f0 100644 --- a/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb @@ -9,11 +9,11 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI = "git://github.com/openbmc/phosphor-certificate-manager" -SRCREV = "811a29e1941db0157f49d2e05491be945f7b2f07" +SRCREV = "7f7b47bea7bbd518d1ff5a306ecf3806cf8d0834" inherit autotools \ pkgconfig \ - obmc-phosphor-systemd + systemd DEPENDS = " \ autoconf-archive-native \ @@ -28,9 +28,18 @@ S = "${WORKDIR}/git" EXTRA_OECONF += "--disable-tests" -CERT_TMPL = "phosphor-certificate-manager@.service" -SYSTEMD_SERVICE:${PN} = "${CERT_TMPL}" +SYSTEMD_SERVICE:${PN} = "phosphor-certificate-manager@.service" -PACKAGECONFIG ??= "" +PACKAGECONFIG ??= "bmcweb-cert nslcd-authority-cert" PACKAGECONFIG[ibm-hypervisor-cert] = "--enable-ca-cert-extension,," -SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'ibm-hypervisor-cert', 'bmc-vmi-ca-manager.service', '', d)}" +PACKAGECONFIG[bmcweb-cert] = "--enable-bmcweb-cert-config,," +PACKAGECONFIG[nslcd-authority-cert] = "--enable-nslcd-authority-cert-config,," + +SYSTEMD_SERVICE:${PN} = " \ + phosphor-certificate-manager@.service \ + ${@bb.utils.contains('PACKAGECONFIG', 'ibm-hypervisor-cert', 'bmc-vmi-ca-manager.service', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'nslcd-authority-cert', 'phosphor-certificate-manager@authority.service', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'bmcweb', 'phosphor-certificate-manager@bmcweb.service', '', d)} \ + " + +FILES:${PN}:append = " ${systemd_system_unitdir}/* ${datadir}/dbus-1" diff --git a/meta-phosphor/recipes-phosphor/certificate/phosphor-nslcd-authority-cert-config.bb b/meta-phosphor/recipes-phosphor/certificate/phosphor-nslcd-authority-cert-config.bb deleted file mode 100644 index c847b6d7b..000000000 --- a/meta-phosphor/recipes-phosphor/certificate/phosphor-nslcd-authority-cert-config.bb +++ /dev/null @@ -1,30 +0,0 @@ -SUMMARY = "Phosphor certificate manager configuration for an nslcd authority service" - -PR = "r1" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -RDEPENDS:${PN} = "phosphor-certificate-manager" - -inherit allarch - -SRC_URI = "file://env" - -FILES:${PN} = "${datadir}" - -do_install() { - install -D ${WORKDIR}/env ${D}/${datadir}/phosphor-certificate-manager/authority -} - -pkg_postinst:${PN}() { - LINK="$D$systemd_system_unitdir/multi-user.target.wants/phosphor-certificate-manager@authority.service" - TARGET="../phosphor-certificate-manager@.service" - mkdir -p $D$systemd_system_unitdir/multi-user.target.wants - ln -s $TARGET $LINK -} - -pkg_prerm:${PN}() { - LINK="$D$systemd_system_unitdir/multi-user.target.wants/phosphor-certificate-manager@authority.service" - rm $LINK -} diff --git a/meta-phosphor/recipes-phosphor/certificate/phosphor-nslcd-authority-cert-config/env b/meta-phosphor/recipes-phosphor/certificate/phosphor-nslcd-authority-cert-config/env deleted file mode 100644 index d2e8814cb..000000000 --- a/meta-phosphor/recipes-phosphor/certificate/phosphor-nslcd-authority-cert-config/env +++ /dev/null @@ -1,12 +0,0 @@ -#REST URI endpoint -#example: /xyz/openbmc_project/certs/authority/ldap -ENDPOINT=ldap - -#Path for the certificate file -CERTPATH=/etc/ssl/certs/authority - -#Units to restart -UNIT=bmcweb.service - -#Type of service -TYPE=authority diff --git a/meta-phosphor/recipes-phosphor/certificate/phosphor-nslcd-cert-config.bb b/meta-phosphor/recipes-phosphor/certificate/phosphor-nslcd-cert-config.bb deleted file mode 100644 index 7b1e26412..000000000 --- a/meta-phosphor/recipes-phosphor/certificate/phosphor-nslcd-cert-config.bb +++ /dev/null @@ -1,30 +0,0 @@ -SUMMARY = "Phosphor certificate manager configuration for a nslcd certificate" - -PR = "r1" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -RDEPENDS:${PN} = "phosphor-certificate-manager" - -inherit allarch - -SRC_URI = "file://env" - -FILES:${PN} = "${datadir}" - -do_install() { - install -D ${WORKDIR}/env ${D}/${datadir}/phosphor-certificate-manager/nslcd -} - -pkg_postinst:${PN}() { - LINK="$D$systemd_system_unitdir/multi-user.target.wants/phosphor-certificate-manager@nslcd.service" - TARGET="../phosphor-certificate-manager@.service" - mkdir -p $D$systemd_system_unitdir/multi-user.target.wants - ln -s $TARGET $LINK -} - -pkg_prerm:${PN}() { - LINK="$D$systemd_system_unitdir/multi-user.target.wants/phosphor-certificate-manager@nslcd.service" - rm $LINK -} diff --git a/meta-phosphor/recipes-phosphor/certificate/phosphor-nslcd-cert-config/env b/meta-phosphor/recipes-phosphor/certificate/phosphor-nslcd-cert-config/env deleted file mode 100644 index 8ac1bf77e..000000000 --- a/meta-phosphor/recipes-phosphor/certificate/phosphor-nslcd-cert-config/env +++ /dev/null @@ -1,9 +0,0 @@ -#REST URI endpoint -#example: /xyz/openbmc_project/certs/client/ldap -ENDPOINT=ldap - -#Path for the certificate file -CERTPATH=/etc/nslcd/certs/cert.pem - -#Type of the service client/server -TYPE=client diff --git a/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-buttons_git.bb b/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-buttons_git.bb index d81780c38..c1b56ea09 100644 --- a/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-buttons_git.bb +++ b/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-buttons_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" S = "${WORKDIR}/git" SRC_URI += "git://github.com/openbmc/phosphor-buttons.git" -SRCREV = "703c7609353f707f5abb33f4ca726b1803463a92" +SRCREV = "8381d5aa3525e15f1e4bd1f3a5af815107716872" inherit cmake pkgconfig systemd diff --git a/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-power_git.bb b/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-power_git.bb index b9f7dc977..93f1aa0b4 100644 --- a/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-power_git.bb +++ b/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-power_git.bb @@ -15,4 +15,4 @@ DEPENDS += "gpioplus" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-power-control" -SRCREV = "4d209a24588d112dfd61158b2e01dd973d99961e" +SRCREV = "ca9aa00180423b548369a7485bbca641581cc1ab" diff --git a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb index 716cb238c..17ad49b7e 100644 --- a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Entity Manager provides d-bus configuration data \ and configures system sensors" SRC_URI = "git://github.com/openbmc/entity-manager.git file://blocklist.json" -SRCREV = "93db9bf7c8c9d81d2f2f88dbc376c1fcb05a82e3" +SRCREV = "7939a765cb6f6e128c87ab61e2bd86d2cae0f9da" PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" @@ -16,7 +16,7 @@ DEPENDS = "boost \ valijson" S = "${WORKDIR}/git" -inherit meson systemd +inherit pkgconfig meson systemd EXTRA_OEMESON = "-Dtests=disabled" diff --git a/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb b/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb index 62efcdb89..dccc05cc3 100644 --- a/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb +++ b/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb @@ -26,7 +26,7 @@ DEPENDS += "autoconf-archive-native \ SRC_URI += "git://github.com/openbmc/obmc-console" SRC_URI += "file://${BPN}.conf" -SRCREV = "cabd9db06da91ecf2198c1baaf20360d1424c2f3" +SRCREV = "467d3010344d974f3051162d29f13f49c0eb8ea3" PV = "1.0+git${SRCPV}" REGISTERED_SERVICES:${PN} += "obmc_console:tcp:2200:" diff --git a/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager_git.bb b/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager_git.bb index 65f9e3a7b..09e0923c2 100644 --- a/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager_git.bb @@ -20,7 +20,7 @@ RDEPENDS:${PN} += "phosphor-network" RDEPENDS:${PN} += "phosphor-mapper" SRC_URI += "git://github.com/openbmc/phosphor-time-manager" -SRCREV = "295b96b743cded8cdba7b0cda59dc1cfe84f64f0" +SRCREV = "076f9ecef94b5329cc0361352e7af30851010e73" PV = "1.0+git${SRCPV}" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/dbus/dbus-perms.bb b/meta-phosphor/recipes-phosphor/dbus/dbus-perms.bb index ca60b6931..9097222f0 100644 --- a/meta-phosphor/recipes-phosphor/dbus/dbus-perms.bb +++ b/meta-phosphor/recipes-phosphor/dbus/dbus-perms.bb @@ -10,6 +10,8 @@ inherit dbus-dir SRC_URI += "file://org.openbmc.conf" +FILES:${PN}:append = " ${dbus_system_confdir}" + do_install:append() { install -d ${D}${dbus_system_confdir} install -m 0644 ${WORKDIR}/org.openbmc.conf \ diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb index 0f5f7ba2d..119d17ffc 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb @@ -6,7 +6,7 @@ S = "${WORKDIR}/git" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -inherit meson +inherit pkgconfig meson inherit obmc-phosphor-utils inherit phosphor-dbus-yaml inherit python3native @@ -18,7 +18,7 @@ DEPENDS += " \ " SRC_URI = "git://github.com/openbmc/phosphor-dbus-interfaces" -SRCREV = "3a665b28dcc0d9f6926a1f5eb20bc0d9d768418d" +SRCREV = "e0764cf41d16b823a519e9d4f508b588e3e84aba" # Process OBMC_ORG_YAML_SUBDIRS to create Meson config options. # ex. xyz/openbmc_project -> -Ddata_xyz_openbmc_project=true diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb index d4176b70a..fb3ce4870 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb @@ -7,7 +7,7 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-dbus-monitor" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/phosphor-dbus-monitor" -SRCREV = "cfdfa0da249777b7aad9dacf4e4e3198d8309da5" +SRCREV = "0a3fe497b41d4530e0f6ce6f19a8612b41986514" inherit autotools \ pkgconfig \ diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper_git.bb index 3ea5bffa0..1a5a6d21b 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper_git.bb @@ -25,7 +25,7 @@ SYSTEMD_SERVICE:${PN} += " \ " SRC_URI += "git://github.com/openbmc/phosphor-objmgr" -SRCREV = "bedd41655ed9641a9f6c47079e811797869ad8f3" +SRCREV = "bbf456b448b8f281ad3a077083a86e61c86e2249" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/dump/debug-trigger_git.bb b/meta-phosphor/recipes-phosphor/dump/debug-trigger_git.bb index fbb41f211..33ceb3d4a 100644 --- a/meta-phosphor/recipes-phosphor/dump/debug-trigger_git.bb +++ b/meta-phosphor/recipes-phosphor/dump/debug-trigger_git.bb @@ -15,7 +15,7 @@ inherit systemd PR = "r1" PV = "0.1+git${SRCPV}" -SRCREV = "15fe59cb0fc1430bdd05a85e7c7887ccc4e5c013" +SRCREV = "9c7783babcef53d80bf14dc268b72f61651009ad" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" diff --git a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc index 812bc7ac7..09c40ebb3 100644 --- a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc +++ b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-debug-collector" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-debug-collector" -SRCREV = "52ac69c15277bb3210647017403e7e4eb793e93c" +SRCREV = "9b4716aef30b0e6f316d8aa91fbee59c1f73991b" diff --git a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb index 2b7372a22..04388fba3 100644 --- a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb +++ b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb @@ -20,7 +20,7 @@ DBUS_PACKAGES = "${PN}-manager" SYSTEMD_PACKAGES = "${PN}-monitor" -inherit meson \ +inherit pkgconfig meson \ obmc-phosphor-dbus-service \ python3native \ phosphor-debug-collector @@ -147,7 +147,7 @@ def install_dreport_user_script(script_path, d): bb.warn("Invalid format for config value =%s" % line) continue parse_value = revalue.group(0) - config_values = re.split('\W+', parse_value, 1) + config_values = re.split(r'\W+', parse_value, 1) if(len(config_values) != 2): bb.warn("Invalid config value=%s" % parse_value) break; diff --git a/meta-phosphor/recipes-phosphor/ecc/phosphor-ecc_git.bb b/meta-phosphor/recipes-phosphor/ecc/phosphor-ecc_git.bb index 0a73d6e7f..2c77b27ea 100644 --- a/meta-phosphor/recipes-phosphor/ecc/phosphor-ecc_git.bb +++ b/meta-phosphor/recipes-phosphor/ecc/phosphor-ecc_git.bb @@ -15,7 +15,7 @@ DEPENDS += "phosphor-logging" RDEPENDS:${PN} += "phosphor-sel-logger" SRC_URI = "git://github.com/openbmc/phosphor-ecc.git" -SRCREV = "0841f8abf9b38f981d443ecc552cc2b014764bbf" +SRCREV = "a56bb3cae1f176a0dc226e172f559185628d3318" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc index 15e5b4306..cdd3e1f14 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-fan-presence" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-fan-presence" -SRCREV = "3edb065647c2cb73d3593a168cd5452add63f75e" +SRCREV = "c024d780229822fe4eb5a948b4e5d76a8e28f3f9" diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb index 01f3586fa..ea62216c5 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb @@ -13,7 +13,7 @@ inherit systemd S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-pid-control" -SRCREV = "e7507a8b55136accc501408d691bd816abc4833f" +SRCREV = "cca9c659889d149c06e95bab4b8808db4f1e3eab" # Each platform will need a service file that starts # at an appropriate time per system. For instance, if diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc index c748e6a84..d62a8c2c7 100644 --- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc +++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-bmc-code-mgmt" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-bmc-code-mgmt" -SRCREV = "3ea1e870cb2205633d74c32d2b520e71e68be501" +SRCREV = "58e18979f54272cea7af1834011cd249902665c5" diff --git a/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb b/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb index a1ea91354..abf8adf1a 100644 --- a/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb +++ b/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb @@ -44,7 +44,7 @@ FILES:${PN}-monitor += "${nonarch_base_libdir}/udev/rules.d/99-gpio-keys.rules" FILES:${PN}-presence += "${bindir}/phosphor-gpio-presence" SRC_URI += "git://github.com/openbmc/phosphor-gpio-monitor" -SRCREV = "b08a0f691740ef21e28547a57981b1043d46d8ce" +SRCREV = "c4b6ce728089737ad85ab5cfa7f34e2a912f091b" S = "${WORKDIR}/git" EXTRA_OEMESON:append = " -Dtests=disabled" diff --git a/meta-phosphor/recipes-phosphor/health/phosphor-health-monitor_git.bb b/meta-phosphor/recipes-phosphor/health/phosphor-health-monitor_git.bb index 4363d4c0a..cf3f7ad12 100644 --- a/meta-phosphor/recipes-phosphor/health/phosphor-health-monitor_git.bb +++ b/meta-phosphor/recipes-phosphor/health/phosphor-health-monitor_git.bb @@ -15,7 +15,7 @@ DEPENDS += "phosphor-logging" DEPENDS += "nlohmann-json" SRC_URI = "git://github.com/openbmc/phosphor-health-monitor.git;protocol=git" -SRCREV = "2b231e8aa91a76a7c36f1c70c7e4058a38d0a5f1" +SRCREV = "f5151879326e36880ddf2c46fe8c539ce721b0d6" S = "${WORKDIR}/git" SYSTEMD_SERVICE:${PN} = "phosphor-health-monitor.service" diff --git a/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb b/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb index e68960d1d..5e320fe7e 100644 --- a/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb +++ b/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb @@ -20,7 +20,7 @@ DEPENDS += "systemd" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-host-postd" -SRCREV = "2a744b2d70ce9de8519a7c716da5009cb049db17" +SRCREV = "996facb65d554f7c0f14c10e3c9252d67a01e21a" SNOOP_DEVICE ?= "aspeed-lpc-snoop0" POST_CODE_BYTES ?= "1" diff --git a/meta-phosphor/recipes-phosphor/initrdscripts/phosphor-mmc-init.bb b/meta-phosphor/recipes-phosphor/initrdscripts/phosphor-mmc-init.bb index 88807c0f0..96c27da12 100644 --- a/meta-phosphor/recipes-phosphor/initrdscripts/phosphor-mmc-init.bb +++ b/meta-phosphor/recipes-phosphor/initrdscripts/phosphor-mmc-init.bb @@ -13,6 +13,7 @@ RDEPENDS:${PN} += " \ e2fsprogs-e2fsck \ e2fsprogs-mke2fs \ gptfdisk \ + libgpiod-tools \ parted \ udev \ " diff --git a/meta-phosphor/recipes-phosphor/initrdscripts/phosphor-mmc-init/mmc-init.sh b/meta-phosphor/recipes-phosphor/initrdscripts/phosphor-mmc-init/mmc-init.sh index 575b7605a..ad9748e65 100644 --- a/meta-phosphor/recipes-phosphor/initrdscripts/phosphor-mmc-init/mmc-init.sh +++ b/meta-phosphor/recipes-phosphor/initrdscripts/phosphor-mmc-init/mmc-init.sh @@ -10,6 +10,9 @@ get_root() { fslist="proc sys dev run" rodir=/mnt/rofs +mmcdev="/dev/mmcblk0" +rwfsdev="/dev/disk/by-partlabel/rwfs" + cd / mkdir -p $fslist mount dev dev -tdevtmpfs @@ -19,7 +22,6 @@ mount tmpfs run -t tmpfs -o mode=755,nodev # Wait up to 5s for the mmc device to appear. Continue even if the count is # exceeded. A failure will be caught later like in the mount command. -mmcdev="/dev/mmcblk0" count=0 while [ $count -lt 5 ]; do if [ -e "${mmcdev}" ]; then @@ -48,16 +50,29 @@ if ! mount /dev/disk/by-partlabel/"$(get_root)" $rodir -t ext4 -o ro; then /bin/sh fi -rwfsdev="/dev/disk/by-partlabel/rwfs" +# Determine if a factory reset has been requested mkdir -p /var/lock -if test $(fw_printenv -n rwreset) = "true"; then +resetval=$(fw_printenv -n rwreset 2>/dev/null) +gpiopresent=$(gpiofind factory-reset-toggle) +if [ $? -eq 0 ]; then + gpioval=$(gpioget $gpiopresent) +else + gpioval="" +fi +# Prevent unnecessary resets on first boot +if [ -n "$gpioval" -a -z "$resetval" ]; then + fw_setenv rwreset $gpioval + resetval=$gpioval +fi +if [ "$resetval" = "true" -o -n "$gpioval" -a "$resetval" != "$gpioval" ]; then echo "Factory reset requested." if ! mkfs.ext4 -F "${rwfsdev}"; then echo "Reformat for factory reset failed." /bin/sh else - fw_setenv rwreset - echo "Formatting of rwfs is complete." + # gpioval will be an empty string if factory-reset-toggle was not found + fw_setenv rwreset $gpioval + echo "rwfs has been formatted." fi fi diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index 46e4ed42c..e083eb460 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb @@ -13,11 +13,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=175792518e4ac015ab6696d16c4f607e" SRC_URI = "git://github.com/openbmc/bmcweb.git" PV = "1.0+git${SRCPV}" -SRCREV = "c0bd5e4b37f65ce29a392594d1ef240c64c99734" +SRCREV = "8682c5ad05a9dff8ba3575ff5c4e8ceb535f6c5e" S = "${WORKDIR}/git" -inherit meson ptest +inherit pkgconfig meson ptest SRC_URI += " \ file://run-ptest \ diff --git a/meta-phosphor/recipes-phosphor/interfaces/rest-dbus_git.bb b/meta-phosphor/recipes-phosphor/interfaces/rest-dbus_git.bb index 92f2342c8..b68d23488 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/rest-dbus_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/rest-dbus_git.bb @@ -22,6 +22,6 @@ SYSTEMD_SERVICE:${PN} += "rest-dbus.service rest-dbus.socket" SRC_URI += "git://github.com/openbmc/rest-dbus.git" -SRCREV = "9273a302e8f2b3c3e939dff77758e90f163bf6a1" +SRCREV = "99d57f2698568be1bf989057f678ff5c053e7957" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/interfaces/slpd-lite_git.bb b/meta-phosphor/recipes-phosphor/interfaces/slpd-lite_git.bb index 6eaed0fe1..c6fc3a5a9 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/slpd-lite_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/slpd-lite_git.bb @@ -16,6 +16,6 @@ DEPENDS += "autoconf-archive-native" SRC_URI += "git://github.com/openbmc/slpd-lite" -SRCREV = "a592888328e79f0ba61a7099fcb1143bc20a0d43" +SRCREV = "ef078cd0d560b8c49061f0b855f0cb4450e69b3a" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.inc b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.inc index 221b88c32..cb82450f1 100644 --- a/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.inc +++ b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.inc @@ -2,4 +2,4 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-inventory-manager" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/phosphor-inventory-manager" -SRCREV = "1707945afbd6c73376a994f7a576a22c0bfb9c6e" +SRCREV = "15d0c9934f9f23c64df0ae0287e8a33135ba8151" diff --git a/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb b/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb index ac1440338..41593e08d 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb @@ -14,4 +14,4 @@ EXTRA_OECONF = "--disable-tests" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/ipmi-blob-tool" -SRCREV = "2ca843c10ee5b26d1c2db41a54cb0feb967800d8" +SRCREV = "d46530fd76038ba22298155047e07f14f7f8793f" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_git.bb index ec3d3a465..45e393d0d 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_git.bb @@ -15,9 +15,12 @@ DEPENDS += "phosphor-logging" DEPENDS += "protobuf-native" DEPENDS += "protobuf" +PACKAGECONFIG ??= "" +PACKAGECONFIG[blobtool] = ",--disable-blobtool" + S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-ipmi-blobs-binarystore" -SRCREV = "c3abe753fca211f49eb68f7d34e37bfc9eb5d4c4" +SRCREV = "d6f65a1b52d662dfe282ebddab840ce161be6c61" FILES:${PN}:append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" FILES:${PN}:append = " ${libdir}/blob-ipmid/lib*${SOLIBS}" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb index b989ef78c..0604c344a 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb @@ -16,7 +16,7 @@ DEPENDS += " \ S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-ipmi-blobs" -SRCREV = "f39e668c2b87c9453e0e28d5a8886b81ed80c50e" +SRCREV = "3b89eda93870cdc701481afc7da85de7a033e4a6" FILES:${PN} += "${libdir}/ipmid-providers" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt_git.bb index df5b65337..f2ff31d49 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt_git.bb @@ -19,4 +19,4 @@ DEPENDS += "systemd" S = "${WORKDIR}/git" SRC_URI += "git://github.com/openbmc/btbridge" -SRCREV="0a47d9a057c94438380142ff08e892e4df633d87" +SRCREV="713a5470b4a1327abf9857870ba7d9cbcd5a54d4" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_git.bb index e1da1570e..d4bfa5a28 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_git.bb @@ -14,7 +14,7 @@ DEPENDS += "phosphor-ipmi-host" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-ipmi-ethstats" -SRCREV = "6b48b92e08abba4e7b31d69c9a74b1d262718a84" +SRCREV = "c8894c55f5d58862f266aebedc43e2652f529a41" FILES:${PN}:append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" FILES:${PN}:append = " ${libdir}/host-ipmid/lib*${SOLIBS}" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb index 65fb2489b..13acf37ea 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb @@ -6,65 +6,67 @@ PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -inherit autotools pkgconfig -inherit obmc-phosphor-ipmiprovider-symlink -inherit systemd +inherit meson pkgconfig systemd -DEPENDS += "autoconf-archive-native" -DEPENDS += "phosphor-ipmi-blobs" -DEPENDS += "phosphor-logging" -DEPENDS += "sdbusplus" -DEPENDS += "systemd" -DEPENDS += "ipmi-blob-tool" -DEPENDS += "pciutils" -DEPENDS += "function2" +DEPENDS += " \ + phosphor-ipmi-blobs \ + phosphor-logging \ + sdbusplus \ + systemd \ + ipmi-blob-tool \ + function2 \ +" PACKAGECONFIG ?= "cleanup-delete" -PACKAGECONFIG[cleanup-delete] = "--enable-cleanup-delete, --disable-cleanup-delete" +PACKAGECONFIG[cleanup-delete] = "-Dcleanup-delete=enabled,-Dcleanup-delete=disabled" # If using static-layout, reboot-update is a good option to handle updating. # To be able to track the update status, update-status option can be used. # Note that both reboot-update and update-status cannot be enabled at the same time. -PACKAGECONFIG[reboot-update] = "--enable-reboot-update, --disable-reboot-update" -PACKAGECONFIG[update-status] = "--enable-update-status, --disable-update-status" +PACKAGECONFIG[reboot-update] = "-Dreboot-update=true,-Dreboot-update=false" +PACKAGECONFIG[update-status] = "-Dupdate-status=true,-Dupdate-status=false" # Default options for supporting various flash types: -PACKAGECONFIG[static-bmc] = "--enable-static-layout, --disable-static-layout" -PACKAGECONFIG[ubitar-bmc] = "--enable-tarball-ubi, --disable-tarball-ubi" -PACKAGECONFIG[host-bios] = "--enable-host-bios, --disable-host-bios" +PACKAGECONFIG[static-bmc] = "-Dupdate-type=static-layout,-Dupdate-type=none" +PACKAGECONFIG[ubitar-bmc] = "-Dupdate-type=tarball-ubi,-Dupdate-type=none" +PACKAGECONFIG[host-bios] = "-Dhost-bios=true,-Dhost-bios=false" # Hardware options to enable transmitting the data from the host. -PACKAGECONFIG[aspeed-p2a] = "--enable-aspeed-p2a, --disable-aspeed-p2a" -PACKAGECONFIG[aspeed-lpc] = "--enable-aspeed-lpc, --disable-aspeed-lpc" -PACKAGECONFIG[nuvoton-lpc] = "--enable-nuvoton-lpc, --disable-nuvoton-lpc" -PACKAGECONFIG[nuvoton-p2a-vga] = "--enable-nuvoton-p2a-vga, --disable-nuvoton-p2a-vga" -PACKAGECONFIG[nuvoton-p2a-mbox] = "--enable-nuvoton-p2a-mbox, --disable-nuvoton-p2a-mbox" -PACKAGECONFIG[net-bridge] = "--enable-net-bridge, --disable-net-bridge" +# Only one type of p2a or lpc can be enabled. +PACKAGECONFIG[aspeed-p2a] = "-Dp2a-type=aspeed-p2a,,,,,aspeed-lpc nuvoton-lpc nuvoton-p2a-vga nuvoton-p2a-mbox" +PACKAGECONFIG[aspeed-lpc] = "-Dlpc-type=aspeed-lpc,,,,,aspeed-p2a nuvoton-lpc nuvoton-p2a-vga nuvoton-p2a-mbox" +PACKAGECONFIG[nuvoton-lpc] = "-Dlpc-type=nuvoton-lpc,,,,,aspeed-p2a aspeed-lpc nuvoton-p2a-vga nuvoton-p2a-mbox" +PACKAGECONFIG[nuvoton-p2a-vga] = "-Dp2a-type=nuvoton-p2a-vga,,,,,aspeed-p2a aspeed-lpc nuvoton-lpc nuvoton-p2a-mbox" +PACKAGECONFIG[nuvoton-p2a-mbox] = "-Dp2a-type=nuvoton-p2a-mbox,,,,,aspeed-p2a aspeed-lpc nuvoton-lpc nuvoton-p2a-vga" +PACKAGECONFIG[net-bridge] = "-Dnet-bridge=true,-Dnet-bridge=false" -EXTRA_OECONF = "--disable-tests --disable-build-host-tool" +EXTRA_OEMESON = "-Dtests=disabled -Dhost-tool=disabled" # Set this variable in your recipe to set it instead of using MAPPED_ADDRESS directly. IPMI_FLASH_BMC_ADDRESS ?= "0" -EXTRA_OECONF:append = " MAPPED_ADDRESS=${IPMI_FLASH_BMC_ADDRESS}" +EXTRA_OEMESON:append = " -Dmapped-address=${IPMI_FLASH_BMC_ADDRESS}" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-ipmi-flash" -SRCREV = "b487eb47e566df7679e740559582f6d25597feba" +SRCREV = "b8fd6d3813baa5a9fc0327750f8dfeec773ba612" SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE:${PN} += "phosphor-ipmi-flash-bmc-prepare.target \ - phosphor-ipmi-flash-bmc-verify.target \ - phosphor-ipmi-flash-bmc-update.target" +SYSTEMD_SERVICE:${PN} += " \ + phosphor-ipmi-flash-bmc-prepare.target \ + phosphor-ipmi-flash-bmc-verify.target \ + phosphor-ipmi-flash-bmc-update.target \ +" # If they enabled host-bios, add those three extra targets. -HOST_BIOS_TARGETS = "phosphor-ipmi-flash-bios-prepare.target \ - phosphor-ipmi-flash-bios-verify.target \ - phosphor-ipmi-flash-bios-update.target" +HOST_BIOS_TARGETS = " \ + phosphor-ipmi-flash-bios-prepare.target \ + phosphor-ipmi-flash-bios-verify.target \ + phosphor-ipmi-flash-bios-update.target \ +" SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'host-bios', '${HOST_BIOS_TARGETS}', '', d)}" -FILES:${PN}:append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" -FILES:${PN}:append = " ${libdir}/blob-ipmid/lib*${SOLIBS}" -FILES:${PN}-dev:append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la" +FILES:${PN}:append = " ${libdir}/ipmid-providers" +FILES:${PN}:append = " ${libdir}/blob-ipmid" FILES:${PN}:append = " ${libdir}/tmpfiles.d" BLOBIPMI_PROVIDER_LIBRARY += "libfirmwareblob.so" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru.inc index 991e3aa03..f7e417352 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru.inc +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/ipmi-fru-parser" LICENSE = "GPL-3.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=7702f203b58979ebbc31bfaeb44f219c" SRC_URI += "git://github.com/openbmc/ipmi-fru-parser" -SRCREV = "904a2184832efe9b8d1cf66ecace4eb8001ec334" +SRCREV = "bc145078e775d4945f9f0162a2aa4eff58d776e7" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc index d5fb2a56b..201f52b9f 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc @@ -2,4 +2,4 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-host-ipmid" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" SRC_URI += "git://github.com/openbmc/phosphor-host-ipmid" -SRCREV = "c2af98befb8ce52f9e290793e756ad12da0ef2bf" +SRCREV = "78fe1b14f60d55ae335369fb2c6e81ed9ac6d865" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb index dbab372c9..1db304c64 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb @@ -3,7 +3,7 @@ DESCRIPTION = "The IPMB bridge implements a Dbus compliant interface for \ implementing IPMB interfaces" SRC_URI = "git://github.com/openbmc/ipmbbridge.git" -SRCREV = "bd78df6be9f677136ca190d50101c328267ddcd2" +SRCREV = "8227626764edf13350c5f5a5857298a905fb43f7" PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb index bff352e59..ac48699cb 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb @@ -29,4 +29,4 @@ DEPENDS += " \ S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/kcsbridge.git" -SRCREV = "03e6defcbca99c9c00cd37c4afb1d2b415a92acd" +SRCREV = "7580a8e60d868b5bcb1a8f8d276374afe7c0983a" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb index 97df26289..c4fd449c9 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb @@ -18,7 +18,7 @@ DEPENDS += "phosphor-ipmi-host" RRECOMMENDS:${PN} = "pam-ipmi" SRC_URI += "git://github.com/openbmc/phosphor-net-ipmid" -SRCREV = "1c5b3ab05817d62a11f75c2a90b6891b18bf62cc" +SRCREV = "5819666c23ee1d01a54fc5fb2c068bb1da1f29c7" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ssif_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ssif_git.bb index ad9780197..73fea8ad4 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ssif_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ssif_git.bb @@ -21,5 +21,5 @@ DEPENDS += "cli11" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/ssifbridge.git;protocol=git;branch=master" -SRCREV= "b62da097135346b1027a057c675ffc679c6fe3f6" +SRCREV= "2c2b8280584d05d16a4d0c180be8c3a6ee37aec2" diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc index 13ac75bec..5132e45c4 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc @@ -2,4 +2,4 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-led-manager" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-led-manager" -SRCREV = "6c4e0f2f767af5d5096d9f5462ba3af06b649e09" +SRCREV = "d1fdc4f48dfa3f156a61ce06b13b40913eef63e8" diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb index 03f7a6d8c..c549a2265 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb @@ -20,7 +20,7 @@ EXTRA_OEMESON:append = " -Dtests=disabled" SRC_URI += "git://github.com/openbmc/phosphor-led-sysfs" SRC_URI += "file://70-leds.rules" -SRCREV = "520c5e51fd5df42e930c14ccf7dcc3c44d829a87" +SRCREV = "ff26c8ecb828d3afbb213081283342c354dcbc79" S = "${WORKDIR}/git" do_install:append() { diff --git a/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb b/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb index c5c137628..214677690 100644 --- a/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb +++ b/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb @@ -11,7 +11,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=0d30807bb7a4f16d36e96b78f9ed8fae" SRC_URI = "git://github.com/openbmc/libmctp \ file://default" -SRCREV = "ae59f4fe3a3ceaf52a682ada2a2b54855fad2408" +SRCREV = "663ec39ea107c2a736f9bcb20cbfdfa623092ab1" DEPENDS += "autoconf-archive-native \ systemd \ diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb index 244f3ea1b..b419db1c0 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-hostlogger" PR = "r1" PV = "1.0+git${SRCPV}" -inherit meson +inherit pkgconfig meson inherit systemd # License info @@ -22,7 +22,7 @@ RRECOMMENDS:${PN} += "phosphor-debug-collector" # Source code repository S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-hostlogger" -SRCREV = "042b5ba8438d1423f807feb5ef739cda063ea8d2" +SRCREV = "1ecbb996d9c88871db20c455db02ee055bff10f2" # Disable unit tests EXTRA_OEMESON:append = " -Dtests=disabled" diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index 279eb46bb..891f295b0 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb @@ -7,7 +7,7 @@ PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -inherit meson +inherit pkgconfig meson inherit python3native inherit obmc-phosphor-dbus-service inherit phosphor-logging @@ -54,7 +54,7 @@ FILES:phosphor-rsyslog-config += " \ " SRC_URI += "git://github.com/openbmc/phosphor-logging" -SRCREV = "8034ddebe40b7dea16491de9bdb436f2ca72cf0e" +SRCREV = "c1ba04f2a6dc2269b8acfb289adaa72f3288a86d" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/misc/phosphor-misc_git.bb b/meta-phosphor/recipes-phosphor/misc/phosphor-misc_git.bb index 17ef04f55..6f7fe21d4 100644 --- a/meta-phosphor/recipes-phosphor/misc/phosphor-misc_git.bb +++ b/meta-phosphor/recipes-phosphor/misc/phosphor-misc_git.bb @@ -6,7 +6,7 @@ PR = "r1" PV = "1.0+git${SRCPV}" SRC_URI = "git://github.com/openbmc/phosphor-misc" -SRCREV = "688e9134a83379393ddde6aab0602c64e956153d" +SRCREV = "669bb350cd2722f0d2bfd6cb4a22142e7e6c1488" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb b/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb index c553e6dad..137e737c2 100644 --- a/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb +++ b/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb @@ -11,7 +11,7 @@ inherit python3native inherit systemd SRC_URI += "git://github.com/openbmc/phosphor-networkd" -SRCREV = "2c0fc568057c5575a75ad638ea91bc8c65b57160" +SRCREV = "26c40a43b2fde3898ba6786ab28af01cd9125805" DEPENDS += "systemd" DEPENDS += "sdbusplus ${PYTHON_PN}-sdbus++-native" diff --git a/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb b/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb index 349008f85..9f5c0b262 100644 --- a/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb +++ b/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb @@ -12,7 +12,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI += "git://github.com/openbmc/phosphor-snmp" -SRCREV = "9e60ef5f73de20555bbc197eb93ba888775e19e5" +SRCREV = "d560529eb7e22c0b78fb0def20f57c6f35be9dfe" DBUS_SERVICE:${PN} += "xyz.openbmc_project.Network.SNMP.service" diff --git a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb index e6c223e7a..6d7d76ac6 100644 --- a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb +++ b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb @@ -43,7 +43,7 @@ RDEPENDS:${PN}-bmc-state-mgmt = " \ SUMMARY:${PN}-bmcweb = "bmcweb support" RDEPENDS:${PN}-bmcweb = " \ bmcweb \ - phosphor-bmcweb-cert-config \ + phosphor-certificate-manager \ " SUMMARY:${PN}-chassis-state-mgmt = "Chassis state management" @@ -195,6 +195,4 @@ RDEPENDS:${PN}-user-mgmt-ldap = " \ ${PN}-user-mgmt \ nss-pam-ldapd \ phosphor-ldap \ - phosphor-nslcd-cert-config \ - phosphor-nslcd-authority-cert-config \ " diff --git a/meta-phosphor/recipes-phosphor/pldm/pldm.inc b/meta-phosphor/recipes-phosphor/pldm/pldm.inc index 40b959a75..61962233c 100644 --- a/meta-phosphor/recipes-phosphor/pldm/pldm.inc +++ b/meta-phosphor/recipes-phosphor/pldm/pldm.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/pldm" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI = "git://github.com/openbmc/pldm" -SRCREV = "be06bc920c007254d5ffd52adb9d2ba4a111c20e" +SRCREV = "77aef218a514d34c03bc024d83f83e334035792e" diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc index 4f502d36e..7f0d7b4d5 100644 --- a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc +++ b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-power" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-power" -SRCREV = "4c88a4c2c0420735b737c8641c51b34d1cfbb0c3" +SRCREV = "2916ea52b3d4c9ba0d0d90c1e33f333aeb720047" diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-psu-software-manager_git.bb b/meta-phosphor/recipes-phosphor/power/phosphor-psu-software-manager_git.bb index ed16ff6e3..e221b4cca 100644 --- a/meta-phosphor/recipes-phosphor/power/phosphor-psu-software-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/power/phosphor-psu-software-manager_git.bb @@ -2,7 +2,7 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-psu-code-mgmt" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI += "git://github.com/openbmc/phosphor-psu-code-mgmt" -SRCREV = "6d62ceb307409a3b5f1b0012558108bfbfa4300c" +SRCREV = "95ad4ee2854fb926d0495df3fb0a12e0874e6c71" SUMMARY = "Phosphor PSU software manager" DESCRIPTION = "Providing PSU firmware version and upgrade" diff --git a/meta-phosphor/recipes-phosphor/sel-logger/phosphor-sel-logger_git.bb b/meta-phosphor/recipes-phosphor/sel-logger/phosphor-sel-logger_git.bb index 4b165f86b..6c10cb7c5 100644 --- a/meta-phosphor/recipes-phosphor/sel-logger/phosphor-sel-logger_git.bb +++ b/meta-phosphor/recipes-phosphor/sel-logger/phosphor-sel-logger_git.bb @@ -9,7 +9,7 @@ DESCRIPTION = "Utility to write IPMI SEL records to the journal" # SEL_LOGGER_MONITOR_THRESHOLD_EVENTS: # Monitors and logs SEL records for threshold sensor events -inherit meson systemd +inherit pkgconfig meson systemd S = "${WORKDIR}/git" LICENSE = "Apache-2.0" @@ -22,7 +22,7 @@ DEPENDS += " \ " SRC_URI = "git://github.com/openbmc/phosphor-sel-logger.git;protocol=git" -SRCREV = "a138ebd3c759f95c53d61170c05e69bf31718114" +SRCREV = "87e3fcf439f2b943272365e1d294984f39bb52b8" PV = "0.1+git${SRCPV}" diff --git a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb index 61ddf5777..c6b4df23d 100644 --- a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb @@ -2,7 +2,7 @@ SUMMARY = "dbus-sensors" DESCRIPTION = "Dbus Sensor Services Configured from D-Bus" SRC_URI = "git://github.com/openbmc/dbus-sensors.git" -SRCREV = "33703af797949b47375086988daeac89b47b5db1" +SRCREV = "cb5af73f5ddf48c5f9455f41a39b44517089352f" PV = "0.1+git${SRCPV}" @@ -73,7 +73,7 @@ DEPENDS = " \ phosphor-logging \ sdbusplus \ " -inherit meson systemd +inherit pkgconfig meson systemd S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb index 68338c6cf..89c68edf6 100644 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb @@ -5,7 +5,7 @@ PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" -inherit meson +inherit pkgconfig meson inherit obmc-phosphor-systemd PACKAGECONFIG ??= "" @@ -45,7 +45,7 @@ RDEPENDS:max31785-msl = "${VIRTUAL-RUNTIME_base-utils} i2c-tools bash" SRC_URI += "git://github.com/openbmc/phosphor-hwmon" -SRCREV = "04da055198fe03f119e53578ac80a6188461b748" +SRCREV = "b6c1771bfd4dcc4bc461878424b3f71b3bffdbca" S = "${WORKDIR}/git" @@ -55,7 +55,7 @@ S = "${WORKDIR}/git" # 2. For each hwmon the script generates busconfig ACLs. pkg_postinst:${PN}() { hwmon_dir="$D/etc/default/obmc/hwmon" - dbus_dir="$D/etc/dbus-1/system.d" + dbus_dir="$D/${datadir}/dbus-1/system.d" if [ -n "$D" -a -d "${hwmon_dir}" ]; then # Remove existing links and replace with actual copy of the file to prevent diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb index 927b3cfd7..7928b2bcd 100644 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb @@ -15,7 +15,7 @@ DEPENDS += "phosphor-logging" DEPENDS += "nlohmann-json" SRC_URI = "git://github.com/openbmc/phosphor-nvme.git;protocol=git" -SRCREV = "e528b0ae32cbc4c5c7d2595deda1d44d2c1aeb45" +SRCREV = "5022a4ee5cd4d3eaeabc4e991507e71b35b26a16" S = "${WORKDIR}/git" SYSTEMD_SERVICE:${PN} = "xyz.openbmc_project.nvme.manager.service" diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb index 7745a9e6f..9590c4db8 100644 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb @@ -16,7 +16,7 @@ DEPENDS += "nlohmann-json" DEPENDS += "exprtk" SRC_URI = "git://github.com/openbmc/phosphor-virtual-sensor.git;protocol=git" -SRCREV = "74c1e7d8c50175017306e347532c8d7e98dc66d5" +SRCREV = "333e5bf60cdc34450617994f29901b6b131111fa" S = "${WORKDIR}/git" SYSTEMD_SERVICE:${PN} = "phosphor-virtual-sensor.service" diff --git a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager.inc b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager.inc index 2ecfd1fe8..00d72fe65 100644 --- a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager.inc +++ b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager.inc @@ -2,4 +2,4 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-settingsd" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" SRC_URI += "git://github.com/openbmc/phosphor-settingsd" -SRCREV = "235526310114281794f37e177eab34456d059c7a" +SRCREV = "5ff6375ba949c918a27b0a8f8d2119289ce863ab" diff --git a/meta-phosphor/recipes-phosphor/smbios/smbios-mdr_git.bb b/meta-phosphor/recipes-phosphor/smbios/smbios-mdr_git.bb index 0cc97ac8c..bfa69e9c3 100644 --- a/meta-phosphor/recipes-phosphor/smbios/smbios-mdr_git.bb +++ b/meta-phosphor/recipes-phosphor/smbios/smbios-mdr_git.bb @@ -28,7 +28,7 @@ EXTRA_OECMAKE = "-DYOCTO=ON" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/smbios-mdr.git" -SRCREV = "ecbd71baa68d0c2834614d84f24de7d369a51ce4" +SRCREV = "631388e621abad855abbe4abbfb20111da9056f1" SYSTEMD_SERVICE:${PN} += "smbios-mdrv2.service" SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'cpuinfo', 'xyz.openbmc_project.cpuinfo.service', '', d)}" diff --git a/meta-phosphor/recipes-phosphor/srvcfg-manager/srvcfg-manager_git.bb b/meta-phosphor/recipes-phosphor/srvcfg-manager/srvcfg-manager_git.bb index fd43707bf..a033239d9 100644 --- a/meta-phosphor/recipes-phosphor/srvcfg-manager/srvcfg-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/srvcfg-manager/srvcfg-manager_git.bb @@ -10,7 +10,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=7becf906c8f8d03c237bad13bc3dac53" SRC_URI = "git://github.com/openbmc/service-config-manager" -SRCREV = "a19b509352cc7d9fcacf345f81163bf6998ec7b4" +SRCREV = "a1fe1a284df3b652bbf55e69945e2fd2b4c7aded" inherit meson pkgconfig systemd diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-post-code-manager_git.bb b/meta-phosphor/recipes-phosphor/state/phosphor-post-code-manager_git.bb index 915ca310c..d5d81f8ba 100644 --- a/meta-phosphor/recipes-phosphor/state/phosphor-post-code-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/state/phosphor-post-code-manager_git.bb @@ -4,7 +4,7 @@ interface /xyz/openbmc_project/state/boot/raw by snoopd daemon and save them \ in a file under /var/lib for history." SRC_URI = "git://github.com/openbmc/phosphor-post-code-manager.git" -SRCREV = "aed7b3de090005433b16ca986ed3df4dbc81446f" +SRCREV = "9ce5a645f50c0ab94e582abbf95474f636aba678" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb index 434e63550..5f76096ec 100644 --- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb @@ -54,6 +54,7 @@ DEPENDS += "phosphor-dbus-interfaces" DEPENDS += "libcereal" DEPENDS += "nlohmann-json" DEPENDS += "cli11" +DEPENDS += "libgpiod" RDEPENDS:${PN}-chassis += "bash" @@ -186,6 +187,6 @@ SYSTEMD_LINK:${PN}-obmc-targets += "${@compose_list(d, 'QUIESCE_FMT', 'HOST_ERRO SRC_URI += "git://github.com/openbmc/phosphor-state-manager" -SRCREV = "5f8e04a6e169121599b6e1e054900fffd1a42a39" +SRCREV = "1e89e62283ea037823319244fc2de6c351c18538" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/system/files/obmc-phosphor-sysd.py b/meta-phosphor/recipes-phosphor/system/files/obmc-phosphor-sysd.py deleted file mode 100644 index c8080ac2c..000000000 --- a/meta-phosphor/recipes-phosphor/system/files/obmc-phosphor-sysd.py +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env python - -# Contributors Listed Below - COPYRIGHT 2015 -# [+] International Business Machines Corp. -# -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. See the License for the specific language governing -# permissions and limitations under the License. - -import time -import sys -import dbus -import dbus.service -import dbus.mainloop.glib - -if __name__ == '__main__': - print "obmc-phosphor-watchdogd starting..." - - while 1: - time.sleep(5) diff --git a/meta-phosphor/recipes-phosphor/system/files/obmc-phosphor-sysd.service b/meta-phosphor/recipes-phosphor/system/files/obmc-phosphor-sysd.service deleted file mode 100644 index 246d985ba..000000000 --- a/meta-phosphor/recipes-phosphor/system/files/obmc-phosphor-sysd.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Phosphor System Manager - -[Service] -Restart=always -ExecStart=/usr/bin/env obmc-phosphor-sysd -SyslogIdentifier=obmc-phosphor-sysd - -[Install] -WantedBy=multi-user.target diff --git a/meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd.bb b/meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd.bb deleted file mode 100644 index 41a4c1e24..000000000 --- a/meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "Phosphor OpenBMC System Management" -DESCRIPTION = "Phosphor OpenBMC system management reference implementation." -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -inherit obmc-phosphor-pydbus-service - -PROVIDES += "virtual/obmc-system-mgmt" -RPROVIDES:${PN} += "virtual-obmc-system-mgmt" - -S = "${WORKDIR}" -SRC_URI += "file://${PN}.py" diff --git a/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb b/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb index f0f28a096..31e821618 100644 --- a/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb +++ b/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb @@ -8,11 +8,11 @@ LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/telemetry" PV = "1.0+git${SRCPV}" -SRCREV = "93064d8fcef2c6fde1f61c0cedacb46b21eab039" +SRCREV = "e28aa53dc1492f09a64dc9f1dbfd5b6dba06e31f" S = "${WORKDIR}/git" -inherit meson +inherit pkgconfig meson inherit systemd DEPENDS = "boost \ diff --git a/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb b/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb index 18a7c505a..21d1c814f 100644 --- a/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb @@ -31,10 +31,15 @@ FILES:phosphor-ldap += " \ ${bindir}/phosphor-ldap-conf \ ${bindir}/phosphor-ldap-mapper \ " +FILES:${PN} += " \ + ${base_libdir}/systemd \ + ${datadir}/dbus-1 \ + ${datadir}/phosphor-certificate-manager \ +" DBUS_SERVICE:phosphor-ldap = " \ xyz.openbmc_project.Ldap.Config.service \ xyz.openbmc_project.LDAP.PrivilegeMapper.service \ " SRC_URI += "git://github.com/openbmc/phosphor-user-manager" -SRCREV = "a260f187436837aec493baef0a5e7063fe11ee92" +SRCREV = "ce4e1aa087ca4ce62069106482285c1acf13499b" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb index 9fe1e6081..4ef5f0cc5 100644 --- a/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb +++ b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb @@ -20,7 +20,7 @@ DEPENDS += "phosphor-logging" DEPENDS += "systemd" SRC_URI += "git://github.com/openbmc/phosphor-watchdog" -SRCREV = "15c5bd1b60300255d9dd2ffdd77eaf6dfce51722" +SRCREV = "6a54155eab9bab579bc9493199a4272676563b5f" S = "${WORKDIR}/git" EXTRA_OEMESON = " \ diff --git a/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb b/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb index 54c63bfc4..f68b6535b 100644 --- a/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb +++ b/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb @@ -6,7 +6,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/phosphor-webui.git" -SRCREV = "51229f8005cb20a12e8d0f057d4565f31d84fa29" +SRCREV = "f59274e8ec337e7f4b135726d6b846fb813d60cb" S = "${WORKDIR}/git" DEPENDS:prepend = "nodejs-native " diff --git a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb index a221ca715..1a3feedbe 100644 --- a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb +++ b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb @@ -6,7 +6,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/webui-vue.git" -SRCREV = "c9cb8d433b7ed5f4d37cd8d946c2593d4d886ce1" +SRCREV = "2a2e1021f48e2a939859ba7f4ae86c5de6df5655" S = "${WORKDIR}/git" DEPENDS:prepend = "nodejs-native nlf-native " diff --git a/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb b/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb index 102b3fcb8..04fd5dc63 100755 --- a/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb +++ b/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb @@ -2,7 +2,7 @@ SUMMARY = "Chassis Power Control service for Intel based platforms" DESCRIPTION = "Chassis Power Control service for Intel based platforms" SRC_URI = "git://github.com/openbmc/x86-power-control.git;protocol=ssh" -SRCREV = "61b4a5bf7e8e7be92807fcb85a9780075e8893b4" +SRCREV = "48c94c59728023cdbff3bd62f203de3434af8b8a" PV = "1.0+git${SRCPV}" diff --git a/meta-phosphor/recipes-x86/peci-pcie/peci-pcie_git.bb b/meta-phosphor/recipes-x86/peci-pcie/peci-pcie_git.bb index 2cdbc5c56..cf1d6b136 100644 --- a/meta-phosphor/recipes-x86/peci-pcie/peci-pcie_git.bb +++ b/meta-phosphor/recipes-x86/peci-pcie/peci-pcie_git.bb @@ -11,7 +11,7 @@ SRC_URI = "git://github.com/openbmc/peci-pcie" DEPENDS = "boost sdbusplus libpeci" PV = "0.1+git${SRCPV}" -SRCREV = "8e96603605eebd574bb00cd35e7fa118071aeeae" +SRCREV = "de624395a587be555463a14a3db90500b4e0521c" S = "${WORKDIR}/git" diff --git a/meta-phosphor/scripts/run-repotest b/meta-phosphor/scripts/run-repotest new file mode 100755 index 000000000..d39cbb701 --- /dev/null +++ b/meta-phosphor/scripts/run-repotest @@ -0,0 +1,227 @@ +#!/bin/bash -e +# + +script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" +obmc_dir=${script_dir}/../../ + +cd "$obmc_dir" + +# openbmc doesn't control what upstream poky, or any of the other layers do, +# which do use patches as part of their upstreaming process. +# meta-phosphor is also included such that patches that the community agrees to +# hold onto will be allowed in that layer. + +patch_files_tmp=$(mktemp) +allowed_patches_tmp=$(mktemp) +trap 'rm $patch_files_tmp $allowed_patches_tmp' exit + +git ls-files -- \ + '*.patch' \ + ':!:poky/**' \ + ':!:meta-security/**' \ + ':!:meta-raspberrypi/**' \ + ':!:meta-openembedded/**' \ + ':!:meta-phosphor/**' \ + | sort > "$patch_files_tmp" + + +# The following patches were present on master at the time this test was +# written. Their presence in this list should not be acknowlegement that they +# are now allowed, but ignoring them is required in the intermediate time +# between when this test was created, and when the maintainers of these repos +# clean them up. +# +# https://github.com/openbmc/docs/blob/master/meta-layer-guidelines.md +echo "\ +meta-amd/meta-ethanolx/recipes-x86/chassis/x86-power-control/0001-Amd-power-control-modifications-for-EthanolX.patch +meta-ampere/meta-common/recipes-devtools/mtd/mtd-utils/0001-flashcp-support-offset-option.patch +meta-aspeed/recipes-bsp/u-boot/files/default-gcc.patch +meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed/0005-ARM-dts-aspeed-Enable-g220a-uart-route.patch +meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-node-manager-proxy/0001-Remove-Total_Power-sensor.patch +meta-facebook/meta-bletchley/recipes-bsp/u-boot/u-boot-aspeed-sdk/0001-u-boot-ast2600-57600-baudrate-for-bletchley.patch +meta-facebook/meta-tiogapass/recipes-bsp/u-boot/u-boot-aspeed/0001-configs-ast-common-use-57600-baud-rate-to-match-Tiog.patch +meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed/0001-board-aspeed-Add-Mux-for-yosemitev2.patch +meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed/0002-spl-host-console-handle.patch +meta-google/dynamic-layers/nuvoton-layer/recipes-bsp/images/npcm7xx-igps/0001-Set-FIU0_DRD_CFG-and-FIU_Clk_divider-for-gbmc-hoth.patch +meta-google/recipes-extended/libconfig/files/0001-conf2struct-Use-the-right-perl.patch +meta-google/recipes-extended/libconfig/files/0001-makefile-Add-missing-LDFLAGS.patch +meta-google/recipes-phosphor/initrdscripts/obmc-phosphor-initfs/rwfs-clean-dev.patch +meta-ingrasys/meta-zaius/recipes-bsp/u-boot/u-boot-aspeed/0001-board-aspeed-Add-reset_phy-for-Zaius.patch +meta-nuvoton/recipes-bsp/images/npcm7xx-igps/0001-Adjust-paths-for-use-with-Bitbake.patch +meta-yadro/meta-nicole/recipes-bsp/u-boot/files/0001-Add-system-reset-status-support.patch +meta-yadro/meta-nicole/recipes-bsp/u-boot/files/0002-config-ast-common-set-fieldmode-to-true.patch +meta-yadro/meta-nicole/recipes-bsp/u-boot/files/0003-aspeed-add-gpio-support.patch +meta-yadro/meta-nicole/recipes-bsp/u-boot/files/0004-aspeed-add-bmc-position-support.patch +meta-yadro/meta-nicole/recipes-kernel/linux/linux-aspeed/0001-Add-NCSI-channel-selector.patch +meta-yadro/meta-nicole/recipes-phosphor/host/op-proc-control/0001-Stop-and-send-SRESET-for-one-thread-only.patch +meta-yadro/recipes-phosphor/dbus/phosphor-dbus-interfaces/0001-Add-boot-initiator-mailbox-interface.patch +meta-yadro/recipes-phosphor/ipmi/phosphor-ipmi-host/0001-Add-support-for-persistent-only-settings.patch +meta-yadro/recipes-phosphor/ipmi/phosphor-ipmi-host/0002-Add-support-for-boot-initiator-mailbox.patch +meta-yadro/recipes-phosphor/ipmi/phosphor-ipmi-host/0003-Fix-version-parsing-update-AUX-revision-info.patch +" | sort > "$allowed_patches_tmp" + +files_diff=$(comm -23 "$patch_files_tmp" "$allowed_patches_tmp") + +files_count=$(echo -n "$files_diff" | grep -c '^' || true) +if [[ $files_count -ne 0 ]]; then + echo "Patch files found not in allow list" + echo "$files_diff" + echo "Patches are not allowed on OpenBMC in these layers. Please upstream your changes and see \ + https://github.com/openbmc/docs/blob/master/meta-layer-guidelines.md" + exit 1 +fi + +lint_exempt="\ +meta-amd/recipes-amd/amd-fpga/files/ethanolx/fpgardu.sh +meta-bytedance/meta-g220a/recipes-network/network/static-mac-addr/mac-check +meta-bytedance/meta-g220a/recipes-phosphor/datetime/me-time-sync/me-time-sync.sh +meta-fii/meta-kudo/recipes-kudo/host/files/ampere_power_util.sh +meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw-ver.sh +meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw.sh +meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-lib.sh +meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/init_once.sh +meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-cmd/kudo-ras.sh +meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-cmd/kudo.sh +meta-fii/meta-kudo/recipes-kudo/network/usb-network/usb_network.sh +meta-fii/meta-kudo/recipes-phosphor/console/obmc-console/kudo_uart_mux_ctrl.sh +meta-google/recipes-google/gpio/gpio-ctrl/lib.sh +meta-google/recipes-google/host-power-ctrl/gpio-host-pwr/host_isoff.sh +meta-google/recipes-google/host-power-ctrl/gpio-host-pwr/host_powercycle.sh +meta-google/recipes-google/host-power-ctrl/gpio-host-pwr/host_poweroff.sh +meta-google/recipes-google/host-power-ctrl/gpio-host-pwr/host_poweron.sh +meta-google/recipes-google/host-power-ctrl/gpio-host-pwr/host_reset.sh +meta-google/recipes-google/host-power-ctrl/gpio-host-pwr/lib.sh +meta-google/recipes-google/ipmi/ipmi-fru-sh/lib.sh +meta-google/recipes-google/ncsi/files/gbmc-ncsi-ip-from-ra.sh.in +meta-google/recipes-google/networking/files/gbmc-ip-monitor-test.sh +meta-google/recipes-google/networking/files/gbmc-ip-monitor.sh +meta-google/recipes-google/networking/files/gbmc-mac-config.sh.in +meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-from-ra.sh +meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-gw-src.sh +meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-nft.sh +meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-ula.sh +meta-google/recipes-google/networking/google-usb-network/usb_network.sh +meta-google/recipes-google/networking/google-usb-network/usb_network_test.sh +meta-google/recipes-google/networking/network-sh/lib.sh +meta-google/recipes-google/networking/network-sh/test.sh +meta-google/recipes-google/nftables/files/nft-configure.sh +meta-google/recipes-google/ssh/authorized-keys-comp/authorized-keys-comp.sh +meta-google/recipes-google/test/test-sh/test.sh +meta-google/recipes-phosphor/flash/google-key/verify-bmc-image.sh +meta-google/recipes-phosphor/flash/inplace-gbmc-update/inplace-gbmc-verify.sh +meta-hpe/meta-common/recipes-hpe/host/host-boot-enable/host-boot-enable.sh +meta-hpe/meta-common/recipes-phosphor/initrdscripts/files/gxp-obmc-init.sh +meta-hpe/meta-dl360poc/recipes-hpe/host/host-boot-enable/host-boot-enable.sh +meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control/vrm-control.sh +meta-ibm/meta-romulus/recipes-phosphor/gpio/id-button/toggle_identify_led.sh +meta-ibm/recipes-phosphor/chassis/power-workarounds/witherspoon/power-workarounds.sh +meta-ibm/recipes-phosphor/chassis/vrm-control/ibm-ac-server/ir35221-unbind-bind.sh +meta-ibm/recipes-phosphor/chassis/vrm-control/mihawk/ir35221-unbind-bind.sh +meta-ibm/recipes-phosphor/chassis/vrm-control/vrm-control.sh +meta-ibm/recipes-phosphor/dump/phosphor-debug-collector/plugins.d/ibm_elogall +meta-ibm/recipes-phosphor/dump/phosphor-debug-collector/plugins.d/pels +meta-ibm/recipes-phosphor/gpio/id-button/toggle_identify_led.sh +meta-ibm/recipes-phosphor/mboxd/mboxd/check_pnor_format.sh +meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control/zaius_avsbus.sh +meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control/zaius_vcs.sh +meta-inventec/meta-transformers/recipes-phosphor/init/transformers-init/transformers-init.sh +meta-openpower/recipes-bsp/pdata/files/power-target.sh +meta-openpower/recipes-phosphor/dump/phosphor-debug-collector/plugins.d/guard +meta-openpower/recipes-phosphor/network/first-boot-set-hostname/first-boot-set-hostname.sh +meta-openpower/recipes-phosphor/network/first-boot-set-mac/first-boot-set-mac.sh +meta-openpower/recipes-phosphor/occ/openpower-occ-control/occ-active.sh +meta-phosphor/recipes-phosphor/initrdscripts/files/obmc-init.sh +meta-phosphor/recipes-phosphor/initrdscripts/files/obmc-shutdown.sh +meta-phosphor/recipes-phosphor/initrdscripts/files/obmc-update.sh +meta-phosphor/recipes-phosphor/initrdscripts/phosphor-mmc-init/mmc-init.sh +meta-phosphor/recipes-phosphor/interfaces/bmcweb/run-ptest +meta-phosphor/recipes-phosphor/preinit-mounts/preinit-mounts/init +meta-phosphor/recipes-support/nss-pam-ldapd/files/nslcd.init +meta-quanta/meta-common/recipes-quanta/network/usb-network/usb-network.sh +meta-quanta/meta-gbs/recipes-gbs/gbs-bios-update/files/bios-update.sh +meta-quanta/meta-gbs/recipes-gbs/gbs-bios-update/files/bios-verify.sh +meta-quanta/meta-gbs/recipes-gbs/gbs-bmc-update/files/bmc-verify.sh +meta-quanta/meta-gbs/recipes-gbs/gbs-detect-gpio-present/files/detect-gpio-present.sh +meta-quanta/meta-gbs/recipes-gbs/gbs-sysinit/files/gbs-sysinit.sh +meta-quanta/meta-gbs/recipes-gbs/hotswap-power-cycle/files/tray_powercycle.sh +meta-quanta/meta-gbs/recipes-google/acpi-power-state/acpi-power-state-daemon/gbs-check-host-state.sh +meta-quanta/meta-gbs/recipes-google/acpi-power-state/acpi-power-state-daemon/gbs-set-failsafe.sh +meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control/fan-table-init.sh +meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-nvme/nvme_json_rewrite.sh +meta-quanta/meta-gsj/recipes-gsj/detect-fan-fail/files/detect-fan-fail.sh +meta-quanta/meta-gsj/recipes-gsj/gsj-hotswap-change-setting/files/gsj-hotswap-change-setting.sh +meta-quanta/meta-gsj/recipes-gsj/quanta-nvme-powerctrl/files/init_once.sh +meta-quanta/meta-gsj/recipes-gsj/quanta-nvme-powerctrl/files/nvme_powerctrl_library.sh +meta-quanta/meta-gsj/recipes-gsj/quanta-nvme-powerctrl/files/nvme_powermanager.sh +meta-quanta/meta-gsj/recipes-gsj/usb-network/files/usb_network.sh +meta-quanta/meta-gsj/recipes-phosphor/fans/phosphor-pid-control/fan-control.sh +meta-quanta/meta-gsj/recipes-phosphor/fans/phosphor-pid-control/fan-default-speed.sh +meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/power/first-boot-set-psu/first-boot-set-psu.sh +meta-quanta/meta-olympus-nuvoton/recipes-phosphor/fans/phosphor-pid-control/fan-full-speed.sh +meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/files/init_once.sh +meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/files/poweroff.sh +meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/files/poweron.sh +meta-yadro/meta-nicole/recipes-phosphor/chassis/avsbus-control/avsbus-control.sh +" + +types=(json shell) +# shellcheck disable=SC2034 +check_json="eslint --resolve-plugins-relative-to /usr/local/lib/node_modules" +# shellcheck disable=SC2034 +check_shell="shellcheck -x" + +for t in "${types[@]}"; do + check_cmd="check_${t}" + if ! which "${!check_cmd%% *}" > /dev/null 2>&1; then + eval "${check_cmd}=\"echo WARNING: Skipping $t due to missing command:\"" + echo "${!check_cmd}" + fi +done + +non_bbfiles=$(git ls-files -- \ + ':!:poky/**' \ + ':!:meta-security/**' \ + ':!:meta-raspberrypi/**' \ + ':!:meta-openembedded/**' \ + | grep -v -e "\.patch$" -e "\.bb$" -e "\.bbappend$") + +for f in $non_bbfiles; do + unset file_type + file_info=$(file "$f") + case $file_info in + *shell\ script*) + file_type="shell" + ;; + + *JSON\ data*) + file_type="json" + ;; + + *) + case $f in + *.sh) + file_type="shell" + ;; + + *.json) + file_type="json" + ;; + esac + esac + + if [ -n "$file_type" ]; then + check_cmd="check_${file_type}" + if ! eval "${!check_cmd} $f"; then + if [[ $lint_exempt == *$f* ]]; then + echo "EXEMPT: $f" + else + echo "FAILED: $f" + false + fi + fi + fi + +done + +echo "Repo test passed" + diff --git a/meta-phosphor/scripts/run-repotest.sh b/meta-phosphor/scripts/run-repotest.sh deleted file mode 100755 index bd82176d3..000000000 --- a/meta-phosphor/scripts/run-repotest.sh +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/bash -e -# - -script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" -obmc_dir=${script_dir}/../../ - -# openbmc doesn't control what upstream poky, or any of the other layers do, -# which do use patches as part of their upstreaming process. -# meta-phosphor is also included such that patches that the community agrees to -# hold onto will be allowed in that layer. - -patch_files_tmp=$(mktemp) -allowed_patches_tmp=$(mktemp) - -git -C "$obmc_dir" ls-files -- \ - '*.patch' \ - ':!:poky/**' \ - ':!:meta-security/**' \ - ':!:meta-xilinx/**' \ - ':!:meta-raspberrypi/**' \ - ':!:meta-openembedded/**' \ - ':!:meta-phosphor/**' \ - | sort > $patch_files_tmp - - -# The following patches were present on master at the time this test was -# written. Their presence in this list should not be acknowlegement that they -# are now allowed, but ignoring them is required in the intermediate time -# between when this test was created, and when the maintainers of these repos -# clean them up. -# -# https://github.com/openbmc/docs/blob/master/meta-layer-guidelines.md -echo "\ -meta-amd/meta-ethanolx/recipes-x86/chassis/x86-power-control/0001-Amd-power-control-modifications-for-EthanolX.patch -meta-ampere/meta-common/recipes-devtools/mtd/mtd-utils/0001-flashcp-support-offset-option.patch -meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0001-aspeed-scu-Switch-PWM-pin-to-GPIO-input-mode.patch -meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0002-aspeed-Disable-internal-PD-resistors-for-GPIOs.patch -meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0003-aspeed-support-passing-system-reset-status-to-kernel.patch -meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0004-aspeed-add-gpio-support.patch -meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0005-aspeed-Enable-SPI-master-mode.patch -meta-ampere/meta-jade/recipes-bsp/u-boot/u-boot-aspeed/0006-aspeed-support-Mt.Jade-platform-init.patch -meta-aspeed/recipes-bsp/u-boot/files/default-gcc.patch -meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed/0001-bytedance-g220a-Enable-ipmb.patch -meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed/0003-misc-aspeed-Add-Aspeed-UART-routing-control-driver.patch -meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed/0004-ARM-dts-aspeed-Add-uart-routing-node.patch -meta-bytedance/meta-g220a/recipes-kernel/linux/linux-aspeed/0005-ARM-dts-aspeed-Enable-g220a-uart-route.patch -meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-node-manager-proxy/0001-Remove-Total_Power-sensor.patch -meta-facebook/meta-bletchley/recipes-bsp/u-boot/u-boot-aspeed-sdk/0001-u-boot-ast2600-57600-baudrate-for-bletchley.patch -meta-facebook/meta-tiogapass/recipes-bsp/u-boot/u-boot-aspeed/0001-configs-ast-common-use-57600-baud-rate-to-match-Tiog.patch -meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed/0001-board-aspeed-Add-Mux-for-yosemitev2.patch -meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed/0002-spl-host-console-handle.patch -meta-google/dynamic-layers/nuvoton-layer/recipes-bsp/images/npcm7xx-igps/0001-Set-FIU0_DRD_CFG-and-FIU_Clk_divider-for-gbmc-hoth.patch -meta-google/recipes-extended/libconfig/files/0001-conf2struct-Use-the-right-perl.patch -meta-google/recipes-extended/libconfig/files/0001-makefile-Add-missing-LDFLAGS.patch -meta-google/recipes-phosphor/initrdscripts/obmc-phosphor-initfs/rwfs-clean-dev.patch -meta-ingrasys/meta-zaius/recipes-bsp/u-boot/u-boot-aspeed/0001-board-aspeed-Add-reset_phy-for-Zaius.patch -meta-nuvoton/recipes-bsp/images/npcm7xx-igps/0001-Adjust-paths-for-use-with-Bitbake.patch -meta-yadro/meta-nicole/recipes-bsp/u-boot/files/0001-Add-system-reset-status-support.patch -meta-yadro/meta-nicole/recipes-bsp/u-boot/files/0002-config-ast-common-set-fieldmode-to-true.patch -meta-yadro/meta-nicole/recipes-bsp/u-boot/files/0003-aspeed-add-gpio-support.patch -meta-yadro/meta-nicole/recipes-bsp/u-boot/files/0004-aspeed-add-bmc-position-support.patch -meta-yadro/meta-nicole/recipes-kernel/linux/linux-aspeed/0001-Add-NCSI-channel-selector.patch -meta-yadro/meta-nicole/recipes-phosphor/host/op-proc-control/0001-Stop-and-send-SRESET-for-one-thread-only.patch -meta-yadro/recipes-phosphor/dbus/phosphor-dbus-interfaces/0001-Add-boot-initiator-mailbox-interface.patch -meta-yadro/recipes-phosphor/ipmi/phosphor-ipmi-host/0001-Add-support-for-persistent-only-settings.patch -meta-yadro/recipes-phosphor/ipmi/phosphor-ipmi-host/0002-Add-support-for-boot-initiator-mailbox.patch -meta-yadro/recipes-phosphor/ipmi/phosphor-ipmi-host/0003-Fix-version-parsing-update-AUX-revision-info.patch -" | sort > $allowed_patches_tmp - - - -files_diff=$(comm -23 $patch_files_tmp $allowed_patches_tmp) -rm $allowed_patches_tmp -rm $patch_files_tmp - -files_count=$(echo -n "$files_diff" | grep -c '^' || true) -if [[ $files_count -ne 0 ]]; then - echo "Patch files found not in allow list" - echo "$files_diff" - echo "Patches are not allowed on OpenBMC in these layers. Please upstream your changes and see \ - https://github.com/openbmc/docs/blob/master/meta-layer-guidelines.md" - exit 1 -fi - -echo "Repo test passed" - |