diff mbox series

[v2,8/8] configure: add [lm32|unicore32]-softmmu to deprecation logic

Message ID 20200915134317.11110-9-alex.bennee@linaro.org
State New
Headers show
Series configure deprecation, linux-user and iotest fixes | expand

Commit Message

Alex Bennée Sept. 15, 2020, 1:43 p.m. UTC 
While we are at it move the few places where they are into the
deprecation build bucket.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

---
 configure      | 2 +-
 .gitlab-ci.yml | 9 +++++----
 .shippable.yml | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

-- 
2.20.1

Comments

Richard Henderson Sept. 15, 2020, 5:20 p.m. UTC | #1 
On 9/15/20 6:43 AM, Alex Bennée wrote:
> While we are at it move the few places where they are into the
> deprecation build bucket.
> 
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
>  configure      | 2 +-
>  .gitlab-ci.yml | 9 +++++----
>  .shippable.yml | 2 +-
>  3 files changed, 7 insertions(+), 6 deletions(-)

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~
Thomas Huth Oct. 29, 2020, 12:25 p.m. UTC | #2 
On 15/09/2020 15.43, Alex Bennée wrote:
> While we are at it move the few places where they are into the
> deprecation build bucket.
> 
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
>  configure      | 2 +-
>  .gitlab-ci.yml | 9 +++++----
>  .shippable.yml | 2 +-
>  3 files changed, 7 insertions(+), 6 deletions(-)

 Hi Alex,

I noticed that these deprecated targets do not show up in the
output of "configure --help" at all anymore:

 --target-list=LIST       set target list (default: build everything)
                           Available targets: aarch64-softmmu alpha-softmmu 
                           arm-softmmu avr-softmmu cris-softmmu hppa-softmmu 
                           i386-softmmu m68k-softmmu microblazeel-softmmu 
                           microblaze-softmmu mips64el-softmmu mips64-softmmu 
                           mipsel-softmmu mips-softmmu moxie-softmmu 
                           nios2-softmmu or1k-softmmu ppc64-softmmu ppc-softmmu 
                           riscv32-softmmu riscv64-softmmu rx-softmmu 
                           s390x-softmmu sh4eb-softmmu sh4-softmmu 
                           sparc64-softmmu sparc-softmmu tricore-softmmu 
                           x86_64-softmmu xtensaeb-softmmu xtensa-softmmu 
                           aarch64_be-linux-user aarch64-linux-user 
                           alpha-linux-user armeb-linux-user arm-linux-user 
                           cris-linux-user hppa-linux-user i386-linux-user 
                           m68k-linux-user microblazeel-linux-user 
                           microblaze-linux-user mips64el-linux-user 
                           mips64-linux-user mipsel-linux-user mips-linux-user 
                           mipsn32el-linux-user mipsn32-linux-user 
                           nios2-linux-user or1k-linux-user ppc64le-linux-user 
                           ppc64-linux-user ppc-linux-user riscv32-linux-user 
                           riscv64-linux-user s390x-linux-user sh4eb-linux-user 
                           sh4-linux-user sparc32plus-linux-user 
                           sparc64-linux-user sparc-linux-user 
                           x86_64-linux-user xtensaeb-linux-user 
                           xtensa-linux-user

The text "default: build everything" is now also not accurate anymore.
How is a user who is still interested in these targets supposed to find
the right --target-list parameters now?

 Thomas
Alex Bennée Oct. 29, 2020, 2:42 p.m. UTC | #3 
Thomas Huth <thuth@redhat.com> writes:

> On 15/09/2020 15.43, Alex Bennée wrote:
>> While we are at it move the few places where they are into the
>> deprecation build bucket.
>> 
>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>> ---
>>  configure      | 2 +-
>>  .gitlab-ci.yml | 9 +++++----
>>  .shippable.yml | 2 +-
>>  3 files changed, 7 insertions(+), 6 deletions(-)
>
>  Hi Alex,
>
> I noticed that these deprecated targets do not show up in the
> output of "configure --help" at all anymore:
>
>  --target-list=LIST       set target list (default: build everything)
>                            Available targets: aarch64-softmmu alpha-softmmu 
>                            arm-softmmu avr-softmmu cris-softmmu hppa-softmmu 
>                            i386-softmmu m68k-softmmu microblazeel-softmmu 
>                            microblaze-softmmu mips64el-softmmu mips64-softmmu 
>                            mipsel-softmmu mips-softmmu moxie-softmmu 
>                            nios2-softmmu or1k-softmmu ppc64-softmmu ppc-softmmu 
>                            riscv32-softmmu riscv64-softmmu rx-softmmu 
>                            s390x-softmmu sh4eb-softmmu sh4-softmmu 
>                            sparc64-softmmu sparc-softmmu tricore-softmmu 
>                            x86_64-softmmu xtensaeb-softmmu xtensa-softmmu 
>                            aarch64_be-linux-user aarch64-linux-user 
>                            alpha-linux-user armeb-linux-user arm-linux-user 
>                            cris-linux-user hppa-linux-user i386-linux-user 
>                            m68k-linux-user microblazeel-linux-user 
>                            microblaze-linux-user mips64el-linux-user 
>                            mips64-linux-user mipsel-linux-user mips-linux-user 
>                            mipsn32el-linux-user mipsn32-linux-user 
>                            nios2-linux-user or1k-linux-user ppc64le-linux-user 
>                            ppc64-linux-user ppc-linux-user riscv32-linux-user 
>                            riscv64-linux-user s390x-linux-user sh4eb-linux-user 
>                            sh4-linux-user sparc32plus-linux-user 
>                            sparc64-linux-user sparc-linux-user 
>                            x86_64-linux-user xtensaeb-linux-user 
>                            xtensa-linux-user
>
> The text "default: build everything" is now also not accurate anymore.
> How is a user who is still interested in these targets supposed to find
> the right --target-list parameters now?

How about:

--8<---------------cut here---------------start------------->8---
modified   configure
@@ -1644,9 +1644,11 @@ Standard options:
   --prefix=PREFIX          install in PREFIX [$prefix]
   --interp-prefix=PREFIX   where to find shared libraries, etc.
                            use %M for cpu name [$interp_prefix]
-  --target-list=LIST       set target list (default: build everything)
+  --target-list=LIST       set target list (default: build all non-deprcated)
 $(echo Available targets: $default_target_list | \
   fold -s -w 53 | sed -e 's/^/                           /')
+$(echo Deprecated targets: $deprecated_targets_list | \
+  fold -s -w 53 | sed -e 's/^/                           /')
   --target-list-exclude=LIST exclude a set of targets from the default target-list
 
 Advanced options (experts only):
--8<---------------cut here---------------end--------------->8---

Which would give:


  --target-list=LIST       set target list (default: build all non-deprcated)
                           Available targets: aarch64-softmmu alpha-softmmu 
                           arm-softmmu avr-softmmu cris-softmmu hppa-softmmu 
                           i386-softmmu m68k-softmmu microblaze-softmmu 
                           microblazeel-softmmu mips-softmmu mips64-softmmu 
                           mips64el-softmmu mipsel-softmmu moxie-softmmu 
                           nios2-softmmu or1k-softmmu ppc-softmmu ppc64-softmmu 
                           riscv32-softmmu riscv64-softmmu rx-softmmu 
                           s390x-softmmu sh4-softmmu sh4eb-softmmu 
                           sparc-softmmu sparc64-softmmu tricore-softmmu 
                           x86_64-softmmu xtensa-softmmu xtensaeb-softmmu 
                           aarch64-linux-user aarch64_be-linux-user 
                           alpha-linux-user arm-linux-user armeb-linux-user 
                           cris-linux-user hppa-linux-user i386-linux-user 
                           m68k-linux-user microblaze-linux-user 
                           microblazeel-linux-user mips-linux-user 
                           mips64-linux-user mips64el-linux-user 
                           mipsel-linux-user mipsn32-linux-user 
                           mipsn32el-linux-user nios2-linux-user 
                           or1k-linux-user ppc-linux-user ppc64-linux-user 
                           ppc64le-linux-user riscv32-linux-user 
                           riscv64-linux-user s390x-linux-user sh4-linux-user 
                           sh4eb-linux-user sparc-linux-user 
                           sparc32plus-linux-user sparc64-linux-user 
                           x86_64-linux-user xtensa-linux-user 
                           xtensaeb-linux-user
                           Deprecated targets: 
                           ppc64abi32-linux-user,tilegx-linux-user,lm32-softmmu,
                           unicore32-softmmu
  --target-list-exclude=LIST exclude a set of targets from the default target-list
