diff options
Diffstat (limited to 'recipes-core')
15 files changed, 294 insertions, 242 deletions
diff --git a/recipes-core/images/core-image-minimal-initramfs.bbappend b/recipes-core/images/core-image-minimal-initramfs.bbappend index 132f15b5..90ac28fd 100644 --- a/recipes-core/images/core-image-minimal-initramfs.bbappend +++ b/recipes-core/images/core-image-minimal-initramfs.bbappend | |||
@@ -1,2 +1,2 @@ | |||
1 | # Add i915 graphics firmware | 1 | # Add i915 graphics firmware |
2 | PACKAGE_INSTALL_append_intel-x86-common = " linux-firmware-i915" | 2 | PACKAGE_INSTALL:append:intel-x86-common = " linux-firmware-i915" |
diff --git a/recipes-core/images/core-image-tiny.bb b/recipes-core/images/core-image-tiny.bb index 6b09b0c2..f521f668 100644 --- a/recipes-core/images/core-image-tiny.bb +++ b/recipes-core/images/core-image-tiny.bb | |||
@@ -32,5 +32,5 @@ python() { | |||
32 | d.appendVarFlag('do_image', 'depends', ' %s:do_image_complete' % initrd_i) | 32 | d.appendVarFlag('do_image', 'depends', ' %s:do_image_complete' % initrd_i) |
33 | } | 33 | } |
34 | 34 | ||
35 | WKS_FILE_intel-corei7-64 = "core-image-tiny.wks.in" | 35 | WKS_FILE:intel-corei7-64 = "core-image-tiny.wks.in" |
36 | WKS_FILE_intel-core2-32 = "core-image-tiny.wks.in" | 36 | WKS_FILE:intel-core2-32 = "core-image-tiny.wks.in" |
diff --git a/recipes-core/libxcam/libxcam/0001-fake_v4l2_device.h-fix-narrowing-warning.patch b/recipes-core/libxcam/libxcam/0001-fake_v4l2_device.h-fix-narrowing-warning.patch new file mode 100644 index 00000000..f15d5cc7 --- /dev/null +++ b/recipes-core/libxcam/libxcam/0001-fake_v4l2_device.h-fix-narrowing-warning.patch | |||
@@ -0,0 +1,94 @@ | |||
1 | From d4c97b50b577ea16b9ff6d9a352ab474a119310e Mon Sep 17 00:00:00 2001 | ||
2 | From: Naveen Saini <naveen.kumar.saini@intel.com> | ||
3 | Date: Wed, 18 May 2022 15:41:24 +0800 | ||
4 | Subject: [PATCH] fake_v4l2_device.h: fix narrowing warning | ||
5 | |||
6 | Use uint32_t instead of int for IOCTLs commands. | ||
7 | |||
8 | Warning log: | ||
9 | | ../../../git/xcore/fake_v4l2_device.h: In member function 'virtual int XCam::FakeV4l2Device::io_control(int, void*)': | ||
10 | | ../../../git/xcore/fake_v4l2_device.h:42:14: error: narrowing conversion of '3225441794' from 'long unsigned int' to 'int' [-Wnarrowing] | ||
11 | | 42 | case VIDIOC_ENUM_FMT: | ||
12 | | | ^~~~~~~~~~~~~~~ | ||
13 | | make[4]: *** [Makefile:685: libgstxcamsrc_la-gstxcamsrc.lo] Error 1 | ||
14 | |||
15 | Issue: https://github.com/intel/libxcam/issues/801 | ||
16 | Upstream-Status: Submitted [https://github.com/intel/libxcam/pull/802] | ||
17 | |||
18 | Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> | ||
19 | --- | ||
20 | xcore/base/xcam_common.h | 2 +- | ||
21 | xcore/fake_v4l2_device.h | 2 +- | ||
22 | xcore/v4l2_device.cpp | 2 +- | ||
23 | xcore/v4l2_device.h | 2 +- | ||
24 | xcore/xcam_common.cpp | 2 +- | ||
25 | 5 files changed, 5 insertions(+), 5 deletions(-) | ||
26 | |||
27 | diff --git a/xcore/base/xcam_common.h b/xcore/base/xcam_common.h | ||
28 | index 1f16e1e..4aa6cb9 100644 | ||
29 | --- a/xcore/base/xcam_common.h | ||
30 | +++ b/xcore/base/xcam_common.h | ||
31 | @@ -75,7 +75,7 @@ void xcam_free (void *ptr); | ||
32 | * return, 0 successfully | ||
33 | * else, check errno | ||
34 | */ | ||
35 | -int xcam_device_ioctl (int fd, int cmd, void *arg); | ||
36 | +int xcam_device_ioctl (int fd, uint32_t cmd, void *arg); | ||
37 | const char *xcam_fourcc_to_string (uint32_t fourcc); | ||
38 | |||
39 | void xcam_set_log (const char* file_name); | ||
40 | diff --git a/xcore/fake_v4l2_device.h b/xcore/fake_v4l2_device.h | ||
41 | index f679c19..e29787d 100644 | ||
42 | --- a/xcore/fake_v4l2_device.h | ||
43 | +++ b/xcore/fake_v4l2_device.h | ||
44 | @@ -33,7 +33,7 @@ public: | ||
45 | : V4l2Device ("/dev/null") | ||
46 | {} | ||
47 | |||
48 | - int io_control (int cmd, void *arg) | ||
49 | + int io_control (uint32_t cmd, void *arg) | ||
50 | { | ||
51 | XCAM_UNUSED (arg); | ||
52 | |||
53 | diff --git a/xcore/v4l2_device.cpp b/xcore/v4l2_device.cpp | ||
54 | index 395461e..66a8ac6 100644 | ||
55 | --- a/xcore/v4l2_device.cpp | ||
56 | +++ b/xcore/v4l2_device.cpp | ||
57 | @@ -185,7 +185,7 @@ V4l2Device::close () | ||
58 | } | ||
59 | |||
60 | int | ||
61 | -V4l2Device::io_control (int cmd, void *arg) | ||
62 | +V4l2Device::io_control (uint32_t cmd, void *arg) | ||
63 | |||
64 | { | ||
65 | if (_fd <= 0) | ||
66 | diff --git a/xcore/v4l2_device.h b/xcore/v4l2_device.h | ||
67 | index b4ad7ad..2551a92 100644 | ||
68 | --- a/xcore/v4l2_device.h | ||
69 | +++ b/xcore/v4l2_device.h | ||
70 | @@ -104,7 +104,7 @@ public: | ||
71 | XCamReturn queue_buffer (SmartPtr<V4l2Buffer> &buf); | ||
72 | |||
73 | // use as less as possible | ||
74 | - virtual int io_control (int cmd, void *arg); | ||
75 | + virtual int io_control (uint32_t cmd, void *arg); | ||
76 | |||
77 | protected: | ||
78 | |||
79 | diff --git a/xcore/xcam_common.cpp b/xcore/xcam_common.cpp | ||
80 | index 848884d..d4d5093 100644 | ||
81 | --- a/xcore/xcam_common.cpp | ||
82 | +++ b/xcore/xcam_common.cpp | ||
83 | @@ -53,7 +53,7 @@ void xcam_free(void *ptr) | ||
84 | free (ptr); | ||
85 | } | ||
86 | |||
87 | -int xcam_device_ioctl (int fd, int cmd, void *arg) | ||
88 | +int xcam_device_ioctl (int fd, uint32_t cmd, void *arg) | ||
89 | { | ||
90 | int ret = 0; | ||
91 | int tried_time = 0; | ||
92 | -- | ||
93 | 2.25.1 | ||
94 | |||
diff --git a/recipes-core/libxcam/libxcam_1.5.0.bb b/recipes-core/libxcam/libxcam_1.5.0.bb new file mode 100644 index 00000000..df459d72 --- /dev/null +++ b/recipes-core/libxcam/libxcam_1.5.0.bb | |||
@@ -0,0 +1,39 @@ | |||
1 | SUMMARY = "libXCam is a project for extended camera(not limited in camera) \ | ||
2 | features and focus on image quality improvement and video analysis" | ||
3 | LICENSE = "Apache-2.0" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=8c911f084a3e5f46b21582a6cc9973e6" | ||
5 | SECTION = "lib" | ||
6 | |||
7 | inherit autotools pkgconfig | ||
8 | |||
9 | S = "${WORKDIR}/git" | ||
10 | SRCREV = "231a1d5243cd45c7a6b511b667f1ec52178fdda8" | ||
11 | SRC_URI = "git://github.com/intel/libxcam.git;branch=1.5.0;protocol=https \ | ||
12 | file://0001-fake_v4l2_device.h-fix-narrowing-warning.patch \ | ||
13 | " | ||
14 | |||
15 | COMPATIBLE_HOST:libc-musl = "null" | ||
16 | |||
17 | PACKAGECONFIG ??= " gst \ | ||
18 | ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "gles", "", d)} \ | ||
19 | ${@bb.utils.contains("DISTRO_FEATURES", "vulkan", "vulkan", "", d)} \ | ||
20 | " | ||
21 | |||
22 | PACKAGECONFIG[gst] = "--enable-gst, --disable-gst, gstreamer1.0 gstreamer1.0-plugins-base" | ||
23 | PACKAGECONFIG[aiq] = "--enable-aiq, --disable-aiq," | ||
24 | PACKAGECONFIG[libcl] = "--enable-libcl, --disable-libcl," | ||
25 | PACKAGECONFIG[opencv] = "--enable-opencv, --disable-opencv, opencv" | ||
26 | PACKAGECONFIG[render] = "--enable-render, --disable-render," | ||
27 | PACKAGECONFIG[gles] = "--enable-gles, --disable-gles, virtual/mesa" | ||
28 | PACKAGECONFIG[vulkan] = "--enable-vulkan, --disable-vulkan, vulkan-loader virtual/mesa" | ||
29 | PACKAGECONFIG[dnn] = "--enable-dnn, --disable-dnn," | ||
30 | |||
31 | do_install:append () { | ||
32 | install -d ${D}${bindir}/libxcam | ||
33 | cp -r ${B}/tests/.libs/* ${D}${bindir}/libxcam/ | ||
34 | } | ||
35 | |||
36 | FILES:${PN} += "${libdir}/gstreamer-*/*.so" | ||
37 | FILES:${PN}-test = "${bindir}/libxcam/*" | ||
38 | PACKAGES =+ "${PN}-test" | ||
39 | RDEPENDS:${PN}-test =+ "bash" | ||
diff --git a/recipes-core/meta/icx-environment.inc b/recipes-core/meta/icx-environment.inc new file mode 100644 index 00000000..65322a91 --- /dev/null +++ b/recipes-core/meta/icx-environment.inc | |||
@@ -0,0 +1,15 @@ | |||
1 | export ICX_LDFLAGS_OPTION = " -Wl,-dynamic-linker,/lib/ld-linux-x86-64.so.2" | ||
2 | export ICXSDK_PREFIX_OPTION = "-B ${TARGET_PREFIX}" | ||
3 | export ICXQSDK_PREFIX_OPTION = "-qgnu-prefix=${TARGET_PREFIX}" | ||
4 | |||
5 | create_sdk_files:append() { | ||
6 | script=${SDK_OUTPUT}/${SDKPATH}/environment-setup-${REAL_MULTIMACH_TARGET_SYS} | ||
7 | if ${@bb.utils.contains('ICXSDK', '1', 'true', 'false', d)}; then | ||
8 | echo 'export ICX="icx ${ICXSDK_PREFIX_OPTION} --target=${TARGET_SYS} ${TARGET_CC_ARCH} --sysroot=$SDKTARGETSYSROOT ${ICX_LDFLAGS_OPTION}"' >> $script | ||
9 | echo 'export ICXCXX="icpx ${ICXSDK_PREFIX_OPTION} --target=${TARGET_SYS} ${TARGET_CC_ARCH} --sysroot=$SDKTARGETSYSROOT ${ICX_LDFLAGS_OPTION}"' >> $script | ||
10 | echo 'export ICXCPP="icx ${ICXSDK_PREFIX_OPTION} -E --target=${TARGET_SYS} ${TARGET_CC_ARCH} --sysroot=$SDKTARGETSYSROOT ${ICX_LDFLAGS_OPTION}"' >> $script | ||
11 | echo 'export ICXLD="xild --sysroot=$SDKTARGETSYSROOT "' >> $script | ||
12 | echo 'export ICXCCLD="icx ${ICXSDK_PREFIX_OPTION} --sysroot=$SDKTARGETSYSROOT"' >> $script | ||
13 | echo 'export ICXAR="xiar ${ICXQSDK_PREFIX_OPTION}"' >> $script | ||
14 | fi | ||
15 | } | ||
diff --git a/recipes-core/meta/meta-environment-extsdk.bbappend b/recipes-core/meta/meta-environment-extsdk.bbappend new file mode 100644 index 00000000..2cff6fc4 --- /dev/null +++ b/recipes-core/meta/meta-environment-extsdk.bbappend | |||
@@ -0,0 +1,3 @@ | |||
1 | FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" | ||
2 | |||
3 | require ${@bb.utils.contains('ICXSDK', '1', 'icx-environment.inc', '', d)} | ||
diff --git a/recipes-core/meta/meta-environment.bbappend b/recipes-core/meta/meta-environment.bbappend new file mode 100644 index 00000000..2cff6fc4 --- /dev/null +++ b/recipes-core/meta/meta-environment.bbappend | |||
@@ -0,0 +1,3 @@ | |||
1 | FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" | ||
2 | |||
3 | require ${@bb.utils.contains('ICXSDK', '1', 'icx-environment.inc', '', d)} | ||
diff --git a/recipes-core/microcode/files/Intel-Microcode-License b/recipes-core/microcode/files/Intel-Microcode-License deleted file mode 100644 index af5b41c2..00000000 --- a/recipes-core/microcode/files/Intel-Microcode-License +++ /dev/null | |||
@@ -1,123 +0,0 @@ | |||
1 | INTEL SOFTWARE LICENSE AGREEMENT | ||
2 | |||
3 | IMPORTANT - READ BEFORE COPYING, INSTALLING OR USING. | ||
4 | Do not use or load this software and any associated materials (collectively, | ||
5 | the "Software") until you have carefully read the following terms and | ||
6 | conditions. By loading or using the Software, you agree to the terms of this | ||
7 | Agreement. If you do not wish to so agree, do not install or use the Software. | ||
8 | |||
9 | LICENSES: Please Note: | ||
10 | - If you are a network administrator, the "Site License" below shall | ||
11 | apply to you. | ||
12 | - If you are an end user, the "Single User License" shall apply to you. | ||
13 | - If you are an original equipment manufacturer (OEM), the "OEM License" | ||
14 | shall apply to you. | ||
15 | |||
16 | SITE LICENSE. You may copy the Software onto your organization's computers | ||
17 | for your organization's use, and you may make a reasonable number of | ||
18 | back-up copies of the Software, subject to these conditions: | ||
19 | |||
20 | 1. This Software is licensed for use only in conjunction with Intel | ||
21 | component products. Use of the Software in conjunction with non-Intel | ||
22 | component products is not licensed hereunder. | ||
23 | 2. You may not copy, modify, rent, sell, distribute or transfer any part | ||
24 | of the Software except as provided in this Agreement, and you agree to | ||
25 | prevent unauthorized copying of the Software. | ||
26 | 3. You may not reverse engineer, decompile, or disassemble the Software. | ||
27 | 4. You may not sublicense or permit simultaneous use of the Software by | ||
28 | more than one user. | ||
29 | 5. The Software may include portions offered on terms in addition to those | ||
30 | set out here, as set out in a license accompanying those portions. | ||
31 | |||
32 | SINGLE USER LICENSE. You may copy the Software onto a single computer for | ||
33 | your personal, noncommercial use, and you may make one back-up copy of the | ||
34 | Software, subject to these conditions: | ||
35 | |||
36 | 1. This Software is licensed for use only in conjunction with Intel | ||
37 | component products. Use of the Software in conjunction with non-Intel | ||
38 | component products is not licensed hereunder. | ||
39 | 2. You may not copy, modify, rent, sell, distribute or transfer any part | ||
40 | of the Software except as provided in this Agreement, and you agree to | ||
41 | prevent unauthorized copying of the Software. | ||
42 | 3. You may not reverse engineer, decompile, or disassemble the Software. | ||
43 | 4. You may not sublicense or permit simultaneous use of the Software by | ||
44 | more than one user. | ||
45 | 5. The Software may include portions offered on terms in addition to those | ||
46 | set out here, as set out in a license accompanying those portions. | ||
47 | |||
48 | OEM LICENSE: You may reproduce and distribute the Software only as an | ||
49 | integral part of or incorporated in Your product or as a standalone | ||
50 | Software maintenance update for existing end users of Your products, | ||
51 | excluding any other standalone products, subject to these conditions: | ||
52 | |||
53 | 1. This Software is licensed for use only in conjunction with Intel | ||
54 | component products. Use of the Software in conjunction with non-Intel | ||
55 | component products is not licensed hereunder. | ||
56 | 2. You may not copy, modify, rent, sell, distribute or transfer any part | ||
57 | of the Software except as provided in this Agreement, and you agree to | ||
58 | prevent unauthorized copying of the Software. | ||
59 | 3. You may not reverse engineer, decompile, or disassemble the Software. | ||
60 | 4. You may only distribute the Software to your customers pursuant to a | ||
61 | written license agreement. Such license agreement may be a "break-the- | ||
62 | seal" license agreement. At a minimum such license shall safeguard | ||
63 | Intel's ownership rights to the Software. | ||
64 | 5. The Software may include portions offered on terms in addition to those | ||
65 | set out here, as set out in a license accompanying those portions. | ||
66 | |||
67 | NO OTHER RIGHTS. No rights or licenses are granted by Intel to You, expressly | ||
68 | or by implication, with respect to any proprietary information or patent, | ||
69 | copyright, mask work, trademark, trade secret, or other intellectual property | ||
70 | right owned or controlled by Intel, except as expressly provided in this | ||
71 | Agreement. | ||
72 | |||
73 | OWNERSHIP OF SOFTWARE AND COPYRIGHTS. Title to all copies of the Software | ||
74 | remains with Intel or its suppliers. The Software is copyrighted and | ||
75 | protected by the laws of the United States and other countries, and | ||
76 | international treaty provisions. You may not remove any copyright notices | ||
77 | from the Software. Intel may make changes to the Software, or to items | ||
78 | referenced therein, at any time without notice, but is not obligated to | ||
79 | support or update the Software. Except as otherwise expressly provided, Intel | ||
80 | grants no express or implied right under Intel patents, copyrights, | ||
81 | trademarks, or other intellectual property rights. You may transfer the | ||
82 | Software only if the recipient agrees to be fully bound by these terms and if | ||
83 | you retain no copies of the Software. | ||
84 | |||
85 | LIMITED MEDIA WARRANTY. If the Software has been delivered by Intel on | ||
86 | physical media, Intel warrants the media to be free from material physical | ||
87 | defects for a period of ninety days after delivery by Intel. If such a defect | ||
88 | is found, return the media to Intel for replacement or alternate delivery of | ||
89 | the Software as Intel may select. | ||
90 | |||
91 | EXCLUSION OF OTHER WARRANTIES. EXCEPT AS PROVIDED ABOVE, THE SOFTWARE IS | ||
92 | PROVIDED "AS IS" WITHOUT ANY EXPRESS OR IMPLIED WARRANTY OF ANY KIND | ||
93 | INCLUDING WARRANTIES OF MERCHANTABILITY, NONINFRINGEMENT, OR FITNESS FOR A | ||
94 | PARTICULAR PURPOSE. Intel does not warrant or assume responsibility for the | ||
95 | accuracy or completeness of any information, text, graphics, links or other | ||
96 | items contained within the Software. | ||
97 | |||
98 | LIMITATION OF LIABILITY. IN NO EVENT SHALL INTEL OR ITS SUPPLIERS BE LIABLE | ||
99 | FOR ANY DAMAGES WHATSOEVER (INCLUDING, WITHOUT LIMITATION, LOST PROFITS, | ||
100 | BUSINESS INTERRUPTION, OR LOST INFORMATION) ARISING OUT OF THE USE OF OR | ||
101 | INABILITY TO USE THE SOFTWARE, EVEN IF INTEL HAS BEEN ADVISED OF THE | ||
102 | POSSIBILITY OF SUCH DAMAGES. SOME JURISDICTIONS PROHIBIT EXCLUSION OR | ||
103 | LIMITATION OF LIABILITY FOR IMPLIED WARRANTIES OR CONSEQUENTIAL OR INCIDENTAL | ||
104 | DAMAGES, SO THE ABOVE LIMITATION MAY NOT APPLY TO YOU. YOU MAY ALSO HAVE | ||
105 | OTHER LEGAL RIGHTS THAT VARY FROM JURISDICTION TO JURISDICTION. | ||
106 | |||
107 | TERMINATION OF THIS AGREEMENT. Intel may terminate this Agreement at any time | ||
108 | if you violate its terms. Upon termination, you will immediately destroy the | ||
109 | Software or return all copies of the Software to Intel. | ||
110 | |||
111 | APPLICABLE LAWS. Claims arising under this Agreement shall be governed by the | ||
112 | laws of California, excluding its principles of conflict of laws and the | ||
113 | United Nations Convention on Contracts for the Sale of Goods. You may not | ||
114 | export the Software in violation of applicable export laws and regulations. | ||
115 | Intel is not obligated under any other agreements unless they are in writing | ||
116 | and signed by an authorized representative of Intel. | ||
117 | |||
118 | GOVERNMENT RESTRICTED RIGHTS. The Software is provided with "RESTRICTED | ||
119 | RIGHTS." Use, duplication, or disclosure by the Government is subject to | ||
120 | restrictions as set forth in FAR52.227-14 and DFAR252.227-7013 et seq. or its | ||
121 | successor. Use of the Software by the Government constitutes acknowledgment | ||
122 | of Intel's proprietary rights therein. Contractor or Manufacturer is Intel | ||
123 | 2200 Mission College Blvd., Santa Clara, CA 95052. | ||
diff --git a/recipes-core/microcode/intel-microcode_20180807.bb b/recipes-core/microcode/intel-microcode_20240312.bb index 02601250..00b18231 100644 --- a/recipes-core/microcode/intel-microcode_20180807.bb +++ b/recipes-core/microcode/intel-microcode_20240312.bb | |||
@@ -11,16 +11,15 @@ DESCRIPTION = "The microcode data file contains the latest microcode\ | |||
11 | if the file is placed in the /etc/firmware directory of the Linux system." | 11 | if the file is placed in the /etc/firmware directory of the Linux system." |
12 | 12 | ||
13 | LICENSE = "Intel-Microcode-License" | 13 | LICENSE = "Intel-Microcode-License" |
14 | LIC_FILES_CHKSUM = "file://Intel-Microcode-License;md5=9052c0dbf7250dc0bef70bd8212b0573" | 14 | LIC_FILES_CHKSUM = "file://license;md5=d8405101ec6e90c1d84b082b0c40c721" |
15 | 15 | ||
16 | SRC_URI = "https://downloadmirror.intel.com/28039/eng/microcode-${PV}.tgz \ | 16 | SRC_URI = "git://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files.git;protocol=https;branch=main \ |
17 | file://Intel-Microcode-License \ | ||
18 | " | 17 | " |
19 | 18 | ||
20 | SRC_URI[md5sum] = "49f534f1079d3c5bc178a150c1c105aa" | 19 | SRCREV = "41af34500598418150aa298bb04e7edacc547897" |
21 | SRC_URI[sha256sum] = "29f9e8dc27e6c9b6488cecd7fe2394030307799e511db2d197d9e6553a7f9e40" | 20 | |
22 | DEPENDS = "iucode-tool-native" | 21 | DEPENDS = "iucode-tool-native" |
23 | S = "${WORKDIR}" | 22 | S = "${WORKDIR}/git" |
24 | 23 | ||
25 | COMPATIBLE_HOST = "(i.86|x86_64).*-linux" | 24 | COMPATIBLE_HOST = "(i.86|x86_64).*-linux" |
26 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 25 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
@@ -32,30 +31,24 @@ inherit deploy | |||
32 | UCODE_FILTER_PARAMETERS ?= "" | 31 | UCODE_FILTER_PARAMETERS ?= "" |
33 | 32 | ||
34 | do_compile() { | 33 | do_compile() { |
35 | rm -f ${WORKDIR}/intel-ucode/list | ||
36 | ${STAGING_DIR_NATIVE}${sbindir_native}/iucode_tool \ | ||
37 | ${UCODE_FILTER_PARAMETERS} \ | ||
38 | --overwrite \ | ||
39 | --write-to=${WORKDIR}/microcode_${PV}.bin \ | ||
40 | ${WORKDIR}/intel-ucode/* | ||
41 | |||
42 | ${STAGING_DIR_NATIVE}${sbindir_native}/iucode_tool \ | 34 | ${STAGING_DIR_NATIVE}${sbindir_native}/iucode_tool \ |
43 | ${UCODE_FILTER_PARAMETERS} \ | 35 | ${UCODE_FILTER_PARAMETERS} \ |
44 | --overwrite \ | 36 | --overwrite \ |
45 | --write-earlyfw=${WORKDIR}/microcode_${PV}.cpio \ | 37 | --write-earlyfw=${WORKDIR}/microcode_${PV}.cpio \ |
46 | ${WORKDIR}/intel-ucode/* | 38 | ${S}/intel-ucode/* ${S}/intel-ucode-with-caveats/* |
47 | } | 39 | } |
48 | 40 | ||
49 | do_install() { | 41 | do_install() { |
50 | install -d ${D}${base_libdir}/firmware/intel-ucode/ | 42 | install -d ${D}${nonarch_base_libdir}/firmware/intel-ucode/ |
51 | install ${WORKDIR}/microcode_${PV}.bin ${D}${base_libdir}/firmware/intel-ucode/ | 43 | ${STAGING_DIR_NATIVE}${sbindir_native}/iucode_tool \ |
52 | cd ${D}${base_libdir}/firmware/intel-ucode/ | 44 | ${UCODE_FILTER_PARAMETERS} \ |
53 | ln -sf microcode_${PV}.bin microcode.bin | 45 | --write-firmware=${D}${nonarch_base_libdir}/firmware/intel-ucode \ |
46 | ${S}/intel-ucode/* ${S}/intel-ucode-with-caveats/* | ||
54 | } | 47 | } |
55 | 48 | ||
56 | do_deploy() { | 49 | do_deploy() { |
57 | install -d ${DEPLOYDIR} | 50 | install -d ${DEPLOYDIR} |
58 | install ${S}/microcode_${PV}.cpio ${DEPLOYDIR}/ | 51 | install ${WORKDIR}/microcode_${PV}.cpio ${DEPLOYDIR}/ |
59 | cd ${DEPLOYDIR} | 52 | cd ${DEPLOYDIR} |
60 | rm -f microcode.cpio | 53 | rm -f microcode.cpio |
61 | ln -sf microcode_${PV}.cpio microcode.cpio | 54 | ln -sf microcode_${PV}.cpio microcode.cpio |
@@ -65,4 +58,6 @@ addtask deploy before do_build after do_compile | |||
65 | 58 | ||
66 | PACKAGES = "${PN}" | 59 | PACKAGES = "${PN}" |
67 | 60 | ||
68 | FILES_${PN} = "${base_libdir}" | 61 | FILES:${PN} = "${nonarch_base_libdir}" |
62 | |||
63 | UPSTREAM_CHECK_GITTAGREGEX = "^microcode-(?P<pver>(\d+)[a-z]*)$" | ||
diff --git a/recipes-core/microcode/iucode-tool_2.3.1.bb b/recipes-core/microcode/iucode-tool_2.3.1.bb index df74a8e9..19417b7c 100644 --- a/recipes-core/microcode/iucode-tool_2.3.1.bb +++ b/recipes-core/microcode/iucode-tool_2.3.1.bb | |||
@@ -12,14 +12,14 @@ DESCRIPTION = "iucode_tool is a program to manipulate Intel i686 and X86-64\ | |||
12 | HOMEPAGE = "https://gitlab.com/iucode-tool/" | 12 | HOMEPAGE = "https://gitlab.com/iucode-tool/" |
13 | BUGTRACKER = "https://bugs.debian.org/cgi-bin/pkgreport.cgi?ordering=normal;archive=0;src=iucode-tool;repeatmerged=0" | 13 | BUGTRACKER = "https://bugs.debian.org/cgi-bin/pkgreport.cgi?ordering=normal;archive=0;src=iucode-tool;repeatmerged=0" |
14 | 14 | ||
15 | LICENSE = "GPLv2+" | 15 | LICENSE = "GPL-2.0-or-later" |
16 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ | 16 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ |
17 | file://iucode_tool.c;beginline=1;endline=15;md5=71eeab3190360ff0267101b570874756" | 17 | file://iucode_tool.c;beginline=1;endline=15;md5=71eeab3190360ff0267101b570874756" |
18 | 18 | ||
19 | DEPENDS_append_libc-musl = " argp-standalone" | 19 | DEPENDS:append:libc-musl = " argp-standalone" |
20 | 20 | ||
21 | SRC_URI = "https://gitlab.com/iucode-tool/releases/raw/master/iucode-tool_${PV}.tar.xz" | 21 | SRC_URI = "https://gitlab.com/iucode-tool/releases/raw/master/iucode-tool_${PV}.tar.xz" |
22 | SRC_URI_append_libc-musl = " file://0001-Makefile.am-Add-arg-parse-library-for-MUSL-support.patch" | 22 | SRC_URI:append:libc-musl = " file://0001-Makefile.am-Add-arg-parse-library-for-MUSL-support.patch" |
23 | 23 | ||
24 | SRC_URI[md5sum] = "63b33cc0ea1f8c73b443412abbf39d6f" | 24 | SRC_URI[md5sum] = "63b33cc0ea1f8c73b443412abbf39d6f" |
25 | SRC_URI[sha256sum] = "12b88efa4d0d95af08db05a50b3dcb217c0eb2bfc67b483779e33d498ddb2f95" | 25 | SRC_URI[sha256sum] = "12b88efa4d0d95af08db05a50b3dcb217c0eb2bfc67b483779e33d498ddb2f95" |
diff --git a/recipes-core/ovmf/files/0001-ovmf-RefkitTestCA-TEST-UEFI-SecureBoot.patch b/recipes-core/ovmf/files/0001-ovmf-RefkitTestCA-TEST-UEFI-SecureBoot.patch index 62db0633..7eb3bc69 100644 --- a/recipes-core/ovmf/files/0001-ovmf-RefkitTestCA-TEST-UEFI-SecureBoot.patch +++ b/recipes-core/ovmf/files/0001-ovmf-RefkitTestCA-TEST-UEFI-SecureBoot.patch | |||
@@ -1,6 +1,6 @@ | |||
1 | From 48e511481d83c1614cd00a5a2edcf6b5d746b9c4 Mon Sep 17 00:00:00 2001 | 1 | From b2099e7184d48a6d05c8713b6fd5dac0e2e70963 Mon Sep 17 00:00:00 2001 |
2 | From: Mikko Ylinen <mikko.ylinen@linux.intel.com> | 2 | From: Mikko Ylinen <mikko.ylinen@linux.intel.com> |
3 | Date: Fri, 7 Apr 2017 12:06:14 +0300 | 3 | Date: Wed, 2 Mar 2022 10:55:35 +0800 |
4 | Subject: [PATCH] ovmf: RefkitTestCA: TEST UEFI SecureBoot | 4 | Subject: [PATCH] ovmf: RefkitTestCA: TEST UEFI SecureBoot |
5 | 5 | ||
6 | This patch adds refkit-db.cer (via xxd -i) in OVMF's db | 6 | This patch adds refkit-db.cer (via xxd -i) in OVMF's db |
@@ -9,97 +9,121 @@ application. It's used for testing purposes only. | |||
9 | 9 | ||
10 | Images signed with refkit-db keys are allowed to boot. | 10 | Images signed with refkit-db keys are allowed to boot. |
11 | 11 | ||
12 | Upstream-Status: Inappropriate | ||
13 | |||
12 | Signed-off-by: Mikko Ylinen <mikko.ylinen@linux.intel.com> | 14 | Signed-off-by: Mikko Ylinen <mikko.ylinen@linux.intel.com> |
15 | Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> | ||
13 | --- | 16 | --- |
14 | OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c | 68 +++++++++++++++++++++++++++ | 17 | OvmfPkg/EnrollDefaultKeys/AuthData.c | 69 +++++++++++++++++++ |
15 | 1 file changed, 68 insertions(+) | 18 | OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c | 3 + |
19 | OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.h | 2 + | ||
20 | 3 files changed, 74 insertions(+) | ||
16 | 21 | ||
22 | diff --git a/OvmfPkg/EnrollDefaultKeys/AuthData.c b/OvmfPkg/EnrollDefaultKeys/AuthData.c | ||
23 | index 53ee7f7003..127131cd05 100644 | ||
24 | --- a/OvmfPkg/EnrollDefaultKeys/AuthData.c | ||
25 | +++ b/OvmfPkg/EnrollDefaultKeys/AuthData.c | ||
26 | @@ -395,6 +395,75 @@ CONST UINT8 mMicrosoftUefiCa[] = { | ||
27 | |||
28 | CONST UINTN mSizeOfMicrosoftUefiCa = sizeof mMicrosoftUefiCa; | ||
29 | |||
30 | +CONST UINT8 mRefkitTestCA[] = { | ||
31 | + 0x30, 0x82, 0x02, 0xfb, 0x30, 0x82, 0x01, 0xe3, 0xa0, 0x03, 0x02, 0x01, | ||
32 | + 0x02, 0x02, 0x09, 0x00, 0xd4, 0xf6, 0x48, 0xc2, 0x68, 0x19, 0x91, 0xac, | ||
33 | + 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, | ||
34 | + 0x0b, 0x05, 0x00, 0x30, 0x14, 0x31, 0x12, 0x30, 0x10, 0x06, 0x03, 0x55, | ||
35 | + 0x04, 0x03, 0x0c, 0x09, 0x72, 0x65, 0x66, 0x6b, 0x69, 0x74, 0x2d, 0x64, | ||
36 | + 0x62, 0x30, 0x1e, 0x17, 0x0d, 0x31, 0x37, 0x30, 0x34, 0x32, 0x30, 0x31, | ||
37 | + 0x32, 0x30, 0x36, 0x33, 0x32, 0x5a, 0x17, 0x0d, 0x31, 0x38, 0x30, 0x34, | ||
38 | + 0x32, 0x30, 0x31, 0x32, 0x30, 0x36, 0x33, 0x32, 0x5a, 0x30, 0x14, 0x31, | ||
39 | + 0x12, 0x30, 0x10, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x09, 0x72, 0x65, | ||
40 | + 0x66, 0x6b, 0x69, 0x74, 0x2d, 0x64, 0x62, 0x30, 0x82, 0x01, 0x22, 0x30, | ||
41 | + 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01, | ||
42 | + 0x05, 0x00, 0x03, 0x82, 0x01, 0x0f, 0x00, 0x30, 0x82, 0x01, 0x0a, 0x02, | ||
43 | + 0x82, 0x01, 0x01, 0x00, 0xb4, 0x1c, 0x22, 0xa6, 0x22, 0x01, 0x57, 0xcd, | ||
44 | + 0xf1, 0x4f, 0xaf, 0x72, 0xe3, 0xd9, 0x01, 0x80, 0x50, 0x55, 0xef, 0x02, | ||
45 | + 0x5e, 0xeb, 0x99, 0x35, 0xcb, 0x7f, 0x2a, 0x79, 0xff, 0xb5, 0x3e, 0xec, | ||
46 | + 0x5d, 0x92, 0x06, 0x30, 0x20, 0xe7, 0x95, 0xad, 0xa4, 0x84, 0x2e, 0x3f, | ||
47 | + 0xfa, 0xd7, 0x46, 0xdd, 0x49, 0xa8, 0xe8, 0xe3, 0x79, 0x49, 0xf6, 0x8f, | ||
48 | + 0x0b, 0x1d, 0xfe, 0x63, 0xa8, 0xd1, 0x63, 0xa3, 0xd6, 0x0d, 0x4e, 0x6c, | ||
49 | + 0x66, 0x5c, 0xd6, 0x66, 0x26, 0xd1, 0x26, 0x98, 0xd4, 0x4f, 0x76, 0xc9, | ||
50 | + 0x65, 0x48, 0x58, 0x13, 0x08, 0x31, 0xbc, 0xe5, 0x47, 0x25, 0x65, 0x95, | ||
51 | + 0x39, 0x89, 0x5f, 0x02, 0xf1, 0xc5, 0x06, 0x17, 0x58, 0xca, 0x09, 0xfd, | ||
52 | + 0xf6, 0x1e, 0xc5, 0x97, 0xda, 0xa3, 0x4e, 0x1a, 0x48, 0xbe, 0xcf, 0x96, | ||
53 | + 0x27, 0x04, 0x4b, 0xb7, 0x6d, 0x67, 0xb6, 0x50, 0x18, 0x04, 0x73, 0x51, | ||
54 | + 0xd2, 0x6a, 0x2d, 0xdf, 0x3b, 0xab, 0xf2, 0x2d, 0x95, 0xd7, 0xa8, 0xb8, | ||
55 | + 0xa8, 0x30, 0xa1, 0xab, 0x8b, 0x92, 0x2b, 0x60, 0x3e, 0x3a, 0xe5, 0x86, | ||
56 | + 0x40, 0x71, 0xc1, 0x3f, 0x2d, 0x2e, 0x90, 0xe7, 0xd6, 0xec, 0xcc, 0xc2, | ||
57 | + 0x0b, 0x79, 0x83, 0x71, 0x6d, 0xf6, 0xa3, 0xa9, 0x4c, 0xcd, 0x46, 0x81, | ||
58 | + 0xdc, 0xef, 0xec, 0x51, 0xbe, 0x81, 0x2a, 0xf1, 0x78, 0x73, 0x41, 0xdb, | ||
59 | + 0x54, 0xce, 0x7c, 0xce, 0xa2, 0xe3, 0x90, 0x4f, 0x45, 0x1a, 0xf9, 0x3d, | ||
60 | + 0x88, 0xfc, 0x0e, 0xed, 0xd3, 0x69, 0x22, 0x4c, 0xfa, 0x0a, 0x69, 0xd1, | ||
61 | + 0x48, 0xc0, 0xaa, 0xa9, 0x3a, 0xb3, 0x8f, 0x10, 0x3a, 0x76, 0xa8, 0x0c, | ||
62 | + 0x7a, 0x3d, 0xd8, 0x79, 0xce, 0x1c, 0x96, 0x62, 0xf4, 0x06, 0xee, 0x47, | ||
63 | + 0xe8, 0xe0, 0x69, 0x91, 0xae, 0xea, 0x34, 0xcf, 0xda, 0xa8, 0xb4, 0x39, | ||
64 | + 0x5e, 0xf3, 0x7a, 0xd0, 0x88, 0x48, 0x47, 0x69, 0x02, 0x03, 0x01, 0x00, | ||
65 | + 0x01, 0xa3, 0x50, 0x30, 0x4e, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, | ||
66 | + 0x04, 0x16, 0x04, 0x14, 0x68, 0x60, 0x11, 0x25, 0x85, 0x14, 0x78, 0x1b, | ||
67 | + 0x1a, 0x9f, 0x46, 0x12, 0xe6, 0x21, 0xe4, 0xef, 0xfb, 0x3b, 0xaa, 0xdd, | ||
68 | + 0x30, 0x1f, 0x06, 0x03, 0x55, 0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, | ||
69 | + 0x14, 0x68, 0x60, 0x11, 0x25, 0x85, 0x14, 0x78, 0x1b, 0x1a, 0x9f, 0x46, | ||
70 | + 0x12, 0xe6, 0x21, 0xe4, 0xef, 0xfb, 0x3b, 0xaa, 0xdd, 0x30, 0x0c, 0x06, | ||
71 | + 0x03, 0x55, 0x1d, 0x13, 0x04, 0x05, 0x30, 0x03, 0x01, 0x01, 0xff, 0x30, | ||
72 | + 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b, | ||
73 | + 0x05, 0x00, 0x03, 0x82, 0x01, 0x01, 0x00, 0x8f, 0xd2, 0x84, 0x7c, 0x43, | ||
74 | + 0x47, 0xca, 0x6b, 0xfd, 0x87, 0x83, 0xd0, 0xef, 0x75, 0xd3, 0x20, 0x52, | ||
75 | + 0x73, 0x18, 0xaa, 0x32, 0x71, 0xfb, 0xa5, 0xf4, 0xc9, 0x11, 0xa3, 0x68, | ||
76 | + 0x4d, 0xb7, 0x9d, 0xe6, 0xd9, 0x46, 0x24, 0xdc, 0xc7, 0xc2, 0x3b, 0xf9, | ||
77 | + 0xb0, 0x98, 0xfc, 0xee, 0x34, 0x6e, 0x10, 0x9b, 0x3d, 0x44, 0x6e, 0x33, | ||
78 | + 0x09, 0x11, 0xb8, 0x29, 0xd6, 0x2d, 0x06, 0xcf, 0x67, 0x8f, 0x96, 0x85, | ||
79 | + 0x9d, 0x63, 0x72, 0xbf, 0x64, 0x5f, 0x0d, 0xe3, 0xc9, 0x63, 0x19, 0x71, | ||
80 | + 0xd4, 0x7d, 0x4c, 0x9c, 0x77, 0x46, 0xda, 0x20, 0x97, 0x6d, 0xbc, 0xdd, | ||
81 | + 0xc2, 0x1f, 0xf3, 0x40, 0x38, 0x1e, 0xe7, 0xcc, 0x55, 0x05, 0x72, 0xba, | ||
82 | + 0x24, 0x4f, 0xb3, 0x8a, 0x93, 0x0c, 0x30, 0x60, 0xda, 0x9f, 0x6f, 0x35, | ||
83 | + 0xf6, 0xfb, 0xb0, 0x1f, 0xb3, 0x00, 0xdd, 0xc4, 0xa6, 0xbc, 0xe2, 0x37, | ||
84 | + 0xc1, 0xa3, 0xef, 0xd9, 0xa1, 0x86, 0xf9, 0xeb, 0xa4, 0xa5, 0x45, 0x38, | ||
85 | + 0xff, 0x4e, 0x87, 0x4a, 0x41, 0xcf, 0x6e, 0x69, 0x7e, 0x97, 0xbe, 0x2d, | ||
86 | + 0x22, 0xbc, 0x8d, 0xa0, 0x1a, 0x21, 0x8f, 0x4b, 0x72, 0x90, 0x01, 0x5c, | ||
87 | + 0xba, 0xa5, 0x9c, 0x2d, 0xd7, 0x25, 0x24, 0xfc, 0xff, 0x5c, 0x58, 0x14, | ||
88 | + 0x46, 0x30, 0x09, 0x7c, 0x55, 0x64, 0x83, 0x0b, 0xb9, 0xdf, 0xcf, 0x25, | ||
89 | + 0xee, 0xec, 0xf7, 0xcb, 0xdb, 0xd1, 0x5b, 0x93, 0x93, 0xc8, 0x8a, 0x10, | ||
90 | + 0x46, 0xb8, 0xb0, 0x35, 0x1c, 0x6c, 0x0d, 0x8f, 0x03, 0x6a, 0x8f, 0x1b, | ||
91 | + 0x36, 0x68, 0xf3, 0x53, 0x89, 0x36, 0x5b, 0x21, 0x80, 0xde, 0xe3, 0x92, | ||
92 | + 0x52, 0x94, 0x97, 0x9d, 0x49, 0x89, 0x7d, 0x3e, 0xde, 0x29, 0x51, 0xba, | ||
93 | + 0x11, 0xf7, 0xba, 0x01, 0xf7, 0xab, 0xea, 0xc1, 0xa7, 0x2e, 0xa3, 0x4d, | ||
94 | + 0x65, 0xfd, 0x40, 0x71, 0xf1, 0xe2, 0x3f, 0x6c, 0x28, 0xcb, 0xd3 | ||
95 | +}; | ||
96 | + | ||
97 | +CONST UINTN mSizeOfRefkitTestCA = sizeof mRefkitTestCA; | ||
98 | + | ||
99 | // | ||
100 | // The Microsoft.UefiSecureBootLogo.Tests.OutOfBoxConfirmDBXisPresent test case | ||
101 | // of the Secure Boot Logo Test in the Microsoft Hardware Certification Kit | ||
17 | diff --git a/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c | 102 | diff --git a/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c |
18 | index 24ab977..a3c12ba 100644 | 103 | index 094e4c821b..0a7eef54dc 100644 |
19 | --- a/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c | 104 | --- a/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c |
20 | +++ b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c | 105 | +++ b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c |
21 | @@ -516,6 +516,73 @@ STATIC CONST UINT8 MicrosoftUefiCA[] = { | 106 | @@ -702,6 +702,9 @@ ShellAppMain ( |
22 | 0x07, 0x92, 0x9b, 0xf5, 0xa6, 0xbc, 0x59, 0x83, 0x58 | 107 | mMicrosoftUefiCa, |
23 | }; | 108 | mSizeOfMicrosoftUefiCa, |
24 | 109 | &gMicrosoftVendorGuid, | |
25 | +STATIC CONST UINT8 RefkitTestCA[] = { | 110 | + mRefkitTestCA, |
26 | + 0x30, 0x82, 0x02, 0xfb, 0x30, 0x82, 0x01, 0xe3, 0xa0, 0x03, 0x02, 0x01, | 111 | + mSizeOfRefkitTestCA, |
27 | + 0x02, 0x02, 0x09, 0x00, 0xd4, 0xf6, 0x48, 0xc2, 0x68, 0x19, 0x91, 0xac, | 112 | + &gEfiCallerIdGuid, |
28 | + 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, | 113 | NULL |
29 | + 0x0b, 0x05, 0x00, 0x30, 0x14, 0x31, 0x12, 0x30, 0x10, 0x06, 0x03, 0x55, | 114 | ); |
30 | + 0x04, 0x03, 0x0c, 0x09, 0x72, 0x65, 0x66, 0x6b, 0x69, 0x74, 0x2d, 0x64, | 115 | } |
31 | + 0x62, 0x30, 0x1e, 0x17, 0x0d, 0x31, 0x37, 0x30, 0x34, 0x32, 0x30, 0x31, | 116 | diff --git a/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.h b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.h |
32 | + 0x32, 0x30, 0x36, 0x33, 0x32, 0x5a, 0x17, 0x0d, 0x31, 0x38, 0x30, 0x34, | 117 | index 56da9c71d6..8de1dfe4e0 100644 |
33 | + 0x32, 0x30, 0x31, 0x32, 0x30, 0x36, 0x33, 0x32, 0x5a, 0x30, 0x14, 0x31, | 118 | --- a/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.h |
34 | + 0x12, 0x30, 0x10, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x09, 0x72, 0x65, | 119 | +++ b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.h |
35 | + 0x66, 0x6b, 0x69, 0x74, 0x2d, 0x64, 0x62, 0x30, 0x82, 0x01, 0x22, 0x30, | 120 | @@ -133,4 +133,6 @@ extern CONST UINTN mSizeOfMicrosoftUefiCa; |
36 | + 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01, | 121 | extern CONST UINT8 mSha256OfDevNull[]; |
37 | + 0x05, 0x00, 0x03, 0x82, 0x01, 0x0f, 0x00, 0x30, 0x82, 0x01, 0x0a, 0x02, | 122 | extern CONST UINTN mSizeOfSha256OfDevNull; |
38 | + 0x82, 0x01, 0x01, 0x00, 0xb4, 0x1c, 0x22, 0xa6, 0x22, 0x01, 0x57, 0xcd, | 123 | |
39 | + 0xf1, 0x4f, 0xaf, 0x72, 0xe3, 0xd9, 0x01, 0x80, 0x50, 0x55, 0xef, 0x02, | 124 | +extern CONST UINT8 mRefkitTestCA[]; |
40 | + 0x5e, 0xeb, 0x99, 0x35, 0xcb, 0x7f, 0x2a, 0x79, 0xff, 0xb5, 0x3e, 0xec, | 125 | +extern CONST UINTN mSizeOfRefkitTestCA; |
41 | + 0x5d, 0x92, 0x06, 0x30, 0x20, 0xe7, 0x95, 0xad, 0xa4, 0x84, 0x2e, 0x3f, | 126 | #endif /* ENROLL_DEFAULT_KEYS_H_ */ |
42 | + 0xfa, 0xd7, 0x46, 0xdd, 0x49, 0xa8, 0xe8, 0xe3, 0x79, 0x49, 0xf6, 0x8f, | ||
43 | + 0x0b, 0x1d, 0xfe, 0x63, 0xa8, 0xd1, 0x63, 0xa3, 0xd6, 0x0d, 0x4e, 0x6c, | ||
44 | + 0x66, 0x5c, 0xd6, 0x66, 0x26, 0xd1, 0x26, 0x98, 0xd4, 0x4f, 0x76, 0xc9, | ||
45 | + 0x65, 0x48, 0x58, 0x13, 0x08, 0x31, 0xbc, 0xe5, 0x47, 0x25, 0x65, 0x95, | ||
46 | + 0x39, 0x89, 0x5f, 0x02, 0xf1, 0xc5, 0x06, 0x17, 0x58, 0xca, 0x09, 0xfd, | ||
47 | + 0xf6, 0x1e, 0xc5, 0x97, 0xda, 0xa3, 0x4e, 0x1a, 0x48, 0xbe, 0xcf, 0x96, | ||
48 | + 0x27, 0x04, 0x4b, 0xb7, 0x6d, 0x67, 0xb6, 0x50, 0x18, 0x04, 0x73, 0x51, | ||
49 | + 0xd2, 0x6a, 0x2d, 0xdf, 0x3b, 0xab, 0xf2, 0x2d, 0x95, 0xd7, 0xa8, 0xb8, | ||
50 | + 0xa8, 0x30, 0xa1, 0xab, 0x8b, 0x92, 0x2b, 0x60, 0x3e, 0x3a, 0xe5, 0x86, | ||
51 | + 0x40, 0x71, 0xc1, 0x3f, 0x2d, 0x2e, 0x90, 0xe7, 0xd6, 0xec, 0xcc, 0xc2, | ||
52 | + 0x0b, 0x79, 0x83, 0x71, 0x6d, 0xf6, 0xa3, 0xa9, 0x4c, 0xcd, 0x46, 0x81, | ||
53 | + 0xdc, 0xef, 0xec, 0x51, 0xbe, 0x81, 0x2a, 0xf1, 0x78, 0x73, 0x41, 0xdb, | ||
54 | + 0x54, 0xce, 0x7c, 0xce, 0xa2, 0xe3, 0x90, 0x4f, 0x45, 0x1a, 0xf9, 0x3d, | ||
55 | + 0x88, 0xfc, 0x0e, 0xed, 0xd3, 0x69, 0x22, 0x4c, 0xfa, 0x0a, 0x69, 0xd1, | ||
56 | + 0x48, 0xc0, 0xaa, 0xa9, 0x3a, 0xb3, 0x8f, 0x10, 0x3a, 0x76, 0xa8, 0x0c, | ||
57 | + 0x7a, 0x3d, 0xd8, 0x79, 0xce, 0x1c, 0x96, 0x62, 0xf4, 0x06, 0xee, 0x47, | ||
58 | + 0xe8, 0xe0, 0x69, 0x91, 0xae, 0xea, 0x34, 0xcf, 0xda, 0xa8, 0xb4, 0x39, | ||
59 | + 0x5e, 0xf3, 0x7a, 0xd0, 0x88, 0x48, 0x47, 0x69, 0x02, 0x03, 0x01, 0x00, | ||
60 | + 0x01, 0xa3, 0x50, 0x30, 0x4e, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, | ||
61 | + 0x04, 0x16, 0x04, 0x14, 0x68, 0x60, 0x11, 0x25, 0x85, 0x14, 0x78, 0x1b, | ||
62 | + 0x1a, 0x9f, 0x46, 0x12, 0xe6, 0x21, 0xe4, 0xef, 0xfb, 0x3b, 0xaa, 0xdd, | ||
63 | + 0x30, 0x1f, 0x06, 0x03, 0x55, 0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, | ||
64 | + 0x14, 0x68, 0x60, 0x11, 0x25, 0x85, 0x14, 0x78, 0x1b, 0x1a, 0x9f, 0x46, | ||
65 | + 0x12, 0xe6, 0x21, 0xe4, 0xef, 0xfb, 0x3b, 0xaa, 0xdd, 0x30, 0x0c, 0x06, | ||
66 | + 0x03, 0x55, 0x1d, 0x13, 0x04, 0x05, 0x30, 0x03, 0x01, 0x01, 0xff, 0x30, | ||
67 | + 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b, | ||
68 | + 0x05, 0x00, 0x03, 0x82, 0x01, 0x01, 0x00, 0x8f, 0xd2, 0x84, 0x7c, 0x43, | ||
69 | + 0x47, 0xca, 0x6b, 0xfd, 0x87, 0x83, 0xd0, 0xef, 0x75, 0xd3, 0x20, 0x52, | ||
70 | + 0x73, 0x18, 0xaa, 0x32, 0x71, 0xfb, 0xa5, 0xf4, 0xc9, 0x11, 0xa3, 0x68, | ||
71 | + 0x4d, 0xb7, 0x9d, 0xe6, 0xd9, 0x46, 0x24, 0xdc, 0xc7, 0xc2, 0x3b, 0xf9, | ||
72 | + 0xb0, 0x98, 0xfc, 0xee, 0x34, 0x6e, 0x10, 0x9b, 0x3d, 0x44, 0x6e, 0x33, | ||
73 | + 0x09, 0x11, 0xb8, 0x29, 0xd6, 0x2d, 0x06, 0xcf, 0x67, 0x8f, 0x96, 0x85, | ||
74 | + 0x9d, 0x63, 0x72, 0xbf, 0x64, 0x5f, 0x0d, 0xe3, 0xc9, 0x63, 0x19, 0x71, | ||
75 | + 0xd4, 0x7d, 0x4c, 0x9c, 0x77, 0x46, 0xda, 0x20, 0x97, 0x6d, 0xbc, 0xdd, | ||
76 | + 0xc2, 0x1f, 0xf3, 0x40, 0x38, 0x1e, 0xe7, 0xcc, 0x55, 0x05, 0x72, 0xba, | ||
77 | + 0x24, 0x4f, 0xb3, 0x8a, 0x93, 0x0c, 0x30, 0x60, 0xda, 0x9f, 0x6f, 0x35, | ||
78 | + 0xf6, 0xfb, 0xb0, 0x1f, 0xb3, 0x00, 0xdd, 0xc4, 0xa6, 0xbc, 0xe2, 0x37, | ||
79 | + 0xc1, 0xa3, 0xef, 0xd9, 0xa1, 0x86, 0xf9, 0xeb, 0xa4, 0xa5, 0x45, 0x38, | ||
80 | + 0xff, 0x4e, 0x87, 0x4a, 0x41, 0xcf, 0x6e, 0x69, 0x7e, 0x97, 0xbe, 0x2d, | ||
81 | + 0x22, 0xbc, 0x8d, 0xa0, 0x1a, 0x21, 0x8f, 0x4b, 0x72, 0x90, 0x01, 0x5c, | ||
82 | + 0xba, 0xa5, 0x9c, 0x2d, 0xd7, 0x25, 0x24, 0xfc, 0xff, 0x5c, 0x58, 0x14, | ||
83 | + 0x46, 0x30, 0x09, 0x7c, 0x55, 0x64, 0x83, 0x0b, 0xb9, 0xdf, 0xcf, 0x25, | ||
84 | + 0xee, 0xec, 0xf7, 0xcb, 0xdb, 0xd1, 0x5b, 0x93, 0x93, 0xc8, 0x8a, 0x10, | ||
85 | + 0x46, 0xb8, 0xb0, 0x35, 0x1c, 0x6c, 0x0d, 0x8f, 0x03, 0x6a, 0x8f, 0x1b, | ||
86 | + 0x36, 0x68, 0xf3, 0x53, 0x89, 0x36, 0x5b, 0x21, 0x80, 0xde, 0xe3, 0x92, | ||
87 | + 0x52, 0x94, 0x97, 0x9d, 0x49, 0x89, 0x7d, 0x3e, 0xde, 0x29, 0x51, 0xba, | ||
88 | + 0x11, 0xf7, 0xba, 0x01, 0xf7, 0xab, 0xea, 0xc1, 0xa7, 0x2e, 0xa3, 0x4d, | ||
89 | + 0x65, 0xfd, 0x40, 0x71, 0xf1, 0xe2, 0x3f, 0x6c, 0x28, 0xcb, 0xd3 | ||
90 | +}; | ||
91 | + | ||
92 | // | ||
93 | // The most important thing about the variable payload is that it is a list of | ||
94 | // lists, where the element size of any given *inner* list is constant. | ||
95 | @@ -908,6 +975,7 @@ ShellAppMain ( | ||
96 | &gEfiImageSecurityDatabaseGuid, | ||
97 | MicrosoftPCA, sizeof MicrosoftPCA, &gEfiCallerIdGuid, | ||
98 | MicrosoftUefiCA, sizeof MicrosoftUefiCA, &gEfiCallerIdGuid, | ||
99 | + RefkitTestCA, sizeof RefkitTestCA, &gEfiCallerIdGuid, | ||
100 | NULL); | ||
101 | if (EFI_ERROR (Status)) { | ||
102 | return 1; | ||
103 | -- | 127 | -- |
104 | 2.1.4 | 128 | 2.17.1 |
105 | 129 | ||
diff --git a/recipes-core/ovmf/ovmf-shell-image-enrollkeys.bb b/recipes-core/ovmf/ovmf-shell-image-enrollkeys.bb index b20f6e58..ca3cfc15 100644 --- a/recipes-core/ovmf/ovmf-shell-image-enrollkeys.bb +++ b/recipes-core/ovmf/ovmf-shell-image-enrollkeys.bb | |||
@@ -1,10 +1,10 @@ | |||
1 | require recipes-core/ovmf/ovmf-shell-image.bb | 1 | require recipes-core/ovmf/ovmf-shell-image.bb |
2 | 2 | ||
3 | WKS_SEARCH_PATH_append = ":${COREBASE}/meta/recipes-core/ovmf" | 3 | WKS_SEARCH_PATH:append = ":${COREBASE}/meta/recipes-core/ovmf" |
4 | 4 | ||
5 | QB_DRIVE_TYPE = "/dev/vd" | 5 | QB_DRIVE_TYPE = "/dev/vd" |
6 | 6 | ||
7 | do_image_append() { | 7 | do_image:append() { |
8 | cat > ${IMAGE_ROOTFS}/startup.nsh << EOF | 8 | cat > ${IMAGE_ROOTFS}/startup.nsh << EOF |
9 | EnrollDefaultKeys | 9 | EnrollDefaultKeys |
10 | reset | 10 | reset |
diff --git a/recipes-core/ovmf/ovmf_%.bbappend b/recipes-core/ovmf/ovmf_%.bbappend index bbf5fa32..34a9dd1b 100644 --- a/recipes-core/ovmf/ovmf_%.bbappend +++ b/recipes-core/ovmf/ovmf_%.bbappend | |||
@@ -1,6 +1,6 @@ | |||
1 | FILESEXTRAPATHS_prepend_intel-x86-common := "${THISDIR}/files:" | 1 | FILESEXTRAPATHS:prepend:intel-x86-common := "${THISDIR}/files:" |
2 | 2 | ||
3 | SRC_URI_append_intel-x86-common = " \ | 3 | SRC_URI:append:intel-x86-common = " \ |
4 | file://0001-ovmf-RefkitTestCA-TEST-UEFI-SecureBoot.patch \ | 4 | file://0001-ovmf-RefkitTestCA-TEST-UEFI-SecureBoot.patch \ |
5 | " | 5 | " |
6 | PACKAGECONFIG_append_intel-x86-common = " secureboot" | 6 | PACKAGECONFIG:append:intel-x86-common = " secureboot" |
diff --git a/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend b/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend new file mode 100644 index 00000000..b5a5fdd4 --- /dev/null +++ b/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend | |||
@@ -0,0 +1 @@ | |||
RDEPENDS:${PN} += "${@bb.utils.contains('ICXSDK', '1', ' intel-oneapi-dpcpp-cpp intel-oneapi-dpcpp-cpp-dev intel-oneapi-dpcpp-cpp-runtime intel-oneapi-dpcpp-cpp-runtime-dev ', '', d)}" | |||
diff --git a/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bbappend b/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bbappend new file mode 100644 index 00000000..608ea3d3 --- /dev/null +++ b/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bbappend | |||
@@ -0,0 +1 @@ | |||
RRECOMMENDS:${PN}:append:intel-x86-common = "${@bb.utils.contains('ICXSDK', '1', ' intel-oneapi-dpcpp-cpp intel-oneapi-dpcpp-cpp-dev intel-oneapi-dpcpp-cpp-runtime intel-oneapi-dpcpp-cpp-runtime-dev ', '', d)}" | |||