diff mbox series

[4/7] .gitlab-ci.d/windows.yml: Drop the sed processing in the 64-bit build

Message ID 20220908132817.1831008-5-bmeng.cn@gmail.com
State New
Headers show
Series nsis: gitlab-ci: Improve QEMU Windows installer packaging | expand

Commit Message

Bin Meng Sept. 8, 2022, 1:28 p.m. UTC 
From: Bin Meng <bin.meng@windriver.com>

The sed processing of build/config-host.mak seems to be no longer
needed, and there is no such in the 32-bit build too. Drop it.

Signed-off-by: Bin Meng <bin.meng@windriver.com>
---

 .gitlab-ci.d/windows.yml | 1 -
 1 file changed, 1 deletion(-)

Comments

Marc-André Lureau Sept. 8, 2022, 2:04 p.m. UTC | #1 
Hi

On Thu, Sep 8, 2022 at 5:33 PM Bin Meng <bmeng.cn@gmail.com> wrote:

> From: Bin Meng <bin.meng@windriver.com>
>
> The sed processing of build/config-host.mak seems to be no longer
> needed, and there is no such in the 32-bit build too. Drop it.
>
> Signed-off-by: Bin Meng <bin.meng@windriver.com>
> ---
>
>  .gitlab-ci.d/windows.yml | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml
> index da6013904a..86a4339c48 100644
> --- a/.gitlab-ci.d/windows.yml
> +++ b/.gitlab-ci.d/windows.yml
> @@ -60,7 +60,6 @@ msys2-64bit:
>    - $env:MSYS = 'winsymlinks:native' # Enable native Windows symlink
>    - .\msys64\usr\bin\bash -lc './configure --target-list=x86_64-softmmu
>        --enable-capstone --without-default-devices'
> -  - .\msys64\usr\bin\bash -lc "sed -i '/^ROMS=/d' build/config-host.mak"
>

It looks like it is there to remove the ROMS from the make build. No idea
if that still makes sense. Thomas, do you remember?



>    - .\msys64\usr\bin\bash -lc 'make'
>    - .\msys64\usr\bin\bash -lc 'make check'
>
> --
> 2.34.1
>
>
>
Thomas Huth Sept. 9, 2022, 4:30 p.m. UTC | #2 
On 08/09/2022 16.04, Marc-André Lureau wrote:
> Hi
> 
> On Thu, Sep 8, 2022 at 5:33 PM Bin Meng <bmeng.cn@gmail.com 
> <mailto:bmeng.cn@gmail.com>> wrote:
> 
>     From: Bin Meng <bin.meng@windriver.com <mailto:bin.meng@windriver.com>>
> 
>     The sed processing of build/config-host.mak seems to be no longer
>     needed, and there is no such in the 32-bit build too. Drop it.
> 
>     Signed-off-by: Bin Meng <bin.meng@windriver.com
>     <mailto:bin.meng@windriver.com>>
>     ---
> 
>       .gitlab-ci.d/windows.yml | 1 -
>       1 file changed, 1 deletion(-)
> 
>     diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml
>     index da6013904a..86a4339c48 100644
>     --- a/.gitlab-ci.d/windows.yml
>     +++ b/.gitlab-ci.d/windows.yml
>     @@ -60,7 +60,6 @@ msys2-64bit:
>         - $env:MSYS = 'winsymlinks:native' # Enable native Windows symlink
>         - .\msys64\usr\bin\bash -lc './configure --target-list=x86_64-softmmu
>             --enable-capstone --without-default-devices'
>     -  - .\msys64\usr\bin\bash -lc "sed -i '/^ROMS=/d' build/config-host.mak"
> 
> 
> It looks like it is there to remove the ROMS from the make build. No idea if 
> that still makes sense. Thomas, do you remember?

I originally had to add this sed statement since there was a compile error 
otherwise in the ROMS ... if it now works fine without this line, this 
should be fine, of course, too.

Reviewed-by: Thomas Huth <thuth@redhat.com>
diff mbox series

Patch

diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml
index da6013904a..86a4339c48 100644
--- a/.gitlab-ci.d/windows.yml
+++ b/.gitlab-ci.d/windows.yml
@@ -60,7 +60,6 @@  msys2-64bit:
   - $env:MSYS = 'winsymlinks:native' # Enable native Windows symlink
   - .\msys64\usr\bin\bash -lc './configure --target-list=x86_64-softmmu
       --enable-capstone --without-default-devices'
-  - .\msys64\usr\bin\bash -lc "sed -i '/^ROMS=/d' build/config-host.mak"
   - .\msys64\usr\bin\bash -lc 'make'
   - .\msys64\usr\bin\bash -lc 'make check'