* [PATCH 0/2] Opkg and distcc fix
@ 2011-05-20 23:19 Khem Raj
2011-05-20 23:19 ` [PATCH 1/2] opkg_svn.bb: Install rcS.d into ${D} instead of ${IMAGE_ROOTFS} Khem Raj
` (2 more replies)
0 siblings, 3 replies; 17+ messages in thread
From: Khem Raj @ 2011-05-20 23:19 UTC (permalink / raw)
To: OE core
These are remaining patches which needed rework.
The following changes since commit c26dadc799cd9c7df66c3bccfc9f21146c35625a:
opkg_svn.bb: Install rcS.d into ${D} instead of ${IMAGE_ROOTFS} (2011-05-20 16:15:29 -0700)
are available in the git repository at:
git@git.openembedded.org:openembedded-core-contrib.git kraj/misc-fixes
http://cgit.openembedded.org/cgit.cgi//log/?h=kraj/misc-fixes
Khem Raj (2):
opkg_svn.bb: Install rcS.d into ${D} instead of ${IMAGE_ROOTFS}
distcc_2.18.3.bb: Fix compilation on uclibc
meta/recipes-devtools/distcc/distcc_2.18.3.bb | 17 ++++++++++++-----
meta/recipes-devtools/opkg/opkg/headerfix.patch | 19 -------------------
meta/recipes-devtools/opkg/opkg_svn.bb | 3 +--
3 files changed, 13 insertions(+), 26 deletions(-)
delete mode 100644 meta/recipes-devtools/opkg/opkg/headerfix.patch
--
1.7.4.1
^ permalink raw reply [flat|nested] 17+ messages in thread* [PATCH 1/2] opkg_svn.bb: Install rcS.d into ${D} instead of ${IMAGE_ROOTFS} 2011-05-20 23:19 [PATCH 0/2] Opkg and distcc fix Khem Raj @ 2011-05-20 23:19 ` Khem Raj 2011-05-20 23:30 ` Saul Wold 2011-05-21 8:00 ` Phil Blundell 2011-05-20 23:19 ` [PATCH 2/2] distcc_2.18.3.bb: Fix compilation on uclibc Khem Raj 2011-05-23 19:09 ` [PATCH 0/2] Opkg and distcc fix Saul Wold 2 siblings, 2 replies; 17+ messages in thread From: Khem Raj @ 2011-05-20 23:19 UTC (permalink / raw) To: OE core Remove headerfix.patch, its already applied upstream Signed-off-by: Khem Raj <raj.khem@gmail.com> --- meta/recipes-devtools/opkg/opkg/headerfix.patch | 19 ------------------- meta/recipes-devtools/opkg/opkg_svn.bb | 3 +-- 2 files changed, 1 insertions(+), 21 deletions(-) delete mode 100644 meta/recipes-devtools/opkg/opkg/headerfix.patch diff --git a/meta/recipes-devtools/opkg/opkg/headerfix.patch b/meta/recipes-devtools/opkg/opkg/headerfix.patch deleted file mode 100644 index b3515a0..0000000 --- a/meta/recipes-devtools/opkg/opkg/headerfix.patch +++ /dev/null @@ -1,19 +0,0 @@ -Without this, the FILE reference in this header can cause compile issues. - -RP - 29/1/10 - -Upstream-Status: Pending - -Index: trunk/libopkg/pkg_dest.h -=================================================================== ---- trunk.orig/libopkg/pkg_dest.h 2010-01-29 09:37:22.000000000 +0000 -+++ trunk/libopkg/pkg_dest.h 2010-01-29 09:37:33.000000000 +0000 -@@ -18,6 +18,8 @@ - #ifndef PKG_DEST_H - #define PKG_DEST_H - -+#include <stdio.h> -+ - typedef struct pkg_dest pkg_dest_t; - struct pkg_dest - { diff --git a/meta/recipes-devtools/opkg/opkg_svn.bb b/meta/recipes-devtools/opkg/opkg_svn.bb index 5964a47..3f2c22b 100644 --- a/meta/recipes-devtools/opkg/opkg_svn.bb +++ b/meta/recipes-devtools/opkg/opkg_svn.bb @@ -11,7 +11,6 @@ RREPLACES_${PN} = "opkg-nogpg" SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \ file://add_vercmp.patch \ - file://headerfix.patch \ " S = "${WORKDIR}/trunk" @@ -34,7 +33,7 @@ do_install_append() { pkg_postinst_${PN} () { #!/bin/sh if [ "x$D" != "x" ]; then - install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d + install -d $D/${sysconfdir}/rcS.d # this happens at S98 where our good 'ole packages script used to run echo "#!/bin/sh opkg-cl configure -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH 1/2] opkg_svn.bb: Install rcS.d into ${D} instead of ${IMAGE_ROOTFS} 2011-05-20 23:19 ` [PATCH 1/2] opkg_svn.bb: Install rcS.d into ${D} instead of ${IMAGE_ROOTFS} Khem Raj @ 2011-05-20 23:30 ` Saul Wold 2011-05-21 0:41 ` Khem Raj 2011-05-21 8:00 ` Phil Blundell 1 sibling, 1 reply; 17+ messages in thread From: Saul Wold @ 2011-05-20 23:30 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On 05/20/2011 04:19 PM, Khem Raj wrote: > Remove headerfix.patch, its already applied upstream > Minor nit, should be $D in the subject line also right? Sau! > Signed-off-by: Khem Raj<raj.khem@gmail.com> > --- > meta/recipes-devtools/opkg/opkg/headerfix.patch | 19 ------------------- > meta/recipes-devtools/opkg/opkg_svn.bb | 3 +-- > 2 files changed, 1 insertions(+), 21 deletions(-) > delete mode 100644 meta/recipes-devtools/opkg/opkg/headerfix.patch > > diff --git a/meta/recipes-devtools/opkg/opkg/headerfix.patch b/meta/recipes-devtools/opkg/opkg/headerfix.patch > deleted file mode 100644 > index b3515a0..0000000 > --- a/meta/recipes-devtools/opkg/opkg/headerfix.patch > +++ /dev/null > @@ -1,19 +0,0 @@ > -Without this, the FILE reference in this header can cause compile issues. > - > -RP - 29/1/10 > - > -Upstream-Status: Pending > - > -Index: trunk/libopkg/pkg_dest.h > -=================================================================== > ---- trunk.orig/libopkg/pkg_dest.h 2010-01-29 09:37:22.000000000 +0000 > -+++ trunk/libopkg/pkg_dest.h 2010-01-29 09:37:33.000000000 +0000 > -@@ -18,6 +18,8 @@ > - #ifndef PKG_DEST_H > - #define PKG_DEST_H > - > -+#include<stdio.h> > -+ > - typedef struct pkg_dest pkg_dest_t; > - struct pkg_dest > - { > diff --git a/meta/recipes-devtools/opkg/opkg_svn.bb b/meta/recipes-devtools/opkg/opkg_svn.bb > index 5964a47..3f2c22b 100644 > --- a/meta/recipes-devtools/opkg/opkg_svn.bb > +++ b/meta/recipes-devtools/opkg/opkg_svn.bb > @@ -11,7 +11,6 @@ RREPLACES_${PN} = "opkg-nogpg" > > SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \ > file://add_vercmp.patch \ > - file://headerfix.patch \ > " > > S = "${WORKDIR}/trunk" > @@ -34,7 +33,7 @@ do_install_append() { > pkg_postinst_${PN} () { > #!/bin/sh > if [ "x$D" != "x" ]; then > - install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d > + install -d $D/${sysconfdir}/rcS.d > # this happens at S98 where our good 'ole packages script used to run > echo "#!/bin/sh > opkg-cl configure ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 1/2] opkg_svn.bb: Install rcS.d into ${D} instead of ${IMAGE_ROOTFS} 2011-05-20 23:30 ` Saul Wold @ 2011-05-21 0:41 ` Khem Raj 0 siblings, 0 replies; 17+ messages in thread From: Khem Raj @ 2011-05-21 0:41 UTC (permalink / raw) To: Saul Wold; +Cc: Patches and discussions about the oe-core layer On (20/05/11 16:30), Saul Wold wrote: > On 05/20/2011 04:19 PM, Khem Raj wrote: > >Remove headerfix.patch, its already applied upstream > > > Minor nit, should be $D in the subject line also right? OK it should. I have amended the commit and refreshed pull branch > > Sau! > > >Signed-off-by: Khem Raj<raj.khem@gmail.com> > >--- > > meta/recipes-devtools/opkg/opkg/headerfix.patch | 19 ------------------- > > meta/recipes-devtools/opkg/opkg_svn.bb | 3 +-- > > 2 files changed, 1 insertions(+), 21 deletions(-) > > delete mode 100644 meta/recipes-devtools/opkg/opkg/headerfix.patch > > > >diff --git a/meta/recipes-devtools/opkg/opkg/headerfix.patch b/meta/recipes-devtools/opkg/opkg/headerfix.patch > >deleted file mode 100644 > >index b3515a0..0000000 > >--- a/meta/recipes-devtools/opkg/opkg/headerfix.patch > >+++ /dev/null > >@@ -1,19 +0,0 @@ > >-Without this, the FILE reference in this header can cause compile issues. > >- > >-RP - 29/1/10 > >- > >-Upstream-Status: Pending > >- > >-Index: trunk/libopkg/pkg_dest.h > >-=================================================================== > >---- trunk.orig/libopkg/pkg_dest.h 2010-01-29 09:37:22.000000000 +0000 > >-+++ trunk/libopkg/pkg_dest.h 2010-01-29 09:37:33.000000000 +0000 > >-@@ -18,6 +18,8 @@ > >- #ifndef PKG_DEST_H > >- #define PKG_DEST_H > >- > >-+#include<stdio.h> > >-+ > >- typedef struct pkg_dest pkg_dest_t; > >- struct pkg_dest > >- { > >diff --git a/meta/recipes-devtools/opkg/opkg_svn.bb b/meta/recipes-devtools/opkg/opkg_svn.bb > >index 5964a47..3f2c22b 100644 > >--- a/meta/recipes-devtools/opkg/opkg_svn.bb > >+++ b/meta/recipes-devtools/opkg/opkg_svn.bb > >@@ -11,7 +11,6 @@ RREPLACES_${PN} = "opkg-nogpg" > > > > SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \ > > file://add_vercmp.patch \ > >- file://headerfix.patch \ > > " > > > > S = "${WORKDIR}/trunk" > >@@ -34,7 +33,7 @@ do_install_append() { > > pkg_postinst_${PN} () { > > #!/bin/sh > > if [ "x$D" != "x" ]; then > >- install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d > >+ install -d $D/${sysconfdir}/rcS.d > > # this happens at S98 where our good 'ole packages script used to run > > echo "#!/bin/sh > > opkg-cl configure > -- -Khem ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 1/2] opkg_svn.bb: Install rcS.d into ${D} instead of ${IMAGE_ROOTFS} 2011-05-20 23:19 ` [PATCH 1/2] opkg_svn.bb: Install rcS.d into ${D} instead of ${IMAGE_ROOTFS} Khem Raj 2011-05-20 23:30 ` Saul Wold @ 2011-05-21 8:00 ` Phil Blundell 2011-05-21 23:04 ` Khem Raj 1 sibling, 1 reply; 17+ messages in thread From: Phil Blundell @ 2011-05-21 8:00 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On Fri, 2011-05-20 at 16:19 -0700, Khem Raj wrote: > - install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d > + install -d $D/${sysconfdir}/rcS.d Just as a note in passing, this sort of thing is best written as: install -d "${D}${sysconfdir}/rcS.d" i.e. you don't need a slash after ${D}, and the whole argument should ideally be quoted to protect against characters that are special to the shell. p. ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 1/2] opkg_svn.bb: Install rcS.d into ${D} instead of ${IMAGE_ROOTFS} 2011-05-21 8:00 ` Phil Blundell @ 2011-05-21 23:04 ` Khem Raj 0 siblings, 0 replies; 17+ messages in thread From: Khem Raj @ 2011-05-21 23:04 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On Sat, May 21, 2011 at 1:00 AM, Phil Blundell <pb@pbcl.net> wrote: > On Fri, 2011-05-20 at 16:19 -0700, Khem Raj wrote: >> - install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d >> + install -d $D/${sysconfdir}/rcS.d > > Just as a note in passing, this sort of thing is best written as: > > install -d "${D}${sysconfdir}/rcS.d" > > i.e. you don't need a slash after ${D}, and the whole argument should > ideally be quoted to protect against characters that are special to the > shell. ok done and patch is in pull branch with this fixed > > p. > > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core > ^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 2/2] distcc_2.18.3.bb: Fix compilation on uclibc 2011-05-20 23:19 [PATCH 0/2] Opkg and distcc fix Khem Raj 2011-05-20 23:19 ` [PATCH 1/2] opkg_svn.bb: Install rcS.d into ${D} instead of ${IMAGE_ROOTFS} Khem Raj @ 2011-05-20 23:19 ` Khem Raj 2011-05-20 23:31 ` Richard Purdie ` (2 more replies) 2011-05-23 19:09 ` [PATCH 0/2] Opkg and distcc fix Saul Wold 2 siblings, 3 replies; 17+ messages in thread From: Khem Raj @ 2011-05-20 23:19 UTC (permalink / raw) To: OE core We enable gtk/gnome in distcc that code uses loadavg() a function unimplemented in uclibc. Therefore for uclibc we disable gnome and gtk+ features in distcc Signed-off-by: Khem Raj <raj.khem@gmail.com> --- meta/recipes-devtools/distcc/distcc_2.18.3.bb | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/meta/recipes-devtools/distcc/distcc_2.18.3.bb b/meta/recipes-devtools/distcc/distcc_2.18.3.bb index 1f5c2af..a15858c 100644 --- a/meta/recipes-devtools/distcc/distcc_2.18.3.bb +++ b/meta/recipes-devtools/distcc/distcc_2.18.3.bb @@ -6,7 +6,10 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" PR = "r6" -DEPENDS = "avahi gtk+" +DEPENDS = "avahi ${GTKDEP}" +GTKDEP-libc-uclibc = "" +GTKDEP = "gtk+" + RRECOMMENDS_${PN} = "avahi-daemon" # Upstream change this patch periodically so store locally @@ -24,17 +27,21 @@ inherit autotools pkgconfig update-rc.d INITSCRIPT_NAME = "distcc" -EXTRA_OECONF = " --with-gtk " - +EXTRA_OECONF_libc-glibc = " --with-gtk " +EXTRA_OECONF_libc-uclibc = " --without-gtk --without-gnome " do_install_append() { install -d ${D}${sysconfdir}/init.d/ install -d ${D}${sysconfdir}/default install -m 0755 ${WORKDIR}/distcc ${D}${sysconfdir}/init.d/ install -m 0755 ${WORKDIR}/default ${D}${sysconfdir}/default/distcc + ${DESKTOPINSTALL} +} +DESKTOPINSTALL = "" +DESKTOPINSTALL_libc-glibc () { + install -d ${D}${datadir}/distcc/ install -m 0644 ${WORKDIR}/distccmon-gnome.desktop ${D}${datadir}/distcc/ } - -PACKAGES += "distcc-distmon-gnome" +PACKAGES_append_libc-glibc = " distcc-distmon-gnome" FILES_${PN} = " ${sysconfdir} \ ${bindir}/distcc \ -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH 2/2] distcc_2.18.3.bb: Fix compilation on uclibc 2011-05-20 23:19 ` [PATCH 2/2] distcc_2.18.3.bb: Fix compilation on uclibc Khem Raj @ 2011-05-20 23:31 ` Richard Purdie 2011-05-21 0:43 ` Khem Raj 2011-05-21 0:48 ` Khem Raj 2011-05-21 6:23 ` Koen Kooi 2011-05-21 6:34 ` Phil Blundell 2 siblings, 2 replies; 17+ messages in thread From: Richard Purdie @ 2011-05-20 23:31 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On Fri, 2011-05-20 at 16:19 -0700, Khem Raj wrote: > We enable gtk/gnome in distcc that code uses loadavg() > a function unimplemented in uclibc. Therefore for uclibc > we disable gnome and gtk+ features in distcc > > Signed-off-by: Khem Raj <raj.khem@gmail.com> > --- > meta/recipes-devtools/distcc/distcc_2.18.3.bb | 17 ++++++++++++----- > 1 files changed, 12 insertions(+), 5 deletions(-) > > diff --git a/meta/recipes-devtools/distcc/distcc_2.18.3.bb b/meta/recipes-devtools/distcc/distcc_2.18.3.bb > index 1f5c2af..a15858c 100644 > --- a/meta/recipes-devtools/distcc/distcc_2.18.3.bb > +++ b/meta/recipes-devtools/distcc/distcc_2.18.3.bb > @@ -6,7 +6,10 @@ LICENSE = "GPLv2" > LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" > PR = "r6" > > -DEPENDS = "avahi gtk+" > +DEPENDS = "avahi ${GTKDEP}" > +GTKDEP-libc-uclibc = "" > +GTKDEP = "gtk+" return -ENOTTESTED; ;-) Cheers, Richard ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 2/2] distcc_2.18.3.bb: Fix compilation on uclibc 2011-05-20 23:31 ` Richard Purdie @ 2011-05-21 0:43 ` Khem Raj 2011-05-21 0:48 ` Khem Raj 1 sibling, 0 replies; 17+ messages in thread From: Khem Raj @ 2011-05-21 0:43 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On (21/05/11 00:31), Richard Purdie wrote: > On Fri, 2011-05-20 at 16:19 -0700, Khem Raj wrote: > > We enable gtk/gnome in distcc that code uses loadavg() > > a function unimplemented in uclibc. Therefore for uclibc > > we disable gnome and gtk+ features in distcc > > > > Signed-off-by: Khem Raj <raj.khem@gmail.com> > > --- > > meta/recipes-devtools/distcc/distcc_2.18.3.bb | 17 ++++++++++++----- > > 1 files changed, 12 insertions(+), 5 deletions(-) > > > > diff --git a/meta/recipes-devtools/distcc/distcc_2.18.3.bb b/meta/recipes-devtools/distcc/distcc_2.18.3.bb > > index 1f5c2af..a15858c 100644 > > --- a/meta/recipes-devtools/distcc/distcc_2.18.3.bb > > +++ b/meta/recipes-devtools/distcc/distcc_2.18.3.bb > > @@ -6,7 +6,10 @@ LICENSE = "GPLv2" > > LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" > > PR = "r6" > > > > -DEPENDS = "avahi gtk+" > > +DEPENDS = "avahi ${GTKDEP}" > > +GTKDEP-libc-uclibc = "" > > +GTKDEP = "gtk+" > > return -ENOTTESTED; heh, I did infact rebuild on uclibc and eglibc but I should have removed dependencies just rebuilding after bitbake -c cleanall is not enough > > ;-) > > Cheers, > > Richard > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core -- -Khem ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 2/2] distcc_2.18.3.bb: Fix compilation on uclibc 2011-05-20 23:31 ` Richard Purdie 2011-05-21 0:43 ` Khem Raj @ 2011-05-21 0:48 ` Khem Raj 1 sibling, 0 replies; 17+ messages in thread From: Khem Raj @ 2011-05-21 0:48 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On (21/05/11 00:31), Richard Purdie wrote: > On Fri, 2011-05-20 at 16:19 -0700, Khem Raj wrote: > > We enable gtk/gnome in distcc that code uses loadavg() > > a function unimplemented in uclibc. Therefore for uclibc > > we disable gnome and gtk+ features in distcc > > > > Signed-off-by: Khem Raj <raj.khem@gmail.com> > > --- > > meta/recipes-devtools/distcc/distcc_2.18.3.bb | 17 ++++++++++++----- > > 1 files changed, 12 insertions(+), 5 deletions(-) > > > > diff --git a/meta/recipes-devtools/distcc/distcc_2.18.3.bb b/meta/recipes-devtools/distcc/distcc_2.18.3.bb > > index 1f5c2af..a15858c 100644 > > --- a/meta/recipes-devtools/distcc/distcc_2.18.3.bb > > +++ b/meta/recipes-devtools/distcc/distcc_2.18.3.bb > > @@ -6,7 +6,10 @@ LICENSE = "GPLv2" > > LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" > > PR = "r6" > > > > -DEPENDS = "avahi gtk+" > > +DEPENDS = "avahi ${GTKDEP}" > > +GTKDEP-libc-uclibc = "" > > +GTKDEP = "gtk+" > > return -ENOTTESTED; OK I have refreshed it with typo fix in the pull request > > ;-) > > Cheers, > > Richard > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core -- -Khem ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 2/2] distcc_2.18.3.bb: Fix compilation on uclibc 2011-05-20 23:19 ` [PATCH 2/2] distcc_2.18.3.bb: Fix compilation on uclibc Khem Raj 2011-05-20 23:31 ` Richard Purdie @ 2011-05-21 6:23 ` Koen Kooi 2011-05-21 6:34 ` Phil Blundell 2 siblings, 0 replies; 17+ messages in thread From: Koen Kooi @ 2011-05-21 6:23 UTC (permalink / raw) To: Patches and discussions about the oe-core layer Op 21 mei 2011, om 01:19 heeft Khem Raj het volgende geschreven: > > do_install_append() { > install -d ${D}${sysconfdir}/init.d/ > install -d ${D}${sysconfdir}/default > install -m 0755 ${WORKDIR}/distcc ${D}${sysconfdir}/init.d/ > install -m 0755 ${WORKDIR}/default ${D}${sysconfdir}/default/distcc > + ${DESKTOPINSTALL} > +} > +DESKTOPINSTALL = "" > +DESKTOPINSTALL_libc-glibc () { > + install -d ${D}${datadir}/distcc/ > install -m 0644 ${WORKDIR}/distccmon-gnome.desktop ${D}${datadir}/distcc/ > } > - > -PACKAGES += "distcc-distmon-gnome" > +PACKAGES_append_libc-glibc = " distcc-distmon-gnome" Are these parts really needed? ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 2/2] distcc_2.18.3.bb: Fix compilation on uclibc 2011-05-20 23:19 ` [PATCH 2/2] distcc_2.18.3.bb: Fix compilation on uclibc Khem Raj 2011-05-20 23:31 ` Richard Purdie 2011-05-21 6:23 ` Koen Kooi @ 2011-05-21 6:34 ` Phil Blundell 2011-05-21 7:19 ` Khem Raj 2 siblings, 1 reply; 17+ messages in thread From: Phil Blundell @ 2011-05-21 6:34 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On Fri, 2011-05-20 at 16:19 -0700, Khem Raj wrote: > -DEPENDS = "avahi gtk+" > +DEPENDS = "avahi ${GTKDEP}" > +GTKDEP-libc-uclibc = "" > +GTKDEP = "gtk+" Does that really work? Surely it should be "GTKDEP_libc-uclibc". > -EXTRA_OECONF = " --with-gtk " > - > +EXTRA_OECONF_libc-glibc = " --with-gtk " > +EXTRA_OECONF_libc-uclibc = " --without-gtk --without-gnome " Can you make this use the same logic as above? > +DESKTOPINSTALL = "" > +DESKTOPINSTALL_libc-glibc () { > + install -d ${D}${datadir}/distcc/ > install -m 0644 ${WORKDIR}/distccmon-gnome.desktop ${D}${datadir}/distcc/ > } Likewise, or find some way to eliminate it entirely. > - > -PACKAGES += "distcc-distmon-gnome" > +PACKAGES_append_libc-glibc = " distcc-distmon-gnome" Is that needed? p. ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 2/2] distcc_2.18.3.bb: Fix compilation on uclibc 2011-05-21 6:34 ` Phil Blundell @ 2011-05-21 7:19 ` Khem Raj 2011-05-21 7:45 ` Phil Blundell 2011-05-21 19:17 ` Koen Kooi 0 siblings, 2 replies; 17+ messages in thread From: Khem Raj @ 2011-05-21 7:19 UTC (permalink / raw) To: Patches and discussions about the oe-core layer Cc: Patches and discussions about the oe-core layer -Khem On May 20, 2011, at 11:34 PM, Phil Blundell <pb@pbcl.net> wrote: > On Fri, 2011-05-20 at 16:19 -0700, Khem Raj wrote: >> -DEPENDS = "avahi gtk+" >> +DEPENDS = "avahi ${GTKDEP}" >> +GTKDEP-libc-uclibc = "" >> +GTKDEP = "gtk+" > > Does that really work? Surely it should be "GTKDEP_libc-uclibc". > No it does not RP pointed it out earlier and I have since fixed it >> -EXTRA_OECONF = " --with-gtk " >> - >> +EXTRA_OECONF_libc-glibc = " --with-gtk " >> +EXTRA_OECONF_libc-uclibc = " --without-gtk --without-gnome " > > Can you make this use the same logic as above? > Is there a problem with this logic ? >> +DESKTOPINSTALL = "" >> +DESKTOPINSTALL_libc-glibc () { >> + install -d ${D}${datadir}/distcc/ >> install -m 0644 ${WORKDIR}/distccmon-gnome.desktop ${D}${datadir}/distcc/ >> } > > Likewise, or find some way to eliminate it entirely. > >> - >> -PACKAGES += "distcc-distmon-gnome" >> +PACKAGES_append_libc-glibc = " distcc-distmon-gnome" > > Is that needed? > May be not it will just be empty in uclibc case > p. > > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 2/2] distcc_2.18.3.bb: Fix compilation on uclibc 2011-05-21 7:19 ` Khem Raj @ 2011-05-21 7:45 ` Phil Blundell 2011-05-21 19:17 ` Koen Kooi 1 sibling, 0 replies; 17+ messages in thread From: Phil Blundell @ 2011-05-21 7:45 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On Sat, 2011-05-21 at 00:19 -0700, Khem Raj wrote: > >> -EXTRA_OECONF = " --with-gtk " > >> - > >> +EXTRA_OECONF_libc-glibc = " --with-gtk " > >> +EXTRA_OECONF_libc-uclibc = " --without-gtk --without-gnome " > > > > Can you make this use the same logic as above? > > > > Is there a problem with this logic ? Not functionally but, if the DEPENDS are expressed in terms of a default and then an override for uclibc, it seems like it would be natural for the corresponding EXTRA_OECONF to be written the same way. p. ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 2/2] distcc_2.18.3.bb: Fix compilation on uclibc 2011-05-21 7:19 ` Khem Raj 2011-05-21 7:45 ` Phil Blundell @ 2011-05-21 19:17 ` Koen Kooi 2011-05-21 23:03 ` Khem Raj 1 sibling, 1 reply; 17+ messages in thread From: Koen Kooi @ 2011-05-21 19:17 UTC (permalink / raw) To: Patches and discussions about the oe-core layer Op 21 mei 2011, om 09:19 heeft Khem Raj het volgende geschreven: > > > -Khem > > On May 20, 2011, at 11:34 PM, Phil Blundell <pb@pbcl.net> wrote: > >> On Fri, 2011-05-20 at 16:19 -0700, Khem Raj wrote: >>> -DEPENDS = "avahi gtk+" >>> +DEPENDS = "avahi ${GTKDEP}" >>> +GTKDEP-libc-uclibc = "" >>> +GTKDEP = "gtk+" >> >> Does that really work? Surely it should be "GTKDEP_libc-uclibc". >> > > No it does not RP pointed it out earlier and I have since fixed it > >>> -EXTRA_OECONF = " --with-gtk " >>> - >>> +EXTRA_OECONF_libc-glibc = " --with-gtk " >>> +EXTRA_OECONF_libc-uclibc = " --without-gtk --without-gnome " >> >> Can you make this use the same logic as above? >> > > Is there a problem with this logic ? > >>> +DESKTOPINSTALL = "" >>> +DESKTOPINSTALL_libc-glibc () { >>> + install -d ${D}${datadir}/distcc/ >>> install -m 0644 ${WORKDIR}/distccmon-gnome.desktop ${D}${datadir}/distcc/ >>> } >> >> Likewise, or find some way to eliminate it entirely. >> >>> - >>> -PACKAGES += "distcc-distmon-gnome" >>> +PACKAGES_append_libc-glibc = " distcc-distmon-gnome" >> >> Is that needed? >> > > May be not it will just be empty in uclibc case since ALLOW_EMPTY is not set, this change is unneeded. ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 2/2] distcc_2.18.3.bb: Fix compilation on uclibc 2011-05-21 19:17 ` Koen Kooi @ 2011-05-21 23:03 ` Khem Raj 0 siblings, 0 replies; 17+ messages in thread From: Khem Raj @ 2011-05-21 23:03 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On Sat, May 21, 2011 at 12:17 PM, Koen Kooi <koen@dominion.thruhere.net> wrote: > > Op 21 mei 2011, om 09:19 heeft Khem Raj het volgende geschreven: > >> >> >> -Khem >> >> On May 20, 2011, at 11:34 PM, Phil Blundell <pb@pbcl.net> wrote: >> >>> On Fri, 2011-05-20 at 16:19 -0700, Khem Raj wrote: >>>> -DEPENDS = "avahi gtk+" >>>> +DEPENDS = "avahi ${GTKDEP}" >>>> +GTKDEP-libc-uclibc = "" >>>> +GTKDEP = "gtk+" >>> >>> Does that really work? Surely it should be "GTKDEP_libc-uclibc". >>> >> >> No it does not RP pointed it out earlier and I have since fixed it >> >>>> -EXTRA_OECONF = " --with-gtk " >>>> - >>>> +EXTRA_OECONF_libc-glibc = " --with-gtk " >>>> +EXTRA_OECONF_libc-uclibc = " --without-gtk --without-gnome " >>> >>> Can you make this use the same logic as above? >>> >> >> Is there a problem with this logic ? >> >>>> +DESKTOPINSTALL = "" >>>> +DESKTOPINSTALL_libc-glibc () { >>>> + install -d ${D}${datadir}/distcc/ >>>> install -m 0644 ${WORKDIR}/distccmon-gnome.desktop ${D}${datadir}/distcc/ >>>> } >>> >>> Likewise, or find some way to eliminate it entirely. >>> >>>> - >>>> -PACKAGES += "distcc-distmon-gnome" >>>> +PACKAGES_append_libc-glibc = " distcc-distmon-gnome" >>> >>> Is that needed? >>> >> >> May be not it will just be empty in uclibc case > > since ALLOW_EMPTY is not set, this change is unneeded. I have include these comments in the new version pushed to pull branch. Hopefully this time its ok. > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core > ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 0/2] Opkg and distcc fix 2011-05-20 23:19 [PATCH 0/2] Opkg and distcc fix Khem Raj 2011-05-20 23:19 ` [PATCH 1/2] opkg_svn.bb: Install rcS.d into ${D} instead of ${IMAGE_ROOTFS} Khem Raj 2011-05-20 23:19 ` [PATCH 2/2] distcc_2.18.3.bb: Fix compilation on uclibc Khem Raj @ 2011-05-23 19:09 ` Saul Wold 2 siblings, 0 replies; 17+ messages in thread From: Saul Wold @ 2011-05-23 19:09 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On 05/20/2011 04:19 PM, Khem Raj wrote: > These are remaining patches which needed rework. > > The following changes since commit c26dadc799cd9c7df66c3bccfc9f21146c35625a: > > opkg_svn.bb: Install rcS.d into ${D} instead of ${IMAGE_ROOTFS} (2011-05-20 16:15:29 -0700) > > are available in the git repository at: > git@git.openembedded.org:openembedded-core-contrib.git kraj/misc-fixes > http://cgit.openembedded.org/cgit.cgi//log/?h=kraj/misc-fixes > > Khem Raj (2): > opkg_svn.bb: Install rcS.d into ${D} instead of ${IMAGE_ROOTFS} > distcc_2.18.3.bb: Fix compilation on uclibc > > meta/recipes-devtools/distcc/distcc_2.18.3.bb | 17 ++++++++++++----- > meta/recipes-devtools/opkg/opkg/headerfix.patch | 19 ------------------- > meta/recipes-devtools/opkg/opkg_svn.bb | 3 +-- > 3 files changed, 13 insertions(+), 26 deletions(-) > delete mode 100644 meta/recipes-devtools/opkg/opkg/headerfix.patch > Khem, After all the churn, latest version has been merged. Thank Sau! ^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2011-05-23 19:12 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-20 23:19 [PATCH 0/2] Opkg and distcc fix Khem Raj
2011-05-20 23:19 ` [PATCH 1/2] opkg_svn.bb: Install rcS.d into ${D} instead of ${IMAGE_ROOTFS} Khem Raj
2011-05-20 23:30 ` Saul Wold
2011-05-21 0:41 ` Khem Raj
2011-05-21 8:00 ` Phil Blundell
2011-05-21 23:04 ` Khem Raj
2011-05-20 23:19 ` [PATCH 2/2] distcc_2.18.3.bb: Fix compilation on uclibc Khem Raj
2011-05-20 23:31 ` Richard Purdie
2011-05-21 0:43 ` Khem Raj
2011-05-21 0:48 ` Khem Raj
2011-05-21 6:23 ` Koen Kooi
2011-05-21 6:34 ` Phil Blundell
2011-05-21 7:19 ` Khem Raj
2011-05-21 7:45 ` Phil Blundell
2011-05-21 19:17 ` Koen Kooi
2011-05-21 23:03 ` Khem Raj
2011-05-23 19:09 ` [PATCH 0/2] Opkg and distcc fix Saul Wold
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox