Message ID | 20200908072939.30178-6-lersek@redhat.com |
---|---|
State | New |
Headers | show |
Series | edk2: adopt the edk2-stable202008 release | expand |
On 09/10/20 17:32, Philippe Mathieu-Daudé wrote: > On 9/8/20 2:08 PM, Laszlo Ersek wrote: >> On 09/08/20 10:22, Philippe Mathieu-Daudé wrote: >>> Hi Laszlo, >>> >>> On 9/8/20 9:29 AM, Laszlo Ersek wrote: >>>> Update the edk2 submodule from release edk2-stable201905 to >>>> edk2-stable202008. The release notes can be read at >>> [...] >>>> >>>> Cc: Philippe Mathieu-Daudé <philmd@redhat.com> >>>> Ref: https://bugs.launchpad.net/qemu/+bug/1852196 >>>> Signed-off-by: Laszlo Ersek <lersek@redhat.com> >>>> --- >>>> roms/edk2 | 2 +- >>>> 1 file changed, 1 insertion(+), 1 deletion(-) >>>> >>>> diff --git a/roms/edk2 b/roms/edk2 >>>> index 20d2e5a125e3..06dc822d045c 160000 >>>> --- a/roms/edk2 >>>> +++ b/roms/edk2 >>>> @@ -1 +1 @@ >>>> -Subproject commit 20d2e5a125e34fc8501026613a71549b2a1a3e54 >>>> +Subproject commit 06dc822d045c2bb42e497487935485302486e151 >>> >>> FYI applying this I got: >>> >>> Fetching submodule roms/edk2 >>> Fetching submodule roms/edk2/CryptoPkg/Library/OpensslLib/openssl >>> From https://github.com/openssl/openssl >>> Could not access submodule 'krb5' >>> Errors during submodule fetch: >>> CryptoPkg/Library/OpensslLib/openssl >>> Errors during submodule fetch: >>> roms/edk2 >>> >>> Probably harmless, as if one care about this submodule, >>> will run "make edk2-basetools" which runs 'git submodule >>> update --init --force' and silently fixes the submodules. >>> >> >> Did you pass the "--recursive" option to the "git submodule" perhaps? > > No I didn't used it. So what was the precise command? git-am, git-fetch, or something else?... I'm asking because I've genuinely not seen git attempt to fetch edk2 -> openssl -> krb, apart from "--recursive". (Anyway, I don't think I can do anything about the krb5 fetch...) Thanks! Laszlo > >> >> (Because, krb5 is a submodule of edk2's openssl submodule.) >> >> "--recursive" should not be used. See "ReadMe.rst" in edk2: >> >> """ >> Note: When cloning submodule repos, '--recursive' option is not >> recommended. EDK II itself will not use any code/feature from >> submodules in above submodules. So using '--recursive' adds a >> dependency on being able to reach servers we do not actually want >> any code from, as well as needlessly downloading code we will not >> use. >> """ >> >> QEMU's current submodules do not require the usage of "--recursive". >> >> Thanks >> Laszlo >> >
On 9/10/20 5:44 PM, Laszlo Ersek wrote: > On 09/10/20 17:32, Philippe Mathieu-Daudé wrote: >> On 9/8/20 2:08 PM, Laszlo Ersek wrote: >>> On 09/08/20 10:22, Philippe Mathieu-Daudé wrote: >>>> Hi Laszlo, >>>> >>>> On 9/8/20 9:29 AM, Laszlo Ersek wrote: >>>>> Update the edk2 submodule from release edk2-stable201905 to >>>>> edk2-stable202008. The release notes can be read at >>>> [...] >>>>> >>>>> Cc: Philippe Mathieu-Daudé <philmd@redhat.com> >>>>> Ref: https://bugs.launchpad.net/qemu/+bug/1852196 >>>>> Signed-off-by: Laszlo Ersek <lersek@redhat.com> >>>>> --- >>>>> roms/edk2 | 2 +- >>>>> 1 file changed, 1 insertion(+), 1 deletion(-) >>>>> >>>>> diff --git a/roms/edk2 b/roms/edk2 >>>>> index 20d2e5a125e3..06dc822d045c 160000 >>>>> --- a/roms/edk2 >>>>> +++ b/roms/edk2 >>>>> @@ -1 +1 @@ >>>>> -Subproject commit 20d2e5a125e34fc8501026613a71549b2a1a3e54 >>>>> +Subproject commit 06dc822d045c2bb42e497487935485302486e151 >>>> >>>> FYI applying this I got: >>>> >>>> Fetching submodule roms/edk2 >>>> Fetching submodule roms/edk2/CryptoPkg/Library/OpensslLib/openssl >>>> From https://github.com/openssl/openssl >>>> Could not access submodule 'krb5' >>>> Errors during submodule fetch: >>>> CryptoPkg/Library/OpensslLib/openssl >>>> Errors during submodule fetch: >>>> roms/edk2 >>>> >>>> Probably harmless, as if one care about this submodule, >>>> will run "make edk2-basetools" which runs 'git submodule >>>> update --init --force' and silently fixes the submodules. >>>> >>> >>> Did you pass the "--recursive" option to the "git submodule" perhaps? >> >> No I didn't used it. > > So what was the precise command? git-am, git-fetch, or something else?... I only used: git submodule sync git submodule update > > I'm asking because I've genuinely not seen git attempt to fetch edk2 -> > openssl -> krb, apart from "--recursive". > > (Anyway, I don't think I can do anything about the krb5 fetch...) Yeah I'm not worried about this, I was just curious. > > Thanks! > Laszlo > >> >>> >>> (Because, krb5 is a submodule of edk2's openssl submodule.) >>> >>> "--recursive" should not be used. See "ReadMe.rst" in edk2: >>> >>> """ >>> Note: When cloning submodule repos, '--recursive' option is not >>> recommended. EDK II itself will not use any code/feature from >>> submodules in above submodules. So using '--recursive' adds a >>> dependency on being able to reach servers we do not actually want >>> any code from, as well as needlessly downloading code we will not >>> use. >>> """ >>> >>> QEMU's current submodules do not require the usage of "--recursive". >>> >>> Thanks >>> Laszlo >>> >> >
On 09/10/20 18:00, Philippe Mathieu-Daudé wrote: > On 9/10/20 5:44 PM, Laszlo Ersek wrote: >> On 09/10/20 17:32, Philippe Mathieu-Daudé wrote: >>> On 9/8/20 2:08 PM, Laszlo Ersek wrote: >>>> On 09/08/20 10:22, Philippe Mathieu-Daudé wrote: >>>>> Hi Laszlo, >>>>> >>>>> On 9/8/20 9:29 AM, Laszlo Ersek wrote: >>>>>> Update the edk2 submodule from release edk2-stable201905 to >>>>>> edk2-stable202008. The release notes can be read at >>>>> [...] >>>>>> >>>>>> Cc: Philippe Mathieu-Daudé <philmd@redhat.com> >>>>>> Ref: https://bugs.launchpad.net/qemu/+bug/1852196 >>>>>> Signed-off-by: Laszlo Ersek <lersek@redhat.com> >>>>>> --- >>>>>> roms/edk2 | 2 +- >>>>>> 1 file changed, 1 insertion(+), 1 deletion(-) >>>>>> >>>>>> diff --git a/roms/edk2 b/roms/edk2 >>>>>> index 20d2e5a125e3..06dc822d045c 160000 >>>>>> --- a/roms/edk2 >>>>>> +++ b/roms/edk2 >>>>>> @@ -1 +1 @@ >>>>>> -Subproject commit 20d2e5a125e34fc8501026613a71549b2a1a3e54 >>>>>> +Subproject commit 06dc822d045c2bb42e497487935485302486e151 >>>>> >>>>> FYI applying this I got: >>>>> >>>>> Fetching submodule roms/edk2 >>>>> Fetching submodule roms/edk2/CryptoPkg/Library/OpensslLib/openssl >>>>> From https://github.com/openssl/openssl >>>>> Could not access submodule 'krb5' >>>>> Errors during submodule fetch: >>>>> CryptoPkg/Library/OpensslLib/openssl >>>>> Errors during submodule fetch: >>>>> roms/edk2 >>>>> >>>>> Probably harmless, as if one care about this submodule, >>>>> will run "make edk2-basetools" which runs 'git submodule >>>>> update --init --force' and silently fixes the submodules. >>>>> >>>> >>>> Did you pass the "--recursive" option to the "git submodule" perhaps? >>> >>> No I didn't used it. >> >> So what was the precise command? git-am, git-fetch, or something else?... > > I only used: > > git submodule sync > git submodule update > >> >> I'm asking because I've genuinely not seen git attempt to fetch edk2 -> >> openssl -> krb, apart from "--recursive". >> >> (Anyway, I don't think I can do anything about the krb5 fetch...) > > Yeah I'm not worried about this, I was just curious. Thanks. FWIW I can't reproduce the symptom, using the above commands. Laszlo
diff --git a/roms/edk2 b/roms/edk2 index 20d2e5a125e3..06dc822d045c 160000 --- a/roms/edk2 +++ b/roms/edk2 @@ -1 +1 @@ -Subproject commit 20d2e5a125e34fc8501026613a71549b2a1a3e54 +Subproject commit 06dc822d045c2bb42e497487935485302486e151