Thomas Huth Oct. 29, 2020, 3:28 p.m. UTC | #4 
On 29/10/2020 15.42, Alex Bennée wrote:
> 
> Thomas Huth <thuth@redhat.com> writes:
> 
>> On 15/09/2020 15.43, Alex Bennée wrote:
>>> While we are at it move the few places where they are into the
>>> deprecation build bucket.
>>>
>>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>>> ---
>>>  configure      | 2 +-
>>>  .gitlab-ci.yml | 9 +++++----
>>>  .shippable.yml | 2 +-
>>>  3 files changed, 7 insertions(+), 6 deletions(-)
>>
>>  Hi Alex,
>>
>> I noticed that these deprecated targets do not show up in the
>> output of "configure --help" at all anymore:
>>
>>  --target-list=LIST       set target list (default: build everything)
>>                            Available targets: aarch64-softmmu alpha-softmmu 
>>                            arm-softmmu avr-softmmu cris-softmmu hppa-softmmu 
>>                            i386-softmmu m68k-softmmu microblazeel-softmmu 
>>                            microblaze-softmmu mips64el-softmmu mips64-softmmu 
>>                            mipsel-softmmu mips-softmmu moxie-softmmu 
>>                            nios2-softmmu or1k-softmmu ppc64-softmmu ppc-softmmu 
>>                            riscv32-softmmu riscv64-softmmu rx-softmmu 
>>                            s390x-softmmu sh4eb-softmmu sh4-softmmu 
>>                            sparc64-softmmu sparc-softmmu tricore-softmmu 
>>                            x86_64-softmmu xtensaeb-softmmu xtensa-softmmu 
>>                            aarch64_be-linux-user aarch64-linux-user 
>>                            alpha-linux-user armeb-linux-user arm-linux-user 
>>                            cris-linux-user hppa-linux-user i386-linux-user 
>>                            m68k-linux-user microblazeel-linux-user 
>>                            microblaze-linux-user mips64el-linux-user 
>>                            mips64-linux-user mipsel-linux-user mips-linux-user 
>>                            mipsn32el-linux-user mipsn32-linux-user 
>>                            nios2-linux-user or1k-linux-user ppc64le-linux-user 
>>                            ppc64-linux-user ppc-linux-user riscv32-linux-user 
>>                            riscv64-linux-user s390x-linux-user sh4eb-linux-user 
>>                            sh4-linux-user sparc32plus-linux-user 
>>                            sparc64-linux-user sparc-linux-user 
>>                            x86_64-linux-user xtensaeb-linux-user 
>>                            xtensa-linux-user
>>
>> The text "default: build everything" is now also not accurate anymore.
>> How is a user who is still interested in these targets supposed to find
>> the right --target-list parameters now?
> 
> How about:
> 
> --8<---------------cut here---------------start------------->8---
> modified   configure
> @@ -1644,9 +1644,11 @@ Standard options:
>    --prefix=PREFIX          install in PREFIX [$prefix]
>    --interp-prefix=PREFIX   where to find shared libraries, etc.
>                             use %M for cpu name [$interp_prefix]
> -  --target-list=LIST       set target list (default: build everything)
> +  --target-list=LIST       set target list (default: build all non-deprcated)
>  $(echo Available targets: $default_target_list | \
>    fold -s -w 53 | sed -e 's/^/                           /')
> +$(echo Deprecated targets: $deprecated_targets_list | \
> +  fold -s -w 53 | sed -e 's/^/                           /')
>    --target-list-exclude=LIST exclude a set of targets from the default target-list
>  
>  Advanced options (experts only):
> --8<---------------cut here---------------end--------------->8---
> 
> Which would give:
> 
> 
>   --target-list=LIST       set target list (default: build all non-deprcated)
>                            Available targets: aarch64-softmmu alpha-softmmu 
>                            arm-softmmu avr-softmmu cris-softmmu hppa-softmmu 
>                            i386-softmmu m68k-softmmu microblaze-softmmu 
>                            microblazeel-softmmu mips-softmmu mips64-softmmu 
>                            mips64el-softmmu mipsel-softmmu moxie-softmmu 
>                            nios2-softmmu or1k-softmmu ppc-softmmu ppc64-softmmu 
>                            riscv32-softmmu riscv64-softmmu rx-softmmu 
>                            s390x-softmmu sh4-softmmu sh4eb-softmmu 
>                            sparc-softmmu sparc64-softmmu tricore-softmmu 
>                            x86_64-softmmu xtensa-softmmu xtensaeb-softmmu 
>                            aarch64-linux-user aarch64_be-linux-user 
>                            alpha-linux-user arm-linux-user armeb-linux-user 
>                            cris-linux-user hppa-linux-user i386-linux-user 
>                            m68k-linux-user microblaze-linux-user 
>                            microblazeel-linux-user mips-linux-user 
>                            mips64-linux-user mips64el-linux-user 
>                            mipsel-linux-user mipsn32-linux-user 
>                            mipsn32el-linux-user nios2-linux-user 
>                            or1k-linux-user ppc-linux-user ppc64-linux-user 
>                            ppc64le-linux-user riscv32-linux-user 
>                            riscv64-linux-user s390x-linux-user sh4-linux-user 
>                            sh4eb-linux-user sparc-linux-user 
>                            sparc32plus-linux-user sparc64-linux-user 
>                            x86_64-linux-user xtensa-linux-user 
>                            xtensaeb-linux-user
>                            Deprecated targets: 
>                            ppc64abi32-linux-user,tilegx-linux-user,lm32-softmmu,
>                            unicore32-softmmu
>   --target-list-exclude=LIST exclude a set of targets from the default target-list

