Fix avahi x11 dependency with non-GPLv3 Build
v2 cover Fix avahi x11 dependency with non-GPLv3 Build
This version removes the DISTRO_FEATURE check for x11 and simply removes the DEPENDS on gtk and sets --disable-gtk to EXTRA_OECONF.
If someone uses/needs the avahi-ui bits, they are available in the OE repo, we would consider taking them into oe-core if there is a clear need for it.
Sau!
The following changes since commit 81274f4488fbc4d68d150870735ec0181b60b451:
freetype: disable bzip2 compressed font support (2011-09-19 13:14:03 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib sgw/oe-fix
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=sgw/oe-fix
Saul Wold (1):
avahi: remove avahi-ui related packages
meta/recipes-connectivity/avahi/avahi.inc | 19 +++++++------------ 1 files changed, 7 insertions(+), 12 deletions(-)
Signature · 1 line
1.7.6
PATCH v2 1/1 avahi: remove avahi-ui related packages
[YOCTO #1492]
This patch removes the UI related packages from avahi. This allows the package to be built without gtk and GPLv3 issues.
--- meta/recipes-connectivity/avahi/avahi.inc | 19 +++++++------------ 1 files changed, 7 insertions(+), 12 deletions(-)
meta/recipes-connectivity/avahi/avahi.inc +7 -12
@@ -14,8 +14,9 @@ SECTION = "network" # python scripts are under GPLv2+ LICENSE = "GPLv2+ & LGPLv2.1+" -X11DEPENDS = "gtk+ libglade" -DEPENDS = "expat libcap libdaemon dbus glib-2.0 ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}" +INC_PR = "r6" + +DEPENDS = "expat libcap libdaemon dbus glib-2.0" SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \ file://00avahi-autoipd \
@@ -30,8 +31,8 @@ EXTRA_OECONF = "--with-distro=debian \ --disable-gdbm \ --disable-mono \ --disable-monodoc \ + --disable-gtk \ --disable-gtk3 \ - ${@base_contains('DISTRO_FEATURES', 'x11', '--enable-gtk', '--disable-gtk', d)} \ --disable-qt3 \ --disable-qt4 \ --disable-python \
@@ -39,7 +40,7 @@ EXTRA_OECONF = "--with-distro=debian \ --with-systemdsystemunitdir=${base_libdir}/systemd/system/ \ " -PACKAGES =+ "avahi-systemd avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-gobject avahi-autoipd avahi-ui-utils avahi-utils libavahi-ui libavahi-ui-dev" +PACKAGES =+ "avahi-systemd avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-gobject libavahi-ui avahi-autoipd avahi-utils" FILES_avahi-systemd = "${base_libdir}/systemd" RDEPENDS_avahi-systemd = "avahi-daemon"
@@ -73,10 +74,6 @@ FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \ ${sysconfdir}/dhcp3/*/avahi-autoipd" FILES_libavahi-common = "${libdir}/libavahi-common.so.*" FILES_libavahi-core = "${libdir}/libavahi-core.so.*" -FILES_libavahi-ui = "${libdir}/libavahi-ui.so.*" -FILES_libavahi-ui-dev = "${libdir}/libavahi-ui.* \ - ${includedir}/avahi-ui/* \ - ${libdir}/pkgconfig/avahi-ui.pc" FILES_avahi-daemon = "${sbindir}/avahi-daemon \ ${sysconfdir}/avahi/avahi-daemon.conf \ ${sysconfdir}/avahi/hosts \
@@ -88,16 +85,13 @@ FILES_avahi-daemon = "${sbindir}/avahi-daemon \ ${datadir}/avahi/service-types \ ${datadir}/dbus-1/system-services" FILES_libavahi-client = "${libdir}/libavahi-client.so.*" +FILES_libavahi-ui = "${libdir}/libavahi-ui.so.*" FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \ ${sysconfdir}/avahi/avahi-dnsconfd.action \ ${sysconfdir}/init.d/avahi-dnsconfd" FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*" FILES_libavahi-gobject = "${libdir}/libavahi-gobject.so.*" FILES_avahi-utils = "${bindir}/avahi-*" -FILES_avahi-ui-utils = "${bindir}/bssh ${bindir}/bvnc ${bindir}/bshell \ - ${bindir}/avahi-discover-standalone \ - ${datadir}/applications \ - ${datadir}/avahi/interfaces" RRECOMMENDS_avahi-dev = "expat-dev libcap-dev libdaemon-dev dbus-dev glib-2.0-dev update-rc.d-dev" RRECOMMENDS_avahi-dev_append_libc-glibc = " gettext-dev"
@@ -119,6 +113,7 @@ do_install() { # /var/run of current version is empty, so just remove it. # if /var/run become non-empty in the future, need to install it via volatile rm -rf ${D}/var/run + rm -rf ${D}${datadir}/dbus-1/interfaces } # At the time the postinst runs, dbus might not be setup so only restart if running
Signature · 1 line
1.7.6
Op 20 sep. 2011, om 20:26 heeft Saul Wold het volgende geschreven:
Quoted 6 lines
This version removes the
DISTRO_FEATUREcheck for x11 and simply removes the DEPENDS on gtk and sets --disable-gtk toEXTRA_OECONF.If someone uses/needs the avahi-ui bits, they are available in the OE repo, we would consider taking them into oe-core if there is a clear need for it.
Can't you just port over the OE classic recipe instead of this half-baked patch?