Skip to content

Commit

Permalink
Merge pull request #830 from YoeDistro/kraj/master
Browse files Browse the repository at this point in the history
Update layers and envsetup.
  • Loading branch information
cbrake authored Aug 28, 2023
2 parents 4288e90 + 58f6d12 commit 9059d49
Show file tree
Hide file tree
Showing 14 changed files with 35 additions and 15 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,19 +56,30 @@ and this project adheres to
- Upgrade mariadb to 10.11.5
- Fix musl build for riscv32
- Allow building some native recipes with ccache
- Do not use LLD linker to build go-runtime on aarch64, subsequent
apps linking with this go-runtime crashes go linker
- Switch from GNU-TLS to openssl transport by default on rsyslog
- Update to latest on QT6 6.5 LTS
- Improve taskhash reproducibility in bitbake/siggen
- Add new srcrev fetcher API to fetch2
- Disable perl support in perf
- Do not define TESTIMAGE_AUTO for qemu machines

### Added

- Added recipes
- webkitgtk3, libnvme, python3-telnetlib3, mstpd, bolt
python3-types-psutil, python3-types-setuptools, qad
ttf-google-fira, python3-oauth2client, python3-schedule
spice-guest-vdagent, aml, phodav, gnome-boxes, libosinfo
gnome-remote-desktop, libcacard, usbids, qcbor
- Add script to generate kernel CVE_STATUS entries for linux-yocto
- Add packageconfig to support colored logs in journald
- Add DOCKER_PORTS variable in setenv to forward ports between docker and host
- Add GCP fetcher to list of supported protocols
- Add yocto sstate mirror as default backup for public sstate feeds
- Add MESON_TARGET to meson class which can be defined in recipes
- Add DOCKER_EXTRA_ARGS to envsetup to pass custom options to docker

### Removed

Expand Down
9 changes: 6 additions & 3 deletions conf/projects/qemucommon/config.conf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ DISTRO = "yoe"
YOE_PROFILE = "yoe-glibc-systemd-wayland"
# usually not changed often
# Add 4G space to QEMU image
IMAGE_ROOTFS_EXTRA_SPACE:append = " + 4000000"
#IMAGE_ROOTFS_EXTRA_SPACE:append = " + 4000000"
# common
#TEST_SERVER_IP = "10.0.0.13"
# QEMU
Expand All @@ -13,9 +13,10 @@ IMAGE_ROOTFS_EXTRA_SPACE:append = " + 4000000"
#TEST_TARGET = "simpleremote"
#TFTP_SERVER_IP = "10.0.0.13"

# Enable clang static analyzer
#INHERIT += "scan-build"
SCAN_BUILD ?= ""
SCAN_BUILD:pn-openssl = "1"
#SCAN_BUILD ?= ""
#SCAN_BUILD:pn-openssl = "1"

IMAGE_FSTYPES:append = " wic.xz wic.bmap tar.xz"
IMAGE_FSTYPES:remove = "tar.bz2 tar.xz tar tar.gz wic.xz wic.bmap"
Expand All @@ -24,6 +25,8 @@ QEMU_USE_KVM = "1"
# normal networking requires sudo access slirp does not
#QEMU_USE_SLIRP = "1"
#TEST_RUNQEMUPARAMS = "slirp"
#TEST_SERVER_IP = "10.0.2.2:8000"

