diff --git a/conf/layer.conf b/conf/layer.conf index b417650..5273d61 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -8,10 +8,9 @@ BBFILE_COLLECTIONS += "wayland" BBFILE_PATTERN_wayland = "^${LAYERDIR}/" BBFILE_PRIORITY_wayland = "5" -LAYERSERIES_COMPAT_wayland = "hardknott" +LAYERSERIES_COMPAT_wayland = "hardknott honister" LAYERDEPENDS_wayland = " \ core \ openembedded-layer \ " - diff --git a/recipes-core/elogind/elogind_git.bb b/recipes-core/elogind/elogind_git.bb index aec2366..80f0bc8 100644 --- a/recipes-core/elogind/elogind_git.bb +++ b/recipes-core/elogind/elogind_git.bb @@ -17,5 +17,5 @@ inherit meson EXTRA_OEMESON += "--buildtype release" -FILES_${PN} += "/usr" +FILES:${PN} += "/usr" diff --git a/recipes-devtools/python/python-i3ipc_git.bb b/recipes-devtools/python/python-i3ipc_git.bb index 2811b7c..7e21c8c 100644 --- a/recipes-devtools/python/python-i3ipc_git.bb +++ b/recipes-devtools/python/python-i3ipc_git.bb @@ -6,7 +6,7 @@ SRC_URI = " \ git://github.com/altdesktop/i3ipc-python.git;protocol=https \ " -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ python3 \ python-xlib \ " diff --git a/recipes-devtools/python/python-xlib.bb b/recipes-devtools/python/python-xlib.bb index d658eb5..e123eb7 100644 --- a/recipes-devtools/python/python-xlib.bb +++ b/recipes-devtools/python/python-xlib.bb @@ -11,7 +11,7 @@ DEPENDS = " \ python3-pip-native \ " -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ python3 \ python3-six \ " diff --git a/recipes-extended/autotiling/autotiling_git.bb b/recipes-extended/autotiling/autotiling_git.bb index 4ac3d4d..7e53f16 100644 --- a/recipes-extended/autotiling/autotiling_git.bb +++ b/recipes-extended/autotiling/autotiling_git.bb @@ -8,7 +8,7 @@ SRC_URI = " \ DEPENDS = "python3-wheel-native" -RDEPENDS_${PN} = "python-i3ipc" +RDEPENDS:${PN} = "python-i3ipc" inherit setuptools3 diff --git a/recipes-extended/date/date_git.bb b/recipes-extended/date/date_git.bb index 67f657f..1c1265d 100644 --- a/recipes-extended/date/date_git.bb +++ b/recipes-extended/date/date_git.bb @@ -24,7 +24,7 @@ EXTRA_OECMAKE += " \ -DUSE_SYSTEM_TZ_DB=ON \ " -do_install_append() { +do_install:append() { # source lacks pkgconfig support. Include a pc file, so 'date' can be found using pkgconfig install -d ${D}${libdir}/pkgconfig install -m 0644 ${WORKDIR}/date.pc ${D}${libdir}/pkgconfig diff --git a/recipes-extended/font-awesome/font-awesome-otf_git.bb b/recipes-extended/font-awesome/font-awesome-otf_git.bb index 1cbbec0..7db84f5 100644 --- a/recipes-extended/font-awesome/font-awesome-otf_git.bb +++ b/recipes-extended/font-awesome/font-awesome-otf_git.bb @@ -22,7 +22,7 @@ do_install () { done } -FILES_${PN} = " \ +FILES:${PN} = " \ ${datadir}/fonts \ " diff --git a/recipes-extended/gtk-layer-shell/gtk-layer-shell_git.bb b/recipes-extended/gtk-layer-shell/gtk-layer-shell_git.bb index 9ed4316..c4a7f1c 100644 --- a/recipes-extended/gtk-layer-shell/gtk-layer-shell_git.bb +++ b/recipes-extended/gtk-layer-shell/gtk-layer-shell_git.bb @@ -27,7 +27,7 @@ PV = "0.6.0" SRCREV = "v${PV}" inherit meson pkgconfig features_check -FILES_${PN} = "${datadir} ${libdir}" +FILES:${PN} = "${datadir} ${libdir}" BBCLASSEXTEND = "" diff --git a/recipes-extended/jq/jq_git.bb b/recipes-extended/jq/jq_git.bb index becf5e7..8ba205b 100644 --- a/recipes-extended/jq/jq_git.bb +++ b/recipes-extended/jq/jq_git.bb @@ -16,6 +16,6 @@ SRCREV = "jq-${PV}" inherit autotools -do_configure_prepend() { +do_configure:prepend() { autoreconf -f } diff --git a/recipes-graphics/wayland/waylandpp_0.2.8.bb b/recipes-graphics/wayland/waylandpp_0.2.8.bb index 2e155a7..efcef80 100644 --- a/recipes-graphics/wayland/waylandpp_0.2.8.bb +++ b/recipes-graphics/wayland/waylandpp_0.2.8.bb @@ -4,8 +4,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=7f6b13e4480850c59e176edd427d996e" SRC_URI = "git://github.com/NilsBrause/waylandpp.git;tag=${PV}" -DEPENDS_append_class-native = " pugixml-native" -DEPENDS_append_class-target = " waylandpp-native wayland virtual/egl" +DEPENDS:append:class-native = " pugixml-native" +DEPENDS:append:class-target = " waylandpp-native wayland virtual/egl" S = "${WORKDIR}/git" PV = "0.2.8" @@ -13,7 +13,7 @@ PV = "0.2.8" inherit cmake -EXTRA_OECMAKE_append_class-native = " \ +EXTRA_OECMAKE:append:class-native = " \ -DBUILD_SCANNER=ON \ -DBUILD_LIBRARIES=OFF \ -DBUILD_DOCUMENTATION=OFF \ @@ -21,7 +21,7 @@ EXTRA_OECMAKE_append_class-native = " \ -DCMAKE_VERBOSE_MAKEFILE=TRUE \ " -EXTRA_OECMAKE_append_class-target = " \ +EXTRA_OECMAKE:append:class-target = " \ -DBUILD_SCANNER=OFF \ -DBUILD_LIBRARIES=ON \ -DBUILD_DOCUMENTATION=OFF \ @@ -35,11 +35,11 @@ EXTRA_OECMAKE_append_class-target = " \ -DCMAKE_EXE_LINKER_FLAGS="-Wl,--enable-new-dtags" \ " -FILES_${PN} = " \ +FILES:${PN} = " \ ${libdir}/libwayland*.so* \ " -FILES_${PN}-dev = " \ +FILES:${PN}-dev = " \ ${includedir}/* \ ${libdir}/pkgconfig/* \ ${libdir}/cmake/waylandpp/* \ @@ -47,7 +47,7 @@ FILES_${PN}-dev = " \ " FILES_SOLIBSDEV = "" -INSANE_SKIP_${PN} += "dev-so" +INSANE_SKIP:${PN} += "dev-so" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend b/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend index 38c2225..445d215 100644 --- a/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend +++ b/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend @@ -1,5 +1,5 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/xserver-xorg:" +FILESEXTRAPATHS:prepend := "${THISDIR}/xserver-xorg:" # This backport is needed on hardknott to enable wlroots to create the xwayland backend -SRC_URI_append = " file://0001-xwayland-Add-a-pkg-config-file-for-Xwayland.patch" +SRC_URI:append = " file://0001-xwayland-Add-a-pkg-config-file-for-Xwayland.patch" diff --git a/recipes-support/fnott/fnott_git.bb b/recipes-support/fnott/fnott_git.bb index 23471f4..d1ded6b 100644 --- a/recipes-support/fnott/fnott_git.bb +++ b/recipes-support/fnott/fnott_git.bb @@ -24,7 +24,7 @@ DEPENDS = " \ wayland-protocols \ " -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ fontconfig \ freetype \ wlroots \ @@ -39,6 +39,6 @@ SRCREV = "${PV}" EXTRA_OEMESON += "--buildtype release" PACKAGES += "${PN}-zsh-completion" -FILES_${PN}-zsh-completion = "${datadir}/zsh" +FILES:${PN}-zsh-completion = "${datadir}/zsh" BBCLASSEXTEND = "" diff --git a/recipes-support/foot/foot_git.bb b/recipes-support/foot/foot_git.bb index 0d11c07..9282f95 100644 --- a/recipes-support/foot/foot_git.bb +++ b/recipes-support/foot/foot_git.bb @@ -19,7 +19,7 @@ DEPENDS = " \ scdoc-native \ " -RRECOMMENDS_${PN} = "xdg-utils" +RRECOMMENDS:${PN} = "xdg-utils" SRC_URI = " \ git://codeberg.org/dnkl/foot.git;protocol=https \ @@ -38,7 +38,7 @@ PACKAGECONFIG ?= " \ inherit meson pkgconfig features_check -FILES_${PN} = " \ +FILES:${PN} = " \ ${bindir} \ ${datadir} \ " diff --git a/recipes-support/fuzzel/fuzzel_git.bb b/recipes-support/fuzzel/fuzzel_git.bb index 5e0beb7..76e2bf6 100644 --- a/recipes-support/fuzzel/fuzzel_git.bb +++ b/recipes-support/fuzzel/fuzzel_git.bb @@ -42,6 +42,6 @@ PACKAGECONFIG ?= " \ EXTRA_OEMESON += "--buildtype release" PACKAGES += "${PN}-zsh-completion" -FILES_${PN}-zsh-completion = "${datadir}/zsh" +FILES:${PN}-zsh-completion = "${datadir}/zsh" BBCLASSEXTEND = "" diff --git a/recipes-support/mako/mako_git.bb b/recipes-support/mako/mako_git.bb index b8d97d3..08b569f 100644 --- a/recipes-support/mako/mako_git.bb +++ b/recipes-support/mako/mako_git.bb @@ -21,9 +21,9 @@ DEPENDS = " \ wayland-protocols \ " -RDEPENDS_${PN} = "dbus" +RDEPENDS:${PN} = "dbus" -RRECOMMENDS_${PN} = "jq" +RRECOMMENDS:${PN} = "jq" inherit meson pkgconfig features_check @@ -45,7 +45,7 @@ SRCREV = "v${PV}" EXTRA_OEMESON += "--buildtype release" -FILES_${PN} += "${datadir}" +FILES:${PN} += "${datadir}" BBCLASSEXTEND = "" diff --git a/recipes-support/nwg-shell/azote_git.bb b/recipes-support/nwg-shell/azote_git.bb index 1865bbd..c7a1a63 100644 --- a/recipes-support/nwg-shell/azote_git.bb +++ b/recipes-support/nwg-shell/azote_git.bb @@ -6,7 +6,7 @@ SRC_URI = " \ git://github.com/nwg-piotr/azote.git;protocol=https \ " -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ python3 \ gtk+3 \ python3-pygobject \ @@ -26,7 +26,7 @@ S = "${WORKDIR}/git" PV = "1.9.1" SRCREV = "v${PV}" -do_install_append() { +do_install:append() { install -d ${D}${bindir} ${D}${datadir}/azote ${D}${datadir}/pixmaps ${D}${datadir}/applications install -m 755 ${S}/dist/azote ${D}${bindir} install -m 644 ${S}/dist/azote.desktop ${D}${datadir}/applications @@ -35,7 +35,7 @@ do_install_append() { install -m 644 ${S}/dist/indicator_attention.png ${D}${datadir}/azote } -FILES_${PN}_append = " \ +FILES:${PN}:append = " \ ${datadir} \ ${bindir} \ " diff --git a/recipes-support/nwg-shell/nwg-bar_git.bb b/recipes-support/nwg-shell/nwg-bar_git.bb index 3e0cffc..8b181c7 100644 --- a/recipes-support/nwg-shell/nwg-bar_git.bb +++ b/recipes-support/nwg-shell/nwg-bar_git.bb @@ -19,7 +19,7 @@ inherit go go-mod GO_INSTALL = "${GO_IMPORT}" -do_install_append() { +do_install:append() { # remove precompiled x86 binary rm -r ${D}${libdir}/go/src/${GO_IMPORT}/bin } diff --git a/recipes-support/nwg-shell/nwg-dock_git.bb b/recipes-support/nwg-shell/nwg-dock_git.bb index 4b27626..62ed16a 100644 --- a/recipes-support/nwg-shell/nwg-dock_git.bb +++ b/recipes-support/nwg-shell/nwg-dock_git.bb @@ -18,7 +18,7 @@ inherit go go-mod GO_INSTALL = "${GO_IMPORT}" -do_install_append() { +do_install:append() { # remove precompiled x86 binary rm -r ${D}${libdir}/go/src/${GO_IMPORT}/bin } diff --git a/recipes-support/nwg-shell/nwg-drawer_git.bb b/recipes-support/nwg-shell/nwg-drawer_git.bb index 06cb6de..923112b 100644 --- a/recipes-support/nwg-shell/nwg-drawer_git.bb +++ b/recipes-support/nwg-shell/nwg-drawer_git.bb @@ -7,7 +7,7 @@ DEPENDS = " \ gtk-layer-shell \ " -RRECOMMENDS_${PN} = " \ +RRECOMMENDS:${PN} = " \ thunar \ foot \ " @@ -23,7 +23,7 @@ inherit go go-mod GO_INSTALL = "${GO_IMPORT}" -do_install_append() { +do_install:append() { # remove precompiled x86 binary rm -r ${D}${libdir}/go/src/${GO_IMPORT}/bin } diff --git a/recipes-support/nwg-shell/nwg-menu_git.bb b/recipes-support/nwg-shell/nwg-menu_git.bb index 3774fd1..ac0f619 100644 --- a/recipes-support/nwg-shell/nwg-menu_git.bb +++ b/recipes-support/nwg-shell/nwg-menu_git.bb @@ -9,7 +9,7 @@ DEPENDS = " \ gtk-layer-shell \ " -RRECOMMENDS_${PN} = " \ +RRECOMMENDS:${PN} = " \ thunar \ foot \ " @@ -25,7 +25,7 @@ inherit go go-mod GO_INSTALL = "${GO_IMPORT}" -do_install_append() { +do_install:append() { # remove precompiled x86 binary rm -r ${D}${libdir}/go/src/${GO_IMPORT}/bin } diff --git a/recipes-support/nwg-shell/nwg-panel_git.bb b/recipes-support/nwg-shell/nwg-panel_git.bb index 27fb42a..41205ae 100644 --- a/recipes-support/nwg-shell/nwg-panel_git.bb +++ b/recipes-support/nwg-shell/nwg-panel_git.bb @@ -6,7 +6,7 @@ SRC_URI = " \ git://github.com/nwg-piotr/nwg-panel.git;protocol=https \ " -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ light \ python3 \ python3-pygobject \ @@ -20,5 +20,5 @@ S = "${WORKDIR}/git" PV = "0.3.3" SRCREV = "v${PV}" -INSANE_SKIP_${PN} = "file-rdeps" +INSANE_SKIP:${PN} = "file-rdeps" diff --git a/recipes-support/nwg-shell/nwg-wrapper_git.bb b/recipes-support/nwg-shell/nwg-wrapper_git.bb index 11bc4bc..e175a66 100644 --- a/recipes-support/nwg-shell/nwg-wrapper_git.bb +++ b/recipes-support/nwg-shell/nwg-wrapper_git.bb @@ -7,7 +7,7 @@ SRC_URI = " \ " DEPENDS = "python3" -RDEPENDS_${PN} = "python3-pygobject" +RDEPENDS:${PN} = "python3-pygobject" inherit setuptools3 gobject-introspection diff --git a/recipes-support/swayidle/swayidle_git.bb b/recipes-support/swayidle/swayidle_git.bb index 6c06870..18e7075 100644 --- a/recipes-support/swayidle/swayidle_git.bb +++ b/recipes-support/swayidle/swayidle_git.bb @@ -33,7 +33,7 @@ PACKAGECONFIG ?= " \ ${@bb.utils.filter('DISTRO_FEATURES', 'sysvinit', d)} \ " -FILES_${PN} += "${datadir}" +FILES:${PN} += "${datadir}" EXTRA_OEMESON += "--buildtype release" diff --git a/recipes-support/swaylock/swaylock_git.bb b/recipes-support/swaylock/swaylock_git.bb index 7555297..843f193 100644 --- a/recipes-support/swaylock/swaylock_git.bb +++ b/recipes-support/swaylock/swaylock_git.bb @@ -37,7 +37,7 @@ inherit meson pkgconfig features_check EXTRA_OEMESON += "--buildtype release" -FILES_${PN} += "${datadir}" +FILES:${PN} += "${datadir}" BBCLASSEXTEND = "" diff --git a/recipes-support/waybar/waybar_git.bb b/recipes-support/waybar/waybar_git.bb index 294ffc2..4d79a28 100644 --- a/recipes-support/waybar/waybar_git.bb +++ b/recipes-support/waybar/waybar_git.bb @@ -44,7 +44,7 @@ PACKAGECONFIG ?= " \ date \ " -RRECOMMENDS_${PN} += " \ +RRECOMMENDS:${PN} += " \ font-awesome-otf \ " @@ -58,7 +58,7 @@ inherit meson pkgconfig features_check PACKAGES += "${PN}-systemd" -FILES_${PN}-systemd += "${libdir}/systemd" +FILES:${PN}-systemd += "${libdir}/systemd" BBCLASSEXTEND = "" diff --git a/recipes-support/wf-recorder/wf-recorder_git.bb b/recipes-support/wf-recorder/wf-recorder_git.bb index afee3b0..0682076 100644 --- a/recipes-support/wf-recorder/wf-recorder_git.bb +++ b/recipes-support/wf-recorder/wf-recorder_git.bb @@ -28,7 +28,7 @@ inherit meson pkgconfig features_check EXTRA_OEMESON += "--buildtype release" GIR_EXTRA_LIBS_PATH="${WORKDIR}" -FILES_${PN} += "${prefix}" +FILES:${PN} += "${prefix}" BBCLASSEXTEND = "" diff --git a/recipes-support/wl-clipboard/wl-clipboard_git.bb b/recipes-support/wl-clipboard/wl-clipboard_git.bb index aac5e1f..59ab44e 100644 --- a/recipes-support/wl-clipboard/wl-clipboard_git.bb +++ b/recipes-support/wl-clipboard/wl-clipboard_git.bb @@ -25,7 +25,7 @@ inherit meson pkgconfig features_check EXTRA_OEMESON += "--buildtype release" -FILES_${PN} += "${datadir}" +FILES:${PN} += "${datadir}" BBCLASSEXTEND = "" diff --git a/recipes-support/yambar/yambar_git.bb b/recipes-support/yambar/yambar_git.bb index 0a075c1..1011ffd 100644 --- a/recipes-support/yambar/yambar_git.bb +++ b/recipes-support/yambar/yambar_git.bb @@ -21,7 +21,7 @@ DEPENDS = " \ scdoc-native \ " -RRECOMMENDS_${PN} += " \ +RRECOMMENDS:${PN} += " \ font-awesome-otf \ " @@ -45,7 +45,7 @@ PACKAGECONFIG ?= " \ EXTRA_OEMESON += "--buildtype release" PACKAGES += "${PN}-zsh-completion" -FILES_${PN}-zsh-completion = "${datadir}/zsh" +FILES:${PN}-zsh-completion = "${datadir}/zsh" BBCLASSEXTEND = "" diff --git a/recipes-wlroots/sway/sway_git.bb b/recipes-wlroots/sway/sway_git.bb index 03c28ab..afab5be 100644 --- a/recipes-wlroots/sway/sway_git.bb +++ b/recipes-wlroots/sway/sway_git.bb @@ -26,9 +26,9 @@ DEPENDS += " \ wayland-protocols \ " # sways default config makes use of it -RDEPENDS_${PN} ?= "swaybg" +RDEPENDS:${PN} ?= "swaybg" -RRECOMMENDS_${PN} ?= " \ +RRECOMMENDS:${PN} ?= " \ foot \ jq \ grim \ @@ -62,11 +62,11 @@ PACKAGECONFIG ?= " \ EXTRA_OEMESON += "--buildtype release" -do_install_append() { +do_install:append() { install -m 755 ${S}/contrib/grimshot ${D}${bindir} } -FILES_${PN}_append = " \ +FILES:${PN}:append = " \ ${datadir} \ " diff --git a/recipes-wlroots/wayfire/wayfire_git.bb b/recipes-wlroots/wayfire/wayfire_git.bb index ff888ac..4bbd166 100644 --- a/recipes-wlroots/wayfire/wayfire_git.bb +++ b/recipes-wlroots/wayfire/wayfire_git.bb @@ -27,7 +27,7 @@ DEPENDS += " \ wayland-protocols \ " -RRECOMMENDS_${PN} += " \ +RRECOMMENDS:${PN} += " \ wlroots \ wcm \ wf-config \ diff --git a/recipes-wlroots/wayfire/wcm_0.7.0.bb b/recipes-wlroots/wayfire/wcm_0.7.0.bb index f37d429..78c4bd4 100644 --- a/recipes-wlroots/wayfire/wcm_0.7.0.bb +++ b/recipes-wlroots/wayfire/wcm_0.7.0.bb @@ -25,7 +25,7 @@ inherit meson pkgconfig features_check EXTRA_OEMESON += "--buildtype release" -FILES_${PN} += "${prefix}" +FILES:${PN} += "${prefix}" BBCLASSEXTEND = "" diff --git a/recipes-wlroots/wayfire/wf-shell_0.7.0.bb b/recipes-wlroots/wayfire/wf-shell_0.7.0.bb index ce8840f..bc2ced0 100644 --- a/recipes-wlroots/wayfire/wf-shell_0.7.0.bb +++ b/recipes-wlroots/wayfire/wf-shell_0.7.0.bb @@ -17,7 +17,7 @@ DEPENDS = " \ libnotify3 \ " -DEPENDS_append_class-target = " gobject-introspection-native qemu-native prelink-native" +DEPENDS:append:class-target = " gobject-introspection-native qemu-native prelink-native" REQUIRED_DISTRO_FEATURES = "wayland gobject-introspection-data" @@ -33,7 +33,7 @@ inherit meson pkgconfig features_check EXTRA_OEMESON += "--buildtype release" -FILES_${PN} += "${prefix}" +FILES:${PN} += "${prefix}" BBCLASSEXTEND = "" diff --git a/recipes-wlroots/wlroots/wlroots_git.bb b/recipes-wlroots/wlroots/wlroots_git.bb index 6c2bc42..46ee734 100644 --- a/recipes-wlroots/wlroots/wlroots_git.bb +++ b/recipes-wlroots/wlroots/wlroots_git.bb @@ -41,11 +41,11 @@ inherit meson pkgconfig features_check EXTRA_OEMESON += "--buildtype release" -FILES_${PN} = "${bindir} \ +FILES:${PN} = "${bindir} \ ${libdir} \ " -FILES_${PN}-dev = "${includedir} \ +FILES:${PN}-dev = "${includedir} \ ${libdir}/libwlroots.so \ "