* [PATCH 0/1 v3] Fix avahi x11 dependency with non-GPLv3 Build
@ 2011-09-20 20:53 Saul Wold
2011-09-20 20:53 ` [PATCH 1/1] avahi: remove avahi-ui related packages Saul Wold
2011-09-20 21:01 ` [PATCH 0/1 v3] Fix avahi x11 dependency with non-GPLv3 Build Saul Wold
0 siblings, 2 replies; 3+ messages in thread
From: Saul Wold @ 2011-09-20 20:53 UTC (permalink / raw)
To: openembedded-core
Richard,
Koen was right, it was a little half baked, I forgot to commit
the avahi_0.6.30.bb file with the PR set up correctly.
Otherwise, at this point, read my last comment, if someone has a
need for the avahi-ui bits, then they can request that the be add
back into OE-core, at this point we don't beleive anyone is using
them.
As this is targeted for the RC3 build, I do not want to take in more
change than necessary.
Thanks
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 +++++++------------
meta/recipes-connectivity/avahi/avahi_0.6.30.bb | 2 +-
2 files changed, 8 insertions(+), 13 deletions(-)
--
1.7.6
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 1/1] avahi: remove avahi-ui related packages
2011-09-20 20:53 [PATCH 0/1 v3] Fix avahi x11 dependency with non-GPLv3 Build Saul Wold
@ 2011-09-20 20:53 ` Saul Wold
2011-09-20 21:01 ` [PATCH 0/1 v3] Fix avahi x11 dependency with non-GPLv3 Build Saul Wold
1 sibling, 0 replies; 3+ messages in thread
From: Saul Wold @ 2011-09-20 20:53 UTC (permalink / raw)
To: openembedded-core
[YOCTO #1492]
This patch removes the UI related packages from avahi. This
allows the package to be built without gtk and GPLv3 issues.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-connectivity/avahi/avahi.inc | 19 +++++++------------
meta/recipes-connectivity/avahi/avahi_0.6.30.bb | 2 +-
2 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index 24ea458..025805a 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -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
diff --git a/meta/recipes-connectivity/avahi/avahi_0.6.30.bb b/meta/recipes-connectivity/avahi/avahi_0.6.30.bb
index 05716d0..5094961 100644
--- a/meta/recipes-connectivity/avahi/avahi_0.6.30.bb
+++ b/meta/recipes-connectivity/avahi/avahi_0.6.30.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
file://avahi-daemon/main.c;endline=21;md5=9ee77368c5407af77caaef1b07285969 \
file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf"
-PR = "r4"
+PR = "${INC_PR}.0"
SRC_URI[md5sum] = "e4db89a2a403ff4c47d66ac66fad1f43"
SRC_URI[sha256sum] = "f9e4316c2339d0020726edd846d01bee0c39980906db0c247479e5807457ff1f"
--
1.7.6
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 0/1 v3] Fix avahi x11 dependency with non-GPLv3 Build
2011-09-20 20:53 [PATCH 0/1 v3] Fix avahi x11 dependency with non-GPLv3 Build Saul Wold
2011-09-20 20:53 ` [PATCH 1/1] avahi: remove avahi-ui related packages Saul Wold
@ 2011-09-20 21:01 ` Saul Wold
1 sibling, 0 replies; 3+ messages in thread
From: Saul Wold @ 2011-09-20 21:01 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On 09/20/2011 01:53 PM, Saul Wold wrote:
> Richard,
>
> Koen was right, it was a little half baked, I forgot to commit
> the avahi_0.6.30.bb file with the PR set up correctly.
>
> Otherwise, at this point, read my last comment, if someone has a
> need for the avahi-ui bits, then they can request that the be add
> back into OE-core, at this point we don't beleive anyone is using
> them.
Time to insert foot in mouth!
Turns out I don't know our own system that well, as oprofileui uses
avahi-ui bits.
I guess I will try to pull the OE bits in, I started to look at earlier.
Sau!
>
> As this is targeted for the RC3 build, I do not want to take in more
> change than necessary.
>
> Thanks
> 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 +++++++------------
> meta/recipes-connectivity/avahi/avahi_0.6.30.bb | 2 +-
> 2 files changed, 8 insertions(+), 13 deletions(-)
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-09-20 21:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-20 20:53 [PATCH 0/1 v3] Fix avahi x11 dependency with non-GPLv3 Build Saul Wold
2011-09-20 20:53 ` [PATCH 1/1] avahi: remove avahi-ui related packages Saul Wold
2011-09-20 21:01 ` [PATCH 0/1 v3] Fix avahi x11 dependency with non-GPLv3 Build Saul Wold
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.