diff --git a/conf/layer.conf b/conf/layer.conf index 1c7f101..249651a 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -7,10 +7,6 @@ BBFILES += "${LAYERDIR}/recipes-*/*.bb ${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/ BBFILES += "${LAYERDIR}/appends/*/*.bbappend" -BBFILES_DYNAMIC += "\ - rust-layer:${LAYERDIR}/dynamic-layers/meta-rust/*.bb \ -" - BBFILE_COLLECTIONS += "meta-musicians" BBFILE_PATTERN_meta-musicians := "^${LAYERDIR}/" BBFILE_PRIORITY_meta-musicians = "20" diff --git a/dynamic-layers/meta-rust/spotify-qt.bb b/recipes-streaming/spotify/spotify-qt.bb similarity index 100% rename from dynamic-layers/meta-rust/spotify-qt.bb rename to recipes-streaming/spotify/spotify-qt.bb diff --git a/dynamic-layers/meta-rust/spotifyd.bb b/recipes-streaming/spotify/spotifyd.bb similarity index 99% rename from dynamic-layers/meta-rust/spotifyd.bb rename to recipes-streaming/spotify/spotifyd.bb index 1ecbead..e461b8a 100644 --- a/dynamic-layers/meta-rust/spotifyd.bb +++ b/recipes-streaming/spotify/spotifyd.bb @@ -3,11 +3,6 @@ HOMEPAGE = "https://github.com/Spotifyd/spotifyd" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d" -python() { - if 'rust-layer' not in d.getVar('BBFILE_COLLECTIONS').split(): - raise bb.parse.SkipRecipe('Requires meta-rust to be present.') -} - DEPENDS = " \ alsa-lib \ libogg \ diff --git a/recipes-support/packagegroups/musicians-world.bb b/recipes-support/packagegroups/musicians-world.bb index ad4cf9b..740ed18 100644 --- a/recipes-support/packagegroups/musicians-world.bb +++ b/recipes-support/packagegroups/musicians-world.bb @@ -194,7 +194,7 @@ RDEPENDS:${PN} += " \ ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "zyn-fusion-dssi zyn-fusion-lv2 zyn-fusion-vst zyn-fusion-standalone", "zynaddsubfx-dssi zynaddsubfx-lv2 zynaddsubfx-vst zynaddsubfx-standalone",d)} \ \ \ - ${@bb.utils.contains('BBFILE_COLLECTIONS', 'rust-layer', 'spotifyd spotify-qt', '', d)} \ + spotifyd spotify-qt \ "