All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] arm-autonomy: fixes for yocto-check-layer
@ 2021-06-30 18:01 Diego Sueiro
  2021-06-30 18:01 ` [PATCH 2/2] ci: Add meta-arm-autonomy to check-layers job Diego Sueiro
  0 siblings, 1 reply; 2+ messages in thread
From: Diego Sueiro @ 2021-06-30 18:01 UTC (permalink / raw)
  To: meta-arm; +Cc: nd

Add fixes for yocto-check-layer with no new functionality introduced.

Issue-Id: SCM-2625
Signed-off-by: Diego Sueiro <diego.sueiro@arm.com>
Change-Id: I4f7dc30e7ca27f88dfe140ac84ff2b73fe99b728
---
 .../conf/distro/include/arm-autonomy-host.inc    |  2 ++
 .../images/firmware-image-juno.bbappend          |  2 +-
 .../recipes-bsp/u-boot/u-boot_%.bbappend         |  9 +++++----
 .../bsp/arm-platforms/n1sdp/n1sdp-preempt-rt.scc |  6 ------
 .../features/arm-autonomy/preempt-rt-extras.cfg  |  7 -------
 .../features/arm-autonomy/preempt-rt-extras.scc  |  3 ---
 .../recipes-kernel/linux/linux-%.bbappend        | 16 +++++++++-------
 .../recipes-bsp/grub/grub-efi_%.bbappend         |  4 +++-
 .../recipes-core/busybox/busybox_%.bbappend      |  8 ++++++--
 .../init-ifupdown/init-ifupdown_1.0.bbappend     |  4 +++-
 .../recipes-devtools/qemu/qemu-autonomy-host.inc |  8 ++++++++
 .../recipes-devtools/qemu/qemu_%.bbappend        | 15 +++------------
 .../recipes-extended/xen/xen-tools_4.14.bbappend |  9 ++++++---
 .../recipes-extended/xen/xen_%.bbappend          | 11 ++++++-----
 .../recipes-extended/xen/xen_4.14.bbappend       |  8 ++++++--
 .../recipes-kernel/linux/linux-%.bbappend        |  6 ++++--
 16 files changed, 62 insertions(+), 56 deletions(-)
 delete mode 100644 meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-kernel/linux/arm-autonomy-kmeta-extra/bsp/arm-platforms/n1sdp/n1sdp-preempt-rt.scc
 delete mode 100644 meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-kernel/linux/arm-autonomy-kmeta-extra/features/arm-autonomy/preempt-rt-extras.cfg
 delete mode 100644 meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-kernel/linux/arm-autonomy-kmeta-extra/features/arm-autonomy/preempt-rt-extras.scc
 create mode 100644 meta-arm-autonomy/recipes-devtools/qemu/qemu-autonomy-host.inc

diff --git a/meta-arm-autonomy/conf/distro/include/arm-autonomy-host.inc b/meta-arm-autonomy/conf/distro/include/arm-autonomy-host.inc
index 3a4e89f..a7fe523 100644
--- a/meta-arm-autonomy/conf/distro/include/arm-autonomy-host.inc
+++ b/meta-arm-autonomy/conf/distro/include/arm-autonomy-host.inc
@@ -1,5 +1,7 @@
 # This files is added when DISTRO_FEATURES contains arm-autonomy-host
 
+ARM_AUTONOMY_HOST_OVERRIDES = ":autonomy-host"
+
 # We need to have xen and ipv4 activated
 DISTRO_FEATURES_append = " xen ipv4"
 DISTRO_FEATURES_NATIVE_append = " arm-autonomy-host"
diff --git a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bbappend b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bbappend
index d855136..6e75af2 100644
--- a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bbappend
+++ b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bbappend
@@ -1,6 +1,6 @@
 # Use OVERRIDES to minimize the usage of
 # ${@bb.utils.contains('DISTRO_FEATURES', 'autonomy-host', ...
-OVERRIDES_append = "${@bb.utils.contains('DISTRO_FEATURES', 'arm-autonomy-host', ':autonomy-host', '', d)}"
+OVERRIDES_append = "${ARM_AUTONOMY_HOST_OVERRIDES}"
 
 FILESEXTRAPATHS_prepend_autonomy-host := "${THISDIR}/${PN}:"
 
diff --git a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend
index e1ba91f..10cd0d6 100644
--- a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend
+++ b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend
@@ -1,9 +1,10 @@
-# Machine specific u-boot
+# Use OVERRIDES to minimize the usage of
+# ${@bb.utils.contains('DISTRO_FEATURES', 'autonomy-host', ...
+OVERRIDES_append = "${ARM_AUTONOMY_HOST_OVERRIDES}"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_prepend_autonomy-host_fvp-base := "${THISDIR}/${PN}:"
 
 #
 # FVP BASE
 #
-
-SRC_URI_append_fvp-base = "${@bb.utils.contains('DISTRO_FEATURES', 'arm-autonomy-host', ' file://xen_u-boot_kernel_addr.patch', '', d)}"
+SRC_URI_append_autonomy-host_fvp-base = " file://xen_u-boot_kernel_addr.patch"
diff --git a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-kernel/linux/arm-autonomy-kmeta-extra/bsp/arm-platforms/n1sdp/n1sdp-preempt-rt.scc b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-kernel/linux/arm-autonomy-kmeta-extra/bsp/arm-platforms/n1sdp/n1sdp-preempt-rt.scc
deleted file mode 100644
index 414732c..0000000
--- a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-kernel/linux/arm-autonomy-kmeta-extra/bsp/arm-platforms/n1sdp/n1sdp-preempt-rt.scc
+++ /dev/null
@@ -1,6 +0,0 @@
-define KMACHINE n1sdp
-define KTYPE preempt-rt
-define KARCH arm64
-
-kconf non-hardware ktypes/developer/developer.cfg
-kconf non-hardware ktypes/preempt-rt/preempt-rt.cfg
diff --git a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-kernel/linux/arm-autonomy-kmeta-extra/features/arm-autonomy/preempt-rt-extras.cfg b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-kernel/linux/arm-autonomy-kmeta-extra/features/arm-autonomy/preempt-rt-extras.cfg
deleted file mode 100644
index bf9e14b..0000000
--- a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-kernel/linux/arm-autonomy-kmeta-extra/features/arm-autonomy/preempt-rt-extras.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-# Yocto kernel-cache sets CONFIG_NLS_CODEPAGE_437=m for LINUX_KERNEL_TYPR=preempt-rt
-CONFIG_NLS_CODEPAGE_437=y
-# Yocto kernel-cache sets CONFIG_NLS_ISO8859_1=m for LINUX_KERNEL_TYPR=preempt-rt
-CONFIG_NLS_ISO8859_1=y
-
-# Set the timer interrupt run at 1000 Hz to have a fast response
-CONFIG_HZ_1000=y
diff --git a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-kernel/linux/arm-autonomy-kmeta-extra/features/arm-autonomy/preempt-rt-extras.scc b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-kernel/linux/arm-autonomy-kmeta-extra/features/arm-autonomy/preempt-rt-extras.scc
deleted file mode 100644
index 676291b..0000000
--- a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-kernel/linux/arm-autonomy-kmeta-extra/features/arm-autonomy/preempt-rt-extras.scc
+++ /dev/null
@@ -1,3 +0,0 @@
-define KFEATURE_DESCRIPTION "Extra kernel configs when building with PREEMPT_RT"
-
-kconf non-hardware preempt-rt-extras.cfg
diff --git a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-kernel/linux/linux-%.bbappend b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-kernel/linux/linux-%.bbappend
index c8eaad7..f590e71 100644
--- a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-kernel/linux/linux-%.bbappend
+++ b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-kernel/linux/linux-%.bbappend
@@ -1,15 +1,17 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}:"
+# Use OVERRIDES to minimize the usage of
+# ${@bb.utils.contains('DISTRO_FEATURES', 'autonomy-host', ...
+OVERRIDES_append = "${ARM_AUTONOMY_HOST_OVERRIDES}"
+
+FILESEXTRAPATHS_prepend_autonomy-host_fvp-base := "${THISDIR}:"
 
 #
 # arm-autonomy kmeta extra
 #
-SRC_URI_append = " file://arm-autonomy-kmeta-extra;type=kmeta;name=arm-autonomy-kmeta-extra;destsuffix=arm-autonomy-kmeta-extra"
+SRC_URI_append_autonomy-host_fvp-base = " \
+    file://arm-autonomy-kmeta-extra;type=kmeta;name=arm-autonomy-kmeta-extra;destsuffix=arm-autonomy-kmeta-extra"
 
 # We need to turn off SVE support in the Linux kernel otherwise Xen is stopping
 # Linux kernel with a coredump while trying to access XEN bit of CPACR1 core
 # register.
-LINUX_ARM_AUTONOMY_DISABLE_ARM64_SVE = "${@bb.utils.contains_any('DISTRO_FEATURES', \
-                                         'arm-autonomy-host arm-autonomy-guest', \
-                                         ' features/arm-autonomy/disable-arm64-sve.scc','',d)}"
-
-KERNEL_FEATURES_append_fvp-base = "${LINUX_ARM_AUTONOMY_DISABLE_ARM64_SVE}"
+KERNEL_FEATURES_append_autonomy-host_fvp-base = " \
+    features/arm-autonomy/disable-arm64-sve.scc"
diff --git a/meta-arm-autonomy/recipes-bsp/grub/grub-efi_%.bbappend b/meta-arm-autonomy/recipes-bsp/grub/grub-efi_%.bbappend
index c59fd09..e88edfd 100644
--- a/meta-arm-autonomy/recipes-bsp/grub/grub-efi_%.bbappend
+++ b/meta-arm-autonomy/recipes-bsp/grub/grub-efi_%.bbappend
@@ -1 +1,3 @@
-GRUB_BUILDIN += "${@bb.utils.contains('DISTRO_FEATURES', 'arm-autonomy-host', 'xen_boot', '', d)}"
+OVERRIDES_append = "${ARM_AUTONOMY_HOST_OVERRIDES}"
+
+GRUB_BUILDIN_append_autonomy-host = " xen_boot"
diff --git a/meta-arm-autonomy/recipes-core/busybox/busybox_%.bbappend b/meta-arm-autonomy/recipes-core/busybox/busybox_%.bbappend
index e335581..36c4569 100644
--- a/meta-arm-autonomy/recipes-core/busybox/busybox_%.bbappend
+++ b/meta-arm-autonomy/recipes-core/busybox/busybox_%.bbappend
@@ -1,4 +1,8 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+# Use OVERRIDES to minimize the usage of
+# ${@bb.utils.contains('DISTRO_FEATURES', 'arm-autonomy-host', ...
+OVERRIDES_append = "${ARM_AUTONOMY_HOST_OVERRIDES}"
+
+FILESEXTRAPATHS_prepend_autonomy-host := "${THISDIR}/${PN}:"
 
 # The --exclude flag in Busybox tar is required by xenguest-mkimage
-SRC_URI += "file://feature_tar_long_options.cfg"
+SRC_URI_append_autonomy-host = " file://feature_tar_long_options.cfg"
diff --git a/meta-arm-autonomy/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend b/meta-arm-autonomy/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend
index 1d97e50..a4edd05 100644
--- a/meta-arm-autonomy/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend
+++ b/meta-arm-autonomy/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend
@@ -3,7 +3,9 @@
 # configuration by adding network network interface configuration file under
 # interfaces.d directory.
 
-do_install_append() {
+OVERRIDES_append = "${ARM_AUTONOMY_HOST_OVERRIDES}"
+
+do_install_append_autonomy-host() {
     # Add scan of interfaces.d to interfaces file
     cp -f ${WORKDIR}/interfaces ${WORKDIR}/interfaces.subdir
     echo "source-directory ${sysconfdir}/network/interfaces.d/" \
diff --git a/meta-arm-autonomy/recipes-devtools/qemu/qemu-autonomy-host.inc b/meta-arm-autonomy/recipes-devtools/qemu/qemu-autonomy-host.inc
new file mode 100644
index 0000000..085f952
--- /dev/null
+++ b/meta-arm-autonomy/recipes-devtools/qemu/qemu-autonomy-host.inc
@@ -0,0 +1,8 @@
+# For Xen we only need the i386 binaries
+QEMU_TARGETS = "i386"
+
+PACKAGECONFIG[noaudio] = "--audio-drv-list='',,"
+PACKAGECONFIG_append = " noaudio"
+PACKAGECONFIG_remove = "fdt sdl kvm"
+
+require recipes-devtools/qemu/qemu-package-split.inc
diff --git a/meta-arm-autonomy/recipes-devtools/qemu/qemu_%.bbappend b/meta-arm-autonomy/recipes-devtools/qemu/qemu_%.bbappend
index e2e1fe5..0be5651 100644
--- a/meta-arm-autonomy/recipes-devtools/qemu/qemu_%.bbappend
+++ b/meta-arm-autonomy/recipes-devtools/qemu/qemu_%.bbappend
@@ -1,12 +1,3 @@
-# Use OVERRIDES to minimize the usage of
-# ${@bb.utils.contains('DISTRO_FEATURES', 'arm-autonomy-host', ...
-OVERRIDES_append = "${@bb.utils.contains('DISTRO_FEATURES', 'arm-autonomy-host', ':autonomy-host', '', d)}"
-
-# For Xen we only need the i386 binaries
-QEMU_TARGETS_autonomy-host = "i386"
-
-PACKAGECONFIG[noaudio] = "--audio-drv-list='',,"
-PACKAGECONFIG_append_autonomy-host = " noaudio"
-PACKAGECONFIG_remove_autonomy-host = "fdt sdl kvm"
-
-require ${@bb.utils.contains('DISTRO_FEATURES', 'arm-autonomy-host', 'recipes-devtools/qemu/${BPN}-package-split.inc', '', d)}
+require ${@bb.utils.contains('DISTRO_FEATURES', \
+                             'arm-autonomy-host', \
+                             'qemu-autonomy-host.inc', '', d)}
diff --git a/meta-arm-autonomy/recipes-extended/xen/xen-tools_4.14.bbappend b/meta-arm-autonomy/recipes-extended/xen/xen-tools_4.14.bbappend
index ea45f31..21192c3 100644
--- a/meta-arm-autonomy/recipes-extended/xen/xen-tools_4.14.bbappend
+++ b/meta-arm-autonomy/recipes-extended/xen/xen-tools_4.14.bbappend
@@ -1,4 +1,7 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-4.14:"
+# Use OVERRIDES to minimize the usage of
+# ${@bb.utils.contains('DISTRO_FEATURES', 'arm-autonomy-host', ...
+OVERRIDES_append = "${ARM_AUTONOMY_HOST_OVERRIDES}"
 
-SRC_URI += "file://0001-vif-nat-fix-hostname.patch \
-           "
+FILESEXTRAPATHS_prepend_autonomy-host := "${THISDIR}/${PN}-4.14:"
+
+SRC_URI_append_autonomy-host = " file://0001-vif-nat-fix-hostname.patch"
diff --git a/meta-arm-autonomy/recipes-extended/xen/xen_%.bbappend b/meta-arm-autonomy/recipes-extended/xen/xen_%.bbappend
index 9403389..4871ef8 100644
--- a/meta-arm-autonomy/recipes-extended/xen/xen_%.bbappend
+++ b/meta-arm-autonomy/recipes-extended/xen/xen_%.bbappend
@@ -1,9 +1,10 @@
+# Use OVERRIDES to minimize the usage of
+# ${@bb.utils.contains('DISTRO_FEATURES', 'arm-autonomy-host', ...
+OVERRIDES_append = "${ARM_AUTONOMY_HOST_OVERRIDES}"
+
 # Make Xen machine specific
 # This ensures that sstate is properly handled and that each machine can have
 # its own configuration
-PACKAGE_ARCH = "${MACHINE_ARCH}"
+PACKAGE_ARCH_autonomy-host = "${MACHINE_ARCH}"
 
-PACKAGECONFIG_remove = "\
-    ${@bb.utils.contains('DISTRO_FEATURES', \
-                         'arm-autonomy-host', \
-                         'sdl', '', d)}"
+PACKAGECONFIG_remove_autonomy-host = "sdl"
diff --git a/meta-arm-autonomy/recipes-extended/xen/xen_4.14.bbappend b/meta-arm-autonomy/recipes-extended/xen/xen_4.14.bbappend
index f4196ff..5e9ff85 100644
--- a/meta-arm-autonomy/recipes-extended/xen/xen_4.14.bbappend
+++ b/meta-arm-autonomy/recipes-extended/xen/xen_4.14.bbappend
@@ -1,5 +1,9 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-4.14:"
+# Use OVERRIDES to minimize the usage of
+# ${@bb.utils.contains('DISTRO_FEATURES', 'arm-autonomy-host', ...
+OVERRIDES_append = "${ARM_AUTONOMY_HOST_OVERRIDES}"
 
-SRC_URI += " \
+FILESEXTRAPATHS_prepend_autonomy-host := "${THISDIR}/${PN}-4.14:"
+
+SRC_URI_append_autonomy-host = " \
     file://0001-xen-arm-Throw-messages-for-unknown-FP-SIMD-implement.patch \
     "
diff --git a/meta-arm-autonomy/recipes-kernel/linux/linux-%.bbappend b/meta-arm-autonomy/recipes-kernel/linux/linux-%.bbappend
index add7042..84a325c 100644
--- a/meta-arm-autonomy/recipes-kernel/linux/linux-%.bbappend
+++ b/meta-arm-autonomy/recipes-kernel/linux/linux-%.bbappend
@@ -1,3 +1,5 @@
 # Add arm-autonomy kernel support
-require linux-arm-autonomy.inc
-
+require ${@bb.utils.contains_any('DISTRO_FEATURES', \
+                                 'arm-autonomy-host arm-autonomy-guest', \
+                                 'linux-arm-autonomy.inc', \
+                                 '', d)}
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread
* [PATCH 2/2] ci: Add meta-arm-autonomy to check-layers job
  2021-06-30 18:01 [PATCH 1/2] arm-autonomy: fixes for yocto-check-layer Diego Sueiro
@ 2021-06-30 18:01 ` Diego Sueiro
  0 siblings, 0 replies; 2+ messages in thread
