diff mbox series

[isar-cip-core] edk2-standalonemm-rpmb: Update to edk2-stable202305

Message ID e2c82aaf-5c90-778b-d324-630e5d846871@siemens.com (mailing list archive)
State Accepted
Headers show
Series [isar-cip-core] edk2-standalonemm-rpmb: Update to edk2-stable202305 | expand

Commit Message

Jan Kiszka June 10, 2023, 9:55 a.m. UTC 
From: Jan Kiszka <jan.kiszka@siemens.com>

Brings one new dependency: MIPI SyS-T, a tracing infrastructure.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 ...02211.bb => edk2-standalonemm-rpmb_202305.bb} | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)
 rename recipes-bsp/edk2/{edk2-standalonemm-rpmb_202211.bb => edk2-standalonemm-rpmb_202305.bb} (69%)

Comments

Su, Bao Cheng June 12, 2023, 1:30 a.m. UTC | #1 
On Sat, 2023-06-10 at 11:55 +0200, Jan Kiszka wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> Brings one new dependency: MIPI SyS-T, a tracing infrastructure.
> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>  ...02211.bb => edk2-standalonemm-rpmb_202305.bb} | 16 +++++++++++---
> --
>  1 file changed, 11 insertions(+), 5 deletions(-)
>  rename recipes-bsp/edk2/{edk2-standalonemm-rpmb_202211.bb => edk2-
> standalonemm-rpmb_202305.bb} (69%)
> 
> diff --git a/recipes-bsp/edk2/edk2-standalonemm-rpmb_202211.bb
> b/recipes-bsp/edk2/edk2-standalonemm-rpmb_202305.bb
> similarity index 69%
> rename from recipes-bsp/edk2/edk2-standalonemm-rpmb_202211.bb
> rename to recipes-bsp/edk2/edk2-standalonemm-rpmb_202305.bb
> index 40d979d9..1a589184 100644
> --- a/recipes-bsp/edk2/edk2-standalonemm-rpmb_202211.bb
> +++ b/recipes-bsp/edk2/edk2-standalonemm-rpmb_202305.bb
> @@ -19,21 +19,24 @@ SRC_URI = " \
>     
> https://github.com/tianocore/edk2/archive/refs/tags/edk2-stable${PV}.tar.gz;subdir=${S}
>  \
>     
> https://github.com/tianocore/edk2-platforms/archive/${SRCREV-edk2-platforms}.tar.gz;name=edk2-platforms;subdir=${S}
>  \
>     
> https://github.com/google/brotli/archive/${SRCREV-brotli}.tar.gz;name=brotli;subdir=${S}
>  \
> +   
> https://github.com/MIPI-Alliance/public-mipi-sys-t/archive/${SRCREV-mipisyst}.tar.gz;name=mipisyst;subdir=${S}
>  \
>     
> https://github.com/openssl/openssl/archive/refs/tags/${PV-openssl}.tar.gz;name=openssl;subdir=${S}
>  \
>      file://rules \
>      "
> -SRC_URI[sha256sum] =
> "b7276c0496bf4983265bf3f9886b563af1ae6e93aade91f4634ead2b1338d1b4"
> -SRC_URI[edk2-platforms.sha256sum] =
> "b0f5b6d832e4dcc1d47a98ae0560e0b955433e32e8ac6d12c946c66d5fa6f51a"
> +SRC_URI[sha256sum] =
> "5f6c18cf1068089d669fbe81dab2325f8bf7b1298b192c276490b65e2edbbd94"
> +SRC_URI[edk2-platforms.sha256sum] =
> "31257160ac51a4a5f63db92d26482d6a005286ed040dafe89d01f0ee906b111e"
>  SRC_URI[brotli.sha256sum] =
> "6d6cacce05086b7debe75127415ff9c3661849f564fe2f5f3b0383d48aa4ed77"
> -SRC_URI[openssl.sha256sum] =
> "6b2d2440ced8c802aaa61475919f0870ec556694c466ebea460e35ea2b14839e"
> +SRC_URI[mipisyst.sha256sum] =
> "9fda3b9a78343ab2be6f06ce6396536e7e065abac29b47c8eb2e42cbb4c4f00b"
> +SRC_URI[openssl.sha256sum] =
> "b1270f044e36452e15d1f2e18b702691a240b0445080282f2c7daaea8704ec5e"
>  
>  # according to edk2 submodules
>  SRCREV-brotli = "f4153a09f87cbb9c826d8fc12c74642bb2d879ea"
> +SRCREV-mipisyst = "370b5944c046bab043dd8b133727b2135af7747a"
>  
>  # revision closest to edk2 release
> -SRCREV-edk2-platforms = "4ad557e494d8055f5ea16009d6e565cace6571d6"
> +SRCREV-edk2-platforms = "b71f2bda9e4fc183068eef5d1d90a631181a2506"
>  
> -PV-openssl = "OpenSSL_1_1_1n"
> +PV-openssl = "OpenSSL_1_1_1t"
> 

