* Re: [PATCH 2/2] Add new util-linux-chkdupexe package to avoid making perl a dependecy for all of util-linux
From: Richard Purdie @ 2011-10-27 7:32 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <1319692454-20226-2-git-send-email-msm@freescale.com>
On Thu, 2011-10-27 at 00:14 -0500, Matthew McClintock wrote:
> Signed-off-by: Matthew McClintock <msm@freescale.com>
> ---
> meta/recipes-core/util-linux/util-linux.inc | 7 +++++--
> meta/recipes-core/util-linux/util-linux_2.19.1.bb | 2 +-
> 2 files changed, 6 insertions(+), 3 deletions(-)
Merged to master, thanks.
Cheers,
Richard
^ permalink raw reply
* Re: [PATCH] Add readline as dependecy for gdb-cross-canadian
From: Richard Purdie @ 2011-10-27 7:42 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <1319684612-24265-1-git-send-email-msm@freescale.com>
On Wed, 2011-10-26 at 22:03 -0500, Matthew McClintock wrote:
> Got errors that we were unable to find -lreadline, this fixed the
> issue
>
> Signed-off-by: Matthew McClintock <msm@freescale.com>
> ---
> meta/recipes-devtools/gdb/gdb-cross-canadian.inc | 2 +-
> .../gdb/gdb-cross-canadian_7.3a.bb | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
This patch didn't apply as it wasn't against master. I have manually
fixed it up but please send patches against master in future! :)
Cheers,
Richard
^ permalink raw reply
* [PATCH 1/3] linux-libc-headers: factor common code into linux-libc-headers.inc
From: Bruce Ashfield @ 2011-10-27 14:32 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core, saul.wold
In-Reply-To: <cover.1319725711.git.bruce.ashfield@windriver.com>
Each time a new linux-libc-headers is created the same code is
cloned. Placing the common functionality in the .inc file simplies
each recipe and make maintenance easier.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
| 47 +++++++++++++++++++
| 48 +-------------------
| 49 +-------------------
3 files changed, 49 insertions(+), 95 deletions(-)
--git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
index 014024f..e586ac3 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
@@ -5,6 +5,53 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/v2.6/linux-${PV}.tar.bz2"
+S = "${WORKDIR}/linux-${PV}"
+
+set_arch() {
+ case ${TARGET_ARCH} in
+ alpha*) ARCH=alpha ;;
+ arm*) ARCH=arm ;;
+ cris*) ARCH=cris ;;
+ hppa*) ARCH=parisc ;;
+ i*86*) ARCH=i386 ;;
+ ia64*) ARCH=ia64 ;;
+ mips*) ARCH=mips ;;
+ m68k*) ARCH=m68k ;;
+ powerpc*) ARCH=powerpc ;;
+ s390*) ARCH=s390 ;;
+ sh*) ARCH=sh ;;
+ sparc64*) ARCH=sparc64 ;;
+ sparc*) ARCH=sparc ;;
+ x86_64*) ARCH=x86_64 ;;
+ avr32*) ARCH=avr32 ;;
+ bfin*) ARCH=blackfin ;;
+ microblaze*) ARCH=microblaze ;;
+ esac
+}
+
+do_configure() {
+ set_arch
+ oe_runmake allnoconfig ARCH=$ARCH
+}
+
+do_compile () {
+}
+
+do_install() {
+ set_arch
+ oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=$ARCH
+ # Kernel should not be exporting this header
+ rm -f ${D}${exec_prefix}/include/scsi/scsi.h
+
+ # The ..install.cmd conflicts between various configure runs
+ find ${D}${includedir} -name ..install.cmd | xargs rm -f
+}
+
+BBCLASSEXTEND = "nativesdk"
+
#DEPENDS = "cross-linkage"
RDEPENDS_${PN}-dev = ""
RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})"
+
+INHIBIT_DEFAULT_DEPS = "1"
+DEPENDS += "unifdef-native"
\ No newline at end of file
--git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.37.2.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.37.2.bb
index 55d7527..c6562b5 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.37.2.bb
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.37.2.bb
@@ -1,53 +1,7 @@
require linux-libc-headers.inc
-INHIBIT_DEFAULT_DEPS = "1"
-DEPENDS += "unifdef-native"
-PR = "r2"
+PR = "r3"
SRC_URI += " file://connector-msg-size-fix.patch"
-
-S = "${WORKDIR}/linux-${PV}"
-
-set_arch() {
- case ${TARGET_ARCH} in
- alpha*) ARCH=alpha ;;
- arm*) ARCH=arm ;;
- cris*) ARCH=cris ;;
- hppa*) ARCH=parisc ;;
- i*86*) ARCH=i386 ;;
- ia64*) ARCH=ia64 ;;
- mips*) ARCH=mips ;;
- m68k*) ARCH=m68k ;;
- powerpc*) ARCH=powerpc ;;
- s390*) ARCH=s390 ;;
- sh*) ARCH=sh ;;
- sparc64*) ARCH=sparc64 ;;
- sparc*) ARCH=sparc ;;
- x86_64*) ARCH=x86_64 ;;
- avr32*) ARCH=avr32 ;;
- bfin*) ARCH=blackfin ;;
- microblaze*) ARCH=microblaze ;;
- esac
-}
-
-do_configure() {
- set_arch
- oe_runmake allnoconfig ARCH=$ARCH
-}
-
-do_compile () {
-}
-
-do_install() {
- set_arch
- oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=$ARCH
- # Kernel should not be exporting this header
- rm -f ${D}${exec_prefix}/include/scsi/scsi.h
-
- # The ..install.cmd conflicts between various configure runs
- find ${D}${includedir} -name ..install.cmd | xargs rm -f
-}
-
-BBCLASSEXTEND = "nativesdk"
SRC_URI[md5sum] = "89f681bc7c917a84aa7470da6eed5101"
SRC_URI[sha256sum] = "2920c4cd3e87fe40ebee96d28779091548867e1c36f71c1fc3d07e6d5802161f"
--git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.39.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.39.bb
index 14f5e8a..36cfb4f 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.39.bb
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.39.bb
@@ -1,54 +1,7 @@
require linux-libc-headers.inc
-INHIBIT_DEFAULT_DEPS = "1"
-DEPENDS += "unifdef-native"
+PR = "r3"
SRC_URI += " file://connector-msg-size-fix.patch"
SRC_URI[md5sum] = "1aab7a741abe08d42e8eccf20de61e05"
SRC_URI[sha256sum] = "584d17f2a3ee18a9501d7ff36907639e538cfdba4529978b8550c461d45c61f6"
-
-S = "${WORKDIR}/linux-${PV}"
-
-PR = "r2"
-
-set_arch() {
- case ${TARGET_ARCH} in
- alpha*) ARCH=alpha ;;
- arm*) ARCH=arm ;;
- cris*) ARCH=cris ;;
- hppa*) ARCH=parisc ;;
- i*86*) ARCH=i386 ;;
- ia64*) ARCH=ia64 ;;
- mips*) ARCH=mips ;;
- m68k*) ARCH=m68k ;;
- powerpc*) ARCH=powerpc ;;
- s390*) ARCH=s390 ;;
- sh*) ARCH=sh ;;
- sparc64*) ARCH=sparc64 ;;
- sparc*) ARCH=sparc ;;
- x86_64*) ARCH=x86_64 ;;
- avr32*) ARCH=avr32 ;;
- bfin*) ARCH=blackfin ;;
- microblaze*) ARCH=microblaze ;;
- esac
-}
-
-do_configure() {
- set_arch
- oe_runmake allnoconfig ARCH=$ARCH
-}
-
-do_compile () {
-}
-
-do_install() {
- set_arch
- oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=$ARCH
- # Kernel should not be exporting this header
- rm -f ${D}${exec_prefix}/include/scsi/scsi.h
-
- # The ..install.cmd conflicts between various configure runs
- find ${D}${includedir} -name ..install.cmd | xargs rm -f
-}
-
-BBCLASSEXTEND = "nativesdk"
--
1.7.0.4
^ permalink raw reply related
* [PATCH 3/3] linux-libc-headers: remove older recipes
From: Bruce Ashfield @ 2011-10-27 14:32 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core, saul.wold
In-Reply-To: <cover.1319725711.git.bruce.ashfield@windriver.com>
The default libc-headers is v3.1 and building against the new
headers but booting an older kernel has been shown to work.
Older 2.6 based header builds can easily be reproduced, but
having all the old recipe iterations available is not required.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
| 7 -------
| 7 -------
2 files changed, 0 insertions(+), 14 deletions(-)
delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.37.2.bb
delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.39.bb
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.37.2.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.37.2.bb
deleted file mode 100644
index c6562b5..0000000
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.37.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require linux-libc-headers.inc
-
-PR = "r3"
-
-SRC_URI += " file://connector-msg-size-fix.patch"
-SRC_URI[md5sum] = "89f681bc7c917a84aa7470da6eed5101"
-SRC_URI[sha256sum] = "2920c4cd3e87fe40ebee96d28779091548867e1c36f71c1fc3d07e6d5802161f"
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.39.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.39.bb
deleted file mode 100644
index 36cfb4f..0000000
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.39.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require linux-libc-headers.inc
-
-PR = "r3"
-
-SRC_URI += " file://connector-msg-size-fix.patch"
-SRC_URI[md5sum] = "1aab7a741abe08d42e8eccf20de61e05"
-SRC_URI[sha256sum] = "584d17f2a3ee18a9501d7ff36907639e538cfdba4529978b8550c461d45c61f6"
--
1.7.0.4
^ permalink raw reply related
* [PATCH 2/3] linux-libc-headers: provide 3.0.x and 3.1 headers
From: Bruce Ashfield @ 2011-10-27 14:32 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core, saul.wold
In-Reply-To: <cover.1319725711.git.bruce.ashfield@windriver.com>
Provide both a 3.0.x and a 3.1 set of headers to the toolchain.
Compatibility is maintained with older 2.6 headers by creating a
new variable that changes the SRC_URI based on the major version
number of the kernel.
Built and booted with 2.6.37.2, 3.0.8 and 3.1 linux-libc-headers.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
meta/conf/distro/include/tcmode-default.inc | 2 +-
| 17 +++++++++++++----
| 7 +++++++
| 7 +++++++
4 files changed, 28 insertions(+), 5 deletions(-)
create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.0.8.bb
create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.1.bb
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index 2bf1beb..ed722be 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -21,7 +21,7 @@ SDKGCCVERSION ?= "4.6%"
BINUVERSION ?= "2.21.1a"
EGLIBCVERSION ?= "2.13"
UCLIBCVERSION ?= "0.9.32"
-LINUXLIBCVERSION ?= "2.6.37.2"
+LINUXLIBCVERSION ?= "3.1"
# Temporary preferred version overrides for PPC
PREFERRED_VERSION_u-boot-mkimage-native_powerpc ?= "2009.08"
--git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
index e586ac3..4137be1 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
@@ -1,9 +1,18 @@
-DESCRIPTION = "Sanitized set of 2.6 kernel headers for the C library's use."
+DESCRIPTION = "Sanitized set of kernel headers for the C library's use."
SECTION = "devel"
LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
-SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/v2.6/linux-${PV}.tar.bz2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
+
+python __anonymous () {
+ major = d.getVar("PV",True).split('.')[0]
+ if major == "3":
+ d.setVar("HEADER_FETCH_VER", "3.0")
+ else:
+ d.setVar("HEADER_FETCH_VER", "2.6")
+}
+
+SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/v${HEADER_FETCH_VER}/linux-${PV}.tar.bz2"
S = "${WORKDIR}/linux-${PV}"
@@ -54,4 +63,4 @@ RDEPENDS_${PN}-dev = ""
RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})"
INHIBIT_DEFAULT_DEPS = "1"
-DEPENDS += "unifdef-native"
\ No newline at end of file
+DEPENDS += "unifdef-native"
--git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.0.8.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.0.8.bb
new file mode 100644
index 0000000..7bb5895
--- /dev/null
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.0.8.bb
@@ -0,0 +1,7 @@
+require linux-libc-headers.inc
+
+PR = "r1"
+
+SRC_URI += " file://connector-msg-size-fix.patch"
+SRC_URI[md5sum] = "eac4d398a0ecd98214487cd47a228998"
+SRC_URI[sha256sum] = "4ed16da319848f681f711dbda2ac2cf1b306a280ec22f90bae190cf23b533add"
--git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.1.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.1.bb
new file mode 100644
index 0000000..b87ecde
--- /dev/null
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.1.bb
@@ -0,0 +1,7 @@
+require linux-libc-headers.inc
+
+PR = "r1"
+
+SRC_URI += " file://connector-msg-size-fix.patch"
+SRC_URI[md5sum] = "8d43453f8159b2332ad410b19d86a931"
+SRC_URI[sha256sum] = "2573d2378c754b0c602b57586e9311e5b38c5d1e6c137f02873833633a4b9359"
--
1.7.0.4
^ permalink raw reply related
* [PATCH 0/3] RFC v3: provide 3.0.x and 3.1 libc headers
From: Bruce Ashfield @ 2011-10-27 14:32 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core, saul.wold
Richard,
Here's v3 of the series, the details are below.
Changes since v2:
- moved more code into the .inc file
- modifed the python code to not import unnecessary functions and
to use d.get/setVar.
- Included an optional patch 3/3 to remove 2.6 based header recipes.
Whether you want this or not .. is up to you!
Changes since v1:
- factored common code out into the .inc file. Captured in patch 1/2
- patch 2/2 is the introduction of the new headers
v1 Email is included below:
Here's a RFC patch for updating the toolchain linux-libc headers to 3.x
variants.
The reason I'm calling it a RFC is:
- I wrote some anonymous python code (and I'm no python coder) to
deal with 2.6 / 3.0 tgz location differences. This could have
also been done with a variable set in the recipes and used by
the .inc. I wasn't sure of the preferred approach, hence the RFC.
I'll take no offense corrections here.
- I changed the .inc, but didn't bump the PR of the existing recipes
and didn't remove the existing 2.6 variants. If either of these
should have been done, let me know and I'll respin.
- I bumped the default to be 3.1. If that's too agressive for the
default, and we'd prefer 3.0.8, let me know and I'll respin.
I built and booted all the qemu machines with the 3.1 kernel headers. So
from the testing I was able to do, this looks to be safe and ready to go.
This is based on my yocto repo, I also did the changes in my oe-core
repository, but I don't have a oe-core contrib branch that I could push to,
so I chose to send the yocto variant. If someone points me to who I email for
an oe-core contrib branch, I can push that variant as well.
Cheers,
Bruce
The following changes since commit fc94f925e848684244a38dcffe15cb1192dfbed8:
Martin Jansa (1):
libxml-parser-perl, libxml-simple-perl, expat, sgmlspl-native, git: bump PR to rebuild after perl upgrade
are available in the git repository at:
git://git.pokylinux.org/poky-contrib zedd/libc-headers-v3
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/libc-headers-v3
Bruce Ashfield (3):
linux-libc-headers: factor common code into linux-libc-headers.inc
linux-libc-headers: provide 3.0.x and 3.1 headers
linux-libc-headers: remove older recipes
meta/conf/distro/include/tcmode-default.inc | 2 +-
.../linux-libc-headers/linux-libc-headers.inc | 62 +++++++++++++++++++-
.../linux-libc-headers_2.6.37.2.bb | 53 -----------------
.../linux-libc-headers_2.6.39.bb | 54 -----------------
.../linux-libc-headers/linux-libc-headers_3.0.8.bb | 7 ++
.../linux-libc-headers/linux-libc-headers_3.1.bb | 7 ++
6 files changed, 74 insertions(+), 111 deletions(-)
delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.37.2.bb
delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.39.bb
create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.0.8.bb
create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.1.bb
^ permalink raw reply
* Re: [PATCH] Add readline as dependecy for gdb-cross-canadian
From: McClintock Matthew-B29882 @ 2011-10-27 16:05 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <1319701366.15601.7.camel@ted>
On Thu, Oct 27, 2011 at 2:42 AM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> On Wed, 2011-10-26 at 22:03 -0500, Matthew McClintock wrote:
>> Got errors that we were unable to find -lreadline, this fixed the
>> issue
>>
>> Signed-off-by: Matthew McClintock <msm@freescale.com>
>> ---
>> meta/recipes-devtools/gdb/gdb-cross-canadian.inc | 2 +-
>> .../gdb/gdb-cross-canadian_7.3a.bb | 2 +-
>> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> This patch didn't apply as it wasn't against master. I have manually
> fixed it up but please send patches against master in future! :)
Thanks! Sorry, I've been working on edison lately this must have
slipped my mind.
-M
^ permalink raw reply
* [PATCH v2 1/2] Add new strace-graph package to avoid making perl a dependecy for all of strace
From: Matthew McClintock @ 2011-10-27 19:31 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1319700362.15601.2.camel@ted>
Signed-off-by: Matthew McClintock <msm@freescale.com>
---
v2: Change to use PACKAGES_prepend instead of explictly listing all packages
and also fixing the fact we missed the -dev and -dbg packages before
meta/recipes-devtools/strace/strace_4.5.20.bb | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-devtools/strace/strace_4.5.20.bb b/meta/recipes-devtools/strace/strace_4.5.20.bb
index b3d2aa5..450abea 100644
--- a/meta/recipes-devtools/strace/strace_4.5.20.bb
+++ b/meta/recipes-devtools/strace/strace_4.5.20.bb
@@ -5,7 +5,9 @@ LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=4535377ede62550fdeaf39f595fd550a"
PR = "r2"
-RDEPENDS = "perl"
+PACKAGES_prepend = "${PN}-graph "
+FILES_${PN}-graph = "${bindir}/strace-graph"
+RDEPENDS_${PN}-graph = "perl"
SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \
file://sigmask.patch \
--
1.7.6.1
^ permalink raw reply related
* Trouble by last dbus patch (46e6c3fa8034b12d178d605f3f5d7efe69671a13)?
From: Andreas Müller @ 2011-10-27 20:30 UTC (permalink / raw)
To: openembedded-core
Since the last updates of all layers (angstrom based) I have issues with
* networkmanager/nm-applet (meta-oe): I am not allowed to change the settings
any more
* xfce-session (meta-oe): Logging out takes very long and Restart/Shutdown is
disabled
I remember that I had similar issues a while ago. That could be worked around
by starting some dbus stuff ( do not exactly remember what it was ).
With this vague idea I checked and found in oe-core:
| dbus: use useradd class to allow use in read-only filesystems
| author Otavio Salvador <otavio@ossystems.com.br>
| commit 46e6c3fa8034b12d178d605f3f5d7efe69671a13
Not understanding totally what is all about I see in /etc/passw
| messagebus:x:999:998::/var/lib/dbus:/bin/sh
but I don't have /var/lib/dbus on my sytem!!
I did not check yet, but maybe this is an incompatibilty with angstrom custom
| FILESYSTEM_PERMS_TABLES = "fs-perms-angstrom.txt"
somebody around to enlight the darkness?
Andreas
^ permalink raw reply
* OE Changelog for 2011-10-17 to 2011-10-24
From: cliff.brake @ 2011-10-27 20:40 UTC (permalink / raw)
To: openembedded-core, openembedded-devel, angstrom-distro-devel
Changelog for 2011-10-17 to 2011-10-24. Projects included in this report:
bitbake: git://git.openembedded.org/bitbake
openembedded-core: git://git.openembedded.org/openembedded-core
meta-openembedded: git://git.openembedded.org/meta-openembedded
meta-angstrom: git://git.angstrom-distribution.org/meta-angstrom
meta-yocto: git://git.yoctoproject.org/poky
meta-texasinstruments: git://git.angstrom-distribution.org/meta-texasinstruments
meta-smartphone: http://git.shr-project.org/repo/meta-smartphone.git
meta-micro: git://git.openembedded.org/meta-micro
meta-slugos: git://github.com/kraj/meta-slugos
meta-nslu2: git://github.com/kraj/meta-nslu2
meta-intel: git://git.yoctoproject.org/meta-intel
meta-handheld: git://git.openembedded.org/meta-handheld
meta-opie: git://git.openembedded.org/meta-opie
openembedded: git://git.openembedded.org/openembedded
====================================================
Changelog for bitbake:
Joshua Lock (3):
fetch2: improve usability of checksums
fetch2: enable checksum definition as SRC_URI parameter
doc: update manual for checksum changes
====================================================
Changelog for openembedded-core:
Anders Darander (1):
module.bbclass: add lock to prevent error bulding ext modules
Cliff Brake (1):
squashfs-tools: add recipe
Darren Hart (1):
insane.bbclass: print full path on invalid LICENSE_FILES_CHKSUM
Joshua Lock (5):
gst-plugins-good: update to 0.10.30
tzdata: updated SRC_URI and update to 2011k
tzcode-native: update SRC_URI to new IANA location
distro-tracking-fields: update fields for tzdata and gst-plugins-good
gst-plugins-good: correctly handle gconf schema
Kang Kai (5):
ghostscript: update to 9.04
libxml-sax-perl: update to 0.99
liburi-perl: update to 1.59
libsdl: update to 1.2.14
distro_tracking_fields: update packages tracking fields
Khem Raj (10):
bluez4: Add glib-2.0 to DEPENDS
gcc-4.6: Upgrade SRCREV to latest FSF 4.6 branch
gcc-4.6: Backport PR46934 fix
tcmode-default.inc: Add TRANSLATED_TARGET_ARCH suffix to binutils-cross-cana
binutils-cross-canadian: Point sysroot to correct location
gcc-configure-sdk: Point sysroot to correct location
xserver-xorg: Add mesa-dri to depends instead of virtual/libgl
gcc-4.6: Backport fix for PR32219
coreutils: Upgrade recipe 8.12 -> 8.14
pulseaudio: inherit perlnative
Lauri Hintsala (1):
poky: fix broken ubifs link in deploy folder
Martin Jansa (6):
fontconfig: fix fix-pkgconfig.patch
apr: add native support
neon: add native support
apr-util: add native support
subversion-1.6.15: add native support too
default-providers: switch virtual/libgl from mesa-xlib to mesa-dri
Nitin A Kamble (7):
x86 tune files: set baselib for x32 tune as libx32
python-scons: upgrade from 2.0.1 to 2.1.0
python-dbus: upgrade from 0.83.2 to 0.84.0
libxml-parser-perl: upgrade from 2.40 to 2.41
distro-tracking: update data for some toolchain recipes
tcl: upgrade from 8.5.9 to 8.5.10
perl: upgrade from 5.12.3 to 5.14.2
Otavio Salvador (5):
src_distribute.bbclass, src_distribute_local.bbclass: mostly rewritten
bootimg.bbclass: add support to disable HDD image building
useradd.bbclass: check if a group already exists manually
base-passwd: move initial criation of group and passwd to preinst
dbus: use useradd class to allow use in read-only filesystems
Saul Wold (4):
ghostscript: Disable parallel make due to install issues
ghostscript: renamed x86_64 to x86-64 for patch to work
texi2html: Added recipe from OE
oprofile: Update to 0.9.7 and convert cvs->git
Wenzong Fan (2):
ccache: update to 3.1.6
chkconfig: Update to 1.3.55
====================================================
Changelog for meta-openembedded:
Andreas Müller (5):
xfce-panel-plugin: bbclass for panel plugins
xfce4-cpufreq-plugin: initial add 1.0.0
xfce4-cpugraph-plugin: initial add 1.0.1
epdfview: add initial recipe with version 0.1.8
xfce4-icon-theme: initial add 4.4.3
Jason Kridner (2):
Cloud9: incremental submodule and build fixes
cloud9: build node-03-xml manually, waf is just too broken for crosscompilat
Joel A Fernandes (1):
memtester: Import from OE classic
Khem Raj (2):
gcc-4.6: Remove the patches that are already applied via oe-core
fuse: Fix linking issues with gold linker
Koen Kooi (23):
pixman 0.23.6: refresh patches with versions for pixman master
systemd-compat-units: start opkg after remount-rootfs.target, not before
pixman 0.23.6: apply typo fix from upstream
upower: update to 0.9.14
network-manager-applet 0.9.0: add gnome-keyring to recommends
cloud9 0.5.1: convert to fetch SRC_URI
nodejs: also package wafadmin
task-basic: include MACHINE_EXTRA_RRECOMMENDS
task-basic: include a minimal set of timezone data
systemd: fix initramfs symlink
cloud9 0.5.1: fix up node-o3-xml library location
udisks: update to 1.0.4
wavpack 4.60.1: import from OE classic
libmicrohttpd 0.4.6: import from OE classic
enca 1.9: import from OE classic
subsurface: update to 1.1 release, start using gitpkgv
libass 0.9.11: import from OE classic
live555: fix build due to missing INC_PR
libftdi: import 0.18 from OE classic, update to 0.19
soft66 git: import from OE classic
udev 174: add version 174, disabled by default (see below)
asio 1.4.1: import from OE classic
goffice 0.8.17: import from OE classic
Martin Jansa (13):
syslog-ng: move conflicting file modules.conf to own packages and fix unpack
xf86-input-tslib: fix build with newer xserver
e-wm-illume-dict-pl: fix licensing information
e-tasks: fix licensing information
ttf-droid: add LIC_FILES_CHKSUM, switch to github.com
abiword: add LIC_FILES_CHKSUM
abiword: add SRC_URI checksums
abiword: fix install, newer versions doesn't allow to overwrite just install
wv: add SRC_URI checksums and drop deprecated patch=1 param
efm-nav, efm-path, efm-pathbar: drop from meta-efl, now are part of efm itse
e-base: bump EFL_SRCREV
webkit-efl: upgrade to 1.6.1
enjoy: include icon in FILES_${PN}
Otavio Salvador (5):
openssl: disable parallel install
udev: udev-systemd refactory
systemd-serialgetty: don't require systemd_git.bb
systemd: add systemd-initramfs
systemd: add lock group using useradd.bbclass
Pau Espin Pedrol (1):
lightmediascanner: Add version 0.4.4 (initial recipe)
====================================================
Changelog for meta-angstrom:
Denys Dmytriyenko (2):
preferred-versions: update mesa version to 7.11 to match oe-core
preferred-versions: update tiff version to 3.9.5 to match oe-core
Khem Raj (2):
angstrom-2010-preferred-versions: Pin xserver-xorg to 1.11.1
angstrom-2010.x: Suffix binutils-cross-canadian with TRANSLATED_TARGET_ARCH
Koen Kooi (3):
update-rc.d 0.7: don't let update-rc.d start initscripts when systemd is pre
images: don't include speed hacks anymore
angstrom: drop preferred version settings for perl, there's only one version
====================================================
Changelog for meta-yocto:
Anders Darander (1):
module.bbclass: add lock to prevent error bulding ext modules
Cliff Brake (1):
squashfs-tools: add recipe
Darren Hart (1):
insane.bbclass: print full path on invalid LICENSE_FILES_CHKSUM
Joshua Lock (9):
gst-plugins-good: update to 0.10.30
tzdata: updated SRC_URI and update to 2011k
tzcode-native: update SRC_URI to new IANA location
distro-tracking-fields: update fields for tzdata and gst-plugins-good
gst-plugins-good: correctly handle gconf schema
hob: fix backtrace when dismissing open dialog
fetch2: improve usability of checksums
fetch2: enable checksum definition as SRC_URI parameter
doc: update manual for checksum changes
Kang Kai (5):
ghostscript: update to 9.04
libxml-sax-perl: update to 0.99
liburi-perl: update to 1.59
libsdl: update to 1.2.14
distro_tracking_fields: update packages tracking fields
Khem Raj (10):
bluez4: Add glib-2.0 to DEPENDS
gcc-4.6: Upgrade SRCREV to latest FSF 4.6 branch
gcc-4.6: Backport PR46934 fix
tcmode-default.inc: Add TRANSLATED_TARGET_ARCH suffix to binutils-cross-cana
binutils-cross-canadian: Point sysroot to correct location
gcc-configure-sdk: Point sysroot to correct location
xserver-xorg: Add mesa-dri to depends instead of virtual/libgl
gcc-4.6: Backport fix for PR32219
coreutils: Upgrade recipe 8.12 -> 8.14
pulseaudio: inherit perlnative
Lauri Hintsala (1):
poky: fix broken ubifs link in deploy folder
Martin Jansa (6):
fontconfig: fix fix-pkgconfig.patch
apr: add native support
neon: add native support
apr-util: add native support
subversion-1.6.15: add native support too
default-providers: switch virtual/libgl from mesa-xlib to mesa-dri
Nitin A Kamble (7):
x86 tune files: set baselib for x32 tune as libx32
python-scons: upgrade from 2.0.1 to 2.1.0
python-dbus: upgrade from 0.83.2 to 0.84.0
libxml-parser-perl: upgrade from 2.40 to 2.41
distro-tracking: update data for some toolchain recipes
tcl: upgrade from 8.5.9 to 8.5.10
perl: upgrade from 5.12.3 to 5.14.2
Otavio Salvador (5):
src_distribute.bbclass, src_distribute_local.bbclass: mostly rewritten
bootimg.bbclass: add support to disable HDD image building
useradd.bbclass: check if a group already exists manually
base-passwd: move initial criation of group and passwd to preinst
dbus: use useradd class to allow use in read-only filesystems
Paul Eggleton (2):
gst-plugins-base: update to 0.10.35
gst-plugins-good: add pulseaudio to DEPENDS
Saul Wold (4):
ghostscript: Disable parallel make due to install issues
ghostscript: renamed x86_64 to x86-64 for patch to work
texi2html: Added recipe from OE
oprofile: Update to 0.9.7 and convert cvs->git
Wenzong Fan (2):
ccache: update to 3.1.6
chkconfig: Update to 1.3.55
====================================================
Changelog for meta-texasinstruments:
Denys Dmytriyenko (3):
u-boot-2011.10rc: update to cover ti33x SOC boards, not just beaglebone
u-boot 2011.10rc: update with latest rev and new SRC_URI
u-boot 2011.10rc: update to the latest revision
Joel A Fernandes (6):
linux-ti33x-psp 3.1rc8: Add pin mux and init for beaglebone specific devices
sdcard_image: Copy user.txt/uEnv.txt if it exists in /boot
beaglebone-tester: Update to latest and bump PR
u-boot 2011.10rc: Read EEPROM header correctly for BeagleBone board detectio
beaglebone-tester: Update to latest and bump PR
linux-ti33x-psp 3.1rc8: Update to latest SRCREV, add EEPROM patches
Khem Raj (1):
signgp: Point S to WORKDIR
Koen Kooi (31):
gadget-init: add ugly, ugly hack to make USB work on ti33x boards
linux-ti33x-psp 3.1rc8: fix USB regression for beaglebone, don't disable DEB
gadget-init: fix target in the unit files
sdcard_image bbclass: make VFAT partition name overridable
u-boot 2011.10rc: make uboot pass beaglebone machine ID when encountering a
linux-ti335x-psp 3.1rc8: add proper machine ID for beaglebone
linux 3.0: move to 3.0.7
linux 3.0: enable more usb wifi cards for beagleboard, fix write protect pin
linux-ti33x-psp 3.1rc8: bump SRCREV, enable RTC for bone
u-boot 2011.10rc: update with latest rev
ti-hw-bringup-image: ship musb workaround
sdcard_image bblass: set beaglebone VFAT label to 'BEAGLE_BONE'
multi-kernel: the fetcher doesn't support dotfiles anymore, so get rid of th
linux-ti33x-psp 3.1rc8: only use one config for beaglebone
README: update
linux 3.0: refresh all patches against 3.0.7
libgles-omap3: adjust INSANE_SKIP to match the new format
matrix: sync with arago-next
uboot 2011.10rc: rediff RO patch
linux-ti33x-psp 3.1rc8: remove MUSB probe order for beaglebone
gadget-init: add in latest batch of workarounds
omap3-sgx-modules: use MACHINE_KERNEL_PR
u-boot 2011.10rc: remove beaglebone machine ID patch
linux-ti33x-psp 3.1rc8: include latest MUSB code, remove machine ID patches
gadget-init: adjust to latest 335x kernel
cloud9 image: also ship vimrc
sdcard image bbclass: don't copy uEnv.txt for the time being
linux-ti33x-psp 3.1rc8: use LZO compression for beaglebone to squeeze out so
linux-ti335x-psp 3.1rc8: tree has been rebased, fix SRCREV
sdcard_image bbclass: reinstate uEnv.txt copying
ti-hw-bringup-image: don't include speed hacks
====================================================
Changelog for meta-smartphone:
Klaus Kurzmann (5):
om-gta04.conf: add a machine config for the gta04
linux-gta04_git.bb: add a kernel for the gta04
shr-image.inc: we don't want udev for the gta04
xserver-xf86-config: add a xorg.conf for the om-gta04 machine
fsogsmd_git.bb: give the modem plugin for gta04 it's own package
Lukas Märdian (1):
shr-splash-theme-logo: add om-gta04, bump SRCREV
Martin Jansa (9):
SHR: drop pulseaudio P_V
meta-shr: add abiword provider
meta-openmoko: linux-openmoko: fix usbhost
meta-shr: subversion: prefer 1.7.0
meta-openmoko: mesa-dri, libdrm: fix override, armv4t (PACKAGE_ARCH/TUNE_PKG
shr-image: add debug-tweaks
meta-shr: use --non-interactive --trust-server-cert in FETCHCMD_svn
linux.inc: sync with cleaned version from meta-handheld
linux.inc: be more strict in CONF_SED_SCRIPT
Simon Busch (11):
meta-fso: libsamsung-ipc: bump SRCREV
meta-fso: cornucopia: bump SRCREV
meta-shr: shr-image: don't use udev for palmpre machine; we're using plain d
meta-aurora: aurora-image: choose devtmpfs or other depending on what the ma
meta-shr: shr-image: we want devtmpfs rather than udev for the crespo machin
meta-aurora: aurora-base: bump SRCREV
meta-fso: fso-specs: bump SRCREV and PV
meta-fso: libfso-glib: bump SRCREV and PV
meta-fso: qfsodbusxml2cpp: import from oe-dev and add BBCLASSEXTEND = "nativ
meta-fso: libfso-qt: import from oe-dev
meta-aurora: aurora-daemon: add libfso-qt as dependency
====================================================
Changelog for meta-micro:
====================================================
Changelog for meta-slugos:
====================================================
Changelog for meta-nslu2:
Khem Raj (1):
linux-firmware: Remove use from meta-oe
====================================================
Changelog for meta-intel:
Tom Zanussi (1):
meta-jasperforest: add xserver-xorg bbappend
====================================================
Changelog for meta-handheld:
====================================================
Changelog for meta-opie:
====================================================
Changelog for openembedded:
Paul Menzel (6):
binutils-{canadian,cross}-sdk_2.18: Remove checksums and implicitly update t
memtester: Add `HOMEPAGE = "http://pyropus.ca/software/memtester/"`
memtester: Order header fields according to style guide [1]
memtester: Remove redundant `S = "${WORKDIR}/memtester-${PV}"`
memtester: Remove version 4.0.5
memtester: Remove version 4.0.6
^ permalink raw reply
* Re: Trouble by last dbus patch (46e6c3fa8034b12d178d605f3f5d7efe69671a13)?
From: Scott Garman @ 2011-10-27 20:43 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <201110272230.29012.schnitzeltony@gmx.de>
On 10/27/2011 01:30 PM, Andreas Müller wrote:
> Since the last updates of all layers (angstrom based) I have issues with
>
> * networkmanager/nm-applet (meta-oe): I am not allowed to change the settings
> any more
> * xfce-session (meta-oe): Logging out takes very long and Restart/Shutdown is
> disabled
>
> I remember that I had similar issues a while ago. That could be worked around
> by starting some dbus stuff ( do not exactly remember what it was ).
>
> With this vague idea I checked and found in oe-core:
>
> | dbus: use useradd class to allow use in read-only filesystems
> | author Otavio Salvador<otavio@ossystems.com.br>
> | commit 46e6c3fa8034b12d178d605f3f5d7efe69671a13
>
> Not understanding totally what is all about I see in /etc/passw
>
> | messagebus:x:999:998::/var/lib/dbus:/bin/sh
>
> but I don't have /var/lib/dbus on my sytem!!
>
> I did not check yet, but maybe this is an incompatibilty with angstrom custom
>
> | FILESYSTEM_PERMS_TABLES = "fs-perms-angstrom.txt"
>
> somebody around to enlight the darkness?
useradd should be creating the home directory automatically, but I'd
guess it's not being picked up during packaging. Try adding:
${localstatedir}/lib/dbus
to FILES_${PN}
This is a reasonable guess off the top of my head.
Scott
--
Scott Garman
Embedded Linux Engineer - Yocto Project
Intel Open Source Technology Center
^ permalink raw reply
* Re: Trouble by last dbus patch (46e6c3fa8034b12d178d605f3f5d7efe69671a13)?
From: Andreas Müller @ 2011-10-27 21:42 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <4EA9C265.80703@intel.com>
On Thursday, October 27, 2011 10:43:17 PM Scott Garman wrote:
> On 10/27/2011 01:30 PM, Andreas Müller wrote:
> > Since the last updates of all layers (angstrom based) I have issues with
> >
> > * networkmanager/nm-applet (meta-oe): I am not allowed to change the settings
> > any more
> > * xfce-session (meta-oe): Logging out takes very long and Restart/Shutdown is
> > disabled
> >
> > I remember that I had similar issues a while ago. That could be worked around
> > by starting some dbus stuff ( do not exactly remember what it was ).
> >
> > With this vague idea I checked and found in oe-core:
> >
> > | dbus: use useradd class to allow use in read-only filesystems
> > | author Otavio Salvador<otavio@ossystems.com.br>
> > | commit 46e6c3fa8034b12d178d605f3f5d7efe69671a13
> >
> > Not understanding totally what is all about I see in /etc/passw
> >
> > | messagebus:x:999:998::/var/lib/dbus:/bin/sh
> >
> > but I don't have /var/lib/dbus on my sytem!!
> >
> > I did not check yet, but maybe this is an incompatibilty with angstrom custom
> >
> > | FILESYSTEM_PERMS_TABLES = "fs-perms-angstrom.txt"
> >
> > somebody around to enlight the darkness?
>
> useradd should be creating the home directory automatically, but I'd
> guess it's not being picked up during packaging. Try adding:
>
> ${localstatedir}/lib/dbus
>
> to FILES_${PN}
>
> This is a reasonable guess off the top of my head.
>
> Scott
>
>
On the machine I created /var/lib/dbus and made messagebus owner but no change
in behaviour..
Andreas
^ permalink raw reply
* [CONSOLIDATED PULL 00/18] Patches, QA & Bug Fixes
From: Saul Wold @ 2011-10-27 22:06 UTC (permalink / raw)
To: openembedded-core
Richard,
This includes some patches that have been pending, along with some
QA packaging fixes that I worked up. This also includes the fix for
creating a the xuser and avahi user.
Thanks
Sau!
The following changes since commit ddc9a58b8553599d2328ac1c4449b41681ae45d1:
Add readline as dependecy for gdb-cross-canadian (2011-10-27 08:37:53 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib sgw/stage
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage
Khem Raj (1):
libtool: Upgrade from 2.4 -> 2.4.2
Paul Eggleton (3):
dbus: remove unused initscript
util-linux: split out mkfs into its own package
e2fsprogs: move mke2fs.conf to e2fsprogs-mke2fs package
Saul Wold (12):
wget: Add recipe from OE
dbus-glib: fix QA Packaging issues
libgcc: fix QA Packaging issues
at: fix QA Packaging issues
man: fix QA Packaging issues
mdadm: fix QA Packaging issues
libatomics-ops: fix QA Packaging issues
libproxy: fix QA Packaging issues
abiword: convert to svn
avahi: use useradd to create user
connman: create xuser
xserver-nodm-init: use useradd to create xuser
Scott Garman (1):
documentation-audit.sh: script for auditing documentation build
status
Wenzong Fan (1):
distro_tracking_fields: update packages tracking fields
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 +
.../conf/distro/include/distro_tracking_fields.inc | 12 +
meta/recipes-connectivity/avahi/avahi.inc | 22 +--
meta/recipes-connectivity/connman/connman.inc | 6 +-
meta/recipes-connectivity/connman/connman_0.75.bb | 2 +-
meta/recipes-core/dbus/dbus-glib.inc | 4 +-
meta/recipes-core/dbus/dbus-glib_0.92.bb | 2 +-
meta/recipes-core/dbus/dbus.inc | 3 +
meta/recipes-core/dbus/dbus_1.4.12.bb | 3 +
meta/recipes-core/util-linux/util-linux.inc | 5 +-
.../e2fsprogs/e2fsprogs_1.41.14.bb | 4 +-
meta/recipes-devtools/gcc/libgcc_4.6.bb | 2 +
.../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 +-
meta/recipes-extended/at/at_3.1.12.bb | 4 +-
meta/recipes-extended/man/man_1.6f.bb | 4 +-
meta/recipes-extended/mdadm/mdadm_3.2.2.bb | 3 +-
.../wget/wget-1.12/fix_makefile.patch | 59 +++++
.../wget/wget-1.12/gnutls.bzr.patch | 266 ++++++++++++++++++++
meta/recipes-extended/wget/wget.inc | 24 ++
meta/recipes-extended/wget/wget_1.12.bb | 11 +
.../x11-common/xserver-nodm-init.bb | 26 +--
.../pulseaudio/libatomics-ops_1.2.bb | 6 +-
meta/recipes-support/libproxy/libproxy_0.4.7.bb | 4 +-
scripts/contrib/documentation-audit.sh | 92 +++++++
33 files changed, 571 insertions(+), 152 deletions(-)
delete mode 100644 meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb
create mode 100644 meta-demoapps/recipes-gnome/abiword/abiword_svn.bb
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%)
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
create mode 100755 scripts/contrib/documentation-audit.sh
--
1.7.6.4
^ permalink raw reply
* [CONSOLIDATED PULL 01/18] libtool: Upgrade from 2.4 -> 2.4.2
From: Saul Wold @ 2011-10-27 22:06 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319753141.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 02/18] wget: Add recipe from OE
From: Saul Wold @ 2011-10-27 22:06 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319753141.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 | 24 ++
meta/recipes-extended/wget/wget_1.12.bb | 11 +
4 files changed, 360 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..589d727
--- /dev/null
+++ b/meta/recipes-extended/wget/wget.inc
@@ -0,0 +1,24 @@
+DESCRIPTION = "A console URL download utility featuring HTTP, FTP, and more."
+SECTION = "console/network"
+LICENSE = "GPL"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+
+DEPENDS = ""
+
+INC_PR = "r10"
+
+S = "${WORKDIR}/wget-${PV}"
+
+inherit autotools gettext update-alternatives
+
+# Disable checking for SSL since that searches the system paths
+EXTRA_OECONF = "--with-libc --enable-ipv6 --without-ssl"
+
+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 03/18] dbus-glib: fix QA Packaging issues
From: Saul Wold @ 2011-10-27 22:06 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319753141.git.sgw@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-core/dbus/dbus-glib.inc | 4 +++-
meta/recipes-core/dbus/dbus-glib_0.92.bb | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/dbus/dbus-glib.inc b/meta/recipes-core/dbus/dbus-glib.inc
index 704dc04..80f68c8 100644
--- a/meta/recipes-core/dbus/dbus-glib.inc
+++ b/meta/recipes-core/dbus/dbus-glib.inc
@@ -19,7 +19,9 @@ EXTRA_OECONF = "--with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-in
--with-dbus-binding-tool=${STAGING_BINDIR_NATIVE}/dbus-binding-tool"
EXTRA_OECONF_virtclass-native = "--with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml"
-FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN} = "${libdir}/lib*${SOLIBS}"
+FILES_${PN}-bash_completion = "${sysconfdir}/bash_completion.d/dbus-bash-completion.sh \
+ ${libexecdir}/dbus-bash-completion-helper"
FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool"
FILES_${PN}-dev += "${bindir}/dbus-binding-tool"
diff --git a/meta/recipes-core/dbus/dbus-glib_0.92.bb b/meta/recipes-core/dbus/dbus-glib_0.92.bb
index 72bea89..c7266d4 100644
--- a/meta/recipes-core/dbus/dbus-glib_0.92.bb
+++ b/meta/recipes-core/dbus/dbus-glib_0.92.bb
@@ -1,6 +1,6 @@
require dbus-glib.inc
-PR = "r0"
+PR = "r1"
SRC_URI[md5sum] = "b595b36890c4f9f8f5d5dec131c495f8"
SRC_URI[sha256sum] = "5a7fd4cf937cdcb7f2eed61341b70ee0f2607450a50db381618598adf60dd40e"
--
1.7.6.4
^ permalink raw reply related
* [CONSOLIDATED PULL 04/18] libgcc: fix QA Packaging issues
From: Saul Wold @ 2011-10-27 22:06 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319753141.git.sgw@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-devtools/gcc/libgcc_4.6.bb | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-devtools/gcc/libgcc_4.6.bb b/meta/recipes-devtools/gcc/libgcc_4.6.bb
index 6ba0339..401d9dc 100644
--- a/meta/recipes-devtools/gcc/libgcc_4.6.bb
+++ b/meta/recipes-devtools/gcc/libgcc_4.6.bb
@@ -6,6 +6,7 @@ DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
PACKAGES = "\
${PN} \
${PN}-dev \
+ ${PN}-dbg \
"
FILES_${PN} = "${base_libdir}/libgcc*.so.*"
@@ -14,6 +15,7 @@ FILES_${PN}-dev = " \
${libdir}/${TARGET_SYS}/${BINV}/crt* \
${libdir}/${TARGET_SYS}/${BINV}/libgcov.a \
${libdir}/${TARGET_SYS}/${BINV}/libgcc*"
+FILES_${PN}-dbg = "${base_libdir}/.debug"
do_configure[noexec] = "1"
do_compile[noexec] = "1"
--
1.7.6.4
^ permalink raw reply related
* [CONSOLIDATED PULL 05/18] at: fix QA Packaging issues
From: Saul Wold @ 2011-10-27 22:06 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319753141.git.sgw@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-extended/at/at_3.1.12.bb | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-extended/at/at_3.1.12.bb b/meta/recipes-extended/at/at_3.1.12.bb
index 30fdb68..f2017b7 100644
--- a/meta/recipes-extended/at/at_3.1.12.bb
+++ b/meta/recipes-extended/at/at_3.1.12.bb
@@ -11,7 +11,7 @@ PAM_DEPS = "libpam libpam-runtime pam-plugin-env pam-plugin-limits"
RCONFLICTS_${PN} = "atd"
RREPLACES_${PN} = "atd"
-PR = "r6"
+PR = "r7"
SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz \
file://configure.patch \
@@ -50,6 +50,8 @@ do_install () {
install -d ${D}${sysconfdir}/rcS.d
install -m 0755 ${WORKDIR}/S99at ${D}${sysconfdir}/init.d/atd
ln -sf ../init.d/atd ${D}${sysconfdir}/rcS.d/S99at
+ cp -r ${D}/usr/doc/at ${D}${docdir}/
+ rm -rf ${D}/usr/doc
for feature in ${DISTRO_FEATURES}; do
if [ "$feature" = "pam" ]; then
--
1.7.6.4
^ permalink raw reply related
* [CONSOLIDATED PULL 06/18] man: fix QA Packaging issues
From: Saul Wold @ 2011-10-27 22:06 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319753141.git.sgw@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-extended/man/man_1.6f.bb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-extended/man/man_1.6f.bb b/meta/recipes-extended/man/man_1.6f.bb
index d38612b..c98c920 100644
--- a/meta/recipes-extended/man/man_1.6f.bb
+++ b/meta/recipes-extended/man/man_1.6f.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "A set of documentation tools: man, apropos and whatis"
SECTION = "console/utils"
HOMEPAGE = "http://primates.ximian.com/~flucifredi/man"
LICENSE = "GPLv2"
-PR = "r0"
+PR = "r1"
DEPENDS = "groff less"
@@ -61,4 +61,4 @@ do_install_append(){
}
-FILES_${PN} += "${datadir}/locale"
+FILES_${PN} += "${datadir}/locale ${sysconfdir}/man.conf"
--
1.7.6.4
^ permalink raw reply related
* [CONSOLIDATED PULL 07/18] mdadm: fix QA Packaging issues
From: Saul Wold @ 2011-10-27 22:06 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319753141.git.sgw@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-extended/mdadm/mdadm_3.2.2.bb | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-extended/mdadm/mdadm_3.2.2.bb b/meta/recipes-extended/mdadm/mdadm_3.2.2.bb
index 492cc8e..97878ed 100644
--- a/meta/recipes-extended/mdadm/mdadm_3.2.2.bb
+++ b/meta/recipes-extended/mdadm/mdadm_3.2.2.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
file://mdmon.c;beginline=4;endline=18;md5=af7d8444d9c4d3e5c7caac0d9d34039d \
file://mdadm.h;beglinlne=4;endline=22;md5=462bc9936ac0d3da110191a3f9994161"
-PR = "r1"
+PR = "r2"
SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.bz2 \
file://0001-mdadm-fix-build-failures-ppc64.patch \
@@ -31,3 +31,4 @@ do_install() {
autotools_do_install
}
+FILES_${PN} += "${base_libdir}/udev/rules.d/*.rules"
--
1.7.6.4
^ permalink raw reply related
* [CONSOLIDATED PULL 09/18] libproxy: fix QA Packaging issues
From: Saul Wold @ 2011-10-27 22:06 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319753141.git.sgw@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-support/libproxy/libproxy_0.4.7.bb | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-support/libproxy/libproxy_0.4.7.bb b/meta/recipes-support/libproxy/libproxy_0.4.7.bb
index 2793b41..f31b701 100644
--- a/meta/recipes-support/libproxy/libproxy_0.4.7.bb
+++ b/meta/recipes-support/libproxy/libproxy_0.4.7.bb
@@ -6,9 +6,10 @@ LICENSE = "LGPLv2.1+"
LIC_FILES_CHKSUM = "file://COPYING;md5=7d7044444a7b1b116e8783edcdb44ff4 \
file://utils/proxy.c;beginline=1;endline=18;md5=55152a1006d7dafbef32baf9c30a99c0"
-
DEPENDS = "gconf"
+PR = "r1"
+
SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.tar.gz"
SRC_URI[md5sum] = "509e03a488a61cd62bfbaf3ab6a2a7a5"
@@ -19,6 +20,7 @@ inherit cmake pkgconfig
EXTRA_OECMAKE = "-DWITH_WEBKIT=no -DWITH_GNOME=yes -DWITH_KDE4=no \
-DWITH_PYTHON=no -DWITH_PERL=no -DWITH_MOZJS=no -DWITH_NM=no -DLIB_INSTALL_DIR=${libdir}"
+FILES_${PN}-dev += "${datadir}/cmake"
FILES_${PN}-dbg += "${libdir}/libproxy/${PV}/plugins/.debug/ ${libdir}/libproxy/${PV}/modules/.debug/"
do_configure_prepend() {
--
1.7.6.4
^ permalink raw reply related
* [CONSOLIDATED PULL 08/18] libatomics-ops: fix QA Packaging issues
From: Saul Wold @ 2011-10-27 22:06 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319753141.git.sgw@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../pulseaudio/libatomics-ops_1.2.bb | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-multimedia/pulseaudio/libatomics-ops_1.2.bb b/meta/recipes-multimedia/pulseaudio/libatomics-ops_1.2.bb
index 05b22e8..ab7ccbe 100644
--- a/meta/recipes-multimedia/pulseaudio/libatomics-ops_1.2.bb
+++ b/meta/recipes-multimedia/pulseaudio/libatomics-ops_1.2.bb
@@ -6,7 +6,7 @@ LICENSE = "GPLv2 & MIT"
LIC_FILES_CHKSUM = "file://doc/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://doc/LICENSING.txt;md5=607073e04548eac7d1f763e480477bab \
"
-PR = "r5"
+PR = "r6"
SRC_URI = "http://www.hpl.hp.com/research/linux/atomic_ops/download/libatomic_ops-${PV}.tar.gz \
file://fedora/libatomic_ops-1.2-ppclwzfix.patch \
@@ -21,3 +21,7 @@ S = "${WORKDIR}/libatomic_ops-${PV}"
ALLOW_EMPTY_${PN} = "1"
inherit autotools pkgconfig
+
+do_install_append() {
+ mv ${D}${datadir}/libatomic_ops ${D}${datadir}/libatomic-ops || true
+}
--
1.7.6.4
^ permalink raw reply related
* [CONSOLIDATED PULL 10/18] abiword: convert to svn
From: Saul Wold @ 2011-10-27 22:06 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319753141.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..4ec0ba9 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 = "svn://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 11/18] dbus: remove unused initscript
From: Saul Wold @ 2011-10-27 22:06 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319753141.git.sgw@linux.intel.com>
From: Paul Eggleton <paul.eggleton@linux.intel.com>
We already install an appropriate init script to /etc/init.d, we do not
need an additional one in /etc/init.d/rc.d as well.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/recipes-core/dbus/dbus.inc | 3 +++
meta/recipes-core/dbus/dbus_1.4.12.bb | 3 +++
2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index 2a97c02..4c7d87a 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -86,6 +86,9 @@ do_install() {
chown root:messagebus ${D}${libexecdir}/dbus-daemon-launch-helper
chmod 4754 ${D}${libexecdir}/dbus-daemon-launch-helper
+ # Remove Red Hat initscript
+ rm -rf ${D}${sysconfdir}/rc.d
+
# disable dbus-1 sysv script on systemd installs
# nearly all distros call the initscript plain 'dbus', but OE-core is different
ln -sf /dev/null ${D}/${base_libdir}/systemd/system/dbus-1.service
diff --git a/meta/recipes-core/dbus/dbus_1.4.12.bb b/meta/recipes-core/dbus/dbus_1.4.12.bb
index ada53c9..9324af7 100644
--- a/meta/recipes-core/dbus/dbus_1.4.12.bb
+++ b/meta/recipes-core/dbus/dbus_1.4.12.bb
@@ -1,4 +1,7 @@
include dbus.inc
+
+PR = "r1"
+
SRC_URI[md5sum] = "104f2ea94c10a896dfb1edecb5714cb1"
SRC_URI[sha256sum] = "da3c97fd546610558d588799e27c4fa81101e754acbcd34747a42c131f30dbe7"
--
1.7.6.4
^ permalink raw reply related
* [CONSOLIDATED PULL 12/18] util-linux: split out mkfs into its own package
From: Saul Wold @ 2011-10-27 22:06 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319753141.git.sgw@linux.intel.com>
From: Paul Eggleton <paul.eggleton@linux.intel.com>
For those external tools such as Webmin that call mkfs to do formatting
operations, it is useful to have it in its own package to avoid dragging
in the rest of util-linux.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
[Merged with head]
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-core/util-linux/util-linux.inc | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index eeba67c..4db577c 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -30,7 +30,7 @@ PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfd
util-linux-mount util-linux-readprofile util-linux-libblkid \
util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev \
util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \
- util-linux-chkdupexe"
+ util-linux-chkdupexe util-linux-mkfs"
EXTRA_OECONF = "--disable-use-tty-group --disable-makeinstall-chown --enable-elvtune --enable-init --enable-kill --enable-last \
--enable-mesg --enable-partx --enable-raw --enable-rdev --enable-reset \
@@ -57,15 +57,16 @@ FILES_util-linux-lscpu = "${bindir}/lscpu"
FILES_util-linux-fsck = "${base_sbindir}/fsck*"
FILES_util-linux-chkdupexe = "${bindir}/chkdupexe"
+FILES_util-linux-mkfs = "${sbindir}/mkfs"
# Util-linux' blkid replaces the e2fsprogs one
FILES_util-linux-blkid = "${base_sbindir}/blkid*"
RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid"
RREPLACES_util-linux-blkid = "e2fsprogs-blkid"
-RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile "
RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup"
RDEPENDS_${PN}-chkdupexe = "perl"
+RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile util-linux-mkfs "
RRECOMMENDS_${PN}_virtclass-native = ""
RDEPENDS_${PN}_virtclass-native = ""
--
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