From: Diego Sueiro @ 2021-06-30 18:01 UTC (permalink / raw)
  To: meta-arm; +Cc: nd

Issue-Id: SCM-2625
Signed-off-by: Diego Sueiro <diego.sueiro@arm.com>
Change-Id: If6ea3b3ed2915d540eb30632e33bb29882a36b67
---
 .gitlab-ci.yml           |  2 +-
 ci/check-layers.yml      |  6 ++++++
 ci/meta-arm-autonomy.yml | 18 ++++++++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 ci/meta-arm-autonomy.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 996b0ab..50eb88b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -98,7 +98,7 @@ check-layers:
   extends: .setup
   coverage: '/Coverage: \d+/'
   script:
-  - kas shell --update --force-checkout ci/base.yml:ci/meta-python.yml --command \
+  - kas shell --update --force-checkout ci/base.yml:ci/meta-arm-autonomy.yml:ci/meta-python.yml --command \
     "$CI_PROJECT_DIR/ci/check-layers.py $CI_PROJECT_DIR/ci/check-layers.yml $CI_PROJECT_DIR $KAS_WORK_DIR"
 
 corstone500:
diff --git a/ci/check-layers.yml b/ci/check-layers.yml
index 7d2820c..2383565 100644
--- a/ci/check-layers.yml
+++ b/ci/check-layers.yml
@@ -3,5 +3,11 @@ layers:
   - meta-arm-bsp
   - meta-arm-toolchain
   - meta-gem5
+  - meta-arm-autonomy
 dependencies:
   - meta-openembedded/meta-oe
+  - meta-openembedded/meta-networking
+  - meta-openembedded/meta-python
+  - meta-openembedded/meta-filesystems
+  - poky/meta-poky
+  - meta-virtualization
diff --git a/ci/meta-arm-autonomy.yml b/ci/meta-arm-autonomy.yml
new file mode 100644
index 0000000..f95642c
--- /dev/null
+++ b/ci/meta-arm-autonomy.yml
@@ -0,0 +1,18 @@
+header:
+  version: 9
+
+repos:
+  meta-openembedded:
+    url: https://git.openembedded.org/meta-openembedded
+    layers:
+      meta-oe:
+      meta-networking:
+      meta-python:
+      meta-filesystem:
+
+  meta-virtualization:
+    url: https://git.yoctoproject.org/git/meta-virtualization
+
+  meta-arm:
+    layers:
+      meta-arm-autonomy:
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-06-30 18:01 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-30 18:01 [PATCH 1/2] arm-autonomy: fixes for yocto-check-layer Diego Sueiro
2021-06-30 18:01 ` [PATCH 2/2] ci: Add meta-arm-autonomy to check-layers job Diego Sueiro

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.