diff mbox series

[RFC] CI: enforce packages upgrade for Msys2 on Windows

Message ID 20220209082423.39760-1-takahiro.akashi@linaro.org
State Accepted
Commit 9ebfc6ba5b2b136932076c73ec8c14350365a0ac
Headers show
Series [RFC] CI: enforce packages upgrade for Msys2 on Windows | expand

Commit Message

AKASHI Takahiro Feb. 9, 2022, 8:24 a.m. UTC
We need to install libgnutls-devel package to build the host tool,
mkeficapsule, and as of now, there seems to be a depencency conflict
in the current msys2 installer;

   :: installing libp11-kit (0.24.1-1) breaks dependency \
	'libp11-kit=0.23.22' required by p11-kit

To resolve this conflict, however, the initial "pacman -Syyuu" in
'tools_only_windows' job is not enough. Another "pacman -Su" will
enforce all the out-of-date packages being upgraded.
(Probably the first "-Syyuu" can be changed to "-Syu".)

See the installation steps in
  https://www.msys2.org/

Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
---
 .azure-pipelines.yml | 1 +
 1 file changed, 1 insertion(+)

Comments

Tom Rini Feb. 9, 2022, 12:28 p.m. UTC | #1
On Wed, Feb 09, 2022 at 05:24:23PM +0900, AKASHI Takahiro wrote:

> We need to install libgnutls-devel package to build the host tool,
> mkeficapsule, and as of now, there seems to be a depencency conflict
> in the current msys2 installer;
> 
>    :: installing libp11-kit (0.24.1-1) breaks dependency \
> 	'libp11-kit=0.23.22' required by p11-kit
> 
> To resolve this conflict, however, the initial "pacman -Syyuu" in
> 'tools_only_windows' job is not enough. Another "pacman -Su" will
> enforce all the out-of-date packages being upgraded.
> (Probably the first "-Syyuu" can be changed to "-Syu".)
> 
> See the installation steps in
>   https://www.msys2.org/
> 
> Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
> ---
>  .azure-pipelines.yml | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
> index eb8ec630a593..767b097f72fd 100644
> --- a/.azure-pipelines.yml
> +++ b/.azure-pipelines.yml
> @@ -23,6 +23,7 @@ stages:
>        - script: |
>            sfx.exe -y -o%CD:~0,2%\
>            %CD:~0,2%\msys64\usr\bin\bash -lc "pacman --noconfirm -Syyuu"
> +          %CD:~0,2%\msys64\usr\bin\bash -lc "pacman --noconfirm -Su"
>          displayName: 'Update MSYS2'
>        - script: |
>            %CD:~0,2%\msys64\usr\bin\bash -lc "pacman --noconfirm --needed -Sy make gcc bison flex diffutils openssl-devel libgnutls-devel libutil-linux-devel"

Seems reasonable to me.  Bin?
Heinrich Schuchardt Feb. 11, 2022, 1:17 p.m. UTC | #2
On 2/9/22 13:28, Tom Rini wrote:
> On Wed, Feb 09, 2022 at 05:24:23PM +0900, AKASHI Takahiro wrote:
>
>> We need to install libgnutls-devel package to build the host tool,
>> mkeficapsule, and as of now, there seems to be a depencency conflict
>> in the current msys2 installer;
>>
>>     :: installing libp11-kit (0.24.1-1) breaks dependency \
>> 	'libp11-kit=0.23.22' required by p11-kit
>>
>> To resolve this conflict, however, the initial "pacman -Syyuu" in
>> 'tools_only_windows' job is not enough. Another "pacman -Su" will
>> enforce all the out-of-date packages being upgraded.
>> (Probably the first "-Syyuu" can be changed to "-Syu".)
>>
>> See the installation steps in
>>    https://www.msys2.org/
>>
>> Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
>> ---
>>   .azure-pipelines.yml | 1 +
>>   1 file changed, 1 insertion(+)
>>
>> diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
>> index eb8ec630a593..767b097f72fd 100644
>> --- a/.azure-pipelines.yml
>> +++ b/.azure-pipelines.yml
>> @@ -23,6 +23,7 @@ stages:
>>         - script: |
>>             sfx.exe -y -o%CD:~0,2%\
>>             %CD:~0,2%\msys64\usr\bin\bash -lc "pacman --noconfirm -Syyuu"

The pacman man-page is available at
https://archlinux.org/pacman/pacman.8.html#SO

-S - synchronize packages
-y - refresh master package database
-yy - refresh all repositories
-u - upgrade all packages
-uu - allow downgrades

>> +          %CD:~0,2%\msys64\usr\bin\bash -lc "pacman --noconfirm -Su"
>>           displayName: 'Update MSYS2'
>>         - script: |
>>             %CD:~0,2%\msys64\usr\bin\bash -lc "pacman --noconfirm --needed -Sy make gcc bison flex diffutils openssl-devel libgnutls-devel libutil-linux-devel"
>
> Seems reasonable to me.  Bin?
>

With this patch Takahiro's mkeficapsule series builds. I rebased it to
let it be in front of the series.

https://github.com/u-boot/u-boot/pull/113#partial-pull-merging

Tested-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
diff mbox series

Patch

diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index eb8ec630a593..767b097f72fd 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -23,6 +23,7 @@  stages:
       - script: |
           sfx.exe -y -o%CD:~0,2%\
           %CD:~0,2%\msys64\usr\bin\bash -lc "pacman --noconfirm -Syyuu"
+          %CD:~0,2%\msys64\usr\bin\bash -lc "pacman --noconfirm -Su"
         displayName: 'Update MSYS2'
       - script: |
           %CD:~0,2%\msys64\usr\bin\bash -lc "pacman --noconfirm --needed -Sy make gcc bison flex diffutils openssl-devel libgnutls-devel libutil-linux-devel"