* Re: [PATCH 3/3 v2] distro_tracking_fields: update packages tracking fields
From: wenzong fan @ 2011-10-24 5:57 UTC (permalink / raw)
To: Saul Wold; +Cc: Patches and discussions about the oe-core layer
In-Reply-To: <4E9FD119.4030307@intel.com>
On 10/20/2011 03:43 PM, Saul Wold wrote:
> On 10/19/2011 10:59 PM, wenzong.fan@windriver.com wrote:
>> From: Wenzong Fan<wenzong.fan@windriver.com>
>>
>> Update packages tracking fields including ccache, chkconfig.
>>
>> Signed-off-by: Wenzong Fan<wenzong.fan@windriver.com>
>> ---
>> .../conf/distro/include/distro_tracking_fields.inc | 12 ++++++++++++
>> 1 files changed, 12 insertions(+), 0 deletions(-)
>>
>> diff --git a/meta/conf/distro/include/distro_tracking_fields.inc
>> b/meta/conf/distro/include/distro_tracking_fields.inc
>> index abc2cbf..a7c2db5 100644
>> --- a/meta/conf/distro/include/distro_tracking_fields.inc
>> +++ b/meta/conf/distro/include/distro_tracking_fields.inc
>> @@ -5914,6 +5914,18 @@ RECIPE_LATEST_RELEASE_DATE_pn-gettext = "Jun
>> 06, 2010"
>> RECIPE_LAST_UPDATE_pn-gettext = "May 24, 2011"
>> RECIPE_MANUAL_CHECK_DATE_pn-gettext = "Sep 29, 2011"
>>
>> +RECIPE_STATUS_pn-ccache = "green"
>> +RECIPE_MAINTAINER_pn-ccache = "Wenzong Fan<wenzong.fan@windriver.com>"
>> +RECIPE_LATEST_VERSION_pn-ccache = "3.1.6"
>> +RECIPE_LAST_UPDATE_pn-ccache = "June 24, 2011"
> You just updated this package, so this should be today's date
> Do you mean theis to be RECIPE_LATEST_RELEASE_DATE of June? Is that
> when the 3.1.6 tarball was released?
Oh, sorry I misunderstand the '_LAST_', June is the last update time for
previous version 3.1.5.
I'll fix that.
Thanks
Wenzong
>
>> +RECIPE_MANUAL_CHECK_DATE_pn-ccache = "October 11, 2011"
>> +
>> +RECIPE_STATUS_pn-chkconfig = "green"
>> +RECIPE_MAINTAINER_pn-chkconfig = "Wenzong
>> Fan<wenzong.fan@windriver.com>"
>> +RECIPE_LATEST_VERSION_pn-chkconfig = "1.3.55"
>> +RECIPE_LAST_UPDATE_pn-chkconfig = "May 24, 2011"
> Same as above!
>
> Sau!
>> +RECIPE_MANUAL_CHECK_DATE_pn-chkconfig = "October 11, 2011"
>> +
>> RECIPE_STATUS_pn-pseudo = "green"
>> RECIPE_LATEST_VERSION_pn-pseudo = "1.1.1"
>> RECIPE_LAST_UPDATE_pn-pseudo = "Jun 06, 2011"
>
>
^ permalink raw reply
* [PATCH 1/1] qmmp: update to 0.5.2
From: Xiaofeng Yan @ 2011-10-24 3:37 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319427162.git.xiaofeng.yan@windriver.com>
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Use do_split_package for each grouping and name them correctly besides updating package.
The format to name plugins of qmmp:
qmmp-plugin-<group>-<library> with the Description: Qmmp <Group> plugin for %s"
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
meta/recipes-qt/qt-apps/qmmp_0.5.2.bb | 60 +++++++++++++++++++++++++++++++++
1 files changed, 60 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-qt/qt-apps/qmmp_0.5.2.bb
diff --git a/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb b/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb
new file mode 100644
index 0000000..58dd825
--- /dev/null
+++ b/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb
@@ -0,0 +1,60 @@
+dESCRIPTION = "Qmmp (Qt-based Multimedia Player) is an audio-player, written with help of Qt library"
+HOMEPAGE = "http://qmmp.ylsoftware.com"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
+SECTION = "multimedia"
+
+PR = "r4"
+
+PROVIDES = "qmmp"
+DEPENDS = "qt4-x11-free taglib libmad libvorbis libogg alsa-lib"
+RDEPENDS_${PN} += "taglib alsa-lib libmad curl"
+
+SRC_URI = "http://qmmp.ylsoftware.com/files/${BPN}-${PV}.tar.bz2"
+
+SRC_URI[md5sum] = "20852f3cce3471bfc5affa9b2e947dc6"
+SRC_URI[sha256sum] = "6391dec020d2a381d7f4b7890fae6c49eadf88b3c9aef571fe3c5e96140822ec"
+
+
+PARALLEL_MAKE = ""
+
+inherit qmake2 cmake package
+
+export EXTRA_OECMAKE = "-DQT_QMAKE_EXECUTABLE=${OE_QMAKE_QMAKE} \
+ -DQT_LRELEASE_EXECUTABLE=${OE_QMAKE_LRELEASE} \
+ -DQT_MOC_EXECUTABLE=${OE_QMAKE_MOC} \
+ -DQT_UIC_EXECUTABLE=${OE_QMAKE_UIC} \
+ -DQT_RCC_EXECUTABLE=${OE_QMAKE_RCC} \
+ -DQT_LIBRARY_DIR=${OE_QMAKE_LIBDIR_QT} \
+ -DQT_HEADERS_DIR=${OE_QMAKE_INCDIR_QT} \
+ -DQT_QTCORE_INCLUDE_DIR=${OE_QMAKE_INCDIR_QT}/QtCore \
+ "
+PACKAGES_DYNAMIC = "qmmp-plugin-* "
+
+
+python populate_packages_prepend () {
+ import os
+ qmmp_libdir = bb.data.expand('${libdir}/qmmp', d)
+ gd = bb.data.expand('${D}/${libdir}/qmmp', d)
+ plug_dirs = os.listdir(gd)
+
+ for plug_dir in plug_dirs:
+ g_plug_dir = os.path.join(qmmp_libdir,plug_dir)
+ do_split_packages(d, g_plug_dir, '^lib(.*)\.so$', 'qmmp-plugin-' + plug_dir + '-%s', 'Qmmp' + plug_dir + 'plugin for %s')
+
+
+
+}
+
+FILES_${PN} = "\
+ ${bindir}/qmmp \
+ ${libdir}/lib*${SOLIBS} \
+ ${datadir}/icons/* \
+ ${datadir}/qmmp/images/* \
+ ${datadir}/applications/* \
+ "
+
+FILES_${PN}-dbg += "\
+ ${libdir}/qmmp/*/.debug/* \
+ "
+
--
1.7.0.4
^ permalink raw reply related
* [PATCH 0/1] qmmp: update to 0.5.2
From: Xiaofeng Yan @ 2011-10-24 3:37 UTC (permalink / raw)
To: openembedded-core
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Hi saul,
Use do_split_package for each grouping and name them correctly besides updating package.
The format to name plugins of qmmp:
qmmp-plugin-<group>-<library> with the Description: Qmmp <Group> plugin for %s"
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: xiaofeng/qmmp_update
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=xiaofeng/qmmp_update
Thanks,
Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
Xiaofeng Yan (1):
qmmp: update to 0.5.2
meta/recipes-qt/qt-apps/qmmp_0.5.2.bb | 60 +++++++++++++++++++++++++++++++++
1 files changed, 60 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-qt/qt-apps/qmmp_0.5.2.bb
^ permalink raw reply
* Re: where is the binary file
From: Ni Qingliang @ 2011-10-24 2:31 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <1319421032.10032.22.camel@localhost.localdomain>
I have found out it!
the PN is tinbox, and I have installed the binary to '/usr/lib/tin/'
the bitbake will process '/lib/${PN}/' and '/usr/lib/${PN}', skipped my
own directory.
after change to /usr/lib/${PN}, it works!
On Mon, 2011-10-24 at 09:50 +0800, Ni Qingliang wrote:
> Hello All:
>
> I have installed some binary file into the /lib/xxx directory (used for
> FPGA), and can find them in the 'package' dir of the package. but can't
> find any in the 'packages-split' dir of it (and also not in the final
> image).
>
>
> Does anyone can tell me what happened?
>
>
>
> --
> Yi Qingliang
> niqingliang@insigma.com.cn
> http://niqingliang2003.wordpress.com
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
--
Yi Qingliang
niqingliang@insigma.com.cn
http://niqingliang2003.wordpress.com
^ permalink raw reply
* where is the binary file
From: Ni Qingliang @ 2011-10-24 1:50 UTC (permalink / raw)
To: openembedded-core
Hello All:
I have installed some binary file into the /lib/xxx directory (used for
FPGA), and can find them in the 'package' dir of the package. but can't
find any in the 'packages-split' dir of it (and also not in the final
image).
Does anyone can tell me what happened?
--
Yi Qingliang
niqingliang@insigma.com.cn
http://niqingliang2003.wordpress.com
^ permalink raw reply
* Re: [review/test 3/5] python, python-native: upgrade from 2.6.6 to 2.7.2
From: Kamble, Nitin A @ 2011-10-24 0:07 UTC (permalink / raw)
To: Martin Jansa; +Cc: Patches and discussions about the oe-core layer
In-Reply-To: <20111023062813.GC3497@jama.jama.net>
Hi Martin,
I tested python inside qemux86-64 and it was working fine. I could test small python scripts working as expected.
Thanks,
Nitin
> -----Original Message-----
> From: Martin Jansa [mailto:martin.jansa@gmail.com]
> Sent: Saturday, October 22, 2011 11:28 PM
> To: Kamble, Nitin A
> Cc: Patches and discussions about the oe-core layer
> Subject: Re: [OE-core] [review/test 3/5] python, python-native: upgrade
> from 2.6.6 to 2.7.2
>
> On Sat, Oct 22, 2011 at 04:54:00PM -0700, Kamble, Nitin A wrote:
> > Hi Martin,
> > I have kept my python work at nitin/python branch on poky contrib.
> the 2.7.2 python is working for all arches except arm. And I am going
> on vacation for few days, and I could not finish the python arm issue
> arm, so if you get a chance you can look into the arm issue, if you
> have not resolved it already then I will look into it again once I am
> back from my vacation on 13th Nov.
>
> Hi Nitin,
>
> I've tried already and failed, but I'll try again and I guess qemux86-
> 64 (linking to host libc and failing if it's not same version as the
> one in
> sysroot) is also still broken and should be taken care of too, right?
>
> Regards,
>
> > > -----Original Message-----
> > > From: openembedded-core-bounces@lists.openembedded.org
> > > [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf
> > > Of Martin Jansa
> > > Sent: Friday, October 14, 2011 2:12 AM
> > > To: Patches and discussions about the oe-core layer
> > > Subject: Re: [OE-core] [review/test 3/5] python, python-native:
> > > upgrade from 2.6.6 to 2.7.2
> > >
> > > On Fri, Oct 14, 2011 at 10:19:39AM +0200, Martin Jansa wrote:
> > > > On Thu, Oct 13, 2011 at 04:06:13PM -0700,
> nitin.a.kamble@intel.com
> > > wrote:
> > > > > From: Nitin A Kamble <nitin.a.kamble@intel.com>
> > > > >
> > > >
> > > > This patch does not apply after
> > > > 9f9612d15acc6ee3b71f52bdb3f1ec4cb56b1a17
> > > >
> > > > can you rebase on top of oe-core?
> > > >
> > > > Also please drop
> > > > DEFAULT_PREFERENCE = "-27"
> > > >
> > > > we have only one python version so I guess it's not usefull at
> all
> > > > anymore
> > > >
> > > > I'll apply it manually, test it here.. and report if those
> modules
> > > are
> > > > build later..
> > >
> > > seems the same as with previous version..
> > >
> > > log.do_compile full of
> > > /OE/shr-core/tmp/sysroots/x86_64-linux/usr/lib/libpython2.7.so:
> file
> > > not recognized: File format not recognized
> > > collect2: ld returned 1 exit status
> > >
> > > and only built module is sqlite
> > > OE @ ~/shr-core/tmp/work/armv4t-oe-linux-gnueabi/python-2.7.2-r0.0
> $
> > > ls Python-2.7.2/build/lib.linux-x86_64-2.7/
> > > _sqlite3.so
> > >
> > > while with 2.6 we had a lot of modules $ ls
> > > Python-2.6.6/build/lib.linux-x86_64-2.6/
> > > _bisect.so _codecs_jp.so _ctypes.so _fileio.so
> > > _json.so _random.so _testcapi.so bz2.so
> > > datetime.so itertools.so parser.so spwd.so
> > > unicodedata.so
> > > _bytesio.so _codecs_kr.so _ctypes_test.so
> _functools.so
> > > _locale.so _socket.so _weakref.so cPickle.so
> fcntl.so
> > > math.so pyexpat.so strop.so zlib.so
> > > _codecs_cn.so _codecs_tw.so _curses.so _hashlib.so
> > > _lsprof.so _sqlite3.so array.so cStringIO.so
> > > future_builtins.so mmap.so readline.so syslog.so
> > > _codecs_hk.so _collections.so _curses_panel.so _heapq.so
> > > _multibytecodec.so _ssl.so audioop.so cmath.so
> gdbm.so
> > > nis.so resource.so termios.so
> > > _codecs_iso2022.so _csv.so _elementtree.so _hotshot.so
> > > _multiprocessing.so _struct.so binascii.so crypt.so
> grp.so
> > > operator.so select.so time.so
> > >
> > > Can you please test that you have non-empty python-syslog python-
> > > resource python-elementtree python-fcntl python-zlib?
> > > And test build for qemuarm, because I guess that it links to -
> native
> > > libpython2.7 when you're building qemux86 on x86 host.
> > >
> > > But it seems that python runtime works now, thanks!
> > >
> > > Regards,
> > > --
> > > Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
>
> --
> Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
^ permalink raw reply
* Re: --root option in upstream shadow
From: Julian Pidancet @ 2011-10-24 0:06 UTC (permalink / raw)
To: openembedded-core, Scott Garman, Julian Pidancet,
pkg-shadow-devel
In-Reply-To: <20111022115412.GM16703@nekral.nekral.homelinux.net>
On Sat, Oct 22, 2011 at 12:54 PM, Nicolas François
<nicolas.francois@centraliens.net> wrote:
> Hello,
>
> I'm the upstream maintainer of the shadow utilities.
>
> I was informed of the OpenEmbedded's add_root_cmd_options patch and would
> like to integrate it upstream.
>
> First of all, thanks a lot for implementing this feature. I was asked
> multiple times for it or something similar, but never found time to work
> on it.
>
> I did not review it completely yet, but would have a question.
> What is the expected behavior when the utility authenticates the caller?
> 1] authenticate the caller in the caller's chroot
> 2] authenticate the caller in the target's chroot
> 3] both
>
> I currently think that 3] would be the right behavior: the caller needs to
> be authenticated to make sure it is allowed to use the tool, then it
> should be authenticated on the target to make sure the operation is
> allowed.
> ...But this is much more complex.
>
> If this is fine for you, I would prefer to disable this feature when the
> utility is setuid and not executed by root.
>
> Best Regards,
Hi Nicolas,
I'm affraid this patch does not do what you think it does. The --root
option does not apply to login, but only to the various administrative
tools that comes with it (gpasswd, groupadd, groupdel, groupmod,
grpconv, grpunconv, passwd, pwconv, pwunconv, useradd, userdel).
It allows OE to manipulate passwd and group files that are located in
a sysroot by chrooting into it, because all these programs have their
path to /etc/passwd and friends hardcoded.
This way, when OE builds a package which needs a special user to be
present at run-time, it can create the user off-line at build-time
instead of beeing required to create post-install scripts which does
the same job but has to be executed at run-time.
--
Julian
^ permalink raw reply
* Re: [CONSOLIDATED PULL 24/27] texi2html: Added recipe from OE
From: Khem Raj @ 2011-10-23 22:35 UTC (permalink / raw)
To: Saul Wold; +Cc: Patches and discussions about the oe-core layer
In-Reply-To: <4EA4757A.5010106@intel.com>
[-- Attachment #1: Type: text/plain, Size: 2357 bytes --]
On Sunday, October 23, 2011, Saul Wold <saul.wold@intel.com> wrote:
> On 10/23/2011 01:06 PM, Khem Raj wrote:
>>
>>
>> On Sunday, October 23, 2011, Saul Wold <sgw@linux.intel.com
>> <mailto:sgw@linux.intel.com>> wrote:
>> > Needed to build oe-core with oe-core
>>
> Nope, this is needed on the target image to build OE-core with an OE-Core
image.
Ok
>
> Sau!
>>
>> Oe-Core with oe-core did u mean meta-oe in one place ?
>> >
>> > Signed-off-by: Saul Wold <sgw@linux.intel.com
>> <mailto:sgw@linux.intel.com>>
>> > ---
>> > meta/recipes-extended/texi2html/texi2html_1.82.bb
>> <http://texi2html_1.82.bb> | 14 ++++++++++++++
>> > 1 files changed, 14 insertions(+), 0 deletions(-)
>> > create mode 100644 meta/recipes-extended/texi2html/texi2html_1.82.bb
>> <http://texi2html_1.82.bb>
>> >
>> > diff --git a/meta/recipes-extended/texi2html/texi2html_1.82.bb
>> <http://texi2html_1.82.bb>
>> b/meta/recipes-extended/texi2html/texi2html_1.82.bb
>> <http://texi2html_1.82.bb>
>> > new file mode 100644
>> > index 0000000..f19b576
>> > --- /dev/null
>> > +++ b/meta/recipes-extended/texi2html/texi2html_1.82.bb
>> <http://texi2html_1.82.bb>
>> > @@ -0,0 +1,14 @@
>> > +DESCRIPTION = "Perl script that converts Texinfo to HTML"
>> > +HOMEPAGE = "http://www.nongnu.org/texi2html/"
>> > +SECTION = "console/utils"
>> > +LICENSE = "GPLv2"
>> > +LIC_FILES_CHKSUM =
"file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
>> > +
>> > +PR = "r0"
>> > +
>> > +SRC_URI =
>> "http://download.savannah.gnu.org/releases/texi2html/${P}.tar.bz2"
>> > +
>> > +SRC_URI[md5sum] = "a8a9193c0ac1bec2f3ca7be40a5a82eb"
>> > +SRC_URI[sha256sum] =
>> "d69c1effc416896409003ea64fdb21152cc0a9a7c665d437a0a3bef9b588b4f1"
>> > +
>> > +inherit autotools
>> > --
>> > 1.7.6.4
>> >
>> >
>> > _______________________________________________
>> > Openembedded-core mailing list
>> > Openembedded-core@lists.openembedded.org
>> <mailto:Openembedded-core@lists.openembedded.org>
>> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>> >
>>
>>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
>
[-- Attachment #2: Type: text/html, Size: 4301 bytes --]
^ permalink raw reply
* Re: [CONSOLIDATED PULL 24/27] texi2html: Added recipe from OE
From: Saul Wold @ 2011-10-23 20:13 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <CAMKF1soJ1Kv77_dNijQTWjzk8W+M5z2+yg2SUPxZtADLgum2CA@mail.gmail.com>
On 10/23/2011 01:06 PM, Khem Raj wrote:
>
>
> On Sunday, October 23, 2011, Saul Wold <sgw@linux.intel.com
> <mailto:sgw@linux.intel.com>> wrote:
> > Needed to build oe-core with oe-core
>
Nope, this is needed on the target image to build OE-core with an
OE-Core image.
Sau!
> Oe-Core with oe-core did u mean meta-oe in one place ?
> >
> > Signed-off-by: Saul Wold <sgw@linux.intel.com
> <mailto:sgw@linux.intel.com>>
> > ---
> > meta/recipes-extended/texi2html/texi2html_1.82.bb
> <http://texi2html_1.82.bb> | 14 ++++++++++++++
> > 1 files changed, 14 insertions(+), 0 deletions(-)
> > create mode 100644 meta/recipes-extended/texi2html/texi2html_1.82.bb
> <http://texi2html_1.82.bb>
> >
> > diff --git a/meta/recipes-extended/texi2html/texi2html_1.82.bb
> <http://texi2html_1.82.bb>
> b/meta/recipes-extended/texi2html/texi2html_1.82.bb
> <http://texi2html_1.82.bb>
> > new file mode 100644
> > index 0000000..f19b576
> > --- /dev/null
> > +++ b/meta/recipes-extended/texi2html/texi2html_1.82.bb
> <http://texi2html_1.82.bb>
> > @@ -0,0 +1,14 @@
> > +DESCRIPTION = "Perl script that converts Texinfo to HTML"
> > +HOMEPAGE = "http://www.nongnu.org/texi2html/"
> > +SECTION = "console/utils"
> > +LICENSE = "GPLv2"
> > +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
> > +
> > +PR = "r0"
> > +
> > +SRC_URI =
> "http://download.savannah.gnu.org/releases/texi2html/${P}.tar.bz2"
> > +
> > +SRC_URI[md5sum] = "a8a9193c0ac1bec2f3ca7be40a5a82eb"
> > +SRC_URI[sha256sum] =
> "d69c1effc416896409003ea64fdb21152cc0a9a7c665d437a0a3bef9b588b4f1"
> > +
> > +inherit autotools
> > --
> > 1.7.6.4
> >
> >
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> <mailto:Openembedded-core@lists.openembedded.org>
> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
> >
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
^ permalink raw reply
* Re: [CONSOLIDATED PULL 24/27] texi2html: Added recipe from OE
From: Khem Raj @ 2011-10-23 20:06 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <9d70a72f5ab24bc0424f11311c8eb6b19f3d2987.1319394187.git.sgw@linux.intel.com>
[-- Attachment #1: Type: text/plain, Size: 1471 bytes --]
On Sunday, October 23, 2011, Saul Wold <sgw@linux.intel.com> wrote:
> Needed to build oe-core with oe-core
Oe-Core with oe-core did u mean meta-oe in one place ?
>
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
> meta/recipes-extended/texi2html/texi2html_1.82.bb | 14 ++++++++++++++
> 1 files changed, 14 insertions(+), 0 deletions(-)
> create mode 100644 meta/recipes-extended/texi2html/texi2html_1.82.bb
>
> diff --git a/meta/recipes-extended/texi2html/texi2html_1.82.bbb/meta/recipes-extended/texi2html/
texi2html_1.82.bb
> new file mode 100644
> index 0000000..f19b576
> --- /dev/null
> +++ b/meta/recipes-extended/texi2html/texi2html_1.82.bb
> @@ -0,0 +1,14 @@
> +DESCRIPTION = "Perl script that converts Texinfo to HTML"
> +HOMEPAGE = "http://www.nongnu.org/texi2html/"
> +SECTION = "console/utils"
> +LICENSE = "GPLv2"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
> +
> +PR = "r0"
> +
> +SRC_URI = "
http://download.savannah.gnu.org/releases/texi2html/${P}.tar.bz2"
> +
> +SRC_URI[md5sum] = "a8a9193c0ac1bec2f3ca7be40a5a82eb"
> +SRC_URI[sha256sum] =
"d69c1effc416896409003ea64fdb21152cc0a9a7c665d437a0a3bef9b588b4f1"
> +
> +inherit autotools
> --
> 1.7.6.4
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
[-- Attachment #2: Type: text/html, Size: 2343 bytes --]
^ permalink raw reply
* Re: [PATCH 2/2] pulseaudio: inherit perlnative
From: Saul Wold @ 2011-10-23 18:31 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <1319380267-29794-2-git-send-email-raj.khem@gmail.com>
On 10/23/2011 07:31 AM, Khem Raj wrote:
> manpage generatition uses xmltoman utility
> which inturn uses xml-parser. So we add
> libxml-parser-perl-native to DEPENDS and also
> inherit perlnative so it does not use the one
> from build host
>
> Signed-off-by: Khem Raj<raj.khem@gmail.com>
> ---
> .../pulseaudio/pulseaudio_0.9.23.bb | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb
> index 33f5e15..9521ab0 100644
> --- a/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb
> +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb
> @@ -1,10 +1,10 @@
> require pulseaudio.inc
>
> -PR = "r5"
> +PR = "r6"
>
> -DEPENDS += "gdbm speex"
> +DEPENDS += "gdbm speex libxml-parser-perl-native"
>
> -inherit gettext
> +inherit gettext perlnative
>
> SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${PV}.tar.gz \
> file://buildfix.patch \
This patch is already out there from Martin, I just submitted it in a
CONSOLIDATED PULL.
Sau!
^ permalink raw reply
* [CONSOLIDATED PULL 25/27] oprofile: Update to 0.9.7 and convert cvs->git
From: Saul Wold @ 2011-10-23 18:27 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319394187.git.sgw@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../oprofile/{oprofile_0.9.6.bb => oprofile.inc} | 13 +++------
meta/recipes-kernel/oprofile/oprofile_0.9.7.bb | 11 ++++++++
meta/recipes-kernel/oprofile/oprofile_cvs.bb | 28 --------------------
meta/recipes-kernel/oprofile/oprofile_git.bb | 11 ++++++++
4 files changed, 26 insertions(+), 37 deletions(-)
rename meta/recipes-kernel/oprofile/{oprofile_0.9.6.bb => oprofile.inc} (70%)
create mode 100644 meta/recipes-kernel/oprofile/oprofile_0.9.7.bb
delete mode 100644 meta/recipes-kernel/oprofile/oprofile_cvs.bb
create mode 100644 meta/recipes-kernel/oprofile/oprofile_git.bb
diff --git a/meta/recipes-kernel/oprofile/oprofile_0.9.6.bb b/meta/recipes-kernel/oprofile/oprofile.inc
similarity index 70%
rename from meta/recipes-kernel/oprofile/oprofile_0.9.6.bb
rename to meta/recipes-kernel/oprofile/oprofile.inc
index 0f154c8..73a5a07 100644
--- a/meta/recipes-kernel/oprofile/oprofile_0.9.6.bb
+++ b/meta/recipes-kernel/oprofile/oprofile.inc
@@ -15,21 +15,16 @@ DEPENDS = "popt binutils"
RDEPENDS_${PN} = "binutils-symlinks"
RRECOMMENDS_${PN} = "kernel-vmlinux"
-FILES_${PN} = "${bindir} ${libdir}/${BPN}/lib*.so.* ${datadir}/${BPN}"
-FILES_${PN}-dev += "${libdir}/${BPN}/lib*.so ${libdir}/${BPN}/lib*.la"
+FILES_${PN} = "${bindir} ${libdir}/${BPN}/lib*${SOLIBS} ${datadir}/${BPN}"
+FILES_${PN}-dev += "${libdir}/${BPN}/lib*${SOLIBSDEV} ${libdir}/${BPN}/lib*.la"
FILES_${PN}-staticdev += "${libdir}/${BPN}/lib*.a"
-PR = "r2"
+INC_PR = "r0"
-SRC_URI = "${SOURCEFORGE_MIRROR}/oprofile/oprofile-${PV}.tar.gz \
- file://opstart.patch \
+SRC_URI = "file://opstart.patch \
file://oprofile-no-query-modules.patch \
file://acinclude.m4"
-SRC_URI[md5sum] = "4e407093ac06200185d5a5e6437d7242"
-SRC_URI[sha256sum] = "3f0dd40a7749fc650d25d79d42ebbff8f3b6db310c36e7c3839696cc09077880"
-S = "${WORKDIR}/oprofile-${PV}"
-
inherit autotools
EXTRA_OECONF = "--with-kernel-support --without-x"
diff --git a/meta/recipes-kernel/oprofile/oprofile_0.9.7.bb b/meta/recipes-kernel/oprofile/oprofile_0.9.7.bb
new file mode 100644
index 0000000..d7e1511
--- /dev/null
+++ b/meta/recipes-kernel/oprofile/oprofile_0.9.7.bb
@@ -0,0 +1,11 @@
+require oprofile.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI += "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "8b5d1d9b65f84420bcc3234777ad3be3"
+SRC_URI[sha256sum] = "cb5b507d5dea058d223fcad3cec8ff9638a4163106afd66d176798bbd973d527"
+
+S = "${WORKDIR}/oprofile-${PV}"
+
diff --git a/meta/recipes-kernel/oprofile/oprofile_cvs.bb b/meta/recipes-kernel/oprofile/oprofile_cvs.bb
deleted file mode 100644
index c66f4d3..0000000
--- a/meta/recipes-kernel/oprofile/oprofile_cvs.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-PV = "0.9.4+cvs${SRCDATE}"
-PR = "r1"
-SECTION = "devel"
-SUMMARY = "System-Wide Profiler"
-DESCRIPTION = "OProfile is a system-wide profiler for Linux systems, capable \
-of profiling all running code at low overhead."
-LICENSE = "GPL"
-DEPENDS = "popt binutils"
-RDEPENDS_${PN} = "binutils-symlinks"
-RRECOMMENDS_${PN} = "kernel-vmlinux"
-
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "cvs://anonymous@oprofile.cvs.sourceforge.net/cvsroot/oprofile;module=oprofile \
- file://opstart.patch \
- file://acinclude.m4"
-S = "${WORKDIR}/oprofile"
-
-inherit autotools
-
-EXTRA_OECONF = "--with-kernel-support \
- --without-x \
- --disable-werror "
-
-do_configure () {
- cp ${WORKDIR}/acinclude.m4 ${S}/
- autotools_do_configure
-}
diff --git a/meta/recipes-kernel/oprofile/oprofile_git.bb b/meta/recipes-kernel/oprofile/oprofile_git.bb
new file mode 100644
index 0000000..c345548
--- /dev/null
+++ b/meta/recipes-kernel/oprofile/oprofile_git.bb
@@ -0,0 +1,11 @@
+require oprofile.inc
+
+SRCREV = "88f43190d412d28ebf5c75a76ba20343d0fe4c41"
+PV = "0.9.7+git${SRCPV}"
+PR = "${INC_PR}.0"
+
+SRC_URI += "git://oprofile.git.sourceforge.net/gitroot/${BPN}/${BPN};protocol=git"
+
+S = "${WORKDIR}/git"
+
+DEFAULT_PREFERENCE = "-1"
--
1.7.6.4
^ permalink raw reply related
* [CONSOLIDATED PULL 27/27] perl: remove debug set -x; pwd
From: Saul Wold @ 2011-10-23 18:27 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319394187.git.sgw@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-devtools/perl/perl_5.14.2.bb | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/perl/perl_5.14.2.bb b/meta/recipes-devtools/perl/perl_5.14.2.bb
index 6bd51ad..7889626 100644
--- a/meta/recipes-devtools/perl/perl_5.14.2.bb
+++ b/meta/recipes-devtools/perl/perl_5.14.2.bb
@@ -207,8 +207,6 @@ do_install() {
PACKAGE_PREPROCESS_FUNCS += "perl_package_preprocess"
perl_package_preprocess () {
- set -x
- pwd
# Fix up installed configuration
sed -i -e "s,${D},,g" \
-e "s,-isystem${STAGING_INCDIR} ,,g" \
--
1.7.6.4
^ permalink raw reply related
* [CONSOLIDATED PULL 26/27] abiword: convert to svn
From: Saul Wold @ 2011-10-23 18:27 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319394187.git.sgw@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta-demoapps/recipes-gnome/abiword/abiword.inc | 4 ++--
meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb | 10 ----------
meta-demoapps/recipes-gnome/abiword/abiword_svn.bb | 10 ++++++++++
3 files changed, 12 insertions(+), 12 deletions(-)
delete mode 100644 meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb
create mode 100644 meta-demoapps/recipes-gnome/abiword/abiword_svn.bb
diff --git a/meta-demoapps/recipes-gnome/abiword/abiword.inc b/meta-demoapps/recipes-gnome/abiword/abiword.inc
index b1b0f67..2b34a7a 100644
--- a/meta-demoapps/recipes-gnome/abiword/abiword.inc
+++ b/meta-demoapps/recipes-gnome/abiword/abiword.inc
@@ -13,8 +13,8 @@ RRECOMMENDS_${PN} = "glibc-gconv-ibm850 glibc-gconv-cp1252 \
RELURI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz"
RELSRC = "${WORKDIR}/abiword-${PV}/abi"
-CVSURI = "cvs://anoncvs:anoncvs@anoncvs.abisource.com/cvsroot;module=abi"
-CVSSRC = "${WORKDIR}/abi"
+SVNURI = "cvs://svn.abisource.com/abiword/trunk;module=abiword;proto=http"
+SVNSRC = "${WORKDIR}/abi"
#want 2.x from 2.x.y for the installation directory
SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
diff --git a/meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb b/meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb
deleted file mode 100644
index 163029e..0000000
--- a/meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require abiword.inc
-
-SRCDATE = "20070130"
-PV="2.5.0+cvs${SRCDATE}"
-PR = "r4"
-
-SRC_URI = "${CVSURI}"
-
-S = "${CVSSRC}"
-
diff --git a/meta-demoapps/recipes-gnome/abiword/abiword_svn.bb b/meta-demoapps/recipes-gnome/abiword/abiword_svn.bb
new file mode 100644
index 0000000..a8946a8
--- /dev/null
+++ b/meta-demoapps/recipes-gnome/abiword/abiword_svn.bb
@@ -0,0 +1,10 @@
+require abiword.inc
+
+SRCREV = "21818"
+PV="2.5.2+svnr${SRCPV}"
+PR = "r0"
+
+SRC_URI = "${SVNURI}"
+
+S = "${SVNSRC}"
+
--
1.7.6.4
^ permalink raw reply related
* [CONSOLIDATED PULL 24/27] texi2html: Added recipe from OE
From: Saul Wold @ 2011-10-23 18:27 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319394187.git.sgw@linux.intel.com>
Needed to build oe-core with oe-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-extended/texi2html/texi2html_1.82.bb | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-extended/texi2html/texi2html_1.82.bb
diff --git a/meta/recipes-extended/texi2html/texi2html_1.82.bb b/meta/recipes-extended/texi2html/texi2html_1.82.bb
new file mode 100644
index 0000000..f19b576
--- /dev/null
+++ b/meta/recipes-extended/texi2html/texi2html_1.82.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Perl script that converts Texinfo to HTML"
+HOMEPAGE = "http://www.nongnu.org/texi2html/"
+SECTION = "console/utils"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
+
+PR = "r0"
+
+SRC_URI = "http://download.savannah.gnu.org/releases/texi2html/${P}.tar.bz2"
+
+SRC_URI[md5sum] = "a8a9193c0ac1bec2f3ca7be40a5a82eb"
+SRC_URI[sha256sum] = "d69c1effc416896409003ea64fdb21152cc0a9a7c665d437a0a3bef9b588b4f1"
+
+inherit autotools
--
1.7.6.4
^ permalink raw reply related
* [CONSOLIDATED PULL 22/27] kernel.bbclass: respect MACHINE_KERNEL_PR
From: Saul Wold @ 2011-10-23 18:27 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319394187.git.sgw@linux.intel.com>
From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
MACHINE_KERNEL_PR was introduced long ago in org.oe.dev. It's present in
meta-oe kernel.bbclass. Several machines depend on this functionality.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
meta/classes/kernel.bbclass | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 42543e0..60be980 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -20,6 +20,11 @@ python __anonymous () {
image = bb.data.getVar('INITRAMFS_IMAGE', d, True)
if image:
bb.data.setVar('INITRAMFS_TASK', '${INITRAMFS_IMAGE}:do_rootfs', d)
+
+ machine_kernel_pr = bb.data.getVar('MACHINE_KERNEL_PR', d, True)
+
+ if machine_kernel_pr:
+ bb.data.setVar('PR', machine_kernel_pr, d)
}
inherit kernel-arch deploy
--
1.7.6.4
^ permalink raw reply related
* [CONSOLIDATED PULL 23/27] wget: Add recipe from OE
From: Saul Wold @ 2011-10-23 18:27 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319394187.git.sgw@linux.intel.com>
Needed to support building oe-core with oe-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../wget/wget-1.12/fix_makefile.patch | 59 +++++
.../wget/wget-1.12/gnutls.bzr.patch | 266 ++++++++++++++++++++
meta/recipes-extended/wget/wget.inc | 40 +++
meta/recipes-extended/wget/wget_1.12.bb | 11 +
4 files changed, 376 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-extended/wget/wget-1.12/fix_makefile.patch
create mode 100644 meta/recipes-extended/wget/wget-1.12/gnutls.bzr.patch
create mode 100644 meta/recipes-extended/wget/wget.inc
create mode 100644 meta/recipes-extended/wget/wget_1.12.bb
diff --git a/meta/recipes-extended/wget/wget-1.12/fix_makefile.patch b/meta/recipes-extended/wget/wget-1.12/fix_makefile.patch
new file mode 100644
index 0000000..3f34c76
--- /dev/null
+++ b/meta/recipes-extended/wget/wget-1.12/fix_makefile.patch
@@ -0,0 +1,59 @@
+
+Upstream-Status: Pending
+
+Signed-off-by: Saul Wold <sgw@linux.intel.com>
+
+Index: wget-1.12/po/Makefile.in.in
+===================================================================
+--- wget-1.12.orig/po/Makefile.in.in 2009-09-04 09:31:54.000000000 -0700
++++ wget-1.12/po/Makefile.in.in 2011-10-19 20:32:53.714812160 -0700
+@@ -8,8 +8,8 @@
+ # Please note that the actual code of GNU gettext is covered by the GNU
+ # General Public License and is *not* in the public domain.
+ #
+-# Origin: gettext-0.17
+-GETTEXT_MACRO_VERSION = 0.17
++# Origin: gettext-0.18
++GETTEXT_MACRO_VERSION = 0.18
+
+ PACKAGE = @PACKAGE@
+ VERSION = @VERSION@
+Index: wget-1.12/configure.ac
+===================================================================
+--- wget-1.12.orig/configure.ac 2009-09-22 09:39:49.000000000 -0700
++++ wget-1.12/configure.ac 2011-10-19 20:32:53.714812160 -0700
+@@ -110,7 +110,7 @@
+ dnl Gettext
+ dnl
+ AM_GNU_GETTEXT([external],[need-ngettext])
+-AM_GNU_GETTEXT_VERSION([0.17])
++AM_GNU_GETTEXT_VERSION([0.18])
+
+ AC_PROG_RANLIB
+
+Index: wget-1.12/configure
+===================================================================
+--- wget-1.12.orig/configure 2009-09-22 09:40:13.000000000 -0700
++++ wget-1.12/configure 2011-10-19 20:33:46.578812174 -0700
+@@ -5297,7 +5297,7 @@
+
+
+
+- GETTEXT_MACRO_VERSION=0.17
++ GETTEXT_MACRO_VERSION=0.18
+
+
+
+Index: wget-1.12/m4/po.m4
+===================================================================
+--- wget-1.12.orig/m4/po.m4 2009-09-04 09:31:54.000000000 -0700
++++ wget-1.12/m4/po.m4 2011-10-19 20:33:53.426812176 -0700
+@@ -30,7 +30,7 @@
+
+ dnl Release version of the gettext macros. This is used to ensure that
+ dnl the gettext macros and po/Makefile.in.in are in sync.
+- AC_SUBST([GETTEXT_MACRO_VERSION], [0.17])
++ AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
+
+ dnl Perform the following tests also if --disable-nls has been given,
+ dnl because they are needed for "make dist" to work.
diff --git a/meta/recipes-extended/wget/wget-1.12/gnutls.bzr.patch b/meta/recipes-extended/wget/wget-1.12/gnutls.bzr.patch
new file mode 100644
index 0000000..6f0c2eb
--- /dev/null
+++ b/meta/recipes-extended/wget/wget-1.12/gnutls.bzr.patch
@@ -0,0 +1,266 @@
+--- wget-1.12/src/gnutls.c 2009-09-22 04:59:33.000000000 +0200
++++ /OE/projects/wget/src/gnutls.c 2010-10-30 16:24:10.000000000 +0200
+@@ -1,6 +1,6 @@
+ /* SSL support via GnuTLS library.
+- Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+- Inc.
++ Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software
++ Foundation, Inc.
+
+ This file is part of GNU Wget.
+
+@@ -37,6 +37,8 @@
+ #endif
+ #include <string.h>
+ #include <stdio.h>
++#include <dirent.h>
++#include <stdlib.h>
+
+ #include <gnutls/gnutls.h>
+ #include <gnutls/x509.h>
+@@ -46,6 +48,10 @@
+ #include "url.h"
+ #include "ssl.h"
+
++#ifdef WIN32
++# include "w32sock.h"
++#endif
++
+ /* Note: some of the functions private to this file have names that
+ begin with "wgnutls_" (e.g. wgnutls_read) so that they wouldn't be
+ confused with actual gnutls functions -- such as the gnutls_read
+@@ -56,15 +62,50 @@
+ bool
+ ssl_init ()
+ {
++ const char *ca_directory;
++ DIR *dir;
++
+ gnutls_global_init ();
+ gnutls_certificate_allocate_credentials (&credentials);
++
++ ca_directory = opt.ca_directory ? opt.ca_directory : "/etc/ssl/certs";
++
++ dir = opendir (ca_directory);
++ if (dir == NULL)
++ {
++ if (opt.ca_directory)
++ logprintf (LOG_NOTQUIET, _("ERROR: Cannot open directory %s.\n"),
++ opt.ca_directory);
++ }
++ else
++ {
++ struct dirent *dent;
++ while ((dent = readdir (dir)) != NULL)
++ {
++ struct stat st;
++ char *ca_file;
++ asprintf (&ca_file, "%s/%s", ca_directory, dent->d_name);
++
++ stat (ca_file, &st);
++
++ if (S_ISREG (st.st_mode))
++ gnutls_certificate_set_x509_trust_file (credentials, ca_file,
++ GNUTLS_X509_FMT_PEM);
++
++ free (ca_file);
++ }
++
++ closedir (dir);
++ }
++
+ if (opt.ca_cert)
+ gnutls_certificate_set_x509_trust_file (credentials, opt.ca_cert,
+ GNUTLS_X509_FMT_PEM);
+ return true;
+ }
+
+-struct wgnutls_transport_context {
++struct wgnutls_transport_context
++{
+ gnutls_session session; /* GnuTLS session handle */
+ int last_error; /* last error returned by read/write/... */
+
+@@ -73,7 +114,7 @@
+ is stored to PEEKBUF, and wgnutls_read checks that buffer before
+ actually reading. */
+ char peekbuf[512];
+- int peekstart, peeklen;
++ int peeklen;
+ };
+
+ #ifndef MIN
+@@ -83,19 +124,18 @@
+ static int
+ wgnutls_read (int fd, char *buf, int bufsize, void *arg)
+ {
+- int ret;
++ int ret = 0;
+ struct wgnutls_transport_context *ctx = arg;
+
+ if (ctx->peeklen)
+ {
+ /* If we have any peek data, simply return that. */
+ int copysize = MIN (bufsize, ctx->peeklen);
+- memcpy (buf, ctx->peekbuf + ctx->peekstart, copysize);
++ memcpy (buf, ctx->peekbuf, copysize);
+ ctx->peeklen -= copysize;
+ if (ctx->peeklen != 0)
+- ctx->peekstart += copysize;
+- else
+- ctx->peekstart = 0;
++ memmove (ctx->peekbuf, ctx->peekbuf + copysize, ctx->peeklen);
++
+ return copysize;
+ }
+
+@@ -105,6 +145,7 @@
+
+ if (ret < 0)
+ ctx->last_error = ret;
++
+ return ret;
+ }
+
+@@ -124,31 +165,49 @@
+ static int
+ wgnutls_poll (int fd, double timeout, int wait_for, void *arg)
+ {
+- return 1;
++ struct wgnutls_transport_context *ctx = arg;
++ return ctx->peeklen || gnutls_record_check_pending (ctx->session)
++ || select_fd (fd, timeout, wait_for);
+ }
+
+ static int
+ wgnutls_peek (int fd, char *buf, int bufsize, void *arg)
+ {
+- int ret;
++ int ret = 0;
+ struct wgnutls_transport_context *ctx = arg;
+-
+- /* We don't support peeks following peeks: the reader must drain all
+- peeked data before the next peek. */
+- assert (ctx->peeklen == 0);
++ int offset = MIN (bufsize, ctx->peeklen);
+ if (bufsize > sizeof ctx->peekbuf)
+ bufsize = sizeof ctx->peekbuf;
+
+- do
+- ret = gnutls_record_recv (ctx->session, buf, bufsize);
+- while (ret == GNUTLS_E_INTERRUPTED);
++ if (ctx->peeklen)
++ memcpy (buf, ctx->peekbuf, offset);
+
+- if (ret >= 0)
++ if (bufsize > offset)
+ {
+- memcpy (ctx->peekbuf, buf, ret);
+- ctx->peeklen = ret;
++ do
++ {
++ ret = gnutls_record_recv (ctx->session, buf + offset,
++ bufsize - offset);
++ }
++ while (ret == GNUTLS_E_INTERRUPTED);
++
++ if (ret < 0)
++ {
++ if (offset)
++ ret = 0;
++ else
++ return ret;
++ }
++
++ if (ret > 0)
++ {
++ memcpy (ctx->peekbuf + offset, buf + offset,
++ ret);
++ ctx->peeklen += ret;
++ }
+ }
+- return ret;
++
++ return offset + ret;
+ }
+
+ static const char *
+@@ -165,23 +224,20 @@
+ /*gnutls_bye (ctx->session, GNUTLS_SHUT_RDWR);*/
+ gnutls_deinit (ctx->session);
+ xfree (ctx);
+-#ifndef WINDOWS
+ close (fd);
+-#else
+- closesocket (fd);
+-#endif
+ }
+
+ /* gnutls_transport is the singleton that describes the SSL transport
+ methods provided by this file. */
+
+-static struct transport_implementation wgnutls_transport = {
++static struct transport_implementation wgnutls_transport =
++{
+ wgnutls_read, wgnutls_write, wgnutls_poll,
+ wgnutls_peek, wgnutls_errstr, wgnutls_close
+ };
+
+ bool
+-ssl_connect (int fd)
++ssl_connect_wget (int fd)
+ {
+ static const int cert_type_priority[] = {
+ GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0
+@@ -189,11 +245,42 @@
+ struct wgnutls_transport_context *ctx;
+ gnutls_session session;
+ int err;
++ int allowed_protocols[4] = {0, 0, 0, 0};
+ gnutls_init (&session, GNUTLS_CLIENT);
+ gnutls_set_default_priority (session);
+ gnutls_certificate_type_set_priority (session, cert_type_priority);
+ gnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE, credentials);
+- gnutls_transport_set_ptr (session, (gnutls_transport_ptr) fd);
++#ifndef FD_TO_SOCKET
++# define FD_TO_SOCKET(X) (X)
++#endif
++ gnutls_transport_set_ptr (session, (gnutls_transport_ptr) FD_TO_SOCKET (fd));
++
++ err = 0;
++ switch (opt.secure_protocol)
++ {
++ case secure_protocol_auto:
++ break;
++ case secure_protocol_sslv2:
++ case secure_protocol_sslv3:
++ allowed_protocols[0] = GNUTLS_SSL3;
++ err = gnutls_protocol_set_priority (session, allowed_protocols);
++ break;
++ case secure_protocol_tlsv1:
++ allowed_protocols[0] = GNUTLS_TLS1_0;
++ allowed_protocols[1] = GNUTLS_TLS1_1;
++ allowed_protocols[2] = GNUTLS_TLS1_2;
++ err = gnutls_protocol_set_priority (session, allowed_protocols);
++ break;
++ default:
++ abort ();
++ }
++ if (err < 0)
++ {
++ logprintf (LOG_NOTQUIET, "GnuTLS: %s\n", gnutls_strerror (err));
++ gnutls_deinit (session);
++ return false;
++ }
++
+ err = gnutls_handshake (session);
+ if (err < 0)
+ {
+@@ -201,6 +288,7 @@
+ gnutls_deinit (session);
+ return false;
+ }
++
+ ctx = xnew0 (struct wgnutls_transport_context);
+ ctx->session = session;
+ fd_register_transport (fd, &wgnutls_transport, ctx);
diff --git a/meta/recipes-extended/wget/wget.inc b/meta/recipes-extended/wget/wget.inc
new file mode 100644
index 0000000..c0d9ba9
--- /dev/null
+++ b/meta/recipes-extended/wget/wget.inc
@@ -0,0 +1,40 @@
+DESCRIPTION = "A console URL download utility featuring HTTP, FTP, and more."
+SECTION = "console/network"
+DEPENDS = ""
+DEPENDS_shr = "gnutls"
+LICENSE = "GPL"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+
+
+INC_PR = "r9"
+
+S = "${WORKDIR}/wget-${PV}"
+
+inherit autotools gettext
+
+# Disable checking for SSL since that searches the system paths
+EXTRA_OECONF = "--enable-ipv6 --without-ssl"
+
+# Enable SSL it's usefull
+EXTRA_OECONF_shr = "--enable-ipv6 --with-ssl=gnutls"
+# The unslung kernel does not support ipv6
+EXTRA_OECONF_unslung = "--without-ssl"
+# SlugOS kernels do not support ipv6. Can be loaded as a module.
+EXTRA_OECONF_slugos = "--without-ssl"
+
+do_configure() {
+ autotools_do_configure
+}
+
+inherit autotools update-alternatives
+
+EXTRA_OECONF = "--with-libc"
+
+do_install_append () {
+ mv ${D}${bindir}/wget ${D}${bindir}/wget.${PN}
+}
+
+ALTERNATIVE_NAME = "wget"
+ALTERNATIVE_LINK = "${base_bindir}/wget"
+ALTERNATIVE_PATH = "${base_bindir}/wget.${PN}"
+ALTERNATIVE_PRIORITY = "100"
diff --git a/meta/recipes-extended/wget/wget_1.12.bb b/meta/recipes-extended/wget/wget_1.12.bb
new file mode 100644
index 0000000..cab27e9
--- /dev/null
+++ b/meta/recipes-extended/wget/wget_1.12.bb
@@ -0,0 +1,11 @@
+PR = "${INC_PR}.1"
+
+SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \
+ file://gnutls.bzr.patch \
+ file://fix_makefile.patch \
+ "
+
+SRC_URI[md5sum] = "141461b9c04e454dc8933c9d1f2abf83"
+SRC_URI[sha256sum] = "7578ed0974e12caa71120581fa3962ee5a69f7175ddc3d6a6db0ecdcba65b572"
+
+require wget.inc
--
1.7.6.4
^ permalink raw reply related
* [CONSOLIDATED PULL 21/27] default-providers: switch virtual/libgl from mesa-xlib to mesa-dri
From: Saul Wold @ 2011-10-23 18:26 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319394187.git.sgw@linux.intel.com>
From: Martin Jansa <martin.jansa@gmail.com>
* to match default virtual/xserver
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/conf/distro/include/default-providers.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
index 66f7ff3..be23d36 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -5,7 +5,7 @@ PREFERRED_PROVIDER_virtual/db ?= "db"
PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
-PREFERRED_PROVIDER_virtual/libgl ?= "mesa-xlib"
+PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth"
PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native"
PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
--
1.7.6.4
^ permalink raw reply related
* [CONSOLIDATED PULL 20/27] libtool: Upgrade from 2.4 -> 2.4.2
From: Saul Wold @ 2011-10-23 18:26 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319394187.git.sgw@linux.intel.com>
From: Khem Raj <raj.khem@gmail.com>
Adjust prefix.patch and delete resolve-sysroot.patch
since its already applied upstream
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../libtool/{libtool.inc => libtool-2.4.2.inc} | 26 +++++++++---
meta/recipes-devtools/libtool/libtool-2.4.inc | 13 ------
...libtool-cross_2.4.bb => libtool-cross_2.4.2.bb} | 2 +-
...btool-native_2.4.bb => libtool-native_2.4.2.bb} | 2 +-
...nativesdk_2.4.bb => libtool-nativesdk_2.4.2.bb} | 2 +-
meta/recipes-devtools/libtool/libtool/prefix.patch | 46 ++++++++++----------
.../libtool/libtool/resolve-sysroot.patch | 42 ------------------
.../libtool/{libtool_2.4.bb => libtool_2.4.2.bb} | 2 +-
8 files changed, 47 insertions(+), 88 deletions(-)
rename meta/recipes-devtools/libtool/{libtool.inc => libtool-2.4.2.inc} (57%)
delete mode 100644 meta/recipes-devtools/libtool/libtool-2.4.inc
rename meta/recipes-devtools/libtool/{libtool-cross_2.4.bb => libtool-cross_2.4.2.bb} (98%)
rename meta/recipes-devtools/libtool/{libtool-native_2.4.bb => libtool-native_2.4.2.bb} (96%)
rename meta/recipes-devtools/libtool/{libtool-nativesdk_2.4.bb => libtool-nativesdk_2.4.2.bb} (97%)
delete mode 100644 meta/recipes-devtools/libtool/libtool/resolve-sysroot.patch
rename meta/recipes-devtools/libtool/{libtool_2.4.bb => libtool_2.4.2.bb} (94%)
diff --git a/meta/recipes-devtools/libtool/libtool.inc b/meta/recipes-devtools/libtool/libtool-2.4.2.inc
similarity index 57%
rename from meta/recipes-devtools/libtool/libtool.inc
rename to meta/recipes-devtools/libtool/libtool-2.4.2.inc
index ef9095b..1f652ef 100644
--- a/meta/recipes-devtools/libtool/libtool.inc
+++ b/meta/recipes-devtools/libtool/libtool-2.4.2.inc
@@ -1,4 +1,3 @@
-SUMMARY = "Generic library support script"
DESCRIPTION = "This is GNU libtool, a generic library support script. \
Libtool hides the complexity of generating special library types \
(such as shared libraries) behind a consistent interface."
@@ -8,21 +7,36 @@ LICENSE = "GPLv2 & LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
file://libltdl/COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06"
+INC_PR = "r0"
+
SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
file://trailingslash.patch \
file://prefix-manpage-fix.patch \
file://rename-with-sysroot.patch \
- file://resolve-sysroot.patch \
file://use-sysroot-in-libpath.patch \
file://fix-final-rpath.patch \
file://avoid_absolute_paths_for_general_utils.patch \
- file://fix-rpath.patch "
+ file://fix-rpath.patch \
+ "
+
+SRC_URI[md5sum] = "d2f3b7d4627e69e13514a40e72a24d50"
+SRC_URI[sha256sum] = "b38de44862a987293cd3d8dfae1c409d514b6c4e794ebc93648febf9afc38918"
do_compile_prepend () {
- # Sometimes this file doesn't get rebuilt, force the issue
- rm -f ${S}/libltdl/config/ltmain.sh
- make libltdl/config/ltmain.sh
+ # Sometimes this file doesn't get rebuilt, force the issue
+ rm -f ${S}/libltdl/config/ltmain.sh
+ make libltdl/config/ltmain.sh
}
inherit autotools
EXTRA_AUTORECONF = "--exclude=libtoolize"
+
+DEPENDS = "libtool-native"
+
+PACKAGES =+ "libltdl libltdl-dev libltdl-dbg"
+FILES_${PN} += "${datadir}/aclocal*"
+FILES_libltdl = "${libdir}/libltdl.so.*"
+FILES_libltdl-dev = "${libdir}/libltdl.* ${includedir}/ltdl.h"
+FILES_libltdl-dbg = "${libdir}/.debug/"
+
+EXTRA_OECONF = "--with-sysroot"
diff --git a/meta/recipes-devtools/libtool/libtool-2.4.inc b/meta/recipes-devtools/libtool/libtool-2.4.inc
deleted file mode 100644
index e3d17b7..0000000
--- a/meta/recipes-devtools/libtool/libtool-2.4.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-require libtool.inc
-DEPENDS = "libtool-native"
-
-PACKAGES =+ "libltdl libltdl-dev libltdl-dbg"
-FILES_${PN} += "${datadir}/aclocal*"
-FILES_libltdl = "${libdir}/libltdl.so.*"
-FILES_libltdl-dev = "${libdir}/libltdl.* ${includedir}/ltdl.h"
-FILES_libltdl-dbg = "${libdir}/.debug/"
-
-SRC_URI[md5sum] = "b32b04148ecdd7344abc6fe8bd1bb021"
-SRC_URI[sha256sum] = "13df57ab63a94e196c5d6e95d64e53262834fe780d5e82c28f177f9f71ddf62e"
-
-EXTRA_OECONF = "--with-sysroot"
\ No newline at end of file
diff --git a/meta/recipes-devtools/libtool/libtool-cross_2.4.bb b/meta/recipes-devtools/libtool/libtool-cross_2.4.2.bb
similarity index 98%
rename from meta/recipes-devtools/libtool/libtool-cross_2.4.bb
rename to meta/recipes-devtools/libtool/libtool-cross_2.4.2.bb
index 6d512b1..b7fe851 100644
--- a/meta/recipes-devtools/libtool/libtool-cross_2.4.bb
+++ b/meta/recipes-devtools/libtool/libtool-cross_2.4.2.bb
@@ -1,6 +1,6 @@
require libtool-${PV}.inc
-PR = "r4"
+PR = "${INC_PR}.0"
PACKAGES = ""
SRC_URI += "file://prefix.patch"
diff --git a/meta/recipes-devtools/libtool/libtool-native_2.4.bb b/meta/recipes-devtools/libtool/libtool-native_2.4.2.bb
similarity index 96%
rename from meta/recipes-devtools/libtool/libtool-native_2.4.bb
rename to meta/recipes-devtools/libtool/libtool-native_2.4.2.bb
index 3d0998e..f12e6a1 100644
--- a/meta/recipes-devtools/libtool/libtool-native_2.4.bb
+++ b/meta/recipes-devtools/libtool/libtool-native_2.4.2.bb
@@ -2,7 +2,7 @@ require libtool-${PV}.inc
DEPENDS = ""
-PR = "r4"
+PR = "${INC_PR}.0"
SRC_URI += "file://prefix.patch"
inherit native
diff --git a/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb b/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.2.bb
similarity index 97%
rename from meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb
rename to meta/recipes-devtools/libtool/libtool-nativesdk_2.4.2.bb
index a96d1d1..bd45dfe 100644
--- a/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb
+++ b/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.2.bb
@@ -1,6 +1,6 @@
require libtool-${PV}.inc
-PR = "r4"
+PR = "${INC_PR}.0"
SRC_URI += "file://prefix.patch"
inherit nativesdk
diff --git a/meta/recipes-devtools/libtool/libtool/prefix.patch b/meta/recipes-devtools/libtool/libtool/prefix.patch
index 1b20324..fabec7a 100644
--- a/meta/recipes-devtools/libtool/libtool/prefix.patch
+++ b/meta/recipes-devtools/libtool/libtool/prefix.patch
@@ -9,11 +9,11 @@ Updated: Date: 2010/06/28
Nitin A Kamble <nitin.a.kamble@intel.com>
-Index: libtool-2.4/libltdl/m4/libtool.m4
+Index: libtool-2.4.2/libltdl/m4/libtool.m4
===================================================================
---- libtool-2.4.orig/libltdl/m4/libtool.m4
-+++ libtool-2.4/libltdl/m4/libtool.m4
-@@ -94,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1])
+--- libtool-2.4.2.orig/libltdl/m4/libtool.m4 2011-10-19 21:22:53.000000000 -0700
++++ libtool-2.4.2/libltdl/m4/libtool.m4 2011-10-19 21:23:30.716036612 -0700
+@@ -94,7 +94,8 @@
LIBTOOL_DEPS="$ltmain"
# Always use our own libtool.
@@ -23,7 +23,7 @@ Index: libtool-2.4/libltdl/m4/libtool.m4
AC_SUBST(LIBTOOL)dnl
_LT_SETUP
-@@ -204,7 +205,7 @@ aix3*)
+@@ -206,7 +207,7 @@
esac
# Global variables:
@@ -32,11 +32,11 @@ Index: libtool-2.4/libltdl/m4/libtool.m4
can_build_shared=yes
# All known linkers require a `.a' archive for static linking (except MSVC,
-Index: libtool-2.4/Makefile.am
+Index: libtool-2.4.2/Makefile.am
===================================================================
---- libtool-2.4.orig/Makefile.am
-+++ libtool-2.4/Makefile.am
-@@ -31,7 +31,7 @@ AM_LDFLAGS =
+--- libtool-2.4.2.orig/Makefile.am 2011-10-19 21:22:53.000000000 -0700
++++ libtool-2.4.2/Makefile.am 2011-10-19 21:25:33.152638032 -0700
+@@ -31,7 +31,7 @@
DIST_SUBDIRS = .
EXTRA_DIST =
@@ -45,8 +45,17 @@ Index: libtool-2.4/Makefile.am
CLEANFILES =
MOSTLYCLEANFILES =
-@@ -65,7 +65,7 @@ rebuild = rebuild=:; $(timestamp); corre
- ## ---------------- ##
+@@ -72,7 +72,7 @@
+ ChangeLog.2002 ChangeLog.2003 ChangeLog.2004 \
+ ChangeLog.2005 ChangeLog.2006 ChangeLog.2007 \
+ ChangeLog.2008 ChangeLog.2009 ChangeLog.2010
+-CLEANFILES += libtool libtoolize libtoolize.tmp \
++CLEANFILES += $(host_alias)-libtool libtoolize libtoolize.tmp \
+ $(auxdir)/ltmain.tmp $(m4dir)/ltversion.tmp
+
+ ## These are the replacements that need to be made at bootstrap time,
+@@ -231,7 +231,7 @@
+ -e 's,@SED\@,$(SED),g'
# The libtool distributor and the standalone libtool script.
-bin_SCRIPTS = libtoolize libtool
@@ -54,7 +63,7 @@ Index: libtool-2.4/Makefile.am
libtoolize: $(srcdir)/libtoolize.in $(top_builddir)/config.status
rm -f libtoolize.tmp libtoolize
-@@ -90,8 +90,8 @@ $(srcdir)/libtoolize.in: $(sh_files) lib
+@@ -244,8 +244,8 @@
# We used to do this with a 'stamp-vcl' file, but non-gmake builds
# would rerun configure on every invocation, so now we manually
# check the version numbers from the build rule when necessary.
@@ -65,7 +74,7 @@ Index: libtool-2.4/Makefile.am
if test -f "$$target"; then \
set dummy `./$$target --version | sed 1q`; actualver="$$5"; \
test "$$actualver" = "$$correctver" && rebuild=false; \
-@@ -100,8 +100,8 @@ libtool: $(top_builddir)/config.status $
+@@ -254,8 +254,8 @@
case $$prereq in *ChangeLog);; *) rebuild=:;; esac; \
done; \
if $$rebuild; then \
@@ -76,16 +85,7 @@ Index: libtool-2.4/Makefile.am
fi
.PHONY: configure-subdirs
-@@ -146,7 +146,7 @@ EXTRA_DIST += bootstrap $(srcdir)/li
- ChangeLog.2002 ChangeLog.2003 ChangeLog.2004 \
- ChangeLog.2005 ChangeLog.2006 ChangeLog.2007 \
- ChangeLog.2008 ChangeLog.2009
--CLEANFILES += libtool libtoolize libtoolize.tmp \
-+CLEANFILES += $(host_alias)-libtool libtoolize libtoolize.tmp \
- $(auxdir)/ltmain.tmp $(m4dir)/ltversion.tmp
-
- ## We build ltversion.m4 here, instead of from config.status,
-@@ -526,12 +526,12 @@ TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$
+@@ -535,12 +535,12 @@
BUILDCHECK_ENVIRONMENT = _lt_pkgdatadir="$(abs_top_srcdir)" \
LIBTOOLIZE="$(abs_top_builddir)/libtoolize" \
diff --git a/meta/recipes-devtools/libtool/libtool/resolve-sysroot.patch b/meta/recipes-devtools/libtool/libtool/resolve-sysroot.patch
deleted file mode 100644
index 0341987..0000000
--- a/meta/recipes-devtools/libtool/libtool/resolve-sysroot.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Upstream-Status: Pending
-
-Sometimes .las have =/a/b/c.la in dependency_libs. This should be
-resolved to sysroot.
-
--Khem Raj <raj.khem@gmail.com>
-
-Index: libtool-2.4/libltdl/config/ltmain.m4sh
-===================================================================
---- libtool-2.4.orig/libltdl/config/ltmain.m4sh
-+++ libtool-2.4/libltdl/config/ltmain.m4sh
-@@ -8479,7 +8479,8 @@ EOF
- *.la)
- func_basename "$deplib"
- name="$func_basename_result"
-- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-+ func_resolve_sysroot "$deplib"
-+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
- test -z "$libdir" && \
- func_fatal_error "\`$deplib' is not a valid libtool archive"
- func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
-@@ -8505,7 +8506,9 @@ EOF
- *.la)
- func_basename "$lib"
- name="$func_basename_result"
-- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-+ func_resolve_sysroot "$lib"
-+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
-+
- test -z "$libdir" && \
- func_fatal_error "\`$lib' is not a valid libtool archive"
- func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
-@@ -8524,7 +8527,8 @@ EOF
- # the library:
- func_basename "$lib"
- name="$func_basename_result"
-- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-+ func_resolve_sysroot "$lib"
-+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
- test -z "$libdir" && \
- func_fatal_error "\`$lib' is not a valid libtool archive"
- func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
diff --git a/meta/recipes-devtools/libtool/libtool_2.4.bb b/meta/recipes-devtools/libtool/libtool_2.4.2.bb
similarity index 94%
rename from meta/recipes-devtools/libtool/libtool_2.4.bb
rename to meta/recipes-devtools/libtool/libtool_2.4.2.bb
index 3002215..a2eb4ea 100644
--- a/meta/recipes-devtools/libtool/libtool_2.4.bb
+++ b/meta/recipes-devtools/libtool/libtool_2.4.2.bb
@@ -1,6 +1,6 @@
require libtool-${PV}.inc
-PR = "r4"
+PR = "${INC_PR}.0"
#
# We want the results of libtool-cross preserved - don't stage anything ourselves.
--
1.7.6.4
^ permalink raw reply related
* [CONSOLIDATED PULL 19/27] coreutils: Upgrade recipe 8.12 -> 8.14
From: Saul Wold @ 2011-10-23 18:26 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319394187.git.sgw@linux.intel.com>
From: Khem Raj <raj.khem@gmail.com>
Change in site files is needed since in cross
build envrionment the test to check for
gl_cv_func_fstatat_zero_flag is a runtime test
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../remove-usr-local-lib-from-m4.patch | 18 +++++++++---------
.../{coreutils_8.12.bb => coreutils_8.14.bb} | 11 ++++++-----
meta/site/common-linux | 3 +++
3 files changed, 18 insertions(+), 14 deletions(-)
rename meta/recipes-core/coreutils/{coreutils-8.12 => coreutils-8.14}/remove-usr-local-lib-from-m4.patch (65%)
rename meta/recipes-core/coreutils/{coreutils_8.12.bb => coreutils_8.14.bb} (90%)
diff --git a/meta/recipes-core/coreutils/coreutils-8.12/remove-usr-local-lib-from-m4.patch b/meta/recipes-core/coreutils/coreutils-8.14/remove-usr-local-lib-from-m4.patch
similarity index 65%
rename from meta/recipes-core/coreutils/coreutils-8.12/remove-usr-local-lib-from-m4.patch
rename to meta/recipes-core/coreutils/coreutils-8.14/remove-usr-local-lib-from-m4.patch
index aac097a..2ef8a54 100644
--- a/meta/recipes-core/coreutils/coreutils-8.12/remove-usr-local-lib-from-m4.patch
+++ b/meta/recipes-core/coreutils/coreutils-8.14/remove-usr-local-lib-from-m4.patch
@@ -8,24 +8,24 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Inappropriate [Upstream does care for AIX while we may not]
-Index: coreutils-8.12/m4/getloadavg.m4
+Index: coreutils-8.14/m4/getloadavg.m4
===================================================================
---- coreutils-8.12.orig/m4/getloadavg.m4 2011-08-03 14:03:59.982197767 -0700
-+++ coreutils-8.12/m4/getloadavg.m4 2011-08-03 14:04:20.402197763 -0700
-@@ -44,16 +44,6 @@ AC_CHECK_FUNC([getloadavg], [],
- [LIBS="-lutil $LIBS" gl_have_func=yes])
+--- coreutils-8.14.orig/m4/getloadavg.m4 2011-09-19 08:09:24.000000000 -0700
++++ coreutils-8.14/m4/getloadavg.m4 2011-10-19 21:42:00.385533357 -0700
+@@ -41,16 +41,6 @@
+ [LIBS="-lutil $LIBS" gl_func_getloadavg_done=yes])
fi
-- if test $gl_have_func = no; then
+- if test $gl_func_getloadavg_done = no; then
- # There is a commonly available library for RS/6000 AIX.
- # Since it is not a standard part of AIX, it might be installed locally.
- gl_getloadavg_LIBS=$LIBS
- LIBS="-L/usr/local/lib $LIBS"
- AC_CHECK_LIB([getloadavg], [getloadavg],
-- [LIBS="-lgetloadavg $LIBS" gl_have_func=yes],
+- [LIBS="-lgetloadavg $LIBS" gl_func_getloadavg_done=yes],
- [LIBS=$gl_getloadavg_LIBS])
- fi
-
# Set up the replacement function if necessary.
- if test $gl_have_func = no; then
- AC_LIBOBJ([getloadavg])
+ if test $gl_func_getloadavg_done = no; then
+ HAVE_GETLOADAVG=0
diff --git a/meta/recipes-core/coreutils/coreutils_8.12.bb b/meta/recipes-core/coreutils/coreutils_8.14.bb
similarity index 90%
rename from meta/recipes-core/coreutils/coreutils_8.12.bb
rename to meta/recipes-core/coreutils/coreutils_8.14.bb
index 0004ce7..f3b7af7 100644
--- a/meta/recipes-core/coreutils/coreutils_8.12.bb
+++ b/meta/recipes-core/coreutils/coreutils_8.14.bb
@@ -7,18 +7,17 @@ BUGTRACKER = "http://debbugs.gnu.org/coreutils"
LICENSE = "GPLv3+"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\
file://src/ls.c;startline=5;endline=16;md5=e1a509558876db58fb6667ba140137ad"
-PR = "r3"
+PR = "r0"
DEPENDS = "gmp"
DEPENDS_virtclass-native = ""
inherit autotools gettext
-SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.gz \
+SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \
file://remove-usr-local-lib-from-m4.patch \
"
-
-SRC_URI[md5sum] = "fce7999953a67243d00d75cc86dbcaa6"
-SRC_URI[sha256sum] = "9e233a62c98a3378a7b0483d2ae3d662dbaf6cd3917d3830d3514665e12a85c8"
+SRC_URI[md5sum] = "bcb135ce553493a45aba01b39eb3920a"
+SRC_URI[sha256sum] = "0d120817c19292edb19e92ae6b8eac9020e03d51e0af9cb116cf82b65d18b02d"
EXTRA_OECONF_virtclass-native = "--without-gmp"
@@ -49,6 +48,8 @@ do_install_append() {
# in update-alternatives to fail, therefore use lbracket - the name used
# for the actual source file.
mv ${D}${bindir}/[ ${D}${bindir}/lbracket.${PN}
+ install -d ${D}${libdir}/coreutils
+ mv ${D}${libexecdir}/coreutils/libstdbuf.so ${D}${libdir}/coreutils
}
pkg_postinst_${PN} () {
diff --git a/meta/site/common-linux b/meta/site/common-linux
index 00ac717..947ed5b 100644
--- a/meta/site/common-linux
+++ b/meta/site/common-linux
@@ -34,6 +34,9 @@ bash_cv_job_control_missing=${bash_cv_job_control_missing=present}
bash_cv_sys_named_pipes=${bash_cv_sys_named_pipes=present}
bash_cv_unusable_rtsigs=${bash_cv_unusable_rtsigs=no}
+# coreutils
+gl_cv_func_fstatat_zero_flag=${gl_cv_func_fstatat_zero_flag=yes}
+
# mysql
ac_cv_sys_restartable_syscalls=${ac_cv_sys_restartable_syscalls=yes}
ac_cv_conv_longlong_to_float=${ac_cv_conv_longlong_to_float=yes}
--
1.7.6.4
^ permalink raw reply related
* [CONSOLIDATED PULL 17/27] xserver-xorg: Add mesa-dri to depends instead of virtual/libgl
From: Saul Wold @ 2011-10-23 18:26 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319394187.git.sgw@linux.intel.com>
From: Khem Raj <raj.khem@gmail.com>
Fixes the compile problems e.g.
| checking for GL... yes
| checking for DRIPROTO... yes
| checking for DRI... no
| configure: error: Package requirements (glproto >= 1.4.14 dri >=
7.8.0) were not met:
|
| No package 'dri' found
|
| Consider adjusting the PKG_CONFIG_PATH environment variable if you
| installed software in a non-standard prefix.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../recipes-graphics/xorg-xserver/xserver-xorg.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 9246b06..b387790 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -1,7 +1,7 @@
require xserver-xorg-common.inc
PROTO_DEPS += "xf86driproto dri2proto"
-LIB_DEPS += "virtual/libgl"
+LIB_DEPS += "mesa-dri"
EXTRA_OECONF += "\
--enable-dri \
--
1.7.6.4
^ permalink raw reply related
* [CONSOLIDATED PULL 18/27] gcc-4.6: Backport fix for PR32219
From: Saul Wold @ 2011-10-23 18:26 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319394187.git.sgw@linux.intel.com>
From: Khem Raj <raj.khem@gmail.com>
This fix is needed for gold to work. Otherwise
connman fails to build since it used hidden weak
symbols.
See
http://gcc.gnu.org/bugzilla/PR32219
http://www.cygwin.com/ml/binutils/2008-02/msg00239.html
The fix proposed to gcc had reviews which were not addressed hence the
patch is not yet
applied to gcc upstream.
connman can also have workaround by changing the visibility of these
symbols to be default
__attribute__ ((weak, visibility("hidden")))
to
__attribute__ ((weak, visibility("default")))
in include/plugin.h
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-devtools/gcc/gcc-4.6.inc | 3 +-
meta/recipes-devtools/gcc/gcc-4.6/pr32219.patch | 71 +++++++++++++++++++++++
2 files changed, 73 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6/pr32219.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.6.inc b/meta/recipes-devtools/gcc/gcc-4.6.inc
index fbc90ea..469457c 100644
--- a/meta/recipes-devtools/gcc/gcc-4.6.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.6.inc
@@ -1,6 +1,6 @@
require gcc-common.inc
-PR = "r15"
+PR = "r16"
# Third digit in PV should be incremented after a minor release
# happens from this branch on gcc e.g. currently its 4.6.0
@@ -70,6 +70,7 @@ SRC_URI = "svn://gcc.gnu.org/svn/gcc/branches;module=${BRANCH};proto=http \
file://fix-for-ice-50099.patch \
file://gcc-with-linker-hash-style.patch \
file://pr46934.patch \
+ file://pr32219.patch \
"
SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch "
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/pr32219.patch b/meta/recipes-devtools/gcc/gcc-4.6/pr32219.patch
new file mode 100644
index 0000000..e310080
--- /dev/null
+++ b/meta/recipes-devtools/gcc/gcc-4.6/pr32219.patch
@@ -0,0 +1,71 @@
+Hi,
+
+As suggested by richi.
+regtested on i686-linux-gnu with all default languages and no regressions.
+Ok for trunk?
+
+gcc/ChangeLog
+2010-03-15 Bernhard Reutner-Fischer <aldot@gcc.gnu.org>
+
+ PR target/32219
+ * varasm.c (default_binds_local_p_1): Weak data is not local.
+
+gcc/testsuite/ChangeLog
+2010-03-15 Bernhard Reutner-Fischer <aldot@gcc.gnu.org>
+
+ PR target/32219
+ * gcc.dg/visibility-21.c: New test.
+
+Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
+---
+ gcc/testsuite/gcc.dg/visibility-21.c | 14 ++++++++++++++
+ gcc/varasm.c | 8 ++++----
+ 2 files changed, 18 insertions(+), 4 deletions(-)
+ create mode 100644 gcc/testsuite/gcc.dg/visibility-21.c
+
+Index: gcc-4_6-branch/gcc/testsuite/gcc.dg/visibility-21.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gcc-4_6-branch/gcc/testsuite/gcc.dg/visibility-21.c 2011-10-18 17:11:33.224827436 -0700
+@@ -0,0 +1,14 @@
++/* PR target/32219 */
++/* { dg-do run } */
++/* { dg-require-visibility "" } */
++/* { dg-options "-fPIC" { target fpic } } */
++
++extern void f() __attribute__((weak,visibility("hidden")));
++extern int puts( char const* );
++int main()
++{
++ if (f)
++ f();
++ return 0;
++}
++
+Index: gcc-4_6-branch/gcc/varasm.c
+===================================================================
+--- gcc-4_6-branch.orig/gcc/varasm.c 2011-09-16 19:58:21.000000000 -0700
++++ gcc-4_6-branch/gcc/varasm.c 2011-10-18 17:19:06.431074788 -0700
+@@ -6760,6 +6760,10 @@
+ /* Static variables are always local. */
+ else if (! TREE_PUBLIC (exp))
+ local_p = true;
++ /* hidden weak can't be overridden by something non-local, all
++ that is possible is that it is not defined at all. */
++ else if (DECL_WEAK (exp))
++ local_p = false;
+ /* A variable is local if the user has said explicitly that it will
+ be. */
+ else if ((DECL_VISIBILITY_SPECIFIED (exp)
+@@ -6773,11 +6777,6 @@
+ local. */
+ else if (DECL_VISIBILITY (exp) != VISIBILITY_DEFAULT)
+ local_p = true;
+- /* Default visibility weak data can be overridden by a strong symbol
+- in another module and so are not local. */
+- else if (DECL_WEAK (exp)
+- && !resolved_locally)
+- local_p = false;
+ /* If PIC, then assume that any global name can be overridden by
+ symbols resolved from other modules. */
+ else if (shlib)
--
1.7.6.4
^ permalink raw reply related
* [CONSOLIDATED PULL 16/27] subversion-1.6.15: add native support too
From: Saul Wold @ 2011-10-23 18:26 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319394187.git.sgw@linux.intel.com>
From: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../subversion/subversion_1.6.15.bb | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-devtools/subversion/subversion_1.6.15.bb b/meta/recipes-devtools/subversion/subversion_1.6.15.bb
index 9a9484f..d3c7392 100644
--- a/meta/recipes-devtools/subversion/subversion_1.6.15.bb
+++ b/meta/recipes-devtools/subversion/subversion_1.6.15.bb
@@ -5,6 +5,8 @@ RDEPENDS_${PN} = "neon"
LICENSE = "Apache-2"
HOMEPAGE = "http://subversion.tigris.org"
+BBCLASSEXTEND = "native"
+
PR = "r1"
SRC_URI = "http://subversion.tigris.org/downloads/${BPN}-${PV}.tar.bz2 \
--
1.7.6.4
^ permalink raw reply related
* [CONSOLIDATED PULL 15/27] subversion: add 1.7.0 with native support and negative D_P for now
From: Saul Wold @ 2011-10-23 18:26 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319394187.git.sgw@linux.intel.com>
From: Martin Jansa <Martin.Jansa@gmail.com>
* be aware that checkouts from 1.7.0 are not compatible with older
subversion clients (ie when builder populating distro PREMIRROR is
using 1.7.0 all builders need to have also 1.7.0)
* and also 1.7.0 client needs to call svn upgrade in checkout first in
order to use it (so if PREMIRROR has tarball from 1.6.x it won't work
on client using 1.7.0 unless fetcher2 is improved to detect this and
call svn upgrade)
* tested on SHR distribution
http://wiki.shr-project.org/trac/wiki/Building%20SHR#subversion1.7inshr-chroot
* only missing part is to add subversion-native dependency, so that
native subversion is built, before building ie elementary (because EFL
are using svnversion from configure.ac to detect source revision and
.svn dir needs to be from compatible version).
* read http://subversion.apache.org/docs/release-notes/1.7.html
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../subversion/subversion-1.7.0/libtool2.patch | 15 ++++++++
.../subversion/subversion_1.7.0.bb | 37 ++++++++++++++++++++
2 files changed, 52 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-devtools/subversion/subversion-1.7.0/libtool2.patch
create mode 100644 meta/recipes-devtools/subversion/subversion_1.7.0.bb
diff --git a/meta/recipes-devtools/subversion/subversion-1.7.0/libtool2.patch b/meta/recipes-devtools/subversion/subversion-1.7.0/libtool2.patch
new file mode 100644
index 0000000..5cd572b
--- /dev/null
+++ b/meta/recipes-devtools/subversion/subversion-1.7.0/libtool2.patch
@@ -0,0 +1,15 @@
+Upstream-Status: Inappropriate [embedded specific]
+
+--- a/configure.ac 2011-10-20 21:56:02.230663987 +0200
++++ b/configure.ac 2011-08-17 15:01:30.000000000 +0200
+@@ -227,8 +227,8 @@
+ LIBTOOL="$sh_libtool"
+ SVN_LIBTOOL="$sh_libtool"
+ else
+- sh_libtool="$abs_builddir/libtool"
+- SVN_LIBTOOL="\$(SHELL) $sh_libtool"
++ sh_libtool="$abs_builddir/$host_alias-libtool"
++ SVN_LIBTOOL="\$(SHELL) \$(abs_builddir)/$host_alias-libtool"
+ fi
+ AC_SUBST(SVN_LIBTOOL)
+
diff --git a/meta/recipes-devtools/subversion/subversion_1.7.0.bb b/meta/recipes-devtools/subversion/subversion_1.7.0.bb
new file mode 100644
index 0000000..396b35b
--- /dev/null
+++ b/meta/recipes-devtools/subversion/subversion_1.7.0.bb
@@ -0,0 +1,37 @@
+DESCRIPTION = "The Subversion (svn) client"
+SECTION = "console/network"
+DEPENDS = "apr-util neon"
+RDEPENDS_${PN} = "neon"
+LICENSE = "Apache-2"
+HOMEPAGE = "http://subversion.tigris.org"
+
+BBCLASSEXTEND = "native"
+
+# negative, because of new checkout format in 1.7.0
+# and distro PREMIRRORs need to be in sync with users
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
+ file://libtool2.patch \
+"
+SRC_URI[md5sum] = "930e6644a1b6094efd268fde6a318f04"
+SRC_URI[sha256sum] = "64fd5f263a80e609717a3ca42f1f2625606a5c4a40a85716f82c866033780978"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=4a14fd2da3134e40a087eb4326a4ecd4"
+
+EXTRA_OECONF = " \
+ --without-berkeley-db --without-apxs --without-apache \
+ --without-swig --with-apr=${STAGING_BINDIR_CROSS} \
+ --with-apr-util=${STAGING_BINDIR_CROSS}"
+
+inherit autotools
+
+export LDFLAGS += " -L${STAGING_LIBDIR} "
+
+acpaths = "-I build/ -I build/ac-macros/"
+
+do_configure_prepend () {
+ rm -f ${S}/libtool
+ rm -f ${S}/build/libtool.m4
+ sed -i -e 's:with_sasl="/usr/local":with_sasl="${STAGING_DIR}":' ${S}/build/ac-macros/sasl.m4
+}
--
1.7.6.4
^ permalink raw reply related
* [CONSOLIDATED PULL 14/27] apr-util: add native support
From: Saul Wold @ 2011-10-23 18:26 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319394187.git.sgw@linux.intel.com>
From: Martin Jansa <Martin.Jansa@gmail.com>
* needed for native subversion
* do_configure_append_virtclass-native is needed, because apr_builddir points to
/OE/shr-core/tmp/sysroots/x86_64-linux/usr/share/build-1
and we're not installing libtool from apr there
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-support/apr/apr-util_1.3.12.bb | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-support/apr/apr-util_1.3.12.bb b/meta/recipes-support/apr/apr-util_1.3.12.bb
index 800e67e..0064c51 100644
--- a/meta/recipes-support/apr/apr-util_1.3.12.bb
+++ b/meta/recipes-support/apr/apr-util_1.3.12.bb
@@ -3,6 +3,8 @@ HOMEPAGE = "http://apr.apache.org/"
SECTION = "libs"
DEPENDS = "apr expat gdbm"
+BBCLASSEXTEND = "native"
+
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=519e0a18e03f7c023070568c14b077bb \
file://include/apu_version.h;endline=17;md5=806685a84e71f10c80144c48eb35df42"
@@ -33,6 +35,12 @@ OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'"
do_configure_prepend() {
cp ${STAGING_DATADIR}/apr/apr_rules.mk ${S}/build/rules.mk
}
+do_configure_prepend_virtclass-native() {
+ cp ${STAGING_DATADIR_NATIVE}/apr/apr_rules.mk ${S}/build/rules.mk
+}
+do_configure_append_virtclass-native() {
+ sed -i "s#LIBTOOL=\$(SHELL) \$(apr_builddir)#LIBTOOL=\$(SHELL) ${STAGING_BINDIR_NATIVE}#" ${S}/build/rules.mk
+}
FILES_${PN} += "${libdir}/apr-util-1/apr_dbm_gdbm-1.so"
FILES_${PN}-dev += "${libdir}/aprutil.exp ${libdir}/apr-util-1/apr_dbm_gdbm.*"
--
1.7.6.4
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox