Skip to contentSkip to conversation

wayland: package target binaries into -tools, not into -dev

PATCH In review Alexander Kanavin 2 participants 6 messages May 26, 2021 – May 27, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/4 wayland: package target binaries into -tools, not into -dev

---
 meta/recipes-graphics/wayland/wayland_1.19.0.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
meta/recipes-graphics/wayland/wayland_1.19.0.bb +3 -1
index 8f121601c4..7e8a2884fe 100644
@@ -52,8 +52,10 @@ sysroot_stage_all_append_class-target () {
 	cp ${STAGING_DATADIR_NATIVE}/aclocal/wayland-scanner.m4 ${SYSROOT_DESTDIR}/${datadir}/aclocal/
 }
 
+PACKAGES += "${PN}-tools"
+
 FILES_${PN} = "${libdir}/*${SOLIBS}"
-FILES_${PN}-dev += "${bindir} ${datadir}/wayland"
+FILES_${PN}-tools += "${bindir} ${datadir}/wayland"
 
 BBCLASSEXTEND = "native nativesdk"
 
Signature · 1 line
2.31.1
#1 lore raw

PATCH 2/4 ptest: add newly discovered missing runtime dependencies across recipes

Making ptest images based on core-image-minimal uncovered quite a few missing depenendcies from various recipes, here they are.

---
 meta/recipes-core/gettext/gettext_0.21.bb         | 2 +-
 meta/recipes-devtools/python/python3_3.9.5.bb     | 3 ++-
 meta/recipes-devtools/valgrind/valgrind_3.17.0.bb | 2 +-
 meta/recipes-extended/parted/parted_3.4.bb        | 2 +-
 meta/recipes-graphics/wayland/wayland_1.19.0.bb   | 2 +-
 meta/recipes-support/libssh2/libssh2_1.9.0.bb     | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)
meta/recipes-core/gettext/gettext_0.21.bb +1 -1
index bc14867bbb..b86e8d8381 100644
@@ -174,7 +174,7 @@ do_install_ptest() {
     fi
 }
 
-RDEPENDS_${PN}-ptest += "make"
+RDEPENDS_${PN}-ptest += "make xz"
 RDEPENDS_${PN}-ptest_append_libc-glibc = "\
     glibc-gconv-big5 \
     glibc-charmap-big5 \
meta/recipes-devtools/python/python3_3.9.5.bb +2 -1
index 82177f4a18..f4002f2516 100644
@@ -344,6 +344,7 @@ PACKAGES =+ "libpython3 libpython3-staticdev"
 FILES_libpython3 = "${libdir}/libpython*.so.*"
 FILES_libpython3-staticdev += "${libdir}/python${PYTHON_MAJMIN}/config-${PYTHON_MAJMIN}-*/libpython${PYTHON_MAJMIN}.a"
 INSANE_SKIP_${PN}-dev += "dev-elf"
+INSANE_SKIP_${PN}-ptest = "dev-deps"
 
 # catch all the rest (unsorted)
 PACKAGES += "${PN}-misc"
@@ -367,7 +368,7 @@ FILES_${PN}-man = "${datadir}/man"
 # See https://bugs.python.org/issue18748 and https://bugs.python.org/issue37395
 RDEPENDS_libpython3_append_libc-glibc = " libgcc"
 RDEPENDS_${PN}-ctypes_append_libc-glibc = " ${MLPREFIX}ldconfig"
-RDEPENDS_${PN}-ptest = "${PN}-modules ${PN}-tests unzip bzip2 libgcc tzdata-europe coreutils sed"
+RDEPENDS_${PN}-ptest = "${PN}-modules ${PN}-tests ${PN}-dev unzip bzip2 libgcc tzdata-europe coreutils sed"
 RDEPENDS_${PN}-ptest_append_libc-glibc = " locale-base-tr-tr.iso-8859-9"
 RDEPENDS_${PN}-tkinter += "${@bb.utils.contains('PACKAGECONFIG', 'tk', 'tk tk-lib', '', d)}"
 RDEPENDS_${PN}-idle += "${@bb.utils.contains('PACKAGECONFIG', 'tk', '${PN}-tkinter tcl', '', d)}"
meta/recipes-devtools/valgrind/valgrind_3.17.0.bb +1 -1
index ebbd83dd3f..d0c60d0a3d 100644
@@ -130,7 +130,7 @@ RDEPENDS_${PN} += "perl"
 # redirect functions like strlen.
 RRECOMMENDS_${PN} += "${TCLIBC}-dbg"
 
-RDEPENDS_${PN}-ptest += " bash coreutils file \
+RDEPENDS_${PN}-ptest += " bash coreutils curl file \
    gdb libgomp \
    perl \
    perl-module-file-basename perl-module-file-glob perl-module-getopt-long \
meta/recipes-extended/parted/parted_3.4.bb +1 -1
index c15f5aeb0b..fb583489f8 100644
@@ -47,7 +47,7 @@ do_install_ptest() {
 	sed -e 's| ../parted||' -i $t/tests/*.sh
 }
 
-RDEPENDS_${PN}-ptest = "bash coreutils perl util-linux-losetup python3 make gawk e2fsprogs-mke2fs python3-core"
+RDEPENDS_${PN}-ptest = "bash coreutils perl util-linux-losetup python3 make gawk e2fsprogs-mke2fs python3-core dosfstools"
 RRECOMMENDS_${PN}-ptest = "kernel-module-scsi-debug"
 RDEPENDS_${PN}-ptest_append_libc-glibc = "\
         glibc-utils \
meta/recipes-graphics/wayland/wayland_1.19.0.bb +1 -1
index 7e8a2884fe..0fda80ccae 100644
@@ -59,4 +59,4 @@ FILES_${PN}-tools += "${bindir} ${datadir}/wayland"
 
 BBCLASSEXTEND = "native nativesdk"
 
-RDEPENDS_${PN}-ptest += "binutils sed"
+RDEPENDS_${PN}-ptest += "binutils sed ${PN}-tools"
meta/recipes-support/libssh2/libssh2_1.9.0.bb +1 -1
index a5451628e7..f290bf3268 100644
@@ -34,7 +34,7 @@ PACKAGECONFIG[gcrypt] = "--with-crypto=libgcrypt --with-libgcrypt-prefix=${STAGI
 BBCLASSEXTEND = "native nativesdk"
 
 # required for ptest on documentation
-RDEPENDS_${PN}-ptest = "man-db openssh"
+RDEPENDS_${PN}-ptest = "man-db openssh util-linux-col"
 RDEPENDS_${PN}-ptest_append_libc-glibc = " locale-base-en-us"
 
 do_compile_ptest() {
Signature · 1 line
2.31.1
#2 lore raw

PATCH 3/4 images: add ptest images based on core-image-minimal

In reply to Alexander Kanavin

This greatly reduces build times needed for those images, as they no longer need anything graphical, or -dev packages for everything.

---
 .../images/core-image-minimal-ptest-all.bb    | 25 +++++++++++++++++++
 .../images/core-image-minimal-ptest-fast.bb   | 24 ++++++++++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 meta/recipes-core/images/core-image-minimal-ptest-all.bb
 create mode 100644 meta/recipes-core/images/core-image-minimal-ptest-fast.bb
meta/recipes-core/images/core-image-minimal-ptest-all.bb new file +25 -0
new file mode 100644
index 0000000000..c1d6aa28a9
@@ -0,0 +1,25 @@
+inherit features_check
+REQUIRED_DISTRO_FEATURES = "ptest"
+
+require core-image-minimal.bb
+require conf/distro/include/ptest-packagelists.inc
+
+DESCRIPTION += "Also includes ptest packages."
+HOMEPAGE = "https://www.yoctoproject.org/"
+
+# Include the full set of ptests
+IMAGE_INSTALL += "${PTESTS_FAST} ${PTESTS_SLOW}"
+
+# This image is sufficiently large (~1.8GB) that we need to be careful that it fits in a live
+# image (which has a 4GB limit), so nullify the overhead factor (1.3x out of the
+# box) and explicitly add just 1100MB.
+# strace-ptest in particular needs more than 500MB
+IMAGE_OVERHEAD_FACTOR = "1.0"
+IMAGE_ROOTFS_EXTRA_SPACE = "1124288"
+
+# ptests need more memory than standard to avoid the OOM killer
+# also lttng-tools needs /tmp that has at least 1G
+QB_MEM = "-m 2048"
+
+# Sadly at the moment the full set of ptests is not robust enough and sporadically fails in random places
+PTEST_EXPECT_FAILURE = "1"
meta/recipes-core/images/core-image-minimal-ptest-fast.bb new file +24 -0
new file mode 100644
index 0000000000..40df274c4c
@@ -0,0 +1,24 @@
+inherit features_check
+REQUIRED_DISTRO_FEATURES = "ptest"
+
+require core-image-minimal.bb
+require conf/distro/include/ptest-packagelists.inc
+
+# Include only fast (< 30 sec) ptests
+IMAGE_INSTALL += "${PTESTS_FAST}"
+
+DESCRIPTION += "Also includes ptest packages with fast execution times to allow for more automated QA."
+HOMEPAGE = "https://www.yoctoproject.org/"
+
+# This image is sufficiently large (~1.8GB) that it can't actually fit in a live
+# image (which has a 4GB limit), so nullify the overhead factor (1.3x out of the
+# box) and explicitly add just 1500MB.
+# strace-ptest in particular needs more than 500MB
+IMAGE_OVERHEAD_FACTOR = "1.0"
+IMAGE_ROOTFS_EXTRA_SPACE = "1524288"
+
+# ptests need more memory than standard to avoid the OOM killer
+QB_MEM = "-m 1024"
+
+# Sadly at the moment the fast set of ptests is not robust enough and sporadically fails in a couple of places
+PTEST_EXPECT_FAILURE = "1"
Signature · 1 line
2.31.1
#3 lore raw

Re: [OE-core] [PATCH 3/4] images: add ptest images based on core-image-minimal

Quoted 11 lines · Alexander Kanavin

This greatly reduces build times needed for those images, as they no longer need anything graphical, or -dev packages for everything.

---
 .../images/core-image-minimal-ptest-all.bb | 25 +++++++++++++++++++
 .../images/core-image-minimal-ptest-fast.bb | 24 ++++++++++++++++++

 2 files changed, 49 insertions(+)

 create mode 100644 meta/recipes-core/images/core-image-minimal-ptest-all.bb create mode 100644 meta/recipes-core/images/core-image-minimal-ptest-fast.bb

Since we're renaming, can these become "core-image-ptest"? The base image is an implementation detail we probably don't need to care about and would make any changes easier in future...

Other patches look good, thanks!

Cheers,

Richard

#4 lore raw

Re: [OE-core] [PATCH 3/4] images: add ptest images based on core-image-minimal

Quoted 6 lines · Richard Purdie

Since we're renaming, can these become "core-image-ptest"? The base image is an implementation detail we probably don't need to care about and would make any changes easier in future...

Other patches look good, thanks!

Updated patches sent, also for config.json.

Alex

#5 lore raw

PATCH 4/4 images: remove sato/weston ptest images

In reply to Alexander Kanavin

They have been replaced by core-image-minimal-ptest-fast/all

---
 .../images/core-image-weston-ptest-all.bb     | 21 ---------------
 .../images/core-image-weston-ptest-fast.bb    | 20 --------------
 .../images/core-image-sato-ptest-fast.bb      | 23 ----------------
 .../images/core-image-sato-sdk-ptest.bb       | 27 -------------------
 4 files changed, 91 deletions(-)
 delete mode 100644 meta/recipes-graphics/images/core-image-weston-ptest-all.bb
 delete mode 100644 meta/recipes-graphics/images/core-image-weston-ptest-fast.bb
 delete mode 100644 meta/recipes-sato/images/core-image-sato-ptest-fast.bb
 delete mode 100644 meta/recipes-sato/images/core-image-sato-sdk-ptest.bb
meta/recipes-graphics/images/core-image-weston-ptest-all.bb deleted +0 -21
deleted file mode 100644
index a622779e6a..0000000000
@@ -1,21 +0,0 @@
-require core-image-weston-sdk.bb
-require conf/distro/include/ptest-packagelists.inc
-
-DESCRIPTION += "Also includes ptest packages."
-
-# Include the full set of ptests
-IMAGE_INSTALL += "${PTESTS_FAST} ${PTESTS_SLOW}"
-
-# This image is sufficiently large (~1.8GB) that we need to be careful that it fits in a live
-# image (which has a 4GB limit), so nullify the overhead factor (1.3x out of the
-# box) and explicitly add just 1100MB.
-# strace-ptest in particular needs more than 500MB
-IMAGE_OVERHEAD_FACTOR = "1.0"
-IMAGE_ROOTFS_EXTRA_SPACE = "1124288"
-
-# ptests need more memory than standard to avoid the OOM killer
-# also lttng-tools needs /tmp that has at least 1G
-QB_MEM = "-m 2048"
-
-# Sadly at the moment the full set of ptests is not robust enough and sporadically fails in random places
-PTEST_EXPECT_FAILURE = "1"
meta/recipes-graphics/images/core-image-weston-ptest-fast.bb deleted +0 -20
deleted file mode 100644
index df02befb66..0000000000
@@ -1,20 +0,0 @@
-require core-image-weston-sdk.bb
-require conf/distro/include/ptest-packagelists.inc
-
-# Include only fast (< 30 sec) ptests
-IMAGE_INSTALL += "${PTESTS_FAST}"
-
-DESCRIPTION += "Also includes ptest packages with fast execution times to allow for more automated QA."
-
-# This image is sufficiently large (~1.8GB) that it can't actually fit in a live
-# image (which has a 4GB limit), so nullify the overhead factor (1.3x out of the
-# box) and explicitly add just 1500MB.
-# strace-ptest in particular needs more than 500MB
-IMAGE_OVERHEAD_FACTOR = "1.0"
-IMAGE_ROOTFS_EXTRA_SPACE = "1524288"
-
-# ptests need more memory than standard to avoid the OOM killer
-QB_MEM = "-m 1024"
-
-# Sadly at the moment the fast set of ptests is not robust enough and sporadically fails in a couple of places
-PTEST_EXPECT_FAILURE = "1"
meta/recipes-sato/images/core-image-sato-ptest-fast.bb deleted +0 -23
deleted file mode 100644
index d37ad00cf8..0000000000
@@ -1,23 +0,0 @@
-inherit features_check
-REQUIRED_DISTRO_FEATURES = "ptest"
-
-require core-image-sato-sdk.bb
-require conf/distro/include/ptest-packagelists.inc
-
-IMAGE_INSTALL += "${PTESTS_FAST}"
-
-DESCRIPTION += "Also includes ptest packages with fast execution times to allow for more automated QA."
-HOMEPAGE = "https://www.yoctoproject.org/"
-
-# This image is sufficiently large (~1.8GB) that it can't actually fit in a live
-# image (which has a 4GB limit), so nullify the overhead factor (1.3x out of the
-# box) and explicitly add just 1500MB.
-# strace-ptest in particular needs more than 500MB
-IMAGE_OVERHEAD_FACTOR = "1.0"
-IMAGE_ROOTFS_EXTRA_SPACE = "1524288"
-
-# ptests need more memory than standard to avoid the OOM killer
-QB_MEM = "-m 1024"
-
-# Sadly at the moment the fast set of ptests is not robust enough and sporadically fails in a couple of places
-PTEST_EXPECT_FAILURE = "1"
meta/recipes-sato/images/core-image-sato-sdk-ptest.bb deleted +0 -27
deleted file mode 100644
index eea89a5d6c..0000000000
@@ -1,27 +0,0 @@
-inherit features_check
-REQUIRED_DISTRO_FEATURES = "ptest"
-
-require core-image-sato-sdk.bb
-require conf/distro/include/ptest-packagelists.inc
-
-DESCRIPTION += "Also includes ptest packages."
-HOMEPAGE = "https://www.yoctoproject.org/"
-
-PROVIDES += "core-image-sato-ptest"
-
-# Also include ptests which may not otherwise be included in a sato image
-IMAGE_INSTALL += "${PTESTS_FAST} ${PTESTS_SLOW}"
-
-# This image is sufficiently large (~1.8GB) that we need to be careful that it fits in a live
-# image (which has a 4GB limit), so nullify the overhead factor (1.3x out of the
-# box) and explicitly add just 1100MB.
-# strace-ptest in particular needs more than 500MB
-IMAGE_OVERHEAD_FACTOR = "1.0"
-IMAGE_ROOTFS_EXTRA_SPACE = "1124288"
-
-# ptests need more memory than standard to avoid the OOM killer
-# also lttng-tools needs /tmp that has at least 1G
-QB_MEM = "-m 2048"
-
-# Sadly at the moment the full set of ptests is not robust enough and sporadically fails in random places
-PTEST_EXPECT_FAILURE = "1"
Signature · 1 line
2.31.1