* [PATCH 1/9] tar: fix build
2012-05-23 0:05 [PATCH 0/9] fixes for misc issue discovered by automake 1.12 nitin.a.kamble
@ 2012-05-23 0:05 ` nitin.a.kamble
2012-05-23 10:44 ` Gary Thomas
2012-05-23 0:05 ` [PATCH 2/9] libgcrypt: " nitin.a.kamble
` (7 subsequent siblings)
8 siblings, 1 reply; 14+ messages in thread
From: nitin.a.kamble @ 2012-05-23 0:05 UTC (permalink / raw)
To: openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
Avoid this error:
| rmdir: failed to remove `/srv/home/nitin/builds/build-gcc47/tmp/work/i586-poky-linux/tar-1.26-r1/image/usr/sbin/': No such file or directory
NOTE: package tar-1.26-r1: task do_install: Failed
no PR bump as no change in the output.
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
meta/recipes-extended/tar/tar.inc | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-extended/tar/tar.inc b/meta/recipes-extended/tar/tar.inc
index 0533b82..5c2325a 100644
--- a/meta/recipes-extended/tar/tar.inc
+++ b/meta/recipes-extended/tar/tar.inc
@@ -18,8 +18,12 @@ do_install () {
do_install_extra () {
install -d ${D}${base_bindir}
mv ${D}${bindir}/tar ${D}${base_bindir}/tar.${PN}
- rmdir ${D}${bindir}/
- rmdir ${D}${sbindir}/
+ if [ -d ${D}${bindir}/ ] ; then
+ rmdir ${D}${bindir}/
+ fi
+ if [ -d ${D}${sbindir}/ ] ; then
+ rmdir ${D}${sbindir}/
+ fi
mv ${D}${libexecdir}/rmt ${D}${libexecdir}/rmt.${PN}
}
--
1.7.7
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH 1/9] tar: fix build
2012-05-23 0:05 ` [PATCH 1/9] tar: fix build nitin.a.kamble
@ 2012-05-23 10:44 ` Gary Thomas
2012-05-23 13:48 ` Richard Purdie
0 siblings, 1 reply; 14+ messages in thread
From: Gary Thomas @ 2012-05-23 10:44 UTC (permalink / raw)
To: openembedded-core
On 2012-05-22 18:05, nitin.a.kamble@intel.com wrote:
> From: Nitin A Kamble<nitin.a.kamble@intel.com>
>
> Avoid this error:
> | rmdir: failed to remove `/srv/home/nitin/builds/build-gcc47/tmp/work/i586-poky-linux/tar-1.26-r1/image/usr/sbin/': No such file or directory
> NOTE: package tar-1.26-r1: task do_install: Failed
>
> no PR bump as no change in the output.
>
> Signed-off-by: Nitin A Kamble<nitin.a.kamble@intel.com>
> ---
> meta/recipes-extended/tar/tar.inc | 8 ++++++--
> 1 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-extended/tar/tar.inc b/meta/recipes-extended/tar/tar.inc
> index 0533b82..5c2325a 100644
> --- a/meta/recipes-extended/tar/tar.inc
> +++ b/meta/recipes-extended/tar/tar.inc
> @@ -18,8 +18,12 @@ do_install () {
> do_install_extra () {
> install -d ${D}${base_bindir}
> mv ${D}${bindir}/tar ${D}${base_bindir}/tar.${PN}
> - rmdir ${D}${bindir}/
> - rmdir ${D}${sbindir}/
> + if [ -d ${D}${bindir}/ ] ; then
> + rmdir ${D}${bindir}/
> + fi
> + if [ -d ${D}${sbindir}/ ] ; then
> + rmdir ${D}${sbindir}/
> + fi
> mv ${D}${libexecdir}/rmt ${D}${libexecdir}/rmt.${PN}
> }
>
Why not just use
rm -fr ${D}${bindir}
etc? No need for all the extra testing...
--
------------------------------------------------------------
Gary Thomas | Consulting for the
MLB Associates | Embedded world
------------------------------------------------------------
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH 1/9] tar: fix build
2012-05-23 10:44 ` Gary Thomas
@ 2012-05-23 13:48 ` Richard Purdie
2012-05-23 22:08 ` Kamble, Nitin A
0 siblings, 1 reply; 14+ messages in thread
From: Richard Purdie @ 2012-05-23 13:48 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Wed, 2012-05-23 at 04:44 -0600, Gary Thomas wrote:
> On 2012-05-22 18:05, nitin.a.kamble@intel.com wrote:
> > From: Nitin A Kamble<nitin.a.kamble@intel.com>
> >
> > Avoid this error:
> > | rmdir: failed to remove `/srv/home/nitin/builds/build-gcc47/tmp/work/i586-poky-linux/tar-1.26-r1/image/usr/sbin/': No such file or directory
> > NOTE: package tar-1.26-r1: task do_install: Failed
> >
> > no PR bump as no change in the output.
> >
> > Signed-off-by: Nitin A Kamble<nitin.a.kamble@intel.com>
> > ---
> > meta/recipes-extended/tar/tar.inc | 8 ++++++--
> > 1 files changed, 6 insertions(+), 2 deletions(-)
> >
> > diff --git a/meta/recipes-extended/tar/tar.inc b/meta/recipes-extended/tar/tar.inc
> > index 0533b82..5c2325a 100644
> > --- a/meta/recipes-extended/tar/tar.inc
> > +++ b/meta/recipes-extended/tar/tar.inc
> > @@ -18,8 +18,12 @@ do_install () {
> > do_install_extra () {
> > install -d ${D}${base_bindir}
> > mv ${D}${bindir}/tar ${D}${base_bindir}/tar.${PN}
> > - rmdir ${D}${bindir}/
> > - rmdir ${D}${sbindir}/
> > + if [ -d ${D}${bindir}/ ] ; then
> > + rmdir ${D}${bindir}/
> > + fi
> > + if [ -d ${D}${sbindir}/ ] ; then
> > + rmdir ${D}${sbindir}/
> > + fi
> > mv ${D}${libexecdir}/rmt ${D}${libexecdir}/rmt.${PN}
> > }
> >
>
> Why not just use
> rm -fr ${D}${bindir}
> etc? No need for all the extra testing...
I've mentioned this once before however I'll do so again. I think these
empty directories were a bug in automake. It looks like automake has
fixed that problem and no longer generates them. I think the correct
thing to do is simply remove the rmdir.
The reason we used rmdir instead of rm is we wanted to know if these
suddenly started containing files, not silently delete them.
Cheers,
Richard
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH 1/9] tar: fix build
2012-05-23 13:48 ` Richard Purdie
@ 2012-05-23 22:08 ` Kamble, Nitin A
0 siblings, 0 replies; 14+ messages in thread
From: Kamble, Nitin A @ 2012-05-23 22:08 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
> -----Original Message-----
> From: openembedded-core-bounces@lists.openembedded.org
> [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of
> Richard Purdie
> Sent: Wednesday, May 23, 2012 6:48 AM
> To: Patches and discussions about the oe-core layer
> Subject: Re: [OE-core] [PATCH 1/9] tar: fix build
>
> On Wed, 2012-05-23 at 04:44 -0600, Gary Thomas wrote:
> > On 2012-05-22 18:05, nitin.a.kamble@intel.com wrote:
> > > From: Nitin A Kamble<nitin.a.kamble@intel.com>
> > >
> > > Avoid this error:
> > > | rmdir: failed to remove
> > > | `/srv/home/nitin/builds/build-gcc47/tmp/work/i586-poky-linux/tar-
> 1
> > > | .26-r1/image/usr/sbin/': No such file or directory
> > > NOTE: package tar-1.26-r1: task do_install: Failed
> > >
> > > no PR bump as no change in the output.
> > >
> > > Signed-off-by: Nitin A Kamble<nitin.a.kamble@intel.com>
> > > ---
> > > meta/recipes-extended/tar/tar.inc | 8 ++++++--
> > > 1 files changed, 6 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/meta/recipes-extended/tar/tar.inc
> > > b/meta/recipes-extended/tar/tar.inc
> > > index 0533b82..5c2325a 100644
> > > --- a/meta/recipes-extended/tar/tar.inc
> > > +++ b/meta/recipes-extended/tar/tar.inc
> > > @@ -18,8 +18,12 @@ do_install () {
> > > do_install_extra () {
> > > install -d ${D}${base_bindir}
> > > mv ${D}${bindir}/tar ${D}${base_bindir}/tar.${PN}
> > > - rmdir ${D}${bindir}/
> > > - rmdir ${D}${sbindir}/
> > > + if [ -d ${D}${bindir}/ ] ; then
> > > + rmdir ${D}${bindir}/
> > > + fi
> > > + if [ -d ${D}${sbindir}/ ] ; then
> > > + rmdir ${D}${sbindir}/
> > > + fi
> > > mv ${D}${libexecdir}/rmt ${D}${libexecdir}/rmt.${PN}
> > > }
> > >
> >
> > Why not just use
> > rm -fr ${D}${bindir}
> > etc? No need for all the extra testing...
>
> I've mentioned this once before however I'll do so again. I think these
> empty directories were a bug in automake. It looks like automake has
> fixed that problem and no longer generates them. I think the correct
> thing to do is simply remove the rmdir.
>
> The reason we used rmdir instead of rm is we wanted to know if these
> suddenly started containing files, not silently delete them.
>
> Cheers,
>
> Richard
>
Hi Richard,
I was trying to make the commits compatible with both automake 1.11 & automake 1.12. Now after discussions with Saul, I understand that these commits will go after automake 1.12 update goes in. In that case we can remove these rmdir statements.
Thanks,
Nitin
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 2/9] libgcrypt: fix build
2012-05-23 0:05 [PATCH 0/9] fixes for misc issue discovered by automake 1.12 nitin.a.kamble
2012-05-23 0:05 ` [PATCH 1/9] tar: fix build nitin.a.kamble
@ 2012-05-23 0:05 ` nitin.a.kamble
2012-05-23 0:05 ` [PATCH 3/9] gpgme: " nitin.a.kamble
` (6 subsequent siblings)
8 siblings, 0 replies; 14+ messages in thread
From: nitin.a.kamble @ 2012-05-23 0:05 UTC (permalink / raw)
To: openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
avoid this issue:
| rmdir: failed to remove `/srv/home/nitin/builds/build-gcc47/tmp/work/i586-poky-linux/libgcrypt-1.5.0-r0/image/usr/sbin': No such file or directory
NOTE: package libgcrypt-1.5.0-r0: task do_install: Failed
no PR bump as no change in the output
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
meta/recipes-support/libgcrypt/libgcrypt.inc | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-support/libgcrypt/libgcrypt.inc b/meta/recipes-support/libgcrypt/libgcrypt.inc
index a890188..012f36a 100644
--- a/meta/recipes-support/libgcrypt/libgcrypt.inc
+++ b/meta/recipes-support/libgcrypt/libgcrypt.inc
@@ -23,7 +23,9 @@ do_install_append() {
install -m 0644 ${S}/src/libgcrypt.pc ${D}/${libdir}/pkgconfig/
# Remove empty sbin directory since we don't build the daemon that would install there
- rmdir ${D}${sbindir}
+ if [ -d ${D}${sbindir} ] ; then
+ rmdir ${D}${sbindir}
+ fi
}
ARM_INSTRUCTION_SET = "arm"
--
1.7.7
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 3/9] gpgme: fix build
2012-05-23 0:05 [PATCH 0/9] fixes for misc issue discovered by automake 1.12 nitin.a.kamble
2012-05-23 0:05 ` [PATCH 1/9] tar: fix build nitin.a.kamble
2012-05-23 0:05 ` [PATCH 2/9] libgcrypt: " nitin.a.kamble
@ 2012-05-23 0:05 ` nitin.a.kamble
2012-05-23 0:05 ` [PATCH 4/9] telepathy-glib: " nitin.a.kamble
` (5 subsequent siblings)
8 siblings, 0 replies; 14+ messages in thread
From: nitin.a.kamble @ 2012-05-23 0:05 UTC (permalink / raw)
To: openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
avoid this issue:
| rmdir: failed to remove `/srv/home/nitin/builds/build-gcc47/tmp/wERROR: Function failed: do_install (see /srv/home/nitin/builds/build-gcc47/tmp/work/i586-poky-linux/gpgme-1.3.1-r1/temp/log.do_install.36763 for further information)
| ork/i586-poky-linux/gpgme-1.3.1-r1/image/usr/libexec': No such file or directory
NOTE: package gpgme-1.3.1-r1: task do_install: Failed
no PR bump as no change in the output
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
meta/recipes-support/gpgme/gpgme_1.3.1.bb | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-support/gpgme/gpgme_1.3.1.bb b/meta/recipes-support/gpgme/gpgme_1.3.1.bb
index 4bcb57a..88f6d28 100644
--- a/meta/recipes-support/gpgme/gpgme_1.3.1.bb
+++ b/meta/recipes-support/gpgme/gpgme_1.3.1.bb
@@ -28,5 +28,7 @@ FILES_${PN} = "${libdir}/libgpgme.so.*"
FILES_${PN}-dev += "${bindir}/gpgme-config ${datadir}/common-lisp/source/gpgme/*"
do_install_append() {
- rmdir ${D}/usr/libexec
+ if [ -d ${D}/usr/libexec ] ; then
+ rmdir ${D}/usr/libexec
+ fi
}
--
1.7.7
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 4/9] telepathy-glib: fix build
2012-05-23 0:05 [PATCH 0/9] fixes for misc issue discovered by automake 1.12 nitin.a.kamble
` (2 preceding siblings ...)
2012-05-23 0:05 ` [PATCH 3/9] gpgme: " nitin.a.kamble
@ 2012-05-23 0:05 ` nitin.a.kamble
2012-05-23 0:05 ` [PATCH 5/9] xf86-video-vmware: fix build issue nitin.a.kamble
` (4 subsequent siblings)
8 siblings, 0 replies; 14+ messages in thread
From: nitin.a.kamble @ 2012-05-23 0:05 UTC (permalink / raw)
To: openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
avoid this issue:
| rmdir: failed to remove `/srv/home/nitin/builds/build-gcc47/tmp/work/i586-poky-linux/telepathy-glib-0.18.1-r0/image/usr/bin': No such file or directory
NOTE: package telepathy-glib-0.18.1-r0: task do_install: Failed
no PR bump as no change in the output
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
.../telepathy/telepathy-glib_0.18.1.bb | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-connectivity/telepathy/telepathy-glib_0.18.1.bb b/meta/recipes-connectivity/telepathy/telepathy-glib_0.18.1.bb
index 81da5f8..296b978 100644
--- a/meta/recipes-connectivity/telepathy/telepathy-glib_0.18.1.bb
+++ b/meta/recipes-connectivity/telepathy/telepathy-glib_0.18.1.bb
@@ -18,7 +18,13 @@ FILES_${PN} += "${datadir}/telepathy \
${datadir}/dbus-1"
do_install_append() {
- rmdir ${D}${bindir}
- rmdir ${D}${libexecdir}
- rmdir ${D}${servicedir}
+ if [ -d ${D}${bindir} ] ; then
+ rmdir ${D}${bindir}
+ fi
+ if [ -d ${D}${libexecdir} ] ; then
+ rmdir ${D}${libexecdir}
+ fi
+ if [ -d ${D}${servicedir} ] ; then
+ rmdir ${D}${servicedir}
+ fi
}
--
1.7.7
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 5/9] xf86-video-vmware: fix build issue
2012-05-23 0:05 [PATCH 0/9] fixes for misc issue discovered by automake 1.12 nitin.a.kamble
` (3 preceding siblings ...)
2012-05-23 0:05 ` [PATCH 4/9] telepathy-glib: " nitin.a.kamble
@ 2012-05-23 0:05 ` nitin.a.kamble
2012-05-23 0:05 ` [PATCH 6/9] avahi: fix install issue nitin.a.kamble
` (3 subsequent siblings)
8 siblings, 0 replies; 14+ messages in thread
From: nitin.a.kamble @ 2012-05-23 0:05 UTC (permalink / raw)
To: openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
Fixes this build issue:
| rmdir: failed to remove
`/srv/home/nitin/builds/build-gcc47/tmp/work/i586-poky-linux/xf86-video-vmware-2_12.0.1-r17.1/image/usr/bin':
No such file or directory
NOTE: package xf86-video-vmware-2_12.0.1-r17.1: task do_install: Failed
No PR bump as no change in the output.
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
.../xorg-driver/xf86-video-vmware_12.0.2.bb | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_12.0.2.bb b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_12.0.2.bb
index 71f0339..5c89ccf 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_12.0.2.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_12.0.2.bb
@@ -18,5 +18,7 @@ COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'
do_install_append () {
# Remove useless empty directory
- rmdir ${D}${bindir}
+ if [ -d ${D}${bindir} ]; then
+ rmdir ${D}${bindir}
+ fi
}
--
1.7.7
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 6/9] avahi: fix install issue
2012-05-23 0:05 [PATCH 0/9] fixes for misc issue discovered by automake 1.12 nitin.a.kamble
` (4 preceding siblings ...)
2012-05-23 0:05 ` [PATCH 5/9] xf86-video-vmware: fix build issue nitin.a.kamble
@ 2012-05-23 0:05 ` nitin.a.kamble
2012-05-23 0:05 ` [PATCH 7/9] pango: fix dependencies to avoid build issue nitin.a.kamble
` (2 subsequent siblings)
8 siblings, 0 replies; 14+ messages in thread
From: nitin.a.kamble @ 2012-05-23 0:05 UTC (permalink / raw)
To: openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
meta/recipes-connectivity/avahi/avahi.inc | 6 ++-
.../avahi/files/avahi_fix_install_issue.patch | 32 ++++++++++++++++++++
2 files changed, 36 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-connectivity/avahi/files/avahi_fix_install_issue.patch
diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index c064e03..c118758 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -14,14 +14,16 @@ SECTION = "network"
# python scripts are under GPLv2+
LICENSE = "GPLv2+ & LGPLv2.1+"
-INC_PR = "r3"
+INC_PR = "r4"
DEPENDS = "expat libcap libdaemon dbus glib-2.0"
SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \
file://00avahi-autoipd \
file://99avahi-autoipd \
- file://initscript.patch"
+ file://initscript.patch \
+ file://avahi_fix_install_issue.patch \
+ "
USERADD_PACKAGES = "avahi-daemon"
USERADD_PARAM_avahi-daemon = "--system --home /var/run/avahi-daemon \
diff --git a/meta/recipes-connectivity/avahi/files/avahi_fix_install_issue.patch b/meta/recipes-connectivity/avahi/files/avahi_fix_install_issue.patch
new file mode 100644
index 0000000..32f20ec
--- /dev/null
+++ b/meta/recipes-connectivity/avahi/files/avahi_fix_install_issue.patch
@@ -0,0 +1,32 @@
+Upstream-Status: Pending
+
+Fixes this install issue
+#| /bin/sh: line 0: cd: /srv/home/nitin/builds/build-gcc47/tmp/work/i586-poky-linux/avahi-0.6.31-r3.0/image//usr/bin: No such file or directory
+
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
+2012/05/03
+
+Index: avahi-0.6.31/avahi-utils/Makefile.am
+===================================================================
+--- avahi-0.6.31.orig/avahi-utils/Makefile.am
++++ avahi-0.6.31/avahi-utils/Makefile.am
+@@ -54,6 +54,7 @@ avahi_set_host_name_CFLAGS = $(AM_CFLAGS
+ avahi_set_host_name_LDADD = $(AM_LDADD) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la
+
+ install-exec-local:
++ $(MKDIR_P) $(DESTDIR)/$(bindir) && \
+ cd $(DESTDIR)/$(bindir) && \
+ rm -f avahi-resolve-host-name avahi-resolve-address avahi-browse-domains avahi-publish-address avahi-publish-service && \
+ $(LN_S) avahi-resolve avahi-resolve-host-name && \
+Index: avahi-0.6.31/avahi-utils/Makefile.in
+===================================================================
+--- avahi-0.6.31.orig/avahi-utils/Makefile.in
++++ avahi-0.6.31/avahi-utils/Makefile.in
+@@ -906,6 +906,7 @@ uninstall-am: uninstall-binPROGRAMS
+
+
+ @HAVE_DBUS_TRUE@install-exec-local:
++@HAVE_DBUS_TRUE@ $(MKDIR_P) $(DESTDIR)/$(bindir) && \
+ @HAVE_DBUS_TRUE@ cd $(DESTDIR)/$(bindir) && \
+ @HAVE_DBUS_TRUE@ rm -f avahi-resolve-host-name avahi-resolve-address avahi-browse-domains avahi-publish-address avahi-publish-service && \
+ @HAVE_DBUS_TRUE@ $(LN_S) avahi-resolve avahi-resolve-host-name && \
--
1.7.7
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 7/9] pango: fix dependencies to avoid build issue
2012-05-23 0:05 [PATCH 0/9] fixes for misc issue discovered by automake 1.12 nitin.a.kamble
` (5 preceding siblings ...)
2012-05-23 0:05 ` [PATCH 6/9] avahi: fix install issue nitin.a.kamble
@ 2012-05-23 0:05 ` nitin.a.kamble
2012-05-23 0:05 ` [PATCH 8/9] libfm: fix a " nitin.a.kamble
2012-05-23 0:05 ` [PATCH 9/9] evolution-data-server: fix with automake work in progress nitin.a.kamble
8 siblings, 0 replies; 14+ messages in thread
From: nitin.a.kamble @ 2012-05-23 0:05 UTC (permalink / raw)
To: openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
this commit avoids this build issue:
| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/libexec/i586-poky-linux/gcc/i586-poky-linux/4.7.1/ld: cannot find -lelf
| collect2: error: ld returned 1 exit status
...
| make: *** [all] Error 2
| ERROR: oe_runmake failed
NOTE: package pango-1.28.4-r7: task do_compile: Failed
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
meta/recipes-graphics/pango/pango.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc
index fbf5027..754a720 100644
--- a/meta/recipes-graphics/pango/pango.inc
+++ b/meta/recipes-graphics/pango/pango.inc
@@ -10,7 +10,7 @@ SECTION = "libs"
LICENSE = "LGPLv2.0+"
X11DEPENDS = "virtual/libx11 libxft"
-DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv gtk-doc-native cairo "
+DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv gtk-doc-native cairo elfutils"
PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
PACKAGECONFIG[x11] = "--with-x,--without-x,${X11DEPENDS}"
--
1.7.7
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 8/9] libfm: fix a build issue
2012-05-23 0:05 [PATCH 0/9] fixes for misc issue discovered by automake 1.12 nitin.a.kamble
` (6 preceding siblings ...)
2012-05-23 0:05 ` [PATCH 7/9] pango: fix dependencies to avoid build issue nitin.a.kamble
@ 2012-05-23 0:05 ` nitin.a.kamble
2012-05-23 0:05 ` [PATCH 9/9] evolution-data-server: fix with automake work in progress nitin.a.kamble
8 siblings, 0 replies; 14+ messages in thread
From: nitin.a.kamble @ 2012-05-23 0:05 UTC (permalink / raw)
To: openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
Avoids this build issue:
| rmdir: failed to remove `/srv/home/nitin/builds/build-gcc47/tmp/work/i586-poky-linux/libfm-0.1.17-r4/image/usr/lib/gio/modules/': No such file or directory
NOTE: package libfm-0.1.17-r4: task do_install: Failed
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
meta/recipes-support/libfm/libfm_0.1.17.bb | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-support/libfm/libfm_0.1.17.bb b/meta/recipes-support/libfm/libfm_0.1.17.bb
index 1bd8850..4df7b25 100644
--- a/meta/recipes-support/libfm/libfm_0.1.17.bb
+++ b/meta/recipes-support/libfm/libfm_0.1.17.bb
@@ -22,8 +22,12 @@ SRC_URI[sha256sum] = "1740681cff4cd4c5a2eaa9805d8898269cfb6a49a0bda0acb242def15b
inherit autotools pkgconfig
do_install_append () {
- rmdir ${D}${libdir}/gio/modules/
- rmdir ${D}${libdir}/gio/
+ if [ -d ${D}${libdir}/gio/modules/ ] ; then
+ rmdir ${D}${libdir}/gio/modules/
+ fi
+ if [ -d ${D}${libdir}/gio ] ; then
+ rmdir ${D}${libdir}/gio/
+ fi
}
PACKAGES += "${PN}-mime"
--
1.7.7
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 9/9] evolution-data-server: fix with automake work in progress
2012-05-23 0:05 [PATCH 0/9] fixes for misc issue discovered by automake 1.12 nitin.a.kamble
` (7 preceding siblings ...)
2012-05-23 0:05 ` [PATCH 8/9] libfm: fix a " nitin.a.kamble
@ 2012-05-23 0:05 ` nitin.a.kamble
2012-05-23 0:06 ` Kamble, Nitin A
8 siblings, 1 reply; 14+ messages in thread
From: nitin.a.kamble @ 2012-05-23 0:05 UTC (permalink / raw)
To: openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
...olution-data-server_fix_for_automake-1.12.patch | 73 ++++++++++++++++++++
meta/recipes-sato/eds/evolution-data-server_git.bb | 1 +
2 files changed, 74 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-sato/eds/evolution-data-server/evolution-data-server_fix_for_automake-1.12.patch
diff --git a/meta/recipes-sato/eds/evolution-data-server/evolution-data-server_fix_for_automake-1.12.patch b/meta/recipes-sato/eds/evolution-data-server/evolution-data-server_fix_for_automake-1.12.patch
new file mode 100644
index 0000000..affe0df
--- /dev/null
+++ b/meta/recipes-sato/eds/evolution-data-server/evolution-data-server_fix_for_automake-1.12.patch
@@ -0,0 +1,73 @@
+Upstream-Status: Pending
+
+This patch fixes following kind of issues with automake 1.12
+
+| automake: warnings are treated as errors
+| Makefile.am:15: warning: '%'-style pattern rules are a GNU make extension
+...
+| Makefile.am:21: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
+...
+| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: warning: 'libebookbackendfile.la': linking libtool libraries using a non-POSIX
+| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: archiver requires 'AM_PROG_AR' in 'configure.ac'
+...
+| addressbook/libebook/Makefile.am:55: warning: '%'-style pattern rules are a GNU make extension
+...
+| addressbook/libebook/Makefile.am:65: warning: '%'-style pattern rules are a GNU make extension
+| addressbook/libebook/Makefile.am:66: warning: subst -,_,$*: non-POSIX variable name
+| addressbook/libebook/Makefile.am:66: (probably a GNU make extension)
+| addressbook/libebook/Makefile.am:72: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
+
+
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
+2012/05/03
+
+Index: git/Makefile.am
+===================================================================
+--- git.orig/Makefile.am
++++ git/Makefile.am
+@@ -12,7 +12,7 @@ DIST_SUBDIRS = libedataserver libebacken
+ changelogs = \
+ ChangeLog
+
+-%-$(API_VERSION).pc: %.pc
++.pc.-$(API_VERSION).pc:
+ cp $< $@
+
+ pkgconfigdir = $(libdir)/pkgconfig
+Index: git/configure.ac
+===================================================================
+--- git.orig/configure.ac
++++ git/configure.ac
+@@ -25,6 +25,10 @@ AC_CONFIG_MACRO_DIR([m4])
+ AC_CONFIG_SRCDIR(README)
+ AC_CONFIG_HEADERS(config.h)
+
++# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it
++m4_pattern_allow([AM_PROG_AR])
++AM_PROG_AR
++
+ dnl This is for the autoconf tests only - it set's the language we use
+ AC_LANG(C)
+
+Index: git/addressbook/libebook/Makefile.am
+===================================================================
+--- git.orig/addressbook/libebook/Makefile.am
++++ git/addressbook/libebook/Makefile.am
+@@ -52,7 +52,7 @@ libebookinclude_HEADERS = \
+ e-name-western.h \
+ e-vcard.h
+
+-%-$(API_VERSION).pc: %.pc
++.pc.-$(API_VERSION).pc:
+ cp $< $@
+
+ e-name-western-tables.h: e-name-western-tables.h.in
+@@ -62,7 +62,7 @@ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libebook-$(API_VERSION).pc
+
+ DBUS_GENERATED_H = e-data-book-factory-bindings.h e-data-book-bindings.h e-data-book-view-bindings.h
+-%-bindings.h: $(top_srcdir)/addressbook/libedata-book/%.xml
++./%-bindings.h: $(top_srcdir)/addressbook/libedata-book/%.xml
+ @DBUS_BINDING_TOOL@ --mode=glib-client --output=$@ --prefix=$(subst -,_,$*) $^
+
+ BUILT_SOURCES = $(DBUS_GENERATED_H) $(MARSHAL_GENERATED)
diff --git a/meta/recipes-sato/eds/evolution-data-server_git.bb b/meta/recipes-sato/eds/evolution-data-server_git.bb
index 1d675dc..325bf4c 100644
--- a/meta/recipes-sato/eds/evolution-data-server_git.bb
+++ b/meta/recipes-sato/eds/evolution-data-server_git.bb
@@ -21,6 +21,7 @@ SRC_URI = "git://git.gnome.org/evolution-data-server;protocol=git \
file://new-contact-fix.patch \
file://old-gdk-api.patch \
file://depbuildfix.patch \
+ file://evolution-data-server_fix_for_automake-1.12.patch \
file://iconv-detect.h"
S = "${WORKDIR}/git"
--
1.7.7
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH 9/9] evolution-data-server: fix with automake work in progress
2012-05-23 0:05 ` [PATCH 9/9] evolution-data-server: fix with automake work in progress nitin.a.kamble
@ 2012-05-23 0:06 ` Kamble, Nitin A
0 siblings, 0 replies; 14+ messages in thread
From: Kamble, Nitin A @ 2012-05-23 0:06 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
Please ignore this evolution-data-server commit, as it is not complete yet.
Nitin
> -----Original Message-----
> From: openembedded-core-bounces@lists.openembedded.org
> [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of
> nitin.a.kamble@intel.com
> Sent: Tuesday, May 22, 2012 5:05 PM
> To: openembedded-core@lists.openembedded.org
> Subject: [OE-core] [PATCH 9/9] evolution-data-server: fix with automake
> work in progress
>
> From: Nitin A Kamble <nitin.a.kamble@intel.com>
>
> Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
> ---
> ...olution-data-server_fix_for_automake-1.12.patch | 73
> ++++++++++++++++++++
> meta/recipes-sato/eds/evolution-data-server_git.bb | 1 +
> 2 files changed, 74 insertions(+), 0 deletions(-) create mode 100644
> meta/recipes-sato/eds/evolution-data-server/evolution-data-
> server_fix_for_automake-1.12.patch
>
> diff --git a/meta/recipes-sato/eds/evolution-data-server/evolution-
> data-server_fix_for_automake-1.12.patch b/meta/recipes-
> sato/eds/evolution-data-server/evolution-data-server_fix_for_automake-
> 1.12.patch
> new file mode 100644
> index 0000000..affe0df
> --- /dev/null
> +++ b/meta/recipes-sato/eds/evolution-data-server/evolution-data-
> server_
> +++ fix_for_automake-1.12.patch
> @@ -0,0 +1,73 @@
> +Upstream-Status: Pending
> +
> +This patch fixes following kind of issues with automake 1.12
> +
> +| automake: warnings are treated as errors
> +| Makefile.am:15: warning: '%'-style pattern rules are a GNU make
> +| extension
> +...
> +| Makefile.am:21: warning: pkgconfig_DATA:-$(API_VERSION: non-POSIX
> +| variable name
> +...
> +| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-
> linux/usr/shar
> +| e/automake-1.12/am/ltlibrary.am: warning: 'libebookbackendfile.la':
> +| linking libtool libraries using a non-POSIX
> +| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-
> linux/usr/share/automake-1.12/am/ltlibrary.am: archiver requires
> 'AM_PROG_AR' in 'configure.ac'
> +...
> +| addressbook/libebook/Makefile.am:55: warning: '%'-style pattern
> rules
> +| are a GNU make extension
> +...
> +| addressbook/libebook/Makefile.am:65: warning: '%'-style pattern
> rules
> +| are a GNU make extension
> +| addressbook/libebook/Makefile.am:66: warning: subst -,_,$*: non-
> POSIX
> +| variable name
> +| addressbook/libebook/Makefile.am:66: (probably a GNU make extension)
> +| addressbook/libebook/Makefile.am:72: warning:
> +| pkgconfig_DATA:-$(API_VERSION: non-POSIX variable name
> +
> +
> +Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
> +2012/05/03
> +
> +Index: git/Makefile.am
> +===================================================================
> +--- git.orig/Makefile.am
> ++++ git/Makefile.am
> +@@ -12,7 +12,7 @@ DIST_SUBDIRS = libedataserver libebacken
> + changelogs = \
> + ChangeLog
> +
> +-%-$(API_VERSION).pc: %.pc
> ++.pc.-$(API_VERSION).pc:
> + cp $< $@
> +
> + pkgconfigdir = $(libdir)/pkgconfig
> +Index: git/configure.ac
> +===================================================================
> +--- git.orig/configure.ac
> ++++ git/configure.ac
> +@@ -25,6 +25,10 @@ AC_CONFIG_MACRO_DIR([m4])
> + AC_CONFIG_SRCDIR(README)
> + AC_CONFIG_HEADERS(config.h)
> +
> ++# automake 1.12 seems to require this, but automake 1.11 doesn't
> ++recognize it
> ++m4_pattern_allow([AM_PROG_AR])
> ++AM_PROG_AR
> ++
> + dnl This is for the autoconf tests only - it set's the language we
> use
> + AC_LANG(C)
> +
> +Index: git/addressbook/libebook/Makefile.am
> +===================================================================
> +--- git.orig/addressbook/libebook/Makefile.am
> ++++ git/addressbook/libebook/Makefile.am
> +@@ -52,7 +52,7 @@ libebookinclude_HEADERS = \
> + e-name-western.h \
> + e-vcard.h
> +
> +-%-$(API_VERSION).pc: %.pc
> ++.pc.-$(API_VERSION).pc:
> + cp $< $@
> +
> + e-name-western-tables.h: e-name-western-tables.h.in @@ -62,7 +62,7 @@
> +pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA =
> +libebook-$(API_VERSION).pc
> +
> + DBUS_GENERATED_H = e-data-book-factory-bindings.h
> +e-data-book-bindings.h e-data-book-view-bindings.h
> +-%-bindings.h: $(top_srcdir)/addressbook/libedata-book/%.xml
> ++./%-bindings.h: $(top_srcdir)/addressbook/libedata-book/%.xml
> + @DBUS_BINDING_TOOL@ --mode=glib-client --output=$@ --
> prefix=$(subst
> + -,_,$*) $^
> +
> + BUILT_SOURCES = $(DBUS_GENERATED_H) $(MARSHAL_GENERATED)
> diff --git a/meta/recipes-sato/eds/evolution-data-server_git.bb
> b/meta/recipes-sato/eds/evolution-data-server_git.bb
> index 1d675dc..325bf4c 100644
> --- a/meta/recipes-sato/eds/evolution-data-server_git.bb
> +++ b/meta/recipes-sato/eds/evolution-data-server_git.bb
> @@ -21,6 +21,7 @@ SRC_URI = "git://git.gnome.org/evolution-data-
> server;protocol=git \
> file://new-contact-fix.patch \
> file://old-gdk-api.patch \
> file://depbuildfix.patch \
> + file://evolution-data-server_fix_for_automake-1.12.patch \
> file://iconv-detect.h"
>
> S = "${WORKDIR}/git"
> --
> 1.7.7
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 14+ messages in thread