# Launch vnc backend during testing
#TEST_RUNQEMUPARAMS = "publicvnc"
# needed for running ptests automatically
Expand Down
1 change: 0 additions & 1 deletion conf/projects/qemux86-64/config.conf
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
MACHINE = "qemux86-64"
TESTIMAGE_AUTO = "1"
require ${TOPDIR}/conf/projects/qemucommon/config.conf
1 change: 0 additions & 1 deletion conf/projects/qemux86/config.conf
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
MACHINE = "qemux86"
TESTIMAGE_AUTO = "1"
require ${TOPDIR}/conf/projects/qemucommon/config.conf
7 changes: 5 additions & 2 deletions envsetup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -624,6 +624,7 @@ dkr() {
--env UUID=$(id -u) \
$PORTMAPS \
$UID_ARGS \
$DOCKER_EXTRA_ARGS \
--cap-add=NET_ADMIN \
--device /dev/net/tun \
--device /dev/kvm \
Expand Down Expand Up @@ -740,6 +741,8 @@ yoe_install_image() {

# Needed for running per-image ptest images in parallel on qemu
yoe_create_tap_devices() {
bitbake qemu-helper-native
sudo ${OE_BASE}/sources/poky/scripts/runqemu-gen-tapdevs `id -u` ` nproc --all`
if [ ! -e ${OE_BASE}/sources/poky/scripts/runqemu-gen-tapdevs ]; then
bitbake qemu-helper-native
fi
sudo ${OE_BASE}/sources/poky/scripts/runqemu-gen-tapdevs `id -g` `nproc --all`
}
5 changes: 5 additions & 0 deletions local.sh.example
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,8 @@
# 5900 is for VNC
# 8181 is for clang static analyzer bitbake -cscanview <recipe>
#export DOCKER_PORTS="5900:5900 8181:8181"
# Pass additional options to launch docker
# --net=host is used to expose host network to
# container, e.g. TAP devices created on host are accessible inside
# docker needed for running ptests e.g. core-image-ptest-all
#DOCKER_EXTRA_ARGS = "--net=host"
2 changes: 1 addition & 1 deletion sources/meta-clang
2 changes: 1 addition & 1 deletion sources/meta-openembedded
Submodule meta-openembedded updated 93 files
+4 −0 meta-gnome/conf/layer.conf
+40 −0 meta-gnome/dynamic-layers/meta-virtualization/recipes-gnome/gnome-boxes/gnome-boxes_44.2.bb
+38 −0 meta-gnome/dynamic-layers/meta-virtualization/recipes-gnome/gnome-remote-desktop/gnome-remote-desktop_44.2.bb
+1 −1 meta-gnome/recipes-connectivity/geary/geary_44.1.bb
+1 −1 meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_42.6.bb
+1 −1 meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.78.bb
+1 −1 meta-networking/recipes-connectivity/samba/samba_4.18.6.bb
+1 −1 meta-networking/recipes-filter/nftables/nftables_1.0.8.bb
+1 −1 meta-networking/recipes-irc/weechat/weechat_4.0.4.bb
+13 −0 meta-networking/recipes-support/spice/libcacard_2.8.1.bb
+23 −0 meta-networking/recipes-support/spice/phodav_3.0.bb
+8 −4 meta-networking/recipes-support/spice/spice-gtk_0.42.bb
+25 −0 meta-networking/recipes-support/spice/spice-guest-vdagent_0.22.1.bb
+0 −59 meta-networking/recipes-support/spice/spice/0001-Convert-pthread_t-to-be-numeric.patch
+0 −96 meta-networking/recipes-support/spice/spice/0001-Fix-compile-errors-on-Linux-32bit-system.patch
+0 −48 meta-networking/recipes-support/spice/spice/0001-configure.ac-explicitly-link-to-jpeg-lib.patch
+10 −27 meta-networking/recipes-support/spice/spice_git.bb
+4 −6 meta-networking/recipes-support/spice/usbredir_0.13.0.bb
+1 −1 meta-oe/recipes-connectivity/gensio/gensio_2.7.4.bb
+0 −42 meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-direct_mmap-Use-off_t-on-linux.patch
+3 −4 meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb
+1 −1 meta-oe/recipes-devtools/ctags/ctags_6.0.20230820.0.bb
+1 −1 meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.131.bb
+3 −0 meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb
+29 −0 ...json-schema-validator/json-schema-validator/0001-Set-Json_validator-Install-off-if-it-finds-it-via-li.patch
+0 −46 meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0001-cmake-Use-GNUInstallDirs.patch
+71 −0 meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0002-Fix-assumed-signed-char.patch
+41 −0 ...oe/recipes-devtools/json-schema-validator/json-schema-validator/0003-For-root-value-use-empty-pointer.patch
+0 −16 meta-oe/recipes-devtools/json-schema-validator/json-schema-validator_2.1.0.bb
+18 −0 meta-oe/recipes-devtools/json-schema-validator/json-schema-validator_2.2.0.bb
+33 −0 meta-oe/recipes-devtools/kconfig-frontends/files/0001-Avoid-using-hard-coded-usr-include-paths.patch
+2 −1 meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb
+1 −1 meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.11.2.bb
+1 −1 meta-oe/recipes-devtools/php/php_8.2.9.bb
+1 −1 meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb
+1 −1 meta-oe/recipes-extended/dialog/dialog_1.3-20210509.bb
+4 −1 meta-oe/recipes-extended/flatpak/flatpak_1.15.4.bb
+1 −1 meta-oe/recipes-extended/libyang/libyang_2.1.111.bb
+32 −0 meta-oe/recipes-extended/qcbor/qcbor_git.bb
+0 −0 meta-oe/recipes-extended/redis/redis-7.2.0/0001-src-Do-not-reset-FINAL_LIBS.patch
+0 −0 meta-oe/recipes-extended/redis/redis-7.2.0/0006-Define-correct-gregs-for-RISCV32.patch
+0 −0 meta-oe/recipes-extended/redis/redis-7.2.0/GNU_SOURCE-7.patch
+4 −6 meta-oe/recipes-extended/redis/redis-7.2.0/hiredis-use-default-CC-if-it-is-set.patch
+0 −0 meta-oe/recipes-extended/redis/redis-7.2.0/init-redis-server
+0 −0 meta-oe/recipes-extended/redis/redis-7.2.0/lua-update-Makefile-to-use-environment-build-setting.patch
+4 −6 meta-oe/recipes-extended/redis/redis-7.2.0/oe-use-libc-malloc.patch
+0 −0 meta-oe/recipes-extended/redis/redis-7.2.0/redis.conf
+0 −0 meta-oe/recipes-extended/redis/redis-7.2.0/redis.service
+1 −1 meta-oe/recipes-extended/redis/redis_7.2.0.bb
+2 −1 meta-oe/recipes-extended/rsyslog/rsyslog_8.2306.0.bb
+2 −0 meta-oe/recipes-extended/snappy/snappy_1.1.9.bb
+35 −0 meta-oe/recipes-graphics/aml/aml_git.bb
+0 −33 meta-oe/recipes-graphics/libdecor/libdecor/0001-libdecor-gtk.c-dont-skip-for-conflicting-symbols.patch
+1 −2 meta-oe/recipes-graphics/libdecor/libdecor_0.1.99.bb
+40 −0 meta-oe/recipes-graphics/neatvnc/neatvnc_git.bb
+2 −0 meta-oe/recipes-multimedia/libopus/libopus_1.4.bb
+1 −1 meta-oe/recipes-multimedia/webm/libvpx_1.13.0.bb
+1 −1 meta-oe/recipes-support/gnulib/gnulib_2018-12-18.bb
+2 −0 meta-oe/recipes-support/lcms/lcms_2.15.bb
+0 −67 meta-oe/recipes-support/libgpiod/libgpiod-2.x/gpio-tools-test-bats-modify.patch
+1 −3 meta-oe/recipes-support/libgpiod/libgpiod_2.0.2.bb
+28 −0 meta-oe/recipes-support/libosinfo/libosinfo/0001-meson.build-allow-crosscompiling-gir.patch
+32 −0 meta-oe/recipes-support/libosinfo/libosinfo_1.10.bb
+3 −39 meta-oe/recipes-support/libssh/libssh/run-ptest
+4 −1 meta-oe/recipes-support/libssh/libssh_0.10.5.bb
+34 −0 meta-oe/recipes-support/liburing/liburing/0001-Fixes-build-failure-on-.-configure-make-shuffle-2836.patch
+0 −47 meta-oe/recipes-support/liburing/liburing/0001-examples-test-Remove-unused-linux-errqueue.h.patch
+2 −3 meta-oe/recipes-support/liburing/liburing_2.4.bb
+18 −0 meta-oe/recipes-support/usbids/usbids_2023.01.16.bb
+3 −3 meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.083.bb
+1 −1 meta-python/recipes-devtools/python/python3-alembic_1.11.3.bb
+1 −1 meta-python/recipes-devtools/python/python3-awesomeversion_23.8.0.bb
+1 −1 meta-python/recipes-devtools/python/python3-bitstring_4.1.0.bb
+1 −1 meta-python/recipes-devtools/python/python3-click_8.1.7.bb
+1 −1 meta-python/recipes-devtools/python/python3-engineio_4.6.0.bb
+1 −1 meta-python/recipes-devtools/python/python3-google-api-python-client_2.97.0.bb
+1 −1 meta-python/recipes-devtools/python/python3-humanize_4.8.0.bb
+0 −0 meta-python/recipes-devtools/python/python3-kivy_2.1.0.bb
+1 −1 meta-python/recipes-devtools/python/python3-mypy_1.5.1.bb
+1 −1 meta-python/recipes-devtools/python/python3-protobuf_4.24.1.bb
+1 −1 meta-python/recipes-devtools/python/python3-pycocotools_2.0.7.bb
+1 −1 meta-python/recipes-devtools/python/python3-pymetno_0.11.0.bb
+1 −1 meta-python/recipes-devtools/python/python3-pymongo_4.5.0.bb
+2 −0 meta-python/recipes-devtools/python/python3-pyroute2_0.7.9.bb
+2 −2 meta-python/recipes-devtools/python/python3-redis_5.0.0.bb
+1 −1 meta-python/recipes-devtools/python/python3-sqlalchemy_2.0.20.bb
+1 −1 meta-python/recipes-devtools/python/python3-tox_4.10.0.bb
+1 −1 meta-python/recipes-devtools/python/python3-typeguard_4.1.2.bb
+1 −1 meta-python/recipes-devtools/python/python3-types-setuptools_68.1.0.0.bb
+1 −1 meta-python/recipes-devtools/python/python3-zeroconf_0.82.1.bb
+1 −1 meta-python/recipes-devtools/python3_oauth2client/python3-oauth2client_4.1.3.bb
+1 −1 meta-python/recipes-extended/pywbem/python3-pywbem_1.6.2.bb
+1 −1 meta-webserver/recipes-httpd/nginx/nginx_1.25.2.bb
2 changes: 1 addition & 1 deletion sources/poky
Submodule poky updated 69 files
+215 −0 bitbake/lib/bb/acl.py
+24 −5 bitbake/lib/bb/fetch2/__init__.py
+4 −3 bitbake/lib/bb/monitordisk.py
+10 −8 bitbake/lib/bb/runqueue.py
+8 −2 bitbake/lib/bb/siggen.py
+126 −0 bitbake/lib/bb/xattr.py
+2 −2 meta-poky/conf/distro/poky.conf
+1 −1 meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb
+1 −1 meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb.upgraded
+3 −15 meta-selftest/recipes-test/gitunpackoffline/gitunpackoffline-fail.bb
+2 −2 meta-selftest/recipes-test/gitunpackoffline/gitunpackoffline.bb
+16 −0 meta-selftest/recipes-test/gitunpackoffline/gitunpackoffline.inc
+1 −1 meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb
+8 −25 meta/classes-global/base.bbclass
+0 −1 meta/classes-global/insane.bbclass
+11 −1 meta/classes-global/package.bbclass
+0 −4 meta/classes-global/sstate.bbclass
+1 −1 meta/classes-recipe/devupstream.bbclass
+4 −2 meta/classes/externalsrc.bbclass
+2 −5 meta/conf/bitbake.conf
+0 −1 meta/conf/documentation.conf
+1 −3 meta/lib/oe/recipeutils.py
+3 −3 meta/lib/oeqa/selftest/cases/devtool.py
+1 −1 meta/lib/oeqa/selftest/cases/fetch.py
+17 −8 meta/lib/oeqa/selftest/cases/gitarchivetests.py
+1 −1 meta/lib/oeqa/selftest/cases/recipetool.py
+0 −1 meta/lib/oeqa/selftest/cases/sstatetests.py
+21 −13 meta/lib/oeqa/utils/gitarchive.py
+1 −1 meta/recipes-bsp/efivar/efivar_38.bb
+1 −1 meta/recipes-core/dbus-wait/dbus-wait_git.bb
+1 −1 meta/recipes-core/musl/gcompat_git.bb
+1 −1 meta/recipes-core/musl/libc-test_git.bb
+1 −1 meta/recipes-core/musl/musl-locales_git.bb
+1 −1 meta/recipes-core/musl/musl_git.bb
+1 −1 meta/recipes-core/newlib/newlib.inc
+1 −1 meta/recipes-core/psplash/psplash_git.bb
+1 −1 meta/recipes-devtools/gnu-config/gnu-config_git.bb
+1 −1 meta/recipes-devtools/mmc/mmc-utils_git.bb
+1 −1 meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
+1 −1 meta/recipes-devtools/pseudo/pseudo_git.bb
+1 −2 meta/recipes-devtools/python/python3-dtc_1.7.0.bb
+1 −1 meta/recipes-devtools/tcf-agent/tcf-agent_git.bb
+1 −1 meta/recipes-devtools/xmlto/xmlto_0.0.28.bb
+1 −1 meta/recipes-extended/baremetal-example/baremetal-helloworld_git.bb
+1 −1 meta/recipes-graphics/libfakekey/libfakekey_git.bb
+1 −1 meta/recipes-graphics/piglit/piglit_git.bb
+1 −1 meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_git.bb
+1 −1 meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
+1 −1 meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
+1 −1 meta/recipes-kernel/blktrace/blktrace_git.bb
+1 −1 meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
+1 −1 meta/recipes-kernel/linux/linux-yocto-dev.bb
+1 −1 meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb
+1 −1 meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb
+1 −1 meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb
+1 −1 meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb
+1 −1 meta/recipes-kernel/linux/linux-yocto_6.1.bb
+1 −1 meta/recipes-kernel/linux/linux-yocto_6.4.bb
+7 −3 meta/recipes-kernel/perf/perf-perl.inc
+17 −9 meta/recipes-kernel/perf/perf.bb
+1 −1 meta/recipes-multimedia/x264/x264_git.bb
+1 −1 meta/recipes-sato/l3afpad/l3afpad_git.bb
+1 −1 meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb
+1 −1 meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.2.bb
+1 −1 meta/recipes-sato/puzzles/puzzles_git.bb
+1 −1 meta/recipes-support/bmap-tools/bmap-tools_git.bb
+1 −1 meta/recipes-support/ptest-runner/ptest-runner_2.4.2.bb
+1 −1 scripts/lib/recipetool/create.py
+1 −1 scripts/lib/scriptutils.py

0 comments on commit 9059d49

Please sign in to comment.