Skip to content

Commit

Permalink
Rename rdepends from 'virtual/' to 'virtual-'
Browse files Browse the repository at this point in the history
Recipes shouldn't use "virtual/" in RPROVIDES and RDEPENDS. This was
addressed already in recipes in meta-oe and oe-core. Add a test for
this in insane.bbclass (>nanbield) to ensure no regressions occur.

This change removes all the needless virtuals defined for the RDEPENDS.
It only remains the 'virtual/wpebackend' but renamed now to
'virtual-wpebackend'.

Ref: https://lists.openembedded.org/g/openembedded-core/message/155551
  • Loading branch information
psaavedra committed Jan 25, 2024
1 parent d544563 commit 92098b5
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 8 deletions.
4 changes: 2 additions & 2 deletions recipes-browser/cog/cog.inc
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ DEPENDS:append:class-target = " \
${@bb.utils.contains('PACKAGECONFIG', 'fdo', 'wayland-native', '', d)} \
"

# At run-time cog package should depend on virtual/wpebackend unless webkitgtk+ is enabled.
# At run-time cog package should depend on virtual-wpebackend unless webkitgtk+ is enabled.
RDEPENDS:${PN} += "\
${@bb.utils.contains('PACKAGECONFIG', 'webkitgtk', '', 'virtual/wpebackend', d)} \
${@bb.utils.contains('PACKAGECONFIG', 'webkitgtk', '', 'virtual-wpebackend', d)} \
xkeyboard-config \
"

Expand Down
1 change: 0 additions & 1 deletion recipes-browser/libwpe/libwpe.inc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=371a616eb4903c6cb79e9893a5f615cc"
DEPENDS:append = " virtual/egl"

PROVIDES += "virtual/libwpe"
RPROVIDES:${PN} += "virtual/libwpe"

# Workaround build issue with RPi userland EGL libraries.
CFLAGS:append:rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '-D_GNU_SOURCE', d)}"
Expand Down
2 changes: 1 addition & 1 deletion recipes-browser/wpebackend-fdo/wpebackend-fdo.inc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1f62cef2e3645e3e74eb05fd389d7a66"
DEPENDS += "glib-2.0 libxkbcommon wayland libepoxy libwpe"
DEPENDS:append:class-target = " wayland-native"
PROVIDES += "virtual/wpebackend"
RPROVIDES:${PN} += "virtual/wpebackend"
RPROVIDES:${PN} += "virtual-wpebackend"

FILES_SOLIBSDEV = ""
FILES:${PN} += "${libdir}/libWPEBackend-fdo-*.so"
Expand Down
2 changes: 1 addition & 1 deletion recipes-browser/wpebackend-rdk/wpebackend-rdk.inc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://src/wayland/display.h;;beginline=5;endline=24;md5=b1c
SRC_URI = "git://github.com/WebPlatformForEmbedded/WPEBackend-rdk.git;protocol=git;branch=master"

PROVIDES += "virtual/wpebackend"
RPROVIDES:${PN} += "virtual/wpebackend"
RPROVIDES:${PN} += "virtual-wpebackend"

DEPENDS:append = " libwpe virtual/egl glib-2.0 libxkbcommon xkeyboard-config"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ PROVIDES:append:class-devupstream = " virtual/wpebackend"
SRC_URI:class-devupstream = "git://github.com/WebPlatformForEmbedded/WPEBackend-rdk.git;protocol=https;branch=master"
SRCREV:class-devupstream = "108e4ab0da043421202e3ef64e0a38d1db8b82ee"

RPROVIDES:${PN}:append:class-devupstream = "virtual/wpebackend"
RPROVIDES:${PN}:append:class-devupstream = "virtual-wpebackend"
2 changes: 1 addition & 1 deletion recipes-browser/wpewebkit/wpewebkit.inc
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ GSTVIDEOCONVERTSCALEPLUGIN = "${@bb.utils.contains_any('LAYERSERIES_CORENAMES',
# Extra runtime depends
RDEPENDS:${PN} += " \
libgles2 \
virtual/wpebackend \
virtual-wpebackend \
${@bb.utils.contains('PACKAGECONFIG', 'remote-inspector', '${PN}-web-inspector-plugin', '', d)} \
${@bb.utils.contains('PACKAGECONFIG', 'mediasource', 'gstreamer1.0-plugins-good-isomp4', '', d)} \
${@bb.utils.contains('PACKAGECONFIG', 'webaudio', 'gstreamer1.0-plugins-good-wavparse', '', d)} \
Expand Down
1 change: 0 additions & 1 deletion recipes-cdm/sparkle-cdm/sparkle-cdm_git.bb
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ PACKAGECONFIG[sample-player] = "-Dsample-player=enabled,-Dsample-player=disabled
PACKAGECONFIG[clearkey-module] = "-Dclearkey-module=enabled,-Dclearkey-module=disabled,json-glib openssl"

PROVIDES += "virtual/open-cdm"
RPROVIDES:${PN} += "virtual/open-cdm"

PACKAGES =+ "${PN}-sample-player ${PN}-clearkey-module"

Expand Down

0 comments on commit 92098b5

Please sign in to comment.