diff options
Diffstat (limited to 'meta-phosphor')
57 files changed, 165 insertions, 383 deletions
diff --git a/meta-phosphor/classes/fit-image.bbclass b/meta-phosphor/classes/fit-image.bbclass index f37aa0271f..bf0fc4f1b9 100644 --- a/meta-phosphor/classes/fit-image.bbclass +++ b/meta-phosphor/classes/fit-image.bbclass @@ -12,7 +12,7 @@ FIT_KERNEL_COMP_ALG_EXTENSION ?= "" do_image_cpio[depends] += "virtual/kernel:do_deploy" run_assemble_fitimage() { - export linux_comp="none" + export linux_comp="${FIT_KERNEL_COMP_ALG}" fitimage_assemble $1.its $1.fitImage 1 # The fitimage_assemble puts the image into DEPLOY_DIR_NAME due to diff --git a/meta-phosphor/classes/image_types_phosphor_nuvoton.bbclass b/meta-phosphor/classes/image_types_phosphor_nuvoton.bbclass index 8fefd827e0..3923a2c90f 100644 --- a/meta-phosphor/classes/image_types_phosphor_nuvoton.bbclass +++ b/meta-phosphor/classes/image_types_phosphor_nuvoton.bbclass @@ -30,14 +30,6 @@ do_prepare_bootloaders[depends] += " \ addtask do_prepare_bootloaders before do_generate_static after do_generate_rwfs_static -# Include the full bootblock and u-boot in the final static image -python do_generate_static:append() { - _append_image(os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), - 'u-boot.%s' % d.getVar('UBOOT_SUFFIX',True)), - int(d.getVar('FLASH_UBOOT_OFFSET', True)), - int(d.getVar('FLASH_KERNEL_OFFSET', True))) -} - do_make_ubi:append() { # Concatenate the uboot and ubi partitions dd bs=1k conv=notrunc seek=${FLASH_UBOOT_OFFSET} \ diff --git a/meta-phosphor/classes/image_types_phosphor_nuvoton_npcm8xx.bbclass b/meta-phosphor/classes/image_types_phosphor_nuvoton_npcm8xx.bbclass index 56aa082823..4d593a03ee 100644 --- a/meta-phosphor/classes/image_types_phosphor_nuvoton_npcm8xx.bbclass +++ b/meta-phosphor/classes/image_types_phosphor_nuvoton_npcm8xx.bbclass @@ -1,291 +1,34 @@ -UBOOT_BINARY := "u-boot.${UBOOT_SUFFIX}" -BB_HEADER_BINARY := "BootBlockAndHeader.bin" -BL31_HEADER_BINARY := "bl31AndHeader.bin" -OPTEE_HEADER_BINARY := "teeAndHeader.bin" -KMT_TIPFW_BINARY := "Kmt_TipFwL0_Skmt_TipFwL1.bin" -KMT_TIPFW_BB_BINARY = "Kmt_TipFw_BootBlock.bin" -KMT_TIPFW_BB_BL31_BINARY = "Kmt_TipFw_BootBlock_BL31.bin" -KMT_TIPFW_BB_BL31_TEE_BINARY = "Kmt_TipFw_BootBlock_BL31_Tee.bin" -KMT_TIPFW_BB_UBOOT_BINARY = "u-boot.bin.merged" -SA_KMT_TIPFW_BINARY := "SA_Kmt_TipFwL0.bin" - -BB_BL31_BINARY = "BootBlock_BL31_no_tip.bin" -BB_BL31_TEE_BINARY = "BootBlock_BL31_Tee_no_tip.bin" -BB_BL31_TEE_UBOOT_BINARY = "BootBlock_BL31_Tee_Uboot_no_tip.bin" -BB_BL31_TEE_UBOOT_SA_BINARY = "BootBlock_BL31_Tee_Uboot_no_tip_SA.bin" - -FULL_SUFFIX = "full" MERGED_SUFFIX = "merged" UBOOT_SUFFIX:append = ".${MERGED_SUFFIX}" -UBOOT_HEADER_BINARY := "${UBOOT_BINARY}.${FULL_SUFFIX}" - -IGPS_DIR = "${STAGING_DIR_NATIVE}/${datadir}/npcm8xx-igps" - -BB_BIN = "arbel_a35_bootblock.bin" -BL31_BIN = "bl31.bin" -OPTEE_BIN = "tee.bin" -UBOOT_BIN = "u-boot.bin" -BB_NO_TIP_BIN = "arbel_a35_bootblock_no_tip.bin" FIT_KERNEL_COMP_ALG:df-obmc-static-norootfs = "gzip" FIT_KERNEL_COMP_ALG_EXTENSION:df-obmc-static-norootfs = ".gz" -# Align images if needed -python do_pad_binary() { - TIP_IMAGE = d.getVar('TIP_IMAGE', True) - def Pad_bin_file_inplace(inF, align): - padding_size = 0 - - F_size = os.path.getsize(inF) - - if ((F_size % align) == 0): - return - - padding_size = align - (F_size % align) - - infile = open(inF, "ab") - infile.seek(0, 2) - infile.write(b'\x00' * padding_size) - infile.close() - - if TIP_IMAGE == "True": - Pad_bin_file_inplace(os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), - '%s' % d.getVar('BB_BIN',True)), int(d.getVar('PAD_ALIGN', True))) - else: - Pad_bin_file_inplace(os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), - '%s' % d.getVar('BB_NO_TIP_BIN',True)), int(d.getVar('PAD_ALIGN', True))) - - Pad_bin_file_inplace(os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), - '%s' % d.getVar('BL31_BIN',True)), int(d.getVar('PAD_ALIGN', True))) - - Pad_bin_file_inplace(os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), - '%s' % d.getVar('OPTEE_BIN',True)), int(d.getVar('PAD_ALIGN', True))) - - Pad_bin_file_inplace(os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), - '%s' % d.getVar('UBOOT_BIN',True)), int(d.getVar('PAD_ALIGN', True))) -} - -# Prepare the Bootblock and U-Boot images using npcm8xx-bingo -do_prepare_bootloaders() { - local olddir="$(pwd)" - cd ${DEPLOY_DIR_IMAGE} - - bingo ${IGPS_DIR}/BL31_AndHeader.xml \ - -o ${BL31_HEADER_BINARY} - - bingo ${IGPS_DIR}/OpTeeAndHeader.xml \ - -o ${OPTEE_HEADER_BINARY} - - if [ "${TIP_IMAGE}" = "True" ]; then - bingo ${IGPS_DIR}/BootBlockAndHeader_${DEVICE_GEN}_${IGPS_MACHINE}.xml \ - -o ${BB_HEADER_BINARY} - else - bingo ${IGPS_DIR}/BootBlockAndHeader_${DEVICE_GEN}_${IGPS_MACHINE}_NoTip.xml \ - -o ${BB_HEADER_BINARY} - fi - - bingo ${IGPS_DIR}/UbootHeader_${DEVICE_GEN}.xml \ - -o ${UBOOT_HEADER_BINARY} - - cd "$olddir" -} - -check_keys() { - if [ -n "${KEY_FOLDER}" ]; then - echo "local" - else - echo "default" - fi -} - -# Sign images for secure os be enabled and TIP mode only -do_sign_binary() { - if [ "${SECURED_IMAGE}" != "True" -o "${TIP_IMAGE}" != "True" ]; then - return - fi - checked=`check_keys` - if [ "${checked}" = "local" ]; then - bbnote "Sign image with local keys" - key_bb=${KEY_FOLDER}/${KEY_BB} - key_bl31=${KEY_FOLDER}/${KEY_BL31} - key_optee=${KEY_FOLDER}/${KEY_OPTEE} - key_uboot=${KEY_FOLDER}/${KEY_UBOOT} - else - bbnote "Sign image with default keys" - key_bb=${KEY_FOLDER_DEFAULT}/${KEY_BB} - key_bl31=${KEY_FOLDER_DEFAULT}/${KEY_BL31} - key_optee=${KEY_FOLDER_DEFAULT}/${KEY_OPTEE} - key_uboot=${KEY_FOLDER_DEFAULT}/${KEY_UBOOT} - fi - bbnote "BB sign key from ${checked}: ${key_bb}" - bbnote "BL31 sign key from ${checked}: ${key_bl31}" - bbnote "OPTEE sign key from ${checked}: ${key_optee}" - bbnote "UBOOT sign key from ${checked}: ${key_uboot}" - # Used to embed the key index inside the image, usually at offset 0x140 - python3 ${IGPS_DIR}/BinarySignatureGenerator.py Replace_binary_single_byte \ - ${DEPLOY_DIR_IMAGE}/${BB_HEADER_BINARY} 140 ${KEY_BB_INDEX} - - python3 ${IGPS_DIR}/BinarySignatureGenerator.py Replace_binary_single_byte \ - ${DEPLOY_DIR_IMAGE}/${BL31_HEADER_BINARY} 140 ${SKMT_BL31_KEY_INDEX} - - python3 ${IGPS_DIR}/BinarySignatureGenerator.py Replace_binary_single_byte \ - ${DEPLOY_DIR_IMAGE}/${OPTEE_HEADER_BINARY} 140 ${SKMT_BL32_KEY_INDEX} - - python3 ${IGPS_DIR}/BinarySignatureGenerator.py Replace_binary_single_byte \ - ${DEPLOY_DIR_IMAGE}/${UBOOT_HEADER_BINARY} 140 ${SKMT_BL33_KEY_INDEX} - - # Sign specific image with specific key - res=`python3 ${IGPS_DIR}/BinarySignatureGenerator.py Sign_binary \ - ${DEPLOY_DIR_IMAGE}/${BB_HEADER_BINARY} 112 ${key_bb} 16 \ - ${DEPLOY_DIR_IMAGE}/${BB_HEADER_BINARY} ${SIGN_TYPE} 0 ${KEY_BB_ID} - - python3 ${IGPS_DIR}/BinarySignatureGenerator.py Sign_binary \ - ${DEPLOY_DIR_IMAGE}/${BL31_HEADER_BINARY} 112 ${key_bl31} 16 \ - ${DEPLOY_DIR_IMAGE}/${BL31_HEADER_BINARY} ${SIGN_TYPE} 0 ${KEY_BL31_ID} - - python3 ${IGPS_DIR}/BinarySignatureGenerator.py Sign_binary \ - ${DEPLOY_DIR_IMAGE}/${OPTEE_HEADER_BINARY} 112 ${key_optee} 16 \ - ${DEPLOY_DIR_IMAGE}/${OPTEE_HEADER_BINARY} ${SIGN_TYPE} 0 ${KEY_OPTEE_ID} - - python3 ${IGPS_DIR}/BinarySignatureGenerator.py Sign_binary \ - ${DEPLOY_DIR_IMAGE}/${UBOOT_HEADER_BINARY} 112 ${key_uboot} 16 \ - ${DEPLOY_DIR_IMAGE}/${UBOOT_HEADER_BINARY} ${SIGN_TYPE} 0 ${KEY_UBOOT_ID}` - - # Stop full image build process when sign binary got failed - set +e - err=`echo $res | grep -E "missing|Invalid|failed"` - if [ -n "${err}" ]; then - bbfatal "Sign binary failed: keys are not found or invalid. Please check your KEY_FOLDER and KEY definition." - fi - set -e -} - -python do_merge_bootloaders() { - TIP_IMAGE = d.getVar('TIP_IMAGE', True) - SA_TIP_IMAGE = d.getVar('SA_TIP_IMAGE', True) - def Merge_bin_files_and_pad(inF1, inF2, outF, align, align_end): - padding_size = 0 - padding_size_end = 0 - F1_size = os.path.getsize(inF1) - F2_size = os.path.getsize(inF2) - - if ((F1_size % align) != 0): - padding_size = align - (F1_size % align) - - if ((F2_size % align_end) != 0): - padding_size_end = align_end - (F2_size % align_end) - - with open(outF, "wb") as file3: - with open(inF1, "rb") as file1: - data = file1.read() - file3.write(data) - - file3.write(b'\xFF' * padding_size) - - with open(inF2, "rb") as file2: - data = file2.read() - file3.write(data) - - file3.write(b'\xFF' * padding_size_end) - - if TIP_IMAGE == "True": - Merge_bin_files_and_pad(os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('KMT_TIPFW_BINARY',True)), - os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('BB_HEADER_BINARY',True)), - os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('KMT_TIPFW_BB_BINARY',True)), - int(d.getVar('BB_ALIGN', True)), int(d.getVar('ALIGN_END', True))) - - Merge_bin_files_and_pad(os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('KMT_TIPFW_BB_BINARY',True)), - os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('BL31_HEADER_BINARY',True)), - os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('KMT_TIPFW_BB_BL31_BINARY',True)), - int(d.getVar('ATF_ALIGN', True)), int(d.getVar('ALIGN_END', True))) - - Merge_bin_files_and_pad(os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('KMT_TIPFW_BB_BL31_BINARY',True)), - os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('OPTEE_HEADER_BINARY',True)), - os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('KMT_TIPFW_BB_BL31_TEE_BINARY',True)), - int(d.getVar('OPTEE_ALIGN', True)), int(d.getVar('ALIGN_END', True))) - - Merge_bin_files_and_pad(os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('KMT_TIPFW_BB_BL31_TEE_BINARY',True)), - os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('UBOOT_HEADER_BINARY',True)), - os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('KMT_TIPFW_BB_UBOOT_BINARY',True)), - int(d.getVar('UBOOT_ALIGN', True)), int(d.getVar('ALIGN_END', True))) - else: - Merge_bin_files_and_pad(os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('BB_HEADER_BINARY',True)), - os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('BL31_HEADER_BINARY',True)), - os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('BB_BL31_BINARY',True)), - int(d.getVar('ATF_ALIGN', True)), int(d.getVar('ALIGN_END', True))) - - Merge_bin_files_and_pad(os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('BB_BL31_BINARY',True)), - os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('OPTEE_HEADER_BINARY',True)), - os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('BB_BL31_TEE_BINARY',True)), - int(d.getVar('OPTEE_ALIGN', True)), int(d.getVar('ALIGN_END', True))) - - Merge_bin_files_and_pad(os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('BB_BL31_TEE_BINARY',True)), - os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('UBOOT_HEADER_BINARY',True)), - os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('BB_BL31_TEE_UBOOT_BINARY',True)), - int(d.getVar('UBOOT_ALIGN', True)), int(d.getVar('ALIGN_END', True))) - - if SA_TIP_IMAGE == "True": - Merge_bin_files_and_pad(os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('BB_BL31_TEE_UBOOT_BINARY',True)), - os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('SA_KMT_TIPFW_BINARY',True)), - os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('BB_BL31_TEE_UBOOT_SA_BINARY',True)), - int(d.getVar('SA_ALIGN', True)), int(d.getVar('ALIGN_END', True))) - - os.rename(os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('BB_BL31_TEE_UBOOT_SA_BINARY',True)), - os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('KMT_TIPFW_BB_UBOOT_BINARY',True))) - else: - os.rename(os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('BB_BL31_TEE_UBOOT_BINARY',True)), - os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), '%s' % d.getVar('KMT_TIPFW_BB_UBOOT_BINARY',True))) -} - -do_pad_binary[depends] += " \ - ${@'npcm8xx-tip-fw:do_deploy' if d.getVar('TIP_IMAGE', True) == 'True' or d.getVar('SA_TIP_IMAGE', True) == 'True' else ''} \ - npcm8xx-bootblock:do_deploy \ - u-boot-nuvoton:do_deploy \ - trusted-firmware-a:do_deploy \ - optee-os:do_deploy \ - npcm7xx-bingo-native:do_populate_sysroot \ - npcm8xx-igps-native:do_populate_sysroot \ - " - # link images for we only need to flash partial image with idea name do_generate_ext4_tar:append() { - cd ${DEPLOY_DIR_IMAGE} - ln -sf ${UBOOT_BINARY}.${MERGED_SUFFIX} image-u-boot - ln -sf ${DEPLOY_DIR_IMAGE}/${FLASH_KERNEL_IMAGE} image-kernel - ln -sf ${S}/ext4/${IMAGE_LINK_NAME}.${FLASH_EXT4_BASETYPE}.zst image-rofs - ln -sf ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.rwfs.${FLASH_EXT4_OVERLAY_BASETYPE} image-rwfs - ln -sf ${IMAGE_NAME}.rootfs.wic.gz image-emmc.gz -} - -addtask do_pad_binary before do_prepare_bootloaders -addtask do_sign_binary before do_merge_bootloaders after do_prepare_bootloaders -addtask do_prepare_bootloaders before do_generate_static after do_generate_rwfs_static -addtask do_prepare_bootloaders before do_generate_static_norootfs after do_image_cpio -addtask do_merge_bootloaders before do_generate_static after do_sign_binary -addtask do_merge_bootloaders before do_generate_static_norootfs after do_sign_binary -addtask do_merge_bootloaders before do_generate_ext4_tar after do_prepare_bootloaders - -# Include the full bootblock and u-boot in the final static image -python do_generate_static:append() { - _append_image(os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), - 'u-boot.%s' % d.getVar('UBOOT_SUFFIX',True)), - int(d.getVar('FLASH_UBOOT_OFFSET', True)), - int(d.getVar('FLASH_KERNEL_OFFSET', True))) -} - -do_make_ubi:append() { - # Concatenate the uboot and ubi partitions - dd bs=1k conv=notrunc seek=${FLASH_UBOOT_OFFSET} \ - if=${DEPLOY_DIR_IMAGE}/u-boot.${UBOOT_SUFFIX} \ - of=${IMGDEPLOYDIR}/${IMAGE_NAME}.ubi.mtd -} + cd ${S}/ext4 + install -m 644 image-u-boot ${IMGDEPLOYDIR}/image-u-boot + cd ${IMGDEPLOYDIR} + ln -sf ${IMAGE_LINK_NAME}.wic.gz image-emmc.gz + ln -sf ${FLASH_KERNEL_IMAGE} image-kernel + ln -sf ${IMAGE_LINK_NAME}.rwfs.${FLASH_EXT4_OVERLAY_BASETYPE} image-rwfs +} + +# clean up image-u-boot because we may generate different size bootbloder +# with different build flags. Function do_generate_image_uboot_file use +# notrunc flag which may generate redundant image if we don't clean deploy. +do_clean_image_uboot() { + rm -rf ${IMGDEPLOYDIR}/image-u-boot +} + +addtask do_clean_image_uboot after do_rootfs +do_make_ubi[depends] += "npcm8xx-bootloader:do_deploy" +do_generate_ubi_tar[depends] += "npcm8xx-bootloader:do_deploy" +do_generate_static_tar[depends] += "npcm8xx-bootloader:do_deploy" +do_generate_static[depends] += " \ + npcm8xx-bootloader:do_deploy \ + ${PN}:do_clean_image_uboot \ +" +do_generate_static_norootfs[depends] += "npcm8xx-bootloader:do_deploy" +do_generate_ext4_tar[depends] += "npcm8xx-bootloader:do_deploy" -do_make_ubi[depends] += "${PN}:do_prepare_bootloaders" -do_generate_ubi_tar[depends] += "${PN}:do_prepare_bootloaders" -do_generate_ubi_tar[depends] += "${PN}:do_merge_bootloaders" -do_generate_static_tar[depends] += "${PN}:do_prepare_bootloaders" -do_generate_static_tar[depends] += "${PN}:do_merge_bootloaders" -do_generate_static_norootfs[depends] += "${PN}:do_prepare_bootloaders" -do_generate_static_norootfs[depends] += "${PN}:do_merge_bootloaders" -do_generate_ext4_tar[depends] += "${PN}:do_prepare_bootloaders" -do_generate_ext4_tar[depends] += "${PN}:do_merge_bootloaders" diff --git a/meta-phosphor/classes/phosphor-debug-collector.bbclass b/meta-phosphor/classes/phosphor-debug-collector.bbclass index d5d49a2dbb..ca1a003ea4 100644 --- a/meta-phosphor/classes/phosphor-debug-collector.bbclass +++ b/meta-phosphor/classes/phosphor-debug-collector.bbclass @@ -1,5 +1,67 @@ -bmc_dump_path="/var/lib/phosphor-debug-collector/dumps" +bmc_dump_path = "/var/lib/phosphor-debug-collector/dumps" dreport_plugin_dir = "${datadir}/dreport.d/plugins.d" dreport_include_dir = "${datadir}/dreport.d/include.d" dreport_conf_dir = "${datadir}/dreport.d/conf.d" dreport_dir = "${datadir}/dreport.d/" + +# Make the links for a single user plugin script +# Create user directories based on the dump type value in the config section +# Create softlinks for the base scripts in the user directories +def install_dreport_user_script(dreport_conf, script_path, d): + import re + import configparser + + #Set variables + config = ("config:") + section = "DumpType" + + #Read the user types from the dreport_conf file + configure = configparser.ConfigParser() + conf_dir = d.getVar('D', True) + d.getVar('dreport_conf_dir', True) + confsource = os.path.join(conf_dir, dreport_conf) + configure.read(confsource) + + #Extract the script name, and open the user script file + dreport_dir = d.getVar('D', True) + d.getVar('dreport_dir', True) + script = os.path.basename(script_path) + file = open(script_path, "r") + + #softlink to the script + srclink = os.path.join(d.getVar('dreport_plugin_dir', True), script) + + for line in file: + if not config in line: + continue + + revalue = re.search('[0-9]+.[0-9]+', line) + if not revalue: + bb.warn("Invalid format for config value =%s" % line) + continue + + #Regex search to identify which directories get softlinks to the script + parse_value = revalue.group(0) + config_values = re.split(r'\W+', parse_value, 1) + if(len(config_values) != 2): + bb.warn("Invalid config value=%s" % parse_value) + break; + priority = config_values[1] + types = [int(d) for d in str(config_values[0])] + + #For every dump type identified from 'types',create softlink to script + for type in types: + if not configure.has_option(section, str(type)): + bb.warn("Invalid dump type id =%s" % (str(type))) + continue + + #create directories based on the usertype + typestr = configure.get(section, str(type)) + destdir = os.path.join(dreport_dir, ("pl_" + typestr + ".d")) + if not os.path.exists(destdir): + os.makedirs(destdir) + + #Create softlinks to the user script in the directories + linkname = "E" + priority + script + destlink = os.path.join(destdir, linkname) + os.symlink(srclink, destlink) + + file.close() diff --git a/meta-phosphor/recipes-core/busybox/busybox/top.cfg b/meta-phosphor/recipes-core/busybox/busybox/top.cfg new file mode 100644 index 0000000000..2cf2727e85 --- /dev/null +++ b/meta-phosphor/recipes-core/busybox/busybox/top.cfg @@ -0,0 +1,6 @@ +CONFIG_FEATURE_TOP_SMP_CPU=y +CONFIG_FEATURE_TOP_SMP_PROCESS=y +CONFIG_FEATURE_TOPMEM=y +CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y +CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y +CONFIG_FEATURE_TOP_INTERACTIVE=y diff --git a/meta-phosphor/recipes-core/busybox/busybox_%.bbappend b/meta-phosphor/recipes-core/busybox/busybox_%.bbappend index ee8b6223aa..93c510de6b 100644 --- a/meta-phosphor/recipes-core/busybox/busybox_%.bbappend +++ b/meta-phosphor/recipes-core/busybox/busybox_%.bbappend @@ -5,6 +5,7 @@ SRC_URI += " \ file://flash.cfg \ file://less.cfg \ file://mountpoint.cfg \ + file://top.cfg \ ${@bb.utils.contains('DISTRO_FEATURES', 'obmc-ubi-fs', \ '', 'file://reboot.cfg', d)} \ " diff --git a/meta-phosphor/recipes-extended/pam/pam-ipmi_git.bb b/meta-phosphor/recipes-extended/pam/pam-ipmi_git.bb index 9a419ebaf6..8d50ebbf70 100644 --- a/meta-phosphor/recipes-extended/pam/pam-ipmi_git.bb +++ b/meta-phosphor/recipes-extended/pam/pam-ipmi_git.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://github.com/openbmc/pam-ipmi" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" DEPENDS += "openssl libpam" -SRCREV = "e4b13e6725abb178f62ee897fe1c0e81b06a9431" +SRCREV = "d9c11abd92db59a4559c71eadbb8e07fcf09dcd4" PV = "1.0+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc index 832c87291a..c4e7efdb96 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;branch=master;protocol=https" -SRCREV = "1a39b64fafa18f03c62e5cbc6cd0d2da2cc6ed6d" +SRCREV = "03b2c26c8d0b97e943a0418378abbe4828184423" 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 51f0b696e6..94d9c56e86 100644 --- a/meta-phosphor/recipes-graphics/obmc-ikvm/obmc-ikvm_git.bb +++ b/meta-phosphor/recipes-graphics/obmc-ikvm/obmc-ikvm_git.bb @@ -3,7 +3,7 @@ DESCRIPTION = "obmc-ikvm is a vncserver for JPEG-serving V4L2 devices to allow i LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=75859989545e37968a99b631ef42722e" DEPENDS = " libvncserver systemd sdbusplus phosphor-logging phosphor-dbus-interfaces" -SRCREV = "033b18e03fec76a026df1b71fbc2e00f2ee6fece" +SRCREV = "1ece8e3c72c256af0b921ce0eed296b00364d79d" PV = "1.0+git${SRCPV}" SRC_URI = "git://github.com/openbmc/obmc-ikvm;branch=master;protocol=https" diff --git a/meta-phosphor/recipes-phosphor/bios/biosconfig-manager_git.bb b/meta-phosphor/recipes-phosphor/bios/biosconfig-manager_git.bb index e666c71460..c7d3e510e8 100644 --- a/meta-phosphor/recipes-phosphor/bios/biosconfig-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/bios/biosconfig-manager_git.bb @@ -14,7 +14,7 @@ DEPENDS = " boost \ phosphor-logging \ sdbusplus \ systemd " -SRCREV = "20de6de8a8fb01032dc90d698559259af4245a87" +SRCREV = "c65f0a3aa1b77917006918908681350def2140e3" PV = "1.0+git${SRCPV}" PR = "r1" 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 201a44e3c0..c5b87644df 100644 --- a/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb @@ -11,7 +11,7 @@ DEPENDS = " \ sdbusplus \ sdeventplus \ " -SRCREV = "798dca541c5d582d43fc953b0768a5aa2b009be5" +SRCREV = "5d4f7932b3456f34745d344af5f5e2512557b772" PACKAGECONFIG ??= "bmcweb-cert authority-cert" PACKAGECONFIG[ibm-hypervisor-cert] = "-Dca-cert-extension=enabled,-Dca-cert-extension=disabled" PACKAGECONFIG[bmcweb-cert] = "-Dconfig-bmcweb=enabled,-Dconfig-bmcweb=disabled" 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 df564f5354..01585b755b 100644 --- a/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-buttons_git.bb +++ b/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-buttons_git.bb @@ -9,7 +9,7 @@ DEPENDS += " \ phosphor-dbus-interfaces \ phosphor-logging \ " -SRCREV = "3610608ce00dd68a08929a48931835ae375d51f9" +SRCREV = "010035ee96cd6b32d1bff77eb5110d030f4e2684" PACKAGECONFIG ??= "signals handler" PACKAGECONFIG[signals] = ",,gpioplus nlohmann-json," PACKAGECONFIG[handler] = ",,,${VIRTUAL-RUNTIME_obmc-host-state-manager} ${VIRTUAL-RUNTIME_obmc-chassis-state-manager}" diff --git a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb index af8434fede..7af2351bea 100644 --- a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb @@ -9,7 +9,7 @@ DEPENDS = "boost \ sdbusplus \ valijson \ " -SRCREV = "513976bed89432f4c24a40c7ba768f023dc280cd" +SRCREV = "0a78b90d2fce79b205a18da80d2a10998599ff15" PACKAGECONFIG ??= "ipmi-fru" PACKAGECONFIG[ipmi-fru] = "-Dfru-device=true, -Dfru-device=false, i2c-tools," PACKAGECONFIG[validate-json] = "-Dvalidate-json=true, \ diff --git a/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb b/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb index 51d531981f..517cc7982f 100644 --- a/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb +++ b/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" DEPENDS += "autoconf-archive-native \ systemd \ " -SRCREV = "b7dddbc63e601298474dee68ea4c0cc25b865461" +SRCREV = "46d9ef298f2e26f4c513fedff3b8a26fdf4b2d35" PACKAGECONFIG ??= "udev ssh" PACKAGECONFIG[udev] = "-Dudev=enabled,-Dudev=disabled,udev" PACKAGECONFIG[concurrent-servers] = "-Dconcurrent-servers=true,-Dconcurrent-servers=false," 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 c351fa6b49..3289f4cfdf 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb @@ -7,7 +7,7 @@ DEPENDS += " \ sdbusplus \ systemd \ " -SRCREV = "b77f80647113037e831d5aa488ed333d508ae0b6" +SRCREV = "e2c9bc74f2b8c0e78c305894289f8938d75ee108" PV = "1.0+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-objmgr_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-objmgr_git.bb index 063a2eb534..0a2f77ccb1 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-objmgr_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-objmgr_git.bb @@ -9,7 +9,7 @@ DEPENDS += "libtinyxml2" DEPENDS += "sdbusplus" DEPENDS += "phosphor-logging" DEPENDS += "cli11" -SRCREV = "883d91d7d8f9a0f2bcf150990f75073cad21d94c" +SRCREV = "fb853663a2e3ca3366bf96a21a0a045f69d7ed2a" PV = "1.0+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc index 7a1827ef5b..1af0a71ba3 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;branch=master;protocol=https" -SRCREV = "8f3f94da33eefc7a78f58c9a9260299ecaac3eaa" +SRCREV = "50646c2de021b8cfba21d63f656f5ad559cb2818" 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 1f281e5633..c16dd87ea7 100644 --- a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb +++ b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb @@ -14,6 +14,7 @@ DEPENDS += " \ ${PYTHON_PN}-pyyaml-native \ ${PYTHON_PN}-setuptools-native \ ${PYTHON_PN}-mako-native \ + nlohmann-json \ " PACKAGECONFIG ??= "${@bb.utils.contains_any('DISTRO_FEATURES', \ 'obmc-ubi-fs phosphor-mmc obmc-static-norootfs', '', 'jffs-workaround', d)}" @@ -125,49 +126,7 @@ install_dreport_include_scripts() { install -m 0755 ${S}/tools/dreport.d/include.d/* \ ${D}${dreport_include_dir}/ } -# Make the links for a single user plugin script -# Create user directories based on the dump type value in the config section -# Create softlinks for the base scripts in the user directories -def install_dreport_user_script(script_path, d): - import re - import configparser - #Read the user types from the dreport.conf file - configure = configparser.ConfigParser() - conf_dir = d.getVar('D', True) + d.getVar('dreport_conf_dir', True) - confsource = os.path.join(conf_dir, "dreport.conf") - configure.read(confsource) - config = ("config:") - section = "DumpType" - dreport_dir = d.getVar('D', True) + d.getVar('dreport_dir', True) - script = os.path.basename(script_path) - srclink = os.path.join(d.getVar('dreport_plugin_dir', True), script) - file = open(script_path, "r") - for line in file: - if not config in line: - continue - revalue = re.search('[0-9]+.[0-9]+', line) - if not revalue: - bb.warn("Invalid format for config value =%s" % line) - continue - parse_value = revalue.group(0) - config_values = re.split(r'\W+', parse_value, 1) - if(len(config_values) != 2): - bb.warn("Invalid config value=%s" % parse_value) - break; - priority = config_values[1] - types = [int(d) for d in str(config_values[0])] - for type in types: - if not configure.has_option(section, str(type)): - bb.warn("Invalid dump type id =%s" % (str(type))) - continue - typestr = configure.get(section, str(type)) - destdir = os.path.join(dreport_dir, ("pl_" + typestr + ".d")) - if not os.path.exists(destdir): - os.makedirs(destdir) - linkname = "E" + priority + script - destlink = os.path.join(destdir, linkname) - os.symlink(srclink, destlink) - file.close() + #Make the links for all the plugins python install_dreport_user_scripts() { source = d.getVar('S', True) @@ -175,5 +134,5 @@ python install_dreport_user_scripts() { scripts = os.listdir(source_path) for script in scripts: srcname = os.path.join(source_path, script) - install_dreport_user_script(srcname, d) + install_dreport_user_script("dreport.conf", srcname, d) } diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc index 0939a1c145..6e9c54c55e 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;branch=master;protocol=https" -SRCREV = "613b5367e8758f88a9bf302d88e8770ac693aa17" +SRCREV = "99914e5e9ce30f6a6b7346fcf592e4b2845b5174" 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 0491d5ff0a..fc7ae48d45 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb @@ -17,7 +17,7 @@ DEPENDS += "cli11" DEPENDS += "boost" # We depend on this to be built first so we can build our providers. DEPENDS += "phosphor-ipmi-host" -SRCREV = "8dc277cc790efa2a25a4778693cba1bfa24ab741" +SRCREV = "5d897e2a20a5107d4677d4da4b1ec9b0eab9e006" PV = "0.1+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc index 83dfe59a22..5589f02849 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;branch=master;protocol=https" -SRCREV = "30352a66bed92bbc1b12a2468d3ccb5eea500004" +SRCREV = "2311b64c99b39fc28060c38e8a4d8e30b8fad075" diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb index a8a24b552a..8579500e78 100644 --- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb @@ -17,6 +17,8 @@ PACKAGECONFIG[ubifs_layout] = "-Dbmc-layout=ubi" PACKAGECONFIG[mmc_layout] = "-Dbmc-layout=mmc" PACKAGECONFIG[flash_bios] = "-Dhost-bios-upgrade=enabled, -Dhost-bios-upgrade=disabled" PACKAGECONFIG[static-dual-image] = "-Dbmc-static-dual-image=enabled, -Dbmc-static-dual-image=disabled" +PACKAGECONFIG[software-update-dbus-interface] = "-Dsoftware-update-dbus-interface=enabled, -Dsoftware-update-dbus-interface=disabled" + PV = "1.0+git${SRCPV}" PR = "r1" @@ -73,7 +75,7 @@ RPROVIDES:${PN}-version += " \ virtual-obmc-image-manager \ " -FILES:${PN}-version += "${bindir}/phosphor-version-software-manager ${exec_prefix}/lib/tmpfiles.d/software.conf" +FILES:${PN}-version += "${bindir}/phosphor-version-software-manager ${exec_prefix}/lib/tmpfiles.d/software.conf ${bindir}/phosphor-software-manager " FILES:${PN}-download-mgr += "${bindir}/phosphor-download-manager" FILES:${PN}-updater += " \ ${bindir}/phosphor-image-updater \ @@ -98,7 +100,10 @@ ALLOW_EMPTY:${PN} = "1" PACKAGE_BEFORE_PN += "${SOFTWARE_MGR_PACKAGES}" DBUS_PACKAGES = "${SOFTWARE_MGR_PACKAGES}" -DBUS_SERVICE:${PN}-version += "xyz.openbmc_project.Software.Version.service" +DBUS_SERVICE:${PN}-version += " \ + xyz.openbmc_project.Software.Version.service \ + ${@bb.utils.contains('PACKAGECONFIG', 'software-update-dbus-interface', 'xyz.openbmc_project.Software.Manager.service', '', d)} \ +" DBUS_SERVICE:${PN}-download-mgr += "xyz.openbmc_project.Software.Download.service" DBUS_SERVICE:${PN}-updater += "xyz.openbmc_project.Software.BMC.Updater.service" DBUS_SERVICE:${PN}-sync += "xyz.openbmc_project.Software.Sync.service" 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 a2790fcd1e..23210b135b 100644 --- a/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb +++ b/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb @@ -12,7 +12,7 @@ DEPENDS += "boost" DEPENDS += "libgpiod" DEPENDS += "cli11" DEPENDS += "nlohmann-json" -SRCREV = "ccfea22159eba4198ec04013f19612dc1ef59b46" +SRCREV = "9f8459a55d1f0cb42c5d99c0759b20739092b841" PV = "1.0+git${SRCPV}" PR = "r1" 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 60ed910572..75f1d2a4af 100644 --- a/meta-phosphor/recipes-phosphor/health/phosphor-health-monitor_git.bb +++ b/meta-phosphor/recipes-phosphor/health/phosphor-health-monitor_git.bb @@ -8,7 +8,7 @@ DEPENDS += "phosphor-dbus-interfaces" DEPENDS += "sdeventplus" DEPENDS += "phosphor-logging" DEPENDS += "nlohmann-json" -SRCREV = "a3c17d0fcd101a698e24e20237b59bd84249eb3f" +SRCREV = "edc9b36980012f8eb6cf74e5e515f73d66f21441" PV = "0.1+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index 2cea421f9b..d85887b311 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb @@ -13,7 +13,7 @@ DEPENDS = " \ ${@bb.utils.contains('PTEST_ENABLED', '1', 'gtest', '', d)} \ ${@bb.utils.contains('PTEST_ENABLED', '1', 'gmock', '', d)} \ " -SRCREV = "c8491cb0b416637f1c1119c3f0d95500a4bd9c29" +SRCREV = "ff0a08815ee289a7a67c31e9bb460cb240daad67" PV = "1.0+git${SRCPV}" SRC_URI = "git://github.com/openbmc/bmcweb.git;branch=master;protocol=https" diff --git a/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.inc b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.inc index 87e01a7ace..8df06ee33d 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;branch=master;protocol=https" -SRCREV = "31424485624109a9c1e6e79e2c1e043afbfedcaa" +SRCREV = "58a0c359fb9984698a702a3580ddee0a848c05e3" diff --git a/meta-phosphor/recipes-phosphor/ipmi/ipmitool/iana-enterprise-numbers b/meta-phosphor/recipes-phosphor/ipmi/ipmitool/iana-enterprise-numbers index ec542b635e..3d4134b1fe 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/ipmitool/iana-enterprise-numbers +++ b/meta-phosphor/recipes-phosphor/ipmi/ipmitool/iana-enterprise-numbers @@ -1,6 +1,6 @@ PRIVATE ENTERPRISE NUMBERS -(last updated 2023-10-25) +(last updated 2024-06-26) SMI Network Management Private Enterprise Codes: @@ -127,3 +127,7 @@ Decimal Inspur Power Systems Co.,Ltd. Bing Liu liubing&inspur.com +61847 + IEIT SYSTEMS Co.，Ltd. + Chuanbo Yuan + yuancb&ieisystem.com diff --git a/meta-phosphor/recipes-phosphor/ipmi/ipmitool/update-enterprise-numbers b/meta-phosphor/recipes-phosphor/ipmi/ipmitool/update-enterprise-numbers index 6d209fa051..c3d74395e7 100755 --- a/meta-phosphor/recipes-phosphor/ipmi/ipmitool/update-enterprise-numbers +++ b/meta-phosphor/recipes-phosphor/ipmi/ipmitool/update-enterprise-numbers @@ -33,6 +33,7 @@ ENTERPRISES = { 51974: "Raptor Computing Systems, LLC", 52538: "Ampere Computing", 52893: "Inspur Power Systems Co.,Ltd.", + 61847: "IEIT SYSTEMS Co.，Ltd.", } HEADER = """\ 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 fa2f1c3a75..0b43397bd4 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt_git.bb @@ -4,7 +4,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" DEPENDS += "systemd" PROVIDES += "virtual/obmc-host-ipmi-hw" -SRCREV = "b847a932b79ef5d57a04d71908bec310c28b0c9f" +SRCREV = "fc0fa20df27a48437575f0486b67883513b5cc1e" PV = "1.0+git${SRCPV}" PR = "r1" 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 0cbc5ad5ff..cd57160bde 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb @@ -10,7 +10,7 @@ DEPENDS += " \ systemd \ ipmi-blob-tool \ " -SRCREV = "3f5962877855937e32008aac96dd750d8264cd00" +SRCREV = "166b4f19bd1c3937ef7c1a18ad9981edf5c036a0" PACKAGECONFIG ?= "cleanup-delete" PACKAGECONFIG[cleanup-delete] = "-Dcleanup-delete=enabled,-Dcleanup-delete=disabled" # If using static-layout, reboot-update is a good option to handle updating. diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru.inc index e4c87f46a1..6890733ad5 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-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=7702f203b58979ebbc31bfaeb44f219c" SRC_URI += "git://github.com/openbmc/ipmi-fru-parser;branch=master;protocol=https" -SRCREV = "d90dda488a311792646e58477d0c3381c61941e5" +SRCREV = "bc5725d02de2dec594c6ce972fa1cc077eed27db" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc index 333a9c0576..596e178aea 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;branch=master;protocol=https" -SRCREV = "8fb5b89ac71ec9c344ff3c030b84a209f09e1b1c" +SRCREV = "42f64efc1eb8d6c09fb55777da2e6b6305cda3db" 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 ccd7fdf531..513ee50985 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb @@ -8,7 +8,7 @@ DEPENDS = "sdbusplus \ i2c-tools \ boost \ nlohmann-json" -SRCREV = "0736e213fa0cc2d2b3463ea8918765ce3b158574" +SRCREV = "524f753f54d33984ea9d85dc940f647c66a74aa6" PV = "0.1+git${SRCPV}" SRC_URI = "git://github.com/openbmc/ipmbbridge.git;branch=master;protocol=https" diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc index fafc500b35..487fccef5e 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;branch=master;protocol=https" -SRCREV = "e13034150bcee2de25bb0bb02c21c33d78d230f8" +SRCREV = "94e894cb0286404821a34db04b711d7dfc4b9fd6" 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 f801b54544..5718106c89 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb @@ -8,7 +8,7 @@ DEPENDS += "sdbusplus" DEPENDS += "systemd" DEPENDS += "phosphor-dbus-interfaces" DEPENDS += "boost" -SRCREV = "d508bfb51df8c7d2174a7a0e678599e9d1ccab5a" +SRCREV = "29bd56b16682ef75ca5ac856bd7c72281c90e892" PV = "1.0+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb b/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb index 4de7cca645..50d4762eeb 100644 --- a/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb +++ b/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0d30807bb7a4f16d36e96b78f9ed8fae" DEPENDS += "autoconf-archive-native \ systemd \ " -SRCREV = "1fe5899eacb2f736766be07fe1a053784ed016b3" +SRCREV = "b3de343e8b8952d337102df130a02dd13cce5b83" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} pcap" PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir}, \ --without-systemdsystemunitdir,systemd" diff --git a/meta-phosphor/recipes-phosphor/libpldm/libpldm_git.bb b/meta-phosphor/recipes-phosphor/libpldm/libpldm_git.bb index 24e778bd4e..4604ddd354 100644 --- a/meta-phosphor/recipes-phosphor/libpldm/libpldm_git.bb +++ b/meta-phosphor/recipes-phosphor/libpldm/libpldm_git.bb @@ -3,7 +3,7 @@ DESCRIPTION = "PLDM library implementing various PLDM specifications" HOMEPAGE = "https://github.com/openbmc/libpldm" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRCREV = "458475a912c81f46a292a63753015ce6081061cc" +SRCREV = "a1efaa2ef3811d900e1c4ab5b5af1933a6286241" LIBPLDM_ABI_DEVELOPMENT = "deprecated,stable,testing" LIBPLDM_ABI_MAINTENANCE = "stable,testing" LIBPLDM_ABI_PRODUCTION = "deprecated,stable" diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index 4e500f1515..5c41888691 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb @@ -16,7 +16,7 @@ DEPENDS += "libcereal" DEPENDS += "sdeventplus" DEPENDS += "packagegroup-obmc-yaml-providers" DEPENDS += "dbus" -SRCREV = "e8026679f89642e3336b8c5e495f6ab694988e7a" +SRCREV = "7cc55b582ed88b0525d6243e2a907ffaa7c0e156" PACKAGECONFIG ??= "" PACKAGECONFIG[openpower-pels] = " \ -Dopenpower-pel-extension=enabled, \ diff --git a/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb b/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb index 678982b911..8925a62e7b 100644 --- a/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb +++ b/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb @@ -10,7 +10,7 @@ DEPENDS += "phosphor-dbus-interfaces" DEPENDS += "phosphor-logging" DEPENDS += "libnl" DEPENDS += "stdplus" -SRCREV = "91f60564228f4546cbe1c2bee3c760a651d8fae0" +SRCREV = "d92826d2db5a80798436c64b9eb92508ee65788a" PACKAGECONFIG ??= "uboot-env default-link-local-autoconf default-ipv6-accept-ra persist-mac" PACKAGECONFIG[uboot-env] = "-Duboot-env=true,-Duboot-env=false,,${UBOOT_ENV_RDEPENDS}" PACKAGECONFIG[default-link-local-autoconf] = "-Ddefault-link-local-autoconf=true,-Ddefault-link-local-autoconf=false,," diff --git a/meta-phosphor/recipes-phosphor/pldm/pldm_git.bb b/meta-phosphor/recipes-phosphor/pldm/pldm_git.bb index e1176e4202..2ba9a46658 100644 --- a/meta-phosphor/recipes-phosphor/pldm/pldm_git.bb +++ b/meta-phosphor/recipes-phosphor/pldm/pldm_git.bb @@ -2,7 +2,7 @@ HOMEPAGE = "https://github.com/openbmc/pldm" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI = "git://github.com/openbmc/pldm;branch=master;protocol=https" -SRCREV = "15ce5a18e226e8495ddc9467c56eedaa6c9df618" +SRCREV = "079e776975ca6ef8635aff40bea71e1389242fb4" SUMMARY = "PLDM Stack" DESCRIPTION = "Implementation of the PLDM specifications" diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc index 24749a7f4f..cd46c48664 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;branch=master;protocol=https" -SRCREV = "2d068dc70d1ab893315edaaaffd84160cd90c9fd" +SRCREV = "ab73001a784c80b2e6bd59e21607e7849d0e7983" 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 4be5a49d0c..5dd85b3be4 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 @@ -10,7 +10,7 @@ DEPENDS = " \ sdbusplus \ openssl \ " -SRCREV = "64c18b07e867920ec53e47bf387f2d5e5b08ca0e" +SRCREV = "760053d8a9a840ce92628f50275daae8eed51a6f" PV = "1.0+git${SRCPV}" PR = "r1" 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 f63ee612f6..67b1ae24af 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 @@ -22,6 +22,7 @@ PACKAGECONFIG[log-watchdog] = "-Dlog-watchdog=true,-Dlog-watchdog=false," PACKAGECONFIG[log-alarm] = "-Dlog-alarm=true,-Dlog-alarm=false," PACKAGECONFIG[log-host] = "-Dlog-host=true,-Dlog-host=false," PACKAGECONFIG[send-to-logger] = "-Dsend-to-logger=true,-Dsend-to-logger=false,phosphor-logging" +PACKAGECONFIG[sel-delete] = "-Dsel-delete=true,-Dsel-delete=false" PV = "0.1+git${SRCPV}" SRC_URI = "git://github.com/openbmc/phosphor-sel-logger.git;protocol=https;branch=master" diff --git a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb index 389f20f8cd..4a1cae8f04 100644 --- a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb @@ -11,7 +11,7 @@ DEPENDS = " \ phosphor-logging \ sdbusplus \ " -SRCREV = "394f0c525355fead2f997c6d9a2096d1fb88b1f0" +SRCREV = "e8a14e91eefb21dc4bfa754c57212504f7fddb09" PACKAGECONFIG ??= " \ adcsensor \ intelcpusensor \ diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb index 3459723495..910e66adda 100644 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb @@ -8,7 +8,7 @@ DEPENDS += "phosphor-dbus-interfaces" DEPENDS += "sdeventplus" DEPENDS += "phosphor-logging" DEPENDS += "nlohmann-json" -SRCREV = "a77827224ed0847779da98c206450bdd82b21f78" +SRCREV = "3b2e5a9b2f56e37982add882c208e50a9d41d080" PV = "0.1+git${SRCPV}" PR = "r1" 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 8040e40505..23c68352a5 100644 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb @@ -10,7 +10,7 @@ DEPENDS:append = "\ phosphor-logging \ sdbusplus \ " -SRCREV = "9358f6bda1b5bcbf300fdb67804dc16a91ac7acc" +SRCREV = "5f07fa36bbca2e9c02cb2b7f1dba0fa618a48cf9" PV = "0.1+git${SRCPV}" PR = "r1" diff --git a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults-native.bb b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults-native.bb index 11271a47fe..e6a51ac250 100644 --- a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults-native.bb +++ b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults-native.bb @@ -24,4 +24,8 @@ do_install() { sed "s/{}/${i}/g" ${f} >> ${DEST}/defaults.yaml done done + for f in ${SETTINGS_BMC_TEMPLATES}; + do + cat $f >> ${DEST}/defaults.yaml + done } diff --git a/meta-phosphor/recipes-phosphor/smbios/smbios-mdr_git.bb b/meta-phosphor/recipes-phosphor/smbios/smbios-mdr_git.bb index 1249e8f468..aed878ee81 100644 --- a/meta-phosphor/recipes-phosphor/smbios/smbios-mdr_git.bb +++ b/meta-phosphor/recipes-phosphor/smbios/smbios-mdr_git.bb @@ -10,7 +10,7 @@ DEPENDS += " \ phosphor-dbus-interfaces \ phosphor-logging \ " -SRCREV = "c13c87544d9fda10f668f61d5c91f9475a5028b2" +SRCREV = "0fe13aba22a36e0b0b6a369c010ff637b43b4d63" PACKAGECONFIG[smbios-no-dimm] = "-Ddimm-dbus=disabled,-Ddimm-dbus=enabled" PACKAGECONFIG[cpuinfo] = "-Dcpuinfo=enabled,-Dcpuinfo=disabled,i2c-tools" PACKAGECONFIG[cpuinfo-peci] = "-Dcpuinfo-peci=enabled,-Dcpuinfo-peci=disabled,libpeci" 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 877c21473b..ba057e3078 100644 --- a/meta-phosphor/recipes-phosphor/srvcfg-manager/srvcfg-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/srvcfg-manager/srvcfg-manager_git.bb @@ -12,7 +12,7 @@ DEPENDS = " \ sdbusplus \ systemd \ " -SRCREV = "d8effd63e885cb755aa44665d833b20f187c0e53" +SRCREV = "ee190f032091dda63053a82e90866244f09ed54b" PV = "1.0+git${SRCPV}" PR = "r1" 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 4f088e2cbf..fbfbbc608c 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." LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRCREV = "f2da78deb3a105c7270f74d9d747c77f0feaae2c" +SRCREV = "4653cd492616bc88da1ad24cf9bd684975cab2b5" PV = "1.0+git${SRCPV}" SRC_URI = "git://github.com/openbmc/phosphor-post-code-manager.git;branch=master;protocol=https" diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc index f6fa3c4e4a..e0abd46ac7 100644 --- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc +++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc @@ -1,5 +1,5 @@ HOST_DEFAULT_TARGETS = " \ - multi-user.target.requires/obmc-host-reset@{}.target \ + multi-user.target.wants/obmc-host-reset@{}.target \ multi-user.target.wants/phosphor-discover-system-state@{}.service \ obmc-host-start@{}.target.requires/obmc-host-startmin@{}.target \ obmc-host-start@{}.target.requires/phosphor-reset-host-reboot-attempts@{}.service \ 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 f2d4831109..970eab4978 100644 --- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb @@ -266,6 +266,6 @@ SYSTEMD_LINK:${PN}-obmc-targets += "${@compose_list_zip(d, 'RESET_FMT_CTRL', 'OB SYSTEMD_LINK[vardeps] += "OBMC_CHASSIS_INSTANCES OBMC_HOST_INSTANCES" SRC_URI = "git://github.com/openbmc/phosphor-state-manager;branch=master;protocol=https" -SRCREV = "1901ab743aa3f820a304299aa4aea6c2827ba1de" +SRCREV = "3c1351cc2b63178876ef68f4107c9804d2e17dcc" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/storage/estoraged_git.bb b/meta-phosphor/recipes-phosphor/storage/estoraged_git.bb index b084597da5..b4f73bdf71 100644 --- a/meta-phosphor/recipes-phosphor/storage/estoraged_git.bb +++ b/meta-phosphor/recipes-phosphor/storage/estoraged_git.bb @@ -9,7 +9,7 @@ DEPENDS += "openssl" DEPENDS += "phosphor-logging" DEPENDS += "sdbusplus" DEPENDS += "stdplus" -SRCREV = "3cf9e80680a02a33c428a82769a697373612c9be" +SRCREV = "d4554f2a17686e36a77ac4a3619efd685fcbb15c" PV = "0.1+git${SRCPV}" PR = "r1" 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 42160fea53..23006ae2a5 100644 --- a/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb @@ -24,6 +24,10 @@ inherit useradd EXTRA_OEMESON = "-Dtests=disabled" +PACKAGECONFIG ?= "root-user-mgmt" +PACKAGECONFIG[root-user-mgmt] = "-Droot_user_mgmt=enabled, -Droot_user_mgmt=disabled" + + do_install:append() { install -d ${D}${libexecdir} install -m 0755 ${WORKDIR}/upgrade_hostconsole_group.sh ${D}${libexecdir}/upgrade_hostconsole_group.sh diff --git a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb index a453391213..0de894cdc4 100644 --- a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb +++ b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb @@ -9,7 +9,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" DEPENDS:prepend = "nodejs-native " -SRCREV = "07368136b6578638f04f961b3842e93d57e41397" +SRCREV = "8841b7d463a5272a87faaa14cb103f778a772770" PV = "1.0+git${SRCPV}" # This recipe requires online access to build, as it uses NPM for dependency # management and resolution. 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 32ad115d24..7e451a5387 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" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRCREV = "58232256fdd892e0a6193c5dd3a0dc5aab2b6477" +SRCREV = "1cc7921fb3229ee61c3162c2b6cbc8db1231cb34" PV = "1.0+git${SRCPV}" SRC_URI = "git://github.com/openbmc/x86-power-control.git;protocol=https;branch=master" diff --git a/meta-phosphor/recipes-x86/libpeci/libpeci_git.bb b/meta-phosphor/recipes-x86/libpeci/libpeci_git.bb index 1b7b50cdfc..be35a51790 100644 --- a/meta-phosphor/recipes-x86/libpeci/libpeci_git.bb +++ b/meta-phosphor/recipes-x86/libpeci/libpeci_git.bb @@ -2,7 +2,7 @@ SUMMARY = "PECI Library" DESCRIPTION = "PECI Library" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=7becf906c8f8d03c237bad13bc3dac53" -SRCREV = "127609cc41c9ef12f62d9a280a25b7d7c1ba5793" +SRCREV = "5302b933aca5417c3e7aabcdde4d05d2ea5c3bd3" PACKAGECONFIG ??= "" PACKAGECONFIG[dbus-raw-peci] = "-Draw-peci='enabled',-Draw-peci='disabled',boost sdbusplus" PV = "0.1+git${SRCPV}" |