summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/avahi/avahi.inc5
-rw-r--r--meta/recipes-connectivity/avahi/files/fix_for_automake_1.11.2.patch44
2 files changed, 47 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index deebbd6bb3..3cee1a4978 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -14,14 +14,15 @@ SECTION = "network"
14# python scripts are under GPLv2+ 14# python scripts are under GPLv2+
15LICENSE = "GPLv2+ & LGPLv2.1+" 15LICENSE = "GPLv2+ & LGPLv2.1+"
16 16
17INC_PR = "r10" 17INC_PR = "r11"
18 18
19DEPENDS = "expat libcap libdaemon dbus glib-2.0" 19DEPENDS = "expat libcap libdaemon dbus glib-2.0"
20 20
21SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \ 21SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \
22 file://00avahi-autoipd \ 22 file://00avahi-autoipd \
23 file://99avahi-autoipd \ 23 file://99avahi-autoipd \
24 file://initscript.patch" 24 file://initscript.patch \
25 file://fix_for_automake_1.11.2.patch"
25 26
26USERADD_PACKAGES = "avahi-daemon" 27USERADD_PACKAGES = "avahi-daemon"
27USERADD_PARAM_avahi-daemon = "--system --home /var/run/avahi-daemon \ 28USERADD_PARAM_avahi-daemon = "--system --home /var/run/avahi-daemon \
diff --git a/meta/recipes-connectivity/avahi/files/fix_for_automake_1.11.2.patch b/meta/recipes-connectivity/avahi/files/fix_for_automake_1.11.2.patch
new file mode 100644
index 0000000000..e7a1908a63
--- /dev/null
+++ b/meta/recipes-connectivity/avahi/files/fix_for_automake_1.11.2.patch
@@ -0,0 +1,44 @@
1Upstream-Status: Pending
2
3automake version 1.11.2 has made use of dir variables more strict.
4the use of pkglibdir with DATA var results in automake errors.
5 This commits uses pkgdatadir var instead of pkglibdir to avoid
6the strict check errors.
7
8Fixes this error:
9service-type-database/Makefile.am:21: `pkglibdir' is not a legitimate directory for `DATA'
10autoreconf: automake failed with exit status: 1
11ERROR: autoreconf execution failed.
12
13Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
142011/12/28
15
16
17Index: avahi-0.6.30/service-type-database/Makefile.am
18===================================================================
19--- avahi-0.6.30.orig/service-type-database/Makefile.am
20+++ avahi-0.6.30/service-type-database/Makefile.am
21@@ -18,13 +18,12 @@
22 EXTRA_DIST=build-db.in service-types
23
24 pkgdata_DATA=service-types
25-pkglib_DATA=
26
27 if HAVE_PYTHON
28 if HAVE_GDBM
29
30 noinst_SCRIPTS=build-db
31-pkglib_DATA+=service-types.db
32+pkgdata_DATA+=service-types.db
33
34 build-db: build-db.in
35 $(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \
36@@ -41,7 +40,7 @@ endif
37 if HAVE_DBM
38
39 noinst_SCRIPTS=build-db
40-pkglib_DATA+=service-types.db.pag service-types.db.dir
41+pkgdata_DATA+=service-types.db.pag service-types.db.dir
42
43 build-db: build-db.in
44 $(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \