Browse Source

kas: Add fvp-eula.yml and remove license related settings

1- Add fvp-eula.yml file which introduces ARM_FVP_EULA_ACCEPT
environment variable
2- Remove any license related settings from fvp-baser-aemv8r64-bsp.yml,
corstone500.yml and corstone1000-fvp.yml

Signed-off-by: Ziad Elhanafy <ziad.elhanafy@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
Ziad Elhanafy 1 year ago
parent
commit
635989dbbb
4 changed files with 10 additions and 6 deletions
  1. 1 1
      kas/corstone1000-fvp.yml
  2. 2 1
      kas/corstone500.yml
  3. 2 4
      kas/fvp-baser-aemv8r64-bsp.yml
  4. 5 0
      kas/fvp-eula.yml

+ 1 - 1
kas/corstone1000-fvp.yml

@@ -2,6 +2,7 @@ header:
   version: 11
   includes:
     - kas/corstone1000-base.yml
+    - kas/fvp-eula.yml
 
 machine: corstone1000-fvp
 
@@ -10,7 +11,6 @@ local_conf_header:
         # Remove Dropbear SSH as it will not fit into the corstone1000 image.
         IMAGE_FEATURES:remove = " ssh-server-dropbear"
         INHERIT = " ${@bb.utils.contains('BUILD_ARCH', 'x86_64', 'fvpboot', '', d)}"
-        LICENSE_FLAGS_ACCEPTED:append = " Arm-FVP-EULA"
 
 target:
   - corstone1000-image

+ 2 - 1
kas/corstone500.yml

@@ -1,5 +1,7 @@
 header:
   version: 11
+  includes:
+    - kas/fvp-eula.yml
 
 distro: poky-tiny
 
@@ -38,7 +40,6 @@ local_conf_header:
     PACKAGECONFIG:append:pn-perf = " coresight"
   fvp-config: |
     IMAGE_CLASSES:append = " ${@bb.utils.contains('BUILD_ARCH', 'x86_64', 'fvpboot', '', d)}"
-    LICENSE_FLAGS_ACCEPTED:append = " Arm-FVP-EULA"
 
 machine: corstone500
 

+ 2 - 4
kas/fvp-baser-aemv8r64-bsp.yml

@@ -1,5 +1,7 @@
 header:
   version: 9
+  includes:
+    - kas/fvp-eula.yml
 
 distro: poky
 machine: fvp-baser-aemv8r64
@@ -24,9 +26,6 @@ repos:
       meta:
       meta-poky:
 
-env:
-  FVP_BASE_R_ARM_EULA_ACCEPT: "False"
-
 local_conf_header:
   base: |
     CONF_VERSION = "2"
@@ -34,7 +33,6 @@ local_conf_header:
     PACKAGECONFIG:remove:pn-qemu-system-native = "gtk+ sdl"
     EXTRA_IMAGE_FEATURES:append = " debug-tweaks ssh-server-openssh"
     CORE_IMAGE_EXTRA_INSTALL:append = " ssh-pregen-hostkeys"
-    LICENSE_FLAGS_ACCEPTED:append = " ${@oe.utils.vartrue('FVP_BASE_R_ARM_EULA_ACCEPT', 'Arm-FVP-EULA', '', d)}"
     IMAGE_CLASSES:append = " testimage"
 
 target:

+ 5 - 0
kas/fvp-eula.yml

@@ -0,0 +1,5 @@
+header:
+  version: 13
+
+env:
+  ARM_FVP_EULA_ACCEPT: