diff --git a/meta-digi-dey/recipes-support/freerdp/freerdp_%.bbappend b/meta-digi-dey/recipes-support/freerdp/freerdp_%.bbappend new file mode 100644 index 000000000..0fa3b2011 --- /dev/null +++ b/meta-digi-dey/recipes-support/freerdp/freerdp_%.bbappend @@ -0,0 +1,5 @@ +# Copyright (C) 2022 Digi International. + +# In sysvinit builds, cups pulls in procps as a dependency, which causes +# conflicts when building the SDK, so remove it +PACKAGECONFIG:remove = "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'cups', '', d)}" diff --git a/meta-digi-dey/recipes-support/freerdp/freerdp_2.3.0.bbappend b/meta-digi-dey/recipes-support/freerdp/freerdp_2.3.0.bbappend deleted file mode 100644 index 0a9f58b44..000000000 --- a/meta-digi-dey/recipes-support/freerdp/freerdp_2.3.0.bbappend +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright (C) 2022 Digi International. - -# In sysvinit builds, cups pulls in procps as a dependency, which causes -# conflicts when building the SDK, so remove it -PACKAGECONFIG:remove = "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'cups', '', d)}" - -# cups pulls in libusb1 as a dependency, but libusb1 is also needed implicitly -# by a different freerdp component. Removing cups from PACKAGECONFIG will -# remove this dependency and cause the build to fail, so we need make the -# dependency explicit in this scenario. -DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'libusb1', '', d)}"