diff options
223 files changed, 4066 insertions, 1314 deletions
diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb index 1d39a52e5..0cf379853 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb @@ -1,6 +1,6 @@ KBRANCH ?= "dev-5.3" -LINUX_VERSION ?= "5.3.11" +LINUX_VERSION ?= "5.3.15" -SRCREV="d41fa1fda16b4b0f9a2d098c1de8f259a00cc9bc" +SRCREV="fdc60468f3e452364d432f1a7c3f83d58bba1b84" require linux-aspeed.inc diff --git a/meta-facebook/meta-tiogapass/recipes-fbtp/packagegroups/packagegroup-fb-apps.bb b/meta-facebook/meta-tiogapass/recipes-fbtp/packagegroups/packagegroup-fb-apps.bb index c1d1ff2ac..1b0e0882f 100644 --- a/meta-facebook/meta-tiogapass/recipes-fbtp/packagegroups/packagegroup-fb-apps.bb +++ b/meta-facebook/meta-tiogapass/recipes-fbtp/packagegroups/packagegroup-fb-apps.bb @@ -21,5 +21,6 @@ RDEPENDS_${PN}-system = " \ fb-ipmi-oem \ phosphor-pid-control \ phosphor-hostlogger \ + phosphor-sel-logger \ ipmitool \ " diff --git a/meta-facebook/meta-tiogapass/recipes-phosphor/ipmi/phosphor-ipmi-config/channel_config.json b/meta-facebook/meta-tiogapass/recipes-phosphor/ipmi/phosphor-ipmi-config/channel_config.json index babb7dc74..eea3b4e20 100644 --- a/meta-facebook/meta-tiogapass/recipes-phosphor/ipmi/phosphor-ipmi-config/channel_config.json +++ b/meta-facebook/meta-tiogapass/recipes-phosphor/ipmi/phosphor-ipmi-config/channel_config.json @@ -10,5 +10,29 @@ "session_supported" : "session-less", "is_ipmi" : true } + }, + "1" : { + "name" : "eth0", + "is_valid" : true, + "active_sessions" : 0, + "max_transfer_size" : 256, + "channel_info" : { + "medium_type" : "lan-802.3", + "protocol_type" : "ipmb-1.0", + "session_supported" : "multi-session", + "is_ipmi" : true + } + }, + "8" : { + "name" : "INTRABMC", + "is_valid" : true, + "active_sessions" : 0, + "max_transfer_size" : 256, + "channel_info" : { + "medium_type" : "oem", + "protocol_type" : "oem", + "session_supported" : "session-less", + "is_ipmi" : true + } } } diff --git a/meta-facebook/meta-tiogapass/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend b/meta-facebook/meta-tiogapass/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend new file mode 100644 index 000000000..4948cb4cb --- /dev/null +++ b/meta-facebook/meta-tiogapass/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend @@ -0,0 +1,3 @@ +# Enable threshold monitoring +EXTRA_OECMAKE += "-DSEL_LOGGER_MONITOR_THRESHOLD_EVENTS=ON" +EXTRA_OECMAKE += "-DREDFISH_LOG_MONITOR_PULSE_EVENTS=ON" diff --git a/meta-facebook/meta-tiogapass/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-cycle.service b/meta-facebook/meta-tiogapass/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-cycle.service new file mode 100644 index 000000000..d0580bb54 --- /dev/null +++ b/meta-facebook/meta-tiogapass/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-cycle.service @@ -0,0 +1,10 @@ +[Unit] +Description=Power Cycle Host Server +Requires=host-gpio.service +After=host-gpio.service + +[Service] +Type=oneshot +ExecStart=busctl set-property xyz.openbmc_project.State.Chassis /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis RequestedPowerTransition s xyz.openbmc_project.State.Chassis.Transition.Off +ExecStart=busctl set-property xyz.openbmc_project.State.Chassis /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis RequestedPowerTransition s xyz.openbmc_project.State.Chassis.Transition.On +SyslogIdentifier=phosphor-watchdog diff --git a/meta-facebook/meta-tiogapass/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-poweroff.service b/meta-facebook/meta-tiogapass/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-poweroff.service new file mode 100644 index 000000000..ddcb9dc62 --- /dev/null +++ b/meta-facebook/meta-tiogapass/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-poweroff.service @@ -0,0 +1,9 @@ +[Unit] +Description=Shutdown Host Server +Requires=host-gpio.service +After=host-gpio.service + +[Service] +Type=oneshot +ExecStart=busctl set-property xyz.openbmc_project.State.Chassis /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis RequestedPowerTransition s xyz.openbmc_project.State.Chassis.Transition.Off +SyslogIdentifier=phosphor-watchdog diff --git a/meta-facebook/meta-tiogapass/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-reset.service b/meta-facebook/meta-tiogapass/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-reset.service new file mode 100644 index 000000000..f00c9e8ab --- /dev/null +++ b/meta-facebook/meta-tiogapass/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-reset.service @@ -0,0 +1,9 @@ +[Unit] +Description=Reset Host Server +Requires=host-gpio.service +After=host-gpio.service + +[Service] +Type=oneshot +ExecStart=busctl set-property xyz.openbmc_project.State.Chassis /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis RequestedPowerTransition s xyz.openbmc_project.State.Chassis.Transition.Reset +SyslogIdentifier=phosphor-watchdog diff --git a/meta-facebook/meta-tiogapass/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog.service b/meta-facebook/meta-tiogapass/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog.service new file mode 100644 index 000000000..f7e93b82f --- /dev/null +++ b/meta-facebook/meta-tiogapass/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog.service @@ -0,0 +1,16 @@ +[Unit] +Description=Phosphor Watchdog + +[Service] +ExecStart=/usr/bin/env phosphor-watchdog --continue --service=xyz.openbmc_project.Watchdog \ + --path=/xyz/openbmc_project/watchdog/host0 \ + --action_target=xyz.openbmc_project.State.Watchdog.Action.HardReset=phosphor-watchdog-host-reset.service \ + --action_target=xyz.openbmc_project.State.Watchdog.Action.PowerOff=host-phosphor-watchdog-host-poweroff.service \ + --action_target=xyz.openbmc_project.State.Watchdog.Action.PowerCycle=phosphor-watchdog-host-cycle.service \ + +SyslogIdentifier=phosphor-watchdog +BusName =xyz.openbmc_project.Watchdog +Type=dbus + +[Install] +WantedBy=basic.target diff --git a/meta-facebook/meta-tiogapass/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend b/meta-facebook/meta-tiogapass/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend new file mode 100644 index 000000000..b0dcd093c --- /dev/null +++ b/meta-facebook/meta-tiogapass/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend @@ -0,0 +1,5 @@ +FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" + +# Remove the override to keep service running after DC cycle +SYSTEMD_OVERRIDE_${PN}_remove = "poweron.conf:phosphor-watchdog@poweron.service.d/poweron.conf" +SYSTEMD_SERVICE_${PN} = "phosphor-watchdog.service phosphor-watchdog-host-poweroff.service phosphor-watchdog-host-reset.service phosphor-watchdog-host-cycle.service" diff --git a/meta-facebook/meta-yosemitev2/conf/bblayers.conf.sample b/meta-facebook/meta-yosemitev2/conf/bblayers.conf.sample new file mode 100644 index 000000000..4e094efb6 --- /dev/null +++ b/meta-facebook/meta-yosemitev2/conf/bblayers.conf.sample @@ -0,0 +1,35 @@ +# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf +# changes incompatibly +LCONF_VERSION = "8" + +BBPATH = "${TOPDIR}" +BBFILES ?= "" + +BBLAYERS ?= " \ + ##OEROOT##/meta \ + ##OEROOT##/meta-poky \ + ##OEROOT##/meta-openembedded/meta-oe \ + ##OEROOT##/meta-openembedded/meta-networking \ + ##OEROOT##/meta-openembedded/meta-perl \ + ##OEROOT##/meta-openembedded/meta-python \ + ##OEROOT##/meta-openembedded/meta-webserver \ + ##OEROOT##/meta-phosphor \ + ##OEROOT##/meta-aspeed \ + ##OEROOT##/meta-openpower \ + ##OEROOT##/meta-facebook \ + ##OEROOT##/meta-facebook/meta-yosemitev2 \ + " +BBLAYERS_NON_REMOVABLE ?= " \ + ##OEROOT##/meta \ + ##OEROOT##/meta-poky \ + ##OEROOT##/meta-openembedded/meta-oe \ + ##OEROOT##/meta-openembedded/meta-networking \ + ##OEROOT##/meta-openembedded/meta-perl \ + ##OEROOT##/meta-openembedded/meta-python \ + ##OEROOT##/meta-openembedded/meta-webserver \ + ##OEROOT##/meta-phosphor \ + ##OEROOT##/meta-aspeed \ + ##OEROOT##/meta-openpower \ + ##OEROOT##/meta-facebook \ + ##OEROOT##/meta-facebook/meta-yosemitev2 \ + " diff --git a/meta-facebook/meta-yosemitev2/conf/conf-notes.txt b/meta-facebook/meta-yosemitev2/conf/conf-notes.txt new file mode 100644 index 000000000..9b3c01a55 --- /dev/null +++ b/meta-facebook/meta-yosemitev2/conf/conf-notes.txt @@ -0,0 +1,2 @@ +Common targets are: + obmc-phosphor-image diff --git a/meta-facebook/meta-yosemitev2/conf/layer.conf b/meta-facebook/meta-yosemitev2/conf/layer.conf new file mode 100644 index 000000000..4c4571a68 --- /dev/null +++ b/meta-facebook/meta-yosemitev2/conf/layer.conf @@ -0,0 +1,11 @@ +# We have a conf and classes directory, add to BBPATH +BBPATH .= ":${LAYERDIR}" + +# We have recipes-* directories, add to BBFILES +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ + ${LAYERDIR}/recipes-*/*/*.bbappend" + +BBFILE_COLLECTIONS += "yosemitev2-layer" +BBFILE_PATTERN_yosemitev2-layer := "^${LAYERDIR}/" + +LAYERSERIES_COMPAT_tiogapass-layer := "warrior zeus" diff --git a/meta-facebook/meta-yosemitev2/conf/local.conf.sample b/meta-facebook/meta-yosemitev2/conf/local.conf.sample new file mode 100644 index 000000000..cbbcb84ef --- /dev/null +++ b/meta-facebook/meta-yosemitev2/conf/local.conf.sample @@ -0,0 +1,223 @@ +# +# This file is your local configuration file and is where all local user settings +# are placed. The comments in this file give some guide to the options a new user +# to the system might want to change but pretty much any configuration option can +# be set in this file. +# +# Lines starting with the '#' character are commented out and in some cases the +# default values are provided as comments to show people example syntax. Enabling +# the option is a question of removing the # character and making any change to the +# variable as required. + +# +# Machine Selection +# +MACHINE ??= "yosemitev2" + +# +# Where to place downloads +# +# During a first build the system will download many different source code tarballs +# from various upstream projects. This can take a while, particularly if your network +# connection is slow. These are all stored in DL_DIR. When wiping and rebuilding you +# can preserve this directory to speed up this part of subsequent builds. This directory +# is safe to share between multiple builds on the same machine too. +# +# The default is a downloads directory under TOPDIR which is the build directory. +# +#DL_DIR ?= "${TOPDIR}/downloads" + +# +# Where to place shared-state files +# +# BitBake has the capability to accelerate builds based on previously built output. +# This is done using "shared state" files which can be thought of as cache objects +# and this option determines where those files are placed. +# +# You can wipe out TMPDIR leaving this directory intact and the build would regenerate +# from these files if no changes were made to the configuration. If changes were made +# to the configuration, only shared state files where the state was still valid would +# be used (done using checksums). +# +# The default is a sstate-cache directory under TOPDIR. +# +#SSTATE_DIR ?= "${TOPDIR}/sstate-cache" + +# +# Where to place the build output +# +# This option specifies where the bulk of the building work should be done and +# where BitBake should place its temporary files and output. Keep in mind that +# this includes the extraction and compilation of many applications and the toolchain +# which can use Gigabytes of hard disk space. +# +# The default is a tmp directory under TOPDIR. +# +#TMPDIR = "${TOPDIR}/tmp" + +# +# Default policy config +# +# The distribution setting controls which policy settings are used as defaults. +# The default value is fine for general Yocto project use, at least initially. +# Ultimately when creating custom policy, people will likely end up subclassing +# these defaults. +# +DISTRO ?= "openbmc-phosphor" +# As an example of a subclass there is a "bleeding" edge policy configuration +# where many versions are set to the absolute latest code from the upstream +# source control systems. This is just mentioned here as an example, its not +# useful to most new users. +# DISTRO ?= "poky-bleeding" + +# +# Package Management configuration +# +# This variable lists which packaging formats to enable. Multiple package backends +# can be enabled at once and the first item listed in the variable will be used +# to generate the root filesystems. +# Options are: +# - 'package_deb' for debian style deb files +# - 'package_ipk' for ipk files are used by opkg (a debian style embedded package manager) +# - 'package_rpm' for rpm style packages +# E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk" +# We default to rpm: +PACKAGE_CLASSES ?= "package_rpm" + +# +# SDK/ADT target architecture +# +# This variable specifies the architecture to build SDK/ADT items for and means +# you can build the SDK packages for architectures other than the machine you are +# running the build on (i.e. building i686 packages on an x86_64 host). +# Supported values are i686 and x86_64 +#SDKMACHINE ?= "i686" + +SANITY_TESTED_DISTROS_append ?= " *" + +# +# Extra image configuration defaults +# +# The EXTRA_IMAGE_FEATURES variable allows extra packages to be added to the generated +# images. Some of these options are added to certain image types automatically. The +# variable can contain the following options: +# "dbg-pkgs" - add -dbg packages for all installed packages +# (adds symbol information for debugging/profiling) +# "dev-pkgs" - add -dev packages for all installed packages +# (useful if you want to develop against libs in the image) +# "ptest-pkgs" - add -ptest packages for all ptest-enabled packages +# (useful if you want to run the package test suites) +# "tools-sdk" - add development tools (gcc, make, pkgconfig etc.) +# "tools-debug" - add debugging tools (gdb, strace) +# "eclipse-debug" - add Eclipse remote debugging support +# "tools-profile" - add profiling tools (oprofile, exmap, lttng, valgrind) +# "tools-testapps" - add useful testing tools (ts_print, aplay, arecord etc.) +# "debug-tweaks" - make an image suitable for development +# e.g. ssh root access has a blank password +# There are other application targets that can be used here too, see +# meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details. +# We default to enabling the debugging tweaks. +EXTRA_IMAGE_FEATURES = "debug-tweaks" + +# +# Additional image features +# +# The following is a list of additional classes to use when building images which +# enable extra features. Some available options which can be included in this variable +# are: +# - 'buildstats' collect build statistics +# - 'image-mklibs' to reduce shared library files size for an image +# - 'image-prelink' in order to prelink the filesystem image +# - 'image-swab' to perform host system intrusion detection +# NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink +# NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended +USER_CLASSES ?= "buildstats image-mklibs image-prelink" + +# +# Runtime testing of images +# +# The build system can test booting virtual machine images under qemu (an emulator) +# after any root filesystems are created and run tests against those images. To +# enable this uncomment this line. See classes/testimage(-auto).bbclass for +# further details. +#TEST_IMAGE = "1" +# +# Interactive shell configuration +# +# Under certain circumstances the system may need input from you and to do this it +# can launch an interactive shell. It needs to do this since the build is +# multithreaded and needs to be able to handle the case where more than one parallel +# process may require the user's attention. The default is iterate over the available +# terminal types to find one that works. +# +# Examples of the occasions this may happen are when resolving patches which cannot +# be applied, to use the devshell or the kernel menuconfig +# +# Supported values are auto, gnome, xfce, rxvt, screen, konsole (KDE 3.x only), none +# Note: currently, Konsole support only works for KDE 3.x due to the way +# newer Konsole versions behave +#OE_TERMINAL = "auto" +# By default disable interactive patch resolution (tasks will just fail instead): +PATCHRESOLVE = "noop" + +# +# Disk Space Monitoring during the build +# +# Monitor the disk space during the build. If there is less that 1GB of space or less +# than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully +# shutdown the build. If there is less that 100MB or 1K inodes, perform a hard abort +# of the build. The reason for this is that running completely out of space can corrupt +# files and damages the build in ways which may not be easily recoverable. +# It's necessary to monitor /tmp, if there is no space left the build will fail +# with very exotic errors. +BB_DISKMON_DIRS = "\ + STOPTASKS,${TMPDIR},1G,100K \ + STOPTASKS,${DL_DIR},1G,100K \ + STOPTASKS,${SSTATE_DIR},1G,100K \ + STOPTASKS,/tmp,100M,100K \ + ABORT,${TMPDIR},100M,1K \ + ABORT,${DL_DIR},100M,1K \ + ABORT,${SSTATE_DIR},100M,1K \ + ABORT,/tmp,10M,1K" + +# +# Shared-state files from other locations +# +# As mentioned above, shared state files are prebuilt cache data objects which can +# used to accelerate build time. This variable can be used to configure the system +# to search other mirror locations for these objects before it builds the data itself. +# +# This can be a filesystem directory, or a remote url such as http or ftp. These +# would contain the sstate-cache results from previous builds (possibly from other +# machines). This variable works like fetcher MIRRORS/PREMIRRORS and points to the +# cache locations to check for the shared objects. +# NOTE: if the mirror uses the same structure as SSTATE_DIR, you need to add PATH +# at the end as shown in the examples below. This will be substituted with the +# correct path within the directory structure. +#SSTATE_MIRRORS ?= "\ +#file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \ +#file://.* file:///some/local/dir/sstate/PATH" + + +# +# Qemu configuration +# +# By default qemu will build with a builtin VNC server where graphical output can be +# seen. The two lines below enable the SDL backend too. This assumes there is a +# libsdl library available on your build system. +#PACKAGECONFIG_append_pn-qemu-native = " sdl" +#PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl" +#ASSUME_PROVIDED += "libsdl-native" + + +# CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to +# track the version of this file when it was generated. This can safely be ignored if +# this doesn't mean anything to you. +CONF_VERSION = "1" + +# Set the root password to '0penBmc' +INHERIT += "extrausers" + +EXTRA_USERS_PARAMS = " \ + usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \ + " diff --git a/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf b/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf new file mode 100644 index 000000000..43e156fac --- /dev/null +++ b/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf @@ -0,0 +1,21 @@ +KMACHINE = "aspeed" +KERNEL_DEVICETREE = "${KMACHINE}-bmc-facebook-${MACHINE}.dtb" + +UBOOT_MACHINE = "ast_g5_ncsi_config" + +require conf/machine/include/ast2500.inc +require conf/machine/include/obmc-bsp-common.inc + +OBMC_MACHINE_FEATURES += "\ + obmc-phosphor-fan-mgmt \ + obmc-phosphor-chassis-mgmt \ + obmc-phosphor-flash-mgmt \ + obmc-host-ipmi \ + obmc-host-state-mgmt \ + obmc-chassis-state-mgmt \ + obmc-bmc-state-mgmt \ + " +PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "" +FLASH_SIZE = "32768" +VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config" + diff --git a/meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed/0002-board-aspeed-Add-Mux-for-yosemitev2.patch b/meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed/0002-board-aspeed-Add-Mux-for-yosemitev2.patch new file mode 100644 index 000000000..5634ce936 --- /dev/null +++ b/meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed/0002-board-aspeed-Add-Mux-for-yosemitev2.patch @@ -0,0 +1,259 @@ +From c2e01a4cc220b9a1c1a6bb52e5f58bcc8d2edc55 Mon Sep 17 00:00:00 2001 +From: manikandan-e <manikandan.hcl.ers.epl@gmail.com> +Date: Wed, 30 Oct 2019 19:43:51 +0530 +Subject: [PATCH 2/2] board-aspeed-Add-Mux-for-yosemitev2 + +Signed-off-by: manikandan-e <manikandan.hcl.ers.epl@gmail.com> + +--- + arch/arm/mach-aspeed/platform_g5.S | 213 +++++++++++++++++++++++++++++++------ + 1 file changed, 183 insertions(+), 30 deletions(-) + +diff --git a/arch/arm/mach-aspeed/platform_g5.S b/arch/arm/mach-aspeed/platform_g5.S +index 2ac1ca4..c3ce077 100644 +--- a/arch/arm/mach-aspeed/platform_g5.S ++++ b/arch/arm/mach-aspeed/platform_g5.S +@@ -302,6 +302,156 @@ TIME_TABLE_DDR4_1600: + ldr r2, =0x00000800 + .endm + ++ .macro console_bmc ++ ldr r0, =0x1e780024 ++ldr r1, [r0] ++orr r1, r1, #0xF ++str r1, [r0] ++ ++ldr r0, =0x1e780020 ++ldr r1, [r0] ++and r1, r1, #0xFFFFFFF0 ++orr r1, r1, #0xC ++str r1, [r0] ++.endm ++ ++.macro console_sel ++ ++ // Disable SoL UARTs[1-4] ++ ldr r0, =0x1e6e2080 ++ ldr r1, [r0] ++ ldr r2, =0xBFBFFFFF ++ and r1, r1, r2 ++ str r1, [r0] ++ ++ ldr r0, =0x1e6e2084 ++ ldr r1, [r0] ++ and r1, r1, r2 ++ str r1, [r0] ++ // Enable GPIOE[0-3] Tolerant ++ ldr r0, =0x1e78003c ++ ldr r1, [r0] ++ orr r1, r1, #0xF ++ str r1, [r0] ++ ++ // Read debug card present ++ ldr r2, =0x1e780080 ++ ldr r0, [r2] ++ and r0, r0, #0x00000800 ++ ldr r1, =0x0800 ++ cmp r0, r1 ++ bne dbg_card_pres\@ ++ console_bmc ++ b case_end\@ ++ ++dbg_card_pres\@: ++ // Read key position ++ ldr r2, =0x1e7801e0 ++ ldr r0, [r2] ++ bic r1, r0, #0xFF0FFFFF ++ mov r0, r1, lsr #20 ++ //Test for position#1 ++ ldr r1, =0x00 ++ cmp r0, r1 ++ bne case_pos2\@ ++ console_bmc ++ b case_end\@ ++case_pos2\@: ++ //Test for position#2 ++ ldr r1, =0x01 ++ cmp r0, r1 ++ bne case_pos3\@ ++ console_bmc ++ b case_end\@ ++case_pos3\@: ++ //Test for position#3 ++ ldr r1, =0x02 ++ cmp r0, r1 ++ bne case_pos4\@ ++ console_bmc ++ b case_end\@ ++case_pos4\@: ++//Test for position#4 ++ ldr r1, =0x03 ++ cmp r0, r1 ++ bne case_pos5\@ ++ console_bmc ++ b case_end\@ ++case_pos5\@: ++ //Test for position#5 ++ ldr r1, =0x04 ++ cmp r0, r1 ++ bne case_pos6\@ ++ console_bmc ++ b case_end\@ ++case_pos6\@: ++ //Test for position#6 ++ ldr r1, =0x05 ++ cmp r0, r1 ++ bne case_pos7\@ ++ console_bmc ++ b case_end\@ ++case_pos7\@: ++ //Test for position#7 ++ ldr r1, =0x06 ++ cmp r0, r1 ++ bne case_pos8\@ ++ console_bmc ++ b case_end\@ ++case_pos8\@: ++ //Test for position#8 ++ ldr r1, =0x07 ++ cmp r0, r1 ++ bne case_pos9\@ ++ console_bmc ++ b case_end\@ ++case_pos9\@: ++ //Test for position#9 ++ ldr r1, =0x08 ++ cmp r0, r1 ++ bne case_pos10\@ ++ console_bmc ++ b case_end\@ ++case_pos10\@: ++ //Test for position#10 ++ ldr r1, =0x09 ++ cmp r0, r1 ++ bne case_end\@ ++ console_bmc ++ b case_end\@ ++case_end\@: ++.endm ++ ++ .macro uart_console_setup ++ console_sel ++ /* setup UART console */ ++ ldr r0, =0x1E78400C ++ mov r1, #0x83 ++ str r1, [r0] ++ ++ ldr r0, =0x1e6e202c ++ ldr r2, [r0] ++ mov r2, r2, lsr #12 ++ tst r2, #0x01 ++ ldr r0, =0x1E784000 ++ moveq r1, #0x0D @ Baudrate 115200 ++ movne r1, #0x01 @ Baudrate 115200, div13 ++ ++ str r1, [r0] ++ ++ ldr r0, =0x1E784004 ++ mov r1, #0x00 ++ str r1, [r0] ++ ++ ldr r0, =0x1E78400C ++ mov r1, #0x03 ++ str r1, [r0] ++ ++ ldr r0, =0x1E784008 ++ mov r1, #0x07 ++ str r1, [r0] ++ .endm ++ + .macro print_hex_char + and r1, r1, #0xF + cmp r1, #9 +@@ -324,6 +474,36 @@ init_dram: + /******************************************** + Initial Reset Procedure : Begin + *******************************************/ ++ /* save into SRAM */ ++ ldr r0, =0x1e720200 /* vbs.uboot_exec_address */ ++ str r4, [r0] ++ ++ uart_console_setup ++ ++ /* Debug - UART console message */ ++ ldr r0, =0x1E784000 ++ mov r1, #0x0D @ '\r' ++ str r1, [r0] ++ mov r1, #0x0A @ '\n' ++ str r1, [r0] ++ mov r1, #0x54 @ 'S' ++ str r1, [r0] ++ mov r1, #0x50 @ 'P' ++ str r1, [r0] ++ mov r1, #0x4C @ 'L' ++ str r1, [r0] ++ mov r1, #0x0D @ '\r' ++ str r1, [r0] ++ mov r1, #0x0A @ '\n' ++ str r1, [r0] ++ /* End Debug - UART console message */ ++ ++ ++ ++ ldr r0, =0x1E720204 ++ mov r1, #0x0 ++ str r1, [r0] ++ + /* Clear AHB bus lock condition */ + ldr r0, =0x1e600000 + ldr r1, =0xAEED1A03 +@@ -793,7 +973,9 @@ wait_ddr_reset: + clear_delay_timer + /* end delay 10ms */ + +-/* Debug - UART console message */ ++ uart_console_setup ++ ++ /* Debug - UART console message */ + #ifdef CONFIG_DRAM_UART_TO_UART1 + ldr r0, =0x1e78909c @ route UART5 to UART Port1, 2016.08.29 + ldr r1, =0x10000004 +@@ -806,35 +988,6 @@ wait_ddr_reset: + str r1, [r0] + #endif + +- ldr r0, =0x1e78400c +- mov r1, #0x83 +- str r1, [r0] +- +- ldr r0, =0x1e6e202c +- ldr r2, [r0] +- mov r2, r2, lsr #12 +- tst r2, #0x01 +- ldr r0, =0x1e784000 +- moveq r1, #0x0D @ Baudrate 115200 +- movne r1, #0x01 @ Baudrate 115200, div13 +-#ifdef CONFIG_DRAM_UART_38400 +- moveq r1, #0x27 @ Baudrate 38400 +- movne r1, #0x03 @ Baudrate 38400 , div13 +-#endif +- str r1, [r0] +- +- ldr r0, =0x1e784004 +- mov r1, #0x00 +- str r1, [r0] +- +- ldr r0, =0x1e78400c +- mov r1, #0x03 +- str r1, [r0] +- +- ldr r0, =0x1e784008 +- mov r1, #0x07 +- str r1, [r0] +- + ldr r0, =0x1e784000 + mov r1, #0x0D @ '\r' + str r1, [r0] +-- +2.7.4 + diff --git a/meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend b/meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend new file mode 100644 index 000000000..51d98a504 --- /dev/null +++ b/meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend @@ -0,0 +1,2 @@ +FILESEXTRAPATHS_prepend_yosemitev2 := "${THISDIR}/${PN}:" +SRC_URI_append_yosemitev2 = " file://0002-board-aspeed-Add-Mux-for-yosemitev2.patch" diff --git a/meta-facebook/meta-yosemitev2/recipes-kernel/linux/linux-aspeed/yosemitev2.cfg b/meta-facebook/meta-yosemitev2/recipes-kernel/linux/linux-aspeed/yosemitev2.cfg new file mode 100644 index 000000000..7ea8dc31a --- /dev/null +++ b/meta-facebook/meta-yosemitev2/recipes-kernel/linux/linux-aspeed/yosemitev2.cfg @@ -0,0 +1,6 @@ +CONFIG_SENSORS_TMP421=y +CONFIG_SENSORS_MAX31785=y +CONFIG_RTC_DRV_RV8803=y +CONFIG_TCG_TPM=y +CONFIG_TCG_TIS_I2C_INFINEON=y +CONFIG_NCSI_OEM_CMD_GET_MAC=y diff --git a/meta-facebook/meta-yosemitev2/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-facebook/meta-yosemitev2/recipes-kernel/linux/linux-aspeed_%.bbappend new file mode 100644 index 000000000..9020b66fb --- /dev/null +++ b/meta-facebook/meta-yosemitev2/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -0,0 +1,2 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/linux-aspeed:" +SRC_URI += "file://yosemitev2.cfg" diff --git a/meta-facebook/meta-yosemitev2/recipes.txt b/meta-facebook/meta-yosemitev2/recipes.txt new file mode 100644 index 000000000..73263d85d --- /dev/null +++ b/meta-facebook/meta-yosemitev2/recipes.txt @@ -0,0 +1,2 @@ +recipes-kernel - The kernel and generic applications/libraries with strong kernel dependencies +recipes-bsp - Aspeed BSP with uboot diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/thermal-policy/mihawk/thermal-policy.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/thermal-policy/mihawk/thermal-policy.yaml index bb3226af3..727630cb8 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/thermal-policy/mihawk/thermal-policy.yaml +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/thermal-policy/mihawk/thermal-policy.yaml @@ -116,6 +116,29 @@ - meta: SENSOR path: /xyz/openbmc_project/sensors/temperature/ambient_temp +- name: gpu sensors + description: > + 'Each gpu has its own temperature sensor.' + class: group + group: path + members: + - meta: SENSOR + path: /xyz/openbmc_project/sensors/temperature/gpu0 + - meta: SENSOR + path: /xyz/openbmc_project/sensors/temperature/gpu1 + - meta: SENSOR + path: /xyz/openbmc_project/sensors/temperature/gpu2 + - meta: SENSOR + path: /xyz/openbmc_project/sensors/temperature/gpu3 + - meta: SENSOR + path: /xyz/openbmc_project/sensors/temperature/gpu4 + - meta: SENSOR + path: /xyz/openbmc_project/sensors/temperature/gpu5 + - meta: SENSOR + path: /xyz/openbmc_project/sensors/temperature/gpu6 + - meta: SENSOR + path: /xyz/openbmc_project/sensors/temperature/gpu7 + - name: core temp description: > 'Monitor the temperature of each core.' @@ -138,6 +161,17 @@ meta: TEMP property: Value +- name: gpu temp + description: > + 'Monitor the temperature of each gpu core.' + class: group + group: property + type: int64 + members: + - interface: xyz.openbmc_project.Sensor.Value + meta: TEMP + property: Value + - name: watch core temps description: > 'Trigger logic on core temp changes.' @@ -156,6 +190,15 @@ properties: ambient temp callback: check ambient temp +- name: watch gpu temps + description: > + 'Trigger logic on gpu core temp changes.' + class: watch + watch: property + paths: gpu sensors + properties: gpu temp + callback: check gpu temps + - name: check temps description: > 'If this condition passes at least three cores are running @@ -185,6 +228,20 @@ bound: 45000 oneshot: true +- name: check gpu temps + description: > + 'If the gpu temperature sensor is too hot. Shut the system down.' + class: condition + condition: count + paths: gpu sensors + properties: gpu temp + callback: gpu log and shutdown + countop: '>=' + countbound: 1 + op: '>=' + bound: 92 + oneshot: true + - name: log and shutdown description: > 'Shut the system down and log an event.' @@ -205,6 +262,16 @@ - create ambient criticalhigh error - create ambient shutdown error +- name: gpu log and shutdown + description: > + 'Shut the system down and log an event.' + class: callback + callback: group + members: + - shutdown + - create gpu criticalhigh error + - create gpu shutdown error + - name: shutdown description: > 'Shut down the system.' @@ -240,6 +307,16 @@ error: xyz::openbmc_project::Sensor::Threshold::Error::CriticalHigh metadata: xyz::openbmc_project::Sensor::Threshold::CriticalHigh::SENSOR_DATA +- name: create gpu criticalhigh error + description: > + 'Create a GPU CriticalHigh Error log.' + class: callback + callback: elog_with_metadata + paths: gpu sensors + properties: gpu temp + error: xyz::openbmc_project::Sensor::Threshold::Error::CriticalHigh + metadata: xyz::openbmc_project::Sensor::Threshold::CriticalHigh::SENSOR_DATA + - name: create shutdown error description: > 'Create a SystemShutdown Error log.' @@ -257,3 +334,12 @@ paths: ambient sensor properties: ambient temp error: xyz::openbmc_project::State::Shutdown::ThermalEvent::Error::Ambient + +- name: create gpu shutdown error + description: > + 'Create a SystemShutdown Error log.' + class: callback + callback: elog + paths: gpu sensors + properties: gpu temp + error: xyz::openbmc_project::State::Shutdown::ThermalEvent::Error::GPU diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config/mihawk/events.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config/mihawk/events.yaml index ade4567ce..386f4b7c7 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config/mihawk/events.yaml +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config/mihawk/events.yaml @@ -301,6 +301,65 @@ actions: - altevents events: + - name: default_fan_floor_on_service_fail + precondition: + name: services_missing_owner + groups: + - name: zone0_ambient + interface: xyz.openbmc_project.Sensor.Value + property: + name: Value + type: int64_t + triggers: + - name: init + method: nameHasOwner + handler: setService + - name: signal + signal: nameOwnerChanged + handler: setService + events: + - name: default_fan_floor + groups: + - name: zone0_ambient + interface: xyz.openbmc_project.Sensor.Value + property: + name: Value + type: int64_t + triggers: + - name: timer + interval: 5000000 + type: oneshot + actions: + - name: default_floor_on_missing_owner + - name: high_speed_on_occ_service_fails + groups: + - name: occ0_object + interface: org.open_power.OCC.Status + property: + name: OccActive + type: bool + - name: occ1_object + interface: org.open_power.OCC.Status + property: + name: OccActive + type: bool + triggers: + - name: init + method: nameHasOwner + handler: setService + - name: signal + signal: nameOwnerChanged + handler: setService + actions: + - name: call_actions_based_on_timer + timer: + interval: 5000000 + type: oneshot + actions: + - name: set_speed_on_missing_owner + speed: + value: 255 + type: uint64_t - name: missing_or_fails_before_high_speed_air groups: - name: air_cooled_zone0_fans diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config/mihawk/fans.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config/mihawk/fans.yaml index 9133fa1fa..d0a09004e 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config/mihawk/fans.yaml +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config/mihawk/fans.yaml @@ -3,29 +3,35 @@ fans: cooling_zone: 0 sensors: - fan0_0 + - fan0_1 target_interface: xyz.openbmc_project.Control.FanPwm - inventory: /system/chassis/motherboard/fan1 cooling_zone: 0 sensors: - fan1_0 + - fan1_1 target_interface: xyz.openbmc_project.Control.FanPwm - inventory: /system/chassis/motherboard/fan2 cooling_zone: 0 sensors: - fan2_0 + - fan2_1 target_interface: xyz.openbmc_project.Control.FanPwm - inventory: /system/chassis/motherboard/fan3 cooling_zone: 0 sensors: - fan3_0 + - fan3_1 target_interface: xyz.openbmc_project.Control.FanPwm - inventory: /system/chassis/motherboard/fan4 cooling_zone: 0 sensors: - fan4_0 + - fan4_1 target_interface: xyz.openbmc_project.Control.FanPwm - inventory: /system/chassis/motherboard/fan5 cooling_zone: 0 sensors: - fan5_0 + - fan5_1 target_interface: xyz.openbmc_project.Control.FanPwm diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/leds/mihawk-led-manager-config/led.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/leds/mihawk-led-manager-config/led.yaml index 1c6634551..59693ce77 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/leds/mihawk-led-manager-config/led.yaml +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/leds/mihawk-led-manager-config/led.yaml @@ -145,4 +145,370 @@ LampTest: Action: 'Blink' DutyOn: 50 Period: 1000 - Priority: 'Blink'
\ No newline at end of file + Priority: 'Blink' +core0Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +core1Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +core2Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +core3Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +core4Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +core5Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +core6Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +core7Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +core8Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +core9Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +core10Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +core11Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +core12Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +core13Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +core14Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +core15Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +core16Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +core17Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +core18Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +core19Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +core20Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +core21Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +core22Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +core23Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +cpu0Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +cpu1Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm0Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm1Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm2Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm3Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm4Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm5Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm6Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm7Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm8Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm9Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm10Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm11Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm12Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm13Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm14Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm15Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm16Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm17Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm18Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm19Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm20Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm21Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm22Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm23Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm24Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm25Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm26Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm27Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm28Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm29Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm30Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +dimm31Fault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +motherboardFault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +occFault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On' +systemFault: + fault: + Action: 'On' + DutyOn: 50 + Period: 0 + Priority: 'On'
\ No newline at end of file diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power_%.bbappend index b90dc9b50..350c996d0 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power_%.bbappend @@ -1,5 +1,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +inherit obmc-phosphor-systemd + SRC_URI += "file://psu.json" EXTRA_OEMESON += "-Ducd90160-yaml=${STAGING_DIR_HOST}${datadir}/power-sequencer/ucd90160.yaml" @@ -12,4 +14,4 @@ do_install_append(){ FILES_${PN} += "${datadir}/phosphor-power/psu.json" PSU_MONITOR_ENV_FMT = "obmc/power-supply-monitor/power-supply-monitor-{0}.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'PSU_MONITOR_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE_${PN}_append_ibm-ac-server += "${@compose_list(d, 'PSU_MONITOR_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@58.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@58.conf index 61b4253bf..80ff06f9f 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@58.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@58.conf @@ -1,4 +1,23 @@ LABEL_in1="ps1_input_voltage" +WARNHI_in1="264000" +WARNLO_in1="200000" +CRITHI_in1="265000" +CRITLO_in1="180000" + LABEL_in2="ps1_output_voltage" +WARNHI_in2="12700" +WARNLO_in2="0" +CRITHI_in2="13000" +CRITLO_in2="0" + LABEL_curr1="ps1_output_current" +WARNHI_curr1="170000" +WARNLO_curr1="0" +CRITHI_curr1="180000" +CRITLO_curr1="0" + LABEL_power1="ps1_input_power" +WARNHI_power1="2300000000" +WARNLO_power1="0" +CRITHI_power1="2500000000" +CRITLO_power1="0"
\ No newline at end of file diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@5b.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@5b.conf index 92838e1d0..db56c888d 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@5b.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@5b.conf @@ -1,4 +1,23 @@ LABEL_in1="ps0_input_voltage" +WARNHI_in1="264000" +WARNLO_in1="200000" +CRITHI_in1="265000" +CRITLO_in1="180000" + LABEL_in2="ps0_output_voltage" +WARNHI_in2="12700" +WARNLO_in2="0" +CRITHI_in2="13000" +CRITLO_in2="0" + LABEL_curr1="ps0_output_current" +WARNHI_curr1="170000" +WARNLO_curr1="0" +CRITHI_curr1="180000" +CRITLO_curr1="0" + LABEL_power1="ps0_input_power" +WARNHI_power1="2300000000" +WARNLO_power1="0" +CRITHI_power1="2500000000" +CRITLO_power1="0" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf index bb569f70a..066ebf6c2 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf @@ -12,8 +12,14 @@ LABEL_fan11 = "fan5_0" LABEL_fan12 = "fan5_1" PWM_TARGET_fan1 = "1" +PWM_TARGET_fan2 = "1" PWM_TARGET_fan3 = "2" +PWM_TARGET_fan4 = "2" PWM_TARGET_fan5 = "3" +PWM_TARGET_fan6 = "3" PWM_TARGET_fan7 = "4" +PWM_TARGET_fan8 = "4" PWM_TARGET_fan9 = "5" +PWM_TARGET_fan10 = "5" PWM_TARGET_fan11 = "6" +PWM_TARGET_fan12 = "6" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf index 94eeff7ca..d6d2416ea 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf @@ -38,6 +38,23 @@ MODE_temp37 = "label" MODE_temp38 = "label" MODE_temp39 = "label" MODE_temp40 = "label" + +MODE_power1 = "label" +MODE_power2 = "label" +MODE_power3 = "label" +MODE_power4 = "label" +MODE_power5 = "label" +MODE_power6 = "label" +MODE_power7 = "label" +MODE_power8 = "label" +MODE_power9 = "label" +MODE_power10 = "label" +MODE_power11 = "label" +MODE_power12 = "label" +MODE_power13 = "label" +MODE_power14 = "label" +MODE_power15 = "label" + LABEL_temp17 = "p0_core0_temp" WARNHI_temp17 = "85000" WARNLO_temp17 = "0" @@ -278,13 +295,13 @@ WARNLO_temp211 = "0" CRITHI_temp211 = "95000" CRITLO_temp211 = "0" -LABEL_power2 = "io_b_power" -LABEL_power3 = "io_a_power" -LABEL_power4 = "p1_mem_power" -LABEL_power5 = "p1_vdd_power" -LABEL_power6 = "p0_mem_power" -LABEL_power7 = "p0_vdd_power" -LABEL_power8 = "fans_power" -LABEL_power9 = "storage_b_power" -LABEL_power10 = "storage_a_power" -LABEL_power15 = "total_power" +LABEL_power0_14_2 = "io_b_power" +LABEL_power0_13_3 = "io_a_power" +LABEL_power0_2_4 = "p1_mem_power" +LABEL_power0_6_5 = "p1_vdd_power" +LABEL_power0_1_6 = "p0_mem_power" +LABEL_power0_5_7 = "p0_vdd_power" +LABEL_power0_16_8 = "fans_power" +LABEL_power0_19_9 = "storage_b_power" +LABEL_power0_18_10 = "storage_a_power" +LABEL_powersystem = "total_power" diff --git a/meta-intel/conf/layer.conf b/meta-intel/conf/layer.conf index b43594da5..c753477a8 100644 --- a/meta-intel/conf/layer.conf +++ b/meta-intel/conf/layer.conf @@ -6,6 +6,7 @@ BBFILES += "${LAYERDIR}/meta-common/recipes-*/*/*.bb \ ${LAYERDIR}/meta-common/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "intel" -BBFILE_PATTERN_intel = "" +BBFILE_PATTERN_intel = "^${LAYERDIR}/" LAYERVERSION_intel = "1" LAYERSERIES_COMPAT_intel = "warrior zeus" +LAYERDEPENDS_intel = "phosphor-layer" diff --git a/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.service b/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.service new file mode 100644 index 000000000..fdeefd417 --- /dev/null +++ b/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.service @@ -0,0 +1,9 @@ +[Unit] +Description=Rotates the event logs + +[Service] +Type=oneshot +ExecStart=/usr/sbin/logrotate /etc/logrotate.d/logrotate.rsyslog + +[Install] +WantedBy=multi-user.target diff --git a/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.timer b/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.timer new file mode 100644 index 000000000..ae1185e4f --- /dev/null +++ b/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.timer @@ -0,0 +1,9 @@ +[Unit] +Description=Run rotate-event-logs.service every minute + +[Timer] +OnActiveSec=60 +OnUnitActiveSec=60 + +[Install] +WantedBy=timers.target diff --git a/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog-override.conf b/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog-override.conf new file mode 100644 index 000000000..14bcc0781 --- /dev/null +++ b/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog-override.conf @@ -0,0 +1,2 @@ +[Service] +ExecReload=/bin/kill -HUP $MAINPID diff --git a/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog.conf b/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog.conf new file mode 100644 index 000000000..46a287eef --- /dev/null +++ b/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog.conf @@ -0,0 +1,79 @@ +# if you experience problems, check +# http://www.rsyslog.com/troubleshoot for assistance + +# rsyslog v3: load input modules +# If you do not load inputs, nothing happens! +# You may need to set the module load path if modules are not found. +# +# Ported from debian's sysklogd.conf + +# Journal-style logging +# Limit to no more than 2000 entries in one minute and enable the +# journal workaround to avoid duplicate entries +module(load="imjournal" StateFile="/var/log/state" + RateLimit.Interval="60" + RateLimit.Burst="2000") + +# Template for IPMI SEL messages +# "<timestamp> <ID>,<Type>,<EventData>,[<Generator ID>,<Path>,<Direction>]" +template(name="IPMISELTemplate" type="list") { + property(name="timereported" dateFormat="rfc3339") + constant(value=" ") + property(name="$!IPMI_SEL_RECORD_ID") + constant(value=",") + property(name="$!IPMI_SEL_RECORD_TYPE") + constant(value=",") + property(name="$!IPMI_SEL_DATA") + constant(value=",") + property(name="$!IPMI_SEL_GENERATOR_ID") + constant(value=",") + property(name="$!IPMI_SEL_SENSOR_PATH") + constant(value=",") + property(name="$!IPMI_SEL_EVENT_DIR") + constant(value="\n") +} + +# Template for Redfish messages +# "<timestamp> <MessageId>,<MessageArgs>" +template(name="RedfishTemplate" type="list") { + property(name="timereported" dateFormat="rfc3339") + constant(value=" ") + property(name="$!REDFISH_MESSAGE_ID") + constant(value=",") + property(name="$!REDFISH_MESSAGE_ARGS") + constant(value="\n") +} + +# Template for Application Crashes +# "<timestamp> <MessageId>,<MessageArgs>" +template(name="CrashTemplate" type="list") { + property(name="timereported" dateFormat="rfc3339") + constant(value=" ") + constant(value="OpenBMC.0.1.ServiceFailure") + constant(value=",") + property(name="$!UNIT") + constant(value="\n") +} + + +# If the journal entry has the IPMI SEL MESSAGE_ID, save as IPMI SEL +# The MESSAGE_ID string is generated using journalctl and must match the +# MESSAGE_ID used in IPMI to correctly find the SEL entries. +if ($!MESSAGE_ID == "b370836ccf2f4850ac5bee185b77893a") then { + action(type="omfile" file="/var/log/ipmi_sel" template="IPMISELTemplate") +} + +# If the journal entry has a Redfish MessageId, save as a Redfish event +if ($!REDFISH_MESSAGE_ID != "") then { + action(type="omfile" file="/var/log/redfish" template="RedfishTemplate") +} + +# If the journal entry has a Exit Code, save as a Redfish event +if ($!EXIT_STATUS != "" and $!EXIT_STATUS != "0") then { + action(type="omfile" file="/var/log/redfish" template="CrashTemplate") +} + +# +# Include all config files in /etc/rsyslog.d/ +# +$IncludeConfig /etc/rsyslog.d/*.conf diff --git a/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate b/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate new file mode 100644 index 000000000..a6ba28d86 --- /dev/null +++ b/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate @@ -0,0 +1,22 @@ +# /etc/logrotate.d/rsyslog - Ported from Debian + +# Keep up to four 64k files for ipmi_sel (256k total) +/var/log/ipmi_sel +{ + rotate 3 + size 64k + missingok + postrotate + systemctl reload rsyslog 2> /dev/null || true + endscript +} +# Keep up to four 64k files for redfish (256k total) +/var/log/redfish +{ + rotate 3 + size 64k + missingok + postrotate + systemctl reload rsyslog 2> /dev/null || true + endscript +} diff --git a/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend b/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend new file mode 100644 index 000000000..7e282804e --- /dev/null +++ b/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend @@ -0,0 +1,23 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI += "file://rsyslog.conf \ + file://rsyslog.logrotate \ + file://rotate-event-logs.service \ + file://rotate-event-logs.timer \ + file://rsyslog-override.conf \ +" + +FILES_${PN} += "${systemd_system_unitdir}/rsyslog.service.d/rsyslog-override.conf" + +PACKAGECONFIG_append = " imjournal" + +do_install_append() { + install -m 0644 ${WORKDIR}/rotate-event-logs.service ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/rotate-event-logs.timer ${D}${systemd_system_unitdir} + install -d ${D}${systemd_system_unitdir}/rsyslog.service.d + install -m 0644 ${WORKDIR}/rsyslog-override.conf \ + ${D}${systemd_system_unitdir}/rsyslog.service.d/rsyslog-override.conf + rm ${D}${sysconfdir}/rsyslog.d/imjournal.conf +} + +SYSTEMD_SERVICE_${PN} += " rotate-event-logs.service rotate-event-logs.timer" diff --git a/meta-intel/meta-common/recipes-intel/chassis/x86-power-control_git.bb b/meta-intel/meta-common/recipes-intel/chassis/x86-power-control_git.bb index 668d0a1ca..81ad1d0b8 100755 --- a/meta-intel/meta-common/recipes-intel/chassis/x86-power-control_git.bb +++ b/meta-intel/meta-common/recipes-intel/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 = "174ec66e41c0182ae3299637c2846a57dc4684f5" +SRCREV = "3f6ecb212494d1a9362256d7aae03e11f3efb6f7" PV = "1.0+git${SRCPV}" diff --git a/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb b/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb index 2f5008be8..ae4c31e99 100755 --- a/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb +++ b/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb @@ -5,12 +5,12 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/intel-ipmi-oem" -SRCREV = "7cc9e478c1d3f5d4571266db0636ac90ea688f22" +SRCREV = "09a8314bb754dccd4af2ef8d2d9e6e43f6da74ec" S = "${WORKDIR}/git" PV = "0.1+git${SRCPV}" -DEPENDS = "boost phosphor-ipmi-host phosphor-logging systemd intel-dbus-interfaces" +DEPENDS = "boost phosphor-ipmi-host phosphor-logging systemd intel-dbus-interfaces libgpiod" inherit cmake obmc-phosphor-ipmiprovider-symlink diff --git a/meta-nuvoton/recipes-bsp/images/npcm7xx-bootblock_10.10.09.bb b/meta-nuvoton/recipes-bsp/images/npcm7xx-bootblock_10.10.09.bb index 3f2178bff..22774cf65 100644 --- a/meta-nuvoton/recipes-bsp/images/npcm7xx-bootblock_10.10.09.bb +++ b/meta-nuvoton/recipes-bsp/images/npcm7xx-bootblock_10.10.09.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/Nuvoton-Israel/npcm7xx-bootblock" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" -FILENAME = "Poleg_bootblock.bin" +FILENAME = "Poleg_bootblock_${PV}.bin" S = "${WORKDIR}" @@ -20,7 +20,7 @@ SRC_URI[bin.sha256sum] = "05f71da6ebb7798679fcffdcc928fbada8f941bd8e7a374ebc8261 inherit deploy do_deploy () { - install -D -m 644 ${WORKDIR}/${FILENAME} ${DEPLOYDIR}/ + install -D -m 644 ${WORKDIR}/${FILENAME} ${DEPLOYDIR}/Poleg_bootblock.bin } addtask deploy before do_build after do_compile diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/0001-Blacklist-DIMM-Bus.patch b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/0001-Blacklist-DIMM-Bus.patch new file mode 100644 index 000000000..e84e79884 --- /dev/null +++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/0001-Blacklist-DIMM-Bus.patch @@ -0,0 +1,26 @@ +From c64c2d05ebd9dcb9b161320087ce205a8a674a45 Mon Sep 17 00:00:00 2001 +From: James Feist <james.feist@linux.intel.com> +Date: Wed, 11 Dec 2019 10:20:40 -0800 +Subject: [PATCH 1/1] Blacklist DIMM Bus + +The dimms error when being scanned, blacklist the bus. + +Change-Id: I797d144dc89b49ef7ac4f68b106a492014a4d086 +Signed-off-by: James Feist <james.feist@linux.intel.com> +--- + blacklist.json | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/blacklist.json b/blacklist.json +index f112a7b..1ae6deb 100644 +--- a/blacklist.json ++++ b/blacklist.json +@@ -1,3 +1,4 @@ + { +- "buses": [] ++ "buses": [9] + } ++ +-- +2.17.1 + diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager_%.bbappend b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager_%.bbappend index 140bdb81a..35fb1cd85 100644 --- a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager_%.bbappend +++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager_%.bbappend @@ -1,5 +1,6 @@ FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" -SRC_URI_append = " file://WC-Baseboard.json \ +SRC_URI_append = " file://0001-Blacklist-DIMM-Bus.patch \ + file://WC-Baseboard.json \ file://WP-Baseboard.json \ file://TNP-baseboard.json \ file://FCXXPDBASSMBL_PDB.json \ @@ -11,7 +12,7 @@ SRC_URI_append = " file://WC-Baseboard.json \ RDEPENDS_${PN} += " default-fru" -do_install_append(){ +do_install_append() { install -d ${D}/usr/share/entity-manager/configurations install -m 0444 ${WORKDIR}/*.json ${D}/usr/share/entity-manager/configurations } diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/workbook/wolfpass-config.bb b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/workbook/wolfpass-config.bb index c91053536..637b836ba 100644 --- a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/workbook/wolfpass-config.bb +++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/workbook/wolfpass-config.bb @@ -7,4 +7,4 @@ inherit config-in-skeleton LIC_FILES_CHKSUM = "file://${INTELBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" SRCREV = "946064239016e38cd1cc346047b1d26960c06cdb" -SKELETON_URI = "git://git@github.com/Intel-BMC/skeleton.git;protocol=ssh;branch=intel" +SKELETON_URI = "git://github.com/Intel-BMC/skeleton.git;protocol=ssh;branch=intel" diff --git a/meta-openbmc-mods/meta-ast2600/conf/machine/include/obmc-bsp-si-common.inc b/meta-openbmc-mods/meta-ast2600/conf/machine/include/obmc-bsp-si-common.inc index a20f9e650..f5a0d9ad0 100644 --- a/meta-openbmc-mods/meta-ast2600/conf/machine/include/obmc-bsp-si-common.inc +++ b/meta-openbmc-mods/meta-ast2600/conf/machine/include/obmc-bsp-si-common.inc @@ -18,6 +18,7 @@ UBOOT_SUFFIX ?= "bin" MACHINEOVERRIDES =. "openbmc:" OBMC_PHOSPHOR_IMAGE_OVERLAY= "1" +OBMC_IMAGE_EXTRA_INSTALL_append = "u-boot-fw-utils-aspeed-sdk" IMAGE_CLASSES += "image_types image_types_phosphor_auto qemuboot" diff --git a/meta-openbmc-mods/meta-common/classes/obmc-phosphor-image-common.bbclass b/meta-openbmc-mods/meta-common/classes/obmc-phosphor-image-common.bbclass index 50c2cc278..802fa2bd5 100644 --- a/meta-openbmc-mods/meta-common/classes/obmc-phosphor-image-common.bbclass +++ b/meta-openbmc-mods/meta-common/classes/obmc-phosphor-image-common.bbclass @@ -13,11 +13,11 @@ IMAGE_INSTALL_append = " \ dbus-sensors \ phosphor-webui \ rest-dbus-static \ + at-scale-debug \ phosphor-pid-control \ phosphor-host-postd \ phosphor-certificate-manager \ phosphor-sel-logger \ - smbios-mdrv1 \ smbios-mdrv2 \ obmc-ikvm \ system-watchdog \ @@ -41,6 +41,7 @@ IMAGE_INSTALL_append = " \ hsbp-manager \ security-registers-check \ pch-time-sync \ + nv-sync \ " IMAGE_INSTALL_append = "${@bb.utils.contains('IMAGE_FSTYPES', 'intel-pfr', 'intel-pfr-manager', '', d)}" diff --git a/meta-openbmc-mods/meta-common/recipes-bsp/u-boot/files/0001-Add-ast2600-intel-as-a-new-board.patch b/meta-openbmc-mods/meta-common/recipes-bsp/u-boot/files/0001-Add-ast2600-intel-as-a-new-board.patch index e76c61a15..a084c4a8c 100644 --- a/meta-openbmc-mods/meta-common/recipes-bsp/u-boot/files/0001-Add-ast2600-intel-as-a-new-board.patch +++ b/meta-openbmc-mods/meta-common/recipes-bsp/u-boot/files/0001-Add-ast2600-intel-as-a-new-board.patch @@ -1,4 +1,4 @@ -From e02a837d388a45e4fb12c7d44eb0a1dc62140d29 Mon Sep 17 00:00:00 2001 +From 069a20560bf9efbd358503c76f043fcdd3a68a94 Mon Sep 17 00:00:00 2001 From: Vernon Mauery <vernon.mauery@intel.com> Date: Thu, 24 Oct 2019 14:06:33 -0700 Subject: [PATCH] Add ast2600-intel as a new board @@ -13,7 +13,7 @@ Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@intel.com> arch/arm/mach-aspeed/ast2600/aspeed_scu_info.c | 1 + board/aspeed/ast2600_intel/Kconfig | 13 + board/aspeed/ast2600_intel/Makefile | 4 + - board/aspeed/ast2600_intel/ast-espi.c | 232 ++++++++++++++ + board/aspeed/ast2600_intel/ast-espi.c | 282 +++++++++++++++++ board/aspeed/ast2600_intel/ast-irq.c | 399 +++++++++++++++++++++++++ board/aspeed/ast2600_intel/ast-irq.h | 8 + board/aspeed/ast2600_intel/ast-timer.c | 59 ++++ @@ -22,7 +22,7 @@ Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@intel.com> common/autoboot.c | 10 + common/board_r.c | 8 +- include/configs/evb_ast2600.h | 2 +- - 16 files changed, 1090 insertions(+), 6 deletions(-) + 16 files changed, 1140 insertions(+), 6 deletions(-) create mode 100644 arch/arm/dts/ast2600-intel.dts create mode 100644 board/aspeed/ast2600_intel/Kconfig create mode 100644 board/aspeed/ast2600_intel/Makefile @@ -322,10 +322,10 @@ index 000000000000..37d2f0064f38 +obj-y += ast-timer.o diff --git a/board/aspeed/ast2600_intel/ast-espi.c b/board/aspeed/ast2600_intel/ast-espi.c new file mode 100644 -index 000000000000..2778d7b67d54 +index 000000000000..8dc12d7c9fe8 --- /dev/null +++ b/board/aspeed/ast2600_intel/ast-espi.c -@@ -0,0 +1,232 @@ +@@ -0,0 +1,282 @@ +/* + * Copyright 2018 Intel Corporation + * @@ -338,18 +338,20 @@ index 000000000000..2778d7b67d54 +#include <common.h> +#include <asm/io.h> + -+#define AST_LPC_BASE 0x1e6e9000 -+#define AST_ESPI_BASE 0x1e6ee000 -+#define AST_SCU_BASE 0x1e6e2000 -+#define AST_SCU_HW_STRAP1 0x510 -+#define SCU_HW_STRAP_ESPI_ENABLED 0x40 ++#define AST_LPC_BASE 0x1e6e9000 ++#define AST_ESPI_BASE 0x1e6ee000 ++#define AST_SCU_BASE 0x1e6e2000 ++#define AST_SCU_HW_STRAP1 0x510 ++#define SCU_HW_STRAP_ESPI_ENABLED 0x40 + -+#define DEBUG_ESPI_ENABLED 1 -+#ifdef DEBUG_ESPI_ENABLED -+#define DBG_ESPI debug ++#define USE_HW_HANDSHAKE 1 ++#define DEBUG_ESPI_ENABLED 1 ++#if DEBUG_ESPI_ENABLED ++#define DBG_ESPI printf +#else +#define DBG_ESPI(...) +#endif ++ +/* eSPI controller registers */ +#define ESPI000 0x000 /* Engine Control. */ +#define ESPI004 0x004 /* Engine Status. */ @@ -376,6 +378,7 @@ index 000000000000..2778d7b67d54 +#define ESPI070 0x070 /* DMA Addr of Flash Channel Tx pkt. */ +#define ESPI074 0x074 /* Control of Flash Channel Tx pkt. */ +#define ESPI078 0x078 /* Data port of Flash Channel Tx pkt. */ ++#define ESPI080 0x080 /* Engine Control 2. */ +#define ESPI084 0x084 /* Mapping Src Addr of Peripheral Channel Rx pkt. */ +#define ESPI088 0x088 /* Mapping Tgt Addr of Peripheral Channel Rx pkt. */ +#define ESPI08C 0x08C /* Mapping Addr Mask of Peripheral Channel Rx pkt. */ @@ -416,35 +419,63 @@ index 000000000000..2778d7b67d54 +#define ESPICFG818 0x818 /* Mapping Addr Mask of Peripheral Channel Rx pkt */ + +/* ESPI000 bits */ -+#define AST_ESPI_OOB_CHRDY (1 << 4) -+#define AST_ESPI_FLASH_SW_CHRDY (0x1 << 7) -+#define AST_ESPI_FLASH_SW_READ (0x1 << 10) ++#define AST_ESPI_OOB_CHRDY BIT(4) ++#define AST_ESPI_FLASH_SW_CHRDY BIT(7) ++#define AST_ESPI_FLASH_SW_READ BIT(10) + +/* ESPI00C bits (Interrupt Enable) */ -+#define AST_ESPI_IEN_SYS_EV (1 << 8) -+#define AST_ESPI_IEN_GPIO_EV (1 << 9) ++#define AST_ESPI_IEN_HW_RST BIT(31) ++#define AST_ESPI_IEN_SYS1_EV BIT(22) ++#define AST_ESPI_IEN_SYS_EV BIT(8) ++#define AST_ESPI_IEN_GPIO_EV BIT(9) + +/* ESPI008 bits ISR */ -+#define AST_ESPI_VW_SYS_EVT (1 << 8) -+#define AST_ESPI_VW_SYS_EV1 (1 << 22) ++#define AST_ESPI_VW_SYS_EVT BIT(8) ++#define AST_ESPI_VW_SYS_EV1 BIT(9) ++#define AST_ESPI_HW_RST BIT(31) ++ ++/* ESPI080 bits */ ++#define AST_ESPI_AUTO_ACK_HOST_RST_WARN BIT(2) ++#define AST_ESPI_AUTO_ACK_OOB_RST_WARN BIT(1) ++#define AST_ESPI_AUTO_ACK_SUS_WARN BIT(0) + +/* ESPI098 and ESPI11C bits */ -+#define AST_ESPI_OOB_RST_WARN (1 << 6) -+#define AST_ESPI_HOST_RST_WARN (1 << 8) -+#define AST_ESPI_OOB_RST_ACK (1 << 16) -+#define AST_ESPI_SL_BT_DONE (1 << 20) -+#define AST_ESPI_SL_BT_STATUS (1 << 23) -+#define AST_ESPI_HOST_RST_ACK (1 << 27) ++#define AST_ESPI_OOB_RST_WARN BIT(6) ++#define AST_ESPI_HOST_RST_WARN BIT(8) ++#define AST_ESPI_PLTRSTN BIT(5) ++#define AST_ESPI_OOB_RST_ACK BIT(16) ++#define AST_ESPI_SL_BT_DONE BIT(20) ++#define AST_ESPI_SL_BT_STATUS BIT(23) ++#define AST_ESPI_HOST_RST_ACK BIT(27) + +/* ESPI104 bits */ -+#define AST_ESPI_SUS_WARN (1 << 0) -+#define AST_ESPI_SUS_ACK (1 << 20) ++#define AST_ESPI_SUS_WARN BIT(0) ++#define AST_ESPI_SUS_ACK BIT(20) + +/* LPC chip ID */ -+#define SCR0SIO 0x170 -+#define IRQ_SRC_ESPI 74 /* IRQ 74 */ ++#define SCR0SIO 0x170 ++#define IRQ_SRC_ESPI 74 /* IRQ 74 */ + -+static int espi_irq_handler(struct pt_regs *regs) ++static void espi_handshake_ack(void) ++{ ++ /* IRQ only serviced if strapped, so no strap check */ ++ if (!(readl(AST_ESPI_BASE + ESPI098) & AST_ESPI_SL_BT_STATUS)) { ++ DBG_ESPI("Setting espi slave boot done\n"); ++ uint32_t v = readl(AST_ESPI_BASE + ESPI098) | ++ AST_ESPI_SL_BT_STATUS | AST_ESPI_SL_BT_DONE; ++ writel(v, AST_ESPI_BASE + ESPI098); ++ } ++ ++ uint32_t sys1_event = readl(AST_ESPI_BASE + ESPI104); ++ if (sys1_event & AST_ESPI_SUS_WARN && ++ !(sys1_event & AST_ESPI_SUS_ACK)) { ++ DBG_ESPI("Boot SUS_WARN, evt: 0x%08x\n", sys1_event); ++ writel(sys1_event | AST_ESPI_SUS_ACK, AST_ESPI_BASE + ESPI104); ++ DBG_ESPI("SUS_WARN sent ack\n"); ++ } ++} ++ ++int espi_irq_handler(struct pt_regs *regs) +{ + uint32_t irq_status = readl(AST_ESPI_BASE + ESPI008); + @@ -456,22 +487,29 @@ index 000000000000..2778d7b67d54 + + DBG_ESPI("sys_status : 0x%08X\n", sys_status); + if (sys_status & AST_ESPI_HOST_RST_WARN) { -+ DBG_ESPI("HOST_RST_WARN ev: %08X\n", sys_event); ++ DBG_ESPI("HOST_RST_WARN evt: 0x%08X\n", sys_event); + if (sys_event & AST_ESPI_HOST_RST_WARN) { -+ uint32_t v = readl(AST_ESPI_BASE + ESPI098) -+ | AST_ESPI_HOST_RST_ACK; ++ uint32_t v = readl(AST_ESPI_BASE + ESPI098) | ++ AST_ESPI_HOST_RST_ACK; + writel(v, AST_ESPI_BASE + ESPI098); ++ DBG_ESPI("HOST_RST_WARN sent ack\n"); + } + } + if (sys_status & AST_ESPI_OOB_RST_WARN) { -+ DBG_ESPI("OOB_RST_WARN ev: %08X\n", sys_event); ++ DBG_ESPI("OOB_RST_WARN evt: 0x%08X\n", sys_event); + if (sys_event & AST_ESPI_OOB_RST_WARN) { -+ uint32_t v = readl(AST_ESPI_BASE + ESPI098) -+ | AST_ESPI_OOB_RST_ACK; ++ uint32_t v = readl(AST_ESPI_BASE + ESPI098) | ++ AST_ESPI_OOB_RST_ACK; + writel(v, AST_ESPI_BASE + ESPI098); ++ DBG_ESPI("OOB_RST_WARN sent ack\n"); + } + } -+ writel(sys_status, AST_ESPI_BASE + ESPI11C); // clear status ++ if (sys_status & AST_ESPI_PLTRSTN) { ++ DBG_ESPI("PLTRSTN: %c, evt: 0x%08X\n", ++ (sys_event & AST_ESPI_PLTRSTN) ? '1' : '0', ++ sys_event); ++ } ++ writel(sys_status, AST_ESPI_BASE + ESPI11C); /* clear status */ + } + + if (irq_status & AST_ESPI_VW_SYS_EV1) { @@ -480,35 +518,31 @@ index 000000000000..2778d7b67d54 + + DBG_ESPI("sys1_status : 0x%08X\n", sys1_status); + if (sys1_status & AST_ESPI_SUS_WARN) { -+ DBG_ESPI("SUS WARN ev: %08X\n", sys1_event); ++ DBG_ESPI("SUS WARN evt: 0x%08X\n", sys1_event); + if (sys1_event & AST_ESPI_SUS_WARN) { -+ uint32_t v = readl(AST_ESPI_BASE + ESPI104) -+ | AST_ESPI_SUS_ACK; ++ uint32_t v = readl(AST_ESPI_BASE + ESPI104) | ++ AST_ESPI_SUS_ACK; + writel(v, AST_ESPI_BASE + ESPI104); ++ DBG_ESPI("SUS_WARN sent ack\n"); + } + } -+ writel(sys1_status, AST_ESPI_BASE + ESPI12C); // clear status ++ writel(sys1_status, AST_ESPI_BASE + ESPI12C); /* clear status */ + } -+ writel(irq_status, AST_ESPI_BASE + ESPI008); // clear irq_status -+ return 0; -+} + -+static void espi_handshake_ack(void) -+{ -+ // IRQ only serviced if strapped, so no strap check -+ if (!(readl(AST_ESPI_BASE + ESPI098) & AST_ESPI_SL_BT_STATUS)) { -+ DBG_ESPI("Setting espi slave boot done\n"); -+ uint32_t v = readl(AST_ESPI_BASE + ESPI098) -+ | AST_ESPI_SL_BT_STATUS | AST_ESPI_SL_BT_DONE; -+ writel(v, AST_ESPI_BASE + ESPI098); -+ } ++ if (irq_status & AST_ESPI_HW_RST) { ++ uint32_t v = readl(AST_ESPI_BASE + ESPI000) & 0x00ffffffff; ++ writel(v, AST_ESPI_BASE + ESPI000); ++ v |= 0xff000000; ++ writel(v, AST_ESPI_BASE + ESPI000); ++ ++ DBG_ESPI("HW_RESET\n"); + -+ if (readl(AST_ESPI_BASE + ESPI104) & AST_ESPI_SUS_WARN) { -+ DBG_ESPI("Boot SUS WARN set %08x\n", -+ readl(AST_ESPI_BASE + ESPI104)); -+ uint32_t v = readl(AST_ESPI_BASE + ESPI104) | AST_ESPI_SUS_ACK; -+ writel(v, AST_ESPI_BASE + ESPI104); ++ espi_handshake_ack(); + } ++ ++ writel(irq_status, AST_ESPI_BASE + ESPI008); /* clear irq_status */ ++ ++ return 0; +} + +void espi_init(void) @@ -517,43 +551,59 @@ index 000000000000..2778d7b67d54 + & SCU_HW_STRAP_ESPI_ENABLED) { + uint32_t v; + ++ DBG_ESPI("espi init\n"); ++ ++ writel(0xff000000, AST_SCU_BASE + 0x454); /* driving strength */ ++ + /* Block flash access from Host */ + v = readl(AST_ESPI_BASE + ESPI000) & ~AST_ESPI_FLASH_SW_CHRDY; + v |= AST_ESPI_FLASH_SW_READ | AST_ESPI_OOB_CHRDY; + writel(v, AST_ESPI_BASE + ESPI000); + -+ /* Set SIO register 0x28 to 0xa8 as a faked ASPEED ChipID for -+ * BIOS using in eSPI mode */ ++ /* ++ * Set SIO register 0x28 to 0xa8 as a faked ASPEED ChipID for ++ * BIOS using in eSPI mode. ++ */ + v = readl(AST_LPC_BASE + SCR0SIO) & ~0x000000ff; + writel(v, AST_LPC_BASE + SCR0SIO); + v = readl(AST_LPC_BASE + SCR0SIO) | 0xa8; + writel(v, AST_LPC_BASE + SCR0SIO); + -+ v = readl(AST_ESPI_BASE + ESPI000) | AST_ESPI_OOB_CHRDY; -+ writel(v, AST_ESPI_BASE + ESPI000); ++#if USE_HW_HANDSHAKE ++ v = readl(AST_ESPI_BASE + ESPI098) | ++ AST_ESPI_SL_BT_STATUS | AST_ESPI_SL_BT_DONE; ++ writel(v, AST_ESPI_BASE + ESPI098); ++ ++ return; ++#endif ++ ++ v = readl(AST_ESPI_BASE + ESPI080); ++ v &= ~(AST_ESPI_AUTO_ACK_HOST_RST_WARN | ++ AST_ESPI_AUTO_ACK_OOB_RST_WARN | ++ AST_ESPI_AUTO_ACK_SUS_WARN); ++ writel(v, AST_ESPI_BASE + ESPI080); /* Disable auto H/W ack */ + + writel(0, AST_ESPI_BASE + ESPI110); + writel(0, AST_ESPI_BASE + ESPI114); -+ writel(AST_ESPI_HOST_RST_WARN | AST_ESPI_OOB_RST_WARN, -+ AST_ESPI_BASE + ESPI118); -+ writel(AST_ESPI_HOST_RST_WARN | AST_ESPI_OOB_RST_WARN, -+ AST_ESPI_BASE + ESPI094); ++ writel(AST_ESPI_HOST_RST_WARN | AST_ESPI_OOB_RST_WARN | ++ AST_ESPI_PLTRSTN, AST_ESPI_BASE + ESPI118); ++ writel(AST_ESPI_HOST_RST_WARN | AST_ESPI_OOB_RST_WARN | ++ AST_ESPI_PLTRSTN, AST_ESPI_BASE + ESPI094); + + writel(AST_ESPI_SUS_WARN, -+ AST_ESPI_BASE + ESPI120); // int type 0 susp warn ++ AST_ESPI_BASE + ESPI120); /* int type 0 susp warn */ + writel(0, AST_ESPI_BASE + ESPI124); + writel(0, AST_ESPI_BASE + ESPI128); + writel(AST_ESPI_SUS_WARN, -+ AST_ESPI_BASE -+ + ESPI100); // Enable sysev1 ints for susp warn ++ AST_ESPI_BASE + ++ ESPI100); /* Enable sysev1 ints for susp warn */ + -+ writel(AST_ESPI_IEN_SYS_EV, -+ AST_ESPI_BASE + ESPI00C); // Enable only sys events ++ writel(AST_ESPI_IEN_HW_RST | AST_ESPI_IEN_SYS1_EV | ++ AST_ESPI_IEN_SYS_EV, AST_ESPI_BASE + ESPI00C); + + espi_handshake_ack(); + + irq_install_handler(IRQ_SRC_ESPI, espi_irq_handler, NULL); -+ + } else { + DBG_ESPI("No espi strap\n"); + } diff --git a/meta-openbmc-mods/meta-common/recipes-bsp/u-boot/files/0003-ast2600-intel-layout-environment-addr.patch b/meta-openbmc-mods/meta-common/recipes-bsp/u-boot/files/0003-ast2600-intel-layout-environment-addr.patch new file mode 100644 index 000000000..a1a8acf81 --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-bsp/u-boot/files/0003-ast2600-intel-layout-environment-addr.patch @@ -0,0 +1,51 @@ +From e074cf61bd6a726c8cb513336507047ece5423d0 Mon Sep 17 00:00:00 2001 +From: Kuiying Wang <kuiying.wang@intel.com> +Date: Thu, 12 Dec 2019 12:54:18 +0800 +Subject: [PATCH] ast2600: intel-layout-environment-addr + +Tested: +Both kernel and u-boot work at the area /dev/mtd/u-boot-env + +Signed-off-by: Kuiying Wang <kuiying.wang@intel.com> +--- + include/configs/aspeed-common.h | 5 ++++- + include/configs/evb_ast2600_spl.h | 2 +- + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/include/configs/aspeed-common.h b/include/configs/aspeed-common.h +index d1eb468..8ad9deb 100644 +--- a/include/configs/aspeed-common.h ++++ b/include/configs/aspeed-common.h +@@ -56,12 +56,15 @@ + #define CONFIG_BOOTCOMMAND "bootm 20080000" + #endif + #define CONFIG_ENV_OVERWRITE ++#define CONFIG_ENV_OFFSET 0x2400000 ++#define CONFIG_ENV_SIZE 0x10000 ++#define CONFIG_ENV_SECT_SIZE (4 << 10) + + #define CONFIG_SYS_BOOTM_LEN (0x800000 * 2) + + #define CONFIG_EXTRA_ENV_SETTINGS \ + "verify=yes\0" \ +- "spi_dma=no\0" \ ++ "spi_dma=yes\0" \ + "" + + /* +diff --git a/include/configs/evb_ast2600_spl.h b/include/configs/evb_ast2600_spl.h +index 8bbd6e1..8529f46 100644 +--- a/include/configs/evb_ast2600_spl.h ++++ b/include/configs/evb_ast2600_spl.h +@@ -19,7 +19,7 @@ + + /* Environment */ + #define CONFIG_ENV_SIZE 0x10000 +-#define CONFIG_ENV_OFFSET 0x90000 ++#define CONFIG_ENV_OFFSET 0x2400000 + #define CONFIG_ENV_SECT_SIZE (4 << 10) + + #ifdef CONFIG_SPL_TINY +-- +2.7.4 + diff --git a/meta-openbmc-mods/meta-common/recipes-bsp/u-boot/files/0021-AST2600-Enable-host-searial-port-clock-configuration.patch b/meta-openbmc-mods/meta-common/recipes-bsp/u-boot/files/0021-AST2600-Enable-host-searial-port-clock-configuration.patch new file mode 100644 index 000000000..5522d5f6c --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-bsp/u-boot/files/0021-AST2600-Enable-host-searial-port-clock-configuration.patch @@ -0,0 +1,72 @@ +From ccfc20ceb2931e84ffb02b01099ccb7610b44d9c Mon Sep 17 00:00:00 2001 +From: Kuiying Wang <kuiying.wang@intel.com> +Date: Tue, 10 Dec 2019 14:58:10 +0800 +Subject: [PATCH] AST2600: Enable host searial port clock configuration in + u-boot + +In u-boot could read env variable "hostsearialcfg" and set the corresponding +clock for host searail port. + +Tested: +setenv hostsearialcfg 1, speed is set to 192Mhz (baud rate 921600) +other value, speed is set to 24Mhz(baud rate 115200) +by default is 24Mhz. + +Signed-off-by: Kuiying Wang <kuiying.wang@intel.com> +--- + board/aspeed/ast2600_intel/intel.c | 36 ++++++++++++++++++++++++++++++++++++ + 1 file changed, 36 insertions(+) + +diff --git a/board/aspeed/ast2600_intel/intel.c b/board/aspeed/ast2600_intel/intel.c +index 100eb1e..eb6fbaf 100644 +--- a/board/aspeed/ast2600_intel/intel.c ++++ b/board/aspeed/ast2600_intel/intel.c +@@ -35,9 +35,45 @@ int gpio_abort(void) + return value <= 0 ? 0 : 1; + } + ++#define SCU_BASE 0x1E6E2000 ++#define SCU_338 0x338 //Generate UART 24 MHz Reference from UXCLK ++#define SCU_33C 0x33c //Generate UART 24 MHz Reference from HUXCLK ++#define SCU_338_R_VALUE_192MHZ 0x8e ++#define SCU_338_N_VALUE_192MHZ 0x3c3 ++#define SCU_338_R_VALUE_24MHZ 0x06 ++#define SCU_338_N_VALUE_24MHZ 0x145 ++#define HOST_SERIAL_HIGH_SPEED_192MHZ 1 ++#define R_VALUE_BITS 8 ++#define V_VALUE_BITS 10 ++#define R_V_VALUE_MASK (1 << (R_VALUE_BITS + V_VALUE_BITS)) ++ + int misc_init_r(void) + { + /* This is called near the end of the _r init sequence */ ++ /* By default host serail is set 24Mhz */ ++ uint32_t host_serial_cfg = 0; ++ char *host_serial_cfg_txt = NULL; ++ ++ /* Config the uart clock source based on environment configuration */ ++ host_serial_cfg_txt = env_get("hostserialcfg"); ++ ++ if (host_serial_cfg_txt != NULL) ++ host_serial_cfg = simple_strtoul(host_serial_cfg_txt, NULL, 16); ++ ++ if (host_serial_cfg > HOST_SERIAL_HIGH_SPEED_192MHZ || host_serial_cfg < 0) { ++ printf("Invalid hostserialcfg %x, 24Mhz is set by default!\n", host_serial_cfg); ++ host_serial_cfg = 0; ++ } ++ ++ if (host_serial_cfg & HOST_SERIAL_HIGH_SPEED_192MHZ) { ++ writel((readl(SCU_BASE | SCU_338) & R_V_VALUE_MASK) | ++ (SCU_338_N_VALUE_192MHZ << R_VALUE_BITS) | SCU_338_R_VALUE_192MHZ, ++ SCU_BASE | SCU_338); ++ } else { ++ writel((readl(SCU_BASE | SCU_338) & R_V_VALUE_MASK) | ++ (SCU_338_N_VALUE_24MHZ << R_VALUE_BITS) | SCU_338_R_VALUE_24MHZ, ++ SCU_BASE | SCU_338); ++ } + + return 0; + } +-- +2.7.4 + diff --git a/meta-openbmc-mods/meta-common/recipes-bsp/u-boot/files/0039-AST2500-increase-boot-speed.patch b/meta-openbmc-mods/meta-common/recipes-bsp/u-boot/files/0039-AST2500-increase-boot-speed.patch new file mode 100644 index 000000000..ce36b580e --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-bsp/u-boot/files/0039-AST2500-increase-boot-speed.patch @@ -0,0 +1,40 @@ +From 1e9a4afdfa995e924f74139f620e8b2f985a705f Mon Sep 17 00:00:00 2001 +From: James Feist <james.feist@linux.intel.com> +Date: Tue, 10 Dec 2019 16:21:24 -0800 +Subject: [PATCH 1/1] AST2500 increase boot speed + +This hardcodes the IOMODE to x2 as that is the fastest +we support. + +Signed-off-by: James Feist <james.feist@linux.intel.com> +--- + arch/arm/mach-aspeed/flash.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/arch/arm/mach-aspeed/flash.c b/arch/arm/mach-aspeed/flash.c +index d33fb9e0fe..31d2ef6001 100644 +--- a/arch/arm/mach-aspeed/flash.c ++++ b/arch/arm/mach-aspeed/flash.c +@@ -730,7 +730,7 @@ static ulong flash_get_size (ulong base, flash_info_t *info) + ulID = ((ulong)ch[0]) | ((ulong)ch[1] << 8) | ((ulong)ch[2] << 16) ; + info->flash_id = ulID; + +-// printf("SPI Flash ID: %x \n", ulID); ++ printf("SPI Flash ID: %x \n", ulID); + + /* init default */ + info->iomode = IOMODEx1; +@@ -1258,6 +1258,10 @@ static ulong flash_get_size (ulong base, flash_info_t *info) + } /* JDEC */ + } + ++ info->readcmd = 0xbb; ++ info->dualport = 1; ++ info->iomode = IOMODEx2_dummy; ++ + sector = base; + for (j = 0; j < info->sector_count; j++) { + +-- +2.17.1 + diff --git a/meta-openbmc-mods/meta-common/recipes-bsp/u-boot/files/0102-Add-espi-polling-check.patch b/meta-openbmc-mods/meta-common/recipes-bsp/u-boot/files/0102-Add-espi-polling-check.patch deleted file mode 100644 index 683178054..000000000 --- a/meta-openbmc-mods/meta-common/recipes-bsp/u-boot/files/0102-Add-espi-polling-check.patch +++ /dev/null @@ -1,141 +0,0 @@ -From ea6dad13d4d4b8c7a39829f75425290447e0f148 Mon Sep 17 00:00:00 2001 -From: Jae Hyun Yoo <jae.hyun.yoo@intel.com> -Date: Tue, 12 Nov 2019 16:46:01 -0800 -Subject: [PATCH] Add espi polling check - -Since interrupt in u-boot isn't working so this commit adds espi -polling check into cli as a WA to handle host espi events. - -This is a temporary WA. - -Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@intel.com> ---- - board/aspeed/ast2600_intel/ast-espi.c | 24 ++++++++++++++++++------ - common/console.c | 3 +++ - 2 files changed, 21 insertions(+), 6 deletions(-) - -diff --git a/board/aspeed/ast2600_intel/ast-espi.c b/board/aspeed/ast2600_intel/ast-espi.c -index 2778d7b67d54..c88098efcdb5 100644 ---- a/board/aspeed/ast2600_intel/ast-espi.c -+++ b/board/aspeed/ast2600_intel/ast-espi.c -@@ -18,7 +18,7 @@ - - #define DEBUG_ESPI_ENABLED 1 - #ifdef DEBUG_ESPI_ENABLED --#define DBG_ESPI debug -+#define DBG_ESPI printf - #else - #define DBG_ESPI(...) - #endif -@@ -116,11 +116,13 @@ - #define SCR0SIO 0x170 - #define IRQ_SRC_ESPI 74 /* IRQ 74 */ - --static int espi_irq_handler(struct pt_regs *regs) -+int espi_irq_handler(struct pt_regs *regs) - { - uint32_t irq_status = readl(AST_ESPI_BASE + ESPI008); - -+#if 0 - DBG_ESPI("ISR irq_status : 0x%08X\n", irq_status); -+#endif - - if (irq_status & AST_ESPI_VW_SYS_EVT) { - uint32_t sys_status = readl(AST_ESPI_BASE + ESPI11C); -@@ -128,19 +130,21 @@ static int espi_irq_handler(struct pt_regs *regs) - - DBG_ESPI("sys_status : 0x%08X\n", sys_status); - if (sys_status & AST_ESPI_HOST_RST_WARN) { -- DBG_ESPI("HOST_RST_WARN ev: %08X\n", sys_event); -+ DBG_ESPI("HOST_RST_WARN evt: 0x%08X\n", sys_event); - if (sys_event & AST_ESPI_HOST_RST_WARN) { - uint32_t v = readl(AST_ESPI_BASE + ESPI098) - | AST_ESPI_HOST_RST_ACK; - writel(v, AST_ESPI_BASE + ESPI098); -+ DBG_ESPI("HOST_RST_WARN sent ack\n"); - } - } - if (sys_status & AST_ESPI_OOB_RST_WARN) { -- DBG_ESPI("OOB_RST_WARN ev: %08X\n", sys_event); -+ DBG_ESPI("OOB_RST_WARN evt: 0x%08X\n", sys_event); - if (sys_event & AST_ESPI_OOB_RST_WARN) { - uint32_t v = readl(AST_ESPI_BASE + ESPI098) - | AST_ESPI_OOB_RST_ACK; - writel(v, AST_ESPI_BASE + ESPI098); -+ DBG_ESPI("OOB_RST_WARN sent ack\n"); - } - } - writel(sys_status, AST_ESPI_BASE + ESPI11C); // clear status -@@ -152,16 +156,19 @@ static int espi_irq_handler(struct pt_regs *regs) - - DBG_ESPI("sys1_status : 0x%08X\n", sys1_status); - if (sys1_status & AST_ESPI_SUS_WARN) { -- DBG_ESPI("SUS WARN ev: %08X\n", sys1_event); -+ DBG_ESPI("SUS WARN evt: 0x%08X\n", sys1_event); - if (sys1_event & AST_ESPI_SUS_WARN) { - uint32_t v = readl(AST_ESPI_BASE + ESPI104) - | AST_ESPI_SUS_ACK; - writel(v, AST_ESPI_BASE + ESPI104); -+ DBG_ESPI("SUS_WARN sent ack\n"); - } - } - writel(sys1_status, AST_ESPI_BASE + ESPI12C); // clear status - } -+ - writel(irq_status, AST_ESPI_BASE + ESPI008); // clear irq_status -+ - return 0; - } - -@@ -176,7 +183,7 @@ static void espi_handshake_ack(void) - } - - if (readl(AST_ESPI_BASE + ESPI104) & AST_ESPI_SUS_WARN) { -- DBG_ESPI("Boot SUS WARN set %08x\n", -+ DBG_ESPI("Boot SUS WARN set 0x%08x\n", - readl(AST_ESPI_BASE + ESPI104)); - uint32_t v = readl(AST_ESPI_BASE + ESPI104) | AST_ESPI_SUS_ACK; - writel(v, AST_ESPI_BASE + ESPI104); -@@ -189,6 +196,8 @@ void espi_init(void) - & SCU_HW_STRAP_ESPI_ENABLED) { - uint32_t v; - -+ DBG_ESPI("espi init\n"); -+ - /* Block flash access from Host */ - v = readl(AST_ESPI_BASE + ESPI000) & ~AST_ESPI_FLASH_SW_CHRDY; - v |= AST_ESPI_FLASH_SW_READ | AST_ESPI_OOB_CHRDY; -@@ -226,6 +235,9 @@ void espi_init(void) - - irq_install_handler(IRQ_SRC_ESPI, espi_irq_handler, NULL); - -+#if 1 -+ espi_irq_handler(NULL); -+#endif - } else { - DBG_ESPI("No espi strap\n"); - } -diff --git a/common/console.c b/common/console.c -index 0b0dd76256c7..90cdf7701c9d 100644 ---- a/common/console.c -+++ b/common/console.c -@@ -308,6 +308,8 @@ int serial_printf(const char *fmt, ...) - return i; - } - -+extern int espi_irq_handler(struct pt_regs *regs); -+ - int fgetc(int file) - { - if (file < MAX_FILES) { -@@ -315,6 +317,7 @@ int fgetc(int file) - * Effectively poll for input wherever it may be available. - */ - for (;;) { -+ espi_irq_handler(NULL); - WATCHDOG_RESET(); - #if CONFIG_IS_ENABLED(CONSOLE_MUX) - /* --- -2.7.4 - diff --git a/meta-openbmc-mods/meta-common/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend b/meta-openbmc-mods/meta-common/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend index 13b7d45e5..376b785c1 100644 --- a/meta-openbmc-mods/meta-common/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend @@ -6,5 +6,6 @@ FILESEXTRAPATHS_append_intel-ast2600:= "${THISDIR}/files:" SRC_URI_append_intel-ast2600 = " \ file://intel.cfg \ file://0001-Add-ast2600-intel-as-a-new-board.patch \ - file://0102-Add-espi-polling-check.patch \ + file://0021-AST2600-Enable-host-searial-port-clock-configuration.patch \ + file://0003-ast2600-intel-layout-environment-addr.patch \ " diff --git a/meta-openbmc-mods/meta-common/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend b/meta-openbmc-mods/meta-common/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend index 675c9493b..a536dce34 100644 --- a/meta-openbmc-mods/meta-common/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend @@ -38,6 +38,7 @@ SRC_URI_append_intel-ast2500 = " \ file://0036-Re-Enable-KCS.patch \ file://0037-aspeed-ast-scu.c-fix-MAC1LINK-and-MAC2LINK-pin-pads-.patch \ file://0038-Increase-default-fan-speed-for-cooper-city.patch \ + file://0039-AST2500-increase-boot-speed.patch \ " PFR_SRC_URI = " \ file://0022-u-boot-env-change-for-PFR-image.patch \ diff --git a/meta-openbmc-mods/meta-common/recipes-core/ac-boot-check/ac-boot-check/ac-boot-check.service b/meta-openbmc-mods/meta-common/recipes-core/ac-boot-check/ac-boot-check/ac-boot-check.service index de607f1a7..e8b563850 100644 --- a/meta-openbmc-mods/meta-common/recipes-core/ac-boot-check/ac-boot-check/ac-boot-check.service +++ b/meta-openbmc-mods/meta-common/recipes-core/ac-boot-check/ac-boot-check/ac-boot-check.service @@ -1,6 +1,6 @@ [Unit] Description=Check for AC boot -After=settings.service +After=xyz.openbmc_project.Settings.service [Service] Type=oneshot diff --git a/meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/at-scale-debug_git.bb b/meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/at-scale-debug_git.bb index b57ae1ca5..1f7fbe73b 100644 --- a/meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/at-scale-debug_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/at-scale-debug_git.bb @@ -12,7 +12,7 @@ DEPENDS = "sdbusplus openssl libpam libgpiod" do_configure[depends] += "virtual/kernel:do_shared_workdir" -SRC_URI = "git://git@github.com/Intel-BMC/asd;protocol=ssh" +SRC_URI = "git://github.com/Intel-BMC/asd;protocol=git" SRCREV = "1.4.2" inherit useradd diff --git a/meta-openbmc-mods/meta-common/recipes-core/crashdump/crashdump_git.bb b/meta-openbmc-mods/meta-common/recipes-core/crashdump/crashdump_git.bb index 21ae0bff7..9d3883d3a 100644 --- a/meta-openbmc-mods/meta-common/recipes-core/crashdump/crashdump_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-core/crashdump/crashdump_git.bb @@ -12,7 +12,7 @@ EXTRA_OECMAKE = "-DCRASHDUMP_BUILD_UT=ON" LICENSE = "Proprietary" LIC_FILES_CHKSUM = "file://LICENSE;md5=26bb6d0733830e7bab774914a8f8f20a" -SRC_URI = "git://git@github.com/Intel-BMC/crashdump;protocol=ssh" +SRC_URI = "git://github.com/Intel-BMC/crashdump;protocol=git" SRCREV = "0.4" S = "${WORKDIR}/git" diff --git a/meta-openbmc-mods/meta-common/recipes-core/fw-update/files/fwupd.sh b/meta-openbmc-mods/meta-common/recipes-core/fw-update/files/fwupd.sh index ca5da9598..3073128e0 100644 --- a/meta-openbmc-mods/meta-common/recipes-core/fw-update/files/fwupd.sh +++ b/meta-openbmc-mods/meta-common/recipes-core/fw-update/files/fwupd.sh @@ -48,7 +48,13 @@ if [ $# -eq 0 ]; then # set DEFURI in $HOME/.fwupd.defaults URI="$DEFURI" else - URI="$1" + if [[ "$1" == *"/"* ]]; then + URI=$1 # local file + local_file=1 ; + else + URI="file:////tmp/images/$1/image-runtime" + local_file=0 ; + fi fi PROTO=$(echo "$URI" | sed 's,\([a-z]*\)://.*$,\1,') @@ -60,10 +66,12 @@ else REMOTE_PATH=$(echo "$REMOTE" | sed 's,[^/]*/\(.*\)$,\1,') fi LOCAL_PATH="/tmp/$(basename $REMOTE_PATH)" +echo "URI=$URI" echo "PROTO=$PROTO" echo "REMOTE=$REMOTE" echo "REMOTE_HOST=$REMOTE_HOST" echo "REMOTE_PATH=$REMOTE_PATH" +echo "LOCAL_PATH=$LOCAL_PATH" if [ ! -e $LOCAL_PATH ] || [ $(stat -c %s $LOCAL_PATH) -eq 0 ]; then echo "Download '$REMOTE_PATH' from $PROTO $REMOTE_HOST $REMOTE_PATH" case "$PROTO" in @@ -105,25 +113,37 @@ fi # PFR image update section # this file being created at build time for PFR images -if [ -e /usr/share/pfr ] -then +if [ -e /usr/share/pfr ] && [ $local_file -eq 0 ]; then + if [ -e /tmp/fwupd_progress ]; then + echo "Firmware update already in progress" + exit 1 + fi +touch /tmp/fwupd_progress + # read the image type from the uploaded image # Byte at location 0x8 gives image type -img_type=$(hexdump -s 8 -n 1 $LOCAL_PATH | cut -b12,1 | sed '2d;') +img_type=$(busctl get-property xyz.openbmc_project.Software.BMC.Updater /xyz/openbmc_project/software/$1 xyz.openbmc_project.Software.Version Purpose | cut -d " " -f 2 | cut -d "." -f 6 | sed 's/.\{1\}$//') +img_target=$(busctl get-property xyz.openbmc_project.Software.BMC.Updater /xyz/openbmc_project/software/$1 xyz.openbmc_project.Software.Activation RequestedActivation | cut -d " " -f 2| cut -d "." -f 6 | sed 's/.\{1\}$//') + echo "image-type=$img_type" +echo "image-target=$img_target" # BMC image - max size 32MB -if [ "$img_type" = '04' ]; then +if [ "$img_type" = 'BMC' ]; then echo "BMC firmware image" # 32MB - 33554432 img_size=33554432 - upd_intent_val=0x08 + if [ "$img_target" = 'StandbySpare' ]; then + upd_intent_val=0x10 + else + upd_intent_val=0x08 + fi # page is at 4KB boundary img_page_offset=0 erase_offset=0 blk_cnt=0x200 # CPLD image- max size 4MB -elif [ "$img_type" = '00' ]; then +elif [ "$img_type" = 'Other' ]; then echo "CPLD firmware image" # 4MB - 4194304 img_size=4194304 @@ -134,11 +154,15 @@ elif [ "$img_type" = '00' ]; then erase_offset=0x3000000 blk_cnt=0x40 # BIOS image- max size 16MB -elif [ "$img_type" = '02' ]; then +elif [ "$img_type" = 'Host' ]; then echo "BIOS firmware image" # 16MB- 16777216 img_size=16777216 - upd_intent_val=0x01 + if [ "$img_target" = 'StandbySpare' ]; then + upd_intent_val=0x02 + else + upd_intent_val=0x01 + fi # dd command accepts the offset in decimal # below is the page offset in 4KB boundary img_page_offset=8192 @@ -146,18 +170,21 @@ elif [ "$img_type" = '02' ]; then blk_cnt=0x100 else echo "${img_type}:Unknown image type, exiting the firmware update script" + rm -rf /tmp/fwupd_progress exit 1 fi -# do a quick sanity check on the image +# do a size check on the image if [ $(stat -c "%s" "$LOCAL_PATH") -gt $img_size ]; then echo "Update file "$LOCAL_PATH" is bigger than the supported image size" + rm -rf /tmp/fwupd_progress exit 1 fi TGT="/dev/mtd/image-stg" -echo "Updating $(basename $TGT)" +echo "Update $(basename $TGT)" flash_erase $TGT $erase_offset $blk_cnt +sync echo "Writing $(stat -c "%s" "$LOCAL_PATH") bytes" # cat "$LOCAL_PATH" > "$TGT" dd bs=4k seek=$img_page_offset if=$LOCAL_PATH of=$TGT @@ -165,8 +192,12 @@ sync echo "Written $(stat -c "%s" "$LOCAL_PATH") bytes" # remove the updated image from /tmp rm -f $LOCAL_PATH -echo "Setting update intent in PFR CPLD" +echo "Writing $upd_intent_val to update intent register in PFR RoT" sleep 5 # delay for sync and to get the above echo messages + +# remove the file which used as lock +rm -rf /tmp/fwupd_progress + # write to PFRCPLD about BMC update intent. i2cset -y 4 0x38 0x13 $upd_intent_val @@ -197,11 +228,13 @@ fi BOOTADDR=$(fw_printenv bootcmd | awk '{print $2}') TGT="/dev/mtd/image-a" -case "$BOOTADDR" in - 20080000) TGT="/dev/mtd/image-b"; BOOTADDR="22480000" ;; - 22480000) TGT="/dev/mtd/image-a"; BOOTADDR="20080000" ;; - *) TGT="/dev/mtd/image-a"; BOOTADDR="20080000" ;; -esac +if [ ! -e /usr/share/pfr ]; then + case "$BOOTADDR" in + 20080000) TGT="/dev/mtd/image-b"; BOOTADDR="22480000" ;; + 22480000) TGT="/dev/mtd/image-a"; BOOTADDR="20080000" ;; + *) TGT="/dev/mtd/image-a"; BOOTADDR="20080000" ;; + esac +fi echo "Updating $(basename $TGT) (use bootm $BOOTADDR)" flash_erase $TGT 0 0 if [ $? -ne 0 ]; then diff --git a/meta-openbmc-mods/meta-common/recipes-core/host-error-monitor/host-error-monitor_git.bb b/meta-openbmc-mods/meta-common/recipes-core/host-error-monitor/host-error-monitor_git.bb index 5aab3db34..faa08a58c 100644 --- a/meta-openbmc-mods/meta-common/recipes-core/host-error-monitor/host-error-monitor_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-core/host-error-monitor/host-error-monitor_git.bb @@ -2,7 +2,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${INTELBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" inherit cmake systemd -SRC_URI = "git://git@github.com/Intel-BMC/host-error-monitor.git;protocol=ssh" +SRC_URI = "git://github.com/Intel-BMC/host-error-monitor.git;protocol=ssh" DEPENDS = "boost sdbusplus libgpiod libpeci" diff --git a/meta-openbmc-mods/meta-common/recipes-core/interfaces/libmctp_git.bb b/meta-openbmc-mods/meta-common/recipes-core/interfaces/libmctp_git.bb index 560efc72c..fcf6631ea 100644 --- a/meta-openbmc-mods/meta-common/recipes-core/interfaces/libmctp_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-core/interfaces/libmctp_git.bb @@ -2,7 +2,7 @@ SUMMARY = "libmctp" DESCRIPTION = "Implementation of MCTP (DTMF DSP0236)" SRC_URI = "git://github.com/openbmc/libmctp.git" -SRCREV = "8081beba756d371cba40dee86b37bbc654020b17" +SRCREV = "62d7236f6be8e830e753c94b6b9018004a7f8e27" PV = "0.1+git${SRCPV}" diff --git a/meta-openbmc-mods/meta-common/recipes-core/ipmi/intel-ipmi-oem_%.bbappend b/meta-openbmc-mods/meta-common/recipes-core/ipmi/intel-ipmi-oem_%.bbappend index baab0e9eb..bfe6de7b2 100644 --- a/meta-openbmc-mods/meta-common/recipes-core/ipmi/intel-ipmi-oem_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-core/ipmi/intel-ipmi-oem_%.bbappend @@ -1,4 +1,4 @@ EXTRA_OECMAKE += "${@bb.utils.contains('IMAGE_FSTYPES', 'intel-pfr', '-DINTEL_PFR_ENABLED=ON', '', d)}" EXTRA_OECMAKE += "${@bb.utils.contains('EXTRA_IMAGE_FEATURES', 'validation-unsecure', '-DBMC_VALIDATION_UNSECURE_FEATURE=ON', '', d)}" SRC_URI = "git://github.com/openbmc/intel-ipmi-oem.git" -SRCREV = "09a8314bb754dccd4af2ef8d2d9e6e43f6da74ec" +SRCREV = "822b0b40efe7695b56e1edb80f995d3c810d6d22" diff --git a/meta-openbmc-mods/meta-common/recipes-core/ipmi/ipmi-providers.bb b/meta-openbmc-mods/meta-common/recipes-core/ipmi/ipmi-providers.bb index 7f6d406d4..939efa75f 100644 --- a/meta-openbmc-mods/meta-common/recipes-core/ipmi/ipmi-providers.bb +++ b/meta-openbmc-mods/meta-common/recipes-core/ipmi/ipmi-providers.bb @@ -1,7 +1,7 @@ SUMMARY = "Intel IPMI Providers" DESCRIPTION = "IPMI Provider Libraries" -SRC_URI = "git://git@github.com/Intel-BMC/intel-ipmi-providers;protocol=ssh" +SRC_URI = "git://github.com/Intel-BMC/intel-ipmi-providers;protocol=ssh" SRCREV = "b2c6184269e3bdf601c38f716ac7ee73379af71b" S = "${WORKDIR}/git" diff --git a/meta-openbmc-mods/meta-common/recipes-core/libpeci/libpeci_git.bb b/meta-openbmc-mods/meta-common/recipes-core/libpeci/libpeci_git.bb index 8b97f95e8..9401b2496 100644 --- a/meta-openbmc-mods/meta-common/recipes-core/libpeci/libpeci_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-core/libpeci/libpeci_git.bb @@ -2,10 +2,10 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${INTELBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" inherit cmake -SRC_URI = "git://git@github.com/Intel-BMC/provingground.git;protocol=ssh" +SRC_URI = "git://github.com/Intel-BMC/provingground.git;protocol=ssh" PV = "0.1+git${SRCPV}" -SRCREV = "e1dbcef575309efeb04d275565a6e9649f3b89dd" +SRCREV = "eddf621897090ba346b1aaa81a4b8be12076ab60" S = "${WORKDIR}/git/libpeci" diff --git a/meta-openbmc-mods/meta-common/recipes-core/nv-sync/nv-sync/nv-sync.service b/meta-openbmc-mods/meta-common/recipes-core/nv-sync/nv-sync/nv-sync.service new file mode 100644 index 000000000..852027209 --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-core/nv-sync/nv-sync/nv-sync.service @@ -0,0 +1,11 @@ +[Unit] +Description=Overlay sync to NV storage + +[Service] +# Run rsync periodically to sync the overlay to NV storage +ExecStart=bash -c 'while true; do rsync -a --delete /tmp/.overlay/ /tmp/.rwfs/.overlay; sleep 20; done' +# On shutdown, archive the bash history so we don't lose it and run one last sync +ExecStop=bash -c 'history -a; rsync -a --delete /tmp/.overlay/ /tmp/.rwfs/.overlay' + +[Install] +WantedBy=multi-user.target diff --git a/meta-openbmc-mods/meta-common/recipes-core/nv-sync/nv-sync_git.bb b/meta-openbmc-mods/meta-common/recipes-core/nv-sync/nv-sync_git.bb new file mode 100644 index 000000000..0ee70e880 --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-core/nv-sync/nv-sync_git.bb @@ -0,0 +1,20 @@ +SUMMARY = "NV Overlay Sync" +DESCRIPTION = "Script to periodically sync the overlay to NV storage" + +S = "${WORKDIR}" +SRC_URI = "file://nv-sync.service \ +" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${INTELBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" + +inherit systemd + +FILES_${PN} += "${systemd_system_unitdir}/nv-sync.service" + +do_install() { + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/nv-sync.service ${D}${systemd_system_unitdir} +} + +SYSTEMD_SERVICE_${PN} += " nv-sync.service" diff --git a/meta-openbmc-mods/meta-common/recipes-core/peci-pcie/peci-pcie_git.bb b/meta-openbmc-mods/meta-common/recipes-core/peci-pcie/peci-pcie_git.bb index 2b77a193c..4bf1c9548 100644 --- a/meta-openbmc-mods/meta-common/recipes-core/peci-pcie/peci-pcie_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-core/peci-pcie/peci-pcie_git.bb @@ -5,7 +5,7 @@ LICENSE = "CLOSED" LIC_FILES_CHKSUM = "" inherit cmake systemd -SRC_URI = "git://git@github.com/Intel-BMC/at-scale-debug;protocol=ssh" +SRC_URI = "git://github.com/Intel-BMC/at-scale-debug;protocol=ssh" DEPENDS = "boost sdbusplus libpeci" diff --git a/meta-openbmc-mods/meta-common/recipes-devtools/mtd-util/mtd-util.bb b/meta-openbmc-mods/meta-common/recipes-devtools/mtd-util/mtd-util.bb index c6b1571ba..027161fc5 100644 --- a/meta-openbmc-mods/meta-common/recipes-devtools/mtd-util/mtd-util.bb +++ b/meta-openbmc-mods/meta-common/recipes-devtools/mtd-util/mtd-util.bb @@ -3,7 +3,7 @@ DESCRIPTION = "OpenBMC mtd-util" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=b77c43ae4eaf67bd73fb6452b2f113a3" -SRC_URI = "git://git@github.com/Intel-BMC/mtd-util;protocol=ssh" +SRC_URI = "git://github.com/Intel-BMC/mtd-util;protocol=ssh" PV = "1.0+git${SRCPV}" SRCREV = "679c6bddaa1fc4fdd473eb84d4e9f97f78ab0f12" diff --git a/meta-openbmc-mods/meta-common/recipes-devtools/template-recipe/template-recipe.bb b/meta-openbmc-mods/meta-common/recipes-devtools/template-recipe/template-recipe.bb index 16b3662ca..50476715e 100644 --- a/meta-openbmc-mods/meta-common/recipes-devtools/template-recipe/template-recipe.bb +++ b/meta-openbmc-mods/meta-common/recipes-devtools/template-recipe/template-recipe.bb @@ -1,7 +1,7 @@ SUMMARY = "HelloWorld app with phosphor-logging usage example." DESCRIPTION = "NOTE: Phosphor-logging has dependencies on systemd and sdbusplus." -SRC_URI = "git://git@github.com/Intel-BMC/template-recipe;protocol=ssh" +SRC_URI = "git://github.com/Intel-BMC/template-recipe;protocol=ssh" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${INTELBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" diff --git a/meta-openbmc-mods/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend b/meta-openbmc-mods/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend index 7e282804e..ef670451e 100644 --- a/meta-openbmc-mods/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend @@ -17,7 +17,7 @@ do_install_append() { install -d ${D}${systemd_system_unitdir}/rsyslog.service.d install -m 0644 ${WORKDIR}/rsyslog-override.conf \ ${D}${systemd_system_unitdir}/rsyslog.service.d/rsyslog-override.conf - rm ${D}${sysconfdir}/rsyslog.d/imjournal.conf + rm -f ${D}${sysconfdir}/rsyslog.d/imjournal.conf } SYSTEMD_SERVICE_${PN} += " rotate-event-logs.service rotate-event-logs.timer" diff --git a/meta-openbmc-mods/meta-common/recipes-graphics/libvncserver/libvncserver_%.bbappend b/meta-openbmc-mods/meta-common/recipes-graphics/libvncserver/libvncserver_%.bbappend index 3ad9e2c0b..b14b0ff0b 100644 --- a/meta-openbmc-mods/meta-common/recipes-graphics/libvncserver/libvncserver_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-graphics/libvncserver/libvncserver_%.bbappend @@ -2,4 +2,4 @@ FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" # Use the latest to support obmc-ikvm properly #SRC_URI = "git://github.com/LibVNC/libvncserver" -SRCREV = "a9f95d843a331c019f07fd59bf84c0aca4f98220" +SRCREV = "e00f736853289290197c290f7eb245f750e635ff" diff --git a/meta-openbmc-mods/meta-common/recipes-intel/intel-pfr/intel-blocksign-native.bb b/meta-openbmc-mods/meta-common/recipes-intel/intel-pfr/intel-blocksign-native.bb index 3f7776e06..9965ab11c 100644 --- a/meta-openbmc-mods/meta-common/recipes-intel/intel-pfr/intel-blocksign-native.bb +++ b/meta-openbmc-mods/meta-common/recipes-intel/intel-pfr/intel-blocksign-native.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${INTELBASE}/COPYING.apache-2.0;md5=34400b68072d710fe DEPENDS = "openssl-native libxml2-native " -SRC_URI = "git://git@github.com/Intel-BMC/blocksign;protocol=ssh" +SRC_URI = "git://github.com/Intel-BMC/blocksign;protocol=ssh" SRCREV = "60d76db038a0d85851098b13451246abb0d876ed" diff --git a/meta-openbmc-mods/meta-common/recipes-intel/intel-pfr/intel-pfr-manager_git.bb b/meta-openbmc-mods/meta-common/recipes-intel/intel-pfr/intel-pfr-manager_git.bb index b32c4e939..4794487d6 100644 --- a/meta-openbmc-mods/meta-common/recipes-intel/intel-pfr/intel-pfr-manager_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-intel/intel-pfr/intel-pfr-manager_git.bb @@ -8,8 +8,8 @@ S = "${WORKDIR}/git/intel-pfr-manager" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -SRC_URI = "git://git@github.com/Intel-BMC/provingground.git;protocol=ssh" -SRCREV = "e1dbcef575309efeb04d275565a6e9649f3b89dd" +SRC_URI = "git://github.com/Intel-BMC/provingground.git;protocol=ssh" +SRCREV = "eddf621897090ba346b1aaa81a4b8be12076ab60" inherit cmake systemd SYSTEMD_SERVICE_${PN} = "xyz.openbmc_project.PFR.Manager.service" diff --git a/meta-openbmc-mods/meta-common/recipes-intel/psu-manager/psu-manager.bb b/meta-openbmc-mods/meta-common/recipes-intel/psu-manager/psu-manager.bb index 1d1ea536c..c24368720 100644 --- a/meta-openbmc-mods/meta-common/recipes-intel/psu-manager/psu-manager.bb +++ b/meta-openbmc-mods/meta-common/recipes-intel/psu-manager/psu-manager.bb @@ -1,8 +1,8 @@ SUMMARY = "Power supply manager for Intel based platform" DESCRIPTION = "Power supply manager which include PSU Cold Redundancy service" -SRC_URI = "git://git@github.com/Intel-BMC/provingground.git;protocol=ssh" -SRCREV = "e1dbcef575309efeb04d275565a6e9649f3b89dd" +SRC_URI = "git://github.com/Intel-BMC/provingground.git;protocol=ssh" +SRCREV = "eddf621897090ba346b1aaa81a4b8be12076ab60" S = "${WORKDIR}/git/psu-manager/" diff --git a/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv1.bb b/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv1.bb index 9e1353208..97866ba4e 100644 --- a/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv1.bb +++ b/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv1.bb @@ -1,8 +1,8 @@ SUMMARY = "SMBIOS MDR version 1 service for Intel based platform" DESCRIPTION = "SMBIOS MDR version 1 service for Intel based platfrom" -SRC_URI = "git://git@github.com/Intel-BMC/provingground.git;protocol=ssh" -SRCREV = "e1dbcef575309efeb04d275565a6e9649f3b89dd" +SRC_URI = "git://github.com/Intel-BMC/provingground.git;protocol=ssh;nobranch=1" +SRCREV = "6aab8bcc8fd0550753c87265036b1b7c4c8a9f71" S = "${WORKDIR}/git/services/smbios/" diff --git a/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv2.bb b/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv2.bb index f15a48214..e42e8fc6f 100644 --- a/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv2.bb +++ b/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv2.bb @@ -1,8 +1,8 @@ SUMMARY = "SMBIOS MDR version 2 service for Intel based platform" DESCRIPTION = "SMBIOS MDR version 2 service for Intel based platfrom" -SRC_URI = "git://git@github.com/Intel-BMC/provingground.git;protocol=ssh" -SRCREV = "e1dbcef575309efeb04d275565a6e9649f3b89dd" +SRC_URI = "git://github.com/Intel-BMC/provingground.git;protocol=ssh" +SRCREV = "eddf621897090ba346b1aaa81a4b8be12076ab60" S = "${WORKDIR}/git/services/smbios-mdrv2/" diff --git a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0001-arm-dts-add-DTS-for-Intel-ast2600-platforms.patch b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0001-arm-dts-add-DTS-for-Intel-ast2600-platforms.patch index 1ebb67a27..7fbe44141 100644 --- a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0001-arm-dts-add-DTS-for-Intel-ast2600-platforms.patch +++ b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0001-arm-dts-add-DTS-for-Intel-ast2600-platforms.patch @@ -1,4 +1,4 @@ -From 3550c57e80ee30113060efa44d41c08fb29fdd25 Mon Sep 17 00:00:00 2001 +From 57363b496c6eb832b0c3407ee997fdee09f4007f Mon Sep 17 00:00:00 2001 From: Vernon Mauery <vernon.mauery@linux.intel.com> Date: Tue, 19 Sep 2017 15:55:39 +0800 Subject: [PATCH] arm: dts: add DTS for Intel ast2600 platforms @@ -9,16 +9,16 @@ Signed-off-by: Vernon Mauery <vernon.mauery@linux.intel.com> Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com> Signed-off-by: Chen Yugang <yugang.chen@linux.intel.com> --- - arch/arm/boot/dts/aspeed-bmc-intel-ast2600.dts | 495 +++++++++++++++++++++++++ - 1 file changed, 495 insertions(+) + arch/arm/boot/dts/aspeed-bmc-intel-ast2600.dts | 507 +++++++++++++++++++++++++ + 1 file changed, 507 insertions(+) create mode 100644 arch/arm/boot/dts/aspeed-bmc-intel-ast2600.dts diff --git a/arch/arm/boot/dts/aspeed-bmc-intel-ast2600.dts b/arch/arm/boot/dts/aspeed-bmc-intel-ast2600.dts new file mode 100644 -index 0000000..a1ea85a +index 000000000000..1ad46e8bc69b --- /dev/null +++ b/arch/arm/boot/dts/aspeed-bmc-intel-ast2600.dts -@@ -0,0 +1,495 @@ +@@ -0,0 +1,507 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + @@ -51,6 +51,13 @@ index 0000000..a1ea85a + compatible = "shared-dma-pool"; + reusable; + }; ++ ++ video_engine_memory: jpegbuffer { ++ size = <0x02000000>; /* 32M */ ++ alignment = <0x01000000>; ++ compatible = "shared-dma-pool"; ++ reusable; ++ }; + }; + + reserved-memory { @@ -112,7 +119,7 @@ index 0000000..a1ea85a +}; + +&espi { -+ status = "okay"; ++ status = "disabled"; /* FIXME: Use H/W handshaking */ +}; + +&peci0 { @@ -511,6 +518,11 @@ index 0000000..a1ea85a + }; +}; + ++&video { ++ status = "okay"; ++ memory-region = <&video_engine_memory>; ++}; ++ +&vhub { + status = "okay"; +}; diff --git a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0080-i2c-aspeed-filter-garbage-interrupts-out.patch b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0080-i2c-aspeed-filter-garbage-interrupts-out.patch index 0e32615d5..801fc2eae 100644 --- a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0080-i2c-aspeed-filter-garbage-interrupts-out.patch +++ b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0080-i2c-aspeed-filter-garbage-interrupts-out.patch @@ -1,4 +1,4 @@ -From 6825259fc0ac015c6544f6070ceaf9cc263c1853 Mon Sep 17 00:00:00 2001 +From b080287881fd76acd54b7971d1f0910907c4f673 Mon Sep 17 00:00:00 2001 From: Jae Hyun Yoo <jae.hyun.yoo@intel.com> Date: Fri, 8 Nov 2019 15:57:27 -0800 Subject: [PATCH] i2c: aspeed: filter garbage interrupts out @@ -8,11 +8,11 @@ in datasheet so filter them out. Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@intel.com> --- - drivers/i2c/busses/i2c-aspeed.c | 19 +++++++++++++++++++ - 1 file changed, 19 insertions(+) + drivers/i2c/busses/i2c-aspeed.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) diff --git a/drivers/i2c/busses/i2c-aspeed.c b/drivers/i2c/busses/i2c-aspeed.c -index 62b803e15ce2..e7cba33c0c87 100644 +index 15a9e1b..916ff7f 100644 --- a/drivers/i2c/busses/i2c-aspeed.c +++ b/drivers/i2c/busses/i2c-aspeed.c @@ -87,7 +87,11 @@ @@ -39,15 +39,7 @@ index 62b803e15ce2..e7cba33c0c87 100644 /* 0x14 : I2CD Command/Status Register */ #define ASPEED_I2CD_SCL_LINE_STS BIT(18) -@@ -1018,9 +1027,19 @@ static irqreturn_t aspeed_i2c_bus_irq(int irq, void *dev_id) - - spin_lock(&bus->lock); - irq_received = readl(bus->base + ASPEED_I2C_INTR_STS_REG); -+ if (!irq_received) { -+ spin_unlock(&bus->lock); -+ return IRQ_NONE; -+ } -+ +@@ -1032,6 +1041,11 @@ static irqreturn_t aspeed_i2c_bus_irq(int irq, void *dev_id) /* Ack all interrupts except for Rx done */ writel(irq_received & ~ASPEED_I2CD_INTR_RX_DONE, bus->base + ASPEED_I2C_INTR_STS_REG); diff --git a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0081-clk-ast2600-enable-BCLK-for-PCI-PCIe-bus-always.patch b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0081-clk-ast2600-enable-BCLK-for-PCI-PCIe-bus-always.patch deleted file mode 100644 index 22c4d191c..000000000 --- a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0081-clk-ast2600-enable-BCLK-for-PCI-PCIe-bus-always.patch +++ /dev/null @@ -1,32 +0,0 @@ -From ff0b985d3ad004398db3222a40607f1bef433f9b Mon Sep 17 00:00:00 2001 -From: Jae Hyun Yoo <jae.hyun.yoo@intel.com> -Date: Tue, 19 Nov 2019 15:12:42 -0800 -Subject: [PATCH] clk: ast2600: enable BCLK for PCI/PCIe bus always - -BCLK for PCI/PCIe bus should be enabled always with having the -CLK_IS_CRITICAL flag otherwise it will be disabled at kernel late -initcall phase as an unused clock, and eventually it causes -unexpected behavior on BMC features that are connected to the host -through PCI/PCIe bus. - -Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@intel.com> ---- - drivers/clk/clk-ast2600.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/clk/clk-ast2600.c b/drivers/clk/clk-ast2600.c -index 9191bc3e78ee..8201d65018b9 100644 ---- a/drivers/clk/clk-ast2600.c -+++ b/drivers/clk/clk-ast2600.c -@@ -64,7 +64,7 @@ static const struct aspeed_gate_data aspeed_g6_gates[] = { - [ASPEED_CLK_GATE_GCLK] = { 2, 7, "gclk-gate", NULL, 0 }, /* 2D engine */ - /* vclk parent - dclk/d1clk/hclk/mclk */ - [ASPEED_CLK_GATE_VCLK] = { 3, 6, "vclk-gate", NULL, 0 }, /* Video Capture */ -- [ASPEED_CLK_GATE_BCLK] = { 4, 8, "bclk-gate", "bclk", 0 }, /* PCIe/PCI */ -+ [ASPEED_CLK_GATE_BCLK] = { 4, 8, "bclk-gate", "bclk", CLK_IS_CRITICAL }, /* PCIe/PCI */ - /* From dpll */ - [ASPEED_CLK_GATE_DCLK] = { 5, -1, "dclk-gate", NULL, CLK_IS_CRITICAL }, /* DAC */ - [ASPEED_CLK_GATE_REF0CLK] = { 6, -1, "ref0clk-gate", "clkin", CLK_IS_CRITICAL }, --- -2.7.4 - diff --git a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0082-ARM-dts-aspeed-g6-add-USB-virtual-hub-fixup.patch b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0082-ARM-dts-aspeed-g6-add-USB-virtual-hub-fixup.patch index b0995992b..252b2203c 100644 --- a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0082-ARM-dts-aspeed-g6-add-USB-virtual-hub-fixup.patch +++ b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0082-ARM-dts-aspeed-g6-add-USB-virtual-hub-fixup.patch @@ -1,4 +1,4 @@ -From 4594ddeadebe0c818c94671295308c51f00a8e7e Mon Sep 17 00:00:00 2001 +From f034e4129e5ad6b102be4cbe2add0fe46bfe413e Mon Sep 17 00:00:00 2001 From: Jae Hyun Yoo <jae.hyun.yoo@intel.com> Date: Wed, 20 Nov 2019 13:06:58 -0800 Subject: [PATCH] ARM: dts: aspeed-g6: add USB virtual hub fixup @@ -12,7 +12,7 @@ Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@intel.com> 2 files changed, 15 insertions(+) diff --git a/arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi b/arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi -index 045ce66ca876..6ea66aaf9dd0 100644 +index 045ce66..6ea66aa 100644 --- a/arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi +++ b/arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi @@ -1112,6 +1112,11 @@ @@ -28,7 +28,7 @@ index 045ce66ca876..6ea66aaf9dd0 100644 function = "VB"; groups = "VB"; diff --git a/arch/arm/boot/dts/aspeed-g6.dtsi b/arch/arm/boot/dts/aspeed-g6.dtsi -index 88bd02058585..b2549f2a619b 100644 +index 88bd020..b2549f2 100644 --- a/arch/arm/boot/dts/aspeed-g6.dtsi +++ b/arch/arm/boot/dts/aspeed-g6.dtsi @@ -253,6 +253,16 @@ diff --git a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0083-usb-gadget-aspeed-add-ast2600-compatible-string.patch b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0083-usb-gadget-aspeed-add-ast2600-compatible-string.patch index 8093b2bc1..3f6f3ce91 100644 --- a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0083-usb-gadget-aspeed-add-ast2600-compatible-string.patch +++ b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0083-usb-gadget-aspeed-add-ast2600-compatible-string.patch @@ -1,4 +1,4 @@ -From 7a9aa0e35180a14d352516a92166743a2b063533 Mon Sep 17 00:00:00 2001 +From eedb53957b507bda2b9f6025149d2052e0598f76 Mon Sep 17 00:00:00 2001 From: Jae Hyun Yoo <jae.hyun.yoo@intel.com> Date: Wed, 20 Nov 2019 12:49:46 -0800 Subject: [PATCH] usb: gadget: aspeed: add ast2600 compatible string @@ -14,7 +14,7 @@ Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@intel.com> 1 file changed, 3 insertions(+) diff --git a/drivers/usb/gadget/udc/aspeed-vhub/core.c b/drivers/usb/gadget/udc/aspeed-vhub/core.c -index 90b134d5dca9..905e1cfd3d51 100644 +index 90b134d..905e1cf 100644 --- a/drivers/usb/gadget/udc/aspeed-vhub/core.c +++ b/drivers/usb/gadget/udc/aspeed-vhub/core.c @@ -407,6 +407,9 @@ static const struct of_device_id ast_vhub_dt_ids[] = { diff --git a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0084-ARM-dts-aspeed-g6-add-GFX-node.patch b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0084-ARM-dts-aspeed-g6-add-GFX-node.patch index d3a4a9fdc..81aefdf47 100644 --- a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0084-ARM-dts-aspeed-g6-add-GFX-node.patch +++ b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0084-ARM-dts-aspeed-g6-add-GFX-node.patch @@ -1,4 +1,4 @@ -From ad8984556c191b75404fc5608466ee95ccc3b501 Mon Sep 17 00:00:00 2001 +From 1a80650c970c8d5f7332249db5d26d2e553ef4c2 Mon Sep 17 00:00:00 2001 From: Jae Hyun Yoo <jae.hyun.yoo@intel.com> Date: Wed, 20 Nov 2019 15:01:06 -0800 Subject: [PATCH] ARM: dts: aspeed-g6: add GFX node @@ -11,7 +11,7 @@ Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@intel.com> 1 file changed, 9 insertions(+) diff --git a/arch/arm/boot/dts/aspeed-g6.dtsi b/arch/arm/boot/dts/aspeed-g6.dtsi -index b2549f2a619b..34281b14128a 100644 +index b2549f2..34281b1 100644 --- a/arch/arm/boot/dts/aspeed-g6.dtsi +++ b/arch/arm/boot/dts/aspeed-g6.dtsi @@ -311,6 +311,15 @@ diff --git a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0085-drm-add-AST2600-GFX-support.patch b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0085-drm-add-AST2600-GFX-support.patch index b936886cf..856da7caf 100644 --- a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0085-drm-add-AST2600-GFX-support.patch +++ b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0085-drm-add-AST2600-GFX-support.patch @@ -1,4 +1,4 @@ -From 0709e2bab2d763b75683a823c97f4016253ebe6b Mon Sep 17 00:00:00 2001 +From 4090d7ab2e7282ff5680c3e574e644964a8ae7d6 Mon Sep 17 00:00:00 2001 From: Jae Hyun Yoo <jae.hyun.yoo@intel.com> Date: Wed, 20 Nov 2019 14:58:24 -0800 Subject: [PATCH] drm: add AST2600 GFX support @@ -13,7 +13,7 @@ Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@intel.com> 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/aspeed/aspeed_gfx.h b/drivers/gpu/drm/aspeed/aspeed_gfx.h -index a10358bb61ec..eebd72eb1220 100644 +index a10358b..eebd72e 100644 --- a/drivers/gpu/drm/aspeed/aspeed_gfx.h +++ b/drivers/gpu/drm/aspeed/aspeed_gfx.h @@ -13,11 +13,15 @@ struct aspeed_gfx { @@ -33,7 +33,7 @@ index a10358bb61ec..eebd72eb1220 100644 #define CRT_CTRL2 0x64 /* CRT Control II */ #define CRT_STATUS 0x68 /* CRT Status */ diff --git a/drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c b/drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c -index 15db9e426ec4..2c95c720f34a 100644 +index 15db9e4..2c95c72 100644 --- a/drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c +++ b/drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c @@ -59,8 +59,8 @@ static void aspeed_gfx_enable_controller(struct aspeed_gfx *priv) @@ -57,7 +57,7 @@ index 15db9e426ec4..2c95c720f34a 100644 static void aspeed_gfx_crtc_mode_set_nofb(struct aspeed_gfx *priv) diff --git a/drivers/gpu/drm/aspeed/aspeed_gfx_drv.c b/drivers/gpu/drm/aspeed/aspeed_gfx_drv.c -index eeb22eccd1fc..aa44e01ac245 100644 +index eeb22ec..aa44e01 100644 --- a/drivers/gpu/drm/aspeed/aspeed_gfx_drv.c +++ b/drivers/gpu/drm/aspeed/aspeed_gfx_drv.c @@ -112,8 +112,14 @@ static int aspeed_gfx_load(struct drm_device *drm) diff --git a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0086-ADC-linux-driver-for-AST2600.patch b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0086-ADC-linux-driver-for-AST2600.patch index 63b683826..8f1e14b86 100644 --- a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0086-ADC-linux-driver-for-AST2600.patch +++ b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0086-ADC-linux-driver-for-AST2600.patch @@ -1,4 +1,4 @@ -From 14a4e77c801be8adbfc0726667a8051957e7a7dd Mon Sep 17 00:00:00 2001 +From 8ed59cc252af9a87d2d7b3e45a949030d91761b7 Mon Sep 17 00:00:00 2001 From: Chen Yugang <yugang.chen@linux.intel.com> Date: Tue, 3 Dec 2019 13:41:37 +0800 Subject: [PATCH] ADC linux driver for AST2600 diff --git a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0086-ARM-dts-aspeed-g6-add-video-node.patch b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0086-ARM-dts-aspeed-g6-add-video-node.patch new file mode 100644 index 000000000..06043dbb0 --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0086-ARM-dts-aspeed-g6-add-video-node.patch @@ -0,0 +1,36 @@ +From 14931c741e837871672bad0208591ea571b0a6ea Mon Sep 17 00:00:00 2001 +From: Jae Hyun Yoo <jae.hyun.yoo@intel.com> +Date: Tue, 26 Nov 2019 16:37:36 -0800 +Subject: [PATCH] ARM: dts: aspeed-g6: add video node + +This commit adds video node. + +Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@intel.com> +--- + arch/arm/boot/dts/aspeed-g6.dtsi | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/arch/arm/boot/dts/aspeed-g6.dtsi b/arch/arm/boot/dts/aspeed-g6.dtsi +index 4e8d25f..239c904 100644 +--- a/arch/arm/boot/dts/aspeed-g6.dtsi ++++ b/arch/arm/boot/dts/aspeed-g6.dtsi +@@ -340,6 +340,16 @@ + status = "disabled"; + }; + ++ video: video@1e700000 { ++ compatible = "aspeed,ast2600-video-engine"; ++ reg = <0x1e700000 0x1000>; ++ clocks = <&syscon ASPEED_CLK_GATE_VCLK>, ++ <&syscon ASPEED_CLK_GATE_ECLK>; ++ clock-names = "vclk", "eclk"; ++ interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; ++ status = "disabled"; ++ }; ++ + gpio0: gpio@1e780000 { + #gpio-cells = <2>; + gpio-controller; +-- +2.7.4 + diff --git a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0087-media-aspeed-add-aspeed-ast2600-video-engine-compati.patch b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0087-media-aspeed-add-aspeed-ast2600-video-engine-compati.patch new file mode 100644 index 000000000..f8c44ea96 --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0087-media-aspeed-add-aspeed-ast2600-video-engine-compati.patch @@ -0,0 +1,29 @@ +From 9ca66177376464ce7c1bbe95c392c4509331ad74 Mon Sep 17 00:00:00 2001 +From: Jae Hyun Yoo <jae.hyun.yoo@intel.com> +Date: Tue, 26 Nov 2019 16:39:16 -0800 +Subject: [PATCH] media: aspeed: add aspeed,ast2600-video-engine compatible + string + +This commit adds "aspeed,ast2600-video-engine" compatible string +to support AST2600 video engine H/W. + +Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@intel.com> +--- + drivers/media/platform/aspeed-video.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c +index 0473f31..5fa48d3 100644 +--- a/drivers/media/platform/aspeed-video.c ++++ b/drivers/media/platform/aspeed-video.c +@@ -1717,6 +1717,7 @@ static int aspeed_video_remove(struct platform_device *pdev) + static const struct of_device_id aspeed_video_of_match[] = { + { .compatible = "aspeed,ast2400-video-engine" }, + { .compatible = "aspeed,ast2500-video-engine" }, ++ { .compatible = "aspeed,ast2600-video-engine" }, + {} + }; + MODULE_DEVICE_TABLE(of, aspeed_video_of_match); +-- +2.7.4 + diff --git a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0088-clk-ast2600-enable-ESPICLK-always.patch b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0088-clk-ast2600-enable-ESPICLK-always.patch new file mode 100644 index 000000000..34df0882b --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0088-clk-ast2600-enable-ESPICLK-always.patch @@ -0,0 +1,30 @@ +From 37efef00064a228c3e723b0eece22d72f2632705 Mon Sep 17 00:00:00 2001 +From: Jae Hyun Yoo <jae.hyun.yoo@intel.com> +Date: Fri, 6 Dec 2019 13:51:37 -0800 +Subject: [PATCH] clk: ast2600: enable ESPICLK always + +To support continous eSPI H/W handshaking, this patch enables +ESPICLK always so that there discontinuity of eSPI handshaking while +boot BMC. + +Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@intel.com> +--- + drivers/clk/clk-ast2600.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/clk/clk-ast2600.c b/drivers/clk/clk-ast2600.c +index 8201d65..21967bc 100644 +--- a/drivers/clk/clk-ast2600.c ++++ b/drivers/clk/clk-ast2600.c +@@ -87,7 +87,7 @@ static const struct aspeed_gate_data aspeed_g6_gates[] = { + [ASPEED_CLK_GATE_EMMCCLK] = { 27, 16, "emmcclk-gate", NULL, 0 }, /* For card clk */ + /* Reserved 28/29/30 */ + [ASPEED_CLK_GATE_LCLK] = { 32, 32, "lclk-gate", NULL, 0 }, /* LPC */ +- [ASPEED_CLK_GATE_ESPICLK] = { 33, -1, "espiclk-gate", NULL, 0 }, /* eSPI */ ++ [ASPEED_CLK_GATE_ESPICLK] = { 33, -1, "espiclk-gate", NULL, CLK_IS_CRITICAL }, /* eSPI */ + [ASPEED_CLK_GATE_REF1CLK] = { 34, -1, "ref1clk-gate", "clkin", CLK_IS_CRITICAL }, + /* Reserved 35 */ + [ASPEED_CLK_GATE_SDCLK] = { 36, 56, "sdclk-gate", NULL, 0 }, /* SDIO/SD */ +-- +2.7.4 + diff --git a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed_%.bbappend index 2ebad4093..7532aa8a4 100644 --- a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -63,12 +63,14 @@ SRC_URI += " \ file://0078-Fix-NCSI-driver-issue-caused-by-host-shutdown.patch \ file://0079-usb-gadget-aspeed-backport-aspeed-vhub-bug-fixes.patch \ file://0080-i2c-aspeed-filter-garbage-interrupts-out.patch \ - file://0081-clk-ast2600-enable-BCLK-for-PCI-PCIe-bus-always.patch \ file://0082-ARM-dts-aspeed-g6-add-USB-virtual-hub-fixup.patch \ file://0083-usb-gadget-aspeed-add-ast2600-compatible-string.patch \ file://0084-ARM-dts-aspeed-g6-add-GFX-node.patch \ file://0085-drm-add-AST2600-GFX-support.patch \ file://0086-ADC-linux-driver-for-AST2600.patch \ + file://0086-ARM-dts-aspeed-g6-add-video-node.patch \ + file://0087-media-aspeed-add-aspeed-ast2600-video-engine-compati.patch \ + file://0088-clk-ast2600-enable-ESPICLK-always.patch \ " SRC_URI += "${@bb.utils.contains('IMAGE_FSTYPES', 'intel-pfr', 'file://0005-128MB-flashmap-for-PFR.patch', '', d)}" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0026-Add-StandbySpare-support-for-software-inventory.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0026-Add-StandbySpare-support-for-software-inventory.patch new file mode 100644 index 000000000..cbf966a37 --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0026-Add-StandbySpare-support-for-software-inventory.patch @@ -0,0 +1,56 @@ +From ae9e4b2a166dc4f34b255ed5338abbfa8aa37778 Mon Sep 17 00:00:00 2001 +From: Vikram Bodireddy <vikram.bodireddy@linux.intel.com> +Date: Sat, 30 Nov 2019 18:20:13 +0530 +Subject: [PATCH] Add StandbySpare support for software inventory + +Add support to allow update for active / recovery +regions of specified firmware. This update enables +the backend modules to advertise whether the +software object is active or recovery (StandbySpare) +image. + +Change-Id: I0d46206463ba566bcaa710fb271aa4d795fa49cd +Signed-off-by: Vikram Bodireddy <vikram.bodireddy@linux.intel.com> +--- + xyz/openbmc_project/Software/Activation.interface.yaml | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/xyz/openbmc_project/Software/Activation.interface.yaml b/xyz/openbmc_project/Software/Activation.interface.yaml +index 37c9cb9..b71b8e7 100644 +--- a/xyz/openbmc_project/Software/Activation.interface.yaml ++++ b/xyz/openbmc_project/Software/Activation.interface.yaml +@@ -28,12 +28,20 @@ enumerations: + - name: Activating + description: > + The Software.Version is in the process of being Activated. ++ - name: ActivatingAsStandbySpare ++ description: > ++ The Software.Version is in the process of being processed ++ as StandbySpare. + - name: Active + description: > + The Software.Version is currently Active. + - name: Failed + description: > + The Software.Version failed during or after Activation. ++ - name: StandbySpare ++ description: > ++ The Software.Version is part of a redundancy set and awaits ++ a failover or external action to activate. + - name: RequestedActivations + description: > + The possible RequestedActivation states of a Software.Version. +@@ -44,6 +52,10 @@ enumerations: + - name: Active + description: > + The Software.Version has been requested for Activation. ++ - name: StandbySpare ++ description: > ++ The Software.Version has been requested to be enabled as ++ StandbySpare. + # TODO: Specify "EAGAIN" type error when requested is unable to be acted on + # due to current system state. Currently, sdbusplus does not support + # errors on properties. +-- +2.7.4 + diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend index f21845ce6..d9240f760 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend @@ -1,5 +1,5 @@ SRC_URI = "git://github.com/openbmc/phosphor-dbus-interfaces.git" -SRCREV = "4610bace070eb17c6e4ee015210dac44284c53a7" +SRCREV = "1b02c38979ab4fa2649699a26266367b115eee7c" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" @@ -13,4 +13,5 @@ SRC_URI += "file://0005-Add-DBUS-interface-of-CPU-and-Memory-s-properties.patch file://0024-Add-the-pre-timeout-interrupt-defined-in-IPMI-spec.patch \ file://0025-Add-PreInterruptFlag-properity-in-DBUS.patch \ file://0001-Reapply-Enhance-DHCP-beyond-just-OFF-and-IPv4-IPv6-e.patch \ + file://0026-Add-StandbySpare-support-for-software-inventory.patch \ " diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/flash/phosphor-software-manager/0007-Adding-StandBySpare-for-firmware-activation.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/flash/phosphor-software-manager/0007-Adding-StandBySpare-for-firmware-activation.patch new file mode 100644 index 000000000..b63226cce --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/flash/phosphor-software-manager/0007-Adding-StandBySpare-for-firmware-activation.patch @@ -0,0 +1,76 @@ +From c2ae3ac444f7a5e9674a82f47086874f947bcec6 Mon Sep 17 00:00:00 2001 +From: Vikram Bodireddy <vikram.bodireddy@linux.intel.com> +Date: Thu, 5 Dec 2019 12:38:21 +0530 +Subject: [PATCH] Adding StandBySpare for firmware activation + +Added new states 'StandBySpare', 'ActivatingAsStandbySpare' for +firmware activation. If the uploaded firmware image is for +backup/recovery, then it sets the "StandBySpare" value for +Activations. When backup/recovery image is in activating state, +then activations will be set to "ActivatingAsStandbySpare". + +Tested: +Tested using redfish interface. +Did the GET on "/redfish/v1/UpdateService/FirmwareInventory/<backup image>" +Response: + .... + "Status": { + "Health": "OK", + "HealthRollup": "OK", + "State": "StandbySpare" + } +....... + +Change-Id: I7f1608fac3196774a6d593b6128d58da3f5c88fc +Signed-off-by: Vikram Bodireddy <vikram.bodireddy@linux.intel.com> +--- + activation.cpp | 22 ++++++++++++++++++++-- + 1 file changed, 20 insertions(+), 2 deletions(-) + +diff --git a/activation.cpp b/activation.cpp +index 2966b2f..a098784 100644 +--- a/activation.cpp ++++ b/activation.cpp +@@ -80,12 +80,16 @@ auto Activation::activation(Activations value) -> Activations + { + + if ((value != softwareServer::Activation::Activations::Active) && +- (value != softwareServer::Activation::Activations::Activating)) ++ (value != softwareServer::Activation::Activations::Activating) && ++ (value != ++ softwareServer::Activation::Activations::ActivatingAsStandbySpare)) + { + redundancyPriority.reset(nullptr); + } + +- if (value == softwareServer::Activation::Activations::Activating) ++ if (value == softwareServer::Activation::Activations::Activating || ++ value == ++ softwareServer::Activation::Activations::ActivatingAsStandbySpare) + { + #ifdef UBIFS_LAYOUT + if (rwVolumeCreated == false && roVolumeCreated == false) +@@ -256,6 +260,20 @@ auto Activation::requestedActivation(RequestedActivations value) + softwareServer::Activation::Activations::Activating); + } + } ++ else if ((value == ++ softwareServer::Activation::RequestedActivations::StandbySpare) && ++ (softwareServer::Activation::requestedActivation() != ++ softwareServer::Activation::RequestedActivations::StandbySpare)) ++ { ++ if ((softwareServer::Activation::activation() == ++ softwareServer::Activation::Activations::Ready) || ++ (softwareServer::Activation::activation() == ++ softwareServer::Activation::Activations::Failed)) ++ { ++ Activation::activation(softwareServer::Activation::Activations:: ++ ActivatingAsStandbySpare); ++ } ++ } + return softwareServer::Activation::requestedActivation(value); + } + +-- +2.7.4 + diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/flash/phosphor-software-manager/0008-PFR-image-HASH-verification.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/flash/phosphor-software-manager/0008-PFR-image-HASH-verification.patch new file mode 100644 index 000000000..31373104f --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/flash/phosphor-software-manager/0008-PFR-image-HASH-verification.patch @@ -0,0 +1,408 @@ +From ac6e0c217a1b136d82f93b691aff1acb40009f26 Mon Sep 17 00:00:00 2001 +From: Vikram Bodireddy <vikram.bodireddy@linux.intel.com> +Date: Thu, 5 Dec 2019 11:55:36 +0530 +Subject: [PATCH] PFR image HASH verification + +This adds HASH verification on PFR images uploaded for +firmware updates + +Tested: tested firmware update with good and bad HASH images. + +Signed-off-by: Vikram Bodireddy <vikram.bodireddy@linux.intel.com> +--- + pfr_image_manager.cpp | 149 ++++++++++++++++++++++++++++++++---------- + pfr_image_manager.hpp | 112 +++++++++++++++++++++++++++++-- + 2 files changed, 221 insertions(+), 40 deletions(-) + +diff --git a/pfr_image_manager.cpp b/pfr_image_manager.cpp +index 242a6ca..1a41cbe 100644 +--- a/pfr_image_manager.cpp ++++ b/pfr_image_manager.cpp +@@ -5,6 +5,8 @@ + #include "version.hpp" + #include "watch.hpp" + ++#include <fcntl.h> ++#include <openssl/err.h> + #include <stdio.h> + #include <stdlib.h> + #include <sys/stat.h> +@@ -15,9 +17,9 @@ + #include <algorithm> + #include <cstring> + #include <elog-errors.hpp> +-#include <filesystem> + #include <fstream> + #include <iomanip> ++#include <set> + #include <sstream> + #include <string> + #include <xyz/openbmc_project/Software/Image/error.hpp> +@@ -33,12 +35,21 @@ using namespace sdbusplus::xyz::openbmc_project::Software::Image::Error; + namespace Software = phosphor::logging::xyz::openbmc_project::Software; + + static constexpr const uint32_t pfmPos = 2054; ++static constexpr const uint32_t block0Magic = 0xB6EAFD19; ++static constexpr const uint32_t lengthBlk0Blk1 = 1024; + +-static int getPFRImgInfo(const std::filesystem::path imgPath, uint8_t& imgType, +- std::string& version) ++int Manager::verifyPFRImage(const std::filesystem::path imgPath, ++ std::string& version, std::string& purposeString) + { +- struct pfrImgBlock0 block0Data; +- uint8_t verData[2]; ++ uint8_t imgType = 0; ++ uint32_t imgMagic = 0; ++ uint8_t verData[2] = {0}; ++ uint32_t hashLen = 0; ++ struct pfrImgBlock0 block0Data = {}; ++ ++ std::string imageName; ++ ++ EVP_MD_CTX* ctx; + + if (std::filesystem::exists(imgPath)) + { +@@ -55,17 +66,101 @@ static int getPFRImgInfo(const std::filesystem::path imgPath, uint8_t& imgType, + + imgFile.read(reinterpret_cast<char*>(&block0Data), + sizeof(block0Data)); ++ ++ imgMagic = block0Data.tag; ++ ++ if (imgMagic != block0Magic) ++ { ++ phosphor::logging::log<phosphor::logging::level::ERR>( ++ "Image magic number match failed", ++ phosphor::logging::entry("IMAGEMAGIC=0x%x", imgMagic)); ++ return -1; ++ } ++ + imgType = block0Data.pcType[0]; ++ ++ phosphor::logging::log<phosphor::logging::level::INFO>( ++ "Image Type", phosphor::logging::entry( ++ "IMAGETYPE=0x%x", static_cast<int>(imgType))); ++ ++ if (imgType == pfrBMCUpdateCap || imgType == pfrBMCPFM) ++ { ++ imageName = "BMC"; ++ purposeString = ++ "xyz.openbmc_project.Software.Version.VersionPurpose.BMC"; ++ } ++ else if (imgType == pfrPCHUpdateCap || imgType == pfrPCHPFM) ++ { ++ imageName = "BIOS"; ++ purposeString = ++ "xyz.openbmc_project.Software.Version.VersionPurpose.Host"; ++ } ++ else if (imgType == pfrCPLDUpdateCap) ++ { ++ imageName = "CPLD"; ++ purposeString = ++ "xyz.openbmc_project.Software.Version.VersionPurpose.Other"; ++ } ++ else ++ { ++ purposeString = "xyz.openbmc_project.Software.Version." ++ "VersionPurpose.Unknown"; ++ ++ phosphor::logging::log<phosphor::logging::level::ERR>( ++ "Unknown image type"); ++ return -1; ++ } ++ + imgFile.seekg(pfmPos, + std::ios::beg); // Version is at 0x806 in the PFM + imgFile.read(reinterpret_cast<char*>(&verData), sizeof(verData)); + imgFile.close(); +- version = +- std::to_string(verData[0]) + "." + std::to_string(verData[1]); ++ ++ auto size = std::filesystem::file_size(imgPath); ++ ++ phosphor::logging::log<phosphor::logging::level::INFO>( ++ "Image Size", phosphor::logging::entry("IMAGESIZE=0x%x", ++ static_cast<int>(size))); ++ ++ // Adds all digest algorithms to the internal table ++ OpenSSL_add_all_digests(); ++ ++ ctx = EVP_MD_CTX_create(); ++ EVP_DigestInit(ctx, EVP_sha256()); ++ ++ // Hash the image file and update the digest ++ auto dataPtr = mapFile(imgPath, size); ++ ++ EVP_DigestUpdate(ctx, ((uint8_t*)dataPtr() + lengthBlk0Blk1), ++ (size - lengthBlk0Blk1)); ++ ++ std::vector<uint8_t> digest(EVP_MD_size(EVP_sha256())); ++ std::vector<uint8_t> expectedDigest(block0Data.hash256, ++ &block0Data.hash256[0] + 32); ++ ++ EVP_DigestFinal(ctx, digest.data(), &hashLen); ++ EVP_MD_CTX_destroy(ctx); ++ ++ std::string redfishMsgID = "OpenBMC.0.1"; ++ ++ if (expectedDigest != digest) ++ { ++ redfishMsgID += ".GeneralFirmwareSecurityViolation"; ++ sd_journal_send("MESSAGE=%s", ++ "Firmware image HASH verification failed", ++ "PRIORITY=%i", LOG_ERR, "REDFISH_MESSAGE_ID=%s", ++ redfishMsgID.c_str(), "REDFISH_MESSAGE_ARGS=%s", ++ "Image HASH check fail", NULL); ++ return -1; ++ } ++ + phosphor::logging::log<phosphor::logging::level::INFO>( + "PFR image", + phosphor::logging::entry("PCType=%d", block0Data.pcType[0]), + phosphor::logging::entry("VERSION=%s", version.c_str())); ++ ++ version = ++ std::to_string(verData[0]) + "." + std::to_string(verData[1]); + } + catch (std::exception& e) + { +@@ -79,20 +174,20 @@ static int getPFRImgInfo(const std::filesystem::path imgPath, uint8_t& imgType, + + int Manager::processImage(const std::string& imgFilePath) + { ++ + std::filesystem::path imgPath(imgFilePath); + + if (!std::filesystem::exists(imgPath)) + return -1; + +- uint8_t imgType; + int retry = 3; + std::string ver; + std::string purposeString; + +- if (0 != getPFRImgInfo(imgFilePath, imgType, ver)) ++ if (0 != verifyPFRImage(imgFilePath, ver, purposeString)) + { + phosphor::logging::log<phosphor::logging::level::ERR>( +- "Error reading uploaded image type and version"); ++ "Error verifying uploaded image"); + return -1; + } + +@@ -103,31 +198,6 @@ int Manager::processImage(const std::string& imgFilePath) + return -1; + } + +- if (imgType == pfrBMCUpdateCap) +- { +- purposeString = +- "xyz.openbmc_project.Software.Version.VersionPurpose.BMC"; +- } +- else if (imgType == pfrPCHUpdateCap) +- { +- purposeString = +- "xyz.openbmc_project.Software.Version.VersionPurpose.Host"; +- } +- else if (imgType == pfrCPLDUpdateCap) +- { +- purposeString = +- "xyz.openbmc_project.Software.Version.VersionPurpose.Other"; +- } +- else +- { +- purposeString = +- "xyz.openbmc_project.Software.Version.VersionPurpose.Unknown"; +- +- phosphor::logging::log<phosphor::logging::level::ERR>( +- "Unknown image type"); +- return -1; +- } +- + sdbusplus::xyz::openbmc_project::Software::server::Version::VersionPurpose + purpose = Version::VersionPurpose::Unknown; + try +@@ -169,6 +239,7 @@ int Manager::processImage(const std::string& imgFilePath) + std::filesystem::create_directory(imageDirPath); + + std::filesystem::path newFileName = imageDirPath / "image-runtime"; ++ + std::filesystem::rename(imgFilePath, newFileName); + + // Create Version object +@@ -212,6 +283,14 @@ void Manager::erase(std::string entryId) + this->versions.erase(entryId); + } + ++CustomMap Manager::mapFile(const std::filesystem::path& path, size_t size) ++{ ++ ++ CustomFd fd(open(path.c_str(), O_RDONLY)); ++ ++ return CustomMap(mmap(nullptr, size, PROT_READ, MAP_PRIVATE, fd(), 0), ++ size); ++} + } // namespace manager + } // namespace software + } // namespace phosphor +diff --git a/pfr_image_manager.hpp b/pfr_image_manager.hpp +index c6ee6a4..5b7b2c3 100644 +--- a/pfr_image_manager.hpp ++++ b/pfr_image_manager.hpp +@@ -1,6 +1,13 @@ + #pragma once + #include "version.hpp" + ++#include <openssl/evp.h> ++#include <openssl/pem.h> ++#include <openssl/rsa.h> ++#include <sys/mman.h> ++#include <unistd.h> ++ ++#include <filesystem> + #include <sdbusplus/server.hpp> + + namespace phosphor +@@ -10,7 +17,8 @@ namespace software + namespace manager + { + +-enum pfrImgPCType { ++enum pfrImgPCType ++{ + pfrCPLDUpdateCap = 0x00, + pfrPCHPFM = 0x01, + pfrPCHUpdateCap = 0x02, +@@ -19,15 +27,94 @@ enum pfrImgPCType { + }; + + /* PFR image block 0 - As defined in HAS */ +-struct pfrImgBlock0 { +- uint8_t tag[4]; ++struct pfrImgBlock0 ++{ ++ uint32_t tag; + uint8_t pcLength[4]; + uint8_t pcType[4]; + uint8_t reserved1[4]; + uint8_t hash256[32]; + uint8_t hash384[48]; + uint8_t reserved2[32]; +-}__attribute__((packed)); ++} __attribute__((packed)); ++ ++/** @struct CustomFd ++ * ++ * RAII wrapper for file descriptor. ++ */ ++struct CustomFd ++{ ++ public: ++ CustomFd() = delete; ++ CustomFd(const CustomFd&) = delete; ++ CustomFd& operator=(const CustomFd&) = delete; ++ CustomFd(CustomFd&&) = default; ++ CustomFd& operator=(CustomFd&&) = default; ++ /** @brief Saves File descriptor and uses it to do file operation ++ * ++ * @param[in] fd - File descriptor ++ */ ++ CustomFd(int fd) : fd(fd) ++ { ++ } ++ ++ ~CustomFd() ++ { ++ if (fd >= 0) ++ { ++ close(fd); ++ } ++ } ++ ++ int operator()() const ++ { ++ return fd; ++ } ++ ++ private: ++ /** @brief File descriptor */ ++ int fd = -1; ++}; ++ ++/** @struct CustomMap ++ * ++ * RAII wrapper for mmap. ++ */ ++struct CustomMap ++{ ++ private: ++ /** @brief starting address of the map */ ++ void* addr; ++ ++ /** @brief length of the mapping */ ++ size_t length; ++ ++ public: ++ CustomMap() = delete; ++ CustomMap(const CustomMap&) = delete; ++ CustomMap& operator=(const CustomMap&) = delete; ++ CustomMap(CustomMap&&) = default; ++ CustomMap& operator=(CustomMap&&) = default; ++ ++ /** @brief Saves starting address of the map and ++ * and length of the file. ++ * @param[in] addr - Starting address of the map ++ * @param[in] length - length of the map ++ */ ++ CustomMap(void* addr, size_t length) : addr(addr), length(length) ++ { ++ } ++ ++ ~CustomMap() ++ { ++ munmap(addr, length); ++ } ++ ++ void* operator()() const ++ { ++ return addr; ++ } ++}; + + /** @class Manager + * @brief Contains a map of Version dbus objects. +@@ -61,13 +148,28 @@ class Manager + void erase(std::string entryId); + + private: ++ /** ++ * @brief Memory map the file ++ * @param[in] - file path ++ * @param[in] - file size ++ * @param[out] - Custom Mmap address ++ */ ++ CustomMap mapFile(const std::filesystem::path& path, size_t size); ++ ++ /** ++ * @brief Verify the PFR image and return version and purpose ++ * @param[in] - file path ++ * @param[out] - version ++ * @param[out] - purpose ++ */ ++ int verifyPFRImage(const std::filesystem::path imgPath, ++ std::string& version, std::string& purposeString); + /** @brief Persistent map of Version dbus objects and their + * version id */ + std::map<std::string, std::unique_ptr<Version>> versions; + + /** @brief Persistent sdbusplus DBus bus connection. */ + sdbusplus::bus::bus& bus; +- + }; + + } // namespace manager +-- +2.17.1 + diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/flash/phosphor-software-manager/fwupd@.service b/meta-openbmc-mods/meta-common/recipes-phosphor/flash/phosphor-software-manager/fwupd@.service index d51fee312..64d9a47a6 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/flash/phosphor-software-manager/fwupd@.service +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/flash/phosphor-software-manager/fwupd@.service @@ -4,5 +4,5 @@ Description=Flash BMC with fwupd script : %I [Service]
Type=oneshot
RemainAfterExit=no
-ExecStart=/usr/bin/fwupd.sh file:////tmp/images/%i/image-runtime
-SyslogIdentifier=fwupd
\ No newline at end of file +ExecStart=/usr/bin/fwupd.sh %i
+SyslogIdentifier=fwupd
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/flash/phosphor-software-manager_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/flash/phosphor-software-manager_%.bbappend index 90da32ac2..96ddfc3ca 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/flash/phosphor-software-manager_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/flash/phosphor-software-manager_%.bbappend @@ -9,6 +9,11 @@ SRC_URI += "file://0002-Redfish-firmware-activation.patch \ file://0004-Changed-the-condition-of-software-version-service-wa.patch \ file://0005-Modified-firmware-activation-to-launch-fwupd.sh-thro.patch \ file://0006-Modify-the-ID-of-software-image-updater-object-on-DB.patch \ + file://0007-Adding-StandBySpare-for-firmware-activation.patch \ " -SRC_URI += "${@bb.utils.contains('IMAGE_FSTYPES', 'intel-pfr', 'file://0007-PFR-images-support.patch', '', d)}" +SRC_URI_PFR = "file://0007-PFR-images-support.patch \ + file://0008-PFR-image-HASH-verification.patch \ + " + +SRC_URI += "${@bb.utils.contains('IMAGE_FSTYPES', 'intel-pfr', SRC_URI_PFR, '', d)}" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0001-Firmware-update-support-for-StandBySpare.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0001-Firmware-update-support-for-StandBySpare.patch new file mode 100644 index 000000000..9e7cdf768 --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0001-Firmware-update-support-for-StandBySpare.patch @@ -0,0 +1,484 @@ +From ba9d7f8443716887bc101e300b06c570f7da8159 Mon Sep 17 00:00:00 2001 +From: Vikram Bodireddy <vikram.bodireddy@linux.intel.com> +Date: Thu, 5 Dec 2019 15:13:52 +0530 +Subject: [PATCH] Firmware update support for StandBySpare + +Firmware update support for StandBySpare. This will +have support for adding 'HttpPushUriTargets' and +'HttpPushUriTargetsBusy' attributes. These attributes enables +'HttpPushUri' to distinguish between the firmware update targets. + +Tested: + - GET on "/redfish/v1/UpdateService", got below response +......... + "HttpPushUriTargets": [], + "HttpPushUriTargetsBusy": false +........ + + - PATCH on "/redfish/v1/UpdateService" and works fine. +{ + "HttpPushUriTargets": ["bmc_recovery"], + "HttpPushUriTargetsBusy": true +} + + - Did Firmware update and verified end to end functionality + for both bmc active and backup images. + + - Successfully ran redfish validater with no new errors. + +Change-Id: I59f317ac001ebf56bbf30e7f43dbec5d69fa249a +Signed-off-by: Vikram Bodireddy <vikram.bodireddy@linux.intel.com> +--- + redfish-core/lib/update_service.hpp | 285 ++++++++++++++++++++++++++++++------ + 1 file changed, 241 insertions(+), 44 deletions(-) + +diff --git a/redfish-core/lib/update_service.hpp b/redfish-core/lib/update_service.hpp +index 57dcc07..c189d5a 100644 +--- a/redfish-core/lib/update_service.hpp ++++ b/redfish-core/lib/update_service.hpp +@@ -30,6 +30,17 @@ static std::unique_ptr<sdbusplus::bus::match::match> fwUpdateMatcher; + static bool fwUpdateInProgress = false; + // Timer for software available + static std::unique_ptr<boost::asio::steady_timer> fwAvailableTimer; ++static constexpr const char *versionIntf = ++ "xyz.openbmc_project.Software.Version"; ++static constexpr const char *activationIntf = ++ "xyz.openbmc_project.Software.Activation"; ++static constexpr const char *reqActivationPropName = "RequestedActivation"; ++static constexpr const char *reqActivationsActive = ++ "xyz.openbmc_project.Software.Activation.RequestedActivations.Active"; ++static constexpr const char *reqActivationsStandBySpare = ++ "xyz.openbmc_project.Software.Activation.RequestedActivations.StandbySpare"; ++static constexpr const char *activationsStandBySpare = ++ "xyz.openbmc_project.Software.Activation.Activations.StandbySpare"; + + static void cleanUp() + { +@@ -37,27 +48,118 @@ static void cleanUp() + fwUpdateMatcher = nullptr; + } + static void activateImage(const std::string &objPath, +- const std::string &service) ++ const std::string &service, ++ const std::vector<std::string> &imgUriTargets) + { + BMCWEB_LOG_DEBUG << "Activate image for " << objPath << " " << service; ++ ++ // If targets is empty, it will apply to the active. ++ if (imgUriTargets.size() == 0) ++ { ++ crow::connections::systemBus->async_method_call( ++ [](const boost::system::error_code error_code) { ++ if (error_code) ++ { ++ BMCWEB_LOG_DEBUG << "RequestedActivation failed: ec = " ++ << error_code; ++ } ++ }, ++ service, objPath, "org.freedesktop.DBus.Properties", "Set", ++ activationIntf, reqActivationPropName, ++ std::variant<std::string>(reqActivationsActive)); ++ return; ++ } ++ ++ // TODO: Now we support only one target becuase software-manager ++ // code support one activation per object. It will be enhanced ++ // to multiple targets for single image in future. For now, ++ // consider first target alone. + crow::connections::systemBus->async_method_call( +- [](const boost::system::error_code error_code) { +- if (error_code) ++ [objPath, service, imgTarget{imgUriTargets[0]}]( ++ const boost::system::error_code ec, ++ const crow::openbmc_mapper::GetSubTreeType &subtree) { ++ if (ec || !subtree.size()) + { +- BMCWEB_LOG_DEBUG << "error_code = " << error_code; +- BMCWEB_LOG_DEBUG << "error msg = " << error_code.message(); ++ return; ++ } ++ ++ for (const auto &[invObjPath, invDict] : subtree) ++ { ++ std::size_t idPos = invObjPath.rfind("/"); ++ if ((idPos == std::string::npos) || ++ ((idPos + 1) >= invObjPath.size())) ++ { ++ BMCWEB_LOG_DEBUG << "Can't parse firmware ID!!"; ++ return; ++ } ++ std::string swId = invObjPath.substr(idPos + 1); ++ ++ if (swId != imgTarget) ++ { ++ continue; ++ } ++ ++ if (invDict.size() < 1) ++ { ++ continue; ++ } ++ BMCWEB_LOG_DEBUG << "Image target matched with object " ++ << invObjPath; ++ crow::connections::systemBus->async_method_call( ++ [objPath, ++ service](const boost::system::error_code error_code, ++ const std::variant<std::string> value) { ++ if (error_code) ++ { ++ BMCWEB_LOG_DEBUG ++ << "Error in querying activation value"; ++ // not all fwtypes are updateable, ++ // this is ok ++ return; ++ } ++ std::string activationValue = ++ std::get<std::string>(value); ++ BMCWEB_LOG_DEBUG << "Activation Value: " ++ << activationValue; ++ std::string reqActivation = reqActivationsActive; ++ if (activationValue == activationsStandBySpare) ++ { ++ reqActivation = reqActivationsStandBySpare; ++ } ++ BMCWEB_LOG_DEBUG ++ << "Setting RequestedActivation value as " ++ << reqActivation << " for " << service << " " ++ << objPath; ++ crow::connections::systemBus->async_method_call( ++ [](const boost::system::error_code error_code) { ++ if (error_code) ++ { ++ BMCWEB_LOG_DEBUG ++ << "RequestedActivation failed: ec = " ++ << error_code; ++ } ++ return; ++ }, ++ service, objPath, "org.freedesktop.DBus.Properties", ++ "Set", activationIntf, reqActivationPropName, ++ std::variant<std::string>(reqActivation)); ++ }, ++ invDict[0].first, ++ "/xyz/openbmc_project/software/" + imgTarget, ++ "org.freedesktop.DBus.Properties", "Get", activationIntf, ++ "Activation"); + } + }, +- service, objPath, "org.freedesktop.DBus.Properties", "Set", +- "xyz.openbmc_project.Software.Activation", "RequestedActivation", +- std::variant<std::string>( +- "xyz.openbmc_project.Software.Activation.RequestedActivations." +- "Active")); ++ "xyz.openbmc_project.ObjectMapper", ++ "/xyz/openbmc_project/object_mapper", ++ "xyz.openbmc_project.ObjectMapper", "GetSubTree", "/", ++ static_cast<int32_t>(0), std::array<const char *, 1>{versionIntf}); + } + + // Note that asyncResp can be either a valid pointer or nullptr. If nullptr + // then no asyncResp updates will occur + static void softwareInterfaceAdded(std::shared_ptr<AsyncResp> asyncResp, ++ const std::vector<std::string> imgUriTargets, + sdbusplus::message::message &m) + { + std::vector<std::pair< +@@ -69,27 +171,24 @@ static void softwareInterfaceAdded(std::shared_ptr<AsyncResp> asyncResp, + + m.read(objPath, interfacesProperties); + +- BMCWEB_LOG_DEBUG << "obj path = " << objPath.str; ++ BMCWEB_LOG_DEBUG << "Software Interface Added. objPath = " << objPath.str; + for (auto &interface : interfacesProperties) + { +- BMCWEB_LOG_DEBUG << "interface = " << interface.first; +- +- if (interface.first == "xyz.openbmc_project.Software.Activation") ++ if (interface.first == activationIntf) + { + // Found our interface, disable callbacks + fwUpdateMatcher = nullptr; +- + // Retrieve service and activate + crow::connections::systemBus->async_method_call( +- [objPath, asyncResp]( ++ [objPath, asyncResp, imgTargets{imgUriTargets}]( + const boost::system::error_code error_code, + const std::vector<std::pair< + std::string, std::vector<std::string>>> &objInfo) { + if (error_code) + { +- BMCWEB_LOG_DEBUG << "error_code = " << error_code; +- BMCWEB_LOG_DEBUG << "error msg = " +- << error_code.message(); ++ BMCWEB_LOG_DEBUG ++ << "GetSoftwareObject path failed: ec = " ++ << error_code; + if (asyncResp) + { + messages::internalError(asyncResp->res); +@@ -113,8 +212,7 @@ static void softwareInterfaceAdded(std::shared_ptr<AsyncResp> asyncResp, + // xyz.openbmc_project.Software.Activation interface + // is added + fwAvailableTimer = nullptr; +- +- activateImage(objPath.str, objInfo[0].first); ++ activateImage(objPath.str, objInfo[0].first, imgTargets); + if (asyncResp) + { + redfish::messages::success(asyncResp->res); +@@ -124,17 +222,16 @@ static void softwareInterfaceAdded(std::shared_ptr<AsyncResp> asyncResp, + "xyz.openbmc_project.ObjectMapper", + "/xyz/openbmc_project/object_mapper", + "xyz.openbmc_project.ObjectMapper", "GetObject", objPath.str, +- std::array<const char *, 1>{ +- "xyz.openbmc_project.Software.Activation"}); ++ std::array<const char *, 1>{activationIntf}); + } + } + } + + // Note that asyncResp can be either a valid pointer or nullptr. If nullptr + // then no asyncResp updates will occur +-static void monitorForSoftwareAvailable(std::shared_ptr<AsyncResp> asyncResp, +- const crow::Request &req, +- int timeoutTimeSeconds = 5) ++static void monitorForSoftwareAvailable( ++ std::shared_ptr<AsyncResp> asyncResp, const crow::Request &req, ++ const std::vector<std::string> &imgUriTargets, int timeoutTimeSeconds = 5) + { + // Only allow one FW update at a time + if (fwUpdateInProgress != false) +@@ -145,7 +242,6 @@ static void monitorForSoftwareAvailable(std::shared_ptr<AsyncResp> asyncResp, + } + return; + } +- + fwAvailableTimer = + std::make_unique<boost::asio::steady_timer>(*req.ioService); + +@@ -174,10 +270,10 @@ static void monitorForSoftwareAvailable(std::shared_ptr<AsyncResp> asyncResp, + } + }); + +- auto callback = [asyncResp](sdbusplus::message::message &m) { +- BMCWEB_LOG_DEBUG << "Match fired"; +- softwareInterfaceAdded(asyncResp, m); +- }; ++ auto callback = ++ [asyncResp, imgTargets{imgUriTargets}](sdbusplus::message::message &m) { ++ softwareInterfaceAdded(asyncResp, imgTargets, m); ++ }; + + fwUpdateInProgress = true; + +@@ -286,9 +382,12 @@ class UpdateServiceActionsSimpleUpdate : public Node + std::string fwFile = imageURI.substr(separator + 1); + BMCWEB_LOG_DEBUG << "Server: " << tftpServer + " File: " << fwFile; + ++ // We will pass empty targets and its handled in activation. ++ std::vector<std::string> httpUriTargets; ++ + // Setup callback for when new software detected + // Give TFTP 2 minutes to complete +- monitorForSoftwareAvailable(nullptr, req, 120); ++ monitorForSoftwareAvailable(nullptr, req, httpUriTargets, 120); + + // TFTP can take up to 2 minutes depending on image size and + // connection speed. Return to caller as soon as the TFTP operation +@@ -322,7 +421,8 @@ class UpdateServiceActionsSimpleUpdate : public Node + class UpdateService : public Node + { + public: +- UpdateService(CrowApp &app) : Node(app, "/redfish/v1/UpdateService/") ++ UpdateService(CrowApp &app) : ++ Node(app, "/redfish/v1/UpdateService/"), httpPushUriTargetBusy(false) + { + entityPrivileges = { + {boost::beast::http::verb::get, {{"Login"}}}, +@@ -334,6 +434,9 @@ class UpdateService : public Node + } + + private: ++ std::vector<std::string> httpPushUriTargets; ++ bool httpPushUriTargetBusy; ++ + void doGet(crow::Response &res, const crow::Request &req, + const std::vector<std::string> ¶ms) override + { +@@ -346,6 +449,8 @@ class UpdateService : public Node + res.jsonValue["Description"] = "Service for Software Update"; + res.jsonValue["Name"] = "Update Service"; + res.jsonValue["HttpPushUri"] = "/redfish/v1/UpdateService"; ++ res.jsonValue["HttpPushUriTargets"] = httpPushUriTargets; ++ res.jsonValue["HttpPushUriTargetsBusy"] = httpPushUriTargetBusy; + // UpdateService cannot be disabled + res.jsonValue["ServiceEnabled"] = true; + res.jsonValue["FirmwareInventory"] = { +@@ -405,9 +510,14 @@ class UpdateService : public Node + std::shared_ptr<AsyncResp> asyncResp = std::make_shared<AsyncResp>(res); + + std::optional<nlohmann::json> pushUriOptions; +- if (!json_util::readJson(req, res, "HttpPushUriOptions", +- pushUriOptions)) ++ std::optional<std::vector<std::string>> imgTargets; ++ std::optional<bool> imgTargetBusy; ++ ++ if (!json_util::readJson(req, res, "HttpPushUriOptions", pushUriOptions, ++ "HttpPushUriTargets", imgTargets, ++ "HttpPushUriTargetsBusy", imgTargetBusy)) + { ++ BMCWEB_LOG_DEBUG << "UpdateService doPatch: Invalid request body"; + return; + } + +@@ -464,7 +574,6 @@ class UpdateService : public Node + messages::internalError(asyncResp->res); + return; + } +- messages::success(asyncResp->res); + }, + "xyz.openbmc_project.Settings", + "/xyz/openbmc_project/software/apply_time", +@@ -475,6 +584,98 @@ class UpdateService : public Node + } + } + } ++ ++ if (imgTargetBusy) ++ { ++ if ((httpPushUriTargetBusy) && (*imgTargetBusy)) ++ { ++ BMCWEB_LOG_DEBUG ++ << "Other client has reserved the HttpPushUriTargets " ++ "property for firmware updates."; ++ messages::resourceInUse(asyncResp->res); ++ return; ++ } ++ ++ if (imgTargets) ++ { ++ if (!(*imgTargetBusy)) ++ { ++ BMCWEB_LOG_DEBUG ++ << "UpdateService doPatch: httpPushUriTargetBusy " ++ "should be " ++ "true before setting httpPushUriTargets"; ++ messages::invalidObject(asyncResp->res, ++ "HttpPushUriTargetsBusy"); ++ return; ++ } ++ if ((*imgTargets).size() != 0) ++ { ++ // TODO: Now we support max one target becuase ++ // software-manager code support one activation per object. ++ // It will be enhanced to multiple targets for single image ++ // in future. For now, consider first target alone. ++ if ((*imgTargets).size() != 1) ++ { ++ messages::invalidObject(asyncResp->res, ++ "HttpPushUriTargets"); ++ return; ++ } ++ crow::connections::systemBus->async_method_call( ++ [this, asyncResp, uriTargets{*imgTargets}, ++ targetBusy{*imgTargetBusy}]( ++ const boost::system::error_code ec, ++ const std::vector<std::string> swInvPaths) { ++ if (ec) ++ { ++ return; ++ } ++ ++ bool swInvObjFound = false; ++ for (const std::string &path : swInvPaths) ++ { ++ std::size_t idPos = path.rfind("/"); ++ if ((idPos == std::string::npos) || ++ ((idPos + 1) >= path.size())) ++ { ++ messages::internalError(asyncResp->res); ++ BMCWEB_LOG_DEBUG ++ << "Can't parse firmware ID!!"; ++ return; ++ } ++ std::string swId = path.substr(idPos + 1); ++ ++ if (swId == uriTargets[0]) ++ { ++ swInvObjFound = true; ++ break; ++ } ++ } ++ if (!swInvObjFound) ++ { ++ messages::invalidObject(asyncResp->res, ++ "HttpPushUriTargets"); ++ return; ++ } ++ this->httpPushUriTargetBusy = targetBusy; ++ this->httpPushUriTargets = uriTargets; ++ }, ++ "xyz.openbmc_project.ObjectMapper", ++ "/xyz/openbmc_project/object_mapper", ++ "xyz.openbmc_project.ObjectMapper", "GetSubTreePaths", ++ "/", static_cast<int32_t>(0), ++ std::array<const char *, 1>{versionIntf}); ++ } ++ else ++ { ++ httpPushUriTargetBusy = *imgTargetBusy; ++ httpPushUriTargets = *imgTargets; ++ } ++ } ++ else ++ { ++ httpPushUriTargetBusy = *imgTargetBusy; ++ } ++ } + } + + void doPost(crow::Response &res, const crow::Request &req, +@@ -485,7 +686,7 @@ class UpdateService : public Node + std::shared_ptr<AsyncResp> asyncResp = std::make_shared<AsyncResp>(res); + + // Setup callback for when new software detected +- monitorForSoftwareAvailable(asyncResp, req); ++ monitorForSoftwareAvailable(asyncResp, req, httpPushUriTargets); + + std::string filepath( + "/tmp/images/" + +@@ -569,9 +770,7 @@ class SoftwareInventoryCollection : public Node + "xyz.openbmc_project.ObjectMapper", + "/xyz/openbmc_project/object_mapper", + "xyz.openbmc_project.ObjectMapper", "GetSubTree", "/", +- static_cast<int32_t>(0), +- std::array<const char *, 1>{ +- "xyz.openbmc_project.Software.Version"}); ++ static_cast<int32_t>(0), std::array<const char *, 1>{versionIntf}); + } + }; + +@@ -756,7 +955,7 @@ class SoftwareInventory : public Node + }, + obj.second[0].first, obj.first, + "org.freedesktop.DBus.Properties", "GetAll", +- "xyz.openbmc_project.Software.Version"); ++ versionIntf); + } + if (!found) + { +@@ -778,9 +977,7 @@ class SoftwareInventory : public Node + "xyz.openbmc_project.ObjectMapper", + "/xyz/openbmc_project/object_mapper", + "xyz.openbmc_project.ObjectMapper", "GetSubTree", "/", +- static_cast<int32_t>(0), +- std::array<const char *, 1>{ +- "xyz.openbmc_project.Software.Version"}); ++ static_cast<int32_t>(0), std::array<const char *, 1>{versionIntf}); + } + }; + +-- +2.7.4 + diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend index 93e684cd7..00eb38799 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend @@ -1,5 +1,5 @@ SRC_URI = "git://github.com/openbmc/bmcweb.git" -SRCREV = "274dfe625f862e8ded2d4eb88dd856cf66bf54bf" +SRCREV = "97d57aaa0b95a110c71016d190f95f853051126a" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" @@ -9,6 +9,9 @@ USERADD_PARAM_${PN} = "-r -s /usr/sbin/nologin -d /home/bmcweb -m -G shadow bmcw GROUPADD_PARAM_${PN} = "web; redfish " +SRC_URI += "file://0001-Firmware-update-support-for-StandBySpare.patch \ + " + # Enable CPU Log and Raw PECI support EXTRA_OECMAKE += "-DBMCWEB_ENABLE_REDFISH_CPU_LOG=ON" EXTRA_OECMAKE += "-DBMCWEB_ENABLE_REDFISH_RAW_PECI=ON" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0059-Move-Set-SOL-config-parameter-to-host-ipmid.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0059-Move-Set-SOL-config-parameter-to-host-ipmid.patch index 0d1a5abbb..bc8c72f13 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0059-Move-Set-SOL-config-parameter-to-host-ipmid.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0059-Move-Set-SOL-config-parameter-to-host-ipmid.patch @@ -1,7 +1,7 @@ -From 27b94aa1df83abad63cbba69525273194b14ab9c Mon Sep 17 00:00:00 2001 +From 1c8cb6b7c99ad85f470aa87095fcfb4de822ddb1 Mon Sep 17 00:00:00 2001 From: Cheng C Yang <cheng.c.yang@intel.com> Date: Wed, 16 Oct 2019 14:24:20 +0800 -Subject: [PATCH] Move Set SOL config parameter to host-ipmid +Subject: [PATCH 1/1] Move Set SOL config parameter to host-ipmid Move Set SOL config parameter command from net-ipmid to host-ipmid, so that BIOS in Intel platform can enable or disable SOL through KCS. @@ -21,13 +21,14 @@ After reboot BMC, "Progress" property in dbus interface change back to 0 and other properties will not reset to default value. Signed-off-by: Cheng C Yang <cheng.c.yang@intel.com> +Signed-off-by: James Feist <james.feist@linux.intel.com> --- host-ipmid-whitelist.conf | 1 + - transporthandler.cpp | 322 ++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 323 insertions(+) + transporthandler.cpp | 294 ++++++++++++++++++++++++++++++++++++++ + 2 files changed, 295 insertions(+) diff --git a/host-ipmid-whitelist.conf b/host-ipmid-whitelist.conf -index e8df7c7..f030ef4 100644 +index 5397115..c93f3b1 100644 --- a/host-ipmid-whitelist.conf +++ b/host-ipmid-whitelist.conf @@ -41,6 +41,7 @@ @@ -39,10 +40,10 @@ index e8df7c7..f030ef4 100644 0x2C:0x01 //<Group Extension>:<Get DCMI Capabilities> 0x2C:0x02 //<Group Extension>:<Get Power Reading> diff --git a/transporthandler.cpp b/transporthandler.cpp -index e88eb63..4a42e7b 100644 +index 61065ad..59e38ea 100644 --- a/transporthandler.cpp +++ b/transporthandler.cpp -@@ -1469,8 +1469,323 @@ RspType<message::Payload> getLan(uint4_t channelBits, uint3_t, bool revOnly, +@@ -1469,8 +1469,298 @@ RspType<message::Payload> getLan(uint4_t channelBits, uint3_t, bool revOnly, } // namespace transport } // namespace ipmi @@ -136,31 +137,6 @@ index e88eb63..4a42e7b 100644 + return 0; +} + -+void initializeSOLInProgress() -+{ -+ ipmi::ChannelInfo chInfo; -+ for (int chNum = 0; chNum < ipmi::maxIpmiChannels; chNum++) -+ { -+ if (!ipmi::isValidChannel(static_cast<uint8_t>(chNum))) -+ { -+ continue; -+ } -+ ipmi_ret_t compCode = -+ ipmi::getChannelInfo(static_cast<uint8_t>(chNum), chInfo); -+ if (compCode != IPMI_CC_OK || -+ chInfo.mediumType != -+ static_cast<uint8_t>(ipmi::EChannelMediumType::lan8032)) -+ { -+ continue; -+ } -+ if (setSOLParameter("Progress", static_cast<uint8_t>(0), chNum) < 0) -+ { -+ phosphor::logging::log<phosphor::logging::level::ERR>( -+ "Error initialize sol progress"); -+ } -+ } -+} -+ +static const constexpr uint8_t encryptMask = 0x80; +static const constexpr uint8_t encryptShift = 7; +static const constexpr uint8_t authMask = 0x40; @@ -366,7 +342,7 @@ index e88eb63..4a42e7b 100644 void register_netfn_transport_functions() { ipmi::registerHandler(ipmi::prioOpenBmcBase, ipmi::netFnTransport, -@@ -1479,4 +1794,11 @@ void register_netfn_transport_functions() +@@ -1479,4 +1769,8 @@ void register_netfn_transport_functions() ipmi::registerHandler(ipmi::prioOpenBmcBase, ipmi::netFnTransport, ipmi::transport::cmdGetLanConfigParameters, ipmi::Privilege::Operator, ipmi::transport::getLan); @@ -374,10 +350,7 @@ index e88eb63..4a42e7b 100644 + ipmi::registerHandler(ipmi::prioOpenBmcBase, ipmi::netFnTransport, + ipmi::transport::cmdSetSolConfigParameters, + ipmi::Privilege::Admin, setSOLConfParams); -+ -+ // Initialize dbus property progress to 0 every time sol manager restart. -+ initializeSOLInProgress(); } -- -2.7.4 +2.17.1 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0060-Move-Get-SOL-config-parameter-to-host-ipmid.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0060-Move-Get-SOL-config-parameter-to-host-ipmid.patch index 01a3e49b8..61ac5fede 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0060-Move-Get-SOL-config-parameter-to-host-ipmid.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0060-Move-Get-SOL-config-parameter-to-host-ipmid.patch @@ -1,7 +1,7 @@ -From e8ad148601fc3b45fac9092fdd45c537433e662f Mon Sep 17 00:00:00 2001 +From b5400c4bc756a800fbeb4cc53117956fb59dc57d Mon Sep 17 00:00:00 2001 From: Cheng C Yang <cheng.c.yang@intel.com> Date: Thu, 11 Jul 2019 00:32:58 +0800 -Subject: [PATCH] Move Get SOL config parameter to host-ipmid +Subject: [PATCH 1/1] Move Get SOL config parameter to host-ipmid Move Get SOL config parameter command from net-ipmid to host-ipmid. @@ -22,16 +22,17 @@ Payload Channel : 1 (0x01) Payload Port : 623 Signed-off-by: Cheng C Yang <cheng.c.yang@intel.com> +Signed-off-by: James Feist <james.feist@linux.intel.com> --- host-ipmid-whitelist.conf | 1 + - transporthandler.cpp | 191 ++++++++++++++++++++++++++++++++++++++++++++++ + transporthandler.cpp | 191 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 192 insertions(+) diff --git a/host-ipmid-whitelist.conf b/host-ipmid-whitelist.conf -index 44c2181..0fcac4e 100644 +index c93f3b1..730437d 100644 --- a/host-ipmid-whitelist.conf +++ b/host-ipmid-whitelist.conf -@@ -41,6 +41,7 @@ +@@ -42,6 +42,7 @@ 0x0A:0x49 //<Storage>:<Set SEL Time> 0x0C:0x02 //<Transport>:<Get LAN Configuration Parameters> 0x0C:0x21 //<Transport>:<Set SOL Configuration Parameters> @@ -40,10 +41,10 @@ index 44c2181..0fcac4e 100644 0x2C:0x01 //<Group Extension>:<Get DCMI Capabilities> 0x2C:0x02 //<Group Extension>:<Get Power Reading> diff --git a/transporthandler.cpp b/transporthandler.cpp -index 25062ae..9ba2868 100644 +index 59e38ea..b64953f 100644 --- a/transporthandler.cpp +++ b/transporthandler.cpp -@@ -1719,6 +1719,28 @@ static int getSOLParameter(const std::string& property, ipmi::Value& value, +@@ -1559,6 +1559,28 @@ static int getSOLParameter(const std::string& property, ipmi::Value& value, return 0; } @@ -69,10 +70,10 @@ index 25062ae..9ba2868 100644 + return 0; +} + - void initializeSOLInProgress() - { - ipmi::ChannelInfo chInfo; -@@ -1913,6 +1935,171 @@ ipmi::RspType<> setSOLConfParams(ipmi::Context::ptr ctx, uint4_t chNum, + static const constexpr uint8_t encryptMask = 0x80; + static const constexpr uint8_t encryptShift = 7; + static const constexpr uint8_t authMask = 0x40; +@@ -1761,6 +1783,171 @@ ipmi::RspType<> setSOLConfParams(ipmi::Context::ptr ctx, uint4_t chNum, return ipmi::responseSuccess(); } @@ -243,18 +244,16 @@ index 25062ae..9ba2868 100644 + void register_netfn_transport_functions() { - // As this timer is only for transport handler -@@ -1934,6 +2121,10 @@ void register_netfn_transport_functions() + ipmi::registerHandler(ipmi::prioOpenBmcBase, ipmi::netFnTransport, +@@ -1773,4 +1960,8 @@ void register_netfn_transport_functions() + ipmi::registerHandler(ipmi::prioOpenBmcBase, ipmi::netFnTransport, ipmi::transport::cmdSetSolConfigParameters, ipmi::Privilege::Admin, setSOLConfParams); - ++ + ipmi::registerHandler(ipmi::prioOpenBmcBase, ipmi::netFnTransport, + ipmi::transport::cmdGetSolConfigParameters, + ipmi::Privilege::User, getSOLConfParams); -+ - // Initialize dbus property progress to 0 every time sol manager restart. - initializeSOLInProgress(); - + } -- -2.7.4 +2.17.1 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0064-Update-provisioning-mode-filter-logic.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0064-Update-provisioning-mode-filter-logic.patch index 57a31c991..5cd8b3ec4 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0064-Update-provisioning-mode-filter-logic.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0064-Update-provisioning-mode-filter-logic.patch @@ -1,7 +1,7 @@ -From 3279300bb9afd1f169b35b7830d7f054045ab35f Mon Sep 17 00:00:00 2001 +From dcfce847654bd7e2475ad74bedf569b6120701dd Mon Sep 17 00:00:00 2001 From: Richard Marian Thomaiyar <richard.marian.thomaiyar@linux.intel.com> Date: Tue, 18 Jun 2019 19:42:30 +0530 -Subject: [PATCH] Update provisioning mode filter logic +Subject: [PATCH 1/1] Update provisioning mode filter logic Updated provisioning mode filtering logic support. Based on the RestrictionMode property, Host (system) interface commands will be @@ -20,12 +20,13 @@ whitelist (Note: New whitelist conf is under review). Change-Id: I7a14e827d70e2d8d6975e600a0fd00e2a790bc22 Signed-off-by: Richard Marian Thomaiyar <richard.marian.thomaiyar@linux.intel.com> +Signed-off-by: James Feist <james.feist@linux.intel.com> --- - whitelist-filter.cpp | 155 ++++++++++++++++++++++++++++++++++++++++----------- - 1 file changed, 122 insertions(+), 33 deletions(-) + whitelist-filter.cpp | 191 ++++++++++++++++++++++++++++++------------- + 1 file changed, 136 insertions(+), 55 deletions(-) diff --git a/whitelist-filter.cpp b/whitelist-filter.cpp -index 9f1e7c8..2c56087 100644 +index 9f1e7c8..53461b4 100644 --- a/whitelist-filter.cpp +++ b/whitelist-filter.cpp @@ -25,6 +25,7 @@ namespace @@ -36,7 +37,7 @@ index 9f1e7c8..2c56087 100644 public: WhitelistFilter(); ~WhitelistFilter() = default; -@@ -35,17 +36,26 @@ class WhitelistFilter +@@ -35,17 +36,24 @@ class WhitelistFilter private: void postInit(); @@ -53,8 +54,7 @@ index 9f1e7c8..2c56087 100644 + RestrictionMode::Modes::ProvisionedHostWhitelist; + bool postCompleted = false; std::shared_ptr<sdbusplus::asio::connection> bus; - std::unique_ptr<settings::Objects> objects; -+ std::unique_ptr<settings::Objects> postCompleteObj; +- std::unique_ptr<settings::Objects> objects; std::unique_ptr<sdbusplus::bus::match::match> modeChangeMatch; + std::unique_ptr<sdbusplus::bus::match::match> postCompleteMatch; @@ -65,7 +65,7 @@ index 9f1e7c8..2c56087 100644 }; WhitelistFilter::WhitelistFilter() -@@ -63,16 +73,22 @@ WhitelistFilter::WhitelistFilter() +@@ -63,43 +71,83 @@ WhitelistFilter::WhitelistFilter() post_work([this]() { postInit(); }); } @@ -73,24 +73,40 @@ index 9f1e7c8..2c56087 100644 +void WhitelistFilter::cacheRestrictedAndPostCompleteMode() { using namespace sdbusplus::xyz::openbmc_project::Control::Security::server; ++ std::string restrictionModeSetting; std::string restrictionModeService; + std::string systemOsStatusPath; + std::string systemOsStatusService; try { - restrictionModeSetting = objects->map.at(restrictionModeIntf).at(0); +- restrictionModeSetting = objects->map.at(restrictionModeIntf).at(0); ++ auto objects = settings::Objects( ++ *bus, std::vector<settings::Interface>({restrictionModeIntf})); ++ auto postCompleteObj = settings::Objects( ++ *bus, std::vector<settings::Interface>({systemOsStatusIntf})); ++ ++ restrictionModeSetting = objects.map.at(restrictionModeIntf).at(0); restrictionModeService = - objects->service(restrictionModeSetting, restrictionModeIntf); +- objects->service(restrictionModeSetting, restrictionModeIntf); ++ objects.service(restrictionModeSetting, restrictionModeIntf); + -+ systemOsStatusPath = postCompleteObj->map.at(systemOsStatusIntf).at(0); ++ systemOsStatusPath = postCompleteObj.map.at(systemOsStatusIntf).at(0); + systemOsStatusService = -+ postCompleteObj->service(systemOsStatusPath, systemOsStatusIntf); ++ postCompleteObj.service(systemOsStatusPath, systemOsStatusIntf); } catch (const std::out_of_range& e) { -@@ -80,26 +96,50 @@ void WhitelistFilter::cacheRestrictedMode() - "Could not look up restriction mode interface from cache"); +- log<level::ERR>( +- "Could not look up restriction mode interface from cache"); ++ log<level::INFO>( ++ "Could not initialize provisioning mode, defaulting to restricted"); ++ return; ++ } ++ catch (const std::exception&) ++ { ++ log<level::INFO>( ++ "Could not initialize provisioning mode, defaulting to restricted"); return; } + @@ -98,11 +114,11 @@ index 9f1e7c8..2c56087 100644 [this](boost::system::error_code ec, ipmi::Value v) { if (ec) { - log<level::ERR>("Error in RestrictionMode Get"); - // Fail-safe to true. +- log<level::ERR>("Error in RestrictionMode Get"); +- // Fail-safe to true. - restrictedMode = true; -+ restrictionMode = -+ RestrictionMode::Modes::ProvisionedHostWhitelist; ++ log<level::INFO>("Could not initialize provisioning mode, " ++ "defaulting to restricted"); return; } auto mode = std::get<std::string>(v); @@ -147,7 +163,7 @@ index 9f1e7c8..2c56087 100644 } void WhitelistFilter::handleRestrictedModeChange(sdbusplus::message::message& m) -@@ -112,23 +152,44 @@ void WhitelistFilter::handleRestrictedModeChange(sdbusplus::message::message& m) +@@ -112,61 +160,94 @@ void WhitelistFilter::handleRestrictedModeChange(sdbusplus::message::message& m) { if (property.first == "RestrictionMode") { @@ -164,16 +180,24 @@ index 9f1e7c8..2c56087 100644 + log<level::INFO>( + "Updated restriction mode", + entry("VALUE=%d", static_cast<int>(restrictionMode))); -+ } -+ } -+} + } + } + } +- +-void WhitelistFilter::postInit() +void WhitelistFilter::handlePostCompleteChange(sdbusplus::message::message& m) -+{ + { +- objects = std::make_unique<settings::Objects>( +- *bus, std::vector<settings::Interface>({restrictionModeIntf})); +- if (!objects) + std::string intf; + std::vector<std::pair<std::string, ipmi::Value>> propertyList; + m.read(intf, propertyList); + for (const auto& property : propertyList) -+ { + { +- log<level::ERR>( +- "Failed to create settings object; defaulting to restricted mode"); +- return; + if (property.first == "OperatingSystemState") + { + std::string value = std::get<std::string>(property.second); @@ -187,47 +211,38 @@ index 9f1e7c8..2c56087 100644 + } + log<level::INFO>(postCompleted ? "Updated to POST Complete" + : "Updated to !POST Complete"); - } ++ } } - } - - void WhitelistFilter::postInit() - { - objects = std::make_unique<settings::Objects>( - *bus, std::vector<settings::Interface>({restrictionModeIntf})); -- if (!objects) -+ postCompleteObj = std::make_unique<settings::Objects>( -+ *bus, std::vector<settings::Interface>({systemOsStatusIntf})); -+ if (!objects || !postCompleteObj) - { - log<level::ERR>( - "Failed to create settings object; defaulting to restricted mode"); -@@ -136,37 +197,65 @@ void WhitelistFilter::postInit() - } - ++} ++void WhitelistFilter::postInit() ++{ // Initialize restricted mode - cacheRestrictedMode(); + cacheRestrictedAndPostCompleteMode(); // Wait for changes on Restricted mode - std::string filterStr; -+ std::string filterStrModeChange; -+ std::string filterStrPostComplete; - try - { +- try +- { - filterStr = sdbusplus::bus::match::rules::propertiesChanged( -+ filterStrModeChange = sdbusplus::bus::match::rules::propertiesChanged( - objects->map.at(restrictionModeIntf).at(0), restrictionModeIntf); -+ filterStrPostComplete = sdbusplus::bus::match::rules::propertiesChanged( -+ postCompleteObj->map.at(systemOsStatusIntf).at(0), -+ systemOsStatusIntf); - } - catch (const std::out_of_range& e) - { +- objects->map.at(restrictionModeIntf).at(0), restrictionModeIntf); +- } +- catch (const std::out_of_range& e) +- { - log<level::ERR>("Failed to determine restriction mode filter string"); -+ log<level::ERR>("Failed to determine restriction mode / POST complete " -+ "filter string"); - return; - } +- return; +- } ++ namespace rules = sdbusplus::bus::match::rules; ++ const std::string filterStrModeChange = ++ rules::type::signal() + rules::member("PropertiesChanged") + ++ rules::interface("org.freedesktop.DBus.Properties") + ++ rules::argN(0, restrictionModeIntf); ++ ++ const std::string filterStrPostComplete = ++ rules::type::signal() + rules::member("PropertiesChanged") + ++ rules::interface("org.freedesktop.DBus.Properties") + ++ rules::argN(0, systemOsStatusIntf); ++ modeChangeMatch = std::make_unique<sdbusplus::bus::match::match>( - *bus, filterStr, [this](sdbusplus::message::message& m) { + *bus, filterStrModeChange, [this](sdbusplus::message::message& m) { @@ -252,16 +267,16 @@ index 9f1e7c8..2c56087 100644 - whitelist.cbegin(), whitelist.cend(), - std::make_pair(request->ctx->netFn, request->ctx->cmd))) + if (!postCompleted) ++ { ++ // Allow all commands, till POST is not completed ++ return ipmi::ccSuccess; ++ } ++ switch (restrictionMode) { - log<level::ERR>("Net function not whitelisted", - entry("NETFN=0x%X", int(request->ctx->netFn)), - entry("CMD=0x%X", int(request->ctx->cmd))); - return ipmi::ccInsufficientPrivilege; -+ // Allow all commands, till POST is not completed -+ return ipmi::ccSuccess; -+ } -+ switch (restrictionMode) -+ { + case RestrictionMode::Modes::ProvisionedHostWhitelist: + { + if (!std::binary_search( @@ -282,5 +297,5 @@ index 9f1e7c8..2c56087 100644 } return ipmi::ccSuccess; -- -2.7.4 +2.17.1 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/phosphor-ipmi-host.service b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/phosphor-ipmi-host.service index 30a4dec25..1e45ee6c9 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/phosphor-ipmi-host.service +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/phosphor-ipmi-host.service @@ -1,16 +1,5 @@ [Unit] Description=Phosphor Inband IPMI -# TODO openbmc/openbmc#2059 - The wants/after below should be based on providers -Wants=mapper-wait@-xyz-openbmc_project-control-host0-boot.service -After=mapper-wait@-xyz-openbmc_project-control-host0-boot.service -Wants=mapper-wait@-xyz-openbmc_project-control-host0-boot-one_time.service -After=mapper-wait@-xyz-openbmc_project-control-host0-boot-one_time.service -Wants=mapper-wait@-xyz-openbmc_project-control-host0-power_restore_policy.service -After=mapper-wait@-xyz-openbmc_project-control-host0-power_restore_policy.service -Wants=mapper-wait@-xyz-openbmc_project-control-security-restriction_mode.service -After=mapper-wait@-xyz-openbmc_project-control-security-restriction_mode.service -Wants=mapper-wait@-xyz-openbmc_project-state-os.service -After=mapper-wait@-xyz-openbmc_project-state-os.service [Service] Restart=always @@ -23,4 +12,4 @@ RuntimeDirectoryPreserve = yes StateDirectory = ipmi [Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} +WantedBy=basic.target diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend index 9f3bf81ca..b488e6d8e 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend @@ -3,7 +3,7 @@ inherit useradd # TODO: This should be removed, once up-stream bump up # issue is resolved SRC_URI += "git://github.com/openbmc/phosphor-net-ipmid" -SRCREV = "49a94b2f82fb1aa68d608f28c4863bb36661a3a4" +SRCREV = "0f63e01ce6bb11920d78d999267558500ca9a272" USERADD_PACKAGES = "${PN}" # add a group called ipmi diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-node-manager-proxy_git.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-node-manager-proxy_git.bb index 6d8334865..635f2d3a4 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-node-manager-proxy_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-node-manager-proxy_git.bb @@ -2,8 +2,8 @@ SUMMARY = "Node Manager Proxy" DESCRIPTION = "The Node Manager Proxy provides a simple interface for communicating \ with Management Engine via IPMB" -SRC_URI = "git://git@github.com/Intel-BMC/node-manager;protocol=ssh" -SRCREV = "a0d3ec079f569c47af21d8cafe46e65f5784cd5b" +SRC_URI = "git://github.com/Intel-BMC/node-manager;protocol=ssh" +SRCREV = "13c62849bce28161fc58134c52920e0c494745f9" PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/multi-node-manager/multi-node-manager.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/multi-node-manager/multi-node-manager.bb index 177f5c98f..620a2ab51 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/multi-node-manager/multi-node-manager.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/multi-node-manager/multi-node-manager.bb @@ -1,7 +1,7 @@ SUMMARY = "Multi node manager" DESCRIPTION = "Daemon to handle chassis level shared resources on multi-node platform" -SRC_URI = "git://git@github.com/Intel-BMC/multi-node-manager.git;protocol=ssh" +SRC_URI = "git://github.com/Intel-BMC/multi-node-manager.git;protocol=ssh" SRCREV = "34d959285a3ca12c4bfefa4040d82d571c78843b" PV = "0.1+git${SRCPV}" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/phosphor-u-boot-mgr/phosphor-u-boot-mgr_git.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/phosphor-u-boot-mgr/phosphor-u-boot-mgr_git.bb index 78b6dd2bd..d89b30380 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/phosphor-u-boot-mgr/phosphor-u-boot-mgr_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/phosphor-u-boot-mgr/phosphor-u-boot-mgr_git.bb @@ -8,9 +8,9 @@ S = "${WORKDIR}/git/phosphor-u-boot-env-mgr" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -SRC_URI = "git://git@github.com/Intel-BMC/provingground.git;protocol=ssh" +SRC_URI = "git://github.com/Intel-BMC/provingground.git;protocol=ssh" -SRCREV = "e1dbcef575309efeb04d275565a6e9649f3b89dd" +SRCREV = "eddf621897090ba346b1aaa81a4b8be12076ab60" inherit cmake systemd SYSTEMD_SERVICE_${PN} = "xyz.openbmc_project.U_Boot.Environment.Manager.service" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/preinit-mounts/preinit-mounts/init b/meta-openbmc-mods/meta-common/recipes-phosphor/preinit-mounts/preinit-mounts/init index 9de00fd2f..0e38f3aeb 100755 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/preinit-mounts/preinit-mounts/init +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/preinit-mounts/preinit-mounts/init @@ -45,14 +45,21 @@ fi # list of things that need to be rw at boot NV_OVERLAYS="/etc /var /home" -# place to mount the real ubifs backing store +# place to mount the overlay backing store +OVERLAY_MNT=/tmp/.overlay +OVERLAY_SIZE=16384 +# place to mount NV RWFS_MNT=/tmp/.rwfs +# NV overlay storage +OVERLAY_SYNC=${RWFS_MNT}/.overlay if grep -q "$RWFS_MNT" /proc/mounts; then # quit - we have already run exit 0 fi -mkdir -p "$RWFS_MNT" +mkdir -p "$OVERLAY_MNT" +# TODO: remount the overlay with a size limit? +# mount -t tmpfs -o rw,size=${OVERLAY_SIZE} oltmp ${OVERLAY_MNT} mtd_by_name() { local name="$1" @@ -73,10 +80,10 @@ NV_MTD_NUM="$(mtdnum_by_name ${NV_MTD})" nvrw() { local p="$1" # Clear the work dir doing overlay mount - rm -rf "${RWFS_MNT}${p}.work" - mkdir -p "${RWFS_MNT}${p}" "${RWFS_MNT}${p}.work" - local mname=$(echo "rwnv${p}" | sed 's,/,,g') - local opts="lowerdir=${p},upperdir=${RWFS_MNT}${p},workdir=${RWFS_MNT}${p}.work,sync" + rm -rf "${OVERLAY_MNT}${p}.work" + mkdir -p "${OVERLAY_MNT}${p}" "${OVERLAY_MNT}${p}.work" + local mname=$(echo "ol${p}" | sed 's,/,,g') + local opts="lowerdir=${p},upperdir=${OVERLAY_MNT}${p},workdir=${OVERLAY_MNT}${p}.work,sync" mount -t overlay -o "$opts" "$mname" "$p" } @@ -84,19 +91,19 @@ targeted_clean() { log "restore-defaults: targeted_clean" # Do not delete FRU info, ssh/ssl certs, or machine-id ( - cd "${RWFS_MNT}/etc" + cd "${OVERLAY_SYNC}/etc" find . ! -regex '.*\(/ssl\|/dropbear\|/machine-id\(_bkup\)\?\|/fru\).*' -exec rm -rf {} + ) # nothing should be in the workdir, but clear it just in case - rm -rf "${RWFS_MNT}/etc.work" + rm -rf "${OVERLAY_SYNC}/etc.work" # clean everything out of /home - rm -rf "${RWFS_MNT}/home" "${RWFS_MNT}/home.work" + rm -rf "${OVERLAY_SYNC}/home" "${OVERLAY_SYNC}/home.work" # clean everything out of /var - rm -rf "${RWFS_MNT}/var" "${RWFS_MNT}/var.work" + rm -rf "${OVERLAY_SYNC}/var" "${OVERLAY_SYNC}/var.work" - echo "Files remaining: $(find $RWFS_MNT/)" + echo "Files remaining: $(find $OVERLAY_SYNC/)" sync } @@ -104,7 +111,7 @@ full_clean() { log "restore-defaults: full_clean" local OVL='' for OVL in $NV_OVERLAYS; do - rm -rf "${RWFS_MNT}${OVL}" "${RWFS_MNT}${OVL}.work" + rm -rf "${OVERLAY_SYNC}${OVL}" "${OVERLAY_SYNC}${OVL}.work" done sync } @@ -153,7 +160,8 @@ clear_ubenv() { flash_erase /dev/mtd/u-boot-env 0 0 } -# mount a UBIFS on the UBI volume +# mount NV filesystem +mkdir -p "$RWFS_MNT" prepare_ubi_volume $NV_MTD_NUM mount -t ubifs -o sync "/dev/ubi${NV_MTD_NUM}_0" "$RWFS_MNT" if [ $? -ne 0 ]; then @@ -178,21 +186,14 @@ elif [ $restore_op -eq 3 ]; then fi rm -f $RESTORE_FLAG +# Restore the overlay saved in the sync +rsync -a --delete "${OVERLAY_SYNC}/" "${OVERLAY_MNT}" +log "Restored overlay from sync location" + for FS in $NV_OVERLAYS; do nvrw "$FS" done -# at first boot, fix up /var/volatile/{log,tmp} to be RW (due to yocto nonsense) -if [ -L /var/log ]; then - # remove symlink /var/log -> volatile/log; make /var/log non-volatile - rm /var/log - mkdir -p /var/log - # remove symlink /var/tmp -> volatile/tmp; symlink to /tmp/var - rm /var/tmp - ln -s /tmp/var /var/tmp -fi -mkdir -p /tmp/var - # work around bug where /etc/machine-id will be mounted with a temporary file # if rootfs is read-only and the file is empty MACHINE_ID=/etc/machine-id @@ -205,9 +206,9 @@ if [ ! -s "$MACHINE_ID" ]; then # work around - Bug: Overlay fs fails for machine-id due to # origin mismatch. Clean it up, from overlay fs before re-creating # the same. - if [ -e "$RWFS_MNT$MACHINE_ID" ]; then + if [ -e "$OVERLAY_MNT$MACHINE_ID" ]; then umount "/etc" - rm -f "$RWFS_MNT$MACHINE_ID" + rm -f "$OVERLAY_MNT$MACHINE_ID" nvrw "/etc" # Restore the machine-id from backup, else generate it. if [ -s "${MACHINE_ID}_bkup" ]; then @@ -237,6 +238,6 @@ if ! grep -q sofs /proc/mounts; then fi fi -log "Finished mounting non-volatile overlays" +log "Finished mounting nv and overlays" exec /lib/systemd/systemd diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/prov-mode-mgr/prov-mode-mgr_git.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/prov-mode-mgr/prov-mode-mgr_git.bb index 94f0f8729..0b5a8f395 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/prov-mode-mgr/prov-mode-mgr_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/prov-mode-mgr/prov-mode-mgr_git.bb @@ -8,9 +8,9 @@ S = "${WORKDIR}/git/prov-mode-mgr" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -SRC_URI = "git://git@github.com/Intel-BMC/provingground.git;protocol=ssh" +SRC_URI = "git://github.com/Intel-BMC/provingground.git;protocol=ssh" -SRCREV = "e1dbcef575309efeb04d275565a6e9649f3b89dd" +SRCREV = "eddf621897090ba346b1aaa81a4b8be12076ab60" inherit cmake systemd SYSTEMD_SERVICE_${PN} = "xyz.openbmc_project.RestrictionMode.Manager.service" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/security-manager/security-manager_git.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/security-manager/security-manager_git.bb index 84e3f6c2b..6e1df2f89 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/security-manager/security-manager_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/security-manager/security-manager_git.bb @@ -9,8 +9,8 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${INTELBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" inherit cmake systemd -SRC_URI = "git://git@github.com/Intel-BMC/provingground.git;protocol=ssh" -SRCREV = "e1dbcef575309efeb04d275565a6e9649f3b89dd" +SRC_URI = "git://github.com/Intel-BMC/provingground.git;protocol=ssh" +SRCREV = "eddf621897090ba346b1aaa81a4b8be12076ab60" SYSTEMD_SERVICE_${PN} += "xyz.openbmc_project.SecurityManager.service" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/selftest/intel-self-test_git.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/selftest/intel-self-test_git.bb index da1d74207..f655d22e4 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/selftest/intel-self-test_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/selftest/intel-self-test_git.bb @@ -1,7 +1,7 @@ SUMMARY = "BMC Self Test service" DESCRIPTION = "BMC Self Test service for subsystem diagnosis failure info" -SRC_URI = "git://git@github.com/Intel-BMC/intel-self-test;protocol=ssh" +SRC_URI = "git://github.com/Intel-BMC/intel-self-test;protocol=ssh" PV = "1.0+git${SRCPV}" SRCREV = "d039998ad2c55aeae4191af30e15bbd3032508c1" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors_%.bbappend index 7da1cdc4d..f0bec9feb 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors_%.bbappend @@ -1,4 +1,4 @@ -SRCREV = "2424cb7c9752cbecc3d133a67cf1c20f8589f2c1" +SRCREV = "9f9b38d89a751e70cdf61bfb3f78c05800201f95" SRC_URI = "git://github.com/openbmc/dbus-sensors.git" DEPENDS_append = " libgpiod" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/settings/settings_git.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/settings/settings_git.bb index b8e3aa8e5..f8fe0682d 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/settings/settings_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/settings/settings_git.bb @@ -1,13 +1,13 @@ SUMMARY = "Settings" -SRC_URI = "git://git@github.com/Intel-BMC/provingground.git;protocol=ssh" -SRCREV = "e1dbcef575309efeb04d275565a6e9649f3b89dd" +SRC_URI = "git://github.com/Intel-BMC/provingground.git;protocol=ssh" +SRCREV = "eddf621897090ba346b1aaa81a4b8be12076ab60" PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${INTELBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" -SYSTEMD_SERVICE_${PN} = "settings.service" +SYSTEMD_SERVICE_${PN} = "xyz.openbmc_project.Settings.service" DEPENDS = "boost \ nlohmann-json \ diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/special-mode-mgr/special-mode-mgr_git.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/special-mode-mgr/special-mode-mgr_git.bb index 9b339d260..a6f5a433e 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/special-mode-mgr/special-mode-mgr_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/special-mode-mgr/special-mode-mgr_git.bb @@ -8,8 +8,8 @@ S = "${WORKDIR}/git/special-mode-mgr" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -SRC_URI = "git://git@github.com/Intel-BMC/provingground.git;protocol=ssh" -SRCREV = "e1dbcef575309efeb04d275565a6e9649f3b89dd" +SRC_URI = "git://github.com/Intel-BMC/provingground.git;protocol=ssh" +SRCREV = "eddf621897090ba346b1aaa81a4b8be12076ab60" EXTRA_OECMAKE += "${@bb.utils.contains('EXTRA_IMAGE_FEATURES', 'validation-unsecure', '-DBMC_VALIDATION_UNSECURE_FEATURE=ON', '', d)}" inherit cmake systemd diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/srvcfg-manager/srvcfg-manager_git.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/srvcfg-manager/srvcfg-manager_git.bb index 47202253a..05f97d1a9 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/srvcfg-manager/srvcfg-manager_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/srvcfg-manager/srvcfg-manager_git.bb @@ -8,8 +8,8 @@ S = "${WORKDIR}/git/srvcfg-manager" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -SRC_URI = "git://git@github.com/Intel-BMC/provingground.git;protocol=ssh" -SRCREV = "e1dbcef575309efeb04d275565a6e9649f3b89dd" +SRC_URI = "git://github.com/Intel-BMC/provingground.git;protocol=ssh" +SRCREV = "eddf621897090ba346b1aaa81a4b8be12076ab60" inherit cmake systemd SYSTEMD_SERVICE_${PN} = "srvcfg-manager.service" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/system/callback-manager.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/system/callback-manager.bb index 1ef186e3a..433bc7ca5 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/system/callback-manager.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/system/callback-manager.bb @@ -1,13 +1,13 @@ SUMMARY = "Callback Manager" DESCRIPTION = "D-Bus daemon that registers matches that trigger method calls" -SRC_URI = "git://git@github.com/Intel-BMC/provingground;protocol=ssh" +SRC_URI = "git://github.com/Intel-BMC/provingground;protocol=ssh" inherit cmake systemd DEPENDS = "boost sdbusplus" PV = "0.1+git${SRCPV}" -SRCREV = "e1dbcef575309efeb04d275565a6e9649f3b89dd" +SRCREV = "eddf621897090ba346b1aaa81a4b8be12076ab60" S = "${WORKDIR}/git/callback-manager" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/virtual-media/virtual-media.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/virtual-media/virtual-media.bb index a2c271885..ca86bd525 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/virtual-media/virtual-media.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/virtual-media/virtual-media.bb @@ -1,8 +1,8 @@ SUMMARY = "Virtual Media Service" DESCRIPTION = "Virtual Media Service" -SRC_URI = "git://git@github.com/Intel-BMC/provingground.git;protocol=ssh" -SRCREV = "e1dbcef575309efeb04d275565a6e9649f3b89dd" +SRC_URI = "git://github.com/Intel-BMC/provingground.git;protocol=ssh" +SRCREV = "eddf621897090ba346b1aaa81a4b8be12076ab60" S = "${WORKDIR}/git/virtual-media/" PV = "1.0+git${SRCPV}" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend index 2da438914..e77d8fd65 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend @@ -1,2 +1,2 @@ -SRC_URI = "git://git@github.com/Intel-BMC/phosphor-webui;protocol=ssh;branch=intel2" -SRCREV = "b26d415f38684f86e19e09a8073f9d4244adcb97" +SRC_URI = "git://github.com/Intel-BMC/phosphor-webui;protocol=ssh;branch=intel2" +SRCREV = "f9935eccf5b9de75d6622b3d0a719ce0f8a425d0" diff --git a/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb b/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb index e31fc6bb8..a818a961f 100644 --- a/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb +++ b/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb @@ -22,6 +22,7 @@ EXTRA_OECONF += "--arch=${TARGET_ARCH} \ --disable-hdhomerun_static \ --disable-ffmpeg_static \ --disable-libav \ + --python=python3 \ " CLEANBROKEN = "1" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2/python3.patch b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2/python3.patch new file mode 100644 index 000000000..df208cf87 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2/python3.patch @@ -0,0 +1,12 @@ +Use Python 3 instead of Python 2. + +Upstream-Status: Pending +Signed-off-by: Ross Burton <ross.burton@intel.com> + +diff --git a/waf b/waf +index 6ce2a24..de3c898 100755 +--- a/waf ++++ b/waf +@@ -1 +1 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 diff --git a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb index d590b0501..50b553c80 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb @@ -10,12 +10,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ DEPENDS = "libpng jpeg udev" -PV = "20190205+${SRCPV}" +PV = "20190904+${SRCPV}" COMPATIBLE_HOST_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '.*-linux*', 'null', d)}" -SRC_URI = "git://github.com/glmark2/glmark2.git;protocol=https" -SRCREV = "c17fd14505f30d9e4dbad276f7aa956fd21a637b" +SRC_URI = "git://github.com/glmark2/glmark2.git;protocol=https \ + file://python3.patch" +SRCREV = "24a1139dcbfd86bd02065316eaa90559e39374e1" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/gattlib/files/dbus-avoid-strange-chars-from-the-build-dir.patch b/meta-openembedded/meta-oe/recipes-connectivity/gattlib/files/dbus-avoid-strange-chars-from-the-build-dir.patch new file mode 100644 index 000000000..96e4f8d6f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/gattlib/files/dbus-avoid-strange-chars-from-the-build-dir.patch @@ -0,0 +1,70 @@ +From 87df05c3f83c563af76ab00567e7a1ab7a6ebc88 Mon Sep 17 00:00:00 2001 +From: Peter Rosin <peda@axentia.se> +Date: Sat, 9 Nov 2019 15:42:03 +0100 +Subject: [PATCH] dbus: avoid 'strange' chars from the build dir in #defines + +gdbus-codegen uses include guards with the full path dir, and if there +are "bad" characters, such as '+', this fails miserably. E.g. Yocto has a +tendency to build in directories named from the Yocto package version and +that package version containing a '+' are not uncommon, and even the +standard in certain scenarios such as when using ${SRCPV}. + +Avoid the problem of the full path "leaking" into the source by avoiding +the normal include guards and request "#pragma once" instead. + +Signed-off-by: Peter Rosin <peda@axentia.se> +--- + dbus/CMakeLists.txt | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/dbus/CMakeLists.txt b/dbus/CMakeLists.txt +index f5096ce10ecd..013c32239e12 100644 +--- a/dbus/CMakeLists.txt ++++ b/dbus/CMakeLists.txt +@@ -43,37 +43,37 @@ else() + endif() + + add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/org-bluez-adaptater1.c +- COMMAND gdbus-codegen --interface-prefix org.bluez.Adapter1. --generate-c-code ${CMAKE_CURRENT_BINARY_DIR}/org-bluez-adaptater1 ${CMAKE_CURRENT_SOURCE_DIR}/${DBUS_BLUEZ_API}/org.bluez.Adapter1.xml ++ COMMAND gdbus-codegen --pragma-once --interface-prefix org.bluez.Adapter1. --generate-c-code ${CMAKE_CURRENT_BINARY_DIR}/org-bluez-adaptater1 ${CMAKE_CURRENT_SOURCE_DIR}/${DBUS_BLUEZ_API}/org.bluez.Adapter1.xml + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${DBUS_BLUEZ_API}/org.bluez.Adapter1.xml + COMMENT "Generate D-Bus 'org.bluez.Adapter1.xml'" + ) + + add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/org-bluez-device1.c +- COMMAND gdbus-codegen --interface-prefix org.bluez.Device1. --generate-c-code ${CMAKE_CURRENT_BINARY_DIR}/org-bluez-device1 ${CMAKE_CURRENT_SOURCE_DIR}/${DBUS_BLUEZ_API}/org.bluez.Device1.xml ++ COMMAND gdbus-codegen --pragma-once --interface-prefix org.bluez.Device1. --generate-c-code ${CMAKE_CURRENT_BINARY_DIR}/org-bluez-device1 ${CMAKE_CURRENT_SOURCE_DIR}/${DBUS_BLUEZ_API}/org.bluez.Device1.xml + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${DBUS_BLUEZ_API}/org.bluez.Device1.xml + COMMENT "Generate D-Bus 'org.bluez.Device1.xml'" + ) + + add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/org-bluez-gattservice1.c +- COMMAND gdbus-codegen --interface-prefix org.bluez.GattService1. --generate-c-code ${CMAKE_CURRENT_BINARY_DIR}/org-bluez-gattservice1 ${CMAKE_CURRENT_SOURCE_DIR}/${DBUS_BLUEZ_API}/org.bluez.GattService1.xml ++ COMMAND gdbus-codegen --pragma-once --interface-prefix org.bluez.GattService1. --generate-c-code ${CMAKE_CURRENT_BINARY_DIR}/org-bluez-gattservice1 ${CMAKE_CURRENT_SOURCE_DIR}/${DBUS_BLUEZ_API}/org.bluez.GattService1.xml + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${DBUS_BLUEZ_API}/org.bluez.GattService1.xml + COMMENT "Generate D-Bus 'org.bluez.GattService1.xml'" + ) + + add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/org-bluez-gattcharacteristic1.c +- COMMAND gdbus-codegen --interface-prefix org.bluez.Characteristic1. --generate-c-code ${CMAKE_CURRENT_BINARY_DIR}/org-bluez-gattcharacteristic1 ${CMAKE_CURRENT_SOURCE_DIR}/${DBUS_BLUEZ_API}/org.bluez.GattCharacteristic1.xml ++ COMMAND gdbus-codegen --pragma-once --interface-prefix org.bluez.Characteristic1. --generate-c-code ${CMAKE_CURRENT_BINARY_DIR}/org-bluez-gattcharacteristic1 ${CMAKE_CURRENT_SOURCE_DIR}/${DBUS_BLUEZ_API}/org.bluez.GattCharacteristic1.xml + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${DBUS_BLUEZ_API}/org.bluez.GattCharacteristic1.xml + COMMENT "Generate D-Bus 'org.bluez.GattCharacteristic1.xml'" + ) + + add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/org-bluez-gattdescriptor1.c +- COMMAND gdbus-codegen --interface-prefix org.bluez.Descriptor1. --generate-c-code ${CMAKE_CURRENT_BINARY_DIR}/org-bluez-gattdescriptor1 ${CMAKE_CURRENT_SOURCE_DIR}/${DBUS_BLUEZ_API}/org.bluez.GattDescriptor1.xml ++ COMMAND gdbus-codegen --pragma-once --interface-prefix org.bluez.Descriptor1. --generate-c-code ${CMAKE_CURRENT_BINARY_DIR}/org-bluez-gattdescriptor1 ${CMAKE_CURRENT_SOURCE_DIR}/${DBUS_BLUEZ_API}/org.bluez.GattDescriptor1.xml + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${DBUS_BLUEZ_API}/org.bluez.GattDescriptor1.xml + COMMENT "Generate D-Bus 'org.bluez.GattDescriptor1.xml'" + ) + + add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/org-bluez-battery1.c +- COMMAND gdbus-codegen --interface-prefix org.bluez.Battery1. --generate-c-code ${CMAKE_CURRENT_BINARY_DIR}/org-bluez-battery1 ${CMAKE_CURRENT_SOURCE_DIR}/${DBUS_BLUEZ_API}/org.bluez.Battery1.xml ++ COMMAND gdbus-codegen --pragma-once --interface-prefix org.bluez.Battery1. --generate-c-code ${CMAKE_CURRENT_BINARY_DIR}/org-bluez-battery1 ${CMAKE_CURRENT_SOURCE_DIR}/${DBUS_BLUEZ_API}/org.bluez.Battery1.xml + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${DBUS_BLUEZ_API}/org.bluez.Battery1.xml + COMMENT "Generate D-Bus 'org.bluez.Battery1.xml'" + ) +-- +2.11.0 + diff --git a/meta-openembedded/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb new file mode 100644 index 000000000..0e6fce9c9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "Bluetooth library with attribute support" +SECTION = "libs/network" + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://CMakeLists.txt;beginline=1;endline=20;md5=8d5efeb9189b60866baff80ff791bf00" + +DEPENDS = "bluez5 glib-2.0" +DEPENDS += "glib-2.0-native" + +PV = "0.2+git${SRCPV}" + +SRC_URI = "git://github.com/labapart/gattlib.git" +SRC_URI += "file://dbus-avoid-strange-chars-from-the-build-dir.patch" + +SRCBRANCH = "master" +SRCREV = "c6a33252221dff904cf277e085e2ce70aced8788" + +S = "${WORKDIR}/git" + +PACKAGECONFIG[examples] = "-DGATTLIB_BUILD_EXAMPLES=ON,-DGATTLIB_BUILD_EXAMPLES=OFF" + +# Set this to force use of DBus API if Bluez version is older than 5.42 +PACKAGECONFIG[force-dbus] = "-DGATTLIB_FORCE_DBUS=TRUE,-DGATTLIB_FORCE_DBUS=FALSE" + +EXTRA_OECMAKE += "-DGATTLIB_BUILD_DOCS=OFF" + +inherit pkgconfig cmake + +FILES_${PN} = "${libdir}/* ${includedir}/*" +FILES_${PN}-dev = "${includedir}/*" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.20.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.20.2.bb index 17d784766..2c4a59f7f 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.20.0.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.20.2.bb @@ -14,5 +14,5 @@ inherit autotools pkgconfig bash-completion SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz \ file://clang.patch \ " -SRC_URI[md5sum] = "b5506db07fb2a0b118e0d6e59b3d5b8f" -SRC_URI[sha256sum] = "2cf7c6c7aa9e962a589f61bff2766035b61792ef961131a21fcbbe043f91a866" +SRC_URI[md5sum] = "988a6a7fd4a2f4e08c098992180e5b02" +SRC_URI[sha256sum] = "550fb69e5e57f7646f8eb9ed8d24e44ea869ad846be9c162893f12e43528059b" diff --git a/meta-openembedded/meta-oe/recipes-core/emlog/emlog.inc b/meta-openembedded/meta-oe/recipes-core/emlog/emlog.inc new file mode 100644 index 000000000..9a0f9ba92 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/emlog/emlog.inc @@ -0,0 +1,13 @@ +DESCRIPTION = "emlog is a Linux kernel module that makes it easy to access the \ +most recent (and only the most recent) output from a process" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +SRC_URI = "git://github.com/nicupavel/emlog.git;protocol=http" +SRCREV = "aee53e8dee862f35291242ba41b0ca88010f6c71" + +S = "${WORKDIR}/git" + +EXTRA_OEMAKE += " \ + CFLAGS='${TARGET_CFLAGS}' \ +" diff --git a/meta-openembedded/meta-oe/recipes-core/emlog/emlog/Drop-use-of-error-h.patch b/meta-openembedded/meta-oe/recipes-core/emlog/emlog/Drop-use-of-error-h.patch new file mode 100644 index 000000000..6bfc44cb8 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/emlog/emlog/Drop-use-of-error-h.patch @@ -0,0 +1,113 @@ +From 41de28a92297f4cb0c5a8d7356cde9190176947b Mon Sep 17 00:00:00 2001 +From: Fabio Berton <fabio.berton@ossystems.com.br> +Date: Thu, 14 Mar 2019 19:54:27 -0300 +Subject: [PATCH] Drop use of error.h +Organization: O.S. Systems Software LTDA. + +The error.h does not work with musl and this project being embedded +friendly it makes sense to avoid glibc-specific code. + +Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> +Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> +--- + mkemlog.c | 29 ++++++++++++++--------------- + 1 file changed, 14 insertions(+), 15 deletions(-) + +diff --git a/mkemlog.c b/mkemlog.c +index e3354ed..7bcdfce 100644 +--- a/mkemlog.c ++++ b/mkemlog.c +@@ -21,7 +21,6 @@ + #include <unistd.h> + #include <fcntl.h> + #include <stdlib.h> +-#include <error.h> + #include <errno.h> + + #define EMLOG_DEVICE "/dev/emlog" +@@ -40,16 +39,16 @@ int main(int argc, char** argv) { + FILE *max_size_file = NULL; + uid_t uid = -1; + if (argc < 2 || argc > 5) { +- error(1 ,0, USAGE); ++ fprintf(stderr, USAGE); + } + file = argv[1]; + + max_size_file = fopen("/sys/module/emlog/parameters/emlog_max_size", "r"); + if (max_size_file == NULL) +- error(1, errno, "Emlog module not loaded\n"); ++ fprintf(stderr, "Emlog module not loaded\n"); + rc = fscanf(max_size_file, "%d", &emlog_max_size); + if (rc != 1) +- error(1, errno, "Unable to get emlog max size\n"); ++ fprintf(stderr, "Unable to get emlog max size\n"); + fclose(max_size_file); + max_size_file = NULL; + if (argc > 2 ) { +@@ -57,13 +56,13 @@ int main(int argc, char** argv) { + number = argv[2]; + size_of_buffer = strtol(number, &end_of_number, 10); + if (errno) { +- error(1, errno, "Invalid size provided\n" USAGE); ++ fprintf(stderr, "Invalid size provided\n" USAGE); + } + if (end_of_number == number) { +- error(1, 0, "Invalid size provided\n" USAGE); ++ fprintf(stderr, "Invalid size provided\n" USAGE); + } + if (size_of_buffer < 1 || size_of_buffer > emlog_max_size) { +- error(1, 0, "Invalid size provided must be a value between 1 and %d\n" USAGE, emlog_max_size); ++ fprintf(stderr, "Invalid size provided must be a value between 1 and %d\n" USAGE, emlog_max_size); + } + } + if (argc > 3 ) { +@@ -71,10 +70,10 @@ int main(int argc, char** argv) { + number = argv[3]; + mode = strtol(number, &end_of_number, 8); + if (errno) { +- error(1, errno, "Invalid mode provided\n" USAGE); ++ fprintf(stderr, "Invalid mode provided\n" USAGE); + } + if (end_of_number == number || S_IFMT & mode) { +- error(1, 0, "Invalid mode provided\n" USAGE); ++ fprintf(stderr, "Invalid mode provided\n" USAGE); + } + } + if (argc > 4 ) { +@@ -82,27 +81,27 @@ int main(int argc, char** argv) { + number = argv[4]; + uid = strtol(number, &end_of_number, 10); + if (errno) { +- error(1, errno, "Invalid uid provided\n" USAGE); ++ fprintf(stderr, "Invalid uid provided\n" USAGE); + } + if (end_of_number == number) { +- error(1, 0, "Invalid uid provided\n" USAGE); ++ fprintf(stderr, "Invalid uid provided\n" USAGE); + } + } + rc = stat(EMLOG_DEVICE, &emlog_stat); + if (rc == -1) { +- error(1, errno, "stat: " EMLOG_DEVICE); ++ fprintf(stderr, "stat: " EMLOG_DEVICE); + } + if (!S_ISCHR(emlog_stat.st_mode)) { +- error(1, 0, EMLOG_DEVICE " is not a valid emlog device\n"); ++ fprintf(stderr, EMLOG_DEVICE " is not a valid emlog device\n"); + } + rc = mknod(file, mode | S_IFCHR, makedev(major(emlog_stat.st_rdev),size_of_buffer)); + if (rc == -1) { +- error(1, errno, "mknod: %s", file); ++ fprintf(stderr, "mknod: %s", file); + } + if (uid != -1) { + rc = chown(file, uid, -1); + if (rc == -1) { +- error(1, errno, "chown: %s", file); ++ fprintf(stderr, "chown: %s", file); + } + } + printf("Log device %s created with buffer size of %d KiB\n", file, size_of_buffer); +-- +2.20.1 diff --git a/meta-openembedded/meta-oe/recipes-core/emlog/emlog/emlog.initd b/meta-openembedded/meta-oe/recipes-core/emlog/emlog/emlog.initd new file mode 100644 index 000000000..361cf8029 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/emlog/emlog/emlog.initd @@ -0,0 +1,25 @@ +#!/bin/sh +PATH=/sbin:/usr/sbin:/bin:/usr/bin + +[ -r /etc/default/emlog ] && . /etc/default/emlog + +do_start() { + : +} + +do_stop() { + nbcat /dev/emlog > /data/emlog +} + +case "$1" in + start) + do_start || exit $? + ;; + stop) + do_stop || exit $? + ;; + *) + echo "Usage: $0 {stop}" >&2 + exit 3 + ;; +esac diff --git a/meta-openembedded/meta-oe/recipes-core/emlog/emlog_git.bb b/meta-openembedded/meta-oe/recipes-core/emlog/emlog_git.bb new file mode 100644 index 000000000..63d12477b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/emlog/emlog_git.bb @@ -0,0 +1,22 @@ +require ${BPN}.inc + +SRC_URI += "file://${BPN}.initd" + +SRC_URI_append_libc-musl = " file://Drop-use-of-error-h.patch" + +inherit update-rc.d + +INITSCRIPT_NAME = "${BPN}" + +do_compile() { + oe_runmake nbcat + oe_runmake mkemlog +} + +do_install() { + install -Dm 0755 ${WORKDIR}/${BPN}.initd ${D}${sysconfdir}/init.d/${BPN} + install -Dm 0755 ${S}/nbcat ${D}${bindir}/nbcat + install -Dm 0755 ${S}/mkemlog ${D}${bindir}/mkemlog +} + +RDEPENDS_${PN} += "kernel-module-emlog" diff --git a/meta-openembedded/meta-oe/recipes-core/emlog/kernel-module-emlog_git.bb b/meta-openembedded/meta-oe/recipes-core/emlog/kernel-module-emlog_git.bb new file mode 100644 index 000000000..51f7226eb --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/emlog/kernel-module-emlog_git.bb @@ -0,0 +1,12 @@ +require emlog.inc + +inherit module + +EXTRA_OEMAKE += " \ + KDIR=${STAGING_KERNEL_DIR} \ + KVER=${KERNEL_VERSION} \ +" + +do_compile() { + oe_runmake modules +} diff --git a/meta-openembedded/meta-oe/recipes-core/mdbus2/mdbus2_git.bb b/meta-openembedded/meta-oe/recipes-core/mdbus2/mdbus2_git.bb new file mode 100644 index 000000000..82f2cf8c9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/mdbus2/mdbus2_git.bb @@ -0,0 +1,16 @@ +SUMMARY = "Mickey's DBus Introspection and Interaction Utility V2" +LICENSE = "GPL-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=ebb5c50ab7cab4baeffba14977030c07" + +DEPENDS = "readline" + +PV = "2.3.3+git${SRCPV}" + +SRC_URI = "git://github.com/freesmartphone/mdbus.git;protocol=http" +SRCREV = "28202692d0b441000f4ddb8f347f72d1355021aa" + +S = "${WORKDIR}/git" + +inherit autotools vala + +EXTRA_OECONF += "--enable-vala" diff --git a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 1f0a7b947..310de5372 100644 --- a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -257,7 +257,7 @@ RDEPENDS_packagegroup-meta-oe-support ="\ " RDEPENDS_packagegroup-meta-oe-support_remove_arm ="numactl" -RDEPENDS_packagegroup-meta-oe-support_remove_mipsarch_libc-glibc = "gperftools" +RDEPENDS_packagegroup-meta-oe-support_remove_mipsarch = "gperftools" RDEPENDS_packagegroup-meta-oe-support-egl ="\ freerdp libnice opencv \ diff --git a/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb/0001-Makefile-Fix-parallel-build.patch b/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb/0001-Makefile-Fix-parallel-build.patch deleted file mode 100644 index 3135d4d5a..000000000 --- a/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb/0001-Makefile-Fix-parallel-build.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c85978e77725ef233543370d24e23f853f449170 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 21 Sep 2017 17:47:02 -0700 -Subject: [PATCH] Makefile: Fix parallel build - -Sometimes mkdir $(SHARED_OUTDIR)/db races with compiler which is -creating .o file in the same directory $(SHARED_OUTDIR)/db/db_bench.o - -Fixes error like - -| mkdir out-static -| mkdir out-shared/db -| Assembler messages: -| Fatal error: can't create out-shared/db/db_bench.o: No such file or directory - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted - - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index f7cc7d7..51a0bcd 100644 ---- a/Makefile -+++ b/Makefile -@@ -386,6 +386,7 @@ $(STATIC_OUTDIR)/write_batch_test:db/write_batch_test.cc $(STATIC_LIBOBJECTS) $( - $(STATIC_OUTDIR)/memenv_test:$(STATIC_OUTDIR)/helpers/memenv/memenv_test.o $(STATIC_OUTDIR)/libmemenv.a $(STATIC_OUTDIR)/libleveldb.a $(TESTHARNESS) - $(XCRUN) $(CXX) $(LDFLAGS) $(STATIC_OUTDIR)/helpers/memenv/memenv_test.o $(STATIC_OUTDIR)/libmemenv.a $(STATIC_OUTDIR)/libleveldb.a $(TESTHARNESS) -o $@ $(LIBS) - -+$(SHARED_OUTDIR)/db/db_bench.o: | $(SHARED_OUTDIR)/db - $(SHARED_OUTDIR)/db_bench:$(SHARED_OUTDIR)/db/db_bench.o $(SHARED_LIBS) $(TESTUTIL) - $(XCRUN) $(CXX) $(LDFLAGS) $(CXXFLAGS) $(PLATFORM_SHARED_CFLAGS) $(SHARED_OUTDIR)/db/db_bench.o $(TESTUTIL) $(SHARED_OUTDIR)/$(SHARED_LIB3) -o $@ $(LIBS) - diff --git a/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb/0001-build_detect_platform-Check-for-__SSE4_2__.patch b/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb/0001-build_detect_platform-Check-for-__SSE4_2__.patch deleted file mode 100644 index 8f93cb325..000000000 --- a/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb/0001-build_detect_platform-Check-for-__SSE4_2__.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 5fd0918df2bb30e8f3edb2ee895d178edbf26f40 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 4 Sep 2017 22:38:03 -0700 -Subject: [PATCH 1/2] build_detect_platform: Check for __SSE4_2__ - -just using -msse4.2 is not enough, especially with clang -where it may accept -msse4.2 even during cross compiling -for say arm, however the difference is that builtin defines -wont be defined. - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - build_detect_platform | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -Index: git/build_detect_platform -=================================================================== ---- git.orig/build_detect_platform -+++ git/build_detect_platform -@@ -224,13 +224,13 @@ EOF - rm -f $CXXOUTPUT 2>/dev/null - - # Test if gcc SSE 4.2 is supported -- $CXX $CXXFLAGS -x c++ - -o $CXXOUTPUT -msse4.2 2>/dev/null <<EOF -+ $CXX $CXXFLAGS -Werror -x c++ - -o $CXXOUTPUT -msse4.2 -dD -E 2>/dev/null <<EOF - int main() {} - EOF -+ eval fgrep __SSE4_2__ $CXXOUTPUT >/dev/null 2>&1 - if [ "$?" = 0 ]; then - PLATFORM_SSEFLAGS="-msse4.2" - fi -- - rm -f $CXXOUTPUT 2>/dev/null - fi - diff --git a/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb/0002-makefile-build-SHARED_MEMENVLIB.patch b/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb/0002-makefile-build-SHARED_MEMENVLIB.patch deleted file mode 100644 index fc708b23a..000000000 --- a/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb/0002-makefile-build-SHARED_MEMENVLIB.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 1ed8cec1fcf666904bb3ebd29fc85e235b72d122 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 4 Sep 2017 22:40:49 -0700 -Subject: [PATCH 2/2] makefile: build SHARED_MEMENVLIB - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - Makefile | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Makefile b/Makefile -index f7cc7d7..cb42278 100644 ---- a/Makefile -+++ b/Makefile -@@ -126,12 +126,12 @@ SHARED_VERSION_MINOR = 20 - SHARED_LIB1 = libleveldb.$(PLATFORM_SHARED_EXT) - SHARED_LIB2 = $(SHARED_LIB1).$(SHARED_VERSION_MAJOR) - SHARED_LIB3 = $(SHARED_LIB1).$(SHARED_VERSION_MAJOR).$(SHARED_VERSION_MINOR) --SHARED_LIBS = $(SHARED_OUTDIR)/$(SHARED_LIB1) $(SHARED_OUTDIR)/$(SHARED_LIB2) $(SHARED_OUTDIR)/$(SHARED_LIB3) -+SHARED_LIBS = $(SHARED_OUTDIR)/$(SHARED_LIB1) $(SHARED_OUTDIR)/$(SHARED_LIB2) $(SHARED_OUTDIR)/$(SHARED_LIB3) $(SHARED_MEMENVLIB) - $(SHARED_OUTDIR)/$(SHARED_LIB1): $(SHARED_OUTDIR)/$(SHARED_LIB3) - ln -fs $(SHARED_LIB3) $(SHARED_OUTDIR)/$(SHARED_LIB1) - $(SHARED_OUTDIR)/$(SHARED_LIB2): $(SHARED_OUTDIR)/$(SHARED_LIB3) - ln -fs $(SHARED_LIB3) $(SHARED_OUTDIR)/$(SHARED_LIB2) --SHARED_MEMENVLIB = $(SHARED_OUTDIR)/libmemenv.a -+SHARED_MEMENVLIB = $(SHARED_OUTDIR)/libmemenv.$(PLATFORM_SHARED_EXT).$(SHARED_VERSION_MAJOR).$(SHARED_VERSION_MINOR) - endif - - $(SHARED_OUTDIR)/$(SHARED_LIB3): $(SHARED_LIBOBJECTS) -@@ -294,7 +294,7 @@ endif - - $(SHARED_MEMENVLIB):$(SHARED_MEMENVOBJECTS) - rm -f $@ -- $(AR) -rs $@ $(SHARED_MEMENVOBJECTS) -+ $(CXX) $(LDFLAGS) $(PLATFORM_SHARED_LDFLAGS)$(basename $(notdir $(SHARED_MEMENVLIB))) $(SHARED_MEMENVOBJECTS) -o $(SHARED_MEMENVLIB) $(LIBS) - - $(STATIC_OUTDIR)/db_bench:db/db_bench.cc $(STATIC_LIBOBJECTS) $(TESTUTIL) - $(CXX) $(LDFLAGS) $(CXXFLAGS) db/db_bench.cc $(STATIC_LIBOBJECTS) $(TESTUTIL) -o $@ $(LIBS) --- -2.14.1 - diff --git a/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb/run-ptest b/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb/run-ptest new file mode 100644 index 000000000..9ae70c128 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb/run-ptest @@ -0,0 +1,10 @@ +#!/bin/sh + +for test in *_test; do + if ./${test}; then + echo "PASS: ${test}" + else + echo "FAIL: ${test}" + fi +done + diff --git a/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb_1.22.bb b/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb_1.22.bb new file mode 100644 index 000000000..b597ef1ea --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb_1.22.bb @@ -0,0 +1,33 @@ +SUMMARY = "LevelDB is a fast key-value storage library" +DESCRIPTION = "LevelDB is a fast key-value storage library that provides an ordered mapping from string keys to string values" +HOMEPAGE = "https://github.com/google/leveldb" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=92d1b128950b11ba8495b64938fc164d" + +SRC_URI = "git://github.com/google/${BPN}.git \ + file://run-ptest" + +SRCREV = "78b39d68c15ba020c0d60a3906fb66dbf1697595" +S = "${WORKDIR}/git" + +inherit cmake ptest + +PACKAGECONFIG ??= "" +PACKAGECONFIG[benchmarks] = "-DLEVELDB_BUILD_BENCHMARKS=ON,-DLEVELDB_BUILD_BENCHMARKS=OFF,sqlite" +PACKAGECONFIG[snappy] = ",,snappy" +PACKAGECONFIG[tcmalloc] = ",,gperftools" + +EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=ON -DCMAKE_SKIP_RPATH=ON \ + -DLEVELDB_BUILD_TESTS=${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'ON', 'OFF', d)}" + +do_install_append() { + install -D -m 0755 ${B}/leveldbutil ${D}${bindir}/leveldbutil +} + +do_install_ptest() { + install -m 0755 ${B}/*_test ${D}${PTEST_PATH} +} + +# Do not try to build lib32-leveldb for mips64, but allow libn32-leveldb. +# +COMPATIBLE_HOST_mipsarcho32_pn-lib32-leveldb = "null" diff --git a/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb_git.bb b/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb_git.bb deleted file mode 100644 index 908ad3e6b..000000000 --- a/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb_git.bb +++ /dev/null @@ -1,41 +0,0 @@ -SUMMARY = "LevelDB is a fast key-value storage library" -DESCRIPTION = "LevelDB is a fast key-value storage library that provides an ordered mapping from string keys to string values" -HOMEPAGE = "http://leveldb.googlecode.com" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=92d1b128950b11ba8495b64938fc164d" - -SRCREV = "a53934a3ae1244679f812d998a4f16f2c7f309a6" -PV = "1.20+git${SRCPV}" - -SRC_URI = "git://github.com/google/${BPN}.git \ - file://0001-build_detect_platform-Check-for-__SSE4_2__.patch \ - file://0002-makefile-build-SHARED_MEMENVLIB.patch \ - file://0001-Makefile-Fix-parallel-build.patch \ - " - -S = "${WORKDIR}/git" - -inherit utils - -do_compile() { - # do not use oe_runmake. oe_runmake pass to make compilation arguments and override - # leveldb makefile variable CFLAGS and broke leveldb build. - CFLAGS="${CFLAGS}" make ${PARALLEL_MAKE}|| die -} - -do_install() { - install -d ${D}${libdir} ${D}${bindir} ${D}${includedir}/leveldb - oe_libinstall -C ${B}/out-shared libleveldb ${D}${libdir} - oe_libinstall -C ${S}/out-static libleveldb ${D}${libdir} - oe_libinstall -C ${S}/out-static libmemenv ${D}${libdir} - install -m 0755 ${B}/out-shared/db_bench ${D}${bindir} - install -m 0755 ${B}/out-static/*_test ${D}${bindir} - install -m 644 ${S}/include/leveldb/*.h ${D}${includedir}/leveldb/ -} - -PACKAGES =+ "${PN}-ptest" -FILES_${PN}-ptest = "${bindir}" - -# Do not try to build lib32-leveldb for mips64, but allow libn32-leveldb. -# -COMPATIBLE_HOST_mipsarcho32_pn-lib32-leveldb = "null" diff --git a/meta-openembedded/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb b/meta-openembedded/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb index fae80a79e..ec959d27d 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb @@ -11,7 +11,7 @@ HOMEPAGE = "https://gitlab.com/ymorin/kconfig-frontends" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=9b8cf60ff39767ff04b671fca8302408" SECTION = "devel" -DEPENDS += "ncurses flex bison gperf-native bison-native" +DEPENDS += "ncurses flex-native gperf-native bison-native" RDEPENDS_${PN} += "python3 bash" SRC_URI = "git://gitlab.com/ymorin/kconfig-frontends.git;protocol=https;branch=4.11.x \ file://0001-Makefile-ensure-frontends-exits-before-writing-into-.patch \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/mercurial/mercurial_4.6.1.bb b/meta-openembedded/meta-oe/recipes-devtools/mercurial/mercurial_5.2.bb index 13710aaea..0fec4d1f1 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/mercurial/mercurial_4.6.1.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/mercurial/mercurial_5.2.bb @@ -3,29 +3,33 @@ HOMEPAGE = "http://mercurial.selenic.com/" SECTION = "console/utils" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "python python-native" -DEPENDS_class-native = "python-native" -RDEPENDS_${PN} = "python python-modules" -inherit python-dir +DEPENDS = "python3 python3-native" +RDEPENDS_${PN} = "python3 python3-modules" + +inherit python3native SRC_URI = "https://www.mercurial-scm.org/release/${BP}.tar.gz" -SRC_URI[md5sum] = "f9b2e4a3b5901ef744fa3abe4196e97e" -SRC_URI[sha256sum] = "89fa8ecbc8aa6e48e98f9803a1683ba91367124295dba2407b28c34ca621108d" +SRC_URI[md5sum] = "9ba9d59157c002db8d8cab680de08eb5" +SRC_URI[sha256sum] = "ff030e923f03ee15c91191996fcb099bfcfa60c7df263be227f67b6a65d36194" S = "${WORKDIR}/mercurial-${PV}" BBCLASSEXTEND = "native" +export LDSHARED="${CCLD} -shared" + EXTRA_OEMAKE = "STAGING_LIBDIR=${STAGING_LIBDIR} STAGING_INCDIR=${STAGING_INCDIR} \ PREFIX=${prefix}" do_configure_append () { - sed -i -e 's:PYTHON=python:PYTHON=${STAGING_BINDIR_NATIVE}/python-native/python:g' ${S}/Makefile + sed -i -e 's:PYTHON?=python:PYTHON=python3:g' ${S}/Makefile } do_install () { oe_runmake -e install-bin DESTDIR=${D} PREFIX=${prefix} + sed -i -e 's:${STAGING_BINDIR_NATIVE}/python3-native/python3:${USRBINPATH}/env python3:g' ${D}${bindir}/hg } FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}" + diff --git a/meta-openembedded/meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb b/meta-openembedded/meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb new file mode 100644 index 000000000..d2819f76c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb @@ -0,0 +1,19 @@ +SUMMARY = "A handy serial sniffer" +LICENSE = "GPL-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a" + +PV = "2.3.4+git${SRCPV}" + +SRC_URI = "git://github.com/snarlistic/jpnevulator.git;protocol=http" +SRCREV = "97438ecbd52fbc01540221bc590f8388a43c74e0" + +S = "${WORKDIR}/git" + +do_compile() { + oe_runmake +} + +do_install() { + oe_runmake install 'DESTDIR=${D}' +} + diff --git a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-7577.patch b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-7577.patch index 92e40aec5..63680b8b7 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-7577.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-7577.patch @@ -47,10 +47,17 @@ CVE: CVE-2019-7577 Upstream-Status: Backport Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> -diff -r a6e3d2f5183e -r 416136310b88 src/audio/SDL_wave.c ---- a/src/audio/SDL_wave.c Mon Jun 10 08:50:59 2019 -0700 -+++ b/src/audio/SDL_wave.c Mon Jun 10 08:54:11 2019 -0700 -@@ -115,7 +115,7 @@ +Refresh CVE-2019-7577.patch as it can't be applyed when using PATCHTOOL = "patch". +Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> +--- + src/audio/SDL_wave.c | 17 ++++++++++++++++- + 1 file changed, 16 insertions(+), 1 deletion(-) + +diff --git a/src/audio/SDL_wave.c b/src/audio/SDL_wave.c +index b4ad6c7..0bcf7e2 100644 +--- a/src/audio/SDL_wave.c ++++ b/src/audio/SDL_wave.c +@@ -115,7 +115,7 @@ static Sint32 MS_ADPCM_nibble(struct MS_ADPCM_decodestate *state, static int MS_ADPCM_decode(Uint8 **audio_buf, Uint32 *audio_len) { struct MS_ADPCM_decodestate *state[2]; @@ -59,7 +66,7 @@ diff -r a6e3d2f5183e -r 416136310b88 src/audio/SDL_wave.c Sint32 encoded_len, samplesleft; Sint8 nybble, stereo; Sint16 *coeff[2]; -@@ -124,6 +124,7 @@ +@@ -124,6 +124,7 @@ static int MS_ADPCM_decode(Uint8 **audio_buf, Uint32 *audio_len) /* Allocate the proper sized output buffer */ encoded_len = *audio_len; encoded = *audio_buf; @@ -67,7 +74,7 @@ diff -r a6e3d2f5183e -r 416136310b88 src/audio/SDL_wave.c freeable = *audio_buf; *audio_len = (encoded_len/MS_ADPCM_state.wavefmt.blockalign) * MS_ADPCM_state.wSamplesPerBlock* -@@ -141,6 +142,7 @@ +@@ -141,10 +142,14 @@ static int MS_ADPCM_decode(Uint8 **audio_buf, Uint32 *audio_len) state[1] = &MS_ADPCM_state.state[stereo]; while ( encoded_len >= MS_ADPCM_state.wavefmt.blockalign ) { /* Grab the initial information for this block */ @@ -75,7 +82,14 @@ diff -r a6e3d2f5183e -r 416136310b88 src/audio/SDL_wave.c state[0]->hPredictor = *encoded++; if ( stereo ) { state[1]->hPredictor = *encoded++; -@@ -188,6 +190,8 @@ + } ++ if (state[0]->hPredictor >= 7 || state[1]->hPredictor >= 7) { ++ goto invalid_predictor; ++ } + state[0]->iDelta = ((encoded[1]<<8)|encoded[0]); + encoded += sizeof(Sint16); + if ( stereo ) { +@@ -188,6 +193,8 @@ static int MS_ADPCM_decode(Uint8 **audio_buf, Uint32 *audio_len) samplesleft = (MS_ADPCM_state.wSamplesPerBlock-2)* MS_ADPCM_state.wavefmt.channels; while ( samplesleft > 0 ) { @@ -84,7 +98,7 @@ diff -r a6e3d2f5183e -r 416136310b88 src/audio/SDL_wave.c nybble = (*encoded)>>4; new_sample = MS_ADPCM_nibble(state[0],nybble,coeff[0]); decoded[0] = new_sample&0xFF; -@@ -209,6 +213,10 @@ +@@ -209,6 +216,14 @@ static int MS_ADPCM_decode(Uint8 **audio_buf, Uint32 *audio_len) } SDL_free(freeable); return(0); @@ -92,28 +106,6 @@ diff -r a6e3d2f5183e -r 416136310b88 src/audio/SDL_wave.c + SDL_SetError("Too short chunk for a MS ADPCM decoder"); + SDL_free(freeable); + return(-1); - } - - struct IMA_ADPCM_decodestate { - - -diff -r 416136310b88 -r faf9abbcfb5f src/audio/SDL_wave.c ---- a/src/audio/SDL_wave.c Mon Jun 10 08:54:11 2019 -0700 -+++ b/src/audio/SDL_wave.c Mon Jun 10 08:54:29 2019 -0700 -@@ -147,6 +147,9 @@ - if ( stereo ) { - state[1]->hPredictor = *encoded++; - } -+ if (state[0]->hPredictor >= 7 || state[1]->hPredictor >= 7) { -+ goto invalid_predictor; -+ } - state[0]->iDelta = ((encoded[1]<<8)|encoded[0]); - encoded += sizeof(Sint16); - if ( stereo ) { -@@ -217,6 +220,10 @@ - SDL_SetError("Too short chunk for a MS ADPCM decoder"); - SDL_free(freeable); - return(-1); +invalid_predictor: + SDL_SetError("Invalid predictor value for a MS ADPCM decoder"); + SDL_free(freeable); @@ -121,3 +113,6 @@ diff -r 416136310b88 -r faf9abbcfb5f src/audio/SDL_wave.c } struct IMA_ADPCM_decodestate { +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/stalonetray/stalonetray_0.8.3.bb b/meta-openembedded/meta-oe/recipes-graphics/stalonetray/stalonetray_0.8.3.bb new file mode 100644 index 000000000..8851729f5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/stalonetray/stalonetray_0.8.3.bb @@ -0,0 +1,14 @@ +SUMMARY = "Stand-alone system tray" +DESCRIPTION = "Stalonetray is a stand-alone freedesktop.org and KDE system tray" +SECTION = "x11/graphics" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +DEPENDS = "virtual/libx11" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2" + +SRC_URI[md5sum] = "ae95dbbacc2620e032acea8abab8c9ef" +SRC_URI[sha256sum] = "36548a588b2d466913423245dda6ffb6313132cd0cec635a117d37b3dab5fd4c" + +inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid/0001-wscript-add-pthread-library-dependency-to-fix-linkin.patch b/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid/0001-wscript-add-pthread-library-dependency-to-fix-linkin.patch deleted file mode 100644 index d17d311bd..000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid/0001-wscript-add-pthread-library-dependency-to-fix-linkin.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 488dc9b00239976caac6bd9ed76b38d9d1659dd9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Tue, 4 Oct 2016 23:44:49 +0200 -Subject: [PATCH] wscript: add pthread library dependency to fix linking -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Stolen from [1] - -[1] http://pkgs.fedoraproject.org/cgit/rpms/a2jmidid.git/tree/a2jmidid-linking.patch - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - wscript | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/wscript b/wscript -index 664625b..66a532a 100644 ---- a/wscript -+++ b/wscript -@@ -67,6 +67,7 @@ def configure(conf): - conf.env['DBUS_ENABLED'] = False - - conf.env['LIB_DL'] = ['dl'] -+ conf.env['LIB_PTHREAD'] = ['pthread'] - - #conf.check_header('expat.h', mandatory=True) - #conf.env['LIB_EXPAT'] = ['expat'] -@@ -152,7 +153,7 @@ def build(bld): - - prog.includes = '.' # make waf dependency tracking work - prog.target = 'a2jmidid' -- prog.uselib = 'ALSA JACK DL' -+ prog.uselib = 'ALSA JACK DL PTHREAD' - if bld.env()['DBUS_ENABLED']: - prog.uselib += " DBUS-1" - prog = bld.create_obj('cc', 'program') --- -2.5.5 - diff --git a/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid/0002-aarch64.patch b/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid/0002-aarch64.patch deleted file mode 100644 index b344f5427..000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid/0002-aarch64.patch +++ /dev/null @@ -1,31 +0,0 @@ -Consider compiler define for aarch64 - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status:Pending - -Index: a2jmidid-8/sigsegv.c -=================================================================== ---- a2jmidid-8.orig/sigsegv.c -+++ a2jmidid-8/sigsegv.c -@@ -91,18 +91,18 @@ static void signal_segv(int signum, sigi - a2j_error("info.si_errno = %d", info->si_errno); - a2j_error("info.si_code = %d (%s)", info->si_code, si_codes[info->si_code]); - a2j_error("info.si_addr = %p", info->si_addr); --#if !defined(__alpha__) && !defined(__ia64__) && !defined(__FreeBSD_kernel__) && !defined(__arm__) && !defined(__hppa__) && !defined(__sh__) -+#if !defined(__alpha__) && !defined(__ia64__) && !defined(__FreeBSD_kernel__) && !defined(__arm__) && !defined(__hppa__) && !defined(__sh__) && !defined(__aarch64__) - for(i = 0; i < NGREG; i++) - a2j_error("reg[%02d] = 0x" REGFORMAT, i, - #if defined(__powerpc__) - ucontext->uc_mcontext.uc_regs[i] --#elif defined(__sparc__) && defined(__arch64__) -+#elif defined(__sparc__) || defined(__arch64__) - ucontext->uc_mcontext.mc_gregs[i] - #else - ucontext->uc_mcontext.gregs[i] - #endif - ); --#endif /* alpha, ia64, kFreeBSD, arm, hppa */ -+#endif /* alpha, ia64, kFreeBSD, arm, hppa aarch64 */ - - #if defined(SIGSEGV_STACK_X86) || defined(SIGSEGV_STACK_IA64) - # if defined(SIGSEGV_STACK_IA64) diff --git a/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid/riscv_ucontext.patch b/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid/riscv_ucontext.patch index 23618f18a..af6612e85 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid/riscv_ucontext.patch +++ b/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid/riscv_ucontext.patch @@ -12,13 +12,13 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> +#if !defined(__alpha__) && !defined(__ia64__) && !defined(__FreeBSD_kernel__) && !defined(__arm__) && !defined(__hppa__) && !defined(__sh__) && !defined(__aarch64__) && !defined(__riscv) for(i = 0; i < NGREG; i++) a2j_error("reg[%02d] = 0x" REGFORMAT, i, - #if defined(__powerpc__) -@@ -102,7 +102,7 @@ static void signal_segv(int signum, sigi + #if defined(__powerpc__) && !defined(__powerpc64__) +@@ -104,7 +104,7 @@ static void signal_segv(int signum, sigi ucontext->uc_mcontext.gregs[i] #endif ); --#endif /* alpha, ia64, kFreeBSD, arm, hppa aarch64 */ -+#endif /* alpha, ia64, kFreeBSD, arm, hppa aarch64 riscv */ +-#endif /* alpha, ia64, kFreeBSD, arm, hppa, aarch64 */ ++#endif /* alpha, ia64, kFreeBSD, arm, hppa, aarch64 riscv */ #if defined(SIGSEGV_STACK_X86) || defined(SIGSEGV_STACK_IA64) # if defined(SIGSEGV_STACK_IA64) diff --git a/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid_8.bb b/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid_8.bb deleted file mode 100644 index a0aa41223..000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid_8.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "a2jmidid is daemon for exposing ALSA sequencer applications as JACK MIDI" -SECTION = "libs/multimedia" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = " \ - file://gpl2.txt;md5=751419260aa954499f7abaabaa882bbe \ -" - -DEPENDS = "alsa-lib jack dbus" -DEPENDS_append_libc-musl = " libexecinfo" - -SRC_URI = " \ - http://download.gna.org/${BPN}/${BPN}-${PV}.tar.bz2 \ - file://0001-wscript-add-pthread-library-dependency-to-fix-linkin.patch \ - file://0002-aarch64.patch \ - file://riscv_ucontext.patch \ -" -SRC_URI[md5sum] = "9cf4edbc3ad2ddeeaf6c8c1791ff3ddd" -SRC_URI[sha256sum] = "2a9635f62aabc59edb54ada07048dd47e896b90caff94bcee710d3582606f55f" - -inherit waf pkgconfig - -LDFLAGS_append_libc-musl = " -lexecinfo" - -export LINKFLAGS="${LDFLAGS}" - -do_configure() { - sed -i 's|/usr/bin/.*python$|/usr/bin/env python2|' ${S}/a2j_control ${S}/waf ${S}/wscript - (cd ${B} && ${S}/waf configure --prefix=${prefix} ${WAF_EXTRA_CONF} ${EXTRA_OECONF}) -} - -FILES_${PN} += "${datadir}/dbus-1/services" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid_9.bb b/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid_9.bb new file mode 100644 index 000000000..5fffe77c2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid_9.bb @@ -0,0 +1,28 @@ +SUMMARY = "a2jmidid is daemon for exposing ALSA sequencer applications as JACK MIDI" +SECTION = "libs/multimedia" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = " \ + file://LICENSE;md5=751419260aa954499f7abaabaa882bbe \ +" + +DEPENDS = "alsa-lib jack dbus" +DEPENDS_append_libc-musl = " libexecinfo" + +SRCREV = "de37569c926c5886768f892c019e3f0468615038" +SRC_URI = " \ + git://github.com/linuxaudio/a2jmidid;protocol=https \ + file://riscv_ucontext.patch \ +" + +S = "${WORKDIR}/git" + +inherit meson pkgconfig + +EXTRA_OEMESON = "-Db_lto=false" + +LDFLAGS_append_libc-musl = " -lexecinfo" + +export LINKFLAGS="${LDFLAGS}" + +FILES_${PN} += "${datadir}/dbus-1/services" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_git.bb b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.14.bb index 9f7d5b0b6..cebc95266 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_git.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.14.bb @@ -15,8 +15,8 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "libsamplerate0 libsndfile1 readline" SRC_URI = "git://github.com/jackaudio/jack2.git" -SRCREV = "37250ff470277f9947fbf3ba738f943053e30525" -PV = "1.9.13" +SRCREV = "b54a09bf7ef760d81fdb8544ad10e45575394624" + S = "${WORKDIR}/git" inherit waf pkgconfig @@ -30,6 +30,12 @@ PACKAGECONFIG[opus] = "--opus=yes,--opus=no,libopus" # portaudio is for windows builds only EXTRA_OECONF = "--portaudio=no" +do_install_append() { + if ! ${@bb.utils.contains('PACKAGECONFIG', 'dbus', True, False, d)}; then + rm -f ${D}${bindir}/jack_control + fi +} + PACKAGES =+ "libjack jack-server jack-utils" RDEPENDS_jack-dev_remove = "${PN} (= ${EXTENDPKGV})" @@ -42,4 +48,4 @@ FILES_jack-server = " \ " FILES_jack-utils = "${bindir}/*" -FILES_${PN}-doc += " ${datadir}/jack-audio-connection-kit/reference/html/* " +FILES_${PN}-doc += " ${datadir}/jack-audio-connection-kit/reference/html/*" diff --git a/meta-openembedded/meta-oe/recipes-shells/mksh/mksh_56.bb b/meta-openembedded/meta-oe/recipes-shells/mksh/mksh_57.bb index e4eb54286..7e9c18ed2 100644 --- a/meta-openembedded/meta-oe/recipes-shells/mksh/mksh_56.bb +++ b/meta-openembedded/meta-oe/recipes-shells/mksh/mksh_57.bb @@ -3,14 +3,14 @@ HOMEPAGE = "http://www.mirbsd.org/mksh.htm" SECTION = "base/shell" LICENSE = "${@bb.utils.contains("TCLIBC", "glibc", "MirOS & ISC", "MirOS", d)}" -LIC_FILES_CHKSUM = "file://main.c;beginline=6;endline=25;md5=7204fec4d12912f2a13fe8745bc356f9 \ +LIC_FILES_CHKSUM = "file://main.c;beginline=6;endline=26;md5=0651e575e39d1a3e884562e25d491fc7 \ file://strlcpy.c;beginline=1;endline=17;md5=d953f28f0c43ee29e238ec9bc15df2a0 \ " -SRC_URI = "http://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R56c.tgz" +SRC_URI = "http://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R57.tgz" -SRC_URI[md5sum] = "4799a9ac6d55871d79ba66713d928663" -SRC_URI[sha256sum] = "dd86ebc421215a7b44095dc13b056921ba81e61b9f6f4cdab08ca135d02afb77" +SRC_URI[md5sum] = "4d2686535252ea6a57bdec531498239a" +SRC_URI[sha256sum] = "3d101154182d52ae54ef26e1360c95bc89c929d28859d378cc1c84f3439dbe75" inherit update-alternatives diff --git a/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.7.bb b/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.7.bb index 731c83516..ee34acec2 100644 --- a/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.7.bb +++ b/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.7.bb @@ -35,5 +35,10 @@ PACKAGECONFIG[static] = "--enable-static,--disable-static," PACKAGE_BEFORE_PN += "libtcmalloc-minimal" FILES_libtcmalloc-minimal = "${libdir}/libtcmalloc_minimal*${SOLIBS} ${libdir}/libtcmalloc_minimal_debug*${SOLIBS}" + +# pprof tool requires Getopt::long and POSIX perl5 modules. +# Also runs `objdump` on each cpuprofile data file +RDEPENDS_${PN} += "binutils perl-module-getopt-long perl-module-posix" + RDEPENDS_${PN} += "libtcmalloc-minimal (= ${EXTENDPKGV})" diff --git a/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap/0001-Fix-out-of-tree-builds.patch b/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap/0001-Fix-out-of-tree-builds.patch deleted file mode 100644 index 5ceb4bf02..000000000 --- a/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap/0001-Fix-out-of-tree-builds.patch +++ /dev/null @@ -1,178 +0,0 @@ -From 8a10b6bd556426616e93f15639f369defbeca33f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 14 Aug 2017 11:58:58 -0700 -Subject: [PATCH] Fix out of tree builds - -When build dir is not same as sourcedir then the build failed due -to use of $(srcdir) variable which assumes source = build therefore -replace that with top_srcdir - -Additionally move the conditional addition of sources to Makefile.am -instead of adding it in configure.ac, since then we can use top_srcdir -variable to access those sources too otherwise its not possible to -specify the right dir for these sources - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted[https://sourceforge.net/p/gsoap2/patches/171/] - - configure.ac | 5 +++-- - gsoap/Makefile.am | 14 +++++++------- - gsoap/samples/autotest/Makefile.am | 8 ++++---- - gsoap/samples/databinding/Makefile.am | 8 ++++---- - gsoap/wsdl/Makefile.am | 15 +++++++++------ - 5 files changed, 27 insertions(+), 23 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 0631c18..c36e696 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -265,7 +265,7 @@ if test "x$with_openssl" = "xyes"; then - WSDL2H_EXTRA_FLAGS="-DWITH_OPENSSL -DWITH_GZIP" - # an ugly hack to get httpda and smdevp plugins to conditionally - # compile with wsdl2h when OPENSSL is available -- WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} ../plugin/httpda.c ../plugin/smdevp.c ../plugin/threads.c -lssl -lcrypto -lz" -+ WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lssl -lcrypto -lz" - SAMPLE_INCLUDES= - SAMPLE_SSL_LIBS="-lssl -lcrypto -lz" - WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a" -@@ -289,12 +289,13 @@ else - SAMPLE_INCLUDES= - WSDL2H_SOAP_CPP_LIB="libgsoap++.a" - fi -+AM_CONDITIONAL(WITH_OPENSSL, test "x$with_openssl" = "xyes" -a "x$with_gnutls" != "xyes") -+AC_SUBST(WITH_OPENSSL) - AC_SUBST(WSDL2H_EXTRA_FLAGS) - AC_SUBST(WSDL2H_EXTRA_LIBS) - AC_SUBST(SAMPLE_INCLUDES) - AC_SUBST(SAMPLE_SSL_LIBS) - AC_SUBST(WSDL2H_SOAP_CPP_LIB) -- - # enable the compile of the samples - AC_ARG_ENABLE(samples, - [ --enable-samples enable compile for the gsoap samples], -diff --git a/gsoap/Makefile.am b/gsoap/Makefile.am -index 7273b82..9c0c89f 100644 ---- a/gsoap/Makefile.am -+++ b/gsoap/Makefile.am -@@ -13,26 +13,26 @@ AM_CXXFLAGS = $(SOAPCPP2_DEBUG) -D$(platform) - AM_CFLAGS = $(SOAPCPP2_DEBUG) -D$(platform) - - # Install all soapcpp2 and wsdl2h files into ${prefix}/share/gsoap --nobase_pkgdata_DATA = $(srcdir)/import/* $(srcdir)/plugin/* $(srcdir)/WS/* $(srcdir)/custom/* $(srcdir)/extras/* -+nobase_pkgdata_DATA = $(top_srcdir)/gsoap/import/* $(top_srcdir)/gsoap/plugin/* $(top_srcdir)/gsoap/WS/* $(top_srcdir)/gsoap/custom/* $(top_srcdir)/gsoap/extras/* - - ## we cannot build stdsoap2.o from 2 different sources (stdsoap2.cpp and stdsoap2.c), so we need an intermediate target: - stdsoap2_ck.c: stdsoap2.cpp -- $(LN_S) -f $(srcdir)/stdsoap2.cpp stdsoap2_ck.c -+ $(LN_S) -f $(top_srcdir)/gsoap/stdsoap2.cpp stdsoap2_ck.c - - stdsoap2_cpp.cpp: stdsoap2.cpp -- $(LN_S) -f $(srcdir)/stdsoap2.cpp stdsoap2_cpp.cpp -+ $(LN_S) -f $(top_srcdir)/gsoap/stdsoap2.cpp stdsoap2_cpp.cpp - - stdsoap2_ck_cpp.cpp: stdsoap2.cpp -- $(LN_S) -f $(srcdir)/stdsoap2.cpp stdsoap2_ck_cpp.cpp -+ $(LN_S) -f $(top_srcdir)/gsoap/stdsoap2.cpp stdsoap2_ck_cpp.cpp - - stdsoap2_ssl.c: stdsoap2.cpp -- $(LN_S) -f $(srcdir)/stdsoap2.cpp stdsoap2_ssl.c -+ $(LN_S) -f $(top_srcdir)/gsoap/stdsoap2.cpp stdsoap2_ssl.c - - stdsoap2_ssl_cpp.cpp: stdsoap2.cpp -- $(LN_S) -f $(srcdir)/stdsoap2.cpp stdsoap2_ssl_cpp.cpp -+ $(LN_S) -f $(top_srcdir)/gsoap/stdsoap2.cpp stdsoap2_ssl_cpp.cpp - ## do the same fo dom.cpp since we want to link it into the cpp libs and dom.c into the c libs - dom_cpp.cpp: dom.cpp -- $(LN_S) -f $(srcdir)/dom.cpp dom_cpp.cpp -+ $(LN_S) -f $(top_srcdir)/gsoap/dom.cpp dom_cpp.cpp - - lib_LIBRARIES = libgsoap.a libgsoap++.a libgsoapck.a libgsoapck++.a libgsoapssl.a libgsoapssl++.a - -diff --git a/gsoap/samples/autotest/Makefile.am b/gsoap/samples/autotest/Makefile.am -index 36adf51..61e514c 100644 ---- a/gsoap/samples/autotest/Makefile.am -+++ b/gsoap/samples/autotest/Makefile.am -@@ -6,13 +6,13 @@ - AUTOMAKE_OPTIONS = subdir-objects foreign 1.4 - - CPPFLAGS=-I$(top_srcdir)/gsoap -I$(top_srcdir)/gsoap/plugin --AM_LDFLAGS=$(CPPFLAGS) -I$(srcdir) -L$(srcdir) -+AM_LDFLAGS=$(CPPFLAGS) -I$(top_srcdir)/gsoap/samples/autotest -L$(top_srcdir)/gsoap/samples/autotest - SOAP=$(top_srcdir)/gsoap/src/soapcpp2$(EXEEXT) - WSDL=$(top_srcdir)/gsoap/wsdl/wsdl2h$(EXEEXT) --WSDL_FLAGS=-d -P -t $(srcdir)/typemap.dat -+WSDL_FLAGS=-d -P -t $(top_srcdir)/gsoap/samples/autotest/typemap.dat - SOAP_FLAGS=-SL -T -I$(top_srcdir)/gsoap/import -I$(top_srcdir)/gsoap/custom --WSDLINPUT=$(srcdir)/examples.wsdl --SOAPHEADER=$(srcdir)/examples.h -+WSDLINPUT=$(top_srcdir)/gsoap/samples/autotest/examples.wsdl -+SOAPHEADER=$(top_srcdir)/gsoap/samples/autotest/examples.h - SOAP_CPP_SRC=soapC.cpp soapServer.cpp - SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a - -diff --git a/gsoap/samples/databinding/Makefile.am b/gsoap/samples/databinding/Makefile.am -index 892d4fd..86ad482 100644 ---- a/gsoap/samples/databinding/Makefile.am -+++ b/gsoap/samples/databinding/Makefile.am -@@ -6,13 +6,13 @@ - AUTOMAKE_OPTIONS = subdir-objects foreign 1.4 - - CPPFLAGS=$(SAMPLE_INCLUDES) -I$(top_srcdir)/gsoap -I$(top_srcdir)/gsoap/plugin --AM_LDFLAGS=$(AM_CPPFLAGS) -I$(srcdir) -L$(srcdir) -+AM_LDFLAGS=$(AM_CPPFLAGS) -I$(top_srcdir)/gsoap/samples/databinding -L$(top_srcdir)/gsoap/samples/databinding - SOAP=$(top_srcdir)/gsoap/src/soapcpp2$(EXEEXT) - WSDL=$(top_srcdir)/gsoap/wsdl/wsdl2h$(EXEEXT) --WSDL_FLAGS=-g -t $(srcdir)/addresstypemap.dat -+WSDL_FLAGS=-g -t $(top_srcdir)/gsoap/samples/databinding/addresstypemap.dat - SOAP_FLAGS=-0 -CS -p address -I$(top_srcdir)/gsoap/import --WSDLINPUT=$(srcdir)/address.xsd --SOAPHEADER=$(srcdir)/address.h -+WSDLINPUT=$(top_srcdir)/gsoap/samples/databinding/address.xsd -+SOAPHEADER=$(top_srcdir)/gsoap/samples/databinding/address.h - SOAP_CPP_SRC=addressC.cpp - SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a - -diff --git a/gsoap/wsdl/Makefile.am b/gsoap/wsdl/Makefile.am -index b8da5db..9f2aefa 100644 ---- a/gsoap/wsdl/Makefile.am -+++ b/gsoap/wsdl/Makefile.am -@@ -6,14 +6,14 @@ - AUTOMAKE_OPTIONS = foreign 1.4 - - # INCLUDES=-I$(top_srcdir)/gsoap --# AM_LDFLAGS=$(INCLUDES) -I$(srcdir) -L$(srcdir) --AM_LDFLAGS=-L$(srcdir) -I$(top_srcdir)/gsoap -I$(top_srcdir)/gsoap/plugin -+# AM_LDFLAGS=$(INCLUDES) -I$(top_srcdir)/gsoap/wsdl -L$(top_srcdir)/gsoap/wsdl -+AM_LDFLAGS=-L$(top_srcdir)/gsoap/wsdl -I$(top_srcdir)/gsoap -I$(top_srcdir)/gsoap/plugin - AM_CPPFLAGS=-I$(top_srcdir)/gsoap -I$(top_srcdir)/gsoap/plugin - SOAP=$(top_builddir)/gsoap/src/soapcpp2$(EXEEXT) - SOAP_CPP_LIB=$(top_builddir)/gsoap/$(WSDL2H_SOAP_CPP_LIB) - SOAP_CPP_SRC=wsdlC.cpp --SOAPHEADER=$(srcdir)/wsdl.h --SOAP_FLAGS=-SC -pwsdl -I$(srcdir) -I$(top_srcdir)/gsoap/import -+SOAPHEADER=$(top_srcdir)/gsoap/wsdl/wsdl.h -+SOAP_FLAGS=-SC -pwsdl -I$(top_srcdir)/gsoap/wsdl -I$(top_srcdir)/gsoap/import - BUILT_SOURCES=$(SOAP_CPP_SRC) - # WSDL2H_EXTRA_FLAGS=-DWITH_OPENSSL -DWITH_GZIP # defined in configure.in - # WSDL2H_EXTRA_LIBS=-lssl -lcrypto -lz # defined in configure.in -@@ -24,11 +24,14 @@ $(SOAP_CPP_SRC) : $(SOAPHEADER) - #LIBS= - - bin_PROGRAMS=wsdl2h -- -+if WITH_OPENSSL -+wsdl2h_LDADD=$(SOAP_CPP_LIB) $(top_srcdir)/gsoap/plugin/httpda.c $(top_srcdir)/gsoap/plugin/smdevp.c $(top_srcdir)/gsoap/plugin/threads.c $(WSDL2H_EXTRA_LIBS) -+else -+wsdl2h_LDADD=$(SOAP_CPP_LIB) $(WSDL2H_EXTRA_LIBS) -+endif - wsdl2h_CFLAGS=$(C_DEBUG_FLAGS) $(SOAPCPP2_NO_C_LOCALE) $(WSDL2H_EXTRA_FLAGS) - wsdl2h_CXXFLAGS=$(C_DEBUG_FLAGS) $(SOAPCPP2_NO_C_LOCALE) $(WSDL2H_EXTRA_FLAGS) $(WSDL2H_IMPORTPATH) - wsdl2h_CPPFLAGS=$(AM_CPPFLAGS) $(SOAPCPP2_NONAMESPACES) -D$(platform) - wsdl2h_SOURCES=wsdl2h.cpp wsdl.cpp wadl.cpp schema.cpp types.cpp service.cpp soap.cpp mime.cpp wsp.cpp bpel.cpp $(SOAP_CPP_SRC) --wsdl2h_LDADD=$(SOAP_CPP_LIB) $(WSDL2H_EXTRA_LIBS) - - CLEANFILES= *~ *C.cpp *H.h *Stub.h *.nsmap --- -2.14.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap/0001-stdgsoap2-Fix-build-with-musl.patch b/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap/0001-stdgsoap2-Fix-build-with-musl.patch deleted file mode 100644 index 571cbe540..000000000 --- a/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap/0001-stdgsoap2-Fix-build-with-musl.patch +++ /dev/null @@ -1,63 +0,0 @@ -From db260fbc7af4c73c997c485a0c69c61594a0e59c Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 30 Aug 2017 19:48:50 -0700 -Subject: [PATCH] stdgsoap2: Fix build with musl - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - gsoap/stdsoap2.c | 2 +- - gsoap/stdsoap2.cpp | 4 ++-- - gsoap/stdsoap2.h | 2 +- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/gsoap/stdsoap2.c b/gsoap/stdsoap2.c -index 58e9df4..62389e1 100644 ---- a/gsoap/stdsoap2.c -+++ b/gsoap/stdsoap2.c -@@ -4462,7 +4462,7 @@ tcp_gethost(struct soap *soap, const char *addr, struct in_addr *inaddr) - return soap->error = SOAP_EOM; - return SOAP_OK; - } --#if defined(__GLIBC__) || (defined(HAVE_GETHOSTBYNAME_R) && (defined(FREEBSD) || defined(__FreeBSD__))) || defined(__ANDROID__) -+#if defined(LINUX) || (defined(HAVE_GETHOSTBYNAME_R) && (defined(FREEBSD) || defined(__FreeBSD__))) || defined(__ANDROID__) - if (gethostbyname_r(addr, &hostent, soap->buf, sizeof(soap->buf), &host, &soap->errnum) < 0) - host = NULL; - #elif defined(_AIX43) || ((defined(TRU64) || defined(HP_UX)) && defined(HAVE_GETHOSTBYNAME_R)) -diff --git a/gsoap/stdsoap2.cpp b/gsoap/stdsoap2.cpp -index 58e9df4..b637161 100644 ---- a/gsoap/stdsoap2.cpp -+++ b/gsoap/stdsoap2.cpp -@@ -4462,7 +4462,7 @@ tcp_gethost(struct soap *soap, const char *addr, struct in_addr *inaddr) - return soap->error = SOAP_EOM; - return SOAP_OK; - } --#if defined(__GLIBC__) || (defined(HAVE_GETHOSTBYNAME_R) && (defined(FREEBSD) || defined(__FreeBSD__))) || defined(__ANDROID__) -+#if defined(LINUX) || (defined(HAVE_GETHOSTBYNAME_R) && (defined(FREEBSD) || defined(__FreeBSD__))) || defined(__ANDROID__) - if (gethostbyname_r(addr, &hostent, soap->buf, sizeof(soap->buf), &host, &soap->errnum) < 0) - host = NULL; - #elif defined(_AIX43) || ((defined(TRU64) || defined(HP_UX)) && defined(HAVE_GETHOSTBYNAME_R)) -@@ -19658,7 +19658,7 @@ soap_strerror(struct soap *soap) - { - #ifndef WIN32 - # ifdef HAVE_STRERROR_R --# if defined(_GNU_SOURCE) && !defined(__ANDROID__) -+# if defined(_GNU_SOURCE) && !defined(__ANDROID__) && defined(__GLIBC__) - return strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf)); /* GNU-specific */ - # else - strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf)); /* XSI-compliant */ -diff --git a/gsoap/stdsoap2.h b/gsoap/stdsoap2.h -index 07a3952..c6ace4c 100644 ---- a/gsoap/stdsoap2.h -+++ b/gsoap/stdsoap2.h -@@ -947,7 +947,7 @@ extern "C" { - # endif - #elif defined(SOCKLEN_T) - # define SOAP_SOCKLEN_T SOCKLEN_T --#elif defined(__socklen_t_defined) || defined(_SOCKLEN_T) || defined(CYGWIN) || defined(FREEBSD) || defined(__FreeBSD__) || defined(OPENBSD) || defined(__QNX__) || defined(QNX) || defined(OS390) || defined(__ANDROID__) || defined(_XOPEN_SOURCE) -+#elif defined(__socklen_t_defined) || defined(_SOCKLEN_T) || defined(CYGWIN) || defined(FREEBSD) || defined(__FreeBSD__) || defined(OPENBSD) || defined(__QNX__) || defined(QNX) || defined(OS390) || defined(__ANDROID__) || defined(_XOPEN_SOURCE) || defined (LINUX) - # define SOAP_SOCKLEN_T socklen_t - #elif defined(IRIX) || defined(WIN32) || defined(__APPLE__) || defined(SUN_OS) || defined(OPENSERVER) || defined(TRU64) || defined(VXWORKS) - # define SOAP_SOCKLEN_T int --- -2.14.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap_2.8.51.bb b/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap_2.8.95.bb index 36530d2df..22a049892 100644 --- a/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap_2.8.51.bb +++ b/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap_2.8.95.bb @@ -6,11 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4f40a941379143186f9602242c3fb729 \ file://GPLv2_license.txt;md5=a33672dbe491b6517750a0389063508b" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}2/${BPN}_${PV}.zip \ - file://0001-Fix-out-of-tree-builds.patch \ - file://0001-stdgsoap2-Fix-build-with-musl.patch \ " -SRC_URI[md5sum] = "212951d6e1435bb51fa4320f458809ea" -SRC_URI[sha256sum] = "3e7bb24a9e492f5cb86daca34054c9787152f1d7b70add36b789d03816d5ffa1" +SRC_URI[md5sum] = "88031646018d60857f21246962d10011" +SRC_URI[sha256sum] = "fe07aa152cd946ef8ebd3f87653f14c1d38efe7c6e6fce8c6f773c4814f79baf" inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-support/htop/files/0001-Ask-for-python3-specifically.patch b/meta-openembedded/meta-oe/recipes-support/htop/files/0001-Ask-for-python3-specifically.patch new file mode 100644 index 000000000..6153bdedb --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/htop/files/0001-Ask-for-python3-specifically.patch @@ -0,0 +1,26 @@ +From 08aca4816cc798fce58b6235c26585a0063fa8af Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 26 Nov 2019 10:43:49 -0800 +Subject: [PATCH] Ask for python3 specifically + +python2 is on its way out + +Upstream-Status: Submitted [https://github.com/hishamhm/htop/pull/968] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + scripts/MakeHeader.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/MakeHeader.py b/scripts/MakeHeader.py +index 7c48fdd..7a7586d 100755 +--- a/scripts/MakeHeader.py ++++ b/scripts/MakeHeader.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + import os, sys, string, io + try: + from StringIO import StringIO +-- +2.24.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/htop/htop_2.2.0.bb b/meta-openembedded/meta-oe/recipes-support/htop/htop_2.2.0.bb index 01c856d12..64eb0c571 100644 --- a/meta-openembedded/meta-oe/recipes-support/htop/htop_2.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/htop/htop_2.2.0.bb @@ -7,7 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c312653532e8e669f30e5ec8bdc23be3" DEPENDS = "ncurses" SRC_URI = "http://hisham.hm/htop/releases/${PV}/${BP}.tar.gz \ - file://0001-Use-pkg-config.patch" + file://0001-Use-pkg-config.patch \ + file://0001-Ask-for-python3-specifically.patch \ + " SRC_URI[md5sum] = "0d816b6beed31edc75babcfbf863ffa8" SRC_URI[sha256sum] = "d9d6826f10ce3887950d709b53ee1d8c1849a70fa38e91d5896ad8cbc6ba3c57" diff --git a/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.67.bb b/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.68.bb index c400462e0..f5569de9f 100644 --- a/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.67.bb +++ b/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.68.bb @@ -8,8 +8,8 @@ DEPENDS = "file" SRC_URI = "${GNU_MIRROR}/libmicrohttpd/${BPN}-${PV}.tar.gz \ " -SRC_URI[md5sum] = "e28e04e3d3eca62f5754efb844d17812" -SRC_URI[sha256sum] = "7e1f852723d099d4827d7ebde4d02dd00fd8da62149526fdb9fae058c5a60495" +SRC_URI[md5sum] = "1c3ca3bf92dfc680538b4186c58a9bd0" +SRC_URI[sha256sum] = "c5716e2a2899abc9e16c8fa7a1a58da88f81aca96a0b7e68a5d4d89e21610b61" inherit autotools lib_package pkgconfig gettext diff --git a/meta-openembedded/meta-oe/recipes-support/libssh2/files/CVE-2019-17498.patch b/meta-openembedded/meta-oe/recipes-support/libssh2/files/CVE-2019-17498.patch new file mode 100644 index 000000000..001080072 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libssh2/files/CVE-2019-17498.patch @@ -0,0 +1,131 @@ +From dedcbd106f8e52d5586b0205bc7677e4c9868f9c Mon Sep 17 00:00:00 2001 +From: Will Cosgrove <will@panic.com> +Date: Fri, 30 Aug 2019 09:57:38 -0700 +Subject: [PATCH] packet.c: improve message parsing (#402) + +* packet.c: improve parsing of packets + +file: packet.c + +notes: +Use _libssh2_get_string API in SSH_MSG_DEBUG/SSH_MSG_DISCONNECT. Additional uint32 bounds check in SSH_MSG_GLOBAL_REQUEST. + +Upstream-Status: Backport +CVE: CVE-2019-17498 +Signed-off-by: Li Zhou <li.zhou@windriver.com> +--- + src/packet.c | 68 ++++++++++++++++++++++------------------------------ + 1 file changed, 29 insertions(+), 39 deletions(-) + +diff --git a/src/packet.c b/src/packet.c +index 38ab629..2e01bfc 100644 +--- a/src/packet.c ++++ b/src/packet.c +@@ -419,8 +419,8 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, + size_t datalen, int macstate) + { + int rc = 0; +- char *message = NULL; +- char *language = NULL; ++ unsigned char *message = NULL; ++ unsigned char *language = NULL; + size_t message_len = 0; + size_t language_len = 0; + LIBSSH2_CHANNEL *channelp = NULL; +@@ -472,33 +472,23 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, + + case SSH_MSG_DISCONNECT: + if(datalen >= 5) { +- size_t reason = _libssh2_ntohu32(data + 1); ++ uint32_t reason = 0; ++ struct string_buf buf; ++ buf.data = (unsigned char *)data; ++ buf.dataptr = buf.data; ++ buf.len = datalen; ++ buf.dataptr++; /* advance past type */ + +- if(datalen >= 9) { +- message_len = _libssh2_ntohu32(data + 5); ++ _libssh2_get_u32(&buf, &reason); ++ _libssh2_get_string(&buf, &message, &message_len); ++ _libssh2_get_string(&buf, &language, &language_len); + +- if(message_len < datalen-13) { +- /* 9 = packet_type(1) + reason(4) + message_len(4) */ +- message = (char *) data + 9; +- +- language_len = +- _libssh2_ntohu32(data + 9 + message_len); +- language = (char *) data + 9 + message_len + 4; +- +- if(language_len > (datalen-13-message_len)) { +- /* bad input, clear info */ +- language = message = NULL; +- language_len = message_len = 0; +- } +- } +- else +- /* bad size, clear it */ +- message_len = 0; +- } + if(session->ssh_msg_disconnect) { +- LIBSSH2_DISCONNECT(session, reason, message, +- message_len, language, language_len); ++ LIBSSH2_DISCONNECT(session, reason, (const char *)message, ++ message_len, (const char *)language, ++ language_len); + } ++ + _libssh2_debug(session, LIBSSH2_TRACE_TRANS, + "Disconnect(%d): %s(%s)", reason, + message, language); +@@ -539,24 +529,24 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, + int always_display = data[1]; + + if(datalen >= 6) { +- message_len = _libssh2_ntohu32(data + 2); +- +- if(message_len <= (datalen - 10)) { +- /* 6 = packet_type(1) + display(1) + message_len(4) */ +- message = (char *) data + 6; +- language_len = _libssh2_ntohu32(data + 6 + +- message_len); +- +- if(language_len <= (datalen - 10 - message_len)) +- language = (char *) data + 10 + message_len; +- } ++ struct string_buf buf; ++ buf.data = (unsigned char *)data; ++ buf.dataptr = buf.data; ++ buf.len = datalen; ++ buf.dataptr += 2; /* advance past type & always display */ ++ ++ _libssh2_get_string(&buf, &message, &message_len); ++ _libssh2_get_string(&buf, &language, &language_len); + } + + if(session->ssh_msg_debug) { +- LIBSSH2_DEBUG(session, always_display, message, +- message_len, language, language_len); ++ LIBSSH2_DEBUG(session, always_display, ++ (const char *)message, ++ message_len, (const char *)language, ++ language_len); + } + } ++ + /* + * _libssh2_debug will actually truncate this for us so + * that it's not an inordinate about of data +@@ -579,7 +569,7 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, + uint32_t len = 0; + unsigned char want_reply = 0; + len = _libssh2_ntohu32(data + 1); +- if(datalen >= (6 + len)) { ++ if((len <= (UINT_MAX - 6)) && (datalen >= (6 + len))) { + want_reply = data[5 + len]; + _libssh2_debug(session, + LIBSSH2_TRACE_CONN, +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb b/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb index 25e0af3ff..185ea11b0 100644 --- a/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb @@ -7,8 +7,9 @@ DEPENDS = "zlib" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=c5cf34fc0acb44b082ef50ef5e4354ca" -SRC_URI = "http://www.libssh2.org/download/${BP}.tar.gz" - +SRC_URI = "http://www.libssh2.org/download/${BP}.tar.gz \ + file://CVE-2019-17498.patch \ +" SRC_URI[md5sum] = "1beefafe8963982adc84b408b2959927" SRC_URI[sha256sum] = "d5fb8bd563305fd1074dda90bd053fb2d29fc4bce048d182f96eaa466dfadafd" diff --git a/meta-openembedded/meta-oe/recipes-support/links/links-x11_2.16.bb b/meta-openembedded/meta-oe/recipes-support/links/links-x11_2.20.2.bb index 90fa20084..645fe3b26 100644 --- a/meta-openembedded/meta-oe/recipes-support/links/links-x11_2.16.bb +++ b/meta-openembedded/meta-oe/recipes-support/links/links-x11_2.20.2.bb @@ -47,7 +47,7 @@ do_install_append() { install -m 0644 ${WORKDIR}/links2.png ${D}/${datadir}/pixmaps } -SRC_URI[md5sum] = "645fb0c0294e4c3268f94d307d394ffb" -SRC_URI[sha256sum] = "82f03038d5e050a65681b9888762af41c40fd42dec7e59a8d630bfb0ee134a3f" +SRC_URI[md5sum] = "ee39e612249440d0497535d0dafc3c0e" +SRC_URI[sha256sum] = "4b4f07d0e6261118d1365a5a5bfa31e1eafdbd280cfae6f0e9eedfea51a2f424" SRC_URI[icon.md5sum] = "477e8787927c634614bac01b44355a33" SRC_URI[icon.sha256sum] = "eddcd8b8c8698aa621d1a453943892d77b72ed492e0d14e0dbac5c6a57e52f47" diff --git a/meta-openembedded/meta-oe/recipes-support/links/links_2.16.bb b/meta-openembedded/meta-oe/recipes-support/links/links_2.20.2.bb index 19ea7a67b..1a36291e5 100644 --- a/meta-openembedded/meta-oe/recipes-support/links/links_2.16.bb +++ b/meta-openembedded/meta-oe/recipes-support/links/links_2.20.2.bb @@ -9,7 +9,7 @@ EXTRA_OECONF = "--enable-graphics \ --without-directfb --without-pmshell --without-atheos \ --without-x" -SRC_URI[md5sum] = "645fb0c0294e4c3268f94d307d394ffb" -SRC_URI[sha256sum] = "82f03038d5e050a65681b9888762af41c40fd42dec7e59a8d630bfb0ee134a3f" +SRC_URI[md5sum] = "ee39e612249440d0497535d0dafc3c0e" +SRC_URI[sha256sum] = "4b4f07d0e6261118d1365a5a5bfa31e1eafdbd280cfae6f0e9eedfea51a2f424" SRC_URI[icon.md5sum] = "477e8787927c634614bac01b44355a33" SRC_URI[icon.sha256sum] = "eddcd8b8c8698aa621d1a453943892d77b72ed492e0d14e0dbac5c6a57e52f47" diff --git a/meta-openembedded/meta-oe/recipes-support/p910nd/p910nd_0.95.bb b/meta-openembedded/meta-oe/recipes-support/p910nd/p910nd_0.97.bb index 5ebbb29e1..45aa0d4ac 100644 --- a/meta-openembedded/meta-oe/recipes-support/p910nd/p910nd_0.95.bb +++ b/meta-openembedded/meta-oe/recipes-support/p910nd/p910nd_0.97.bb @@ -9,8 +9,8 @@ PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/p910nd/p910nd-${PV}.tar.bz2 \ file://fix-var-lock.patch" -SRC_URI[md5sum] = "c7ac6afdf7730ac8387a8e87198d4491" -SRC_URI[sha256sum] = "7d78642c86dc247fbdef1ff85c56629dcdc6b2a457c786420299e284fffcb029" +SRC_URI[md5sum] = "69461a6c54dca0b13ecad5b83864b43e" +SRC_URI[sha256sum] = "4ac980a3ae24babae6f70f0a692625ece03a4a92c357fbb10d2e368386c3c26f" do_compile () { ${CC} ${LDFLAGS} -o p910nd p910nd.c diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/use_py3.patch b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/use_py3.patch new file mode 100644 index 000000000..c7b4163cb --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/use_py3.patch @@ -0,0 +1,20 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -1488,7 +1488,7 @@ AC_ARG_WITH([python], + + if test "x$enable_dbus" = "xyes" || test "x$enable_consoleui" = "xyes" ; then + if test -z "$PYTHON" -o "x$PYTHON" = "xyes"; then +- AC_PATH_PROG([PYTHON], [python], [no]) ++ AC_PATH_PROG([PYTHON], [python3], [no]) + fi + + if test x"$PYTHON" = x"no" ; then +@@ -1568,7 +1568,7 @@ dnl Check for Python headers (currently + dnl (Thanks to XChat) + if test "x$enable_consoleui" = "xyes" -a ! -z "$PYTHON" -a x"$PYTHON" != x"no" ; then + AC_MSG_CHECKING(for Python compile flags) +- PKG_CHECK_MODULES(PY, python, [ ++ PKG_CHECK_MODULES(PY, python3, [ + AC_SUBST(PY_CFLAGS) + AC_SUBST(PY_LIBS) + ], [ diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin_2.13.0.bb b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin_2.13.0.bb index b094ba25e..fdc79e81b 100644 --- a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin_2.13.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin_2.13.0.bb @@ -2,15 +2,16 @@ SUMMARY = "multi-protocol instant messaging client" SECTION = "x11/network" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -DEPENDS = "python virtual/libintl intltool-native libxml2 gconf glib-2.0-native" +DEPENDS = "python3 virtual/libintl intltool-native libxml2 gconf glib-2.0-native" -inherit autotools gettext pkgconfig gconf perlnative +inherit autotools gettext pkgconfig gconf perlnative python3native SRC_URI = "\ ${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \ file://sanitize-configure.ac.patch \ file://purple-OE-branding-25.patch \ file://pidgin-cross-python-265.patch \ + file://use_py3.patch \ " SRC_URI[md5sum] = "423403494fe1951e47cc75231f743bb0" diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng.inc index 3aba4473d..8e5368953 100644 --- a/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng.inc +++ b/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng.inc @@ -27,7 +27,7 @@ SRC_URI = "https://github.com/balabit/syslog-ng/releases/download/${BP}/${BP}.ta UPSTREAM_CHECK_URI = "https://github.com/balabit/syslog-ng/releases" -inherit autotools gettext systemd pkgconfig update-rc.d +inherit autotools gettext systemd pkgconfig update-rc.d multilib_header EXTRA_OECONF = " \ --enable-dynamic-linking \ @@ -103,6 +103,8 @@ do_install_append() { else install ${WORKDIR}/syslog-ng.conf.sysvinit ${D}${sysconfdir}/${BPN}/${BPN}.conf fi + + oe_multilib_header syslog-ng/syslog-ng-config.h } FILES_${PN} += "${datadir}/include/scl/ ${datadir}/xsd ${datadir}/tools ${systemd_unitdir}/system/multi-user.target.wants/*" diff --git a/meta-openembedded/meta-oe/recipes-test/googletest/googletest_git.bb b/meta-openembedded/meta-oe/recipes-test/googletest/googletest_git.bb index e1df9b6e2..b675ea0f3 100644 --- a/meta-openembedded/meta-oe/recipes-test/googletest/googletest_git.bb +++ b/meta-openembedded/meta-oe/recipes-test/googletest/googletest_git.bb @@ -5,6 +5,8 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://googlemock/LICENSE;md5=cbbd27594afd089daa160d3a16dd515a \ file://googletest/LICENSE;md5=cbbd27594afd089daa160d3a16dd515a" +PV = "1.10.0" + PROVIDES += "gmock gtest" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-configargparse.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-configargparse.inc new file mode 100644 index 000000000..17d296ff8 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-configargparse.inc @@ -0,0 +1,22 @@ +SUMMARY = "A drop-in replacement for argparse that allows options to also be set via config files and/or environment variables." +HOMEPAGE = "https://github.com/bw2/ConfigArgParse" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=da746463714cc35999ed9a42339f2943" + +SRC_URI[md5sum] = "aba15b7973b7a70bea86fd69289f8fe3" +SRC_URI[sha256sum] = "baaf0fd2c1c108d007f402dab5481ac5f12d77d034825bf5a27f8224757bd0ac" + +PYPI_PACKAGE = "ConfigArgParse" + +inherit pypi + +PACKAGECONFIG ?= "yaml" +PACKAGECONFIG[yaml] = ",,,${PYTHON_PN}-pyyaml" + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-core \ + ${PYTHON_PN}-shell \ +" + +BBCLASSEXTEND = "native nativesdk" + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-configargparse_0.15.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-configargparse_0.15.1.bb new file mode 100644 index 000000000..6d64b8d0b --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-configargparse_0.15.1.bb @@ -0,0 +1,3 @@ +inherit setuptools +require python-configargparse.inc + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-django.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-django.inc index ee3aee638..63d025d54 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-django.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-django.inc @@ -3,9 +3,6 @@ HOMEPAGE = "http://www.djangoproject.com/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=f09eb47206614a4954c51db8a94840fa" -SRC_URI[md5sum] = "38e82b59a1c27bbf98ccf0564ead7426" -SRC_URI[sha256sum] = "eb9271f0874f53106a2719c0c35ce67631f6cc27cf81a60c6f8c9817b35a3f6e" - PYPI_PACKAGE = "Django" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-django_1.11.14.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-django_1.11.14.bb index d2347cc96..efe23dcb7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-django_1.11.14.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-django_1.11.14.bb @@ -1,6 +1,9 @@ require python-django.inc inherit setuptools +SRC_URI[md5sum] = "38e82b59a1c27bbf98ccf0564ead7426" +SRC_URI[sha256sum] = "eb9271f0874f53106a2719c0c35ce67631f6cc27cf81a60c6f8c9817b35a3f6e" + RDEPENDS_${PN} += " \ ${PYTHON_PN}-argparse \ ${PYTHON_PN}-subprocess \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-netifaces.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-netifaces.inc new file mode 100644 index 000000000..daccc4fba --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-netifaces.inc @@ -0,0 +1,10 @@ +DESCRIPTION = "Portable network interface information for Python" +SECTION = "devel/python" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=a53cbc7cb75660694e138ba973c148df" + +SRC_URI[md5sum] = "de92cc322b4f56047c073f802ad77860" +SRC_URI[sha256sum] = "2dee9ffdd16292878336a58d04a20f0ffe95555465fee7c9bd23b3490ef2abf3" + +inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-netifaces_0.10.9.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-netifaces_0.10.9.bb new file mode 100644 index 000000000..c4aa84971 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-netifaces_0.10.9.bb @@ -0,0 +1,2 @@ +require python-netifaces.inc +inherit setuptools diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-slip-dbus.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-slip-dbus.inc index 0933b4559..9e726b5b9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-slip-dbus.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-slip-dbus.inc @@ -24,6 +24,9 @@ do_compile_prepend() { sed -e 's/@VERSION@/${PV}/g' setup.py.in > setup.py } +RDEPENDS_${PN} += "\ +${PYTHON_PN}-six \ +" # http://errors.yoctoproject.org/Errors/Details/184713/ # python-native/python: can't open file 'setup.py': [Errno 2] No such file or directory CLEANBROKEN = "1" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-sqlparse.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-sqlparse.inc new file mode 100644 index 000000000..f71f8152a --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-sqlparse.inc @@ -0,0 +1,13 @@ +DESCRIPTION = "Non-validating SQL parser module" +HOMEPAGE = "http://pypi.python.org/pypi/sqlparse" +SECTION = "devel/python" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2b136f573f5386001ea3b7b9016222fc" + +SRC_URI[md5sum] = "2ce34181d6b7b234c9f3c0ecd1ffb93e" +SRC_URI[sha256sum] = "7c3dca29c022744e95b547e867cee89f4fce4373f3549ccd8797d8eb52cdb873" + +export BUILD_SYS +export HOST_SYS + +inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-sqlparse_0.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-sqlparse_0.3.0.bb new file mode 100644 index 000000000..2b7773fd4 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-sqlparse_0.3.0.bb @@ -0,0 +1,2 @@ +inherit setuptools +require python-sqlparse.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-yarl.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-yarl.inc index 49b5a607b..ea555418a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-yarl.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-yarl.inc @@ -8,3 +8,7 @@ SRC_URI[sha256sum] = "024ecdc12bc02b321bc66b41327f930d1c2c543fa9a561b39861da9388 PYPI_PACKAGE = "yarl" inherit pypi +RDEPENDS_${PN} = "\ + ${PYTHON_PN}-multidict \ + ${PYTHON_PN}-idna \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-configargparse_0.15.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-configargparse_0.15.1.bb new file mode 100644 index 000000000..698eccf66 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-configargparse_0.15.1.bb @@ -0,0 +1,3 @@ +inherit setuptools3 +require python-configargparse.inc + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-dbussy_1.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-dbussy_1.2.1.bb new file mode 100644 index 000000000..ac4b8c2aa --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-dbussy_1.2.1.bb @@ -0,0 +1,22 @@ +SUMMARY = "language bindings for libdbus, for Python 3.5 or later" +HOMEPAGE = "https://github.com/ldo/dbussy" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7" + +SRC_URI = "git://github.com/ldo/dbussy.git" + +SRCREV = "d0ec0223f3797e1612d835e71694a1083881149f" + +S = "${WORKDIR}/git" + +inherit distutils3 + +RDEPENDS_${PN} += "\ + python3-asyncio \ + python3-core \ + python3-ctypes \ + python3-xml \ +" + +BBCLASSEXTEND = "native nativesdk" + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-django_1.11.14.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-django_1.11.14.bb deleted file mode 100644 index e1e38c322..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-django_1.11.14.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-django.inc -inherit setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-django_2.2.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-django_2.2.7.bb new file mode 100644 index 000000000..e56453abc --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-django_2.2.7.bb @@ -0,0 +1,9 @@ +require python-django.inc +inherit setuptools3 + +SRC_URI[md5sum] = "b0833024aac4c8240467e4dc91a12e9b" +SRC_URI[sha256sum] = "16040e1288c6c9f68c6da2fe75ebde83c0a158f6f5d54f4c5177b0c1478c5b86" + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-sqlparse \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-netifaces_0.10.9.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-netifaces_0.10.9.bb new file mode 100644 index 000000000..69d5c674c --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-netifaces_0.10.9.bb @@ -0,0 +1,2 @@ +require python-netifaces.inc +inherit setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pid/0001-remove-requirement-of-nose.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pid/0001-remove-requirement-of-nose.patch deleted file mode 100644 index 3beef0700..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pid/0001-remove-requirement-of-nose.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 04d04a8fa1ef3d8dbdaebbaac9ae936e1c8234c1 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Wed, 28 Jun 2017 21:17:43 -0400 -Subject: [PATCH] remove requirement of nose - -The nose extends unittest to make testing easier. -Do not need the test suite, so remove requirement of nose. - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - setup.py | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/setup.py b/setup.py -index 3f7c7cb..c42a546 100644 ---- a/setup.py -+++ b/setup.py -@@ -53,6 +53,4 @@ setup( - keywords='pid pidfile context manager decorator', - packages=["pid"], - install_requires=[], -- test_suite='nose.collector', -- setup_requires=['nose>=1.0'], - ) --- -2.8.1 - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pid_2.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pid_2.2.5.bb index e43831989..b8dd0d747 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pid_2.2.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pid_2.2.5.bb @@ -4,11 +4,7 @@ HOMEPAGE = "https://github.com/trbs/pid/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=83d53cbd3105063f20305bc313464e29" -SRC_URI[md5sum] = "04d30308013d16aa882b3806feda8ab2" -SRC_URI[sha256sum] = "d8bb2ceec21a4ae84be6e9d320db1f56934b30e676e31c6f098ca7218b3d67d4" +SRC_URI[md5sum] = "ad352ee1dc28b9746a15451c0c53e9d7" +SRC_URI[sha256sum] = "96eb7dba326b88f5164bc1afdc986c7793e0d32d7f62366256a3903c7b0614ef" inherit pypi setuptools3 - -SRC_URI += " \ - file://0001-remove-requirement-of-nose.patch \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlparse_0.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlparse_0.3.0.bb new file mode 100644 index 000000000..a646ac648 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlparse_0.3.0.bb @@ -0,0 +1,3 @@ +inherit setuptools3 +require python-sqlparse.inc +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openpower/recipes-bsp/ecmd-pdbg/ecmd-pdbg_1.0.bb b/meta-openpower/recipes-bsp/ecmd-pdbg/ecmd-pdbg_1.0.bb deleted file mode 100644 index 21b397972..000000000 --- a/meta-openpower/recipes-bsp/ecmd-pdbg/ecmd-pdbg_1.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "eCMD plugin with pdbg backend" -DESCRIPTION = "The glue code necessary for pdbg to be used as an eCMD plugin" -PR = "r1" -PV = "1.0+git${SRCPV}" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" - -inherit meson -inherit pkgconfig - -SRC_URI = "git://github.com/open-power/ecmd-pdbg.git" -SRCREV = "d955e0efe5a4e01af23448083d63cc8581a18b3e" - -S = "${WORKDIR}/git" - -DEPENDS = "pdbg zlib libyaml" - -FILES_${PN} += "${prefix}/help"
\ No newline at end of file diff --git a/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb b/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb index 902f38b7b..04a3fbbb7 100644 --- a/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb +++ b/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb @@ -49,5 +49,4 @@ SUMMARY_${PN}-system = "OpenPOWER System" RDEPENDS_${PN}-system = " \ pdbg \ croserver \ - ecmd-pdbg \ - "
\ No newline at end of file + " diff --git a/meta-phosphor/recipes-extended/pam/libpam/pam.d/common-password b/meta-phosphor/recipes-extended/pam/libpam/pam.d/common-password index cf6a62a2c..ef706f308 100644 --- a/meta-phosphor/recipes-extended/pam/libpam/pam.d/common-password +++ b/meta-phosphor/recipes-extended/pam/libpam/pam.d/common-password @@ -16,8 +16,8 @@ # See the pam_unix manpage for other options. # here are the per-package modules (the "Primary" block) -password [success=ok default=die] pam_ipmicheck.so spec_grp_name=ipmi -password [success=ok default=die] pam_cracklib.so debug enforce_for_root reject_username minlen=8 difok=0 lcredit=0 ocredit=0 dcredit=0 ucredit=0 use_authtok +password [success=ok default=die] pam_cracklib.so debug enforce_for_root reject_username minlen=8 difok=0 lcredit=0 ocredit=0 dcredit=0 ucredit=0 +password [success=ok default=die] pam_ipmicheck.so spec_grp_name=ipmi use_authtok password [success=ok ignore=ignore default=die] pam_pwhistory.so debug enforce_for_root remember=0 use_authtok password [success=ok default=die] pam_unix.so sha512 use_authtok password [success=1 default=die] pam_ipmisave.so spec_grp_name=ipmi spec_pass_file=/etc/ipmi_pass key_file=/etc/key_file 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 88cef960d..40a991e39 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb @@ -14,7 +14,7 @@ DEPENDS += "autoconf-archive-native" DEPENDS += "sdbus++-native" SRC_URI += "git://github.com/openbmc/phosphor-dbus-interfaces" -SRCREV = "2d3b637f21f642afbe3d1193fd6cc4ab3a5e0d6c" +SRCREV = "1b02c38979ab4fa2649699a26266367b115eee7c" DEPENDS_remove_class-native = "sdbus++-native" DEPENDS_remove_class-nativesdk = "sdbus++-native" diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc index e72b2ef3d..2edf117b4 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 = "22848eceb4f19c93b1e3331e52005ce09523637d" +SRCREV = "ec4eec346011a5fa6882e0b020200b0c51f02cb0" diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index 5e4768a29..720b068c1 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/bmcweb.git" PV = "1.0+git${SRCPV}" -SRCREV = "2658d9859a89d2d3c02326e5e2b944480119e0c3" +SRCREV = "7166bf0fd7453f2b5d6bfb3afbdad5eb00f74990" S = "${WORKDIR}/git" 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 0f6c433e3..55bac7d77 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 += "ipmi-blob-tool" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-ipmi-blobs" -SRCREV = "fea1d8115bace4bedae2523a9d9389a990adb09f" +SRCREV = "9cd8f76d3a786645ba6e21e146f66f5f27a6290c" 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-bt_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt_git.bb index a3180402d..e702d2481 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt_git.bb @@ -20,7 +20,3 @@ DEPENDS += "systemd" S = "${WORKDIR}/git" SRC_URI += "git://github.com/openbmc/btbridge" SRCREV="aa5511d28ff9acee4a404c6397d09f5187812ed8" - -# This is how linux-libc-headers says to include custom uapi headers -CFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include/uapi" -do_configure[depends] += "virtual/kernel:do_shared_workdir" 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 100552978..3c11d85e6 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb @@ -44,7 +44,7 @@ EXTRA_OECONF_append = " MAPPED_ADDRESS=${IPMI_FLASH_BMC_ADDRESS}" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-ipmi-flash" -SRCREV = "1290198fb84fc136ff33cb79f1333fd06977d847" +SRCREV = "2aa55347312c400f9dd61a32c8c1e37b1691bb1c" SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE_${PN} += "phosphor-ipmi-flash-bmc-prepare.target \ diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc index 465aa6a1e..f9cd1b775 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 = "4d22640a64b74c11b2cbdadc88d0ffd60d09e274" +SRCREV = "225dec858e52f0e8319acfe72d7b3630adcc7a0d" 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 eb39439b1..3cb163077 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb @@ -31,7 +31,3 @@ DEPENDS += " \ S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/kcsbridge.git" SRCREV = "46525ae48db23333493ac927c12ed13a0e663de5" - -# This is how linux-libc-headers says to include custom uapi headers -CFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include/uapi" -do_configure[depends] += "virtual/kernel:do_shared_workdir" 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 733bbf503..3f9313ab6 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb @@ -16,7 +16,7 @@ DEPENDS += "systemd" DEPENDS += "phosphor-ipmi-host" SRC_URI += "git://github.com/openbmc/phosphor-net-ipmid" -SRCREV = "49a94b2f82fb1aa68d608f28c4863bb36661a3a4" +SRCREV = "b0a81f665fb76dab9ef2af174ac64de99211f2f8" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index 061124c09..f2c1f6288 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb @@ -54,7 +54,7 @@ FILES_phosphor-rsyslog-config += " \ " SRC_URI += "git://github.com/openbmc/phosphor-logging" -SRCREV = "53407be367f112649cae10ebd6152f9bfd62b79b" +SRCREV = "57686b65b58e247858df228de8889ae30104ecdf" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/mboxd/files/aspeed-lpc-ctrl-h.patch b/meta-phosphor/recipes-phosphor/mboxd/files/aspeed-lpc-ctrl-h.patch deleted file mode 100644 index 122594e9f..000000000 --- a/meta-phosphor/recipes-phosphor/mboxd/files/aspeed-lpc-ctrl-h.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- /dev/null 2017-01-17 09:45:47.987442339 +1030 -+++ include/linux/aspeed-lpc-ctrl.h 2017-01-17 11:12:17.711635876 +1030 -@@ -0,0 +1,36 @@ -+/* -+ * Copyright 2017 IBM Corp. -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version -+ * 2 of the License, or (at your option) any later version. -+ */ -+ -+#ifndef _LINUX_ASPEED_LPC_CTRL_H -+#define _LINUX_ASPEED_LPC_CTRL_H -+ -+#include <linux/ioctl.h> -+ -+/* Window types */ -+#define ASPEED_LPC_CTRL_WINDOW_FLASH 1 -+#define ASPEED_LPC_CTRL_WINDOW_MEMORY 2 -+ -+struct aspeed_lpc_ctrl_mapping { -+ __u8 window_type; -+ __u8 window_id; -+ __u16 flags; -+ __u32 addr; -+ __u32 offset; -+ __u32 size; -+}; -+ -+#define __ASPEED_LPC_CTRL_IOCTL_MAGIC 0xb2 -+ -+#define ASPEED_LPC_CTRL_IOCTL_GET_SIZE _IOWR(__ASPEED_LPC_CTRL_IOCTL_MAGIC, \ -+ 0x00, struct aspeed_lpc_ctrl_mapping) -+ -+#define ASPEED_LPC_CTRL_IOCTL_MAP _IOW(__ASPEED_LPC_CTRL_IOCTL_MAGIC, \ -+ 0x01, struct aspeed_lpc_ctrl_mapping) -+ -+#endif /* _LINUX_ASPEED_LPC_CTRL_H */ diff --git a/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb b/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb index b33df921d..b5ee156a0 100644 --- a/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb +++ b/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb @@ -17,7 +17,6 @@ S = "${WORKDIR}/git" SRC_URI += "git://github.com/openbmc/mboxbridge.git" SRC_URI += "file://99-aspeed-lpc-ctrl.rules" -SRC_URI += "file://aspeed-lpc-ctrl-h.patch" SRCREV="0acc669979cc5b1b66c2c4e5d975c60779bedd81" @@ -26,10 +25,6 @@ PROVIDES += "mboxctl" MBOXD_FLASH_SIZE ??= "32M" SYSTEMD_SUBSTITUTIONS += "FLASH_SIZE:${MBOXD_FLASH_SIZE}:${PN}.service" -# Hacks because ${STAGING_KERNEL_DIR} points to the kernel source tree, not the -# installed, pre-processed headers. Requires the aspeed-lpc-ctrl-h patch above. -CFLAGS_append = " -I include" - do_install_append() { install -d ${D}/lib/udev/rules.d install -m 0644 ${WORKDIR}/99-aspeed-lpc-ctrl.rules ${D}/lib/udev/rules.d diff --git a/meta-phosphor/recipes-phosphor/pldm/pldm.inc b/meta-phosphor/recipes-phosphor/pldm/pldm.inc index 6787dea8a..951bc298d 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 = "4de4d00f3ab06eaf2ac15719c27ce21603c88369" +SRCREV = "9a26f89f45c3753c9059505506da9f02460122ab" diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc index f062cd0a7..52e8c045d 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 = "6d5977375f5ca0a8676c6337e465bf7c92f3a765" +SRCREV = "575ed139220d7a694893f8b1a1e2d4c3b69317fe" 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 459ca82f1..0c078574f 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 @@ -18,7 +18,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" DEPENDS += "systemd sdbusplus boost phosphor-ipmi-host" SRC_URI = "git://github.com/openbmc/phosphor-sel-logger.git;protocol=git" -SRCREV = "7d5054ac15bee9945ac00c470c36c94b565ac8fa" +SRCREV = "151b7c1fc62971b7d319146e5ea129d44eadd9d7" 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 f6ecb7c0d..8c884ab85 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 = "14f0ad806c3e92b5aee23632534698fbca18014b" +SRCREV = "73c363ff2d131b59149baaa0bc9bff41a3cfb125" PV = "0.1+git${SRCPV}" diff --git a/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb b/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb index 21c5fe6d8..950ae6e9e 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 = "1ab0f7c1d59e3ccae14d92ba865ec52c53772ca2" +SRCREV = "86f4056a2dfee6fced5b5b03de04a7ef9c33d74f" S = "${WORKDIR}/git" DEPENDS_prepend = "nodejs-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 668d0a1ca..81ad1d0b8 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 = "174ec66e41c0182ae3299637c2846a57dc4684f5" +SRCREV = "3f6ecb212494d1a9362256d7aae03e11f3efb6f7" PV = "1.0+git${SRCPV}" diff --git a/meta-quanta/meta-olympus-nuvoton/conf/machine/olympus-nuvoton.conf b/meta-quanta/meta-olympus-nuvoton/conf/machine/olympus-nuvoton.conf index f13b5c5ac..ac3c128a7 100644 --- a/meta-quanta/meta-olympus-nuvoton/conf/machine/olympus-nuvoton.conf +++ b/meta-quanta/meta-olympus-nuvoton/conf/machine/olympus-nuvoton.conf @@ -25,3 +25,5 @@ OBMC_MACHINE_FEATURES += "\ obmc-chassis-state-mgmt \ obmc-bmc-state-mgmt \ " + +PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs" diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/bmc b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/bmc new file mode 100644 index 000000000..d512687a9 --- /dev/null +++ b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/bmc @@ -0,0 +1,2 @@ +SYSFS_PATH=/sys/bus/i2c/devices/13-0051/eeprom +FRUID=2 diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/motherboard b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/motherboard new file mode 100644 index 000000000..eec92f463 --- /dev/null +++ b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/motherboard @@ -0,0 +1,2 @@ +SYSFS_PATH=/sys/bus/i2c/devices/4-0054/eeprom +FRUID=1 diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend new file mode 100644 index 000000000..ba0862d3a --- /dev/null +++ b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -0,0 +1,22 @@ +inherit obmc-phosphor-systemd + +FILESEXTRAPATHS_prepend_olympus-nuvoton := "${THISDIR}/${PN}:" + +EEPROM_NAMES = "motherboard bmc" + +EEPROMFMT = "system/chassis/{0}" +EEPROM_ESCAPEDFMT = "system-chassis-{0}" +EEPROMS = "${@compose_list(d, 'EEPROMFMT', 'EEPROM_NAMES')}" +EEPROMS_ESCAPED = "${@compose_list(d, 'EEPROM_ESCAPEDFMT', 'EEPROM_NAMES')}" + +ENVFMT = "obmc/eeproms/{0}" +SYSTEMD_ENVIRONMENT_FILE_${PN}_append_olympus-nuvoton := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}" + +TMPL = "obmc-read-eeprom@.service" +TGT = "${SYSTEMD_DEFAULT_TARGET}" +INSTFMT = "obmc-read-eeprom@{0}.service" +FMT = "../${TMPL}:${TGT}.wants/${INSTFMT}" + +SYSTEMD_LINK_${PN}_append_olympus-nuvoton := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend new file mode 100644 index 000000000..f5b70c829 --- /dev/null +++ b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend @@ -0,0 +1,2 @@ +KCS_DEVICE = "ipmi-kcs1" + diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend new file mode 100644 index 000000000..d18146439 --- /dev/null +++ b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend @@ -0,0 +1 @@ +RMCPP_IFACE = "eth1"
\ No newline at end of file diff --git a/meta-raspberrypi/classes/sdcard_image-rpi.bbclass b/meta-raspberrypi/classes/sdcard_image-rpi.bbclass index d3447689a..177988e61 100644 --- a/meta-raspberrypi/classes/sdcard_image-rpi.bbclass +++ b/meta-raspberrypi/classes/sdcard_image-rpi.bbclass @@ -64,7 +64,7 @@ do_image_rpi_sdimg[depends] = " \ do_image_rpi_sdimg[recrdeps] = "do_build" # SD card image name -SDIMG = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.rpi-sdimg" +SDIMG = "${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.rpi-sdimg" # Additional files and/or directories to be copied into the vfat partition from the IMAGE_ROOTFS. FATPAYLOAD ?= "" diff --git a/meta-security/README b/meta-security/README index 5abb0e262..c419d506d 100644 --- a/meta-security/README +++ b/meta-security/README @@ -52,14 +52,14 @@ other layers needed. e.g.: Maintenance ----------- -Send pull requests, patches, comments or questions to yocto@yoctoproject.org +Send pull requests, patches, comments or questions to yocto@lists.yoctoproject.org When sending single patches, please using something like: -'git send-email -1 --to yocto@yoctoproject.org --subject-prefix=meta-security][PATCH' +'git send-email -1 --to yocto@lists.yoctoproject.org --subject-prefix=meta-security][PATCH' These values can be set as defaults for this repository: -$ git config sendemail.to yocto@yoctoproject.org +$ git config sendemail.to yocto@lists.yoctoproject.org $ git config format.subjectPrefix meta-security][PATCH Now you can just do 'git send-email origin/master' to send all local patches. diff --git a/meta-security/meta-tpm/recipes-tpm2/cryptsetup-tpm-incubator/cryptsetup-tpm-incubator_0.9.9.bb b/meta-security/meta-tpm/recipes-tpm2/cryptsetup-tpm-incubator/cryptsetup-tpm-incubator_0.9.9.bb index 8385c9403..b706d1505 100644 --- a/meta-security/meta-tpm/recipes-tpm2/cryptsetup-tpm-incubator/cryptsetup-tpm-incubator_0.9.9.bb +++ b/meta-security/meta-tpm/recipes-tpm2/cryptsetup-tpm-incubator/cryptsetup-tpm-incubator_0.9.9.bb @@ -32,6 +32,7 @@ RRECOMMENDS_${PN} = "kernel-module-aes-generic \ kernel-module-xts \ " +FILES_${PN} += "${libdir}/tmpfiles.d" RDEPENDS_${PN} += "lvm2 libdevmapper" RRECOMMENDS_${PN} += "lvm2-udevrules" diff --git a/meta-security/meta-tpm/recipes-tpm2/tpm2-abrmd/tpm2-abrmd_2.2.0.bb b/meta-security/meta-tpm/recipes-tpm2/tpm2-abrmd/tpm2-abrmd_2.3.0.bb index 021c96930..991364ad3 100644 --- a/meta-security/meta-tpm/recipes-tpm2/tpm2-abrmd/tpm2-abrmd_2.2.0.bb +++ b/meta-security/meta-tpm/recipes-tpm2/tpm2-abrmd/tpm2-abrmd_2.3.0.bb @@ -18,7 +18,7 @@ SRC_URI = "\ file://tpm2-abrmd.default \ " -SRCREV = "ac2a5a4b5a4e548177ed7a5b74cea23e00fd30b4" +SRCREV = "ac82192df1158cb58eac02777cf15c965b02cfbc" S = "${WORKDIR}/git" diff --git a/meta-security/meta-tpm/recipes-tpm2/tpm2-pkcs11/tpm2-pkcs11_0.9.9.bb b/meta-security/meta-tpm/recipes-tpm2/tpm2-pkcs11/tpm2-pkcs11_0.9.9.bb index 218574999..351e03e5b 100644 --- a/meta-security/meta-tpm/recipes-tpm2/tpm2-pkcs11/tpm2-pkcs11_0.9.9.bb +++ b/meta-security/meta-tpm/recipes-tpm2/tpm2-pkcs11/tpm2-pkcs11_0.9.9.bb @@ -10,7 +10,7 @@ SRC_URI = "git://github.com/tpm2-software/tpm2-pkcs11.git \ file://bootstrap_fixup.patch \ " -SRCREV = "caf20c04651029626466c59d88b36c05cc6ea20b" +SRCREV = "6de3f6f9c6e0a4983f3fb90e35feb34906f8aea7" S = "${WORKDIR}/git" diff --git a/meta-security/meta-tpm/recipes-tpm2/tpm2-tools/tpm2-tools_3.2.0.bb b/meta-security/meta-tpm/recipes-tpm2/tpm2-tools/tpm2-tools_3.2.0.bb deleted file mode 100644 index b6f1be0d9..000000000 --- a/meta-security/meta-tpm/recipes-tpm2/tpm2-tools/tpm2-tools_3.2.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "Tools for TPM2." -DESCRIPTION = "tpm2-tools" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=91b7c548d73ea16537799e8060cea819" -SECTION = "tpm" - -DEPENDS = "pkgconfig tpm2-tss openssl curl autoconf-archive" - -SRCREV = "a17daa948fc67685651bf3b7a589ed341080ddd3" - -SRC_URI = "git://github.com/tpm2-software/tpm2-tools.git;branch=3.X" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig diff --git a/meta-security/meta-tpm/recipes-tpm2/tpm2-tools/tpm2-tools_4.0.1.bb b/meta-security/meta-tpm/recipes-tpm2/tpm2-tools/tpm2-tools_4.0.1.bb new file mode 100644 index 000000000..8f9497252 --- /dev/null +++ b/meta-security/meta-tpm/recipes-tpm2/tpm2-tools/tpm2-tools_4.0.1.bb @@ -0,0 +1,14 @@ +SUMMARY = "Tools for TPM2." +DESCRIPTION = "tpm2-tools" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://LICENSE;md5=0eb1216e46938bd723098d93a23c3bcc" +SECTION = "tpm" + +DEPENDS = "tpm2-abrmd tpm2-tss openssl curl autoconf-archive" + +SRC_URI = "https://github.com/tpm2-software/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.gz" + +SRC_URI[md5sum] = "071aa40bc8721700ea4ed19cc2fdeabf" +SRC_URI[sha256sum] = "ccec3fca6370341a102c5c2ef1ddb4e5cd242bf1bbc6c51d969f77fc78ca67d1" + +inherit autotools pkgconfig bash-completion diff --git a/meta-security/meta-tpm/recipes-tpm2/tpm2-totp/files/litpm2_totp_build_fix.patch b/meta-security/meta-tpm/recipes-tpm2/tpm2-totp/files/litpm2_totp_build_fix.patch deleted file mode 100644 index c14705458..000000000 --- a/meta-security/meta-tpm/recipes-tpm2/tpm2-totp/files/litpm2_totp_build_fix.patch +++ /dev/null @@ -1,36 +0,0 @@ -C99 fixes: - - src/libtpm2-totp.c:172:13: error: format '%li' expects argument of type 'long int', but argument 3 has type 'size_t' {aka 'unsigned int'} [-Werror=format=] -| dbg("Calling Esys_GetRandom for %li bytes", SECRETLEN - *secret_size); - -src/tpm2-totp.c:343:23: error: format '%ld' expects argument of type 'long int', but argument 3 has type 'uint64_t' {aka 'long long unsigned int'} [-Werror=format=] - -Upstream-Status: Pending -Signed-off-by: Armin Kuster <akuster808@gmail.com> - -Index: git/src/libtpm2-totp.c -=================================================================== ---- git.orig/src/libtpm2-totp.c -+++ git/src/libtpm2-totp.c -@@ -169,7 +169,7 @@ tpm2totp_generateKey(uint32_t pcrs, uint - if (rc != TPM2_RC_INITIALIZE) chkrc(rc, goto error); - - while (*secret_size < SECRETLEN) { -- dbg("Calling Esys_GetRandom for %li bytes", SECRETLEN - *secret_size); -+ dbg("Calling Esys_GetRandom for %li bytes", (long int) (SECRETLEN - *secret_size)); - rc = Esys_GetRandom(ctx, - ESYS_TR_NONE, ESYS_TR_NONE, ESYS_TR_NONE, - SECRETLEN - *secret_size, &t); -Index: git/src/tpm2-totp.c -=================================================================== ---- git.orig/src/tpm2-totp.c -+++ git/src/tpm2-totp.c -@@ -340,7 +340,7 @@ main(int argc, char **argv) - localtime (&now)); - chkrc(rc, exit(1)); - } -- printf("%s%06ld", timestr, totp); -+ printf("%s%06ld", timestr, (long int)totp); - break; - case CMD_RESEAL: - rc = tpm2totp_loadKey_nv(opt.nvindex, &keyBlob, &keyBlob_size); diff --git a/meta-security/meta-tpm/recipes-tpm2/tpm2-totp/tpm2-totp_0.1.2.bb b/meta-security/meta-tpm/recipes-tpm2/tpm2-totp/tpm2-totp_0.2.0.bb index 8a2504d94..0dad67306 100644 --- a/meta-security/meta-tpm/recipes-tpm2/tpm2-totp/tpm2-totp_0.1.2.bb +++ b/meta-security/meta-tpm/recipes-tpm2/tpm2-totp/tpm2-totp_0.2.0.bb @@ -9,9 +9,9 @@ DEPENDS = "autoconf-archive libtss2-dev qrencode" PE = "1" -SRCREV = "15cc8fbc8fe71be9c04c3169ee1f70450d52a51a" -SRC_URI = "git://github.com/tpm2-software/tpm2-totp.git;branch=v0.1.x \ - file://litpm2_totp_build_fix.patch " +SRCREV = "994b4203e4769baefa6e7719915629bc8210e90a" +SRC_URI = "git://github.com/tpm2-software/tpm2-totp.git;branch=v0.2.x \ + " inherit autotools-brokensep pkgconfig diff --git a/meta-security/meta-tpm/recipes-tpm2/tpm2-tss-engine/tpm2-tss-engine_1.0.1.bb b/meta-security/meta-tpm/recipes-tpm2/tpm2-tss-engine/tpm2-tss-engine_1.0.1.bb index 8825737ee..3641b1b76 100644 --- a/meta-security/meta-tpm/recipes-tpm2/tpm2-tss-engine/tpm2-tss-engine_1.0.1.bb +++ b/meta-security/meta-tpm/recipes-tpm2/tpm2-tss-engine/tpm2-tss-engine_1.0.1.bb @@ -2,13 +2,13 @@ SUMMARY = "The tpm2-tss-engine project implements a cryptographic engine for Ope DESCRIPTION = "The tpm2-tss-engine project implements a cryptographic engine for OpenSSL for Trusted Platform Module (TPM 2.0) using the tpm2-tss software stack that follows the Trusted Computing Groups (TCG) TPM Software Stack (TSS 2.0). It uses the Enhanced System API (ESAPI) interface of the TSS 2.0 for downwards communication. It supports RSA decryption and signatures as well as ECDSA signatures." LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3fb0047fd29391478a71e8e6101c76eb" +LIC_FILES_CHKSUM = "file://LICENSE;md5=7b3ab643b9ce041de515d1ed092a36d4" SECTION = "security/tpm" DEPENDS = "autoconf-archive-native bash-completion libtss2 libgcrypt openssl" -SRCREV = "e1bbabe29377e45282d753a1b103625c420a19cf" +SRCREV = "fdc8f65dfc8bad8b5a3aed181fae338267308f70" SRC_URI = "git://github.com/tpm2-software/tpm2-tss-engine.git" inherit autotools-brokensep pkgconfig systemd diff --git a/meta-security/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_2.3.1.bb b/meta-security/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_2.3.1.bb index 3e77f71d2..dfdf73424 100644 --- a/meta-security/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_2.3.1.bb +++ b/meta-security/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_2.3.1.bb @@ -17,6 +17,8 @@ S = "${WORKDIR}/git" PACKAGECONFIG ??= "" PACKAGECONFIG[oxygen] = ",--disable-doxygen-doc, " +EXTRA_OECONF += "--with-udevrulesdir=${base_prefix}/lib/udev/rules.d/" + do_configure_prepend () { ./bootstrap } @@ -74,6 +76,6 @@ FILES_libtss2-dev = " \ ${libdir}/libtss2*so" FILES_libtss2-staticdev = "${libdir}/libtss*a" -FILES_${PN} = "${libdir}/udev" +FILES_${PN} = "${libdir}/udev ${base_prefix}/lib/udev" RDEPENDS_libtss2 = "libgcrypt" diff --git a/meta-security/recipes-ids/suricata/files/tmpfiles.suricata b/meta-security/recipes-ids/suricata/files/tmpfiles.suricata new file mode 100644 index 000000000..fbf37848e --- /dev/null +++ b/meta-security/recipes-ids/suricata/files/tmpfiles.suricata @@ -0,0 +1,2 @@ +#Type Path Mode UID GID Age Argument +d /var/log/suricata 0755 root root diff --git a/meta-security/recipes-ids/suricata/suricata_4.1.5.bb b/meta-security/recipes-ids/suricata/suricata_4.1.5.bb index e15a9a337..b2700d63f 100644 --- a/meta-security/recipes-ids/suricata/suricata_4.1.5.bb +++ b/meta-security/recipes-ids/suricata/suricata_4.1.5.bb @@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;beginline=1;endline=2;md5=c70d8d3310941dcdfcd SRC_URI += " \ file://volatiles.03_suricata \ + file://tmpfiles.suricata \ file://suricata.yaml \ file://suricata.service \ file://run-ptest \ @@ -59,14 +60,19 @@ do_install_append () { install -m 0644 ${S}/threshold.config ${D}${sysconfdir}/suricata - install -d ${D}${systemd_unitdir}/system - sed -e s:/etc:${sysconfdir}:g \ - -e s:/var/run:/run:g \ - -e s:/var:${localstatedir}:g \ - -e s:/usr/bin:${bindir}:g \ - -e s:/bin/kill:${base_bindir}/kill:g \ - -e s:/usr/lib:${libdir}:g \ - ${WORKDIR}/suricata.service > ${D}${systemd_unitdir}/system/suricata.service + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/tmpfiles.d + install -m 0644 ${WORKDIR}/tmpfiles.suricata ${D}${sysconfdir}/tmpfiles.d/suricata.conf + + install -d ${D}${systemd_unitdir}/system + sed -e s:/etc:${sysconfdir}:g \ + -e s:/var/run:/run:g \ + -e s:/var:${localstatedir}:g \ + -e s:/usr/bin:${bindir}:g \ + -e s:/bin/kill:${base_bindir}/kill:g \ + -e s:/usr/lib:${libdir}:g \ + ${WORKDIR}/suricata.service > ${D}${systemd_unitdir}/system/suricata.service + fi # Remove /var/run as it is created on startup rm -rf ${D}${localstatedir}/run @@ -74,7 +80,9 @@ do_install_append () { } pkg_postinst_ontarget_${PN} () { -if [ -e /etc/init.d/populate-volatile.sh ] ; then +if command -v systemd-tmpfiles >/dev/null; then + systemd-tmpfiles --create ${sysconfdir}/tmpfiles.d/suricata.conf +elif [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then ${sysconfdir}/init.d/populate-volatile.sh update fi } @@ -82,7 +90,7 @@ fi SYSTEMD_PACKAGES = "${PN}" PACKAGES =+ "${PN}-socketcontrol" -FILES_${PN} += "${systemd_unitdir}" +FILES_${PN} += "${systemd_unitdir} ${sysconfdir}/tmpfiles.d" FILES_${PN}-socketcontrol = "${bindir}/suricatasc ${PYTHON_SITEPACKAGES_DIR}" CONFFILES_${PN} = "${sysconfdir}/suricata/suricata.yaml" diff --git a/meta-security/recipes-mac/ccs-tools/ccs-tools_1.8.4.bb b/meta-security/recipes-mac/ccs-tools/ccs-tools_1.8.4.bb index 189504a55..2e37c0b3c 100644 --- a/meta-security/recipes-mac/ccs-tools/ccs-tools_1.8.4.bb +++ b/meta-security/recipes-mac/ccs-tools/ccs-tools_1.8.4.bb @@ -15,7 +15,7 @@ SRC_URI[sha256sum] = "c358b80a2ea77a9dda79dc2a056dae3acaf3a72fcb8481cfb1cd1f1674 S = "${WORKDIR}/${PN}" -inherit distro_features_check +inherit features_check do_make(){ oe_runmake USRLIBDIR=${libdir} all diff --git a/meta-security/recipes-security/checksecurity/checksecurity_2.0.15.bb b/meta-security/recipes-security/checksecurity/checksecurity_2.0.15.bb index a9616911b..030bf2515 100644 --- a/meta-security/recipes-security/checksecurity/checksecurity_2.0.15.bb +++ b/meta-security/recipes-security/checksecurity/checksecurity_2.0.15.bb @@ -5,7 +5,8 @@ LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" SRC_URI = "http://ftp.de.debian.org/debian/pool/main/c/checksecurity/checksecurity_${PV}.tar.gz \ - file://setuid-log-folder.patch" + file://setuid-log-folder.patch \ + file://check-setuid-use-more-portable-find-args.patch" SRC_URI[md5sum] = "a30161c3e24d3be710b2fd13fcd1f32f" SRC_URI[sha256sum] = "67abe3d6391c96146e96f376d3fd6eb7a9418b0f7fe205b465219889791dba32" diff --git a/meta-security/recipes-security/checksecurity/files/check-setuid-use-more-portable-find-args.patch b/meta-security/recipes-security/checksecurity/files/check-setuid-use-more-portable-find-args.patch new file mode 100644 index 000000000..f1fe8edce --- /dev/null +++ b/meta-security/recipes-security/checksecurity/files/check-setuid-use-more-portable-find-args.patch @@ -0,0 +1,23 @@ +From f3073b8e06a607677d47ad9a19533b2e33408a4f Mon Sep 17 00:00:00 2001 +From: Christopher Larson <chris_larson@mentor.com> +Date: Wed, 5 Sep 2018 23:21:43 +0500 +Subject: [PATCH] check-setuid: use more portable find args + +Signed-off-by: Christopher Larson <chris_larson@mentor.com> +--- + plugins/check-setuid | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +Index: checksecurity-2.0.15/plugins/check-setuid +=================================================================== +--- checksecurity-2.0.15.orig/plugins/check-setuid 2018-09-06 00:49:23.930934294 +0500 ++++ checksecurity-2.0.15/plugins/check-setuid 2018-09-06 00:49:49.694934757 +0500 +@@ -99,7 +99,7 @@ + ionice -t -c3 \ + find `mount | grep -vE "$CHECKSECURITY_FILTER" | cut -d ' ' -f 3` \ + -xdev $PATHCHK \ +- \( -type f -perm +06000 -o \( \( -type b -o -type c \) \ ++ \( -type f \( -perm -4000 -o -perm -2000 \) -o \( \( -type b -o -type c \) \ + $DEVCHK \) \) \ + -ignore_readdir_race \ + -printf "%8i %5m %3n %-10u %-10g %9s %t %h/%f\n" | diff --git a/meta-security/recipes-security/clamav/clamav_0.99.4.bb b/meta-security/recipes-security/clamav/clamav_0.99.4.bb index 7f0433777..a340b4856 100644 --- a/meta-security/recipes-security/clamav/clamav_0.99.4.bb +++ b/meta-security/recipes-security/clamav/clamav_0.99.4.bb @@ -15,6 +15,7 @@ SRC_URI = "git://github.com/vrtadmin/clamav-devel;branch=rel/0.99 \ file://clamd.conf \ file://freshclam.conf \ file://volatiles.03_clamav \ + file://tmpfiles.clamav \ file://${BPN}.service \ file://freshclam-native.conf \ " @@ -104,11 +105,15 @@ do_install_append_class-target () { install -m 666 ${S}/clamav_db/* ${D}/${localstatedir}/lib/clamav/. if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};then install -D -m 0644 ${WORKDIR}/clamav.service ${D}${systemd_unitdir}/system/clamav.service + install -d ${D}${sysconfdir}/tmpfiles.d + install -m 0644 ${WORKDIR}/tmpfiles.clamav ${D}${sysconfdir}/tmpfiles.d/clamav.conf fi } pkg_postinst_ontarget_${PN} () { - if [ -e /etc/init.d/populate-volatile.sh ] ; then + if command -v systemd-tmpfiles >/dev/null; then + systemd-tmpfiles --create ${sysconfdir}/tmpfiles.d/clamav.conf + elif [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then ${sysconfdir}/init.d/populate-volatile.sh update fi mkdir -p ${localstatedir}/lib/clamav @@ -140,6 +145,7 @@ FILES_${PN}-daemon = "${bindir}/clamconf ${bindir}/clamdtop ${sbindir}/clamd \ FILES_${PN}-freshclam = "${bindir}/freshclam \ ${sysconfdir}/freshclam.conf* \ ${sysconfdir}/clamav ${sysconfdir}/default/volatiles \ + ${sysconfdir}/tmpfiles.d/*.conf \ ${localstatedir}/lib/clamav \ ${docdir}/${PN}-freshclam ${mandir}/man1/freshclam.* \ ${mandir}/man5/freshclam.conf.* \ diff --git a/meta-security/recipes-security/clamav/files/tmpfiles.clamav b/meta-security/recipes-security/clamav/files/tmpfiles.clamav new file mode 100644 index 000000000..fd5adfeeb --- /dev/null +++ b/meta-security/recipes-security/clamav/files/tmpfiles.clamav @@ -0,0 +1,3 @@ +#Type Path Mode UID GID Age Argument +d /var/log/clamav 0755 clamav clamav - +f /var/log/clamav/freshclam.log 0644 clamav clamav - diff --git a/meta-security/recipes-security/google-authenticator-libpam/google-authenticator-libpam_1.05.bb b/meta-security/recipes-security/google-authenticator-libpam/google-authenticator-libpam_1.05.bb index 73b802fb9..2181629bd 100644 --- a/meta-security/recipes-security/google-authenticator-libpam/google-authenticator-libpam_1.05.bb +++ b/meta-security/recipes-security/google-authenticator-libpam/google-authenticator-libpam_1.05.bb @@ -10,7 +10,7 @@ DEPENDS = "libpam" S = "${WORKDIR}/git" -inherit autotools distro_features_check +inherit autotools features_check REQUIRED_DISTRO_FEATURES = "pam" diff --git a/meta-security/recipes-security/packagegroup/packagegroup-core-security-ptest.bb b/meta-security/recipes-security/packagegroup/packagegroup-core-security-ptest.bb index 39873b850..83a9ed83e 100644 --- a/meta-security/recipes-security/packagegroup/packagegroup-core-security-ptest.bb +++ b/meta-security/recipes-security/packagegroup/packagegroup-core-security-ptest.bb @@ -3,7 +3,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "ptest" diff --git a/meta-security/recipes-security/sssd/sssd_1.16.4.bb b/meta-security/recipes-security/sssd/sssd_1.16.4.bb index 34bc8c804..089a99e0d 100644 --- a/meta-security/recipes-security/sssd/sssd_1.16.4.bb +++ b/meta-security/recipes-security/sssd/sssd_1.16.4.bb @@ -14,7 +14,7 @@ SRC_URI = "https://releases.pagure.org/SSSD/${BPN}/${BP}.tar.gz\ SRC_URI[md5sum] = "757bbb6f15409d8d075f4f06cb678d50" SRC_URI[sha256sum] = "6bb212cd6b75b918e945c24e7c3f95a486fb54d7f7d489a9334cfa1a1f3bf959" -inherit autotools pkgconfig gettext python-dir distro_features_check +inherit autotools pkgconfig gettext python-dir features_check REQUIRED_DISTRO_FEATURES = "pam" |