Any clues on when they will upgrade to openssl 3?

>  
>  DEBIAN_BUILD_DEPENDS = "bash, python3:native, dh-python, uuid-
> dev:native"
>  
> @@ -49,6 +52,9 @@ do_prepare_build() {
>      rm -rf
> ${S}/edk2/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli
>      ln -s ../../../../brotli-${SRCREV-brotli}
> ${S}/edk2/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli
>  
> +    rm -rf ${S}/edk2/MdePkg/Library/MipiSysTLib/mipisyst
> +    ln -s ../../../../public-mipi-sys-t-${SRCREV-mipisyst}
> ${S}/edk2/MdePkg/Library/MipiSysTLib/mipisyst
> +
>      rm -rf ${S}/edk2/CryptoPkg/Library/OpensslLib/openssl
>      ln -s ../../../../openssl-${PV-openssl}
> ${S}/edk2/CryptoPkg/Library/OpensslLib/openssl
>
Jan Kiszka June 12, 2023, 6:11 a.m. UTC | #2 
On 12.06.23 03:30, Su, Bao Cheng (DI FA CTR IPC CN PRC4) wrote:
> On Sat, 2023-06-10 at 11:55 +0200, Jan Kiszka wrote:
>> From: Jan Kiszka <jan.kiszka@siemens.com>
>>
>> Brings one new dependency: MIPI SyS-T, a tracing infrastructure.
>>
>> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
>> ---
>>  ...02211.bb => edk2-standalonemm-rpmb_202305.bb} | 16 +++++++++++---
>> --
>>  1 file changed, 11 insertions(+), 5 deletions(-)
>>  rename recipes-bsp/edk2/{edk2-standalonemm-rpmb_202211.bb => edk2-
>> standalonemm-rpmb_202305.bb} (69%)
>>
>> diff --git a/recipes-bsp/edk2/edk2-standalonemm-rpmb_202211.bb
>> b/recipes-bsp/edk2/edk2-standalonemm-rpmb_202305.bb
>> similarity index 69%
>> rename from recipes-bsp/edk2/edk2-standalonemm-rpmb_202211.bb
>> rename to recipes-bsp/edk2/edk2-standalonemm-rpmb_202305.bb
>> index 40d979d9..1a589184 100644
>> --- a/recipes-bsp/edk2/edk2-standalonemm-rpmb_202211.bb
>> +++ b/recipes-bsp/edk2/edk2-standalonemm-rpmb_202305.bb
>> @@ -19,21 +19,24 @@ SRC_URI = " \
>>
>> https://github.com/tianocore/edk2/archive/refs/tags/edk2-stable${PV}.tar.gz;subdir=${S}
>>  \
>>
>> https://github.com/tianocore/edk2-platforms/archive/${SRCREV-edk2-platforms}.tar.gz;name=edk2-platforms;subdir=${S}
>>  \
>>
>> https://github.com/google/brotli/archive/${SRCREV-brotli}.tar.gz;name=brotli;subdir=${S}
>>  \
>> +
>> https://github.com/MIPI-Alliance/public-mipi-sys-t/archive/${SRCREV-mipisyst}.tar.gz;name=mipisyst;subdir=${S}
>>  \
>>
>> https://github.com/openssl/openssl/archive/refs/tags/${PV-openssl}.tar.gz;name=openssl;subdir=${S}
>>  \
>>      file://rules \
>>      "
>> -SRC_URI[sha256sum] =
>> "b7276c0496bf4983265bf3f9886b563af1ae6e93aade91f4634ead2b1338d1b4"
>> -SRC_URI[edk2-platforms.sha256sum] =
>> "b0f5b6d832e4dcc1d47a98ae0560e0b955433e32e8ac6d12c946c66d5fa6f51a"
>> +SRC_URI[sha256sum] =
>> "5f6c18cf1068089d669fbe81dab2325f8bf7b1298b192c276490b65e2edbbd94"
>> +SRC_URI[edk2-platforms.sha256sum] =
>> "31257160ac51a4a5f63db92d26482d6a005286ed040dafe89d01f0ee906b111e"
>>  SRC_URI[brotli.sha256sum] =
>> "6d6cacce05086b7debe75127415ff9c3661849f564fe2f5f3b0383d48aa4ed77"
>> -SRC_URI[openssl.sha256sum] =
>> "6b2d2440ced8c802aaa61475919f0870ec556694c466ebea460e35ea2b14839e"
>> +SRC_URI[mipisyst.sha256sum] =
>> "9fda3b9a78343ab2be6f06ce6396536e7e065abac29b47c8eb2e42cbb4c4f00b"
>> +SRC_URI[openssl.sha256sum] =
>> "b1270f044e36452e15d1f2e18b702691a240b0445080282f2c7daaea8704ec5e"
>>
>>  # according to edk2 submodules
>>  SRCREV-brotli = "f4153a09f87cbb9c826d8fc12c74642bb2d879ea"
>> +SRCREV-mipisyst = "370b5944c046bab043dd8b133727b2135af7747a"
>>
>>  # revision closest to edk2 release
>> -SRCREV-edk2-platforms = "4ad557e494d8055f5ea16009d6e565cace6571d6"
>> +SRCREV-edk2-platforms = "b71f2bda9e4fc183068eef5d1d90a631181a2506"
>>
>> -PV-openssl = "OpenSSL_1_1_1n"
>> +PV-openssl = "OpenSSL_1_1_1t"
>>
> 
> Any clues on when they will upgrade to openssl 3?

