From 15d70890184315d3d8280df070cee68f36dc0ad0 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 12 Dec 2019 03:01:06 +0000 Subject: bmcweb: srcrev bump 7166bf0fd7..97d57aaa0b Carol Wang (1): Redfish: Support health status of firmware inventory objects Joseph Reynolds (1): Change PAM service_name for password changes (From meta-phosphor rev: 62a575918839d6ff33e7fb7dcb54a89c26aa2af1) Change-Id: Id7e23222d0da952bf7a3b7c77a3bc9de237c7eea Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index 720b068c1..c7ee201b5 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 = "7166bf0fd7453f2b5d6bfb3afbdad5eb00f74990" +SRCREV = "97d57aaa0b95a110c71016d190f95f853051126a" S = "${WORKDIR}/git" -- cgit v1.2.3 From 4e9150039c2060abdc8347dcc4565f721025bc4d Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 12 Dec 2019 05:21:17 +0000 Subject: dbus-sensors: srcrev bump 73c363ff2d..d12f23ecc9 jayaprakash Mutyala (1): PSUEvent:Fix for ConfigureError deassert eventlog (From meta-phosphor rev: 166f4a1f204eaf9611ab6389dc364f9f4dc5a9b5) Change-Id: I711d1a94a712396d3b7bb8f2708c49a187056d10 Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb index 8c884ab85..adcb16704 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 = "73c363ff2d131b59149baaa0bc9bff41a3cfb125" +SRCREV = "d12f23ecc9e136d7593f75d3496f475ec4c12f55" PV = "0.1+git${SRCPV}" -- cgit v1.2.3 From 264dcc04d6affbb78098d01fa83200a7a058a26d Mon Sep 17 00:00:00 2001 From: Benjamin Fair Date: Thu, 17 Oct 2019 16:55:54 -0700 Subject: meta-phosphor: phosphor-ipmi-flash: add net bridge option Add a new PACKAGECONFIG option for enabling the network bridge data transfer backend. (From meta-phosphor rev: 23bb90e4e655008366d4aeb9918743de143b2457) Change-Id: I1ea955129e757431cd1aea059a25dfd0d051477c Signed-off-by: Benjamin Fair Signed-off-by: Brad Bishop --- meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb | 1 + 1 file changed, 1 insertion(+) 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 3c11d85e6..534e4ec7e 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb @@ -35,6 +35,7 @@ PACKAGECONFIG[host-bios] = "--enable-host-bios, --disable-host-bios" PACKAGECONFIG[aspeed-p2a] = "--enable-aspeed-p2a, --disable-aspeed-p2a" PACKAGECONFIG[aspeed-lpc] = "--enable-aspeed-lpc, --disable-aspeed-lpc" PACKAGECONFIG[nuvoton-lpc] = "--enable-nuvoton-lpc, --disable-nuvoton-lpc" +PACKAGECONFIG[net-bridge] = "--enable-net-bridge, --disable-net-bridge" EXTRA_OECONF = "--disable-tests --disable-build-host-tool" -- cgit v1.2.3 From 559017307cd076a282bc38ccfc1fb25754a35330 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 10 Dec 2019 13:03:03 -0800 Subject: Fixup hwmon filenames Our previous start_hwmon.sh script was not escaping the filenames properly, resulting in configuration filepaths that differed from the actual filepaths. (From meta-ingrasys rev: 66419549bc438ce800b9149ccae0ef02bf7e3bca) Change-Id: I4d7c634c8cbe0987ae4407d9fd1431ff16064119 Signed-off-by: William A. Kennington III Signed-off-by: Brad Bishop --- .../00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf | 84 ---------------------- .../01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf | 84 ---------------------- .../00:00:00:06/sbefifo1-dev0/occ-hwmon.1.conf | 84 ++++++++++++++++++++++ .../01:01:00:06/sbefifo2-dev0/occ-hwmon.2.conf | 84 ++++++++++++++++++++++ .../sensors/phosphor-hwmon_%.bbappend | 6 +- 5 files changed, 171 insertions(+), 171 deletions(-) delete mode 100644 meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf delete mode 100644 meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf create mode 100644 meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00:00/00:00:00:06/sbefifo1-dev0/occ-hwmon.1.conf create mode 100644 meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00:00/00:00:00:0a/fsi1/slave@01:00/01:01:00:06/sbefifo2-dev0/occ-hwmon.2.conf diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf deleted file mode 100644 index a5ccf550d..000000000 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf +++ /dev/null @@ -1,84 +0,0 @@ -REMOVERCS = "11, 74, 90, 110" -MODE_temp1 = "label" -MODE_temp2 = "label" -MODE_temp3 = "label" -MODE_temp4 = "label" -MODE_temp5 = "label" -MODE_temp6 = "label" -MODE_temp7 = "label" -MODE_temp8 = "label" -MODE_temp9 = "label" -MODE_temp10 = "label" -MODE_temp11 = "label" -MODE_temp12 = "label" -MODE_temp13 = "label" -MODE_temp14 = "label" -MODE_temp15 = "label" -MODE_temp16 = "label" -MODE_temp17 = "label" -MODE_temp18 = "label" -MODE_temp19 = "label" -MODE_temp20 = "label" -MODE_temp21 = "label" -MODE_temp22 = "label" -MODE_temp23 = "label" -MODE_temp24 = "label" -MODE_temp25 = "label" -MODE_temp26 = "label" -MODE_temp27 = "label" -MODE_temp28 = "label" -MODE_temp29 = "label" -MODE_temp30 = "label" -MODE_temp31 = "label" -MODE_temp32 = "label" -MODE_temp33 = "label" -MODE_temp34 = "label" -MODE_temp35 = "label" -MODE_temp36 = "label" -MODE_temp37 = "label" -MODE_temp38 = "label" -MODE_temp39 = "label" -MODE_temp40 = "label" -LABEL_temp34 = "p0_core0_temp" -LABEL_temp37 = "p0_core1_temp" -LABEL_temp40 = "p0_core2_temp" -LABEL_temp43 = "p0_core3_temp" -LABEL_temp46 = "p0_core4_temp" -LABEL_temp49 = "p0_core5_temp" -LABEL_temp52 = "p0_core6_temp" -LABEL_temp55 = "p0_core7_temp" -LABEL_temp58 = "p0_core8_temp" -LABEL_temp61 = "p0_core9_temp" -LABEL_temp64 = "p0_core10_temp" -LABEL_temp67 = "p0_core11_temp" -LABEL_temp70 = "p0_core12_temp" -LABEL_temp73 = "p0_core13_temp" -LABEL_temp76 = "p0_core14_temp" -LABEL_temp79 = "p0_core15_temp" -LABEL_temp82 = "p0_core16_temp" -LABEL_temp85 = "p0_core17_temp" -LABEL_temp88 = "p0_core18_temp" -LABEL_temp91 = "p0_core19_temp" -LABEL_temp94 = "p0_core20_temp" -LABEL_temp97 = "p0_core21_temp" -LABEL_temp100 = "p0_core22_temp" -LABEL_temp103 = "p0_core23_temp" -LABEL_temp224 = "dimm0_temp" -LABEL_temp226 = "dimm1_temp" -LABEL_temp228 = "dimm2_temp" -LABEL_temp230 = "dimm3_temp" -LABEL_temp232 = "dimm4_temp" -LABEL_temp234 = "dimm5_temp" -LABEL_temp236 = "dimm6_temp" -LABEL_temp238 = "dimm7_temp" -LABEL_temp240 = "dimm8_temp" -LABEL_temp242 = "dimm9_temp" -LABEL_temp244 = "dimm10_temp" -LABEL_temp246 = "dimm11_temp" -LABEL_temp248 = "dimm12_temp" -LABEL_temp250 = "dimm13_temp" -LABEL_temp252 = "dimm14_temp" -LABEL_temp254 = "dimm15_temp" -LABEL_power2 = "p0_power" -LABEL_power3 = "p0_vdd_power" -LABEL_power4 = "p0_vdn_power" diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf deleted file mode 100644 index 55f3f1dcf..000000000 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf +++ /dev/null @@ -1,84 +0,0 @@ -REMOVERCS = "11, 74, 90, 110" -MODE_temp1 = "label" -MODE_temp2 = "label" -MODE_temp3 = "label" -MODE_temp4 = "label" -MODE_temp5 = "label" -MODE_temp6 = "label" -MODE_temp7 = "label" -MODE_temp8 = "label" -MODE_temp9 = "label" -MODE_temp10 = "label" -MODE_temp11 = "label" -MODE_temp12 = "label" -MODE_temp13 = "label" -MODE_temp14 = "label" -MODE_temp15 = "label" -MODE_temp16 = "label" -MODE_temp17 = "label" -MODE_temp18 = "label" -MODE_temp19 = "label" -MODE_temp20 = "label" -MODE_temp21 = "label" -MODE_temp22 = "label" -MODE_temp23 = "label" -MODE_temp24 = "label" -MODE_temp25 = "label" -MODE_temp26 = "label" -MODE_temp27 = "label" -MODE_temp28 = "label" -MODE_temp29 = "label" -MODE_temp30 = "label" -MODE_temp31 = "label" -MODE_temp32 = "label" -MODE_temp33 = "label" -MODE_temp34 = "label" -MODE_temp35 = "label" -MODE_temp36 = "label" -MODE_temp37 = "label" -MODE_temp38 = "label" -MODE_temp39 = "label" -MODE_temp40 = "label" -LABEL_temp114 = "p1_core0_temp" -LABEL_temp117 = "p1_core1_temp" -LABEL_temp120 = "p1_core2_temp" -LABEL_temp123 = "p1_core3_temp" -LABEL_temp126 = "p1_core4_temp" -LABEL_temp129 = "p1_core5_temp" -LABEL_temp132 = "p1_core6_temp" -LABEL_temp135 = "p1_core7_temp" -LABEL_temp138 = "p1_core8_temp" -LABEL_temp141 = "p1_core9_temp" -LABEL_temp144 = "p1_core10_temp" -LABEL_temp147 = "p1_core11_temp" -LABEL_temp150 = "p1_core12_temp" -LABEL_temp153 = "p1_core13_temp" -LABEL_temp156 = "p1_core14_temp" -LABEL_temp159 = "p1_core15_temp" -LABEL_temp162 = "p1_core16_temp" -LABEL_temp165 = "p1_core17_temp" -LABEL_temp168 = "p1_core18_temp" -LABEL_temp171 = "p1_core19_temp" -LABEL_temp174 = "p1_core20_temp" -LABEL_temp177 = "p1_core21_temp" -LABEL_temp180 = "p1_core22_temp" -LABEL_temp183 = "p1_core23_temp" -LABEL_temp192 = "dimm16_temp" -LABEL_temp194 = "dimm17_temp" -LABEL_temp196 = "dimm18_temp" -LABEL_temp198 = "dimm19_temp" -LABEL_temp200 = "dimm20_temp" -LABEL_temp202 = "dimm21_temp" -LABEL_temp204 = "dimm22_temp" -LABEL_temp206 = "dimm23_temp" -LABEL_temp208 = "dimm24_temp" -LABEL_temp210 = "dimm25_temp" -LABEL_temp212 = "dimm26_temp" -LABEL_temp224 = "dimm27_temp" -LABEL_temp216 = "dimm28_temp" -LABEL_temp218 = "dimm29_temp" -LABEL_temp220 = "dimm30_temp" -LABEL_temp222 = "dimm31_temp" -LABEL_power2 = "p1_power" -LABEL_power3 = "p1_vdd_power" -LABEL_power4 = "p1_vdn_power" diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00:00/00:00:00:06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00:00/00:00:00:06/sbefifo1-dev0/occ-hwmon.1.conf new file mode 100644 index 000000000..a5ccf550d --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00:00/00:00:00:06/sbefifo1-dev0/occ-hwmon.1.conf @@ -0,0 +1,84 @@ +REMOVERCS = "11, 74, 90, 110" +MODE_temp1 = "label" +MODE_temp2 = "label" +MODE_temp3 = "label" +MODE_temp4 = "label" +MODE_temp5 = "label" +MODE_temp6 = "label" +MODE_temp7 = "label" +MODE_temp8 = "label" +MODE_temp9 = "label" +MODE_temp10 = "label" +MODE_temp11 = "label" +MODE_temp12 = "label" +MODE_temp13 = "label" +MODE_temp14 = "label" +MODE_temp15 = "label" +MODE_temp16 = "label" +MODE_temp17 = "label" +MODE_temp18 = "label" +MODE_temp19 = "label" +MODE_temp20 = "label" +MODE_temp21 = "label" +MODE_temp22 = "label" +MODE_temp23 = "label" +MODE_temp24 = "label" +MODE_temp25 = "label" +MODE_temp26 = "label" +MODE_temp27 = "label" +MODE_temp28 = "label" +MODE_temp29 = "label" +MODE_temp30 = "label" +MODE_temp31 = "label" +MODE_temp32 = "label" +MODE_temp33 = "label" +MODE_temp34 = "label" +MODE_temp35 = "label" +MODE_temp36 = "label" +MODE_temp37 = "label" +MODE_temp38 = "label" +MODE_temp39 = "label" +MODE_temp40 = "label" +LABEL_temp34 = "p0_core0_temp" +LABEL_temp37 = "p0_core1_temp" +LABEL_temp40 = "p0_core2_temp" +LABEL_temp43 = "p0_core3_temp" +LABEL_temp46 = "p0_core4_temp" +LABEL_temp49 = "p0_core5_temp" +LABEL_temp52 = "p0_core6_temp" +LABEL_temp55 = "p0_core7_temp" +LABEL_temp58 = "p0_core8_temp" +LABEL_temp61 = "p0_core9_temp" +LABEL_temp64 = "p0_core10_temp" +LABEL_temp67 = "p0_core11_temp" +LABEL_temp70 = "p0_core12_temp" +LABEL_temp73 = "p0_core13_temp" +LABEL_temp76 = "p0_core14_temp" +LABEL_temp79 = "p0_core15_temp" +LABEL_temp82 = "p0_core16_temp" +LABEL_temp85 = "p0_core17_temp" +LABEL_temp88 = "p0_core18_temp" +LABEL_temp91 = "p0_core19_temp" +LABEL_temp94 = "p0_core20_temp" +LABEL_temp97 = "p0_core21_temp" +LABEL_temp100 = "p0_core22_temp" +LABEL_temp103 = "p0_core23_temp" +LABEL_temp224 = "dimm0_temp" +LABEL_temp226 = "dimm1_temp" +LABEL_temp228 = "dimm2_temp" +LABEL_temp230 = "dimm3_temp" +LABEL_temp232 = "dimm4_temp" +LABEL_temp234 = "dimm5_temp" +LABEL_temp236 = "dimm6_temp" +LABEL_temp238 = "dimm7_temp" +LABEL_temp240 = "dimm8_temp" +LABEL_temp242 = "dimm9_temp" +LABEL_temp244 = "dimm10_temp" +LABEL_temp246 = "dimm11_temp" +LABEL_temp248 = "dimm12_temp" +LABEL_temp250 = "dimm13_temp" +LABEL_temp252 = "dimm14_temp" +LABEL_temp254 = "dimm15_temp" +LABEL_power2 = "p0_power" +LABEL_power3 = "p0_vdd_power" +LABEL_power4 = "p0_vdn_power" diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00:00/00:00:00:0a/fsi1/slave@01:00/01:01:00:06/sbefifo2-dev0/occ-hwmon.2.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00:00/00:00:00:0a/fsi1/slave@01:00/01:01:00:06/sbefifo2-dev0/occ-hwmon.2.conf new file mode 100644 index 000000000..55f3f1dcf --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00:00/00:00:00:0a/fsi1/slave@01:00/01:01:00:06/sbefifo2-dev0/occ-hwmon.2.conf @@ -0,0 +1,84 @@ +REMOVERCS = "11, 74, 90, 110" +MODE_temp1 = "label" +MODE_temp2 = "label" +MODE_temp3 = "label" +MODE_temp4 = "label" +MODE_temp5 = "label" +MODE_temp6 = "label" +MODE_temp7 = "label" +MODE_temp8 = "label" +MODE_temp9 = "label" +MODE_temp10 = "label" +MODE_temp11 = "label" +MODE_temp12 = "label" +MODE_temp13 = "label" +MODE_temp14 = "label" +MODE_temp15 = "label" +MODE_temp16 = "label" +MODE_temp17 = "label" +MODE_temp18 = "label" +MODE_temp19 = "label" +MODE_temp20 = "label" +MODE_temp21 = "label" +MODE_temp22 = "label" +MODE_temp23 = "label" +MODE_temp24 = "label" +MODE_temp25 = "label" +MODE_temp26 = "label" +MODE_temp27 = "label" +MODE_temp28 = "label" +MODE_temp29 = "label" +MODE_temp30 = "label" +MODE_temp31 = "label" +MODE_temp32 = "label" +MODE_temp33 = "label" +MODE_temp34 = "label" +MODE_temp35 = "label" +MODE_temp36 = "label" +MODE_temp37 = "label" +MODE_temp38 = "label" +MODE_temp39 = "label" +MODE_temp40 = "label" +LABEL_temp114 = "p1_core0_temp" +LABEL_temp117 = "p1_core1_temp" +LABEL_temp120 = "p1_core2_temp" +LABEL_temp123 = "p1_core3_temp" +LABEL_temp126 = "p1_core4_temp" +LABEL_temp129 = "p1_core5_temp" +LABEL_temp132 = "p1_core6_temp" +LABEL_temp135 = "p1_core7_temp" +LABEL_temp138 = "p1_core8_temp" +LABEL_temp141 = "p1_core9_temp" +LABEL_temp144 = "p1_core10_temp" +LABEL_temp147 = "p1_core11_temp" +LABEL_temp150 = "p1_core12_temp" +LABEL_temp153 = "p1_core13_temp" +LABEL_temp156 = "p1_core14_temp" +LABEL_temp159 = "p1_core15_temp" +LABEL_temp162 = "p1_core16_temp" +LABEL_temp165 = "p1_core17_temp" +LABEL_temp168 = "p1_core18_temp" +LABEL_temp171 = "p1_core19_temp" +LABEL_temp174 = "p1_core20_temp" +LABEL_temp177 = "p1_core21_temp" +LABEL_temp180 = "p1_core22_temp" +LABEL_temp183 = "p1_core23_temp" +LABEL_temp192 = "dimm16_temp" +LABEL_temp194 = "dimm17_temp" +LABEL_temp196 = "dimm18_temp" +LABEL_temp198 = "dimm19_temp" +LABEL_temp200 = "dimm20_temp" +LABEL_temp202 = "dimm21_temp" +LABEL_temp204 = "dimm22_temp" +LABEL_temp206 = "dimm23_temp" +LABEL_temp208 = "dimm24_temp" +LABEL_temp210 = "dimm25_temp" +LABEL_temp212 = "dimm26_temp" +LABEL_temp224 = "dimm27_temp" +LABEL_temp216 = "dimm28_temp" +LABEL_temp218 = "dimm29_temp" +LABEL_temp220 = "dimm30_temp" +LABEL_temp222 = "dimm31_temp" +LABEL_power2 = "p1_power" +LABEL_power3 = "p1_vdd_power" +LABEL_power4 = "p1_vdn_power" diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index b5b0fbced..5260498b8 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -25,10 +25,10 @@ ZAIUS_ITEMS += " onewire2.conf" ZAIUS_ITEMS += " onewire3.conf" ZAIUS_OCCS = " \ - 00--00--00--06/sbefifo1-dev0/occ-hwmon.1 \ - 00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2 \ + 00:00:00:06/sbefifo1-dev0/occ-hwmon.1 \ + 00:00:00:0a/fsi1/slave@01:00/01:01:00:06/sbefifo2-dev0/occ-hwmon.2 \ " -ZAIUS_OCCSFMT = "devices/platform/gpio-fsi/fsi0/slave@00--00/{0}.conf" +ZAIUS_OCCSFMT = "devices/platform/gpio-fsi/fsi0/slave@00:00/{0}.conf" ZAIUS_OCCITEMS = "${@compose_list(d, 'ZAIUS_OCCSFMT', 'ZAIUS_OCCS')}" ENVS = "obmc/hwmon/{0}" -- cgit v1.2.3 From 6aafc64d27318d5c2dc82b4195ee0318618bb3e9 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 12 Dec 2019 09:10:40 +0000 Subject: openpower-proc-control: srcrev bump 22a057ed88..b181d3bb87 Ramesh Iyyar (2): Added feature flag instead of CHIPS Enabled pHAL infrastructure to boot the host (From meta-openpower rev: 4bb6ee298278d0dcb40d3050427cd82ca0e48a49) Change-Id: Ia9f049f92829afc379003563a8dcbc87e61d496d Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-openpower/recipes-phosphor/host/op-proc-control_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb index a72adb66e..2ff565db7 100644 --- a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb +++ b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb @@ -11,7 +11,7 @@ inherit autotools obmc-phosphor-utils pkgconfig pythonnative inherit systemd SRC_URI += "git://github.com/openbmc/openpower-proc-control" -SRCREV = "22a057ed88f0f68aca521cf8e239413113b31932" +SRCREV = "b181d3bb878f986598751ddb1875577b7ba65a39" DEPENDS += " \ autoconf-archive-native \ -- cgit v1.2.3 From bac788912fe2bc34599d4f63735b7fc3c0b76195 Mon Sep 17 00:00:00 2001 From: George Liu Date: Tue, 10 Dec 2019 11:43:11 +0800 Subject: fp5280g2: Fix missing power-supply-monitor configs Since the SYSTEMD_ENVIRONMENT_FILE_${PN} defined in obmc-phosphor-systemd.bbclass, and the phosphor-power_%.bbappend have not inherit obmc-phosphor-systemd, so all of the power-supply-monitor-*.conf are not installed. Tested: Built fp5280g2 successfully and includes the power-supply-monitor configs. (From meta-inspur rev: 05c197192a813e5d276e9b2c0c7d4ac19f726b7d) Signed-off-by: George Liu Change-Id: Icd31b517536cd77ced911deb796c7c7549b0b480 Signed-off-by: Brad Bishop --- .../meta-fp5280g2/recipes-phosphor/power/phosphor-power_%.bbappend | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power_%.bbappend index ad1232a24..02f0d2bcd 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power_%.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power_%.bbappend @@ -1,5 +1,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +inherit obmc-phosphor-systemd + SRC_URI += "file://psu.json" PSU_MONITOR_ENV_FMT = "obmc/power-supply-monitor/power-supply-monitor-{0}.conf" -- cgit v1.2.3 From dbd5699ea53275eb3d1895174eadeaee31cd17ad Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 13 Dec 2019 18:20:28 +0000 Subject: intel-ipmi-oem: srcrev bump 09a8314bb7..822b0b40ef Suryakanth Sekar (1): Enchance the set specialuser password cmd for ASD (From meta-intel rev: 65bcc1018e9702a6c1678b2b79550ff4ab83ccbf) Change-Id: I85e274f5e6c8aa7493bcd62d6048aeb00910ee71 Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ae4c31e99..c0f44d3d9 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,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/intel-ipmi-oem" -SRCREV = "09a8314bb754dccd4af2ef8d2d9e6e43f6da74ec" +SRCREV = "822b0b40efe7695b56e1edb80f995d3c810d6d22" S = "${WORKDIR}/git" PV = "0.1+git${SRCPV}" -- cgit v1.2.3 From 702025114ee46882b52c7c4d7c893a18cc0f5a91 Mon Sep 17 00:00:00 2001 From: Joseph Liu Date: Mon, 11 Nov 2019 19:00:49 +0800 Subject: u-boot-nuvoton: srcrev bump 053010cb581..adb4ac1af3f Stanley Chu(1): npcm7xx: invalidate L2 cache in lowlevel_init Joseph Liu(3): runbmc: don't reset all gpio bank if core domain reset Revert "runbmc: don't reset all gpio bank if core domain reset" runbmc: don't reset gpiom5 if core domain reset (From meta-nuvoton rev: f90dac58bf0830ee2896c1ed2298e7cc58533b0d) Signed-off-by: Joseph Liu Change-Id: Idf6efd0cd16d26e350d8b9761778957f0854e920 Signed-off-by: Brad Bishop --- meta-nuvoton/recipes-bsp/u-boot/u-boot-common-nuvoton.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-nuvoton/recipes-bsp/u-boot/u-boot-common-nuvoton.inc b/meta-nuvoton/recipes-bsp/u-boot/u-boot-common-nuvoton.inc index e049d9bd1..7ab0dedbd 100644 --- a/meta-nuvoton/recipes-bsp/u-boot/u-boot-common-nuvoton.inc +++ b/meta-nuvoton/recipes-bsp/u-boot/u-boot-common-nuvoton.inc @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" UBRANCH = "npcm7xx-v2019.01" SRC_URI = "git://github.com/Nuvoton-Israel/u-boot.git;branch=${UBRANCH}" -SRCREV = "053010cb581266c6be675b9ae4ca7bf0583e8538" +SRCREV = "adb4ac1af3f952ee6248e839af0c8600a0642d4b" S = "${WORKDIR}/git" -- cgit v1.2.3 From ba8655bcb2d07cc7f2d46d55d2186da719c8038f Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Mon, 16 Dec 2019 14:24:40 -0500 Subject: Revert "Fixup hwmon filenames" This reverts commit 66419549bc438ce800b9149ccae0ef02bf7e3bca. This patch is still under development and as is breaks the build. (From meta-ingrasys rev: df05e2d9f5843abf8cf4ef81a6b42752475ad6d8) Change-Id: I2158c28a2033c2bcf5f8a9cded8e345e39d5df6b Signed-off-by: Brad Bishop --- .../00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf | 84 ++++++++++++++++++++++ .../01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf | 84 ++++++++++++++++++++++ .../00:00:00:06/sbefifo1-dev0/occ-hwmon.1.conf | 84 ---------------------- .../01:01:00:06/sbefifo2-dev0/occ-hwmon.2.conf | 84 ---------------------- .../sensors/phosphor-hwmon_%.bbappend | 6 +- 5 files changed, 171 insertions(+), 171 deletions(-) create mode 100644 meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf create mode 100644 meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf delete mode 100644 meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00:00/00:00:00:06/sbefifo1-dev0/occ-hwmon.1.conf delete mode 100644 meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00:00/00:00:00:0a/fsi1/slave@01:00/01:01:00:06/sbefifo2-dev0/occ-hwmon.2.conf diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf new file mode 100644 index 000000000..a5ccf550d --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf @@ -0,0 +1,84 @@ +REMOVERCS = "11, 74, 90, 110" +MODE_temp1 = "label" +MODE_temp2 = "label" +MODE_temp3 = "label" +MODE_temp4 = "label" +MODE_temp5 = "label" +MODE_temp6 = "label" +MODE_temp7 = "label" +MODE_temp8 = "label" +MODE_temp9 = "label" +MODE_temp10 = "label" +MODE_temp11 = "label" +MODE_temp12 = "label" +MODE_temp13 = "label" +MODE_temp14 = "label" +MODE_temp15 = "label" +MODE_temp16 = "label" +MODE_temp17 = "label" +MODE_temp18 = "label" +MODE_temp19 = "label" +MODE_temp20 = "label" +MODE_temp21 = "label" +MODE_temp22 = "label" +MODE_temp23 = "label" +MODE_temp24 = "label" +MODE_temp25 = "label" +MODE_temp26 = "label" +MODE_temp27 = "label" +MODE_temp28 = "label" +MODE_temp29 = "label" +MODE_temp30 = "label" +MODE_temp31 = "label" +MODE_temp32 = "label" +MODE_temp33 = "label" +MODE_temp34 = "label" +MODE_temp35 = "label" +MODE_temp36 = "label" +MODE_temp37 = "label" +MODE_temp38 = "label" +MODE_temp39 = "label" +MODE_temp40 = "label" +LABEL_temp34 = "p0_core0_temp" +LABEL_temp37 = "p0_core1_temp" +LABEL_temp40 = "p0_core2_temp" +LABEL_temp43 = "p0_core3_temp" +LABEL_temp46 = "p0_core4_temp" +LABEL_temp49 = "p0_core5_temp" +LABEL_temp52 = "p0_core6_temp" +LABEL_temp55 = "p0_core7_temp" +LABEL_temp58 = "p0_core8_temp" +LABEL_temp61 = "p0_core9_temp" +LABEL_temp64 = "p0_core10_temp" +LABEL_temp67 = "p0_core11_temp" +LABEL_temp70 = "p0_core12_temp" +LABEL_temp73 = "p0_core13_temp" +LABEL_temp76 = "p0_core14_temp" +LABEL_temp79 = "p0_core15_temp" +LABEL_temp82 = "p0_core16_temp" +LABEL_temp85 = "p0_core17_temp" +LABEL_temp88 = "p0_core18_temp" +LABEL_temp91 = "p0_core19_temp" +LABEL_temp94 = "p0_core20_temp" +LABEL_temp97 = "p0_core21_temp" +LABEL_temp100 = "p0_core22_temp" +LABEL_temp103 = "p0_core23_temp" +LABEL_temp224 = "dimm0_temp" +LABEL_temp226 = "dimm1_temp" +LABEL_temp228 = "dimm2_temp" +LABEL_temp230 = "dimm3_temp" +LABEL_temp232 = "dimm4_temp" +LABEL_temp234 = "dimm5_temp" +LABEL_temp236 = "dimm6_temp" +LABEL_temp238 = "dimm7_temp" +LABEL_temp240 = "dimm8_temp" +LABEL_temp242 = "dimm9_temp" +LABEL_temp244 = "dimm10_temp" +LABEL_temp246 = "dimm11_temp" +LABEL_temp248 = "dimm12_temp" +LABEL_temp250 = "dimm13_temp" +LABEL_temp252 = "dimm14_temp" +LABEL_temp254 = "dimm15_temp" +LABEL_power2 = "p0_power" +LABEL_power3 = "p0_vdd_power" +LABEL_power4 = "p0_vdn_power" diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf new file mode 100644 index 000000000..55f3f1dcf --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf @@ -0,0 +1,84 @@ +REMOVERCS = "11, 74, 90, 110" +MODE_temp1 = "label" +MODE_temp2 = "label" +MODE_temp3 = "label" +MODE_temp4 = "label" +MODE_temp5 = "label" +MODE_temp6 = "label" +MODE_temp7 = "label" +MODE_temp8 = "label" +MODE_temp9 = "label" +MODE_temp10 = "label" +MODE_temp11 = "label" +MODE_temp12 = "label" +MODE_temp13 = "label" +MODE_temp14 = "label" +MODE_temp15 = "label" +MODE_temp16 = "label" +MODE_temp17 = "label" +MODE_temp18 = "label" +MODE_temp19 = "label" +MODE_temp20 = "label" +MODE_temp21 = "label" +MODE_temp22 = "label" +MODE_temp23 = "label" +MODE_temp24 = "label" +MODE_temp25 = "label" +MODE_temp26 = "label" +MODE_temp27 = "label" +MODE_temp28 = "label" +MODE_temp29 = "label" +MODE_temp30 = "label" +MODE_temp31 = "label" +MODE_temp32 = "label" +MODE_temp33 = "label" +MODE_temp34 = "label" +MODE_temp35 = "label" +MODE_temp36 = "label" +MODE_temp37 = "label" +MODE_temp38 = "label" +MODE_temp39 = "label" +MODE_temp40 = "label" +LABEL_temp114 = "p1_core0_temp" +LABEL_temp117 = "p1_core1_temp" +LABEL_temp120 = "p1_core2_temp" +LABEL_temp123 = "p1_core3_temp" +LABEL_temp126 = "p1_core4_temp" +LABEL_temp129 = "p1_core5_temp" +LABEL_temp132 = "p1_core6_temp" +LABEL_temp135 = "p1_core7_temp" +LABEL_temp138 = "p1_core8_temp" +LABEL_temp141 = "p1_core9_temp" +LABEL_temp144 = "p1_core10_temp" +LABEL_temp147 = "p1_core11_temp" +LABEL_temp150 = "p1_core12_temp" +LABEL_temp153 = "p1_core13_temp" +LABEL_temp156 = "p1_core14_temp" +LABEL_temp159 = "p1_core15_temp" +LABEL_temp162 = "p1_core16_temp" +LABEL_temp165 = "p1_core17_temp" +LABEL_temp168 = "p1_core18_temp" +LABEL_temp171 = "p1_core19_temp" +LABEL_temp174 = "p1_core20_temp" +LABEL_temp177 = "p1_core21_temp" +LABEL_temp180 = "p1_core22_temp" +LABEL_temp183 = "p1_core23_temp" +LABEL_temp192 = "dimm16_temp" +LABEL_temp194 = "dimm17_temp" +LABEL_temp196 = "dimm18_temp" +LABEL_temp198 = "dimm19_temp" +LABEL_temp200 = "dimm20_temp" +LABEL_temp202 = "dimm21_temp" +LABEL_temp204 = "dimm22_temp" +LABEL_temp206 = "dimm23_temp" +LABEL_temp208 = "dimm24_temp" +LABEL_temp210 = "dimm25_temp" +LABEL_temp212 = "dimm26_temp" +LABEL_temp224 = "dimm27_temp" +LABEL_temp216 = "dimm28_temp" +LABEL_temp218 = "dimm29_temp" +LABEL_temp220 = "dimm30_temp" +LABEL_temp222 = "dimm31_temp" +LABEL_power2 = "p1_power" +LABEL_power3 = "p1_vdd_power" +LABEL_power4 = "p1_vdn_power" diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00:00/00:00:00:06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00:00/00:00:00:06/sbefifo1-dev0/occ-hwmon.1.conf deleted file mode 100644 index a5ccf550d..000000000 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00:00/00:00:00:06/sbefifo1-dev0/occ-hwmon.1.conf +++ /dev/null @@ -1,84 +0,0 @@ -REMOVERCS = "11, 74, 90, 110" -MODE_temp1 = "label" -MODE_temp2 = "label" -MODE_temp3 = "label" -MODE_temp4 = "label" -MODE_temp5 = "label" -MODE_temp6 = "label" -MODE_temp7 = "label" -MODE_temp8 = "label" -MODE_temp9 = "label" -MODE_temp10 = "label" -MODE_temp11 = "label" -MODE_temp12 = "label" -MODE_temp13 = "label" -MODE_temp14 = "label" -MODE_temp15 = "label" -MODE_temp16 = "label" -MODE_temp17 = "label" -MODE_temp18 = "label" -MODE_temp19 = "label" -MODE_temp20 = "label" -MODE_temp21 = "label" -MODE_temp22 = "label" -MODE_temp23 = "label" -MODE_temp24 = "label" -MODE_temp25 = "label" -MODE_temp26 = "label" -MODE_temp27 = "label" -MODE_temp28 = "label" -MODE_temp29 = "label" -MODE_temp30 = "label" -MODE_temp31 = "label" -MODE_temp32 = "label" -MODE_temp33 = "label" -MODE_temp34 = "label" -MODE_temp35 = "label" -MODE_temp36 = "label" -MODE_temp37 = "label" -MODE_temp38 = "label" -MODE_temp39 = "label" -MODE_temp40 = "label" -LABEL_temp34 = "p0_core0_temp" -LABEL_temp37 = "p0_core1_temp" -LABEL_temp40 = "p0_core2_temp" -LABEL_temp43 = "p0_core3_temp" -LABEL_temp46 = "p0_core4_temp" -LABEL_temp49 = "p0_core5_temp" -LABEL_temp52 = "p0_core6_temp" -LABEL_temp55 = "p0_core7_temp" -LABEL_temp58 = "p0_core8_temp" -LABEL_temp61 = "p0_core9_temp" -LABEL_temp64 = "p0_core10_temp" -LABEL_temp67 = "p0_core11_temp" -LABEL_temp70 = "p0_core12_temp" -LABEL_temp73 = "p0_core13_temp" -LABEL_temp76 = "p0_core14_temp" -LABEL_temp79 = "p0_core15_temp" -LABEL_temp82 = "p0_core16_temp" -LABEL_temp85 = "p0_core17_temp" -LABEL_temp88 = "p0_core18_temp" -LABEL_temp91 = "p0_core19_temp" -LABEL_temp94 = "p0_core20_temp" -LABEL_temp97 = "p0_core21_temp" -LABEL_temp100 = "p0_core22_temp" -LABEL_temp103 = "p0_core23_temp" -LABEL_temp224 = "dimm0_temp" -LABEL_temp226 = "dimm1_temp" -LABEL_temp228 = "dimm2_temp" -LABEL_temp230 = "dimm3_temp" -LABEL_temp232 = "dimm4_temp" -LABEL_temp234 = "dimm5_temp" -LABEL_temp236 = "dimm6_temp" -LABEL_temp238 = "dimm7_temp" -LABEL_temp240 = "dimm8_temp" -LABEL_temp242 = "dimm9_temp" -LABEL_temp244 = "dimm10_temp" -LABEL_temp246 = "dimm11_temp" -LABEL_temp248 = "dimm12_temp" -LABEL_temp250 = "dimm13_temp" -LABEL_temp252 = "dimm14_temp" -LABEL_temp254 = "dimm15_temp" -LABEL_power2 = "p0_power" -LABEL_power3 = "p0_vdd_power" -LABEL_power4 = "p0_vdn_power" diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00:00/00:00:00:0a/fsi1/slave@01:00/01:01:00:06/sbefifo2-dev0/occ-hwmon.2.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00:00/00:00:00:0a/fsi1/slave@01:00/01:01:00:06/sbefifo2-dev0/occ-hwmon.2.conf deleted file mode 100644 index 55f3f1dcf..000000000 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00:00/00:00:00:0a/fsi1/slave@01:00/01:01:00:06/sbefifo2-dev0/occ-hwmon.2.conf +++ /dev/null @@ -1,84 +0,0 @@ -REMOVERCS = "11, 74, 90, 110" -MODE_temp1 = "label" -MODE_temp2 = "label" -MODE_temp3 = "label" -MODE_temp4 = "label" -MODE_temp5 = "label" -MODE_temp6 = "label" -MODE_temp7 = "label" -MODE_temp8 = "label" -MODE_temp9 = "label" -MODE_temp10 = "label" -MODE_temp11 = "label" -MODE_temp12 = "label" -MODE_temp13 = "label" -MODE_temp14 = "label" -MODE_temp15 = "label" -MODE_temp16 = "label" -MODE_temp17 = "label" -MODE_temp18 = "label" -MODE_temp19 = "label" -MODE_temp20 = "label" -MODE_temp21 = "label" -MODE_temp22 = "label" -MODE_temp23 = "label" -MODE_temp24 = "label" -MODE_temp25 = "label" -MODE_temp26 = "label" -MODE_temp27 = "label" -MODE_temp28 = "label" -MODE_temp29 = "label" -MODE_temp30 = "label" -MODE_temp31 = "label" -MODE_temp32 = "label" -MODE_temp33 = "label" -MODE_temp34 = "label" -MODE_temp35 = "label" -MODE_temp36 = "label" -MODE_temp37 = "label" -MODE_temp38 = "label" -MODE_temp39 = "label" -MODE_temp40 = "label" -LABEL_temp114 = "p1_core0_temp" -LABEL_temp117 = "p1_core1_temp" -LABEL_temp120 = "p1_core2_temp" -LABEL_temp123 = "p1_core3_temp" -LABEL_temp126 = "p1_core4_temp" -LABEL_temp129 = "p1_core5_temp" -LABEL_temp132 = "p1_core6_temp" -LABEL_temp135 = "p1_core7_temp" -LABEL_temp138 = "p1_core8_temp" -LABEL_temp141 = "p1_core9_temp" -LABEL_temp144 = "p1_core10_temp" -LABEL_temp147 = "p1_core11_temp" -LABEL_temp150 = "p1_core12_temp" -LABEL_temp153 = "p1_core13_temp" -LABEL_temp156 = "p1_core14_temp" -LABEL_temp159 = "p1_core15_temp" -LABEL_temp162 = "p1_core16_temp" -LABEL_temp165 = "p1_core17_temp" -LABEL_temp168 = "p1_core18_temp" -LABEL_temp171 = "p1_core19_temp" -LABEL_temp174 = "p1_core20_temp" -LABEL_temp177 = "p1_core21_temp" -LABEL_temp180 = "p1_core22_temp" -LABEL_temp183 = "p1_core23_temp" -LABEL_temp192 = "dimm16_temp" -LABEL_temp194 = "dimm17_temp" -LABEL_temp196 = "dimm18_temp" -LABEL_temp198 = "dimm19_temp" -LABEL_temp200 = "dimm20_temp" -LABEL_temp202 = "dimm21_temp" -LABEL_temp204 = "dimm22_temp" -LABEL_temp206 = "dimm23_temp" -LABEL_temp208 = "dimm24_temp" -LABEL_temp210 = "dimm25_temp" -LABEL_temp212 = "dimm26_temp" -LABEL_temp224 = "dimm27_temp" -LABEL_temp216 = "dimm28_temp" -LABEL_temp218 = "dimm29_temp" -LABEL_temp220 = "dimm30_temp" -LABEL_temp222 = "dimm31_temp" -LABEL_power2 = "p1_power" -LABEL_power3 = "p1_vdd_power" -LABEL_power4 = "p1_vdn_power" diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 5260498b8..b5b0fbced 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -25,10 +25,10 @@ ZAIUS_ITEMS += " onewire2.conf" ZAIUS_ITEMS += " onewire3.conf" ZAIUS_OCCS = " \ - 00:00:00:06/sbefifo1-dev0/occ-hwmon.1 \ - 00:00:00:0a/fsi1/slave@01:00/01:01:00:06/sbefifo2-dev0/occ-hwmon.2 \ + 00--00--00--06/sbefifo1-dev0/occ-hwmon.1 \ + 00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2 \ " -ZAIUS_OCCSFMT = "devices/platform/gpio-fsi/fsi0/slave@00:00/{0}.conf" +ZAIUS_OCCSFMT = "devices/platform/gpio-fsi/fsi0/slave@00--00/{0}.conf" ZAIUS_OCCITEMS = "${@compose_list(d, 'ZAIUS_OCCSFMT', 'ZAIUS_OCCS')}" ENVS = "obmc/hwmon/{0}" -- cgit v1.2.3 From b92147cf66fed9e3636d945cb50ab7fae2fd7192 Mon Sep 17 00:00:00 2001 From: Vernon Mauery Date: Thu, 17 Oct 2019 11:22:20 -0700 Subject: Move ast2600 to use hard float call convention Before this change, the ast2600 binaries were built with the soft float call convention, which allows them to run on systems that don't have hard float FPUs. Internally, this changes yocto to build like this: CXX="arm-openbmc-linux-gnueabi-g++ \ -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard ... CPP="arm-openbmc-linux-gnueabi-gcc \ -march=armv7-a -mfpu=vfpv4-d16 -mfloat-abi=hard ... Tested: Builds and boots on ast2600-EVB (From meta-aspeed rev: 53e322518fe6f471663746934e38bf5d8143a501) Change-Id: If8037c66301ca4a3588d10270fe8d2fc610bb195 Signed-off-by: Vernon Mauery Signed-off-by: Brad Bishop --- meta-aspeed/conf/machine/include/aspeed.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-aspeed/conf/machine/include/aspeed.inc b/meta-aspeed/conf/machine/include/aspeed.inc index 05e465849..a2316cf6a 100644 --- a/meta-aspeed/conf/machine/include/aspeed.inc +++ b/meta-aspeed/conf/machine/include/aspeed.inc @@ -20,7 +20,7 @@ MACHINEOVERRIDES =. "aspeed:" SERIAL_CONSOLES ?= "115200;ttyS4" DEFAULTTUNE_aspeed-g5 ?= "arm1176jzs" -DEFAULTTUNE_aspeed-g6 ?= "armv7a-vfpv4d16" +DEFAULTTUNE_aspeed-g6 ?= "armv7ahf-vfpv4d16" UBOOT_ENTRYPOINT_aspeed-g4 ?= "0x40001000" UBOOT_ENTRYPOINT_aspeed-g5 ?= "0x80001000" -- cgit v1.2.3 From 01489f0fc9139d8e8b128392ded3f071c7dddfba Mon Sep 17 00:00:00 2001 From: Jim Wright Date: Wed, 27 Nov 2019 15:17:28 -0600 Subject: Remove setting BMC_DCM_ALL_RESET_N in Rainier power on Reviewing GPIO function with engineering, BMC_DCM_ALL_RESET_N GPIO should be handled differently. Remove BMC_DCM_ALL_RESET_N from Rainier power-on GPIO configuration. (From meta-ibm rev: de595e38e6c38729d7e0c7eb6925fe639cbb5b85) Signed-off-by: Jim Wright Change-Id: I2fa2949b49d192b0a3a6a516c3ce9c49052dd3d7 Signed-off-by: Brad Bishop --- .../skeleton/obmc-libobmc-intf/rainier/gpio_defs.json | 8 -------- 1 file changed, 8 deletions(-) diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/skeleton/obmc-libobmc-intf/rainier/gpio_defs.json b/meta-ibm/meta-witherspoon/recipes-phosphor/skeleton/obmc-libobmc-intf/rainier/gpio_defs.json index 828c35b29..296039502 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/skeleton/obmc-libobmc-intf/rainier/gpio_defs.json +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/skeleton/obmc-libobmc-intf/rainier/gpio_defs.json @@ -6,9 +6,6 @@ "power_up_outs": [ {"name": "SOFTWARE_PGOOD", "polarity": true}, {"name": "BMC_POWER_UP", "polarity": true} - ], - "reset_outs": [ - {"name": "BMC_DCM_ALL_RESET_N", "polarity": false} ] } }, @@ -28,11 +25,6 @@ "name": "SYS_PWROK_BUFF", "pin": "R2", "direction": "in" - }, - { - "name": "BMC_DCM_ALL_RESET_N", - "pin": "Q0", - "direction": "out" } ] } -- cgit v1.2.3 From 49d6e86226e1173bafaf99bb6efa069d402b1593 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 16 Dec 2019 20:01:17 +0000 Subject: phosphor-net-ipmid: srcrev bump b0a81f665f..8e342c9c65 Rashmi RV (1): Fix: Handle exception during sol activate cmd Yong Li (1): Do not stop session in deactivate payload call (From meta-phosphor rev: a7b5af5628ca06b3c20e2d99b5196d18bef7de0e) Change-Id: I7dc6b72a3b2b68e62cd7939797fed4174fd01b34 Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3f9313ab6..3605d9892 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 = "b0a81f665fb76dab9ef2af174ac64de99211f2f8" +SRCREV = "8e342c9c65c602b2fc85c80b8a75c5d515c48059" S = "${WORKDIR}/git" -- cgit v1.2.3 From 0f6b2edab8e99673c6bc8cc131f76aa71b30e670 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 16 Dec 2019 17:21:04 +0000 Subject: bmcweb: srcrev bump 97d57aaa0b..1e2cec3081 Gunnar Mills (1): Update redfish-logging-in-bmcweb.md link Zbigniew Kurzynski (2): Fixing mTLS switches Adding a new value to cookie (From meta-phosphor rev: 39e63385f0b25f0e9fa0cbf7acd1710ccf282d06) Change-Id: Ica53e4e06bffb655ef6d212d3ccaf1f83fb42dbc Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index c7ee201b5..823000609 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 = "97d57aaa0b95a110c71016d190f95f853051126a" +SRCREV = "1e2cec30813560f17b2d214b81a579b68bd37256" S = "${WORKDIR}/git" -- cgit v1.2.3 From 2b9e9deacbea6dc7fc459954deff9753e15b8587 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Sat, 14 Dec 2019 11:11:43 +0000 Subject: pldm: srcrev bump 9a26f89f45..f4e0a49596 vkaverap (1): ibm-oem: libpldm: add APIs for for FileAck command (From meta-phosphor rev: 33ae08bdbc05e9ac756352e326384e6b71ea9819) Change-Id: Ib8ca07e9f75f4a6a45d8745b3bd160fe89dbcbd0 Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-phosphor/recipes-phosphor/pldm/pldm.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/pldm/pldm.inc b/meta-phosphor/recipes-phosphor/pldm/pldm.inc index 951bc298d..5cf57211c 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 = "9a26f89f45c3753c9059505506da9f02460122ab" +SRCREV = "f4e0a49596ceb48cc7ce8f7c3e10d398bdf941eb" -- cgit v1.2.3 From 03f05fef86e5b1a369b65972b8c3be55af71f80c Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 13 Dec 2019 17:21:20 +0000 Subject: dbus-sensors: srcrev bump d12f23ecc9..9f9b38d89a Joel Stanley (1): Move ioctl header to common include path jayaprakash Mutyala (1): PSUSensor: Fix for PSU details (From meta-phosphor rev: 868a1009b3071347c1ba02b255081262dc98732b) Change-Id: I3a8f90c66f7b14774bfe6bd6a3ec87a11498eb1c Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb index adcb16704..2a0d33290 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 = "d12f23ecc9e136d7593f75d3496f475ec4c12f55" +SRCREV = "9f9b38d89a751e70cdf61bfb3f78c05800201f95" PV = "0.1+git${SRCPV}" -- cgit v1.2.3 From bc16e96065c6b2ae719ccc3cbf428c7c634fbee5 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Sat, 14 Dec 2019 00:21:01 +0000 Subject: phosphor-host-postd: srcrev bump 49a18b2202..6dac4c5e55 Tim Lee (1): main: Fix BMC system stuck when doing enumerate state after host shutdown William A. Kennington III (1): main: Improve support for existing and new driver semantics (From meta-phosphor rev: 7aa04211d94efaeb44e57907f2b780672393224c) Change-Id: I60584a69b529504e0f379bacc81fd3b02df744ba Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb b/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb index e1114e8aa..3b088b93c 100644 --- a/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb +++ b/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb @@ -17,7 +17,7 @@ DEPENDS += "systemd" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-host-postd" -SRCREV = "49a18b220229304b690097041d8028895bd4215a" +SRCREV = "6dac4c5e5529eac30c6c2d35db9023c9914cc798" SNOOP_DEVICE ?= "aspeed-lpc-snoop0" POST_CODE_BYTES ?= "1" -- cgit v1.2.3 From 87bebf2d3333eec409e6ae0a75be19275bed1207 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 13 Dec 2019 07:00:52 +0000 Subject: phosphor-certificate-manager: srcrev bump 667286e4f7..fe590c4e28 Zbigniew Lukwinski (1): Limit access permissions for authority cert directory. (From meta-phosphor rev: 4fbae2f0c26a1975d490c5b0ba46558ee73e6d4a) Change-Id: Idf2e346f5559b69ea406feb3cc636a9d1542cd63 Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- .../recipes-phosphor/certificate/phosphor-certificate-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb b/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb index b2a908244..a152aab9a 100644 --- a/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb @@ -9,7 +9,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI = "git://github.com/openbmc/phosphor-certificate-manager" -SRCREV = "667286e4f7dc31a9ab786307092919901adccbb5" +SRCREV = "fe590c4e28e28f611162f5766681d6396d6fd59b" inherit autotools \ pkgconfig \ -- cgit v1.2.3 From c2a635740a9c5fe5d4389c4a062e3d78995d7b26 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 17 Dec 2019 21:40:37 +0000 Subject: intel-ipmi-oem: srcrev bump 822b0b40ef..934ee9c9e9 AppaRao Puli (1): Firmware update commmands re-write anil kumar appana (1): manufacturingcmds: added intrusionsensor status jayaprakash Mutyala (2): bridgingcommands:Move ClearMessageFlags to new API oemcommands: Fix for status LED when Solidgreen (From meta-intel rev: eed0e4132d33fdd0128634047e6829d89cd986e4) Change-Id: I134f7eed7d9cba14060bb254059bf28321345af7 Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c0f44d3d9..4eb95403e 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,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/intel-ipmi-oem" -SRCREV = "822b0b40efe7695b56e1edb80f995d3c810d6d22" +SRCREV = "934ee9c9e952871a999030b03f23918022ae5c09" S = "${WORKDIR}/git" PV = "0.1+git${SRCPV}" -- cgit v1.2.3 From ccdf861a0a99b06bb5970d8e0c4163550bce2be7 Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Mon, 2 Dec 2019 14:41:31 +1030 Subject: dbus-sensors: Remove kernel sources from include path The Linux kernel userspace headers must be installed, not included directly from the kernel source tree: The correct way to package the header files for a distribution is to run 'make headers_install' from the kernel source directory to install the headers into /usr/include and then rebuild the C library package, with a dependency on the specific version of the just installed kernel headers. (From meta-phosphor rev: 3c315a34f2763f1932c6a8c12d7d12874a51aedb) Resolves: https://github.com/openbmc/openbmc/issues/3634 Change-Id: I308de6697a731ec184d45f72e9428c697f788864 Signed-off-by: Joel Stanley Signed-off-by: Brad Bishop --- meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb index 2a0d33290..637327ab3 100644 --- a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb @@ -24,8 +24,4 @@ inherit cmake systemd S = "${WORKDIR}/git/" -# linux-libc-headers guides this way to include custom uapi headers -CXXFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include/uapi" -CXXFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include" -do_configure[depends] += "virtual/kernel:do_shared_workdir" EXTRA_OECMAKE = "-DYOCTO=1" -- cgit v1.2.3 From 35aa376fe88dfa871f8cdd5fd0544f12496ef490 Mon Sep 17 00:00:00 2001 From: Artem Senichev Date: Tue, 17 Dec 2019 11:28:45 +0300 Subject: nicole: esel-parser: srcrev bump 1ed2c38..c35879f Artem Senichev (4): Allow using fsp-trace from current directory Fix parsing "Creator subsystem" field Add source file name to fsp-trace output hostboot: bump version 3920d160..0921b80a (From meta-yadro rev: 1e65c1adfc33232d89e9deb50e436c2356317f6a) Signed-off-by: Artem Senichev Change-Id: If56a76133bb9fff94638fafe5428969797b257a8 Signed-off-by: Brad Bishop --- .../meta-nicole/recipes-phosphor/logging/openpower-esel-parser_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-yadro/meta-nicole/recipes-phosphor/logging/openpower-esel-parser_git.bb b/meta-yadro/meta-nicole/recipes-phosphor/logging/openpower-esel-parser_git.bb index ff6091845..fe9b8fee9 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/logging/openpower-esel-parser_git.bb +++ b/meta-yadro/meta-nicole/recipes-phosphor/logging/openpower-esel-parser_git.bb @@ -20,4 +20,4 @@ DEPENDS += "autoconf-archive-native \ # Source code repository S = "${WORKDIR}/git" SRC_URI = "gitsm://github.com/YADRO-KNS/openpower-esel-parser" -SRCREV = "1ed2c38095591c68348983637e4dcb50f4cfff63" +SRCREV = "c35879fa605f3aa8098fff2c0a395815d8cbfe51" -- cgit v1.2.3 From 780c5fed9e9ddd76bec12de00c1a96d2de57d1e0 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 17 Dec 2019 19:11:32 +0000 Subject: phosphor-webui: srcrev bump 86f4056a2d..f2127efa1b MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Wiktor Gołgowski (1): User logged in when IsAuthenticated cookie is set. (From meta-phosphor rev: 0ef53041cf7efdc6e0bd81636ed2ccfc65b8368b) Change-Id: Ic859b2d93be25901c43be029910a00e9a6bc900c Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb b/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb index 950ae6e9e..bfa5dcc0a 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 = "86f4056a2dfee6fced5b5b03de04a7ef9c33d74f" +SRCREV = "f2127efa1b7d1c9fc1625f6e30b75be0ed658d53" S = "${WORKDIR}/git" DEPENDS_prepend = "nodejs-native " -- cgit v1.2.3 From ef6785c2a6f3311a008c237ee2426d24b53f9a1f Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 17 Dec 2019 19:11:01 +0000 Subject: bmcweb: srcrev bump 1e2cec3081..a6e2f1c4cb AppaRao Puli (1): Fix: bug fixes in readJson Jason M. Bills (2): Fix $metadata/index.xml parse error Consolidate regex calls when converting links RAJESWARAN THILLAIGOVINDAN (1): Fix authorization for LDAP users (From meta-phosphor rev: 5e35dbbec02a84112d084a876f0b6d9c9b77e327) Change-Id: I5bd851bbcb08b299ea1ddef17550d17a4cce41ae Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index 823000609..713acb115 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 = "1e2cec30813560f17b2d214b81a579b68bd37256" +SRCREV = "a6e2f1c4cba5f3b19d7c039f52d6598b129b5b10" S = "${WORKDIR}/git" -- cgit v1.2.3 From 3363587670414c0ed2be6614dbb76647d944e144 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 17 Dec 2019 19:01:18 +0000 Subject: phosphor-net-ipmid: srcrev bump 8e342c9c65..46bec0f60a Jason M. Bills (1): Always return Message Tag and Remote Console Session ID (From meta-phosphor rev: ed6472b27d2e81282fbddfce8853eca2698fe757) Change-Id: Iebfe9bf0ceee53540f2872cceac0945d8b6629da Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3605d9892..ab93f7a42 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 = "8e342c9c65c602b2fc85c80b8a75c5d515c48059" +SRCREV = "46bec0f60a201a644c1f3af4cec2f31da58a0595" S = "${WORKDIR}/git" -- cgit v1.2.3 From 51cd42424ef935bbab43758a7bca4c6b872a63cd Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 17 Dec 2019 17:31:26 +0000 Subject: phosphor-logging: srcrev bump 57686b65b5..b3f5186e89 Harisuddin Mohamed Isa (1): PEL: Filled in PEL value descriptions Matt Spinler (3): PEL: Fix message registry schema typo PEL: Add repo function to get a PEL FD PEL: Add API to get the PLDM instance ID (From meta-phosphor rev: a4c74aa783c9c286997d11eb3635145e2d4590b0) Change-Id: I3205bb2fcd502310f1dc7c4428c3aa270d54d1fc Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index f2c1f6288..4483a6474 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 = "57686b65b58e247858df228de8889ae30104ecdf" +SRCREV = "b3f5186e89a1ff8887e41863da39d30d373e3c08" S = "${WORKDIR}/git" -- cgit v1.2.3 From 3b02cf25d45e7cb0c87df1a4d1c56b00dab7f1bb Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 17 Dec 2019 17:11:08 +0000 Subject: phosphor-host-ipmid: srcrev bump 225dec858e..4a15685ee8 Johnathan Mantey (1): Emit correct error code when "reserved" fields are modified. (From meta-phosphor rev: 5ebd4e211c4948016916524792cbcd6ef955f089) Change-Id: I2991c0dc0b4565a0564409b13e9a148051480a4b Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc index f9cd1b775..8a15732e8 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 = "225dec858e52f0e8319acfe72d7b3630adcc7a0d" +SRCREV = "4a15685ee852d0b0ee0981d3d1a2a9dd55130835" -- cgit v1.2.3 From c7c0fcc19baafa6ee99e6f920c39464975936987 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 9 Dec 2019 17:52:08 -0800 Subject: phosphor-hwmon: Fix unit escaping We aren't correctly escaping all of the specical characters based on the systemd spec for unit name escaping. systemd provides a utility to do this reliably, so use that instead of a custom implementation. (From meta-phosphor rev: e1acbce6ac818e411cee8483c89ea6f7b0829162) Change-Id: I239f396f92e6a6b94edcfe48084c41dcc292e1b7 Signed-off-by: William A. Kennington III Signed-off-by: Brad Bishop --- .../recipes-phosphor/sensors/phosphor-hwmon/start_hwmon.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon/start_hwmon.sh b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon/start_hwmon.sh index 2f35865b3..2e346d0fb 100755 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon/start_hwmon.sh +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon/start_hwmon.sh @@ -17,7 +17,8 @@ then fi fi +# Needed to re-do escaping used to avoid bitbake separator conflicts path="${path//:/--}" -path="${path//-/\\x2d}" - -systemctl --no-block $action 'xyz.openbmc_project.Hwmon@'$path'.service' +# Needed to escape prior to being used as a unit argument +path="$(systemd-escape "$path")" +systemctl --no-block "$action" "xyz.openbmc_project.Hwmon@$path.service" -- cgit v1.2.3 From 00743113bfb98bcbfc6419e67f1ba4b581e1ba49 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 19 Dec 2019 19:30:54 +0000 Subject: entity-manager: srcrev bump 7d807754cc..0c3980a748 James Feist (1): FruDevice: Don't scan Mux bus if root is in blacklist (From meta-phosphor rev: 59c9c8853bfbe10e8333ef3743ec5767a4c234f0) Change-Id: Ic4ec1b34e20aba2c5f0f64fae72dc2be08afca31 Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb index 8d0c36fa7..8dc263ae1 100644 --- a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Entity Manager provides d-bus configuration data \ and configures system sensors" SRC_URI = "git://github.com/openbmc/entity-manager.git" -SRCREV = "7d807754cc9153b04b599804464edd9654d7a81e" +SRCREV = "0c3980a748f145672e800c718318f761da3c56a5" PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" -- cgit v1.2.3 From 041f36da632e7ec238d30b507da9d1a17a8c6cfd Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 19 Dec 2019 16:31:21 +0000 Subject: phosphor-webui: srcrev bump f2127efa1b..dda0b83ebe Gunnar Mills (2): Users: Update Callback/NoAccess Role Users: Role Table: Update ssh (From meta-phosphor rev: 2c400bafce6097464d368d9314d8bd81abd7eb0d) Change-Id: I6daf7a73f4c65c25a30d746cac94c016bef3eec5 Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb b/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb index bfa5dcc0a..dd37689fb 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 = "f2127efa1b7d1c9fc1625f6e30b75be0ed658d53" +SRCREV = "dda0b83ebe65f7dc90275a649245e85ba3e8b315" S = "${WORKDIR}/git" DEPENDS_prepend = "nodejs-native " -- cgit v1.2.3 From 3e1101ba9bfca4735cc4a0f8e4c28ad56b3acf9e Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 19 Dec 2019 14:31:01 +0000 Subject: bmcweb: srcrev bump a6e2f1c4cb..0e1cf26b1c Adriana Kobylak (1): Make the max http request body size configurable Ed Tanous (2): Remove #include of self Implement a TODO(ed) in comment Jan Sowinski (1): Connection and websockets fixes Zbigniew Kurzynski (1): Turning ON the mutual TLS (From meta-phosphor rev: be7988f3c7e0a0cc5dd0d359ec4810a7da068eef) Change-Id: Idf80dd08c2370f32902953fa73c813bc8a5910ed Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index 713acb115..4049629b2 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 = "a6e2f1c4cba5f3b19d7c039f52d6598b129b5b10" +SRCREV = "0e1cf26b1cd98e0ec069e6187434fcabf1e9c200" S = "${WORKDIR}/git" -- cgit v1.2.3 From 9a53395458785b43f205c5aa4a2730fa3d4057a3 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Thu, 19 Dec 2019 16:39:26 -0500 Subject: meta-security: subtree update:2df7dd9fba..3001c3ebfc Armin Kuster (6): meta-security: add layer index callouts meta-security-compliance/conf/layer.conf: fix typo python3-suricata-update: update to 1.1.1 libhtp: bugfix only update 0.5.32 lib/oeqa/runtime: suricata add tests suricata: update to 4.1.6 Philip Tricca (1): tpm2-abrmd: Port command line options to new version. Trevor Woerner (1): tpm2-abrmd-init.sh: fix for /dev/tpmrmX Yi Zhao (1): libseccomp: upgrade 2.4.1 -> 2.4.2 Change-Id: Ic00ca8ac8ff5d3fbe0b79aa4a42243b197080f14 Signed-off-by: Brad Bishop --- meta-security/lib/oeqa/runtime/cases/suricata.py | 63 ++++++++++++-- meta-security/meta-integrity/conf/layer.conf | 2 + .../meta-security-compliance/conf/layer.conf | 2 + meta-security/meta-tpm/conf/layer.conf | 1 + .../tpm2-abrmd/files/tpm2-abrmd-init.sh | 2 +- .../tpm2-abrmd/files/tpm2-abrmd.default | 2 +- .../recipes-ids/suricata/libhtp_0.5.31.bb | 15 ---- .../recipes-ids/suricata/libhtp_0.5.32.bb | 15 ++++ .../suricata/python3-suricata-update_1.0.5.bb | 15 ---- .../suricata/python3-suricata-update_1.1.1.bb | 15 ++++ meta-security/recipes-ids/suricata/suricata.inc | 6 +- .../recipes-ids/suricata/suricata_4.1.5.bb | 98 ---------------------- .../recipes-ids/suricata/suricata_4.1.6.bb | 97 +++++++++++++++++++++ ...on-__SNR_xxx-instead-of-__NR_xxx-for-sysc.patch | 45 ++++++++++ .../libseccomp/libseccomp_2.4.1.bb | 43 ---------- .../libseccomp/libseccomp_2.4.2.bb | 44 ++++++++++ 16 files changed, 282 insertions(+), 183 deletions(-) delete mode 100644 meta-security/recipes-ids/suricata/libhtp_0.5.31.bb create mode 100644 meta-security/recipes-ids/suricata/libhtp_0.5.32.bb delete mode 100644 meta-security/recipes-ids/suricata/python3-suricata-update_1.0.5.bb create mode 100644 meta-security/recipes-ids/suricata/python3-suricata-update_1.1.1.bb delete mode 100644 meta-security/recipes-ids/suricata/suricata_4.1.5.bb create mode 100644 meta-security/recipes-ids/suricata/suricata_4.1.6.bb create mode 100644 meta-security/recipes-security/libseccomp/files/0001-tests-rely-on-__SNR_xxx-instead-of-__NR_xxx-for-sysc.patch delete mode 100644 meta-security/recipes-security/libseccomp/libseccomp_2.4.1.bb create mode 100644 meta-security/recipes-security/libseccomp/libseccomp_2.4.2.bb diff --git a/meta-security/lib/oeqa/runtime/cases/suricata.py b/meta-security/lib/oeqa/runtime/cases/suricata.py index 17fc8c508..7f052ecd7 100644 --- a/meta-security/lib/oeqa/runtime/cases/suricata.py +++ b/meta-security/lib/oeqa/runtime/cases/suricata.py @@ -1,6 +1,7 @@ # Copyright (C) 2019 Armin Kuster # import re +from tempfile import mkstemp from oeqa.runtime.case import OERuntimeTestCase from oeqa.core.decorator.depends import OETestDepends @@ -9,6 +10,22 @@ from oeqa.runtime.decorator.package import OEHasPackage class SuricataTest(OERuntimeTestCase): + @classmethod + def setUpClass(cls): + cls.tmp_fd, cls.tmp_path = mkstemp() + with os.fdopen(cls.tmp_fd, 'w') as f: + # use google public dns + f.write("nameserver 8.8.8.8") + f.write(os.linesep) + f.write("nameserver 8.8.4.4") + f.write(os.linesep) + f.write("nameserver 127.0.0.1") + f.write(os.linesep) + + @classmethod + def tearDownClass(cls): + os.remove(cls.tmp_path) + @OEHasPackage(['suricata']) @OETestDepends(['ssh.SSHTest.test_ssh']) def test_suricata_help(self): @@ -18,10 +35,42 @@ class SuricataTest(OERuntimeTestCase): self.assertEqual(status, 1, msg = msg) @OETestDepends(['suricata.SuricataTest.test_suricata_help']) - def test_suricata_unittest(self): - status, output = self.target.run('suricata -u') - match = re.search('FAILED: 0 ', output) - if not match: - msg = ('suricata unittest had an unexpected failure. ' - 'Status and output:%s and %s' % (status, output)) - self.assertEqual(status, 0, msg = msg) + def test_ping_openinfosecfoundation_org(self): + dst = '/etc/resolv.conf' + self.tc.target.run('rm -f %s' % dst) + (status, output) = self.tc.target.copyTo(self.tmp_path, dst) + msg = 'File could not be copied. Output: %s' % output + self.assertEqual(status, 0, msg=msg) + + status, output = self.target.run('ping -c 1 openinfosecfoundation.org') + msg = ('ping openinfosecfoundation.org failed: output is:\n%s' % output) + self.assertEqual(status, 0, msg = msg) + + @OEHasPackage(['python3-suricata-update']) + @OETestDepends(['suricata.SuricataTest.test_ping_openinfosecfoundation_org']) + def test_suricata_update(self): + status, output = self.tc.target.run('suricata-update') + msg = ('suricata-update had an unexpected failure. ' + 'Status and output:%s and %s' % (status, output)) + self.assertEqual(status, 0, msg = msg) + + @OETestDepends(['suricata.SuricataTest.test_suricata_update']) + def test_suricata_update_sources_list(self): + status, output = self.tc.target.run('suricata-update list-sources') + msg = ('suricata-update list-sources had an unexpected failure. ' + 'Status and output:%s and %s' % (status, output)) + self.assertEqual(status, 0, msg = msg) + + @OETestDepends(['suricata.SuricataTest.test_suricata_update_sources_list']) + def test_suricata_update_sources(self): + status, output = self.tc.target.run('suricata-update update-sources') + msg = ('suricata-update update-sources had an unexpected failure. ' + 'Status and output:%s and %s' % (status, output)) + self.assertEqual(status, 0, msg = msg) + + @OETestDepends(['suricata.SuricataTest.test_suricata_update_sources']) + def test_suricata_update_enable_source(self): + status, output = self.tc.target.run('suricata-update enable-source oisf/trafficid') + msg = ('suricata-update enable-source oisf/trafficid had an unexpected failure. ' + 'Status and output:%s and %s' % (status, output)) + self.assertEqual(status, 0, msg = msg) diff --git a/meta-security/meta-integrity/conf/layer.conf b/meta-security/meta-integrity/conf/layer.conf index 962424ccb..bfc9c6ff1 100644 --- a/meta-security/meta-integrity/conf/layer.conf +++ b/meta-security/meta-integrity/conf/layer.conf @@ -24,3 +24,5 @@ OE_TERMINAL_EXPORTS += "INTEGRITY_BASE" LAYERSERIES_COMPAT_integrity = "zeus" # ima-evm-utils depends on keyutils from meta-oe LAYERDEPENDS_integrity = "core openembedded-layer" + +BBLAYERS_LAYERINDEX_NAME_integrity = "meta-integrity" diff --git a/meta-security/meta-security-compliance/conf/layer.conf b/meta-security/meta-security-compliance/conf/layer.conf index 0e93bd0e8..8572a1fce 100644 --- a/meta-security/meta-security-compliance/conf/layer.conf +++ b/meta-security/meta-security-compliance/conf/layer.conf @@ -11,3 +11,5 @@ BBFILE_PRIORITY_scanners-layer = "10" LAYERSERIES_COMPAT_scanners-layer = "zeus" LAYERDEPENDS_scanners-layer = "core openembedded-layer meta-python" + +BBLAYERS_LAYERINDEX_NAME_scanners-layer = "meta-security-compliance" diff --git a/meta-security/meta-tpm/conf/layer.conf b/meta-security/meta-tpm/conf/layer.conf index 3af2d9517..175eba84e 100644 --- a/meta-security/meta-tpm/conf/layer.conf +++ b/meta-security/meta-tpm/conf/layer.conf @@ -14,3 +14,4 @@ LAYERDEPENDS_tpm-layer = " \ core \ openembedded-layer \ " +BBLAYERS_LAYERINDEX_NAME_tpm-layer = "meta-tpm" diff --git a/meta-security/meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd-init.sh b/meta-security/meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd-init.sh index c8dfb7de3..9bb7da972 100644 --- a/meta-security/meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd-init.sh +++ b/meta-security/meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd-init.sh @@ -27,7 +27,7 @@ case "${1}" in start) echo -n "Starting $DESC: " - if [ ! -e /dev/tpm* ] + if [ ! -e /dev/tpm? ] then echo "device driver not loaded, skipping." exit 0 diff --git a/meta-security/meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd.default b/meta-security/meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd.default index 987978a66..b4b3c2072 100644 --- a/meta-security/meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd.default +++ b/meta-security/meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd.default @@ -1 +1 @@ -DAEMON_OPTS="--tcti=device --logger=syslog --max-connections=20 --max-transient-objects=20 --fail-on-loaded-trans" +DAEMON_OPTS="--tcti=device --logger=syslog --max-connections=20 --max-transients=20 --flush-all" diff --git a/meta-security/recipes-ids/suricata/libhtp_0.5.31.bb b/meta-security/recipes-ids/suricata/libhtp_0.5.31.bb deleted file mode 100644 index 8305f7010..000000000 --- a/meta-security/recipes-ids/suricata/libhtp_0.5.31.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "LibHTP is a security-aware parser for the HTTP protocol and the related bits and pieces." - -require suricata.inc - -LIC_FILES_CHKSUM = "file://../LICENSE;beginline=1;endline=2;md5=c70d8d3310941dcdfcd1e02800a1f548" - -DEPENDS = "zlib" - -inherit autotools pkgconfig - -CFLAGS += "-D_DEFAULT_SOURCE" - -S = "${WORKDIR}/suricata-${VER}/${BPN}" - -RDEPENDS_${PN} += "zlib" diff --git a/meta-security/recipes-ids/suricata/libhtp_0.5.32.bb b/meta-security/recipes-ids/suricata/libhtp_0.5.32.bb new file mode 100644 index 000000000..8305f7010 --- /dev/null +++ b/meta-security/recipes-ids/suricata/libhtp_0.5.32.bb @@ -0,0 +1,15 @@ +SUMMARY = "LibHTP is a security-aware parser for the HTTP protocol and the related bits and pieces." + +require suricata.inc + +LIC_FILES_CHKSUM = "file://../LICENSE;beginline=1;endline=2;md5=c70d8d3310941dcdfcd1e02800a1f548" + +DEPENDS = "zlib" + +inherit autotools pkgconfig + +CFLAGS += "-D_DEFAULT_SOURCE" + +S = "${WORKDIR}/suricata-${VER}/${BPN}" + +RDEPENDS_${PN} += "zlib" diff --git a/meta-security/recipes-ids/suricata/python3-suricata-update_1.0.5.bb b/meta-security/recipes-ids/suricata/python3-suricata-update_1.0.5.bb deleted file mode 100644 index 63f75e096..000000000 --- a/meta-security/recipes-ids/suricata/python3-suricata-update_1.0.5.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "The tool for updating your Suricata rules. " -HOMEPAGE = "http://suricata-ids.org/" -SECTION = "security Monitor/Admin" -LICENSE = "GPLv2" - -LIC_FILES_CHKSUM = "file://LICENSE;beginline=1;endline=2;md5=c70d8d3310941dcdfcd1e02800a1f548" - -SRCREV = "dcd0f630e13463750efb1593ad3ccae1ae6c27d4" -SRC_URI = "git://github.com/OISF/suricata-update;branch='master-1.0.x'" - -S = "${WORKDIR}/git" - -inherit python3native setuptools3 - -RDEPENDS_${PN} = "python3-pyyaml" diff --git a/meta-security/recipes-ids/suricata/python3-suricata-update_1.1.1.bb b/meta-security/recipes-ids/suricata/python3-suricata-update_1.1.1.bb new file mode 100644 index 000000000..0070b5bcf --- /dev/null +++ b/meta-security/recipes-ids/suricata/python3-suricata-update_1.1.1.bb @@ -0,0 +1,15 @@ +SUMMARY = "The tool for updating your Suricata rules. " +HOMEPAGE = "http://suricata-ids.org/" +SECTION = "security Monitor/Admin" +LICENSE = "GPLv2" + +LIC_FILES_CHKSUM = "file://LICENSE;beginline=1;endline=2;md5=c70d8d3310941dcdfcd1e02800a1f548" + +SRCREV = "9630630ffc493ca26299d174ee2066aa1405b2d4" +SRC_URI = "git://github.com/OISF/suricata-update;branch='master-1.1.x'" + +S = "${WORKDIR}/git" + +inherit python3native setuptools3 + +RDEPENDS_${PN} = "python3-pyyaml" diff --git a/meta-security/recipes-ids/suricata/suricata.inc b/meta-security/recipes-ids/suricata/suricata.inc index 1f4baffcc..3adbcf6d4 100644 --- a/meta-security/recipes-ids/suricata/suricata.inc +++ b/meta-security/recipes-ids/suricata/suricata.inc @@ -2,8 +2,8 @@ HOMEPAGE = "http://suricata-ids.org/" SECTION = "security Monitor/Admin" LICENSE = "GPLv2" -VER = "4.1.5" +VER = "4.1.6" SRC_URI = "http://www.openinfosecfoundation.org/download/suricata-${VER}.tar.gz" -SRC_URI[md5sum] = "0dfd68f6f4314c5c2eed7128112eff3b" -SRC_URI[sha256sum] = "cee5f6535cd7fe63fddceab62eb3bc66a63fc464466c88ec7a41b7a1331ac74b" +SRC_URI[md5sum] = "da5de1e8053f05cbd295793210117d34" +SRC_URI[sha256sum] = "8441ac89016106459ade2112fcde58b3f789e4beb2fd8bfa081ffb75eec75fe0" diff --git a/meta-security/recipes-ids/suricata/suricata_4.1.5.bb b/meta-security/recipes-ids/suricata/suricata_4.1.5.bb deleted file mode 100644 index b2700d63f..000000000 --- a/meta-security/recipes-ids/suricata/suricata_4.1.5.bb +++ /dev/null @@ -1,98 +0,0 @@ -SUMMARY = "The Suricata Engine is an Open Source Next Generation Intrusion Detection and Prevention Engine" - -require suricata.inc - -LIC_FILES_CHKSUM = "file://LICENSE;beginline=1;endline=2;md5=c70d8d3310941dcdfcd1e02800a1f548" - -SRC_URI += " \ - file://volatiles.03_suricata \ - file://tmpfiles.suricata \ - file://suricata.yaml \ - file://suricata.service \ - file://run-ptest \ - file://0001-af-packet-fix-build-on-recent-Linux-kernels.patch \ - " - -inherit autotools-brokensep pkgconfig python3-dir systemd ptest - -CFLAGS += "-D_DEFAULT_SOURCE" - -CACHED_CONFIGUREVARS = "ac_cv_header_htp_htp_h=yes ac_cv_lib_htp_htp_conn_create=yes \ - ac_cv_path_HAVE_WGET=no ac_cv_path_HAVE_CURL=no " - -EXTRA_OECONF += " --disable-debug \ - --enable-non-bundled-htp \ - --disable-gccmarch-native \ - --disable-suricata-update \ - " - -PACKAGECONFIG ??= "htp jansson file pcre yaml pcap cap-ng net nfnetlink nss nspr" -PACKAGECONFIG_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'unittests', '', d)}" - -PACKAGECONFIG[htp] = "--with-libhtp-includes=${STAGING_INCDIR} --with-libhtp-libraries=${STAGING_LIBDIR}, ,libhtp," -PACKAGECONFIG[pcre] = "--with-libpcre-includes=${STAGING_INCDIR} --with-libpcre-libraries=${STAGING_LIBDIR}, ,libpcre ," -PACKAGECONFIG[yaml] = "--with-libyaml-includes=${STAGING_INCDIR} --with-libyaml-libraries=${STAGING_LIBDIR}, ,libyaml ," -PACKAGECONFIG[pcap] = "--with-libpcap-includes=${STAGING_INCDIR} --with-libpcap-libraries=${STAGING_LIBDIR}, ,libpcap ," -PACKAGECONFIG[cap-ng] = "--with-libcap_ng-includes=${STAGING_INCDIR} --with-libcap_ng-libraries=${STAGING_LIBDIR}, ,libcap-ng , " -PACKAGECONFIG[net] = "--with-libnet-includes=${STAGING_INCDIR} --with-libnet-libraries=${STAGING_LIBDIR}, , libnet," -PACKAGECONFIG[nfnetlink] = "--with-libnfnetlink-includes=${STAGING_INCDIR} --with-libnfnetlink-libraries=${STAGING_LIBDIR}, ,libnfnetlink ," -PACKAGECONFIG[nfq] = "--enable-nfqueue, --disable-nfqueue,libnetfilter-queue," - -PACKAGECONFIG[jansson] = "--with-libjansson-includes=${STAGING_INCDIR} --with-libjansson-libraries=${STAGING_LIBDIR},,jansson, jansson" -PACKAGECONFIG[file] = ",,file, file" -PACKAGECONFIG[nss] = "--with-libnss-includes=${STAGING_INCDIR} --with-libnss-libraries=${STAGING_LIBDIR}, nss, nss," -PACKAGECONFIG[nspr] = "--with-libnspr-includes=${STAGING_INCDIR} --with-libnspr-libraries=${STAGING_LIBDIR}, nspr, nspr," -PACKAGECONFIG[python] = "--enable-python, --disable-python, python3, python3" -PACKAGECONFIG[unittests] = "--enable-unittests, --disable-unittests," - -export logdir = "${localstatedir}/log" - -do_install_append () { - - install -d ${D}${sysconfdir}/suricata - - oe_runmake install-conf DESTDIR=${D} - - oe_runmake install-rules DESTDIR=${D} - - install -d ${D}${sysconfdir}/suricata ${D}${sysconfdir}/default/volatiles - install -m 0644 ${WORKDIR}/volatiles.03_suricata ${D}${sysconfdir}/default/volatiles/volatiles.03_suricata - - install -m 0644 ${S}/threshold.config ${D}${sysconfdir}/suricata - - 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 - -} - -pkg_postinst_ontarget_${PN} () { -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 -} - -SYSTEMD_PACKAGES = "${PN}" - -PACKAGES =+ "${PN}-socketcontrol" -FILES_${PN} += "${systemd_unitdir} ${sysconfdir}/tmpfiles.d" -FILES_${PN}-socketcontrol = "${bindir}/suricatasc ${PYTHON_SITEPACKAGES_DIR}" - -CONFFILES_${PN} = "${sysconfdir}/suricata/suricata.yaml" - -RDEPENDS_${PN}-python = "python" diff --git a/meta-security/recipes-ids/suricata/suricata_4.1.6.bb b/meta-security/recipes-ids/suricata/suricata_4.1.6.bb new file mode 100644 index 000000000..9b7122b9e --- /dev/null +++ b/meta-security/recipes-ids/suricata/suricata_4.1.6.bb @@ -0,0 +1,97 @@ +SUMMARY = "The Suricata Engine is an Open Source Next Generation Intrusion Detection and Prevention Engine" + +require suricata.inc + +LIC_FILES_CHKSUM = "file://LICENSE;beginline=1;endline=2;md5=c70d8d3310941dcdfcd1e02800a1f548" + +SRC_URI += " \ + file://volatiles.03_suricata \ + file://tmpfiles.suricata \ + file://suricata.yaml \ + file://suricata.service \ + file://run-ptest \ + " + +inherit autotools-brokensep pkgconfig python3-dir systemd ptest + +CFLAGS += "-D_DEFAULT_SOURCE" + +CACHED_CONFIGUREVARS = "ac_cv_header_htp_htp_h=yes ac_cv_lib_htp_htp_conn_create=yes \ + ac_cv_path_HAVE_WGET=no ac_cv_path_HAVE_CURL=no " + +EXTRA_OECONF += " --disable-debug \ + --enable-non-bundled-htp \ + --disable-gccmarch-native \ + --disable-suricata-update \ + " + +PACKAGECONFIG ??= "htp jansson file pcre yaml pcap cap-ng net nfnetlink nss nspr" +PACKAGECONFIG_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'unittests', '', d)}" + +PACKAGECONFIG[htp] = "--with-libhtp-includes=${STAGING_INCDIR} --with-libhtp-libraries=${STAGING_LIBDIR}, ,libhtp," +PACKAGECONFIG[pcre] = "--with-libpcre-includes=${STAGING_INCDIR} --with-libpcre-libraries=${STAGING_LIBDIR}, ,libpcre ," +PACKAGECONFIG[yaml] = "--with-libyaml-includes=${STAGING_INCDIR} --with-libyaml-libraries=${STAGING_LIBDIR}, ,libyaml ," +PACKAGECONFIG[pcap] = "--with-libpcap-includes=${STAGING_INCDIR} --with-libpcap-libraries=${STAGING_LIBDIR}, ,libpcap ," +PACKAGECONFIG[cap-ng] = "--with-libcap_ng-includes=${STAGING_INCDIR} --with-libcap_ng-libraries=${STAGING_LIBDIR}, ,libcap-ng , " +PACKAGECONFIG[net] = "--with-libnet-includes=${STAGING_INCDIR} --with-libnet-libraries=${STAGING_LIBDIR}, , libnet," +PACKAGECONFIG[nfnetlink] = "--with-libnfnetlink-includes=${STAGING_INCDIR} --with-libnfnetlink-libraries=${STAGING_LIBDIR}, ,libnfnetlink ," +PACKAGECONFIG[nfq] = "--enable-nfqueue, --disable-nfqueue,libnetfilter-queue," + +PACKAGECONFIG[jansson] = "--with-libjansson-includes=${STAGING_INCDIR} --with-libjansson-libraries=${STAGING_LIBDIR},,jansson, jansson" +PACKAGECONFIG[file] = ",,file, file" +PACKAGECONFIG[nss] = "--with-libnss-includes=${STAGING_INCDIR} --with-libnss-libraries=${STAGING_LIBDIR}, nss, nss," +PACKAGECONFIG[nspr] = "--with-libnspr-includes=${STAGING_INCDIR} --with-libnspr-libraries=${STAGING_LIBDIR}, nspr, nspr," +PACKAGECONFIG[python] = "--enable-python, --disable-python, python3, python3" +PACKAGECONFIG[unittests] = "--enable-unittests, --disable-unittests," + +export logdir = "${localstatedir}/log" + +do_install_append () { + + install -d ${D}${sysconfdir}/suricata + + oe_runmake install-conf DESTDIR=${D} + + oe_runmake install-rules DESTDIR=${D} + + install -d ${D}${sysconfdir}/suricata ${D}${sysconfdir}/default/volatiles + install -m 0644 ${WORKDIR}/volatiles.03_suricata ${D}${sysconfdir}/default/volatiles/volatiles.03_suricata + + install -m 0644 ${S}/threshold.config ${D}${sysconfdir}/suricata + + 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 + +} + +pkg_postinst_ontarget_${PN} () { +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 +} + +SYSTEMD_PACKAGES = "${PN}" + +PACKAGES =+ "${PN}-socketcontrol" +FILES_${PN} += "${systemd_unitdir} ${sysconfdir}/tmpfiles.d" +FILES_${PN}-socketcontrol = "${bindir}/suricatasc ${PYTHON_SITEPACKAGES_DIR}" + +CONFFILES_${PN} = "${sysconfdir}/suricata/suricata.yaml" + +RDEPENDS_${PN}-python = "python" diff --git a/meta-security/recipes-security/libseccomp/files/0001-tests-rely-on-__SNR_xxx-instead-of-__NR_xxx-for-sysc.patch b/meta-security/recipes-security/libseccomp/files/0001-tests-rely-on-__SNR_xxx-instead-of-__NR_xxx-for-sysc.patch new file mode 100644 index 000000000..a53433fe5 --- /dev/null +++ b/meta-security/recipes-security/libseccomp/files/0001-tests-rely-on-__SNR_xxx-instead-of-__NR_xxx-for-sysc.patch @@ -0,0 +1,45 @@ +From 1ecdddb2a5b61cf527d1f238f88a9d129239f87a Mon Sep 17 00:00:00 2001 +From: Paul Moore +Date: Tue, 5 Nov 2019 15:11:11 -0500 +Subject: [PATCH] tests: rely on __SNR_xxx instead of __NR_xxx for syscalls + +We recently changed how libseccomp handles syscall numbers that are +not defined natively, but we missed test #15. + +Acked-by: Tom Hromatka +Signed-off-by: Paul Moore + +Upstream-Status: Backport +[https://github.com/seccomp/libseccomp/commit/1ecdddb2a5b61cf527d1f238f88a9d129239f87a] + +Signed-off-by: Yi Zhao +--- + tests/15-basic-resolver.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/tests/15-basic-resolver.c b/tests/15-basic-resolver.c +index 6badef1..0c1eefe 100644 +--- a/tests/15-basic-resolver.c ++++ b/tests/15-basic-resolver.c +@@ -55,15 +55,15 @@ int main(int argc, char *argv[]) + unsigned int arch; + char *name = NULL; + +- if (seccomp_syscall_resolve_name("open") != __NR_open) ++ if (seccomp_syscall_resolve_name("open") != __SNR_open) + goto fail; +- if (seccomp_syscall_resolve_name("read") != __NR_read) ++ if (seccomp_syscall_resolve_name("read") != __SNR_read) + goto fail; + if (seccomp_syscall_resolve_name("INVALID") != __NR_SCMP_ERROR) + goto fail; + + rc = seccomp_syscall_resolve_name_rewrite(SCMP_ARCH_NATIVE, "openat"); +- if (rc != __NR_openat) ++ if (rc != __SNR_openat) + goto fail; + + while ((arch = arch_list[iter++]) != -1) { +-- +2.17.1 + diff --git a/meta-security/recipes-security/libseccomp/libseccomp_2.4.1.bb b/meta-security/recipes-security/libseccomp/libseccomp_2.4.1.bb deleted file mode 100644 index 37a79829f..000000000 --- a/meta-security/recipes-security/libseccomp/libseccomp_2.4.1.bb +++ /dev/null @@ -1,43 +0,0 @@ -SUMMARY = "interface to seccomp filtering mechanism" -DESCRIPTION = "The libseccomp library provides and easy to use, platform independent,interface to the Linux Kernel's syscall filtering mechanism: seccomp." -SECTION = "security" -LICENSE = "LGPL-2.1" -LIC_FILES_CHKSUM = "file://LICENSE;beginline=0;endline=1;md5=8eac08d22113880357ceb8e7c37f989f" - -SRCREV = "fb43972ea1aab24f2a70193fb7445c2674f594e3" - -SRC_URI = "git://github.com/seccomp/libseccomp.git;branch=release-2.4 \ - file://run-ptest \ -" - -S = "${WORKDIR}/git" - -inherit autotools-brokensep pkgconfig ptest - -PACKAGECONFIG ??= "" -PACKAGECONFIG[python] = "--enable-python, --disable-python, python" - -DISABLE_STATIC = "" - -do_compile_ptest() { - oe_runmake -C tests check-build -} - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - install -d ${D}${PTEST_PATH}/tools - for file in $(find tests/* -executable -type f); do - install -m 744 ${S}/${file} ${D}/${PTEST_PATH}/tests - done - for file in $(find tests/*.tests -type f); do - install -m 744 ${S}/${file} ${D}/${PTEST_PATH}/tests - done - for file in $(find tools/* -executable -type f); do - install -m 744 ${S}/${file} ${D}/${PTEST_PATH}/tools - done -} - -FILES_${PN} = "${bindir} ${libdir}/${BPN}.so*" -FILES_${PN}-dbg += "${libdir}/${PN}/tests/.debug/* ${libdir}/${PN}/tools/.debug" - -RDEPENDS_${PN}-ptest = "bash" diff --git a/meta-security/recipes-security/libseccomp/libseccomp_2.4.2.bb b/meta-security/recipes-security/libseccomp/libseccomp_2.4.2.bb new file mode 100644 index 000000000..07db82a60 --- /dev/null +++ b/meta-security/recipes-security/libseccomp/libseccomp_2.4.2.bb @@ -0,0 +1,44 @@ +SUMMARY = "interface to seccomp filtering mechanism" +DESCRIPTION = "The libseccomp library provides and easy to use, platform independent,interface to the Linux Kernel's syscall filtering mechanism: seccomp." +SECTION = "security" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://LICENSE;beginline=0;endline=1;md5=8eac08d22113880357ceb8e7c37f989f" + +SRCREV = "1b6cfd1fc0b7499a28c24299a93a80bd18619563" + +SRC_URI = "git://github.com/seccomp/libseccomp.git;branch=release-2.4 \ + file://0001-tests-rely-on-__SNR_xxx-instead-of-__NR_xxx-for-sysc.patch \ + file://run-ptest \ +" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep pkgconfig ptest + +PACKAGECONFIG ??= "" +PACKAGECONFIG[python] = "--enable-python, --disable-python, python" + +DISABLE_STATIC = "" + +do_compile_ptest() { + oe_runmake -C tests check-build +} + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + install -d ${D}${PTEST_PATH}/tools + for file in $(find tests/* -executable -type f); do + install -m 744 ${S}/${file} ${D}/${PTEST_PATH}/tests + done + for file in $(find tests/*.tests -type f); do + install -m 744 ${S}/${file} ${D}/${PTEST_PATH}/tests + done + for file in $(find tools/* -executable -type f); do + install -m 744 ${S}/${file} ${D}/${PTEST_PATH}/tools + done +} + +FILES_${PN} = "${bindir} ${libdir}/${BPN}.so*" +FILES_${PN}-dbg += "${libdir}/${PN}/tests/.debug/* ${libdir}/${PN}/tools/.debug" + +RDEPENDS_${PN}-ptest = "bash" -- cgit v1.2.3 From 8bd2e6f39e3bbbedd0d7c3aea57827e2ff675855 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 20 Dec 2019 06:11:10 +0000 Subject: bmcweb: srcrev bump 0e1cf26b1c..9c6b0159a6 Yong Li (1): Adjust the PSU related log level (From meta-phosphor rev: d34272236883488bffbeeca67b85bdbce77843a6) Change-Id: Ib4fcbcd3e7c468182120c5a88b5cd9a094f4d2cd Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index 4049629b2..24a6bb3cf 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 = "0e1cf26b1cd98e0ec069e6187434fcabf1e9c200" +SRCREV = "9c6b0159a6d9f71d0bbc1301d1f605add3f91da3" S = "${WORKDIR}/git" -- cgit v1.2.3 From 284fafc59f32528f92e8f0f49c76e08d6cfdf02c Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Thu, 28 Nov 2019 11:31:04 +1030 Subject: linux-aspeed: Move to v5.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This moves the OpenBMC kernel to a Linux v5.4 base. There are 161 patches in dev-5.4. Of these 69 are backported from upstream, leaving 92 out of tree patches. Alexander Amelkin (1): mtd: spi-nor: fix options for mx66l51235f Andrew Jeffery (12): dt-bindings: hwmon: pmbus: Add Maxim MAX31785 documentation pmbus (max31785): Add support for devicetree configuration pmbus (core): One-shot retries for failure to set page pmbus (core): Use driver callbacks in pmbus_get_fan_rate() pmbus (max31785): Wrap all I2C accessors in one-shot failure handlers soc: aspeed: Miscellaneous control interfaces ARM: dts: aspeed: witherspoon: Update max31785 node ARM: dts: aspeed-g5: Expose VGA and SuperIO scratch registers net: ftgmac100: Ungate RCLK for RMII on ASPEED MACs pinctrl: aspeed-g6: Fix LPC/eSPI mux configuration pinctrl: aspeed: Improve debug output soc: aspeed: Fail probe of lpc-ctrl if reserved memory is not aligned Arnd Bergmann (1): ARM: aspeed: ast2500 is ARMv6K Brad Bishop (4): ARM: dts: aspeed-g6: Expose SuperIO scratch registers soc: aspeed: lpc: Add G6 compatible strings ipmi: aspeed-g6: Add compatible strings reset: simple: Add AST2600 compatibility string Cédric Le Goater (21): mtd: spi-nor: aspeed: use command mode for reads mtd: spi-nor: aspeed: add support for SPI dual IO read mode mtd: spi-nor: aspeed: link controller with the ahb clock mtd: spi-nor: aspeed: optimize read mode mtd: spi-nor: aspeed: limit the maximum SPI frequency mtd: spi-nor: aspeed: introduce a aspeed_smc_default_read() helper mtd: spi-nor: aspeed: clarify 4BYTE address mode mask mtd: spi-nor: aspeed: use memcpy_fromio() to capture the optimization buffer mtd: spi-nor: aspeed: add support for the 4B opcodes mtd: spi-nor: Add support for w25q512jv mtd: spi-nor: aspeed: Introduce a field for the AHB physical address mtd: spi-nor: aspeed: Introduce segment operations mtd: spi-nor: aspeed: add initial support for ast2600 mtd: spi-nor: aspeed: Check for disabled segments on the AST2600 mtd: spi-nor: aspeed: Introduce training operations per platform mtd: spi-nor: aspeed: Introduce a HCLK mask for training mtd: spi-nor: aspeed: check upper freq limit when doing training mtd: spi-nor: aspeed: add support for AST2600 training mtd: spi-nor: aspeed: fix training of multiple CS on the AST2600 mtd: spi-nor: aspeed: Disable zero size segments on the AST2600 /dev/mem: add a devmem kernel parameter to activate the device Eddie James (5): i2c: aspeed: Add AST2600 compatible hwmon: (pmbus/ibm-cffps) Switch LEDs to blocking brightness call hwmon: (pmbus/ibm-cffps) Fix LED blink behavior hwmon: (pmbus/ibm-cffps) Add version detection capability ARM: dts: aspeed: rainier: Switch PSUs to unknown version Fran Hsu (4): ARM: dts: nuvoton: Add NPCM730 common device tree ARM: dts: nuvoton: Add Quanta GSJ BMC pinctrl ARM: dts: nuvoton: Add Quanta GSJ BMC Device Tree. ARM: dts: nuvoton: Add GPIOs and LEDs to GSJ device tree George Hung (2): dt-binding: edac: add NPCM ECC documentation edac: npcm: Add Nuvoton NPCM7xx EDAC driver Jae Hyun Yoo (13): ARM: dts: aspeed: peci: Add PECI node clk: ast2600: enable BCLK for PCI/PCIe bus always dt-bindings: Add PECI subsystem document Documentation: ioctl: Add ioctl numbers for PECI subsystem peci: Add support for PECI bus driver core dt-bindings: Add bindings document of Aspeed PECI adapter ARM: dts: aspeed: Add PECI node peci: Add Aspeed PECI adapter driver dt-bindings: mfd: Add Intel PECI client bindings document mfd: intel-peci-client: Add Intel PECI client driver Documentation: hwmon: Add documents for PECI hwmon drivers hwmon: Add PECI cputemp driver hwmon: Add PECI dimmtemp driver Joel Stanley (9): ARM: dts: aspeed-g4: Expose SuperIO scratch registers ARM: dts: aspeed: ast2600evb: Enable FSI master usb: gadget: Quieten gadget config message clocksource: fttmr010: Parametrise shutdown clocksource: fttmr010: Set interrupt and shutdown clocksource: fttmr010: Add support for ast2600 watchdog: aspeed: Fix clock behaviour for ast2600 ARM: config: aspeed: Update defconfigs Revert "ARM: dts: aspeed: peci: Add PECI node" Johnny Huang (6): pinctrl: aspeed-g6: Add AST2600 I3C1 and I3C2 pinmux config pinctrl: aspeed-g6: Add support for the AST2600 USB pinmux pinctrl: aspeed: Add ASPEED_SB_PINCONF() helper pinctrl: aspeed: Move aspeed_pin_config_map to separate source file pinctrl: aspeed: Use masks to describe pinconf bitfields pinctrl: aspeed-g6: Add AST2600 pinconf support Tali Perry (2): dt-bindings: i2c: npcm7xx: add NPCM I2C controller documentation i2c: npcm: Add Nuvoton NPCM I2C controller driver Tomer Maimon (12): dt-binding: bmc: Add NPCM7xx LPC BPC documentation misc: npcm7xx-lpc-bpc: add NPCM7xx BIOS post code driver dt-binding: bmc: add npcm7xx pci mailbox document misc: mbox: add npcm7xx pci mailbox driver dt-binding: net: document NPCM7xx EMC DT bindings net: npcm: add NPCM7xx Ethernet MAC controller ARM: configs: add defconfig for Nuvoton NPCM7xx BMC ARM: dts: npcm7xx: Update device tree arm: dts: add NPCM7xx RunBMC Olympus Quanta device tree dt-bindings: peci: add NPCM PECI documentation ARM: dts: npcm7xx: Add PECI node peci: npcm: add NPCM PECI driver (From meta-aspeed rev: 6d863dd22836673ccd2a5d40778a3d5e4e03d7ea) Change-Id: I8f43925375c26bc88f94eee13430fcb03252b8ca Signed-off-by: Joel Stanley Signed-off-by: Brad Bishop --- meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g4/defconfig | 1 + meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig | 4 ++++ meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig | 1 + meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb | 6 +++--- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g4/defconfig b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g4/defconfig index d0abbf1fa..939a60e91 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g4/defconfig +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g4/defconfig @@ -141,6 +141,7 @@ CONFIG_I2C_MUX_PCA9541=y CONFIG_I2C_MUX_PCA954x=y CONFIG_I2C_ASPEED=y CONFIG_I2C_FSI=y +CONFIG_SPI=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y CONFIG_GPIO_ASPEED=y diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig index 209ed49f7..d189de899 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig @@ -3,6 +3,8 @@ CONFIG_KERNEL_XZ=y CONFIG_SYSVIPC=y CONFIG_NO_HZ_IDLE=y CONFIG_HIGH_RES_TIMERS=y +CONFIG_PSI=y +CONFIG_PSI_DEFAULT_DISABLED=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=16 @@ -138,10 +140,12 @@ CONFIG_ASPEED_BT_IPMI_BMC=y CONFIG_HW_RANDOM_TIMERIOMEM=y # CONFIG_I2C_COMPAT is not set CONFIG_I2C_CHARDEV=y +CONFIG_I2C_MUX=y CONFIG_I2C_MUX_PCA9541=y CONFIG_I2C_MUX_PCA954x=y CONFIG_I2C_ASPEED=y CONFIG_I2C_FSI=y +CONFIG_SPI=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y CONFIG_GPIO_ASPEED=y diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig index 43a77c1d2..bf6e9527c 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig @@ -152,6 +152,7 @@ CONFIG_ASPEED_BT_IPMI_BMC=y CONFIG_HW_RANDOM_TIMERIOMEM=y # CONFIG_I2C_COMPAT is not set CONFIG_I2C_CHARDEV=y +CONFIG_I2C_MUX=y CONFIG_I2C_MUX_PCA9541=y CONFIG_I2C_MUX_PCA954x=y CONFIG_I2C_ASPEED=y diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb index 0cf379853..7057ccd81 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.15" +KBRANCH ?= "dev-5.4" +LINUX_VERSION ?= "5.4.4" -SRCREV="fdc60468f3e452364d432f1a7c3f83d58bba1b84" +SRCREV="91b5e9f45c23ff55d8b547ddf1661337a70e2b22" require linux-aspeed.inc -- cgit v1.2.3 From 90a837f71a2a8e4ad3ab8d626605d9204705a5ca Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 19 Dec 2019 22:20:27 +0000 Subject: intel-ipmi-oem: srcrev bump 934ee9c9e9..ce4e73fd31 Zhikui Ren (1): convert sysfs gpio usage to libgpod (From meta-intel rev: 0c071ab85b21f967b0958836104f4dcb09024ce1) Change-Id: I2ea7c7f8f2781c000ea17404c46514f7750c08f3 Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4eb95403e..e4007da82 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,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/intel-ipmi-oem" -SRCREV = "934ee9c9e952871a999030b03f23918022ae5c09" +SRCREV = "ce4e73fd31d46fc101d0994ea5e6f85e3a03e2d4" S = "${WORKDIR}/git" PV = "0.1+git${SRCPV}" -- cgit v1.2.3