Re: [OE-core] [PATCH v3] dbus: include dbus-launch in the main dbus package
On 07/27/2012 12:12 AM, Burton, Ross wrote:
On 26 July 2012 14:17, Enrico Scholz enrico.sch...@sigma-chemnitz.de wrote:
Radu Moisan radu.moisan-ral2jqcrhueavxtiumw...@public.gmane.org
writes:
Followed suggestions from Bugz 2261:
1) remove the --with-x/--without-x configure arguments.
why? They are valid ./configure options and common when evaluating the
x11 distro-feature. Selecting them explicitly makes the build more
predictable and detects configuration errors earlier.
Sense of '--without-x' was disabling of x11 dependency, but not turning
off the x11-autolaunch feature.
That's my fault, and I can't remember my reasoning. Probably best to
bring it back so the recipe is explicit.
Radu, bring back this fragment, but correct the options
EXTRA_OECONF_X = ${@base_contains('DISTRO_FEATURES', 'x11',
'--enable-x11-autolaunch', '--disable-x11-autolaunch', d)}
Ross
I've looked into the configure script and found that autolaunch feature
is depending on x11, in other words using --with-x/--without-x implies
--enable-x11-autolaunch/--disable-x11-autolaunch, so I guess the initial
EXTRA_OECONF_X line will do pretty much the same thing.
EXTRA_OECONF_X = ${@base_contains('DISTRO_FEATURES', 'x11', '--with-x',
'--without-x', d)}
Radu
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3] dbus: include dbus-launch in the main dbus package
On 07/27/2012 09:10 AM, Radu Moisan wrote:
On 07/27/2012 12:12 AM, Burton, Ross wrote:
On 26 July 2012 14:17, Enrico Scholzenrico.sch...@sigma-chemnitz.de wrote:
Radu Moisanradu.moisan-ral2jqcrhueavxtiumw...@public.gmane.org
writes:
Followed suggestions from Bugz 2261:
1) remove the --with-x/--without-x configure arguments.
why? They are valid ./configure options and common when evaluating the
x11 distro-feature. Selecting them explicitly makes the build more
predictable and detects configuration errors earlier.
Sense of '--without-x' was disabling of x11 dependency, but not turning
off the x11-autolaunch feature.
That's my fault, and I can't remember my reasoning. Probably best to
bring it back so the recipe is explicit.
Radu, bring back this fragment, but correct the options
EXTRA_OECONF_X = ${@base_contains('DISTRO_FEATURES', 'x11',
'--enable-x11-autolaunch', '--disable-x11-autolaunch', d)}
Ross
I've looked into the configure script and found that autolaunch
feature is depending on x11, in other words using --with-x/--without-x
implies --enable-x11-autolaunch/--disable-x11-autolaunch, so I guess
the initial EXTRA_OECONF_X line will do pretty much the same thing.
EXTRA_OECONF_X = ${@base_contains('DISTRO_FEATURES', 'x11',
'--with-x', '--without-x', d)}
and the same applies for EXTRA_OECONF_X_virtclass-native disabling X
will disable autolaunch feature, so I'll keep the initial line as well.
Radu
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v5] dbus: include dbus-launch in the main dbus package
Followed suggestions from Bugz 2261:
2) make the virtual/libx11 DEPENDS conditional based on the x11 distro feature.
This makes the build dependencies reflect the feature list.
3) remove dbus-x11, meaning that dbus-launch with its potential X11 dependency
is now back in dbus where is belongs.
4) Potentially make dbus provide dbus-x11, for compatibility.
Fixes [Yocto #2261]
Signed-off-by: Radu Moisan radu.moi...@intel.com
---
meta/recipes-core/dbus/dbus.inc |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index a75583d..b01323b 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -31,10 +31,12 @@ CONFFILES_${PN} = ${sysconfdir}/dbus-1/system.conf
${sysconfdir}/dbus-1/session
DEBIANNAME_${PN} = dbus-1
-PACKAGES =+ ${PN}-lib ${PN}-systemd ${@base_contains('DISTRO_FEATURES',
'x11', '${PN}-x11', '', d)}
+PACKAGES =+ ${PN}-lib ${PN}-systemd
-FILES_${PN}-x11 = ${bindir}/dbus-launch
-RDEPENDS_${PN}-x11 = ${PN}
+# for compatibility
+PROVIDES = dbus-x11
+RPROVIDES_${PN} = dbus-x11
+RREPLACES_${PN} += dbus-x11
FILES_${PN}-systemd = ${systemd_unitdir}/system/
@@ -43,6 +45,7 @@ FILES_${PN} = ${bindir}/dbus-daemon* \
${bindir}/dbus-cleanup-sockets \
${bindir}/dbus-send \
${bindir}/dbus-monitor \
+ ${bindir}/dbus-launch \
${libexecdir}/dbus* \
${sysconfdir} \
${localstatedir} \
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] lttng-2.0: update to the latest version
From: Fahad Usman fahad_us...@mentor.com
update lttng-modules-2.0, lttng-tools-2.0 lttng-ust-2.0 and liburcu to the
latest stable released versions by lttng community
remove the lttng-sycalls-protect-is_compat_task-from-redefiniti.patch because
the problem is handled in the latest version of lttng-modules
Signed-off-by: Fahad Usman fahad_us...@mentor.com
---
...ls-protect-is_compat_task-from-redefiniti.patch | 41
.../lttng-2.0/lttng-modules_2.0.4.bb | 26
.../lttng-2.0/lttng-modules_2.0.pre11.bb | 30 --
meta/recipes-kernel/lttng-2.0/lttng-tools_2.0.1.bb | 32 ---
meta/recipes-kernel/lttng-2.0/lttng-tools_2.0.3.bb | 30 ++
meta/recipes-kernel/lttng-2.0/lttng2-ust_2.0.2.bb | 30 --
meta/recipes-kernel/lttng-2.0/lttng2-ust_2.0.4.bb | 30 ++
meta/recipes-support/liburcu/liburcu_0.6.7.bb | 24 ---
meta/recipes-support/liburcu/liburcu_0.7.3.bb | 24 +++
9 files changed, 110 insertions(+), 157 deletions(-)
delete mode 100644
meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-sycalls-protect-is_compat_task-from-redefiniti.patch
create mode 100644 meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.4.bb
delete mode 100644 meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.pre11.bb
delete mode 100644 meta/recipes-kernel/lttng-2.0/lttng-tools_2.0.1.bb
create mode 100644 meta/recipes-kernel/lttng-2.0/lttng-tools_2.0.3.bb
delete mode 100644 meta/recipes-kernel/lttng-2.0/lttng2-ust_2.0.2.bb
create mode 100644 meta/recipes-kernel/lttng-2.0/lttng2-ust_2.0.4.bb
delete mode 100644 meta/recipes-support/liburcu/liburcu_0.6.7.bb
create mode 100644 meta/recipes-support/liburcu/liburcu_0.7.3.bb
diff --git
a/meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-sycalls-protect-is_compat_task-from-redefiniti.patch
b/meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-sycalls-protect-is_compat_task-from-redefiniti.patch
deleted file mode 100644
index 0056633..000
---
a/meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-sycalls-protect-is_compat_task-from-redefiniti.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 415a1a678cb2fcf603f9777f2c7b71c1e38f8101 Mon Sep 17 00:00:00 2001
-From: Bruce Ashfield bruce.ashfi...@windriver.com
-Date: Mon, 19 Mar 2012 13:30:31 -0400
-Subject: [PATCH] lttng-sycalls: protect is_compat_task from redefinition
-
-recent -stable kernels have their own fallback definition of is_compat_task
-
- #define is_compat_task() (0)
-
-To protect against this double definition of is_compat_task we can check
-to see if it is already defined, and skip the lttng variant.
-
-Signed-off-by: Bruce Ashfield bruce.ashfi...@windriver.com
- lttng-syscalls.c |4
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/lttng-syscalls.c b/lttng-syscalls.c
-index 9de3c07..80d0f05 100644
a/lttng-syscalls.c
-+++ b/lttng-syscalls.c
-@@ -17,12 +17,16 @@
- #include ltt-events.h
-
- #ifndef CONFIG_COMPAT
-+
-+#ifndef is_compat_task
- static inline int is_compat_task(void)
- {
- return 0;
- }
- #endif
-
-+#endif
-+
- static
- void syscall_entry_probe(void *__data, struct pt_regs *regs, long id);
-
---
-1.7.5.4
-
diff --git a/meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.4.bb
b/meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.4.bb
new file mode 100644
index 000..d40c99b
--- /dev/null
+++ b/meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.4.bb
@@ -0,0 +1,26 @@
+SECTION = devel
+SUMMARY = Linux Trace Toolkit KERNEL MODULE
+DESCRIPTION = The lttng-modules 2.0 package contains the kernel tracer
modules
+LICENSE = LGPLv2.1 GPLv2
+LIC_FILES_CHKSUM = file://LICENSE;md5=1eb086682a7c65a45acd9bcdf6877b3e \
+file://gpl-2.0.txt;md5=751419260aa954499f7abaabaa882bbe \
+file://lgpl-2.1.txt;md5=243b725d71bb5df4a1e5920b344b86ad
+
+DEPENDS = virtual/kernel
+
+inherit module
+
+PR = r0
+
+SRC_URI = http://lttng.org/files/${PN}/${PN}-${PV}.tar.bz2\
+ file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch
+SRC_URI[md5sum] = e2f07c0eb40a0d8027de17f4dd7ebe12
+SRC_URI[sha256sum] =
f00116c388289192774c774581a651832be094aeb6da2f2c0f9c9e275fed2d14
+
+export INSTALL_MOD_DIR=kernel/lttng-modules
+export KERNEL_SRC=${STAGING_KERNEL_DIR}
+
+# Due to liburcu not building for MIPS currently this recipe needs to
+# be limited also.
+# So here let us first suppport x86/arm/powerpc platforms now.
+COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|powerpc.*)-linux'
diff --git a/meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.pre11.bb
b/meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.pre11.bb
deleted file mode 100644
index 4c78f36..000
--- a/meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.pre11.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-SECTION = devel
-SUMMARY = Linux Trace Toolkit KERNEL MODULE
-DESCRIPTION = The lttng-modules 2.0 package contains the kernel tracer
modules
-LICENSE = LGPLv2.1 GPLv2
[OE-core] [PATCH 1/1] socat 1.7.2: add readline dependency
From: Roy.Li rongqing...@windriver.com
[YOCTO #2844]
socat has dependency on readline
Signed-off-by: Roy.Li rongqing...@windriver.com
---
meta/recipes-connectivity/socat/socat_1.7.2.0.bb |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-connectivity/socat/socat_1.7.2.0.bb
b/meta/recipes-connectivity/socat/socat_1.7.2.0.bb
index 1273dcf..33004e3 100644
--- a/meta/recipes-connectivity/socat/socat_1.7.2.0.bb
+++ b/meta/recipes-connectivity/socat/socat_1.7.2.0.bb
@@ -4,11 +4,11 @@ HOMEPAGE = http://www.dest-unreach.org/socat/;
SECTION = console/network
-DEPENDS = openssl
+DEPENDS = openssl readline
LICENSE = GPL-2.0+-with-OpenSSL-exception
-PR = r0
+PR = r1
SRC_URI =
http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2;name=src \
file://compile.patch
--
1.7.4.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] lttng-2.0: update to the latest version
Hi,
I recommend changing the liburcu licence as follows, following a GPLv3
file addition in the build macros:
LICENSE = LGPLv2.1+ MIT-style GPLv3
LICENSE_${PN} = LGPLv2.1+ MIT-style
Cheers,
Alex
On Fri, Jul 27, 2012 at 10:30 AM, fahad.us...@gmail.com wrote:
From: Fahad Usman fahad_us...@mentor.com
update lttng-modules-2.0, lttng-tools-2.0 lttng-ust-2.0 and liburcu to the
latest stable released versions by lttng community
remove the lttng-sycalls-protect-is_compat_task-from-redefiniti.patch
because
the problem is handled in the latest version of lttng-modules
Signed-off-by: Fahad Usman fahad_us...@mentor.com
---
...ls-protect-is_compat_task-from-redefiniti.patch | 41
.../lttng-2.0/lttng-modules_2.0.4.bb | 26
.../lttng-2.0/lttng-modules_2.0.pre11.bb | 30 --
meta/recipes-kernel/lttng-2.0/lttng-tools_2.0.1.bb | 32 ---
meta/recipes-kernel/lttng-2.0/lttng-tools_2.0.3.bb | 30 ++
meta/recipes-kernel/lttng-2.0/lttng2-ust_2.0.2.bb | 30 --
meta/recipes-kernel/lttng-2.0/lttng2-ust_2.0.4.bb | 30 ++
meta/recipes-support/liburcu/liburcu_0.6.7.bb | 24 ---
meta/recipes-support/liburcu/liburcu_0.7.3.bb | 24 +++
9 files changed, 110 insertions(+), 157 deletions(-)
delete mode 100644
meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-sycalls-protect-is_compat_task-from-redefiniti.patch
create mode 100644 meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.4.bb
delete mode 100644 meta/recipes-kernel/lttng-2.0/
lttng-modules_2.0.pre11.bb
delete mode 100644 meta/recipes-kernel/lttng-2.0/lttng-tools_2.0.1.bb
create mode 100644 meta/recipes-kernel/lttng-2.0/lttng-tools_2.0.3.bb
delete mode 100644 meta/recipes-kernel/lttng-2.0/lttng2-ust_2.0.2.bb
create mode 100644 meta/recipes-kernel/lttng-2.0/lttng2-ust_2.0.4.bb
delete mode 100644 meta/recipes-support/liburcu/liburcu_0.6.7.bb
create mode 100644 meta/recipes-support/liburcu/liburcu_0.7.3.bb
diff --git
a/meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-sycalls-protect-is_compat_task-from-redefiniti.patch
b/meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-sycalls-protect-is_compat_task-from-redefiniti.patch
deleted file mode 100644
index 0056633..000
---
a/meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-sycalls-protect-is_compat_task-from-redefiniti.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 415a1a678cb2fcf603f9777f2c7b71c1e38f8101 Mon Sep 17 00:00:00 2001
-From: Bruce Ashfield bruce.ashfi...@windriver.com
-Date: Mon, 19 Mar 2012 13:30:31 -0400
-Subject: [PATCH] lttng-sycalls: protect is_compat_task from redefinition
-
-recent -stable kernels have their own fallback definition of
is_compat_task
-
- #define is_compat_task() (0)
-
-To protect against this double definition of is_compat_task we can check
-to see if it is already defined, and skip the lttng variant.
-
-Signed-off-by: Bruce Ashfield bruce.ashfi...@windriver.com
- lttng-syscalls.c |4
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/lttng-syscalls.c b/lttng-syscalls.c
-index 9de3c07..80d0f05 100644
a/lttng-syscalls.c
-+++ b/lttng-syscalls.c
-@@ -17,12 +17,16 @@
- #include ltt-events.h
-
- #ifndef CONFIG_COMPAT
-+
-+#ifndef is_compat_task
- static inline int is_compat_task(void)
- {
- return 0;
- }
- #endif
-
-+#endif
-+
- static
- void syscall_entry_probe(void *__data, struct pt_regs *regs, long id);
-
---
-1.7.5.4
-
diff --git
a/meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.4.bbb/meta/recipes-kernel/lttng-2.0/
lttng-modules_2.0.4.bb
new file mode 100644
index 000..d40c99b
--- /dev/null
+++ b/meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.4.bb
@@ -0,0 +1,26 @@
+SECTION = devel
+SUMMARY = Linux Trace Toolkit KERNEL MODULE
+DESCRIPTION = The lttng-modules 2.0 package contains the kernel tracer
modules
+LICENSE = LGPLv2.1 GPLv2
+LIC_FILES_CHKSUM = file://LICENSE;md5=1eb086682a7c65a45acd9bcdf6877b3e \
+
file://gpl-2.0.txt;md5=751419260aa954499f7abaabaa882bbe \
+
file://lgpl-2.1.txt;md5=243b725d71bb5df4a1e5920b344b86ad
+
+DEPENDS = virtual/kernel
+
+inherit module
+
+PR = r0
+
+SRC_URI = http://lttng.org/files/${PN}/${PN}-${PV}.tar.bz2\
+ file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch
+SRC_URI[md5sum] = e2f07c0eb40a0d8027de17f4dd7ebe12
+SRC_URI[sha256sum] =
f00116c388289192774c774581a651832be094aeb6da2f2c0f9c9e275fed2d14
+
+export INSTALL_MOD_DIR=kernel/lttng-modules
+export KERNEL_SRC=${STAGING_KERNEL_DIR}
+
+# Due to liburcu not building for MIPS currently this recipe needs to
+# be limited also.
+# So here let us first suppport x86/arm/powerpc platforms now.
+COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|powerpc.*)-linux'
diff --git
a/meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.pre11.bbb/meta/recipes-kernel/lttng-2.0/
[OE-core] [PATCH] busybox: udhcpc shouldn't be a service
udhcpc is invoked from the networking service, so it shouldn't exist
standalone. If /etc/init.d/busybox-udhcpc is present, it will cause
udhcpc to be started two times.
And since the script doesn't support the stop action, it will cause
udhcpc to be started even when system is being shutdown.
Remove /etc/init.d/busybox-udhcpc to resolve the issues.
[YOCTO #2840]
Signed-off-by: Jesse Zhang sen.zh...@windriver.com
---
meta/recipes-core/busybox/busybox.inc |6 +---
meta/recipes-core/busybox/busybox_1.19.4.bb|3 +-
meta/recipes-core/busybox/files/busybox-udhcpc | 25
3 files changed, 3 insertions(+), 31 deletions(-)
delete mode 100755 meta/recipes-core/busybox/files/busybox-udhcpc
diff --git a/meta/recipes-core/busybox/busybox.inc
b/meta/recipes-core/busybox/busybox.inc
index b2fbd52..0a4c067 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -20,16 +20,15 @@ FILES_${PN}-httpd = ${sysconfdir}/init.d/busybox-httpd
/srv/www
FILES_${PN}-syslog = ${sysconfdir}/init.d/syslog*
${sysconfdir}/syslog-startup.conf*
FILES_${PN}-mdev = ${sysconfdir}/init.d/mdev ${sysconfdir}/mdev.conf
FILES_${PN}-udhcpd = ${sysconfdir}/init.d/busybox-udhcpd
-FILES_${PN}-udhcpc = ${sysconfdir}/udhcpc.d ${datadir}/udhcpc
${sysconfdir}/init.d/busybox-udhcpc
+FILES_${PN}-udhcpc = ${sysconfdir}/udhcpc.d ${datadir}/udhcpc
-INITSCRIPT_PACKAGES = ${PN}-httpd ${PN}-syslog ${PN}-udhcpd ${PN}-udhcpc
${PN}-mdev
+INITSCRIPT_PACKAGES = ${PN}-httpd ${PN}-syslog ${PN}-udhcpd ${PN}-mdev
INITSCRIPT_NAME_${PN}-httpd = busybox-httpd
INITSCRIPT_NAME_${PN}-syslog = syslog
INITSCRIPT_NAME_${PN}-mdev = mdev
INITSCRIPT_PARAMS_${PN}-mdev = start 06 S .
INITSCRIPT_NAME_${PN}-udhcpd = busybox-udhcpd
-INITSCRIPT_NAME_${PN}-udhcpc = busybox-udhcpc
CONFFILES_${PN}-syslog = ${sysconfdir}/syslog-startup.conf.${BPN}
CONFFILES_${PN}-mdev = ${sysconfdir}/mdev.conf
@@ -186,7 +185,6 @@ do_install () {
install -d ${D}${datadir}/udhcpc
install -m 0755 ${WORKDIR}/simple.script
${D}${sysconfdir}/udhcpc.d/50default
install -m 0755 ${WORKDIR}/default.script
${D}${datadir}/udhcpc/default.script
- install -m 0755 ${WORKDIR}/busybox-udhcpc
${D}${sysconfdir}/init.d/
fi
if grep CONFIG_INETD=y ${WORKDIR}/defconfig; then
install -m 0755 ${WORKDIR}/inetd
${D}${sysconfdir}/init.d/inetd.${BPN}
diff --git a/meta/recipes-core/busybox/busybox_1.19.4.bb
b/meta/recipes-core/busybox/busybox_1.19.4.bb
index 6e69d22..4614cb6 100644
--- a/meta/recipes-core/busybox/busybox_1.19.4.bb
+++ b/meta/recipes-core/busybox/busybox_1.19.4.bb
@@ -1,5 +1,5 @@
require busybox.inc
-PR = r10
+PR = r11
SRC_URI = http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball
\
file://B921600.patch \
@@ -14,7 +14,6 @@ SRC_URI =
http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
file://busybox-cron \
file://busybox-httpd \
file://busybox-udhcpd \
- file://busybox-udhcpc \
file://default.script \
file://simple.script \
file://hwclock.sh \
diff --git a/meta/recipes-core/busybox/files/busybox-udhcpc
b/meta/recipes-core/busybox/files/busybox-udhcpc
deleted file mode 100755
index 2c43f8d..000
--- a/meta/recipes-core/busybox/files/busybox-udhcpc
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-#
-# (c) 2010-2011 Wind River Systems, Inc.
-#
-# Busybox udhcpc init script
-#
-# script to start the udpchc DHCP client on boots where
-# the parameter 'ip=dhcp' was included in the kernel parameters
-
-# ensure the required binaries are present
-[ -x /sbin/udhcpc ] || exit 1
-[ -x /bin/grep ] || exit 1
-[ -x /bin/mount ] || exit 1
-
-# ensure /proc is mounted
-if ! mount | grep -q /proc ; then
- exit 2
-fi
-
-rc=0
-if grep -q -E \bip=dhcp\b /proc/cmdline; then
- /sbin/udhcpc -D -s /usr/share/udhcpc/default.script
- rc=$?
-fi
-exit $rc
--
1.7.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] busybox: udhcpc shouldn't be a service
Fixed Bug 2840 - busybox: udhcpc misbehavior when ip=dhcp. Jesse Zhang (1): busybox: udhcpc shouldn't be a service meta/recipes-core/busybox/busybox.inc |6 +--- meta/recipes-core/busybox/busybox_1.19.4.bb|3 +- meta/recipes-core/busybox/files/busybox-udhcpc | 25 3 files changed, 3 insertions(+), 31 deletions(-) delete mode 100755 meta/recipes-core/busybox/files/busybox-udhcpc -- 1.7.7 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] udev: upgrade to 182
From: Alexandru DAMIAN alexandru.dam...@intel.com
This is the final upgrade of udev. Futher upgrades will only
come in conjunction with systemd.
The v4l1 removal patch is deprecated as the bug is fixed inside udev.
There is a new patch fixing the path for default sh interpreter.
New debug binaries are generated, and udev.inc is modified to package
those correctly.
The install locations changed for udevd and udevadm, so the scripts
are updated accordingly.
Signed-off-by: Alexandru DAMIAN alexandru.dam...@intel.com
---
.../initscripts/initscripts-1.0/volatiles |2 +-
meta/recipes-core/initscripts/initscripts_1.0.bb |2 +-
meta/recipes-core/udev/udev.inc| 12 +++--
...yboard_force_release.sh-shell-script-path.patch | 35 ++
meta/recipes-core/udev/udev/include_resource.patch | 31
meta/recipes-core/udev/udev/init | 14 +++---
meta/recipes-core/udev/udev/udev-166-v4l1-1.patch | 50
meta/recipes-core/udev/udev/udev-cache |2 +-
meta/recipes-core/udev/udev_164.bb |9
meta/recipes-core/udev/udev_182.bb |9
10 files changed, 62 insertions(+), 104 deletions(-)
create mode 100644
meta/recipes-core/udev/udev/0001-Fixing-keyboard_force_release.sh-shell-script-path.patch
delete mode 100644 meta/recipes-core/udev/udev/include_resource.patch
delete mode 100644 meta/recipes-core/udev/udev/udev-166-v4l1-1.patch
delete mode 100644 meta/recipes-core/udev/udev_164.bb
create mode 100644 meta/recipes-core/udev/udev_182.bb
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/volatiles
b/meta/recipes-core/initscripts/initscripts-1.0/volatiles
index b2ae279..e0741aa 100644
--- a/meta/recipes-core/initscripts/initscripts-1.0/volatiles
+++ b/meta/recipes-core/initscripts/initscripts-1.0/volatiles
@@ -36,4 +36,4 @@ f root root 0664 /var/log/wtmp none
f root root 0664 /var/run/utmp none
l root root 0644 /etc/resolv.conf /var/run/resolv.conf
f root root 0644 /var/run/resolv.conf none
-
+l root root 0755 /run /var/run
diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb
b/meta/recipes-core/initscripts/initscripts_1.0.bb
index 1d80c55..b741b61 100644
--- a/meta/recipes-core/initscripts/initscripts_1.0.bb
+++ b/meta/recipes-core/initscripts/initscripts_1.0.bb
@@ -3,7 +3,7 @@ DESCRIPTION = Initscripts provide the basic system startup
initialization scrip
SECTION = base
LICENSE = GPLv2
LIC_FILES_CHKSUM = file://COPYING;md5=751419260aa954499f7abaabaa882bbe
-PR = r135
+PR = r136
INHIBIT_DEFAULT_DEPS = 1
diff --git a/meta/recipes-core/udev/udev.inc b/meta/recipes-core/udev/udev.inc
index 3e72515..6242fcc 100644
--- a/meta/recipes-core/udev/udev.inc
+++ b/meta/recipes-core/udev/udev.inc
@@ -6,9 +6,10 @@ LICENSE = GPLv2.0+ LGPLv2.1+
LICENSE_${PN} = GPLv2.0+
LICENSE_libudev = LGPLv2.1+
LICENSE_libgudev = LGPLv2.1+
-LIC_FILES_CHKSUM = file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
-
file://libudev/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
-
file://extras/gudev/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343
+LIC_FILES_CHKSUM = file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+file://src/COPYING;md5=17c4e5fb495e6707ac92a3864926f979 \
+
file://src/gudev/COPYING;md5=fb494485a7d0505308cb68e4997cc266
+
DEPENDS = acl glib-2.0 libusb usbutils pciutils gperf-native libxslt-native
RPROVIDES_${PN} = hotplug
@@ -16,6 +17,7 @@ RRECOMMENDS_${PN} += udev-extraconf usbutils-ids
pciutils-ids
RDEPENDS_libudev = ${PN} (= ${EXTENDPKGV})
SRC_URI = ${KERNELORG_MIRROR}/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
+
file://0001-Fixing-keyboard_force_release.sh-shell-script-path.patch \
file://run.rules \
file://udev.rules \
file://devfs-udev.rules \
@@ -32,7 +34,7 @@ inherit autotools pkgconfig update-rc.d
# udevd/udevadm - /sbin/, libudev.so.* - /lib/
sbindir = ${base_sbindir}
-libexecdir = ${base_libdir}/udev
+libexecdir = ${base_libdir}
EXTRA_OECONF = --disable-introspection --with-rootlibdir=${base_libdir} \
--with-pci-ids-path=${datadir}/pci.ids
@@ -50,6 +52,8 @@ FILES_${PN} += ${libexecdir} ${libdir}/ConsoleKit
RRECOMMENDS_${PN} += udev-utils
FILES_${PN}-dbg += ${libexecdir}/.debug
+FILES_${PN}-dbg += ${base_libdir}/udev/.debug/
+FILES_${PN}-dbg += ${base_libdir}/udev/.debug/*
FILES_${PN}-dev = ${datadir}/pkgconfig/udev.pc
FILES_libudev = ${base_libdir}/libudev.so.*
FILES_libudev-dbg = ${base_libdir}/.debug/libudev.so.*
diff --git
a/meta/recipes-core/udev/udev/0001-Fixing-keyboard_force_release.sh-shell-script-path.patch
b/meta/recipes-core/udev/udev/0001-Fixing-keyboard_force_release.sh-shell-script-path.patch
new file mode 100644
index 000..41deafa
--- /dev/null
+++
Re: [OE-core] [PATCH v3] dbus: include dbus-launch in the main dbus package
On 27 July 2012 07:10, Radu Moisan radu.moi...@intel.com wrote: I've looked into the configure script and found that autolaunch feature is depending on x11, in other words using --with-x/--without-x implies --enable-x11-autolaunch/--disable-x11-autolaunch, so I guess the initial EXTRA_OECONF_X line will do pretty much the same thing. Using --enable-x11-autolaunch (and --disable) make it obvious what the intention is, and is the option exposed by DBus. --with-x is an artifact of using AC_PATH_XTRA, so if dbus decided to use pkg-config to find the X headers --with-x will disappear. Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gcc: Make it possbile for armcc and gcc to coexist.
On Thu, 2012-07-26 at 10:11 +0200, Martin Ertsaas wrote:
Signed-off-by: Martin Ertsaas mert...@cisco.com
---
meta/recipes-devtools/gcc/gcc-4.7.inc |2 +-
.../gcc/gcc-4.7/armcc-coexistence.patch.txt| 12
.../recipes-devtools/gcc/gcc-configure-runtime.inc |6 ++
3 files changed, 19 insertions(+), 1 deletions(-)
create mode 100644
meta/recipes-devtools/gcc/gcc-4.7/armcc-coexistence.patch.txt
I'm afraid this patch caused some build failures on the automated
regression testing. Most of the red columns on the autobuilder:
http://autobuilder.yoctoproject.org:8010/waterfall
are due to this, e.g.:
http://autobuilder.yoctoproject.org:8010/builders/nightly-non-gpl3/builds/177/steps/shell_23/logs/stdio
The problem is we share a work directory between all the gcc component
builds (gcc-cross-initial, gcc-cross-intermediate, gcc-cross, libgcc and
gcc-runtime). For this to work, they all need to have matching SRC_URIs
which is an assumption this patch breaks. We'll therefore need to find a
different way to do this. Patches should really be applied by do_patch
anyway, it confuses things not to do that as if every recipe did this,
we'd end up in a huge mess.
The patch is also missing an Upstream-Status field, author information
and a description of what it does.
Cheers,
Richard
diff --git a/meta/recipes-devtools/gcc/gcc-4.7.inc
b/meta/recipes-devtools/gcc/gcc-4.7.inc
index 43d77ec..709d7d8 100644
--- a/meta/recipes-devtools/gcc/gcc-4.7.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.7.inc
@@ -1,6 +1,6 @@
require gcc-common.inc
-PR = r7
+PR = r8
# Third digit in PV should be incremented after a minor release
# happens from this branch on gcc e.g. currently its 4.7.1
diff --git a/meta/recipes-devtools/gcc/gcc-4.7/armcc-coexistence.patch.txt
b/meta/recipes-devtools/gcc/gcc-4.7/armcc-coexistence.patch.txt
new file mode 100644
index 000..61c04ac
--- /dev/null
+++ b/meta/recipes-devtools/gcc/gcc-4.7/armcc-coexistence.patch.txt
@@ -0,0 +1,12 @@
+---
/usr/local/oecore-x86_64/sysroots/armv7ahf-vfp-neon-nimbus-linux-gnueabi/usr/include/c++/OE_TARGET_SYS/bits/c++config.h~
2012-06-15 11:47:57.0 +0200
/usr/local/oecore-x86_64/sysroots/armv7ahf-vfp-neon-nimbus-linux-gnueabi/usr/include/c++/OE_TARGET_SYS/bits/c++config.h
2012-06-29 11:57:10.0 +0200
+@@ -1147,7 +1147,9 @@ namespace std
+ /* #undef _GLIBCXX_VERSION */
+
+ /* Define if the compiler supports C++11 atomics. */
++#ifndef __ARMCC_VERSION
+ #define _GLIBCXX_ATOMIC_BUILTINS 1
++#endif
+
+ /* Define to use concept checking code from the boost libraries. */
+ /* #undef _GLIBCXX_CONCEPT_CHECKS */
diff --git a/meta/recipes-devtools/gcc/gcc-configure-runtime.inc
b/meta/recipes-devtools/gcc/gcc-configure-runtime.inc
index d40383c..cdb69bf 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-runtime.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-runtime.inc
@@ -2,6 +2,8 @@ require gcc-configure-common.inc
CXXFLAGS := ${@oe_filter_out('-fvisibility-inlines-hidden', '${CXXFLAGS}',
d)}
+SRC_URI += file://armcc-coexistence.patch.txt
+
EXTRA_OECONF_PATHS = \
--with-gxx-include-dir=${includedir}/c++/ \
--with-sysroot=${STAGING_DIR_TARGET} \
@@ -49,6 +51,10 @@ do_install () {
rmdir --ignore-fail-on-non-empty -p ${D}${datadir}/info
fi
done
+ cd ${D}${prefix}
+ cat ${S}/../armcc-coexistence.patch.txt \
+ | sed -e s|OE_TARGET_SYS|${TARGET_SYS}|g \
+ | patch -p7
chown -R root:root ${D}
}
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] package-index: inherit pythonnative
After talk with Richard, we'd better move the scripts/rpm-createsolvedb.py to meta/recipes-support/createrepo/createrepo_0.4.11.bb, I will send an update sooner, the current fix can be a workaround. // Robert On 07/27/2012 09:18 AM, Robert Yang wrote: Hi Richard, There was something wrong with my mail sever, I resend the answer now. On 07/24/2012 06:49 PM, Richard Purdie wrote: On Tue, 2012-07-24 at 18:19 +0800, Robert Yang wrote: The native python binary has been moved from usr/bin/python to usr/bin/python-native/python, the recipe which needs python-native should inherit pythonnative, otherwise there would be errors when the python script runs. [YOCTO #2822] Signed-off-by: Robert Yang liezhi.y...@windriver.com --- meta/recipes-core/meta/package-index.bb |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Which part of this recipe needs python-native? Shouldn't scripts which need pythonnative be using the path to the python interpreter explicitly? It is the poky/scripts/rpm-createsolvedb.py which needs python-native, I think that if we want to use /path/to/python-native/python to run rpm-createsolvedb.py or create a wrapper for it, we should put the rpm-createsolvedb.py into a recipe. So I just inherit pythonnative in package-index.bb to make it work. I wonder whether this will cause something wrong, please? // Robert Cheers, Richard ___ Openembedded-core mailing list 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 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [oe-commits] Cristian Iorga : libpcap: upgrade to ver. 1.3
On Thu, Jul 26, 2012 at 01:53:24PM +, g...@git.openembedded.org wrote:
Module: openembedded-core.git
Branch: master
Commit: 3f0cc742ea5d4788df26bb0592c294e5a67e1093
URL:
http://git.openembedded.org/?p=openembedded-core.gita=commit;h=3f0cc742ea5d4788df26bb0592c294e5a67e1093
Author: Cristian Iorga cristian.io...@intel.com
Date: Tue Jul 24 08:36:57 2012 +0300
libpcap: upgrade to ver. 1.3
Signed-off-by: Cristian Iorga cristian.io...@intel.com
Signed-off-by: Saul Wold s...@linux.intel.com
This changes .so version so now libpcap package is renamed to libpcap1
and breaks at least ppp and tcpdump recipes:
/OE/openembedded-core/meta/recipes-connectivity/ppp/ppp_2.4.5.bb
/OE/meta-openembedded/meta-oe/recipes-support/tcpdump/tcpdump_4.1.1.bb
I'll send PR bumps for those 2, but maybe there are more recipes
depending on now non-existent libpcap.
Cheers,
---
.../{libpcap-1.2.1 = libpcap-1.3.0}/aclocal.patch |0
.../ieee80215-arphrd.patch |0
.../libpcap/{libpcap_1.2.1.bb = libpcap_1.3.0.bb} |4 ++--
3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-connectivity/libpcap/libpcap-1.2.1/aclocal.patch
b/meta/recipes-connectivity/libpcap/libpcap-1.3.0/aclocal.patch
similarity index 100%
rename from meta/recipes-connectivity/libpcap/libpcap-1.2.1/aclocal.patch
rename to meta/recipes-connectivity/libpcap/libpcap-1.3.0/aclocal.patch
diff --git
a/meta/recipes-connectivity/libpcap/libpcap-1.2.1/ieee80215-arphrd.patch
b/meta/recipes-connectivity/libpcap/libpcap-1.3.0/ieee80215-arphrd.patch
similarity index 100%
rename from
meta/recipes-connectivity/libpcap/libpcap-1.2.1/ieee80215-arphrd.patch
rename to
meta/recipes-connectivity/libpcap/libpcap-1.3.0/ieee80215-arphrd.patch
diff --git a/meta/recipes-connectivity/libpcap/libpcap_1.2.1.bb
b/meta/recipes-connectivity/libpcap/libpcap_1.3.0.bb
similarity index 73%
rename from meta/recipes-connectivity/libpcap/libpcap_1.2.1.bb
rename to meta/recipes-connectivity/libpcap/libpcap_1.3.0.bb
index 91bedf7..717e0e8 100644
--- a/meta/recipes-connectivity/libpcap/libpcap_1.2.1.bb
+++ b/meta/recipes-connectivity/libpcap/libpcap_1.3.0.bb
@@ -5,8 +5,8 @@ PR = ${INC_PR}.0
SRC_URI += file://aclocal.patch \
file://ieee80215-arphrd.patch
-SRC_URI[md5sum] = 06046e0e81efc60566daf1cc96c77d46
-SRC_URI[sha256sum] =
a135a6ef7e539729a57c7ed345bdb9b64159e13404174006a7972eb33f00debd
+SRC_URI[md5sum] = f78455a92622b7a3c05c58b6ad1cec7e
+SRC_URI[sha256sum] =
41cbd9ed68383afd9f1fda279cb78427d36879d9e34ee707e31a16a1afd872b9
#
# make install doesn't cover the shared lib
___
Openembedded-commits mailing list
openembedded-comm...@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] ppp: bump PR to rebuild against libpcap1 instead libpcap
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta/recipes-connectivity/ppp/ppp_2.4.5.bb |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.5.bb
b/meta/recipes-connectivity/ppp/ppp_2.4.5.bb
index 587871a..6af4e98 100644
--- a/meta/recipes-connectivity/ppp/ppp_2.4.5.bb
+++ b/meta/recipes-connectivity/ppp/ppp_2.4.5.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM =
file://pppd/ccp.c;beginline=1;endline=29;md5=e2c43fe6e81ff77
file://pppd/plugins/passprompt.c;beginline=1;endline=10;md5=3bcbcdbf0e369c9a3e0b8c8275b065d8
\
file://pppd/tdb.c;beginline=1;endline=27;md5=4ca3a9991b011038d085d6675ae7c4e6 \
file://chat/chat.c;beginline=1;endline=15;md5=0d374b8545ee5c62d7aff1acbd38add2
-PR = r5
+PR = r6
SRC_URI = http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \
file://makefile.patch \
--
1.7.8.6
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/6] relocatable SDK
Hi, This patchset adds relocatable SDK functionality. Instead of a tarball, the output of bitbake meta-toolchain/meta-toolchain-sdk will be a self extracting archive. The user will then execute the .sh script and give it the target directory for SDK installation (default is /opt/poky). The installer will then extract the embedded tarball to the user provided location and will set up the SDK: change the paths in the environment script, change the dynamic loader path in all binaries and, also, change the ls.so.cache path in the dynamic loader itself, together with the SYSDIR paths/lengths. With that, no more root privileges are needed in order to install the SDK. Thanks, Laurentiu The following changes since commit 651b223c5fc93c7504e304e954b9ae4640ed47c6: usbutils: avoid dependency on bash (2012-07-26 18:52:00 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib lpalcu/relocatable_sdk http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=lpalcu/relocatable_sdk Laurentiu Palcu (6): eglibc: relocatable SDK changes binutils: relocatable SDK: change PT_INTERP section size scripts: add script for relocating the SDK populate_sdk_base.bbclass: create self-extracting archive relocatable.bbclass: split it up, to reuse code package.bbclass: change RPATHs for nativesdk packages meta/classes/chrpath.bbclass | 89 + meta/classes/package.bbclass |5 + meta/classes/populate_sdk_base.bbclass | 82 meta/classes/relocatable.bbclass | 91 + .../eglibc/eglibc-2.15/relocatable_sdk.patch | 70 +++ meta/recipes-core/eglibc/eglibc_2.15.bb|6 +- .../binutils/binutils-crosssdk_2.22.bb |5 + .../binutils/binutils/relocatable_sdk.patch| 13 ++ scripts/relocate_sdk.py| 200 9 files changed, 470 insertions(+), 91 deletions(-) create mode 100644 meta/classes/chrpath.bbclass create mode 100644 meta/recipes-core/eglibc/eglibc-2.15/relocatable_sdk.patch create mode 100644 meta/recipes-devtools/binutils/binutils/relocatable_sdk.patch create mode 100755 scripts/relocate_sdk.py -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/6] binutils: relocatable SDK: change PT_INTERP section size
This patch is needed so that all SDK binaries have the PT_INTERP section
size set to 4096 (max path size in Linux) in order to be able to parse
the binaries later and change the interpreter to the path we want.
Signed-off-by: Laurentiu Palcu laurentiu.pa...@intel.com
---
.../binutils/binutils-crosssdk_2.22.bb |5 +
.../binutils/binutils/relocatable_sdk.patch| 13 +
2 files changed, 18 insertions(+)
create mode 100644
meta/recipes-devtools/binutils/binutils/relocatable_sdk.patch
diff --git a/meta/recipes-devtools/binutils/binutils-crosssdk_2.22.bb
b/meta/recipes-devtools/binutils/binutils-crosssdk_2.22.bb
index 0eb5684..c936549 100644
--- a/meta/recipes-devtools/binutils/binutils-crosssdk_2.22.bb
+++ b/meta/recipes-devtools/binutils/binutils-crosssdk_2.22.bb
@@ -2,8 +2,13 @@ require binutils-cross_${PV}.bb
inherit crosssdk
+PR = r1
+
PROVIDES = virtual/${TARGET_PREFIX}binutils-crosssdk
+
+SRC_URI += file://relocatable_sdk.patch
+
do_configure_prepend () {
sed -i 's#/usr/local/lib /lib /usr/lib#${SDKPATHNATIVE}/lib
${SDKPATHNATIVE}/usr/lib /usr/local/lib /lib /usr/lib#' ${S}/ld/configure.tgt
}
diff --git a/meta/recipes-devtools/binutils/binutils/relocatable_sdk.patch
b/meta/recipes-devtools/binutils/binutils/relocatable_sdk.patch
new file mode 100644
index 000..09cb925
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/relocatable_sdk.patch
@@ -0,0 +1,13 @@
+Index: binutils-2.22/ld/scripttempl/elf.sc
+===
+--- binutils-2.22.orig/ld/scripttempl/elf.sc
binutils-2.22/ld/scripttempl/elf.sc
+@@ -116,7 +116,7 @@ if test -n ${COMMONPAGESIZE}; then
+ DATA_SEGMENT_RELRO_END=. = DATA_SEGMENT_RELRO_END (${SEPARATE_GOTPLT-0},
.);
+ fi
+ if test -z ${INITIAL_READONLY_SECTIONS}${CREATE_SHLIB}; then
+- INITIAL_READONLY_SECTIONS=.interp ${RELOCATING-0} : { *(.interp) }
++ INITIAL_READONLY_SECTIONS=.interp ${RELOCATING-0} : { *(.interp); .
= 0x1000; }
+ fi
+ if test -z $PLT; then
+ IPLT=.iplt ${RELOCATING-0} : { *(.iplt) }
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/6] eglibc: relocatable SDK changes
Modifying the dynamic loader path in all binaries by the SDK installer
would not be possible because we cannot know in advance the SDK target
location. Hence, the PT_INTERP section size has been set to 4096 (which
is the maximum path lengh in Linux).
Also, for the dynamic loader SYSDIRS and ld.so.cache paths, special
4096 bytes sections were allocated so that we can easily parse the ELF
binary at install time and modify the paths.
Signed-off-by: Laurentiu Palcu laurentiu.pa...@intel.com
---
.../eglibc/eglibc-2.15/relocatable_sdk.patch | 70
meta/recipes-core/eglibc/eglibc_2.15.bb|6 +-
2 files changed, 74 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-core/eglibc/eglibc-2.15/relocatable_sdk.patch
diff --git a/meta/recipes-core/eglibc/eglibc-2.15/relocatable_sdk.patch
b/meta/recipes-core/eglibc/eglibc-2.15/relocatable_sdk.patch
new file mode 100644
index 000..6c6f601
--- /dev/null
+++ b/meta/recipes-core/eglibc/eglibc-2.15/relocatable_sdk.patch
@@ -0,0 +1,70 @@
+Index: libc/elf/interp.c
+===
+--- libc.orig/elf/interp.c
libc/elf/interp.c
+@@ -17,5 +17,5 @@
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA. */
+
+-const char __invoke_dynamic_linker__[] __attribute__ ((section (.interp)))
++const char __invoke_dynamic_linker__[4096] __attribute__ ((section
(.interp)))
+ = RUNTIME_LINKER;
+Index: libc/elf/dl-load.c
+===
+--- libc.orig/elf/dl-load.c
libc/elf/dl-load.c
+@@ -145,8 +145,8 @@ static size_t max_capstrlen attribute_re
+ /* Get the generated information about the trusted directories. */
+ #include trusted-dirs.h
+
+-static const char system_dirs[] = SYSTEM_DIRS;
+-static const size_t system_dirs_len[] =
++static const char system_dirs[4096] __attribute__ ((section (.sysdirs))) =
SYSTEM_DIRS;
++volatile static const size_t system_dirs_len[] __attribute__ ((section
(.sysdirslen))) =
+ {
+ SYSTEM_DIRS_LEN
+ };
+Index: libc/elf/dl-cache.c
+===
+--- libc.orig/elf/dl-cache.c
libc/elf/dl-cache.c
+@@ -134,6 +134,10 @@ do
\
+ while (0)
+
+
++const char LD_SO_CACHE[4096] __attribute__ ((section (.ldsocache))) =
++ SYSCONFDIR /ld.so.cache;
++
++
+ int
+ internal_function
+ _dl_cache_libcmp (const char *p1, const char *p2)
+Index: libc/elf/ldconfig.c
+===
+--- libc.orig/elf/ldconfig.c
libc/elf/ldconfig.c
+@@ -167,6 +167,9 @@ static struct argp argp =
+ options, parse_opt, NULL, doc, NULL, more_help, NULL
+ };
+
++
++extern const char LD_SO_CACHE[4096] __attribute__ ((section (.ldsocache)));
++
+ /* Check if string corresponds to an important hardware capability or
+a platform. */
+ static int
+Index: libc/sysdeps/generic/dl-cache.h
+===
+--- libc.orig/sysdeps/generic/dl-cache.h
libc/sysdeps/generic/dl-cache.h
+@@ -28,10 +28,6 @@
+ ((flags) == 1 || (flags) == _DL_CACHE_DEFAULT_ID)
+ #endif
+
+-#ifndef LD_SO_CACHE
+-# define LD_SO_CACHE SYSCONFDIR /ld.so.cache
+-#endif
+-
+ #ifndef add_system_dir
+ # define add_system_dir(dir) add_dir (dir)
+ #endif
diff --git a/meta/recipes-core/eglibc/eglibc_2.15.bb
b/meta/recipes-core/eglibc/eglibc_2.15.bb
index d9cb048..69db5c9 100644
--- a/meta/recipes-core/eglibc/eglibc_2.15.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.15.bb
@@ -3,7 +3,7 @@ require eglibc.inc
SRCREV = 19294
DEPENDS += gperf-native
-PR = r12
+PR = r13
PR_append = +svnr${SRCPV}
EGLIBC_BRANCH=eglibc-2_15
@@ -33,7 +33,9 @@ LIC_FILES_CHKSUM =
file://LICENSES;md5=98a1128c4b58120182cbea3b1752d8b9 \
file://posix/rxspencer/COPYRIGHT;md5=dc5485bb394a13b2332ec1c785f5d83a \
file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff
-SRC_URI_append_virtclass-nativesdk = file://ld-search-order.patch
+SRC_URI_append_virtclass-nativesdk = file://ld-search-order.patch \
+file://relocatable_sdk.patch \
+
S = ${WORKDIR}/${EGLIBC_BRANCH}/libc
B = ${WORKDIR}/build-${TARGET_SYS}
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/6] scripts: add script for relocating the SDK
This script will be embedded in the SDK tarball and will be called by the SDK installer. It replaces the interpreter path in all binaries and it also changes the ld.so.cache and SYSDIRS in dynamic loader. Signed-off-by: Laurentiu Palcu laurentiu.pa...@intel.com --- scripts/relocate_sdk.py | 200 +++ 1 file changed, 200 insertions(+) create mode 100755 scripts/relocate_sdk.py diff --git a/scripts/relocate_sdk.py b/scripts/relocate_sdk.py new file mode 100755 index 000..0668600 --- /dev/null +++ b/scripts/relocate_sdk.py @@ -0,0 +1,200 @@ +#!/usr/bin/env python +# +# Copyright (c) 2012 Intel Corporation +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# DESCRIPTION +# This script is called by the SDK installer script. It replaces the dynamic +# loader path in all binaries and also fixes the SYSDIR paths/lengths and the +# location of ld.so.cache in the dynamic loader binary +# +# AUTHORS +# Laurentiu Palcu laurentiu.pa...@intel.com +# + +import struct +import sys +import stat +import os +import re + +old_prefix = re.compile(\/opt\/poky) + +def get_arch(): +f.seek(0) +e_ident =f.read(16) +ei_mag0,ei_mag1_3,ei_class = struct.unpack(B3sB11x, e_ident) + +if (ei_mag0 != 0x7f and ei_mag1_3 != ELF) or ei_class == 0: +return 0 + +if ei_class == 1: +return 32 +elif ei_class == 2: +return 64 + +def parse_elf_header(): +global e_type, e_machine, e_version, e_entry, e_phoff, e_shoff, e_flags,\ + e_ehsize, e_phentsize, e_phnum, e_shentsize, e_shnum, e_shstrndx + +f.seek(0) +elf_header = f.read(64) + +if arch == 32: +# 32bit +hdr_struct = struct.Struct(HHILLLIHH) +hdr_size = 52 +else: +# 64bit +hdr_struct = struct.Struct(HHIQQQIHH) +hdr_size = 64 + +e_type, e_machine, e_version, e_entry, e_phoff, e_shoff, e_flags,\ +e_ehsize, e_phentsize, e_phnum, e_shentsize, e_shnum, e_shstrndx =\ +hdr_struct.unpack(elf_header[16:hdr_size]) + +def change_interpreter(): +if arch == 32: +ph_struct = struct.Struct() +else: +ph_struct = struct.Struct(IIQQ) + + look for PT_INTERP section +for i in range(0,e_phnum): +f.seek(e_phoff + i * e_phentsize) +ph_hdr = f.read(e_phentsize) +if arch == 32: +# 32bit +p_type, p_offset, p_vaddr, p_paddr, p_filesz,\ +p_memsz, p_flags, p_align = ph_struct.unpack(ph_hdr) +else: +# 64bit +p_type, p_flags, p_offset, p_vaddr, p_paddr, \ +p_filesz, p_memsz, p_align = ph_struct.unpack(ph_hdr) + + change interpreter +if p_type == 3: +# PT_INTERP section +f.seek(p_offset) +dl_path = new_dl_path + \0 * (e_phentsize - len(new_dl_path)) +f.write(new_dl_path) +break + +def change_dl_sysdirs(): +if arch == 32: +sh_struct = struct.Struct(II) +else: +sh_struct = struct.Struct(IIIIQQ) + + read section string table +f.seek(e_shoff + e_shstrndx * e_shentsize) +sh_hdr = f.read(e_shentsize) +if arch == 32: +sh_offset, sh_size = struct.unpack(16xII16x, sh_hdr) +else: +sh_offset, sh_size = struct.unpack(24xQQ24x, sh_hdr) + +f.seek(sh_offset) +sh_strtab = f.read(sh_size) + +sysdirs = sysdirs_len = + + change ld.so.cache path and default libs path for dynamic loader +for i in range(0,e_shnum): +f.seek(e_shoff + i * e_shentsize) +sh_hdr = f.read(e_shentsize) + +sh_name, sh_type, sh_flags, sh_addr, sh_offset, sh_size, sh_link,\ +sh_info, sh_addralign, sh_entsize = sh_struct.unpack(sh_hdr) + +name = sh_strtab[sh_name:sh_strtab.find(\0, sh_name)] + + look only into SHT_PROGBITS sections +if sh_type == 1: +f.seek(sh_offset) + default library paths cannot be changed on the fly because + the string lengths have to be changed too. +if name == .sysdirs: +sysdirs = f.read(sh_size) +sysdirs_off = sh_offset +sysdirs_sect_size = sh_size +elif name == .sysdirslen: +sysdirslen = f.read(sh_size) +sysdirslen_off =
[OE-core] [PATCH 4/6] populate_sdk_base.bbclass: create self-extracting archive
In order for the SDK to be relocatable, the user would need to call a
setup script to change the binaries acordingly. Having an auto-extracting
archive has the advantage of being more user friendly and the user does
not have to call the setup script separately after extracting the SDK.
It is called automatically.
Signed-off-by: Laurentiu Palcu laurentiu.pa...@intel.com
---
meta/classes/populate_sdk_base.bbclass | 82
1 file changed, 82 insertions(+)
diff --git a/meta/classes/populate_sdk_base.bbclass
b/meta/classes/populate_sdk_base.bbclass
index 9483e93..4464cdd 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -55,6 +55,8 @@ fakeroot python do_populate_sdk() {
bb.build.exec_func(create_sdk_files, localdata)
bb.build.exec_func(tar_sdk, d)
+
+bb.build.exec_func(create_shar, d)
}
fakeroot populate_sdk_image() {
@@ -94,6 +96,8 @@ fakeroot create_sdk_files() {
# Add version information
toolchain_create_sdk_version
${SDK_OUTPUT}/${SDKPATH}/version-${REAL_MULTIMACH_TARGET_SYS}
+
+ cp ${COREBASE}/scripts/relocate_sdk.py ${SDK_OUTPUT}/${SDKPATH}/
}
fakeroot tar_sdk() {
@@ -103,6 +107,84 @@ fakeroot tar_sdk() {
tar --owner=root --group=root -cj
--file=${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.bz2 .
}
+fakeroot create_shar() {
+ cat EOF ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.sh
+#!/bin/bash
+
+DEFAULT_INSTALL_DIR=/opt/poky
+
+echo -n Enter target directory for Poky SDK (default: $DEFAULT_INSTALL_DIR):
+read target_sdk_dir
+
+if [ $target_sdk_dir = ]; then
+ target_sdk_dir=$DEFAULT_INSTALL_DIR
+fi
+
+eval target_sdk_dir=$target_sdk_dir
+target_sdk_dir=$(readlink -m $target_sdk_dir)
+
+echo -n You are about to install Poky SDK to \$target_sdk_dir\.
Proceed[Y/n]?
+read answer
+
+if [ $answer = ]; then
+ answer=y
+fi
+
+if [ $answer != Y -a $answer != y ]; then
+ echo Installation aborted!
+ exit 1
+fi
+
+mkdir -p $target_sdk_dir /dev/null 21
+if [ $? -ne 0 ]; then
+ echo Error: Unable to create target directory. Do you have
permissions?
+ exit 1
+fi
+
+target_sdk_dir_absoulte_path=$(readlink -f $target_sdk_dir)
+
+payload_offset=$(($(grep -na -m1 ^MARKER:$ $(basename $0)|cut -d':' -f1) +
1))
+
+echo -n Extracting SDK...
+tail -n +$payload_offset $(basename $0) | tar xj --strip-components=3 -C
$target_sdk_dir
+echo done
+
+echo -n Setting it up...
+# fix environment paths
+env_setup_script=$(find $target_sdk_dir_absoulte_path -name
environment-setup*)
+sed -e s:/opt/poky:$target_sdk_dir_absoulte_path:g -i $env_setup_script
+
+# fix dynamic loader paths in all ELF SDK binaries
+native_sysroot=$(cat $env_setup_script |grep OECORE_NATIVE_SYSROOT|cut -d'='
-f2|tr -d '')
+dl_path=$(find $native_sysroot/lib -name ld-linux*)
+executable_files=$(find $native_sysroot -type f -perm +111)
+${env_setup_script%/*}/relocate_sdk.py $target_sdk_dir_absoulte_path $dl_path
$executable_files
+if [ $? -ne 0 ]; then
+ echo SDK could not be set up. Relocate script failed. Abort!
+ exit 1
+fi
+
+# replace /opt/poky with the new prefix in all text files: configs/scripts/etc
+find $native_sysroot -type f -exec file '{}' \;|grep text|cut -d':' -f1|xargs
sed -i -e s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g
+
+echo done
+
+# delete the relocating script, so that user is forced to re-run the installer
+# if he/she wants another location for the sdk
+rm ${env_setup_script%/*}/relocate_sdk.py
+
+echo SDK has been successfully set up and is ready to be used.
+
+exit 0
+
+MARKER:
+EOF
+ cat ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.bz2
${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.sh
+
+ # delete the old tarball, we don't need it anymore
+ rm ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.bz2
+}
+
populate_sdk_log_check() {
for target in $*
do
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/6] relocatable.bbclass: split it up, to reuse code
Most of the code in relocatable.bbclass will be used for relocating the
SDK binaries. So, create another class chrpath.bbclass that will contain
the core of the relocatable.bbclass, so we can reuse it.
Signed-off-by: Laurentiu Palcu laurentiu.pa...@intel.com
---
meta/classes/chrpath.bbclass | 89 +
meta/classes/relocatable.bbclass | 91 +-
2 files changed, 91 insertions(+), 89 deletions(-)
create mode 100644 meta/classes/chrpath.bbclass
diff --git a/meta/classes/chrpath.bbclass b/meta/classes/chrpath.bbclass
new file mode 100644
index 000..10b5ca0
--- /dev/null
+++ b/meta/classes/chrpath.bbclass
@@ -0,0 +1,89 @@
+CHRPATH_BIN ?= chrpath
+PREPROCESS_RELOCATE_DIRS ?=
+
+def process_dir (directory, d):
+import subprocess as sub
+import stat
+
+cmd = d.expand('${CHRPATH_BIN}')
+tmpdir = d.getVar('TMPDIR')
+basedir = d.expand('${base_prefix}')
+
+#bb.debug(Checking %s for binaries to process % directory)
+if not os.path.exists(directory):
+return
+
+dirs = os.listdir(directory)
+for file in dirs:
+fpath = directory + / + file
+fpath = os.path.normpath(fpath)
+if os.path.islink(fpath):
+# Skip symlinks
+continue
+
+if os.path.isdir(fpath):
+process_dir(fpath, d)
+else:
+#bb.note(Testing %s for relocatability % fpath)
+
+# We need read and write permissions for chrpath, if we don't have
+# them then set them temporarily. Take a copy of the files
+# permissions so that we can restore them afterwards.
+perms = os.stat(fpath)[stat.ST_MODE]
+if os.access(fpath, os.W_OK|os.R_OK):
+perms = None
+else:
+# Temporarily make the file writeable so we can chrpath it
+os.chmod(fpath, perms|stat.S_IRWXU)
+
+p = sub.Popen([cmd, '-l', fpath],stdout=sub.PIPE,stderr=sub.PIPE)
+err, out = p.communicate()
+# If returned succesfully, process stderr for results
+if p.returncode != 0:
+continue
+
+# Throw away everything other than the rpath list
+curr_rpath = err.partition(RPATH=)[2]
+#bb.note(Current rpath for %s is %s % (fpath,
curr_rpath.strip()))
+rpaths = curr_rpath.split(:)
+new_rpaths = []
+for rpath in rpaths:
+# If rpath is already dynamic continue
+if rpath.find($ORIGIN) != -1:
+continue
+# If the rpath shares a root with base_prefix determine a new
dynamic rpath from the
+# base_prefix shared root
+if rpath.find(basedir) != -1:
+depth = fpath.partition(basedir)[2].count('/')
+libpath = rpath.partition(basedir)[2].strip()
+# otherwise (i.e. cross packages) determine a shared root
based on the TMPDIR
+# NOTE: This will not work reliably for cross packages,
particularly in the case
+# where your TMPDIR is a short path (i.e. /usr/poky) as
chrpath cannot insert an
+# rpath longer than that which is already set.
+else:
+depth = fpath.rpartition(tmpdir)[2].count('/')
+libpath = rpath.partition(tmpdir)[2].strip()
+
+base = $ORIGIN
+while depth 1:
+base += /..
+depth-=1
+new_rpaths.append(%s%s % (base, libpath))
+
+# if we have modified some rpaths call chrpath to update the binary
+if len(new_rpaths):
+args = :.join(new_rpaths)
+#bb.note(Setting rpath for %s to %s %(fpath, args))
+sub.call([cmd, '-r', args, fpath])
+
+if perms:
+os.chmod(fpath, perms)
+
+def rpath_replace (path, d):
+bindirs = d.expand(${bindir} ${sbindir} ${base_sbindir} ${base_bindir}
${libdir} ${base_libdir} ${libexecdir} ${PREPROCESS_RELOCATE_DIRS}).split()
+
+for bindir in bindirs:
+#bb.note (Processing directory + bindir)
+directory = path + / + bindir
+process_dir (directory, d)
+
diff --git a/meta/classes/relocatable.bbclass b/meta/classes/relocatable.bbclass
index 072f533..4ca9981 100644
--- a/meta/classes/relocatable.bbclass
+++ b/meta/classes/relocatable.bbclass
@@ -1,93 +1,6 @@
-SYSROOT_PREPROCESS_FUNCS += relocatable_binaries_preprocess
-
-CHRPATH_BIN ?= chrpath
-PREPROCESS_RELOCATE_DIRS ?=
-
-def process_dir (directory, d):
-import subprocess as sub
-import stat
-
-cmd = d.expand('${CHRPATH_BIN}')
-tmpdir = d.getVar('TMPDIR')
-basedir = d.expand('${base_prefix}')
-
-#bb.debug(Checking %s for binaries to process % directory)
-if not os.path.exists(directory):
-return
-
[OE-core] [PATCH 6/6] package.bbclass: change RPATHs for nativesdk packages
Change binaries RPATHs, to include $ORIGIN, to make them relocatable.
Signed-off-by: Laurentiu Palcu laurentiu.pa...@intel.com
---
meta/classes/package.bbclass |5 +
1 file changed, 5 insertions(+)
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 962abcd..52986e1 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -40,6 +40,7 @@
inherit packagedata
inherit prserv
+inherit chrpath
PKGD= ${WORKDIR}/package
PKGDEST = ${WORKDIR}/packages-split
@@ -438,6 +439,10 @@ python perform_packagecopy () {
subprocess.call('rm -rf %s/*' % (dvar), shell=True)
# Preserve sparse files and hard links
subprocess.call('tar -cf - -C %s -ps . | tar -xf - -C %s' % (dest, dvar),
shell=True)
+
+# replace RPATHs for the nativesdk binaries, to make them relocatable
+if bb.data.inherits_class('nativesdk', d):
+rpath_replace (dvar, d)
}
# We generate a master list of directories to process, we start by
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] image.bbclass: Update outdated reference to export IMAGE_BASENAME
On Thu, 2012-07-26 at 19:06 -0400, Robert P. J. Day wrote:
Signed-off-by: Robert P. J. Day rpj...@crashcourse.ca
---
does this look about right?
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 1799bf1..b0b476f 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -58,10 +58,9 @@ PACKAGE_GROUP_dev-pkgs[optional] = 1
PACKAGE_GROUP_doc-pkgs = ${@' '.join('%s-doc' % pkg for pkg in
normal_pkgs_to_install(d))}
PACKAGE_GROUP_doc-pkgs[optional] = 1
-# export IMAGE_BASENAME not supported at this time
IMAGE_INSTALL ?=
IMAGE_INSTALL[type] = list
-IMAGE_BASENAME[export] = 1
+export IMAGE_BASENAME
export PACKAGE_INSTALL ?= ${IMAGE_INSTALL} ${ROOTFS_BOOTSTRAP_INSTALL}
${FEATURE_INSTALL}
PACKAGE_INSTALL_ATTEMPTONLY ?= ${FEATURE_INSTALL_OPTIONAL}
diff --git a/meta/recipes-core/images/core-image-minimal-initramfs.bb
b/meta/recipes-core/images/core-image-minimal-initramfs.bb
index 7f6826c..ddc2142 100644
--- a/meta/recipes-core/images/core-image-minimal-initramfs.bb
+++ b/meta/recipes-core/images/core-image-minimal-initramfs.bb
@@ -8,7 +8,6 @@ IMAGE_INSTALL = initramfs-live-boot initramfs-live-install
initramfs-live-insta
# Do not pollute the initrd image with rootfs features
IMAGE_FEATURES =
-export IMAGE_BASENAME = core-image-minimal-initramfs
IMAGE_LINGUAS =
I meant just to remove the export flag here, so:
-export IMAGE_BASENAME = core-image-minimal-initramfs
+IMAGE_BASENAME = core-image-minimal-initramfs
Cheers,
Richard
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] package.bbclass/eglibc-locale: Ensure the correct PN is used for locale packages
This avoids dependencies like eglibc-locale-locale creeping into
the eglibc locale packaging by blinding using the value of PN.
Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org
---
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index ea199d3..90f145d 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -371,6 +371,8 @@ python package_get_auto_pr() {
d.setVar('PRAUTO',str(auto_pr))
}
+LOCALEBASEPN ??= ${PN}
+
python package_do_split_locales() {
if (d.getVar('PACKAGE_NO_LOCALE', True) == '1'):
bb.debug(1, package requested not splitting locales)
@@ -384,7 +386,7 @@ python package_do_split_locales() {
return
dvar = d.getVar('PKGD', True)
-pn = d.getVar('PN', True)
+pn = d.getVar('LOCALEBASEPN', True)
if pn + '-locale' in packages:
packages.remove(pn + '-locale')
diff --git a/meta/recipes-core/eglibc/eglibc-locale.inc
b/meta/recipes-core/eglibc/eglibc-locale.inc
index 6990569..c08e38d 100644
--- a/meta/recipes-core/eglibc/eglibc-locale.inc
+++ b/meta/recipes-core/eglibc/eglibc-locale.inc
@@ -2,6 +2,7 @@ INHIBIT_DEFAULT_DEPS = 1
LICENSE = GPLv2 LGPLv2.1
BPN = eglibc
+LOCALEBASEPN = eglibc
do_fetch[noexec] = 1
do_unpack[noexec] = 1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] world-broken.inc: Remove clutter-box2d from the exclude list, it works
Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- diff --git a/meta/conf/distro/include/world-broken.inc b/meta/conf/distro/include/world-broken.inc index da9b1e4..76b08d0 100644 --- a/meta/conf/distro/include/world-broken.inc +++ b/meta/conf/distro/include/world-broken.inc @@ -5,7 +5,3 @@ EXCLUDE_FROM_WORLD_pn-gobject-introspection = 1 # Need bzr EXCLUDE_FROM_WORLD_pn-eds-tools = 1 - -# Need Updates from Clutter 0.8 -EXCLUDE_FROM_WORLD_pn-clutter-box2d = 1 - ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] eds-tools: Drop this recipe, its inappropriate in OE-Core
Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org
---
diff --git a/meta/conf/distro/include/world-broken.inc
b/meta/conf/distro/include/world-broken.inc
index 76b08d0..f7c222e 100644
--- a/meta/conf/distro/include/world-broken.inc
+++ b/meta/conf/distro/include/world-broken.inc
@@ -3,5 +3,3 @@
#
EXCLUDE_FROM_WORLD_pn-gobject-introspection = 1
-# Need bzr
-EXCLUDE_FROM_WORLD_pn-eds-tools = 1
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index a23a0ee..1200589 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -126,7 +126,6 @@ BBCLASSEXTEND_append_pn-dtc = ${MULTILIBS}
BBCLASSEXTEND_append_pn-e2fsprogs = ${MULTILIBS}
BBCLASSEXTEND_append_pn-ed = ${MULTILIBS}
BBCLASSEXTEND_append_pn-evolution-data-server = ${MULTILIBS}
-BBCLASSEXTEND_append_pn-eds-tools = ${MULTILIBS}
BBCLASSEXTEND_append_pn-eee-acpi-scripts = ${MULTILIBS}
BBCLASSEXTEND_append_pn-eglibc-initial = ${MULTILIBS}
BBCLASSEXTEND_append_pn-eglibc-locale = ${MULTILIBS}
diff --git a/meta/recipes-sato/eds/eds-tools_git.bb
b/meta/recipes-sato/eds/eds-tools_git.bb
deleted file mode 100644
index 97279ce..000
--- a/meta/recipes-sato/eds/eds-tools_git.bb
+++ b/dev/null
@@ -1,20 +0,0 @@
-LICENSE = GPLv2
-SECTION = x11
-DEPENDS = dbus-glib evolution-data-server
-RDEPENDS_${PN} = libedata-book
-DESCRIPTION = Test applications for EDS
-
-SRCREV = 5e9afbd22a021d1f0d0a0249d5995d19dd770584
-PR = r3
-
-SRC_URI = git://github.com/rossburton/eds-tools.git;protocol=git
-
-LIC_FILES_CHKSUM = file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f
-
-inherit autotools pkgconfig
-
-S = ${WORKDIR}/git
-
-FILES_${PN} += ${libdir}/evolution-data-server-1.2/extensions/*.so
-FILES_${PN} += ${libdir}/evolution-data-server-1.2/extensions/*.la
-FILES_${PN}-dbg += ${libdir}/evolution-data-server-1.2/extensions/.debug/*.so
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] gobject-introspection: Drop the recipe, it has never worked and if it does cross compile, we can add it back
Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org
---
diff --git a/meta/conf/distro/include/world-broken.inc
b/meta/conf/distro/include/world-broken.inc
index f7c222e..ab0c2dc 100644
--- a/meta/conf/distro/include/world-broken.inc
+++ b/meta/conf/distro/include/world-broken.inc
@@ -1,5 +1,5 @@
#
# Exclude known broken packages
#
-EXCLUDE_FROM_WORLD_pn-gobject-introspection = 1
+
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index 1200589..6a3fa54 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -198,7 +198,6 @@ BBCLASSEXTEND_append_pn-gnome-terminal = ${MULTILIBS}
BBCLASSEXTEND_append_pn-gnu-config = ${MULTILIBS}
BBCLASSEXTEND_append_pn-gnupg = ${MULTILIBS}
BBCLASSEXTEND_append_pn-gnutls = ${MULTILIBS}
-BBCLASSEXTEND_append_pn-gobject-introspection = ${MULTILIBS}
BBCLASSEXTEND_append_pn-gperf = ${MULTILIBS}
BBCLASSEXTEND_append_pn-gpgme = ${MULTILIBS}
BBCLASSEXTEND_append_pn-grep = ${MULTILIBS}
diff --git
a/meta/recipes-gnome/gnome/gobject-introspection/use-usr-bin-env-for-python.patch
b/meta/recipes-gnome/gnome/gobject-introspection/use-usr-bin-env-for-python.patch
deleted file mode 100644
index ea00157..000
---
a/meta/recipes-gnome/gnome/gobject-introspection/use-usr-bin-env-for-python.patch
+++ b/dev/null
@@ -1,22 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Index: gobject-introspection-0.9.10/tools/g-ir-annotation-tool.in
-===
gobject-introspection-0.9.10.orig/tools/g-ir-annotation-tool.in
-+++ gobject-introspection-0.9.10/tools/g-ir-annotation-tool.in
-@@ -1,4 +1,4 @@
--#!@PYTHON@
-+#!/usr/bin/env python
- # -*- Mode: Python -*-
- # GObject-Introspection - a framework for introspecting GObject libraries
- # Copyright (C) 2008 Johan Dahlin
-Index: gobject-introspection-0.9.10/tools/g-ir-scanner.in
-===
gobject-introspection-0.9.10.orig/tools/g-ir-scanner.in
-+++ gobject-introspection-0.9.10/tools/g-ir-scanner.in
-@@ -1,4 +1,4 @@
--#!@PYTHON@
-+#!/usr/bin/env python
- # -*- Mode: Python -*-
- # GObject-Introspection - a framework for introspecting GObject libraries
- # Copyright (C) 2008 Johan Dahlin
diff --git a/meta/recipes-gnome/gnome/gobject-introspection_1.32.1.bb
b/meta/recipes-gnome/gnome/gobject-introspection_1.32.1.bb
deleted file mode 100644
index 8f5ca56..000
--- a/meta/recipes-gnome/gnome/gobject-introspection_1.32.1.bb
+++ b/dev/null
@@ -1,28 +0,0 @@
-# NOTE: WIP! This recipe does not cross-compile atm., only -native
-DEPENDS = glib-2.0 libffi python-native gobject-introspection-native
-DEPENDS_virtclass-native = glib-2.0-native libffi-native python-native
bison-native flex-native
-BBCLASSEXTEND = native
-
-PR = r1
-
-SHRT_VER =
${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}
-SRC_URI = \
- ${GNOME_MIRROR}/${BPN}/${SHRT_VER}/${BP}.tar.xz \
- file://use-usr-bin-env-for-python.patch \
-
-
-SRC_URI[md5sum] = 7bbdb696c37bb98aef5af02c4b8975e3
-SRC_URI[sha256sum] =
44f3fb933f76e4728818cc360cb5f9e2edcbdf9bc8a8f9aded99b3e3ef5cb858
-
-LICENSE = GPLv2+ LGPLv2+
-LIC_FILES_CHKSUM = file://COPYING;md5=90d577535a3898e1ae5dbf0ae3509a8c \
-file://COPYING.GPL;md5=94d55d512a9ba36caa9b7df079bae19f \
-file://COPYING.LGPL;md5=3bf50002aefd002f49e7bb854063f7e7
-
-inherit autotools gtk-doc pythonnative
-
-do_configure_prepend () {
-echo EXTRA_DIST = ${S}/gtk-doc.make
-}
-
-EXTRA_OECONF = --disable-tests
diff --git a/meta/recipes-gnome/gnome/gobject-introspection_git.bb
b/meta/recipes-gnome/gnome/gobject-introspection_git.bb
deleted file mode 100644
index 8a9aa14..000
--- a/meta/recipes-gnome/gnome/gobject-introspection_git.bb
+++ b/dev/null
@@ -1,28 +0,0 @@
-# NOTE: WIP! This recipe does not cross-compile atm., only -native
-DEPENDS = glib-2.0 libffi python-native gobject-introspection-native
-DEPENDS_virtclass-native = glib-2.0-native libffi-native python-native
bison-native flex-native
-BBCLASSEXTEND = native
-
-SRC_URI = git://git.gnome.org/gobject-introspection;protocol=git \
- file://use-usr-bin-env-for-python.patch \
-
-
-LICENSE = GPLv2+ LGPLv2+
-LIC_FILES_CHKSUM = file://COPYING.tools;md5=94d55d512a9ba36caa9b7df079bae19f \
- file://COPYING.lib;md5=3bf50002aefd002f49e7bb854063f7e7
-
-SRCREV = 8d64bc23d2b837421ecf9c7b0e4b8d5d95ca0d21
-PV = 1.29.0+gitr${SRCPV}
-PR = r1
-
-DEFAULT_PREFERENCE = -1
-
-S = ${WORKDIR}/git
-
-inherit autotools gtk-doc pythonnative
-
-BBCLASSEXTEND = native
-
-EXTRA_OECONF = \
- --disable-tests \
-
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gobject-introspection: Drop the recipe, it has never worked and if it does cross compile, we can add it back
On Fri, Jul 27, 2012 at 12:43:14PM +0100, Richard Purdie wrote: Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- diff --git a/meta/recipes-gnome/gnome/gobject-introspection_1.32.1.bb b/meta/recipes-gnome/gnome/gobject-introspection_1.32.1.bb deleted file mode 100644 index 8f5ca56..000 --- a/meta/recipes-gnome/gnome/gobject-introspection_1.32.1.bb +++ b/dev/null @@ -1,28 +0,0 @@ -# NOTE: WIP! This recipe does not cross-compile atm., only -native -DEPENDS = glib-2.0 libffi python-native gobject-introspection-native -DEPENDS_virtclass-native = glib-2.0-native libffi-native python-native bison-native flex-native -BBCLASSEXTEND = native what will provide gobject-introspection-native for meta-oe and meta-gnome now? Or should we add this recipe back in meta-oe? Cheers, meta-gnome/recipes-gnome/libwnck/libwnck3_3.0.2.bb:DEPENDS = gobject-introspection-native gtk+3 gdk-pixbuf-native meta-gnome/recipes-gnome/libwnck/libwnck_2.30.5.bb:DEPENDS = gobject-introspection-native gtk+ gdk-pixbuf-native meta-oe/recipes-devtools/libgee/libgee_0.6.4.bb:#autoreconf needs introspection.m4 (staged by gobject-introspection-native) after http://git.gnome.org/browse/libgee/commit/?id=d026a29b38ca1a3388981c6e75a92602212373d8 meta-oe/recipes-devtools/libgee/libgee_0.6.4.bb:DEPENDS += gobject-introspection-native meta-oe/recipes-devtools/libgee/libgee_0.6.4.bb:DEPENDS_virtclass-native += gobject-introspection-native meta-oe/recipes-support/upower/upower_0.9.14.bb:DEPENDS = libusb1 udev glib-2.0 dbus-glib polkit gobject-introspection-native -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] qemu: cflags concatination issue
From: Fahad Usman fahad_us...@mentor.com
add patch to fix cflags concatination issue
Signed-off-by: Fahad Usman fahad_us...@mentor.com
---
.../qemu/qemu-0.15.1/cflags-separator.patch| 15 +++
meta/recipes-devtools/qemu/qemu_0.15.1.bb |3 ++-
2 files changed, 17 insertions(+), 1 deletions(-)
create mode 100644
meta/recipes-devtools/qemu/qemu-0.15.1/cflags-separator.patch
diff --git a/meta/recipes-devtools/qemu/qemu-0.15.1/cflags-separator.patch
b/meta/recipes-devtools/qemu/qemu-0.15.1/cflags-separator.patch
new file mode 100644
index 000..9eb9c70
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu-0.15.1/cflags-separator.patch
@@ -0,0 +1,15 @@
+---
+ configure |2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- qemu-0.15.1.orig/configure
qemu-0.15.1/configure
+@@ -2550,7 +2550,7 @@ int main(int argc, char **argv)
+ }
+ EOF
+ if ! compile_prog ; then
+-CFLAGS+=-march=i486
++CFLAGS+= -march=i486
+ fi
+ fi
+
diff --git a/meta/recipes-devtools/qemu/qemu_0.15.1.bb
b/meta/recipes-devtools/qemu/qemu_0.15.1.bb
index 2cc59f6..6a4a1ec 100644
--- a/meta/recipes-devtools/qemu/qemu_0.15.1.bb
+++ b/meta/recipes-devtools/qemu/qemu_0.15.1.bb
@@ -3,7 +3,7 @@ require qemu.inc
LIC_FILES_CHKSUM = file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913
-PR = r9
+PR = r10
FILESPATH = ${FILE_DIRNAME}/qemu-${PV}
FILESDIR = ${WORKDIR}
@@ -21,6 +21,7 @@ SRC_URI = \
file://a4d1f142542935b90d2eb30f3aead4edcf455fe6.patch \
file://dummy-gl-config.patch \
file://0001-ppc64-Fix-linker-script.patch \
+file://cflags-separator.patch \
# Only use the GL passthrough patches for native/nativesdk versions
--
1.7.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gobject-introspection: Drop the recipe, it has never worked and if it does cross compile, we can add it back
On 27 July 2012 12:46, Martin Jansa martin.ja...@gmail.com wrote: what will provide gobject-introspection-native for meta-oe and meta-gnome now? Or should we add this recipe back in meta-oe? gtk-doc-stub has stub machinery for gobject-introspection too. Expect a follow-up patch. Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [oe-commits] Cristian Iorga : libpcap: upgrade to ver. 1.3
On Fri, Jul 27, 2012 at 01:05:21PM +0200, Martin Jansa wrote:
On Thu, Jul 26, 2012 at 01:53:24PM +, g...@git.openembedded.org wrote:
Module: openembedded-core.git
Branch: master
Commit: 3f0cc742ea5d4788df26bb0592c294e5a67e1093
URL:
http://git.openembedded.org/?p=openembedded-core.gita=commit;h=3f0cc742ea5d4788df26bb0592c294e5a67e1093
Author: Cristian Iorga cristian.io...@intel.com
Date: Tue Jul 24 08:36:57 2012 +0300
libpcap: upgrade to ver. 1.3
Signed-off-by: Cristian Iorga cristian.io...@intel.com
Signed-off-by: Saul Wold s...@linux.intel.com
This changes .so version so now libpcap package is renamed to libpcap1
and breaks at least ppp and tcpdump recipes:
/OE/openembedded-core/meta/recipes-connectivity/ppp/ppp_2.4.5.bb
/OE/meta-openembedded/meta-oe/recipes-support/tcpdump/tcpdump_4.1.1.bb
I'll send PR bumps for those 2, but maybe there are more recipes
depending on now non-existent libpcap.
And even with those PR bumps, upgrade path is broken and needs manuall
step
Upgrading tcpdump on root from 4.1.1-r1 to 4.1.1-r2...
Downloading
http://jama.dyndns-home.com/org.openembedded.shr-core//armv4t/tcpdump_4.1.1-r2_armv4t.ipk.
Installing libpcap1 (1.3.0-r2.0) to root...
Downloading
http://jama.dyndns-home.com/org.openembedded.shr-core//armv4t/libpcap1_1.3.0-r2.0_armv4t.ipk.
Upgrading ppp on root from 2.4.5-r5 to 2.4.5-r6...
Downloading
http://jama.dyndns-home.com/org.openembedded.shr-core//armv4t/ppp_2.4.5-r6_armv4t.ipk.
Installing libpcap1 (1.3.0-r2.0) to root...
Collected errors:
* check_data_file_clashes: Package libpcap1 wants to install file
/usr/lib/libpcap.so.1
But that file is already provided by package * libpcap
* check_data_file_clashes: Package libpcap1 wants to install file
/usr/lib/libpcap.so.1
But that file is already provided by package * libpcap
RREPLACES_${PN} += libpcap would probably help in this case.
Cheers,
Cheers,
---
.../{libpcap-1.2.1 = libpcap-1.3.0}/aclocal.patch |0
.../ieee80215-arphrd.patch |0
.../libpcap/{libpcap_1.2.1.bb = libpcap_1.3.0.bb} |4 ++--
3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-connectivity/libpcap/libpcap-1.2.1/aclocal.patch
b/meta/recipes-connectivity/libpcap/libpcap-1.3.0/aclocal.patch
similarity index 100%
rename from meta/recipes-connectivity/libpcap/libpcap-1.2.1/aclocal.patch
rename to meta/recipes-connectivity/libpcap/libpcap-1.3.0/aclocal.patch
diff --git
a/meta/recipes-connectivity/libpcap/libpcap-1.2.1/ieee80215-arphrd.patch
b/meta/recipes-connectivity/libpcap/libpcap-1.3.0/ieee80215-arphrd.patch
similarity index 100%
rename from
meta/recipes-connectivity/libpcap/libpcap-1.2.1/ieee80215-arphrd.patch
rename to
meta/recipes-connectivity/libpcap/libpcap-1.3.0/ieee80215-arphrd.patch
diff --git a/meta/recipes-connectivity/libpcap/libpcap_1.2.1.bb
b/meta/recipes-connectivity/libpcap/libpcap_1.3.0.bb
similarity index 73%
rename from meta/recipes-connectivity/libpcap/libpcap_1.2.1.bb
rename to meta/recipes-connectivity/libpcap/libpcap_1.3.0.bb
index 91bedf7..717e0e8 100644
--- a/meta/recipes-connectivity/libpcap/libpcap_1.2.1.bb
+++ b/meta/recipes-connectivity/libpcap/libpcap_1.3.0.bb
@@ -5,8 +5,8 @@ PR = ${INC_PR}.0
SRC_URI += file://aclocal.patch \
file://ieee80215-arphrd.patch
-SRC_URI[md5sum] = 06046e0e81efc60566daf1cc96c77d46
-SRC_URI[sha256sum] =
a135a6ef7e539729a57c7ed345bdb9b64159e13404174006a7972eb33f00debd
+SRC_URI[md5sum] = f78455a92622b7a3c05c58b6ad1cec7e
+SRC_URI[sha256sum] =
41cbd9ed68383afd9f1fda279cb78427d36879d9e34ee707e31a16a1afd872b9
#
# make install doesn't cover the shared lib
___
Openembedded-commits mailing list
openembedded-comm...@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/4] drm updates
Forwarding some patches to libdrm. More mesa-related changes later. The following changes since commit fb53d69d9c726e6a663ea276cc440676e20f8326: documentation/dev-manual/dev-manual-intro.xml: typo fixed. (2012-07-26 18:53:04 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib ross/mesa for you to fetch changes up to cae0f7ba7693529116ae5e21cdddc35bf96aa8fe: libdrm: Bump libdrm_git to 2.4.37 (2012-07-27 12:51:29 +0100) Damien Lespiau (3): libdrm: libdrm does not depend on xcb any more libdrm: Put the license md5sum in the common include libdrm: Bump libdrm_git to 2.4.37 Ross Burton (1): drm: move to PR/INC_PR, starting at r1 as libdrm_git was at r1 meta/recipes-graphics/drm/libdrm.inc |5 - meta/recipes-graphics/drm/libdrm_2.4.35.bb |4 +--- meta/recipes-graphics/drm/libdrm_git.bb|7 --- 3 files changed, 9 insertions(+), 7 deletions(-) Damien Lespiau (3): libdrm: libdrm does not depend on xcb any more libdrm: Put the license md5sum in the common include libdrm: Bump libdrm_git to 2.4.37 Ross Burton (1): drm: move to PR/INC_PR, starting at r1 as libdrm_git was at r1 meta/recipes-graphics/drm/libdrm.inc |5 - meta/recipes-graphics/drm/libdrm_2.4.35.bb |4 +--- meta/recipes-graphics/drm/libdrm_git.bb|7 --- 3 files changed, 9 insertions(+), 7 deletions(-) -- 1.7.10 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/4] libdrm: Bump libdrm_git to 2.4.37
From: Damien Lespiau damien.lesp...@intel.com
Signed-off-by: Damien Lespiau damien.lesp...@intel.com
Signed-off-by: Ross Burton ross.bur...@intel.com
---
meta/recipes-graphics/drm/libdrm_git.bb |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/drm/libdrm_git.bb
b/meta/recipes-graphics/drm/libdrm_git.bb
index d71b7f7..2b3ef47 100644
--- a/meta/recipes-graphics/drm/libdrm_git.bb
+++ b/meta/recipes-graphics/drm/libdrm_git.bb
@@ -4,6 +4,7 @@ SRC_URI =
git://anongit.freedesktop.org/git/mesa/drm;protocol=git
S = ${WORKDIR}/git
-SRCREV = 3f3c5be6f908272199ccf53f108b1124bfe0a00e
-PV = 2.4.15+git${SRCPV}
+SRCREV = 1b1a4f0a779f7ab2ba5673b9c9fe2a37047fe765
+PV = 2.4.37+git${SRCPV}
PR = ${INC_PR}.0
+
--
1.7.10
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/4] libdrm: libdrm does not depend on xcb any more
From: Damien Lespiau damien.lesp...@intel.com
Signed-off-by: Damien Lespiau damien.lesp...@intel.com
Signed-off-by: Ross Burton ross.bur...@intel.com
---
meta/recipes-graphics/drm/libdrm.inc |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/drm/libdrm.inc
b/meta/recipes-graphics/drm/libdrm.inc
index 8a2c760..e9ca2f9 100644
--- a/meta/recipes-graphics/drm/libdrm.inc
+++ b/meta/recipes-graphics/drm/libdrm.inc
@@ -8,9 +8,9 @@ SECTION = x11/base
LICENSE = MIT
SRC_URI = http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2;
PROVIDES = drm
-DEPENDS = libpthread-stubs udev cairo virtual/libx11
+DEPENDS = libpthread-stubs udev cairo
-INC_PR = r1
+INC_PR = r2
#libpciaccess is required starting from libdrm 2.4.26
DEPENDS += libpciaccess
--
1.7.10
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/4] drm: move to PR/INC_PR, starting at r1 as libdrm_git was at r1
Signed-off-by: Ross Burton ross.bur...@intel.com
---
meta/recipes-graphics/drm/libdrm.inc |2 ++
meta/recipes-graphics/drm/libdrm_2.4.35.bb |2 +-
meta/recipes-graphics/drm/libdrm_git.bb|2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/drm/libdrm.inc
b/meta/recipes-graphics/drm/libdrm.inc
index 20d7f1f..8a2c760 100644
--- a/meta/recipes-graphics/drm/libdrm.inc
+++ b/meta/recipes-graphics/drm/libdrm.inc
@@ -10,6 +10,8 @@ SRC_URI =
http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2;
PROVIDES = drm
DEPENDS = libpthread-stubs udev cairo virtual/libx11
+INC_PR = r1
+
#libpciaccess is required starting from libdrm 2.4.26
DEPENDS += libpciaccess
diff --git a/meta/recipes-graphics/drm/libdrm_2.4.35.bb
b/meta/recipes-graphics/drm/libdrm_2.4.35.bb
index 3677b8d..9d9ada1 100644
--- a/meta/recipes-graphics/drm/libdrm_2.4.35.bb
+++ b/meta/recipes-graphics/drm/libdrm_2.4.35.bb
@@ -2,7 +2,7 @@ require libdrm.inc
LIC_FILES_CHKSUM =
file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c530816761e949dc71
-PR = r0
+PR = ${INC_PR}.0
SRC_URI += file://installtests.patch \
file://GNU_SOURCE_definition.patch \
diff --git a/meta/recipes-graphics/drm/libdrm_git.bb
b/meta/recipes-graphics/drm/libdrm_git.bb
index c2f9855..d71b7f7 100644
--- a/meta/recipes-graphics/drm/libdrm_git.bb
+++ b/meta/recipes-graphics/drm/libdrm_git.bb
@@ -6,4 +6,4 @@ S = ${WORKDIR}/git
SRCREV = 3f3c5be6f908272199ccf53f108b1124bfe0a00e
PV = 2.4.15+git${SRCPV}
-PR = r1
+PR = ${INC_PR}.0
--
1.7.10
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/4] libdrm: Put the license md5sum in the common include
From: Damien Lespiau damien.lesp...@intel.com
With this, libdrm_git now does have LIC_FILES_CHKSUM as well.
Signed-off-by: Damien Lespiau damien.lesp...@intel.com
Signed-off-by: Ross Burton ross.bur...@intel.com
---
meta/recipes-graphics/drm/libdrm.inc |1 +
meta/recipes-graphics/drm/libdrm_2.4.35.bb |2 --
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/drm/libdrm.inc
b/meta/recipes-graphics/drm/libdrm.inc
index e9ca2f9..5ddab85 100644
--- a/meta/recipes-graphics/drm/libdrm.inc
+++ b/meta/recipes-graphics/drm/libdrm.inc
@@ -6,6 +6,7 @@ accelerated OpenGL drivers.
HOMEPAGE = http://dri.freedesktop.org;
SECTION = x11/base
LICENSE = MIT
+LIC_FILES_CHKSUM =
file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c530816761e949dc71
SRC_URI = http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2;
PROVIDES = drm
DEPENDS = libpthread-stubs udev cairo
diff --git a/meta/recipes-graphics/drm/libdrm_2.4.35.bb
b/meta/recipes-graphics/drm/libdrm_2.4.35.bb
index 9d9ada1..58ee449 100644
--- a/meta/recipes-graphics/drm/libdrm_2.4.35.bb
+++ b/meta/recipes-graphics/drm/libdrm_2.4.35.bb
@@ -1,7 +1,5 @@
require libdrm.inc
-LIC_FILES_CHKSUM =
file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c530816761e949dc71
-
PR = ${INC_PR}.0
SRC_URI += file://installtests.patch \
--
1.7.10
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libpciaccess: lpci access does not depend on X
From: Damien Lespiau damien.lesp...@intel.com
So let's remove the X dependencies from DEPENDS and white list it in
xorg-lib-common.inc.
Signed-off-by: Damien Lespiau damien.lesp...@intel.com
Signed-off-by: Ross Burton ross.bur...@intel.com
---
meta/recipes-graphics/xorg-lib/libpciaccess_0.13.1.bb |4 +---
meta/recipes-graphics/xorg-lib/xorg-lib-common.inc|2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.1.bb
b/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.1.bb
index 178e220..0ec6814 100644
--- a/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.1.bb
+++ b/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.1.bb
@@ -8,9 +8,7 @@ require xorg-lib-common.inc
LICENSE = MIT MIT-style
LIC_FILES_CHKSUM = file://COPYING;md5=de01cb89a769dc657d4c321c209ce4fc
-PR = r0
-
-DEPENDS += xproto virtual/libx11
+PR = r1
SRC_URI[md5sum] = 399a419ac6a54f0fc07c69c9bdf452dc
SRC_URI[sha256sum] =
27ab68f645691a4ca258dcc9d131040586e134f9233ce079794496f6264da084
diff --git a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc
b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc
index 73a4d1d..55eaf49 100644
--- a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc
+++ b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc
@@ -16,7 +16,7 @@ inherit autotools pkgconfig
EXTRA_OECONF = --enable-malloc0returnsnull --with-fop=no --without-xmlto
python () {
-whitelist = [ pixman ]
+whitelist = [ pixman, libpciaccess ]
if not d.getVar('BPN', True) in whitelist and not oe.utils.contains
('DISTRO_FEATURES', 'x11', True, False, d):
raise bb.parse.SkipPackage('x11' not in DISTRO_FEATURES)
}
--
1.7.10
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] image.bbclass: Update outdated reference to export IMAGE_BASENAME
On Fri, Jul 27, 2012 at 1:25 PM, Richard Purdie
richard.pur...@linuxfoundation.org wrote:
On Thu, 2012-07-26 at 19:06 -0400, Robert P. J. Day wrote:
Signed-off-by: Robert P. J. Day rpj...@crashcourse.ca
---
does this look about right?
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 1799bf1..b0b476f 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -58,10 +58,9 @@ PACKAGE_GROUP_dev-pkgs[optional] = 1
PACKAGE_GROUP_doc-pkgs = ${@' '.join('%s-doc' % pkg for pkg in
normal_pkgs_to_install(d))}
PACKAGE_GROUP_doc-pkgs[optional] = 1
-# export IMAGE_BASENAME not supported at this time
IMAGE_INSTALL ?=
IMAGE_INSTALL[type] = list
-IMAGE_BASENAME[export] = 1
+export IMAGE_BASENAME
export PACKAGE_INSTALL ?= ${IMAGE_INSTALL} ${ROOTFS_BOOTSTRAP_INSTALL}
${FEATURE_INSTALL}
PACKAGE_INSTALL_ATTEMPTONLY ?= ${FEATURE_INSTALL_OPTIONAL}
diff --git
a/meta/recipes-core/images/core-image-minimal-initramfs.bbb/meta/recipes-core/images/
core-image-minimal-initramfs.bb
index 7f6826c..ddc2142 100644
--- a/meta/recipes-core/images/core-image-minimal-initramfs.bb
+++ b/meta/recipes-core/images/core-image-minimal-initramfs.bb
@@ -8,7 +8,6 @@ IMAGE_INSTALL = initramfs-live-boot
initramfs-live-install initramfs-live-insta
# Do not pollute the initrd image with rootfs features
IMAGE_FEATURES =
-export IMAGE_BASENAME = core-image-minimal-initramfs
IMAGE_LINGUAS =
I meant just to remove the export flag here, so:
-export IMAGE_BASENAME = core-image-minimal-initramfs
+IMAGE_BASENAME = core-image-minimal-initramfs
Why is this finally needed?
I'd redefine IMAGE_BASENAME only to change from its default value (PN)
Cheers
Andrea
Cheers,
Richard
___
Openembedded-core mailing list
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
Re: [OE-core] image.bbclass: Update outdated reference to export IMAGE_BASENAME
On Fri, 27 Jul 2012, Richard Purdie wrote:
On Thu, 2012-07-26 at 19:06 -0400, Robert P. J. Day wrote:
Signed-off-by: Robert P. J. Day rpj...@crashcourse.ca
---
does this look about right?
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 1799bf1..b0b476f 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -58,10 +58,9 @@ PACKAGE_GROUP_dev-pkgs[optional] = 1
PACKAGE_GROUP_doc-pkgs = ${@' '.join('%s-doc' % pkg for pkg in
normal_pkgs_to_install(d))}
PACKAGE_GROUP_doc-pkgs[optional] = 1
-# export IMAGE_BASENAME not supported at this time
IMAGE_INSTALL ?=
IMAGE_INSTALL[type] = list
-IMAGE_BASENAME[export] = 1
+export IMAGE_BASENAME
export PACKAGE_INSTALL ?= ${IMAGE_INSTALL} ${ROOTFS_BOOTSTRAP_INSTALL}
${FEATURE_INSTALL}
PACKAGE_INSTALL_ATTEMPTONLY ?= ${FEATURE_INSTALL_OPTIONAL}
diff --git a/meta/recipes-core/images/core-image-minimal-initramfs.bb
b/meta/recipes-core/images/core-image-minimal-initramfs.bb
index 7f6826c..ddc2142 100644
--- a/meta/recipes-core/images/core-image-minimal-initramfs.bb
+++ b/meta/recipes-core/images/core-image-minimal-initramfs.bb
@@ -8,7 +8,6 @@ IMAGE_INSTALL = initramfs-live-boot initramfs-live-install
initramfs-live-insta
# Do not pollute the initrd image with rootfs features
IMAGE_FEATURES =
-export IMAGE_BASENAME = core-image-minimal-initramfs
IMAGE_LINGUAS =
I meant just to remove the export flag here, so:
-export IMAGE_BASENAME = core-image-minimal-initramfs
+IMAGE_BASENAME = core-image-minimal-initramfs
ah, all right, then.
rday
--
Robert P. J. Day Ottawa, Ontario, CANADA
http://crashcourse.ca
Twitter: http://twitter.com/rpjday
LinkedIn: http://ca.linkedin.com/in/rpjday
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] gtk-doc-stub: Add PROVIDES for gobject-introspection-stub and fix unpackaged files
Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org
---
diff --git a/meta/recipes-gnome/gtk-doc-stub/gtk-doc-stub_git.bb
b/meta/recipes-gnome/gtk-doc-stub/gtk-doc-stub_git.bb
index 195fc41..da2eca6 100644
--- a/meta/recipes-gnome/gtk-doc-stub/gtk-doc-stub_git.bb
+++ b/meta/recipes-gnome/gtk-doc-stub/gtk-doc-stub_git.bb
@@ -4,7 +4,7 @@ SECTION = x11/base
LICENSE = GPLv2
LIC_FILES_CHKSUM = file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f
-PROVIDES = gtk-doc
+PROVIDES = gtk-doc gobject-introspection-stub
SRCREV = 3dfd0a09de696ec8c544762747f8a0f77153622e
PV = 0.0+git${SRCPV}
@@ -16,4 +16,6 @@ S = ${WORKDIR}/git
inherit autotools
+FILES_${PN} += ${datadir}
+
BBCLASSEXTEND = native
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] polkit/vte/gupnp/gssdp: Replace introspection hacks with gobject-introspection-stub
Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- diff --git a/meta/recipes-connectivity/gupnp/gssdp-0.10.0/introspection.patch b/meta/recipes-connectivity/gupnp/gssdp-0.10.0/introspection.patch deleted file mode 100644 index 39c1502..000 --- a/meta/recipes-connectivity/gupnp/gssdp-0.10.0/introspection.patch +++ b/dev/null @@ -1,104 +0,0 @@ -Copied from gobject-introspection/m4/introspection.m4 - -Upstream-Status: Inappropriate [configuration] - -Signed-off-By: Dongxiao Xu dongxiao...@intel.com - -diff -ruN gssdp-0.9.0-orig/m4/introspection.m4 gssdp-0.9.0/m4/introspection.m4 gssdp-0.9.0-orig/m4/introspection.m4 1970-01-01 08:00:00.0 +0800 -+++ gssdp-0.9.0/m4/introspection.m42010-12-06 11:08:16.0 +0800 -@@ -0,0 +1,94 @@ -+dnl -*- mode: autoconf -*- -+dnl Copyright 2009 Johan Dahlin -+dnl -+dnl This file is free software; the author(s) gives unlimited -+dnl permission to copy and/or distribute it, with or without -+dnl modifications, as long as this notice is preserved. -+dnl -+ -+# serial 1 -+ -+m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], -+[ -+AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first -+AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first -+AC_BEFORE([LT_INIT],[$0])dnl setup libtool first -+ -+dnl enable/disable introspection -+m4_if([$2], [require], -+[dnl -+enable_introspection=yes -+],[dnl -+AC_ARG_ENABLE(introspection, -+ AS_HELP_STRING([--enable-introspection[=@:@no/auto/yes@:@]], -+ [Enable introspection for this build]),, -+ [enable_introspection=auto]) -+])dnl -+ -+AC_MSG_CHECKING([for gobject-introspection]) -+ -+dnl presence/version checking -+AS_CASE([$enable_introspection], -+[no], [dnl -+found_introspection=no (disabled, use --enable-introspection to enable) -+],dnl -+[yes],[dnl -+PKG_CHECK_EXISTS([gobject-introspection-1.0],, -+ AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) -+PKG_CHECK_EXISTS([gobject-introspection-1.0 = $1], -+ found_introspection=yes, -+ AC_MSG_ERROR([You need to have gobject-introspection = $1 installed to build AC_PACKAGE_NAME])) -+],dnl -+[auto],[dnl -+PKG_CHECK_EXISTS([gobject-introspection-1.0 = $1], found_introspection=yes, found_introspection=no) -+],dnl -+[dnl -+AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @:@no/auto/yes@:@]) -+])dnl -+ -+AC_MSG_RESULT([$found_introspection]) -+ -+INTROSPECTION_SCANNER= -+INTROSPECTION_COMPILER= -+INTROSPECTION_GENERATE= -+INTROSPECTION_GIRDIR= -+INTROSPECTION_TYPELIBDIR= -+if test x$found_introspection = xyes; then -+ INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` -+ INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` -+ INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` -+ INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` -+ INTROSPECTION_TYPELIBDIR=$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0) -+ INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` -+ INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` -+ INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection -+fi -+AC_SUBST(INTROSPECTION_SCANNER) -+AC_SUBST(INTROSPECTION_COMPILER) -+AC_SUBST(INTROSPECTION_GENERATE) -+AC_SUBST(INTROSPECTION_GIRDIR) -+AC_SUBST(INTROSPECTION_TYPELIBDIR) -+AC_SUBST(INTROSPECTION_CFLAGS) -+AC_SUBST(INTROSPECTION_LIBS) -+AC_SUBST(INTROSPECTION_MAKEFILE) -+ -+AM_CONDITIONAL(HAVE_INTROSPECTION, test x$found_introspection = xyes) -+]) -+ -+ -+dnl Usage: -+dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) -+ -+AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], -+[ -+ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) -+]) -+ -+dnl Usage: -+dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) -+ -+ -+AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], -+[ -+ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) -+]) diff --git a/meta/recipes-connectivity/gupnp/gssdp_0.10.0.bb b/meta/recipes-connectivity/gupnp/gssdp_0.10.0.bb index dcc40b8..f3494e7 100644 --- a/meta/recipes-connectivity/gupnp/gssdp_0.10.0.bb +++ b/meta/recipes-connectivity/gupnp/gssdp_0.10.0.bb @@ -2,10 +2,9 @@ SUMMARY = Resource discovery and announcement over SSDP DESCRIPTION = GSSDP implements resource discovery and announcement over SSDP (Simpe Service Discovery Protocol). LICENSE = LGPLv2 LIC_FILES_CHKSUM = file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 -DEPENDS = glib-2.0 libsoup-2.4
[OE-core] [PATCH 1/1] usbutils 0.91: Fix NULL pointer crash.
From: Roy.Li rongqing...@windriver.com
[YOCTO #2847]
Before use usbbuslist, we should check if it is valid.
Signed-off-by: Roy.Li rongqing...@windriver.com
---
.../usbutils/usbutils/Fix-NULL-pointer-crash.patch | 28
meta/recipes-bsp/usbutils/usbutils_0.91.bb |5 ++-
2 files changed, 31 insertions(+), 2 deletions(-)
create mode 100644
meta/recipes-bsp/usbutils/usbutils/Fix-NULL-pointer-crash.patch
diff --git a/meta/recipes-bsp/usbutils/usbutils/Fix-NULL-pointer-crash.patch
b/meta/recipes-bsp/usbutils/usbutils/Fix-NULL-pointer-crash.patch
new file mode 100644
index 000..f5ad2b2
--- /dev/null
+++ b/meta/recipes-bsp/usbutils/usbutils/Fix-NULL-pointer-crash.patch
@@ -0,0 +1,28 @@
+Fix NULL pointer crash.
+
+Before use usbbuslist, we should check if it is valid.
+
+Upstream-Status: Pending
+Signed-off-by: Roy.Li rongqing...@windriver.com
+---
+ lsusb-t.c |4
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/lsusb-t.c b/lsusb-t.c
+index f604155..583a46a 100644
+--- a/lsusb-t.c
b/lsusb-t.c
+@@ -643,6 +643,10 @@ static void sort_busses(void)
+ /* need to reverse sort bus numbers */
+ struct usbbusnode *t, *p, **pp;
+ int swapped;
++
++ if (!usbbuslist)
++ return;
++
+ do {
+ p = usbbuslist;
+ pp = usbbuslist;
+--
+1.7.4.1
+
diff --git a/meta/recipes-bsp/usbutils/usbutils_0.91.bb
b/meta/recipes-bsp/usbutils/usbutils_0.91.bb
index 04d1681..abe807c 100644
--- a/meta/recipes-bsp/usbutils/usbutils_0.91.bb
+++ b/meta/recipes-bsp/usbutils/usbutils_0.91.bb
@@ -7,10 +7,11 @@ LICENSE = GPLv2+
LIC_FILES_CHKSUM = file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f
DEPENDS = libusb zlib
-PR = r4
+PR = r5
SRC_URI = ${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz \
- file://usb-devices-avoid-dependency-on-bash.patch
+ file://usb-devices-avoid-dependency-on-bash.patch \
+ file://Fix-NULL-pointer-crash.patch
SRC_URI[md5sum] = 49de2403b40bf3a9863faaa8d3858deb
SRC_URI[sha256sum] =
c122346b0225121bcf159abf804116f826a4a3462c94ce7b8871f7559e6b3a46
--
1.7.4.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [oe-commits] Cristian Iorga : libpcap: upgrade to ver. 1.3
On Fri, 2012-07-27 at 13:52 +0200, Martin Jansa wrote: * check_data_file_clashes: Package libpcap1 wants to install file /usr/lib/libpcap.so.1 But that file is already provided by package * libpcap * check_data_file_clashes: Package libpcap1 wants to install file /usr/lib/libpcap.so.1 But that file is already provided by package * libpcap If the old library was also libpcap.so.1, why has the package name changed? You said in your first mail that the patch changes .so version but if that was the case then there oughtn't to have been a file conflict here. p. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [oe-commits] Cristian Iorga : libpcap: upgrade to ver. 1.3
On Fri, Jul 27, 2012 at 01:05:43PM +0100, Phil Blundell wrote: On Fri, 2012-07-27 at 13:52 +0200, Martin Jansa wrote: * check_data_file_clashes: Package libpcap1 wants to install file /usr/lib/libpcap.so.1 But that file is already provided by package * libpcap * check_data_file_clashes: Package libpcap1 wants to install file /usr/lib/libpcap.so.1 But that file is already provided by package * libpcap If the old library was also libpcap.so.1, why has the package name changed? You said in your first mail that the patch changes .so version but if that was the case then there oughtn't to have been a file conflict here. True, I haven't seen this error before sending my first reply. So I've assumed that it was libpcap0 before and I was wrong. The real reason for package rename was that before this upgrade libpcap package contained also pcap-config (so debian naming wasn't used): http://git.shr-project.org/git/?p=buildhistory.git;a=commitdiff;h=85dae3abafee082905ffb5b9f1a2072e8f3eb047#patch190 Once again https://bugzilla.yoctoproject.org/show_bug.cgi?id=2787 proves to be usefull.. Cheers, -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] gconf: Clean up introspection disabling by using gobject-introspection-stub
Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org
---
diff --git a/meta/recipes-gnome/gnome/gconf-3.2.3/nointro.patch
b/meta/recipes-gnome/gnome/gconf-3.2.3/nointro.patch
deleted file mode 100644
index 29181e3..000
--- a/meta/recipes-gnome/gnome/gconf-3.2.3/nointro.patch
+++ b/dev/null
@@ -1,59 +0,0 @@
-This is a hacky way to prevent GConf from trying to build the introspection
related pieces.
-Clearly not appropriate for upstream.
-
-Upstream-Status: Inappropriate
-
-Signed-off-by: Joshua Lock j...@linux.intel.com
-
-Index: GConf-3.2.2/gconf/Makefile.am
-===
GConf-3.2.2.orig/gconf/Makefile.am
-+++ GConf-3.2.2/gconf/Makefile.am
-@@ -145,34 +145,6 @@ libgconf_2_la_LDFLAGS = -version-info $(
-
- libgconf_2_la_LIBADD = $(INTLLIBS) $(DEPENDENT_LIBS) $(DEPENDENT_DBUS_LIBS)
$(DEPENDENT_ORBIT_LIBS)
-
---include $(INTROSPECTION_MAKEFILE)
--INTROSPECTION_GIRS =
--INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path=$(srcdir)
--INTROSPECTION_COMPILER_ARGS= --includedir=$(srcdir)
--
--if HAVE_INTROSPECTION
--introspection_files = \
-- $(gconfinclude_HEADERS) \
-- $(filter-out $(CORBA_SOURCECODE), $(filter
%.c,$(libgconf_2_la_SOURCES)))
--GConf-2.0.gir: libgconf-2.la Makefile
--GConf_2_0_gir_INCLUDES = GObject-2.0
--GConf_2_0_gir_CFLAGS = \
-- $(INCLUDES)
--GConf_2_0_gir_LIBS = libgconf-2.la
--GConf_2_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files))
--GConf_2_0_gir_SCANNERFLAGS = --identifier-prefix=GConf --symbol-prefix=gconf
--c-include gconf/gconf.h
--GConf_2_0_gir_EXPORT_PACKAGES = gconf-2.0
--INTROSPECTION_GIRS += GConf-2.0.gir
--
--girdir = $(datadir)/gir-1.0/
--gir_DATA = $(INTROSPECTION_GIRS)
--
--typelibsdir = $(libdir)/girepository-1.0/
--typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
--
--CLEANFILES += $(gir_DATA) $(typelibs_DATA)
--endif
--
- EXTRA_DIST=GConfX.idl default.path.in org.gnome.GConf.service.in
gconfmarshal.list regenerate-enum-header.sh regenerate-enum-footer.sh
-
- default.path: $(srcdir)/default.path.in
-Index: GConf-3.2.2/configure.in
-===
GConf-3.2.2.orig/configure.in
-+++ GConf-3.2.2/configure.in
-@@ -354,8 +354,6 @@ AM_GLIB_GNU_GETTEXT
-
- AC_CHECK_FUNCS(bind_textdomain_codeset)
-
--GOBJECT_INTROSPECTION_CHECK([0.9.5])
--
- AC_SUBST(CFLAGS)
- AC_SUBST(CPPFLAGS)
- AC_SUBST(LDFLAGS)
diff --git a/meta/recipes-gnome/gnome/gconf_3.2.3.bb
b/meta/recipes-gnome/gnome/gconf_3.2.3.bb
index 60c2be2..8388684 100644
--- a/meta/recipes-gnome/gnome/gconf_3.2.3.bb
+++ b/meta/recipes-gnome/gnome/gconf_3.2.3.bb
@@ -6,15 +6,14 @@ LIC_FILES_CHKSUM =
file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605
POLKIT = polkit
POLKIT_libc-uclibc =
-DEPENDS = glib-2.0 dbus dbus-glib libxml2 intltool-native ${POLKIT}
-DEPENDS_virtclass-native = glib-2.0-native dbus-native dbus-glib-native
libxml2-native intltool-native gnome-common-native
+DEPENDS = glib-2.0 dbus dbus-glib libxml2 intltool-native ${POLKIT}
gobject-introspection-stub
+DEPENDS_virtclass-native = glib-2.0-native dbus-native dbus-glib-native
libxml2-native intltool-native gnome-common-native
gobject-introspection-stub-native
PR = r11
inherit gnomebase gtk-doc
SRC_URI =
${GNOME_MIRROR}/GConf/${@gnome_verdir(${PV})}/GConf-${PV}.tar.bz2;name=archive
\
- file://nointro.patch \
file://backenddir.patch
SRC_URI[archive.md5sum] = f80329173cd9d134ad07e36002dd2a15
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gobject-introspection: Drop the recipe, it has never worked and if it does cross compile, we can add it back
On Fri, 2012-07-27 at 13:46 +0200, Martin Jansa wrote: On Fri, Jul 27, 2012 at 12:43:14PM +0100, Richard Purdie wrote: Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- diff --git a/meta/recipes-gnome/gnome/gobject-introspection_1.32.1.bb b/meta/recipes-gnome/gnome/gobject-introspection_1.32.1.bb deleted file mode 100644 index 8f5ca56..000 --- a/meta/recipes-gnome/gnome/gobject-introspection_1.32.1.bb +++ b/dev/null @@ -1,28 +0,0 @@ -# NOTE: WIP! This recipe does not cross-compile atm., only -native -DEPENDS = glib-2.0 libffi python-native gobject-introspection-native -DEPENDS_virtclass-native = glib-2.0-native libffi-native python-native bison-native flex-native -BBCLASSEXTEND = native what will provide gobject-introspection-native for meta-oe and meta-gnome now? Or should we add this recipe back in meta-oe? Is introspection being used there of do they just want the .m4 file and disable it? If the latter, add gobject-introspection-stub to DEPENDS and this should resolve it. See the patches I just sent doing this for OE-Core. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] qemu: cflags concatination issue
On Fri, 2012-07-27 at 16:47 +0500, Fahad Usman wrote:
From: Fahad Usman fahad_us...@mentor.com
add patch to fix cflags concatination issue
Signed-off-by: Fahad Usman fahad_us...@mentor.com
---
.../qemu/qemu-0.15.1/cflags-separator.patch| 15 +++
meta/recipes-devtools/qemu/qemu_0.15.1.bb |3 ++-
2 files changed, 17 insertions(+), 1 deletions(-)
create mode 100644
meta/recipes-devtools/qemu/qemu-0.15.1/cflags-separator.patch
diff --git a/meta/recipes-devtools/qemu/qemu-0.15.1/cflags-separator.patch
b/meta/recipes-devtools/qemu/qemu-0.15.1/cflags-separator.patch
new file mode 100644
index 000..9eb9c70
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu-0.15.1/cflags-separator.patch
@@ -0,0 +1,15 @@
+---
+ configure |2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- qemu-0.15.1.orig/configure
qemu-0.15.1/configure
+@@ -2550,7 +2550,7 @@ int main(int argc, char **argv)
+ }
+ EOF
+ if ! compile_prog ; then
+-CFLAGS+=-march=i486
++CFLAGS+= -march=i486
+ fi
+ fi
+
The patch is missing the Upstream-Status, author and description
information in the header.
Cheers,
Richard
diff --git a/meta/recipes-devtools/qemu/qemu_0.15.1.bb
b/meta/recipes-devtools/qemu/qemu_0.15.1.bb
index 2cc59f6..6a4a1ec 100644
--- a/meta/recipes-devtools/qemu/qemu_0.15.1.bb
+++ b/meta/recipes-devtools/qemu/qemu_0.15.1.bb
@@ -3,7 +3,7 @@ require qemu.inc
LIC_FILES_CHKSUM = file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913
-PR = r9
+PR = r10
FILESPATH = ${FILE_DIRNAME}/qemu-${PV}
FILESDIR = ${WORKDIR}
@@ -21,6 +21,7 @@ SRC_URI = \
file://a4d1f142542935b90d2eb30f3aead4edcf455fe6.patch \
file://dummy-gl-config.patch \
file://0001-ppc64-Fix-linker-script.patch \
+file://cflags-separator.patch \
# Only use the GL passthrough patches for native/nativesdk versions
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] image.bbclass: Update outdated reference to export IMAGE_BASENAME
On Fri, Jul 27, 2012 at 2:01 PM, Robert P. J. Day rpj...@crashcourse.cawrote:
On Fri, 27 Jul 2012, Richard Purdie wrote:
On Thu, 2012-07-26 at 19:06 -0400, Robert P. J. Day wrote:
Signed-off-by: Robert P. J. Day rpj...@crashcourse.ca
---
does this look about right?
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 1799bf1..b0b476f 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -58,10 +58,9 @@ PACKAGE_GROUP_dev-pkgs[optional] = 1
PACKAGE_GROUP_doc-pkgs = ${@' '.join('%s-doc' % pkg for pkg in
normal_pkgs_to_install(d))}
PACKAGE_GROUP_doc-pkgs[optional] = 1
-# export IMAGE_BASENAME not supported at this time
IMAGE_INSTALL ?=
IMAGE_INSTALL[type] = list
-IMAGE_BASENAME[export] = 1
+export IMAGE_BASENAME
export PACKAGE_INSTALL ?= ${IMAGE_INSTALL}
${ROOTFS_BOOTSTRAP_INSTALL} ${FEATURE_INSTALL}
PACKAGE_INSTALL_ATTEMPTONLY ?= ${FEATURE_INSTALL_OPTIONAL}
diff --git
a/meta/recipes-core/images/core-image-minimal-initramfs.bbb/meta/recipes-core/images/
core-image-minimal-initramfs.bb
index 7f6826c..ddc2142 100644
--- a/meta/recipes-core/images/core-image-minimal-initramfs.bb
+++ b/meta/recipes-core/images/core-image-minimal-initramfs.bb
@@ -8,7 +8,6 @@ IMAGE_INSTALL = initramfs-live-boot
initramfs-live-install initramfs-live-insta
# Do not pollute the initrd image with rootfs features
IMAGE_FEATURES =
-export IMAGE_BASENAME = core-image-minimal-initramfs
IMAGE_LINGUAS =
I meant just to remove the export flag here, so:
-export IMAGE_BASENAME = core-image-minimal-initramfs
+IMAGE_BASENAME = core-image-minimal-initramfs
ah, all right, then.
rday
--
Robert P. J. Day Ottawa, Ontario, CANADA
http://crashcourse.ca
Twitter: http://twitter.com/rpjday
LinkedIn: http://ca.linkedin.com/in/rpjday
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
By the way,
we have followed pedissequally and re-introduced 'export IMAGE_BASENAME'
[1] when we adapted our initramfs image for oe-core, even though we had
built whitout until then, both in oe-classic and in oe-core. **
Regards
Andrea
[1]
http://cgit.openembedded.org/meta-handheld/commit/?id=3021e1fc380067666a63fa5b2bdfc5fd16282973
**
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] image.bbclass: Update outdated reference to export IMAGE_BASENAME
On Fri, 27 Jul 2012, Andrea Adami wrote: By the way, we have followed pedissequally and re-introduced 'export IMAGE_BASENAME' [1] when we adapted our initramfs image for oe-core, even though we had built whitout until then, both in oe-classic and in oe-core. Regards Andrea [1] http://cgit.openembedded.org/meta-handheld/commit/?id=3021e1fc380067666a63fa5b2bdfc5fd16282973 i think i'll just leave this for someone else higher up the food chain to deal with if they think it's worth it. rday -- Robert P. J. Day Ottawa, Ontario, CANADA http://crashcourse.ca Twitter: http://twitter.com/rpjday LinkedIn: http://ca.linkedin.com/in/rpjday ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] image.bbclass: Update outdated reference to export IMAGE_BASENAME
On Fri, 2012-07-27 at 14:53 +0200, Andrea Adami wrote: By the way, we have followed pedissequally and re-introduced 'export IMAGE_BASENAME' [1] when we adapted our initramfs image for oe-core, even though we had built whitout until then, both in oe-classic and in oe-core. Regards Andrea [1] http://cgit.openembedded.org/meta-handheld/commit/?id=3021e1fc380067666a63fa5b2bdfc5fd16282973 At this point I don't know if this is necessary or not. It might be unnecessary but we would need someone to confirm that before we remove it. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] dbus-glib: Conditionaly adds dbus-x11 to RDEPENDS_${PN}-tests
From: Noor Ahsan noor_ah...@mentor.commailto:noor_ah...@mentor.com
* Build was hitting an error Nothing RPROVIDES 'dbus-x11'. dbus-glib
RDEPENDS on it and
dbus was providing dbus-x11 when x11 was present in DISTRO FEATURES. So
conditionally
added dbus-x11 to RDEPENDS_${PN}-tests in dbus-glib recipe.
* Verified on qemuppc.
Signed-off-by: Noor Ahsan noor_ah...@mentor.com
---
meta/recipes-core/dbus/dbus-glib.inc |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/dbus/dbus-glib.inc
b/meta/recipes-core/dbus/dbus-glib.inc
index a8e6d42..9cfe796 100644
--- a/meta/recipes-core/dbus/dbus-glib.inc
+++ b/meta/recipes-core/dbus/dbus-glib.inc
@@ -35,7 +35,7 @@ FILES_${PN}-bash-completion =
${sysconfdir}/bash_completion.d/dbus-bash-complet
FILES_${PN}-dev += ${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool
FILES_${PN}-dev += ${bindir}/dbus-binding-tool
-RDEPENDS_${PN}-tests += dbus-x11
+RDEPENDS_${PN}-tests += ${@base_contains('DISTRO_FEATURES', 'x11',
'dbus-x11', '', d)}
FILES_${PN}-tests = ${datadir}/${PN}/tests
FILES_${PN}-tests-dbg = ${datadir}/${PN}/tests/.debug/* \
${datadir}/${PN}/tests/core/.debug/* \
--
1.7.10.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gobject-introspection: Drop the recipe, it has never worked and if it does cross compile, we can add it back
Hi Richard, On Fri, 2012-07-27 at 13:18 +0100, Richard Purdie wrote: If the latter, add gobject-introspection-stub to DEPENDS and this should resolve it. See the patches I just sent doing this for OE-Core. Just want to say thanks for picking this up and running with it; it'll reduce the delta between how we currently build GNOME components and what OE needs, which is a big win. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] libc-common.bbclass and uclibc
On Thu, Jul 26, 2012 at 6:17 PM, Phil Blundell ph...@gnu.org wrote:
On Thu, 2012-07-26 at 17:51 -0400, Manuel Bessler wrote:
=
python populate_packages_prepend () {
if d.getVar('DEBIAN_NAMES', True):
bpn = d.getVar('BPN', True)
d.setVar('PKG_'+bpn, 'libc6')
...
=
That particular piece of code does seem bogus for many reasons and
should probably go away. I think it is a historical relic.
But, that said, libc-common.bbclass is poorly named and is really
specific to (e)glibc. You don't want to use that for uclibc.
Ok, thanks, good to know. I just confirmed that my build indeed
succeeds without it.
Thanks,
Manuel
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] dbus-glib: Conditionaly adds dbus-x11 to RDEPENDS_${PN}-tests
On Fri, Jul 27, 2012 at 6:10 AM, Ahsan, Noor noor_ah...@mentor.com wrote:
From: Noor Ahsan noor_ah...@mentor.com
* Build was hitting an error Nothing RPROVIDES 'dbus-x11'. dbus-glib
RDEPENDS on it and
dbus was providing dbus-x11 when x11 was present in DISTRO FEATURES. So
conditionally
added dbus-x11 to RDEPENDS_${PN}-tests in dbus-glib recipe.
* Verified on qemuppc.
Signed-off-by: Noor Ahsan noor_ah...@mentor.com
I think this is a better fix:
-PACKAGES += ${PN}-bash-completion ${PN}-tests-dbg ${PN}-tests
+PACKAGES += ${PN}-bash-completion ${@base_contains('PACKAGECONFIG',
'tests', '${PN}-tests-dbg ${PN}-tests', '', d}
Due to this:
PACKAGECONFIG ??=
PACKAGECONFIG[tests] = --enable-tests,,,
--
Christopher Larson
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] openssh: openssh's init fails to restart if sshd is not running
openssh: openssh's init fails to restart if sshd is not running Because of set -e, it's necessary to specify the -o (or --oknodo) so that start-stop-daemon returns an exit status of 0 if no actions are taken. Signed-off-by: Amy Fong amy.f...@windriver.com --- init |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/openssh/openssh-5.9p1/init b/meta/recipes-connectivity/openssh/openssh-5.9p1/init index 055dd22..6beec84 100644 --- a/meta/recipes-connectivity/openssh/openssh-5.9p1/init +++ b/meta/recipes-connectivity/openssh/openssh-5.9p1/init @@ -76,7 +76,7 @@ case $1 in check_keys check_config echo -n Restarting OpenBSD Secure Shell server: sshd - start-stop-daemon -K -x /usr/sbin/sshd + start-stop-daemon -K --oknodo -x /usr/sbin/sshd check_for_no_start check_privsep_dir sleep 2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] image.bbclass: Update outdated reference to export IMAGE_BASENAME
On Fri, Jul 27, 2012 at 3:15 PM, Richard Purdie
richard.pur...@linuxfoundation.org wrote:
On Fri, 2012-07-27 at 14:53 +0200, Andrea Adami wrote:
By the way,
we have followed pedissequally and re-introduced 'export
IMAGE_BASENAME' [1] when we adapted our initramfs image for oe-core,
even though we had built whitout until then, both in oe-classic and in
oe-core.
Regards
Andrea
[1]
http://cgit.openembedded.org/meta-handheld/commit/?id=3021e1fc380067666a63fa5b2bdfc5fd16282973
At this point I don't know if this is necessary or not. It might be
unnecessary but we would need someone to confirm that before we remove
it.
Cheers,
Richard
I see in bitbake.conf IMAGE_BASENAME = ${PN}
This is enough in the default case.
Cheers
Andrea
___
Openembedded-core mailing list
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
Re: [OE-core] [PATCH] openssh: package testing
On 07/27/2012 08:24 AM, Amy Fong wrote:
openssh: package testing
Package openssh's regression tests
Signed-off-by: Amy Fong amy.f...@windriver.com
---
openssh-5.9p1/runtests.sh | 29 +
openssh_5.9p1.bb |9 +
2 files changed, 38 insertions(+)
diff --git a/meta/recipes-connectivity/openssh/openssh-5.9p1/runtests.sh
b/meta/recipes-connectivity/openssh/openssh-5.9p1/runtests.sh
new file mode 100755
index 000..bb99a05
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh-5.9p1/runtests.sh
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+cd regress
+
+make \
+ .OBJDIR=`pwd` \
+ .CURDIR=`pwd` \
+ BUILDDIR=`pwd` \
+ OBJ=`pwd` \
+ PATH=$PATH:. \
+ TEST_SHELL=sh \
+ TEST_SSH_SSH=`which ssh` \
+ TEST_SSH_SSHD=`which sshd` \
+ TEST_SSH_SSHAGENT=`which ssh-agent` \
+ TEST_SSH_SSHADD=`which ssh-add` \
+ TEST_SSH_SSHKEYGEN=`which ssh-keygen` \
+ TEST_SSH_SSHPKCS11HELPER=/usr/libexec/ssh-pkcs11-helper \
+ TEST_SSH_SSHKEYSCAN=`which ssh-keyscan` \
+ TEST_SSH_SFTP=`which sftp` \
+ TEST_SSH_SFTPSERVER=/usr/libexec/sftp-server \
+ TEST_SSH_PLINK=plink \
+ TEST_SSH_PUTTYGEN=puttygen \
+ TEST_SSH_CONCH=conch \
+ TEST_SSH_IPV6=yes \
+ TEST_SSH_ECC=yes \
+ TEST_SSH_SHA256=yes \
+ EXEEXT= \
+ tests
+
diff --git a/meta/recipes-connectivity/openssh/openssh_5.9p1.bb
b/meta/recipes-connectivity/openssh/openssh_5.9p1.bb
index 749f89e..f0880c0 100644
--- a/meta/recipes-connectivity/openssh/openssh_5.9p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_5.9p1.bb
@@ -23,6 +23,7 @@ SRC_URI =
ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.
file://sshd_config \
file://ssh_config \
file://init \
+ file://runtests.sh \
${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '',
d)}
PAM_SRC_URI = file://sshd
@@ -81,6 +82,9 @@ do_install_append () {
mv ${D}${bindir}/ssh ${D}${bindir}/ssh.${PN}
rm -f ${D}${bindir}/slogin ${D}${datadir}/Ssh.bin
rmdir ${D}/var/run/sshd ${D}/var/run ${D}/var
+ if [ ! -d ${D}/opt/${PN}-tests/ ]; then mkdir -p ${D}/opt/${PN}-tests/;
fi
+ install -m 755 ${WORKDIR}/runtests.sh ${D}/opt/${PN}-tests/
+ cp -ra ${S}/regress ${D}/opt/${PN}-tests/
}
I think these needs to be conditional on PACKAGECONFIG having tests to
include tests and test scripts. Also, I am not sure we should be
putting them in opt, probably better to have them in ${datadir}/${PN}/tests
ALLOW_EMPTY_${PN} = 1
@@ -95,6 +99,11 @@ FILES_${PN}-sftp-server = ${libexecdir}/sftp-server
FILES_${PN}-misc = ${bindir}/ssh* ${libexecdir}/ssh*
FILES_${PN}-keygen = ${bindir}/ssh-keygen
+PACKAGES += ${PN}-testing
This should also be triggered by a PACKAGECONFIG check.
+DEPENDS_${PN}-testing += ${PN}-keygen ${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-sftp
${PN}-misc ${PN}-sftp-server
+FILES_${PN}-testing += /opt/${PN}-tests/*
+FILES_${PN}-dbg += /opt/${PN}-tests/.debug/*
+
RDEPENDS_${PN} += ${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen
DEPENDS_${PN}-sshd += update-rc.d
RDEPENDS_${PN}-sshd += update-rc.d ${PN}-keygen
___
Openembedded-core mailing list
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
Re: [OE-core] [PATCH v5] dbus: include dbus-launch in the main dbus package
On Fri, 2012-07-27 at 09:22 +0300, Radu Moisan wrote:
Followed suggestions from Bugz 2261:
2) make the virtual/libx11 DEPENDS conditional based on the x11 distro
feature.
This makes the build dependencies reflect the feature list.
3) remove dbus-x11, meaning that dbus-launch with its potential X11 dependency
is now back in dbus where is belongs.
4) Potentially make dbus provide dbus-x11, for compatibility.
I'm not quite sure I understand what's potential about this last item.
The patch below seems to do that unconditionally.
+# for compatibility
+PROVIDES = dbus-x11
+RPROVIDES_${PN} = dbus-x11
+RREPLACES_${PN} += dbus-x11
You probably want RCONFLICTS_${PN} there for completeness. Also, as I
think was already noted, that PROVIDES is most likely superfluous.
p.
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/6] relocatable SDK
On 07/27/2012 04:21 AM, Laurentiu Palcu wrote: Hi, This patchset adds relocatable SDK functionality. Instead of a tarball, the output of bitbake meta-toolchain/meta-toolchain-sdk will be a self extracting archive. The user will then execute the .sh script and give it the target directory for SDK installation (default is /opt/poky). The installer will then extract the embedded tarball to the user provided location and will set up the SDK: change the paths in the environment script, change the dynamic loader path in all binaries and, also, change the ls.so.cache path in the dynamic loader itself, together with the SYSDIR paths/lengths. With that, no more root privileges are needed in order to install the SDK. Thanks, Laurentiu The following changes since commit 651b223c5fc93c7504e304e954b9ae4640ed47c6: usbutils: avoid dependency on bash (2012-07-26 18:52:00 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib lpalcu/relocatable_sdk http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=lpalcu/relocatable_sdk Laurentiu Palcu (6): eglibc: relocatable SDK changes binutils: relocatable SDK: change PT_INTERP section size scripts: add script for relocating the SDK populate_sdk_base.bbclass: create self-extracting archive relocatable.bbclass: split it up, to reuse code package.bbclass: change RPATHs for nativesdk packages meta/classes/chrpath.bbclass | 89 + meta/classes/package.bbclass |5 + meta/classes/populate_sdk_base.bbclass | 82 meta/classes/relocatable.bbclass | 91 + .../eglibc/eglibc-2.15/relocatable_sdk.patch | 70 +++ meta/recipes-core/eglibc/eglibc_2.15.bb|6 +- .../binutils/binutils-crosssdk_2.22.bb |5 + .../binutils/binutils/relocatable_sdk.patch| 13 ++ scripts/relocate_sdk.py| 200 9 files changed, 470 insertions(+), 91 deletions(-) create mode 100644 meta/classes/chrpath.bbclass create mode 100644 meta/recipes-core/eglibc/eglibc-2.15/relocatable_sdk.patch create mode 100644 meta/recipes-devtools/binutils/binutils/relocatable_sdk.patch create mode 100755 scripts/relocate_sdk.py Your patches need to have Upstream-Status and Signed-off-by: added along with a header explaining why the patch is needed. Just a quick first pass review, there may be more comments as I review deeper. Sau! ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] openssh: package testing
On 7/27/12 11:35 AM, Saul Wold wrote:
On 07/27/2012 08:24 AM, Amy Fong wrote:
openssh: package testing
Package openssh's regression tests
Signed-off-by: Amy Fong amy.f...@windriver.com
---
openssh-5.9p1/runtests.sh | 29 +
openssh_5.9p1.bb |9 +
2 files changed, 38 insertions(+)
diff --git a/meta/recipes-connectivity/openssh/openssh-5.9p1/runtests.sh
b/meta/recipes-connectivity/openssh/openssh-5.9p1/runtests.sh
new file mode 100755
index 000..bb99a05
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh-5.9p1/runtests.sh
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+cd regress
+
+make \
+ .OBJDIR=`pwd` \
+ .CURDIR=`pwd` \
+ BUILDDIR=`pwd` \
+ OBJ=`pwd` \
+ PATH=$PATH:. \
+ TEST_SHELL=sh \
+ TEST_SSH_SSH=`which ssh` \
+ TEST_SSH_SSHD=`which sshd` \
+ TEST_SSH_SSHAGENT=`which ssh-agent` \
+ TEST_SSH_SSHADD=`which ssh-add` \
+ TEST_SSH_SSHKEYGEN=`which ssh-keygen` \
+ TEST_SSH_SSHPKCS11HELPER=/usr/libexec/ssh-pkcs11-helper \
+ TEST_SSH_SSHKEYSCAN=`which ssh-keyscan` \
+ TEST_SSH_SFTP=`which sftp` \
+ TEST_SSH_SFTPSERVER=/usr/libexec/sftp-server \
+ TEST_SSH_PLINK=plink \
+ TEST_SSH_PUTTYGEN=puttygen \
+ TEST_SSH_CONCH=conch \
+ TEST_SSH_IPV6=yes \
+ TEST_SSH_ECC=yes \
+ TEST_SSH_SHA256=yes \
+ EXEEXT= \
+ tests
+
diff --git a/meta/recipes-connectivity/openssh/openssh_5.9p1.bb
b/meta/recipes-connectivity/openssh/openssh_5.9p1.bb
index 749f89e..f0880c0 100644
--- a/meta/recipes-connectivity/openssh/openssh_5.9p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_5.9p1.bb
@@ -23,6 +23,7 @@ SRC_URI =
ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.
file://sshd_config \
file://ssh_config \
file://init \
+ file://runtests.sh \
${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '',
d)}
PAM_SRC_URI = file://sshd
@@ -81,6 +82,9 @@ do_install_append () {
mv ${D}${bindir}/ssh ${D}${bindir}/ssh.${PN}
rm -f ${D}${bindir}/slogin ${D}${datadir}/Ssh.bin
rmdir ${D}/var/run/sshd ${D}/var/run ${D}/var
+ if [ ! -d ${D}/opt/${PN}-tests/ ]; then mkdir -p ${D}/opt/${PN}-tests/;
fi
+ install -m 755 ${WORKDIR}/runtests.sh ${D}/opt/${PN}-tests/
+ cp -ra ${S}/regress ${D}/opt/${PN}-tests/
}
I think these needs to be conditional on PACKAGECONFIG having tests to
include tests and test scripts. Also, I am not sure we should be
putting them in opt, probably better to have them in ${datadir}/${PN}/tests
With a separate test package, it doesn't seem to me there is a reason to have
the PACKAGECONFIG, either install the tests or don't.. (default being don't of
course.)
As for the install location, I've seen it done both ways. I'm not sure we have
a standard in OE on where tests should be located.
--Mark
ALLOW_EMPTY_${PN} = 1
@@ -95,6 +99,11 @@ FILES_${PN}-sftp-server = ${libexecdir}/sftp-server
FILES_${PN}-misc = ${bindir}/ssh* ${libexecdir}/ssh*
FILES_${PN}-keygen = ${bindir}/ssh-keygen
+PACKAGES += ${PN}-testing
This should also be triggered by a PACKAGECONFIG check.
+DEPENDS_${PN}-testing += ${PN}-keygen ${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-sftp
${PN}-misc ${PN}-sftp-server
+FILES_${PN}-testing += /opt/${PN}-tests/*
+FILES_${PN}-dbg += /opt/${PN}-tests/.debug/*
+
RDEPENDS_${PN} += ${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen
DEPENDS_${PN}-sshd += update-rc.d
RDEPENDS_${PN}-sshd += update-rc.d ${PN}-keygen
___
Openembedded-core mailing list
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
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] busybox: Add inetd related files
* Add back inetd and inetd.conf files which are needed if
CONFIG_INETD is enabled in the defconfig. Grabbed these files
from oe-classic
Signed-off-by: Franklin S Cooper Jr fcoo...@ti.com
---
meta/recipes-core/busybox/busybox_1.19.4.bb |4 ++-
meta/recipes-core/busybox/files/inetd | 33 +++
meta/recipes-core/busybox/files/inetd.conf | 20
3 files changed, 56 insertions(+), 1 deletions(-)
create mode 100755 meta/recipes-core/busybox/files/inetd
create mode 100644 meta/recipes-core/busybox/files/inetd.conf
diff --git a/meta/recipes-core/busybox/busybox_1.19.4.bb b/meta/recipes-core/busybox/busybox_1.19.4.bb
index ad8297e..f87cb5f 100644
--- a/meta/recipes-core/busybox/busybox_1.19.4.bb
+++ b/meta/recipes-core/busybox/busybox_1.19.4.bb
@@ -24,7 +24,9 @@ SRC_URI = http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
file://mdev \
file://mdev.conf \
file://umount.busybox \
- file://defconfig
+ file://defconfig \
+ file://inetd.conf \
+ file://inetd
SRC_URI[tarball.md5sum] = 9c0cae5a0379228e7b55e5b29528df8e
SRC_URI[tarball.sha256sum] = 9b853406da61ffb59eb488495fe99cbb7fb3dd29a31307fcfa9cf070543710ee
diff --git a/meta/recipes-core/busybox/files/inetd b/meta/recipes-core/busybox/files/inetd
new file mode 100755
index 000..cf50bcd
--- /dev/null
+++ b/meta/recipes-core/busybox/files/inetd
@@ -0,0 +1,33 @@
+#!/bin/sh
+#
+# start/stop inetd super server.
+
+if ! [ -x /usr/sbin/inetd ]; then
+ exit 0
+fi
+
+case $1 in
+start)
+ echo -n Starting internet superserver:
+ echo -n inetd ; start-stop-daemon -S -x /usr/sbin/inetd /dev/null
+ echo .
+ ;;
+stop)
+ echo -n Stopping internet superserver:
+ echo -n inetd ; start-stop-daemon -K -x /usr/sbin/inetd /dev/null
+ echo .
+ ;;
+restart)
+ echo -n Restarting internet superserver:
+ echo -n inetd
+ killall -HUP inetd
+ echo .
+ ;;
+*)
+ echo Usage: /etc/init.d/inetd {start|stop|restart}
+ exit 1
+ ;;
+esac
+
+exit 0
+
diff --git a/meta/recipes-core/busybox/files/inetd.conf b/meta/recipes-core/busybox/files/inetd.conf
new file mode 100644
index 000..b02fe85
--- /dev/null
+++ b/meta/recipes-core/busybox/files/inetd.conf
@@ -0,0 +1,20 @@
+# /etc/inetd.conf: see inetd(8) for further informations.
+#
+# Internet server configuration database
+#
+# If you want to disable an entry so it isn't touched during
+# package updates just comment it out with a single '#' character.
+#
+# service_name sock_type proto flags user server_path args
+#
+#:INTERNAL: Internal services
+#echo stream tcp nowait root internal
+#echo dgram udp wait root internal
+#chargen stream tcp nowait root internal
+#chargen dgram udp wait root internal
+#discard stream tcp nowait root internal
+#discard dgram udp wait root internal
+#daytime stream tcp nowait root internal
+#daytime dgram udp wait root internal
+#time stream tcp nowait root internal
+#time dgram udp wait root internal
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] busybox: Add inetd related files
On Fri, 2012-07-27 at 14:52 -0500, Franklin S Cooper Jr wrote:
+if ! [ -x /usr/sbin/inetd ]; then
+ exit 0
+fi
That should be ${sbindir}.
p.
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] openssh: package testing
On 07/27/2012 11:15 AM, Mark Hatle wrote:
On 7/27/12 11:35 AM, Saul Wold wrote:
On 07/27/2012 08:24 AM, Amy Fong wrote:
openssh: package testing
Package openssh's regression tests
Signed-off-by: Amy Fong amy.f...@windriver.com
---
openssh-5.9p1/runtests.sh | 29 +
openssh_5.9p1.bb |9 +
2 files changed, 38 insertions(+)
diff --git
a/meta/recipes-connectivity/openssh/openssh-5.9p1/runtests.sh
b/meta/recipes-connectivity/openssh/openssh-5.9p1/runtests.sh
new file mode 100755
index 000..bb99a05
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh-5.9p1/runtests.sh
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+cd regress
+
+make \
+.OBJDIR=`pwd` \
+.CURDIR=`pwd` \
+BUILDDIR=`pwd` \
+OBJ=`pwd` \
+PATH=$PATH:. \
+TEST_SHELL=sh \
+TEST_SSH_SSH=`which ssh` \
+TEST_SSH_SSHD=`which sshd` \
+TEST_SSH_SSHAGENT=`which ssh-agent` \
+TEST_SSH_SSHADD=`which ssh-add` \
+TEST_SSH_SSHKEYGEN=`which ssh-keygen` \
+TEST_SSH_SSHPKCS11HELPER=/usr/libexec/ssh-pkcs11-helper \
+TEST_SSH_SSHKEYSCAN=`which ssh-keyscan` \
+TEST_SSH_SFTP=`which sftp` \
+TEST_SSH_SFTPSERVER=/usr/libexec/sftp-server \
+TEST_SSH_PLINK=plink \
+TEST_SSH_PUTTYGEN=puttygen \
+TEST_SSH_CONCH=conch \
+TEST_SSH_IPV6=yes \
+TEST_SSH_ECC=yes \
+TEST_SSH_SHA256=yes \
+EXEEXT= \
+tests
+
diff --git a/meta/recipes-connectivity/openssh/openssh_5.9p1.bb
b/meta/recipes-connectivity/openssh/openssh_5.9p1.bb
index 749f89e..f0880c0 100644
--- a/meta/recipes-connectivity/openssh/openssh_5.9p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_5.9p1.bb
@@ -23,6 +23,7 @@ SRC_URI =
ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.
file://sshd_config \
file://ssh_config \
file://init \
+ file://runtests.sh \
${@base_contains('DISTRO_FEATURES', 'pam',
'${PAM_SRC_URI}', '', d)}
PAM_SRC_URI = file://sshd
@@ -81,6 +82,9 @@ do_install_append () {
mv ${D}${bindir}/ssh ${D}${bindir}/ssh.${PN}
rm -f ${D}${bindir}/slogin ${D}${datadir}/Ssh.bin
rmdir ${D}/var/run/sshd ${D}/var/run ${D}/var
+if [ ! -d ${D}/opt/${PN}-tests/ ]; then mkdir -p
${D}/opt/${PN}-tests/; fi
+install -m 755 ${WORKDIR}/runtests.sh ${D}/opt/${PN}-tests/
+cp -ra ${S}/regress ${D}/opt/${PN}-tests/
}
I think these needs to be conditional on PACKAGECONFIG having tests to
include tests and test scripts. Also, I am not sure we should be
putting them in opt, probably better to have them in
${datadir}/${PN}/tests
With a separate test package, it doesn't seem to me there is a reason to
have the PACKAGECONFIG, either install the tests or don't.. (default
being don't of course.)
I was thinking about build time and setting a standard on how we should
do it. Clearly in this case build time is not directly a factor, but
think of a case that has numerous tests that need to get compiled and
linked and then have a bunch of packages with those tests enabled, build
time will increase.
As for the install location, I've seen it done both ways. I'm not sure
we have a standard in OE on where tests should be located.
Again, starting the discussion to get a stake in the ground, I think
that having them in ${datadir} (/usr/share) works well and leaves /opt
free of anything OE installs there (ie OE-core should not install
anything in /opt), leave it for layers to use.
Sau!
--Mark
ALLOW_EMPTY_${PN} = 1
@@ -95,6 +99,11 @@ FILES_${PN}-sftp-server = ${libexecdir}/sftp-server
FILES_${PN}-misc = ${bindir}/ssh* ${libexecdir}/ssh*
FILES_${PN}-keygen = ${bindir}/ssh-keygen
+PACKAGES += ${PN}-testing
This should also be triggered by a PACKAGECONFIG check.
+DEPENDS_${PN}-testing += ${PN}-keygen ${PN}-scp ${PN}-ssh
${PN}-sshd ${PN}-sftp ${PN}-misc ${PN}-sftp-server
+FILES_${PN}-testing += /opt/${PN}-tests/*
+FILES_${PN}-dbg += /opt/${PN}-tests/.debug/*
+
RDEPENDS_${PN} += ${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen
DEPENDS_${PN}-sshd += update-rc.d
RDEPENDS_${PN}-sshd += update-rc.d ${PN}-keygen
___
Openembedded-core mailing list
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
___
Openembedded-core mailing list
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
Re: [OE-core] [PATCH] lttng-2.0: update to the latest version
On 07/27/2012 01:39 AM, Damian, Alexandru wrote:
Hi,
I recommend changing the liburcu licence as follows, following a GPLv3
file addition in the build macros:
LICENSE = LGPLv2.1+ MIT-style GPLv3
LICENSE_${PN} = LGPLv2.1+ MIT-style
Alex,
Please what what you are replying to, I am not sure this has anything to
do with the LTTNG update.
Thanks
Sau!
Cheers,
Alex
On Fri, Jul 27, 2012 at 10:30 AM, fahad.us...@gmail.com
mailto:fahad.us...@gmail.com wrote:
From: Fahad Usman fahad_us...@mentor.com
mailto:fahad_us...@mentor.com
update lttng-modules-2.0, lttng-tools-2.0 lttng-ust-2.0 and liburcu
to the
latest stable released versions by lttng community
remove the
lttng-sycalls-protect-is_compat_task-from-redefiniti.patch because
the problem is handled in the latest version of lttng-modules
Signed-off-by: Fahad Usman fahad_us...@mentor.com
mailto:fahad_us...@mentor.com
---
...ls-protect-is_compat_task-from-redefiniti.patch | 41
.../lttng-2.0/lttng-modules_2.0.4.bb
http://lttng-modules_2.0.4.bb | 26
.../lttng-2.0/lttng-modules_2.0.pre11.bb
http://lttng-modules_2.0.pre11.bb | 30 --
meta/recipes-kernel/lttng-2.0/lttng-tools_2.0.1.bb
http://lttng-tools_2.0.1.bb | 32 ---
meta/recipes-kernel/lttng-2.0/lttng-tools_2.0.3.bb
http://lttng-tools_2.0.3.bb | 30 ++
meta/recipes-kernel/lttng-2.0/lttng2-ust_2.0.2.bb
http://lttng2-ust_2.0.2.bb | 30 --
meta/recipes-kernel/lttng-2.0/lttng2-ust_2.0.4.bb
http://lttng2-ust_2.0.4.bb | 30 ++
meta/recipes-support/liburcu/liburcu_0.6.7.bb
http://liburcu_0.6.7.bb | 24 ---
meta/recipes-support/liburcu/liburcu_0.7.3.bb
http://liburcu_0.7.3.bb | 24 +++
9 files changed, 110 insertions(+), 157 deletions(-)
delete mode 100644
meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-sycalls-protect-is_compat_task-from-redefiniti.patch
create mode 100644
meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.4.bb
http://lttng-modules_2.0.4.bb
delete mode 100644
meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.pre11.bb
http://lttng-modules_2.0.pre11.bb
delete mode 100644
meta/recipes-kernel/lttng-2.0/lttng-tools_2.0.1.bb
http://lttng-tools_2.0.1.bb
create mode 100644
meta/recipes-kernel/lttng-2.0/lttng-tools_2.0.3.bb
http://lttng-tools_2.0.3.bb
delete mode 100644
meta/recipes-kernel/lttng-2.0/lttng2-ust_2.0.2.bb
http://lttng2-ust_2.0.2.bb
create mode 100644
meta/recipes-kernel/lttng-2.0/lttng2-ust_2.0.4.bb
http://lttng2-ust_2.0.4.bb
delete mode 100644 meta/recipes-support/liburcu/liburcu_0.6.7.bb
http://liburcu_0.6.7.bb
create mode 100644 meta/recipes-support/liburcu/liburcu_0.7.3.bb
http://liburcu_0.7.3.bb
diff --git
a/meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-sycalls-protect-is_compat_task-from-redefiniti.patch
b/meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-sycalls-protect-is_compat_task-from-redefiniti.patch
deleted file mode 100644
index 0056633..000
---
a/meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-sycalls-protect-is_compat_task-from-redefiniti.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 415a1a678cb2fcf603f9777f2c7b71c1e38f8101 Mon Sep 17 00:00:00 2001
-From: Bruce Ashfield bruce.ashfi...@windriver.com
mailto:bruce.ashfi...@windriver.com
-Date: Mon, 19 Mar 2012 13:30:31 -0400
-Subject: [PATCH] lttng-sycalls: protect is_compat_task from
redefinition
-
-recent -stable kernels have their own fallback definition of
is_compat_task
-
- #define is_compat_task() (0)
-
-To protect against this double definition of is_compat_task we can
check
-to see if it is already defined, and skip the lttng variant.
-
-Signed-off-by: Bruce Ashfield bruce.ashfi...@windriver.com
mailto:bruce.ashfi...@windriver.com
- lttng-syscalls.c |4
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/lttng-syscalls.c b/lttng-syscalls.c
-index 9de3c07..80d0f05 100644
a/lttng-syscalls.c
-+++ b/lttng-syscalls.c
-@@ -17,12 +17,16 @@
- #include ltt-events.h
-
- #ifndef CONFIG_COMPAT
-+
-+#ifndef is_compat_task
- static inline int is_compat_task(void)
- {
- return 0;
- }
- #endif
-
-+#endif
-+
- static
- void syscall_entry_probe(void *__data, struct pt_regs *regs, long id);
-
---
-1.7.5.4
-
diff --git a/meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.4.bb
http://lttng-modules_2.0.4.bb
b/meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.4.bb
http://lttng-modules_2.0.4.bb
new file mode 100644
index
Re: [OE-core] [PATCH] busybox: Add inetd related files
The section you mentioned is within the file inetd which I am adding to the
SRC_URI list in the busybox_1.19.4.bb file. The variable ${sbindir} won't be
expanded.
-Original Message-
From: Phil Blundell [mailto:ph...@gnu.org]
Sent: Friday, July 27, 2012 3:02 PM
To: Patches and discussions about the oe-core layer
Cc: Cooper Jr., Franklin
Subject: Re: [OE-core] [PATCH] busybox: Add inetd related files
On Fri, 2012-07-27 at 14:52 -0500, Franklin S Cooper Jr wrote:
+if ! [ -x /usr/sbin/inetd ]; then
+ exit 0
+fi
That should be ${sbindir}.
p.
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC 00/34] Clear update-alternatives WARNINGS
On 7/26/12 11:50 PM, Saul Wold wrote:
Folks,
Please review this change set via the links, it large enough
that I don't want to spam the list multiple times as I already
send enough pull requests to you all!
I have reviewed these and they look correct, there are a couple
of issues that I am still working out so there will likely be a
v2 (possibly a v3).
One thing I did notice is that for some of the alternatives in the
following form I am not sure the correct files are getting setup:
ALTERNATIVE_${PN} = x-terminal-emulator
ALTERNATIVE_LINK_NAME[x-terminal-emulator] = ${bindir}/rxvt
In the older/depercated way there would be a /usr/bin/rxvt while with
the new U-A code, I get a /usr/bin/rxvt.rxvt-unicode so the rxvt binary
is not effectively gone, this happens in other cases also.
There are three variables that work together for this..
The first ALTERNATIVE_recipe name is the list of alternatives.
The second ALTERNATIVE_LINK_NAME[alternative] = ... is the name of what we're
about to create. The default is ${bindir}/alternative.
The third ALTERNATIVE_TARGET[alternative] = ... is the name of the link
target.
# NOTE: If the ALTERNATIVE_LINK_NAME and ALTERNATIVE_TARGET are the same,
# ALTERNATIVE_TARGET will have '.{BPN}' appended to it. If the file
# referenced has not been renamed, it will also be renamed. (This avoids
# the need to rename alternative files in the do_install step, but still
# supports it if necessary for some reason.)
So what you want is:
ALTERNATIVE_${PN} = x-terminal-emulator
ALTERNATIVE_TARGET[x-terminal-emulator] = ${bindir}/rxvt
(ALTERNATIVE_LINK_NAME[x-terminal-emulator] will automatically be set to
${bindir}/x-terminal-emulator)
--Mark
I know there is a problem with ncurses and nativesdk, which I am still
working on. pigz seems to not add any alt-update in the pkgdata, I am
not sure why not.
Please scan though these and let me know what you think.
BTW, you will all be saved from my Consolidated pulls for a week
while I hike the North Umpqua trail in Oregon.
Thanks
Sau!
The following changes since commit 651b223c5fc93c7504e304e954b9ae4640ed47c6:
usbutils: avoid dependency on bash (2012-07-26 18:52:00 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib sgw/update-alternatives
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/update-alternatives
Saul Wold (34):
rxvt-unicode: cleanup update-alternatives deprecated code
openssh: cleanup update-alternatives deprecated code
mini-x-session: cleanup update-alternatives deprecated code
console-tools: cleanup update-alternatives deprecated code
kbd: cleanup update-alternatives deprecated code
tinylogin: cleanup update-alternatives deprecated code
patch: cleanup update-alternatives deprecated code
ubootchart: cleanup update-alternatives deprecated code
bc: cleanup update-alternatives deprecated code
diffutils: refactor to add a common diffutils.inc
diffutils: cleanup update-alternatives deprecated code
findutils: refactor common code to findutils.inc
findutils: cleanup update-alternatives deprecated code
powertop: cleanup update-alternatives deprecated code
mutter: cleanup update-alternatives deprecated code
matchbox-wm-2: cleanup update-alternatives deprecated code
matchbox-session: cleanup update-alternatives deprecated code
metacity: cleanup update-alternatives deprecated code
pigz: cleanup update-alternatives deprecated code
msmtp: cleanup update-alternatives deprecated code
mktemp: cleanup update-alternatives deprecated code
which: cleanup update-alternatives deprecated code
less: cleanup update-alternatives deprecated code
shadow: cleanup update-alternatives deprecated code
mingetty: cleanup update-alternatives deprecated code
hdparm: cleanup update-alternatives deprecated code
gzip: cleanup update-alternatives deprecated code
procps: cleanup update-alternatives deprecated code
time: cleanup update-alternatives deprecated code
wget: cleanup update-alternatives deprecated code
sed: cleanup update-alternatives deprecated code
gawk: cleanup update-alternatives deprecated code
net-tools: cleanup update-alternatives deprecated code
ncurses: fix file names for update -alternatives
meta/recipes-connectivity/openssh/openssh_6.0p1.bb |6 +---
.../console-tools/console-tools_0.3.2.bb |8 -
meta/recipes-core/kbd/kbd_1.15.2.bb|7 ++--
meta/recipes-core/ncurses/ncurses.inc |4 +-
meta/recipes-core/tinylogin/tinylogin_1.4.bb | 11 ++-
meta/recipes-devtools/patch/patch.inc |7 +
meta/recipes-devtools/patch/patch_2.5.9.bb |2 +-
meta/recipes-devtools/patch/patch_2.6.1.bb |2 +-
meta/recipes-devtools/ubootchart/ubootchart_svn.bb |7 ++--
meta/recipes-extended/bc/bc_1.06.bb|4 +-
Re: [OE-core] [PATCH] busybox: Add inetd related files
On Fri, 2012-07-27 at 20:26 +, Cooper Jr., Franklin wrote:
The section you mentioned is within the file inetd which I am adding to the
SRC_URI list in the busybox_1.19.4.bb file. The variable ${sbindir} won't be
expanded.
Right, so you need to arrange for it to get expanded. If you hardcode
the path, the script will just fail unless ${sbindir} happens to be set
to /usr/sbin.
p.
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] openssh: package testing
Op 27 jul. 2012, om 17:24 heeft Amy Fong amy.f...@windriver.com het volgende
geschreven:
openssh: package testing
Package openssh's regression tests
Signed-off-by: Amy Fong amy.f...@windriver.com
---
openssh-5.9p1/runtests.sh | 29 +
openssh_5.9p1.bb |9 +
2 files changed, 38 insertions(+)
diff --git a/meta/recipes-connectivity/openssh/openssh-5.9p1/runtests.sh
b/meta/recipes-connectivity/openssh/openssh-5.9p1/runtests.sh
new file mode 100755
index 000..bb99a05
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh-5.9p1/runtests.sh
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+cd regress
+
+make \
+ .OBJDIR=`pwd` \
+ .CURDIR=`pwd` \
+ BUILDDIR=`pwd` \
+ OBJ=`pwd` \
+ PATH=$PATH:. \
+ TEST_SHELL=sh \
+ TEST_SSH_SSH=`which ssh` \
+ TEST_SSH_SSHD=`which sshd` \
+ TEST_SSH_SSHAGENT=`which ssh-agent` \
+ TEST_SSH_SSHADD=`which ssh-add` \
+ TEST_SSH_SSHKEYGEN=`which ssh-keygen` \
+ TEST_SSH_SSHPKCS11HELPER=/usr/libexec/ssh-pkcs11-helper \
+ TEST_SSH_SSHKEYSCAN=`which ssh-keyscan` \
+ TEST_SSH_SFTP=`which sftp` \
+ TEST_SSH_SFTPSERVER=/usr/libexec/sftp-server \
+ TEST_SSH_PLINK=plink \
+ TEST_SSH_PUTTYGEN=puttygen \
+ TEST_SSH_CONCH=conch \
+ TEST_SSH_IPV6=yes \
+ TEST_SSH_ECC=yes \
+ TEST_SSH_SHA256=yes \
+ EXEEXT= \
+ tests
+
diff --git a/meta/recipes-connectivity/openssh/openssh_5.9p1.bb
b/meta/recipes-connectivity/openssh/openssh_5.9p1.bb
index 749f89e..f0880c0 100644
--- a/meta/recipes-connectivity/openssh/openssh_5.9p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_5.9p1.bb
@@ -23,6 +23,7 @@ SRC_URI =
ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.
file://sshd_config \
file://ssh_config \
file://init \
+ file://runtests.sh \
${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '',
d)}
PAM_SRC_URI = file://sshd
@@ -81,6 +82,9 @@ do_install_append () {
mv ${D}${bindir}/ssh ${D}${bindir}/ssh.${PN}
rm -f ${D}${bindir}/slogin ${D}${datadir}/Ssh.bin
rmdir ${D}/var/run/sshd ${D}/var/run ${D}/var
+ if [ ! -d ${D}/opt/${PN}-tests/ ]; then mkdir -p ${D}/opt/${PN}-tests/;
fi
+ install -m 755 ${WORKDIR}/runtests.sh ${D}/opt/${PN}-tests/
+ cp -ra ${S}/regress ${D}/opt/${PN}-tests/
Don't use /opt, /opt is bad, bad, bad. Don't ever use it
}
ALLOW_EMPTY_${PN} = 1
@@ -95,6 +99,11 @@ FILES_${PN}-sftp-server = ${libexecdir}/sftp-server
FILES_${PN}-misc = ${bindir}/ssh* ${libexecdir}/ssh*
FILES_${PN}-keygen = ${bindir}/ssh-keygen
+PACKAGES += ${PN}-testing
+DEPENDS_${PN}-testing += ${PN}-keygen ${PN}-scp ${PN}-ssh ${PN}-sshd
${PN}-sftp ${PN}-misc ${PN}-sftp-server
+FILES_${PN}-testing += /opt/${PN}-tests/*
+FILES_${PN}-dbg += /opt/${PN}-tests/.debug/*
And it's missing a PR bump
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] busybox: Add inetd related files
On 7/27/12 3:26 PM, Cooper Jr., Franklin wrote:
The section you mentioned is within the file inetd which I am adding to the
SRC_URI list in the busybox_1.19.4.bb file. The variable ${sbindir} won't be
expanded.
-Original Message-
From: Phil Blundell [mailto:ph...@gnu.org]
Sent: Friday, July 27, 2012 3:02 PM
To: Patches and discussions about the oe-core layer
Cc: Cooper Jr., Franklin
Subject: Re: [OE-core] [PATCH] busybox: Add inetd related files
On Fri, 2012-07-27 at 14:52 -0500, Franklin S Cooper Jr wrote:
+if ! [ -x /usr/sbin/inetd ]; then
+ exit 0
+fi
That should be ${sbindir}.
Inline sed of the initscript may be the easiest way to do this.
You need to expand it, you can not rely on /usr/sbin/inetd, as OE-Core expressly
permits people to change the bindir and sbindir locations. (Generally if
someone does, they change from /usr/sbin to /sbin, and /usr/bin to /bin...)
--Mark
p.
___
Openembedded-core mailing list
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
[OE-core] [PATCH 0/1] Update pseudo to 1.4 (target improvements)
Someone managed to do something which caused pseudo to try to build on ARM, where -m32 doesn't work, and I looked at the sort of half-baked --arch fix in tree, concluded I hated it, and redid it. So as of 1.4, pseudo now has support for a --cflags configure option, so the build system can pass in its own cflags instead of relying on pseudo being able to guess the correct way to change bit widths around. It still relies on the guesswork for the native build, but at least so far that's always x86. And at least we now have the correct tool so that, if we ever do develop a clean way to create the cflags for a different width, we'll be able to pass them in without major alterations. I also changed the upstream to point to the yoctoproject.org git server, which I've been using as the primary upstream for a couple of months now. Verified that at least pseudo-native can build from both the _git and 1.4 recipes. The following changes since commit 651b223c5fc93c7504e304e954b9ae4640ed47c6: Paul Eggleton (1): usbutils: avoid dependency on bash are available in the git repository at: git://git.yoctoproject.org/poky-contrib seebs/pseudo http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=seebs/pseudo Peter Seebach (1): pseudo.inc/pseudo_1.4.bb: update pseudo to 1.4 meta/recipes-devtools/pseudo/pseudo.inc | 12 +--- meta/recipes-devtools/pseudo/pseudo_1.3.1.bb |8 meta/recipes-devtools/pseudo/pseudo_1.4.bb |8 meta/recipes-devtools/pseudo/pseudo_git.bb |8 4 files changed, 21 insertions(+), 15 deletions(-) delete mode 100644 meta/recipes-devtools/pseudo/pseudo_1.3.1.bb create mode 100644 meta/recipes-devtools/pseudo/pseudo_1.4.bb ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] pseudo.inc/pseudo_1.4.bb: update pseudo to 1.4
This update replaces the half-baked --arch logic with the use
of $CFLAGS to pick compiler flags, on the grounds that it makes
a lot more sense for the build system to pick flags than for
pseudo to try to guess what they should be; this should allow
pseudo to at least compile for targets, and possibly run on
them.
This doesn't solve the problem of guessing how to forcibly
build the 32-bit variant on hosts, because we really don't
have a general solution for that. There's no idiom for given
this set of compiler flags and this architecture, what flags
would you use to request a 32-bit compile instead? So we
basically ignore that for now. If someone comes along trying
to use the build system to build pseudo-native on a 64-bit
host that also supports 32-bit binaries and isn't x86, we
will revisit this.
---
meta/recipes-devtools/pseudo/pseudo.inc | 12 +---
meta/recipes-devtools/pseudo/pseudo_1.3.1.bb |8
meta/recipes-devtools/pseudo/pseudo_1.4.bb |8
meta/recipes-devtools/pseudo/pseudo_git.bb |8
4 files changed, 21 insertions(+), 15 deletions(-)
delete mode 100644 meta/recipes-devtools/pseudo/pseudo_1.3.1.bb
create mode 100644 meta/recipes-devtools/pseudo/pseudo_1.4.bb
diff --git a/meta/recipes-devtools/pseudo/pseudo.inc
b/meta/recipes-devtools/pseudo/pseudo.inc
index 8798018..ac898d2 100644
--- a/meta/recipes-devtools/pseudo/pseudo.inc
+++ b/meta/recipes-devtools/pseudo/pseudo.inc
@@ -3,7 +3,7 @@
# BBFETCH2=True PSEUDO_BUILD=1 ../bitbake/bin/bitbake pseudo-native [-c CMD]
DESCRIPTION = Pseudo gives fake root capabilities to a normal user
-HOMEPAGE = http://wiki.github.com/wrpseudo/pseudo/;
+HOMEPAGE = http://git.yoctoproject.org/cgit/cgit.cgi/pseudo;
LIC_FILES_CHKSUM = file://COPYING;md5=243b725d71bb5df4a1e5920b344b86ad
SECTION = base
LICENSE = LGPL2.1
@@ -11,6 +11,8 @@ DEPENDS = sqlite3
SRC_URI_append_virtclass-nativesdk = file://symver.patch
+SRC_URI_append_virtclass-native = file://symver.patch
+
FILES_${PN} = ${libdir}/pseudo/lib*/libpseudo.so ${bindir}/*
${localstatedir}/pseudo ${prefix}/var/pseudo
FILES_${PN}-dbg += ${libdir}/pseudo/lib*/.debug
PROVIDES += virtual/fakeroot
@@ -28,9 +30,9 @@ NO32LIBS ??= 1
# Compile for the local machine arch...
do_compile () {
if [ ${SITEINFO_BITS} = 64 ]; then
- ${S}/configure --prefix=${prefix}
--libdir=${prefix}/lib/pseudo/lib${SITEINFO_BITS}
--with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=${SITEINFO_BITS}
--enable-static-sqlite --without-rpath
+ ${S}/configure --prefix=${prefix}
--libdir=${prefix}/lib/pseudo/lib${SITEINFO_BITS}
--with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --cflags=${CFLAGS}
--bits=${SITEINFO_BITS} --enable-static-sqlite --without-rpath
else
- ${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib
--with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=${SITEINFO_BITS}
--enable-static-sqlite --without-rpath
+ ${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib
--with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --cflags=${CFLAGS}
--bits=${SITEINFO_BITS} --enable-static-sqlite --without-rpath
fi
oe_runmake ${MAKEOPTS}
}
@@ -41,6 +43,8 @@ do_compile () {
do_compile_prepend_virtclass-native () {
if [ ${SITEINFO_BITS} = 64 -a -e /usr/include/gnu/stubs-32.h -a
${PN} = pseudo-native -a ${NO32LIBS} != 1 ]; then
# We need the 32-bit libpseudo on a 64-bit machine...
+# ... and we really, really, hope that the native host is
+# x86, or else --bits may not work.
./configure --prefix=${prefix}
--libdir=${prefix}/lib/pseudo/lib
--with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 --without-rpath
oe_runmake ${MAKEOPTS} libpseudo
# prevent it from removing the lib, but remove everything else
@@ -51,6 +55,8 @@ do_compile_prepend_virtclass-native () {
do_compile_prepend_virtclass-nativesdk () {
if [ ${SITEINFO_BITS} = 64 -a -e /usr/include/gnu/stubs-32.h -a
${PN} = pseudo-native -a ${NO32LIBS} != 1 ]; then
# We need the 32-bit libpseudo on a 64-bit machine...
+# ... and we really, really, hope that the native host is
+# x86, or else --bits may not work.
./configure --prefix=${prefix}
--libdir=${prefix}/lib/pseudo/lib
--with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 --without-rpath
oe_runmake ${MAKEOPTS} libpseudo
# prevent it from removing the lib, but remove everything else
diff --git a/meta/recipes-devtools/pseudo/pseudo_1.3.1.bb
b/meta/recipes-devtools/pseudo/pseudo_1.3.1.bb
deleted file mode 100644
index d64e0e5..000
--- a/meta/recipes-devtools/pseudo/pseudo_1.3.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require pseudo.inc
-
-PR = r11
-
-SRC_URI = http://www.yoctoproject.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2;
-
-SRC_URI[md5sum] =
[OE-core] [branch: denzil] [PATCH] busybox: Add inetd related files
* Add back inetd and inetd.conf files which are needed if
CONFIG_INETD is enabled in the defconfig. Grabbed these files
from oe-classic
Signed-off-by: Franklin S Cooper Jr fcoo...@ti.com
---
meta/recipes-core/busybox/busybox.inc |1 +
meta/recipes-core/busybox/busybox_1.19.4.bb |6 +++-
meta/recipes-core/busybox/files/inetd | 33 +++
meta/recipes-core/busybox/files/inetd.conf | 20
4 files changed, 58 insertions(+), 2 deletions(-)
create mode 100755 meta/recipes-core/busybox/files/inetd
create mode 100644 meta/recipes-core/busybox/files/inetd.conf
diff --git a/meta/recipes-core/busybox/busybox.inc
b/meta/recipes-core/busybox/busybox.inc
index ec76ad2..89c51d3 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -190,6 +190,7 @@ do_install () {
fi
if grep CONFIG_INETD=y ${WORKDIR}/defconfig; then
install -m 0755 ${WORKDIR}/inetd
${D}${sysconfdir}/init.d/inetd.${BPN}
+sed -i s:/usr/sbin/:${sbindir}/:
${D}${sysconfdir}/init.d/inetd.${BPN}
install -m 0644 ${WORKDIR}/inetd.conf ${D}${sysconfdir}/
fi
if grep CONFIG_MDEV=y ${WORKDIR}/defconfig; then
diff --git a/meta/recipes-core/busybox/busybox_1.19.4.bb
b/meta/recipes-core/busybox/busybox_1.19.4.bb
index ad8297e..3093f01 100644
--- a/meta/recipes-core/busybox/busybox_1.19.4.bb
+++ b/meta/recipes-core/busybox/busybox_1.19.4.bb
@@ -1,5 +1,5 @@
require busybox.inc
-PR = r2
+PR = r3
SRC_URI = http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball
\
file://udhcpscript.patch \
@@ -24,7 +24,9 @@ SRC_URI =
http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
file://mdev \
file://mdev.conf \
file://umount.busybox \
- file://defconfig
+ file://defconfig \
+ file://inetd.conf \
+ file://inetd
SRC_URI[tarball.md5sum] = 9c0cae5a0379228e7b55e5b29528df8e
SRC_URI[tarball.sha256sum] =
9b853406da61ffb59eb488495fe99cbb7fb3dd29a31307fcfa9cf070543710ee
diff --git a/meta/recipes-core/busybox/files/inetd
b/meta/recipes-core/busybox/files/inetd
new file mode 100755
index 000..cf50bcd
--- /dev/null
+++ b/meta/recipes-core/busybox/files/inetd
@@ -0,0 +1,33 @@
+#!/bin/sh
+#
+# start/stop inetd super server.
+
+if ! [ -x /usr/sbin/inetd ]; then
+ exit 0
+fi
+
+case $1 in
+start)
+ echo -n Starting internet superserver:
+ echo -n inetd ; start-stop-daemon -S -x /usr/sbin/inetd /dev/null
+ echo .
+ ;;
+stop)
+ echo -n Stopping internet superserver:
+ echo -n inetd ; start-stop-daemon -K -x /usr/sbin/inetd /dev/null
+ echo .
+ ;;
+restart)
+ echo -n Restarting internet superserver:
+ echo -n inetd
+ killall -HUP inetd
+ echo .
+ ;;
+*)
+ echo Usage: /etc/init.d/inetd {start|stop|restart}
+ exit 1
+ ;;
+esac
+
+exit 0
+
diff --git a/meta/recipes-core/busybox/files/inetd.conf
b/meta/recipes-core/busybox/files/inetd.conf
new file mode 100644
index 000..b02fe85
--- /dev/null
+++ b/meta/recipes-core/busybox/files/inetd.conf
@@ -0,0 +1,20 @@
+# /etc/inetd.conf: see inetd(8) for further informations.
+#
+# Internet server configuration database
+#
+# If you want to disable an entry so it isn't touched during
+# package updates just comment it out with a single '#' character.
+#
+# service_name sock_type proto flags user server_path args
+#
+#:INTERNAL: Internal services
+#echo stream tcp nowait rootinternal
+#echo dgram udp waitrootinternal
+#chargen stream tcp nowait rootinternal
+#chargen dgram udp waitrootinternal
+#discard stream tcp nowait rootinternal
+#discard dgram udp waitrootinternal
+#daytime stream tcp nowait rootinternal
+#daytime dgram udp waitrootinternal
+#time stream tcp nowait rootinternal
+#time dgram udp waitrootinternal
--
1.7.0.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] busybox: Add inetd related files
This patch was meant for the denzil branch and I also forgot to bump the PR in
the busybox_1.19.4.bb file. So I rejected this patch in Patchworks and
submitted an updated one. I also made a tweak that addresses your concern.
-Original Message-
From: Phil Blundell [mailto:ph...@gnu.org]
Sent: Friday, July 27, 2012 3:43 PM
To: Cooper Jr., Franklin
Cc: Patches and discussions about the oe-core layer
Subject: Re: [OE-core] [PATCH] busybox: Add inetd related files
On Fri, 2012-07-27 at 20:26 +, Cooper Jr., Franklin wrote:
The section you mentioned is within the file inetd which I am adding to the
SRC_URI list in the busybox_1.19.4.bb file. The variable ${sbindir} won't be
expanded.
Right, so you need to arrange for it to get expanded. If you hardcode
the path, the script will just fail unless ${sbindir} happens to be set
to /usr/sbin.
p.
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2 1/2] kernel.bbclass: fix external module building
On 07/20/2012 04:22 PM, Khem Raj wrote:
From: Denis Carikli gnu...@no-log.org
Without that fix we have the following while compiling compat-wireless.
include/linux/mmzone.h:18:30: fatal error: generated/bounds.h: No such file
or directory
Note that the compat-wireless recipe will be added in another commit.
make -C $kerneldir _mrproper_scripts deleted this file along with
other things so we resurrect it with this patch.
Signed-off-by: Denis 'GNUtoo' Carikli gnu...@no-log.org
Signed-off-by: Koen Kooi k...@dominion.thruhere.net
This addresses my concerns and incorporates Paul's request for
documentation in the commit header.
Acked-by: Darren Hart dvh...@linux.intel.com
---
meta/classes/kernel.bbclass |3 +++
1 file changed, 3 insertions(+)
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 08b5e61..ce4d7de 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -187,6 +187,9 @@ kernel_do_install() {
cp arch/powerpc/lib/crtsavres.o
$kerneldir/arch/powerpc/lib/crtsavres.o
fi
+ # Necessary for building modules like compat-wireless.
+ cp include/generated/bounds.h $kerneldir/include/generated/bounds.h
+
# Remove the following binaries which cause strip or arch QA errors
# during do_package for cross-compiled platforms
bin_files=arch/powerpc/boot/addnote arch/powerpc/boot/hack-coff \
--
Darren Hart
Intel Open Source Technology Center
Yocto Project - Technical Lead - Linux Kernel
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] kernel.bbclass: remove default module_autoload and module_conf values
On 07/26/2012 11:04 AM, Bruce Ashfield wrote:
kernel.bbclass is a common class for many different kernel versions,
and as such the default module_autoload and module_conf values that
it contains are not relevant, or out of date for most builds.
Individual kernel recipes or distros can better specify these
values to meet their needs.
Signed-off-by: Bruce Ashfield bruce.ashfi...@windriver.com
This makes sense to me. None of the below are likely to prevent boot and
seem to be more along the lines of MACHINE policy.
--
Darren
---
meta/classes/kernel.bbclass | 19 ---
1 files changed, 0 insertions(+), 19 deletions(-)
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index ab984e3..c647e9b 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -293,25 +293,6 @@ if [ x$D = x ]; then
fi
}
-# autoload defaults (alphabetically sorted)
-module_autoload_hidp = hidp
-module_autoload_ipv6 = ipv6
-module_autoload_ipsec = ipsec
-module_autoload_ircomm-tty = ircomm-tty
-module_autoload_rfcomm = rfcomm
-module_autoload_sa1100-rtc = sa1100-rtc
-# sa1100-rtc was renamed in 2.6.23 onwards
-module_autoload_rtc-sa1100 = rtc-sa1100
-
-# alias defaults (alphabetically sorted)
-module_conf_af_packet = alias net-pf-17 af_packet
-module_conf_bluez = alias net-pf-31 bluez
-module_conf_bnep = alias bt-proto-4 bnep
-module_conf_hci_uart = alias tty-ldisc-15 hci_uart
-module_conf_l2cap = alias bt-proto-0 l2cap
-module_conf_sco = alias bt-proto-2 sco
-module_conf_rfcomm = alias bt-proto-3 rfcomm
-
python populate_packages_prepend () {
def extract_modinfo(file):
import tempfile, re, subprocess
--
Darren Hart
Intel Open Source Technology Center
Yocto Project - Technical Lead - Linux Kernel
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2 1/2] kernel.bbclass: fix external module building
On Fri, Jul 20, 2012 at 4:22 PM, Khem Raj raj.k...@gmail.com wrote:
From: Denis Carikli gnu...@no-log.org
Without that fix we have the following while compiling compat-wireless.
include/linux/mmzone.h:18:30: fatal error: generated/bounds.h: No such file
or directory
Note that the compat-wireless recipe will be added in another commit.
make -C $kerneldir _mrproper_scripts deleted this file along with
other things so we resurrect it with this patch.
Signed-off-by: Denis 'GNUtoo' Carikli gnu...@no-log.org
Signed-off-by: Koen Kooi k...@dominion.thruhere.net
---
meta/classes/kernel.bbclass |3 +++
1 file changed, 3 insertions(+)
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 08b5e61..ce4d7de 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -187,6 +187,9 @@ kernel_do_install() {
cp arch/powerpc/lib/crtsavres.o
$kerneldir/arch/powerpc/lib/crtsavres.o
fi
+ # Necessary for building modules like compat-wireless.
+ cp include/generated/bounds.h $kerneldir/include/generated/bounds.h
+
# Remove the following binaries which cause strip or arch QA errors
# during do_package for cross-compiled platforms
bin_files=arch/powerpc/boot/addnote arch/powerpc/boot/hack-coff \
--
1.7.9.5
As an fyi, this seems to have broken compatibility with 2.6 kernel
recipes, as bounds.h doesn't live in generated/ there.
--
Christopher Larson
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
