Message ID | 45321e8446f7e16a4c1d5f4a9b827c5d2e75bdc3.1552849786.git.baruch@tkos.co.il |
---|---|
State | Accepted |
Headers | show |
Series | [v2] package/libpcap: fix bluez circular dependency | expand |
On Sun, 17 Mar 2019 21:09:46 +0200 Baruch Siach <baruch@tkos.co.il> wrote: > The optional bluez_utils dependency of libpcap creates a circular > dependency: > > $ make dbus-show-recursive-depends > > Recursion detected for : systemd > which is a dependency of: dbus > which is a dependency of: bluez_utils > which is a dependency of: libpcap > which is a dependency of: iptables > which is a dependency of: systemd > make: *** [package/dbus/dbus.mk:121: dbus-show-recursive-depends] Error 1 > > Drop support for bluez_utils. For bluez5_utils, which also depends on > dbus, we only need the headers in the bluez5_utils-headers package. Use > that to break the circular dependency. > > Fixes: > http://autobuild.buildroot.net/results/9c3/9c3ee798fa6bb501a20a7892c0b085d2b279b664/ > > Suggested-by: Yann E. MORIN <yann.morin.1998@free.fr> > Signed-off-by: Baruch Siach <baruch@tkos.co.il> > --- > v2: keep bluez5_utils, and use bluez5_utils-headers (Yann) > --- > package/libpcap/libpcap.mk | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas
>>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes: > The optional bluez_utils dependency of libpcap creates a circular > dependency: > $ make dbus-show-recursive-depends > Recursion detected for : systemd > which is a dependency of: dbus > which is a dependency of: bluez_utils > which is a dependency of: libpcap > which is a dependency of: iptables > which is a dependency of: systemd > make: *** [package/dbus/dbus.mk:121: dbus-show-recursive-depends] Error 1 > Drop support for bluez_utils. For bluez5_utils, which also depends on > dbus, we only need the headers in the bluez5_utils-headers package. Use > that to break the circular dependency. > Fixes: > http://autobuild.buildroot.net/results/9c3/9c3ee798fa6bb501a20a7892c0b085d2b279b664/ > Suggested-by: Yann E. MORIN <yann.morin.1998@free.fr> > Signed-off-by: Baruch Siach <baruch@tkos.co.il> > --- > v2: keep bluez5_utils, and use bluez5_utils-headers (Yann) Committed to 2019.02.x, thanks.
diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk index 83188c8c4847..2f46426d3756 100644 --- a/package/libpcap/libpcap.mk +++ b/package/libpcap/libpcap.mk @@ -26,10 +26,8 @@ define LIBPCAP_CONFIG_REMOVE_RPATH endef LIBPCAP_POST_BUILD_HOOKS = LIBPCAP_CONFIG_REMOVE_RPATH -ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y) -LIBPCAP_DEPENDENCIES += bluez_utils -else ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS),y) -LIBPCAP_DEPENDENCIES += bluez5_utils +ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS),y) +LIBPCAP_DEPENDENCIES += bluez5_utils-headers else LIBPCAP_CONF_OPTS += --disable-bluetooth endif
The optional bluez_utils dependency of libpcap creates a circular dependency: $ make dbus-show-recursive-depends Recursion detected for : systemd which is a dependency of: dbus which is a dependency of: bluez_utils which is a dependency of: libpcap which is a dependency of: iptables which is a dependency of: systemd make: *** [package/dbus/dbus.mk:121: dbus-show-recursive-depends] Error 1 Drop support for bluez_utils. For bluez5_utils, which also depends on dbus, we only need the headers in the bluez5_utils-headers package. Use that to break the circular dependency. Fixes: http://autobuild.buildroot.net/results/9c3/9c3ee798fa6bb501a20a7892c0b085d2b279b664/ Suggested-by: Yann E. MORIN <yann.morin.1998@free.fr> Signed-off-by: Baruch Siach <baruch@tkos.co.il> --- v2: keep bluez5_utils, and use bluez5_utils-headers (Yann) --- package/libpcap/libpcap.mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)