Sounds good!

 Thomas
diff mbox series

Patch

diff --git a/configure b/configure
index dfd7f18dcb24..756447900855 100755
--- a/configure
+++ b/configure
@@ -280,7 +280,7 @@  supported_whpx_target() {
     return 1
 }
 
-deprecated_targets_list=ppc64abi32-linux-user,tilegx-linux-user
+deprecated_targets_list=ppc64abi32-linux-user,tilegx-linux-user,lm32-softmmu,unicore32-softmmu
 deprecated_features=""
 
 supported_target() {
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f027b55aef15..a18e18b57e54 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -134,7 +134,7 @@  build-system-fedora:
   variables:
     IMAGE: fedora
     CONFIGURE_ARGS: --disable-gcrypt --enable-nettle
-    TARGETS: tricore-softmmu unicore32-softmmu microblaze-softmmu mips-softmmu
+    TARGETS: tricore-softmmu microblaze-softmmu mips-softmmu
       xtensa-softmmu m68k-softmmu riscv32-softmmu ppc-softmmu sparc64-softmmu
     MAKE_CHECK_ARGS: check-build
   artifacts:
@@ -166,7 +166,7 @@  build-system-centos:
   variables:
     IMAGE: centos8
     CONFIGURE_ARGS: --disable-nettle --enable-gcrypt
-    TARGETS: ppc64-softmmu lm32-softmmu or1k-softmmu s390x-softmmu
+    TARGETS: ppc64-softmmu or1k-softmmu s390x-softmmu
       x86_64-softmmu rx-softmmu sh4-softmmu nios2-softmmu
     MAKE_CHECK_ARGS: check-build
   artifacts:
@@ -259,9 +259,10 @@  build-deprecated:
   <<: *native_build_job_definition
   variables:
     IMAGE: debian-all-test-cross
-    CONFIGURE_ARGS: --disable-docs --disable-tools --disable-system
+    CONFIGURE_ARGS: --disable-docs --disable-tools
     MAKE_CHECK_ARGS: check-tcg
-    TARGETS: ppc64abi32-linux-user tilegx-linux-user
+    TARGETS: ppc64abi32-linux-user tilegx-linux-user lm32-softmmu
+      unicore32-softmmu
   allow_failure: true
 
 build-oss-fuzz:
diff --git a/.shippable.yml b/.shippable.yml
index 89d8be4291b0..0b4fd6df1d81 100644
--- a/.shippable.yml
+++ b/.shippable.yml
@@ -8,7 +8,7 @@  env:
     - IMAGE=debian-amd64
       TARGET_LIST=x86_64-softmmu,x86_64-linux-user
     - IMAGE=debian-win32-cross
-      TARGET_LIST=arm-softmmu,i386-softmmu,lm32-softmmu
+      TARGET_LIST=arm-softmmu,i386-softmmu
     - IMAGE=debian-win64-cross
       TARGET_LIST=aarch64-softmmu,sparc64-softmmu,x86_64-softmmu
     - IMAGE=debian-armel-cross