No idea, better ask their community. So far, 1.1.1 is still maintained
at least.

Jan

> 
>>
>>  DEBIAN_BUILD_DEPENDS = "bash, python3:native, dh-python, uuid-
>> dev:native"
>>
>> @@ -49,6 +52,9 @@ do_prepare_build() {
>>      rm -rf
>> ${S}/edk2/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli
>>      ln -s ../../../../brotli-${SRCREV-brotli}
>> ${S}/edk2/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli
>>
>> +    rm -rf ${S}/edk2/MdePkg/Library/MipiSysTLib/mipisyst
>> +    ln -s ../../../../public-mipi-sys-t-${SRCREV-mipisyst}
>> ${S}/edk2/MdePkg/Library/MipiSysTLib/mipisyst
>> +
>>      rm -rf ${S}/edk2/CryptoPkg/Library/OpensslLib/openssl
>>      ln -s ../../../../openssl-${PV-openssl}
>> ${S}/edk2/CryptoPkg/Library/OpensslLib/openssl
>>
>
Schultschik, Sven June 12, 2023, 7:06 a.m. UTC | #3 
On Sat, 2023-06-10 at 11:55 +0200, Jan Kiszka wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> Brings one new dependency: MIPI SyS-T, a tracing infrastructure.

I don't think it is a required dependency for standalone rpmb. Did the
build fail because of the missing dependency? 

> 
> 
> +SRC_URI[mipisyst.sha256sum] =
> "9fda3b9a78343ab2be6f06ce6396536e7e065abac29b47c8eb2e42cbb4c4f00b"
>  
>  # according to edk2 submodules
>  SRCREV-brotli = "f4153a09f87cbb9c826d8fc12c74642bb2d879ea"
> +SRCREV-mipisyst = "370b5944c046bab043dd8b133727b2135af7747a"
>  
>  
> +    rm -rf ${S}/edk2/MdePkg/Library/MipiSysTLib/mipisyst
> +    ln -s ../../../../public-mipi-sys-t-${SRCREV-mipisyst}
> ${S}/edk2/MdePkg/Library/MipiSysTLib/mipisyst
> +
>      rm -rf ${S}/edk2/CryptoPkg/Library/OpensslLib/openssl
>      ln -s ../../../../openssl-${PV-openssl}
> ${S}/edk2/CryptoPkg/Library/OpensslLib/openssl
>
Jan Kiszka June 12, 2023, 7:47 a.m. UTC | #4 
On 12.06.23 09:06, Schultschik, Sven (DI PA DCP R&D 2) wrote:
> On Sat, 2023-06-10 at 11:55 +0200, Jan Kiszka wrote:
>> From: Jan Kiszka <jan.kiszka@siemens.com>
>>
>> Brings one new dependency: MIPI SyS-T, a tracing infrastructure.
> 
> I don't think it is a required dependency for standalone rpmb. Did the
> build fail because of the missing dependency? 

Yes, and I didn't find a knob which makes this optional. If you find
one, please share!

Jant

> 
>>
>>
>> +SRC_URI[mipisyst.sha256sum] =
>> "9fda3b9a78343ab2be6f06ce6396536e7e065abac29b47c8eb2e42cbb4c4f00b"
>>  
>>  # according to edk2 submodules
>>  SRCREV-brotli = "f4153a09f87cbb9c826d8fc12c74642bb2d879ea"
>> +SRCREV-mipisyst = "370b5944c046bab043dd8b133727b2135af7747a"
>>  
>>  
>> +    rm -rf ${S}/edk2/MdePkg/Library/MipiSysTLib/mipisyst
>> +    ln -s ../../../../public-mipi-sys-t-${SRCREV-mipisyst}
>> ${S}/edk2/MdePkg/Library/MipiSysTLib/mipisyst
>> +
>>      rm -rf ${S}/edk2/CryptoPkg/Library/OpensslLib/openssl
>>      ln -s ../../../../openssl-${PV-openssl}
>> ${S}/edk2/CryptoPkg/Library/OpensslLib/openssl
>>  
> 
> 
>
diff mbox series

Patch

diff --git a/recipes-bsp/edk2/edk2-standalonemm-rpmb_202211.bb b/recipes-bsp/edk2/edk2-standalonemm-rpmb_202305.bb
similarity index 69%
rename from recipes-bsp/edk2/edk2-standalonemm-rpmb_202211.bb
rename to recipes-bsp/edk2/edk2-standalonemm-rpmb_202305.bb
index 40d979d9..1a589184 100644
--- a/recipes-bsp/edk2/edk2-standalonemm-rpmb_202211.bb
+++ b/recipes-bsp/edk2/edk2-standalonemm-rpmb_202305.bb
@@ -19,21 +19,24 @@  SRC_URI = " \
     https://github.com/tianocore/edk2/archive/refs/tags/edk2-stable${PV}.tar.gz;subdir=${S} \
     https://github.com/tianocore/edk2-platforms/archive/${SRCREV-edk2-platforms}.tar.gz;name=edk2-platforms;subdir=${S} \
     https://github.com/google/brotli/archive/${SRCREV-brotli}.tar.gz;name=brotli;subdir=${S} \
+    https://github.com/MIPI-Alliance/public-mipi-sys-t/archive/${SRCREV-mipisyst}.tar.gz;name=mipisyst;subdir=${S} \
     https://github.com/openssl/openssl/archive/refs/tags/${PV-openssl}.tar.gz;name=openssl;subdir=${S} \
     file://rules \
     "
-SRC_URI[sha256sum] = "b7276c0496bf4983265bf3f9886b563af1ae6e93aade91f4634ead2b1338d1b4"
-SRC_URI[edk2-platforms.sha256sum] = "b0f5b6d832e4dcc1d47a98ae0560e0b955433e32e8ac6d12c946c66d5fa6f51a"
+SRC_URI[sha256sum] = "5f6c18cf1068089d669fbe81dab2325f8bf7b1298b192c276490b65e2edbbd94"
+SRC_URI[edk2-platforms.sha256sum] = "31257160ac51a4a5f63db92d26482d6a005286ed040dafe89d01f0ee906b111e"
 SRC_URI[brotli.sha256sum] = "6d6cacce05086b7debe75127415ff9c3661849f564fe2f5f3b0383d48aa4ed77"
-SRC_URI[openssl.sha256sum] = "6b2d2440ced8c802aaa61475919f0870ec556694c466ebea460e35ea2b14839e"
+SRC_URI[mipisyst.sha256sum] = "9fda3b9a78343ab2be6f06ce6396536e7e065abac29b47c8eb2e42cbb4c4f00b"
+SRC_URI[openssl.sha256sum] = "b1270f044e36452e15d1f2e18b702691a240b0445080282f2c7daaea8704ec5e"
 
 # according to edk2 submodules
 SRCREV-brotli = "f4153a09f87cbb9c826d8fc12c74642bb2d879ea"
+SRCREV-mipisyst = "370b5944c046bab043dd8b133727b2135af7747a"
 
 # revision closest to edk2 release
-SRCREV-edk2-platforms = "4ad557e494d8055f5ea16009d6e565cace6571d6"
+SRCREV-edk2-platforms = "b71f2bda9e4fc183068eef5d1d90a631181a2506"
 
-PV-openssl = "OpenSSL_1_1_1n"
+PV-openssl = "OpenSSL_1_1_1t"
 
 DEBIAN_BUILD_DEPENDS = "bash, python3:native, dh-python, uuid-dev:native"
 
@@ -49,6 +52,9 @@  do_prepare_build() {
     rm -rf ${S}/edk2/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli
     ln -s ../../../../brotli-${SRCREV-brotli} ${S}/edk2/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli
 
+    rm -rf ${S}/edk2/MdePkg/Library/MipiSysTLib/mipisyst
+    ln -s ../../../../public-mipi-sys-t-${SRCREV-mipisyst} ${S}/edk2/MdePkg/Library/MipiSysTLib/mipisyst
+
     rm -rf ${S}/edk2/CryptoPkg/Library/OpensslLib/openssl
     ln -s ../../../../openssl-${PV-openssl} ${S}/edk2/CryptoPkg/Library/OpensslLib/openssl