[OE-core] [PATCH 1/2] gobject-introspection: update frome meta-oe
OE-Core uses very old version of gobject-introspection. The recipe says
0.10.8, but in reality it's GOBJECT_INTROSPECTION_0_6_3-41-gefa7266.
That version e.g. doesn't compile with python 2.7 (default in some
versions), etc.
Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com
---
.../gnome/gobject-introspection/configure.patch| 27
.../gnome/gobject-introspection/pathfix.patch | 27
.../use-usr-bin-env-for-python.patch | 20
.../gnome/gobject-introspection_git.bb | 32 +++
4 files changed, 38 insertions(+), 68 deletions(-)
delete mode 100644
meta/recipes-gnome/gnome/gobject-introspection/configure.patch
delete mode 100644 meta/recipes-gnome/gnome/gobject-introspection/pathfix.patch
create mode 100644
meta/recipes-gnome/gnome/gobject-introspection/use-usr-bin-env-for-python.patch
diff --git a/meta/recipes-gnome/gnome/gobject-introspection/configure.patch
b/meta/recipes-gnome/gnome/gobject-introspection/configure.patch
deleted file mode 100644
index 5dcd9b0..000
--- a/meta/recipes-gnome/gnome/gobject-introspection/configure.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Index: git/common.mk
-===
git.orig/common.mk 2009-08-19 11:11:26.0 +0100
-+++ git/common.mk 2009-08-19 11:12:05.0 +0100
-@@ -4,7 +4,7 @@
- UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \
- UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir)
- SCANNER_ARGS = -v --add-include-path=$(top_builddir)/gir --add-include-path=.
--SCANNER = $(AM_V_GEN) env LPATH=.libs $(CHECK_DEBUG) $(SCANNER_ENV)
$(SCANNER_BIN) $(SCANNER_ARGS)
-+SCANNER = $(AM_V_GEN) env LPATH=.libs $(CHECK_DEBUG) $(SCANNER_ENV)
g-ir-scanner $(SCANNER_ARGS)
- SCANNER_LIBS = \
- $(top_srcdir)/giscanner/*.py \
- $(top_builddir)/giscanner/libgiscanner.la \
-Index: git/configure.ac
-===
git.orig/configure.ac 2009-08-19 11:11:26.0 +0100
-+++ git/configure.ac 2009-08-19 11:11:28.0 +0100
-@@ -201,7 +201,6 @@
- pyexecdir=`echo $pyexecdir | tr '' '/'`
- ;;
- esac
--AM_CHECK_PYTHON_HEADERS(,AC_MSG_ERROR([Python headers not found]))
-
- AC_CONFIG_FILES([
- Makefile
diff --git a/meta/recipes-gnome/gnome/gobject-introspection/pathfix.patch
b/meta/recipes-gnome/gnome/gobject-introspection/pathfix.patch
deleted file mode 100644
index a96e4b1..000
--- a/meta/recipes-gnome/gnome/gobject-introspection/pathfix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Upstream-Status: Pending
-
-Index: git/giscanner/dumper.py
-===
git.orig/giscanner/dumper.py 2010-11-29 15:14:35.0 -0800
-+++ git/giscanner/dumper.py2010-11-29 15:14:57.115747154 -0800
-@@ -82,7 +82,7 @@
- self._tmpdir = tempfile.mkdtemp('', 'tmp-introspect', dir=os.getcwd())
-
- self._compiler_cmd = os.environ.get('CC', 'gcc')
--self._linker_cmd = os.environ.get('LD', self._compiler_cmd)
-+self._linker_cmd = os.environ.get('CCLD', self._compiler_cmd)
- self._pkgconfig_cmd = os.environ.get('PKG_CONFIG', 'pkg-config')
-
- self._uninst_srcdir = os.environ.get(
-Index: git/giscanner/scannermain.py
-===
git.orig/giscanner/scannermain.py 2010-11-29 15:14:35.0 -0800
-+++ git/giscanner/scannermain.py 2010-11-29 15:14:57.120747321 -0800
-@@ -283,6 +283,7 @@
- shown_include_warning = False
- for include in options.includes:
- if os.sep in include:
-+continue
- raise ValueError(Invalid include path %r % (include, ))
- include_obj = Include.from_string(include)
- transformer.register_include(include_obj)
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
new file mode 100644
index 000..67b8547
--- /dev/null
+++
b/meta/recipes-gnome/gnome/gobject-introspection/use-usr-bin-env-for-python.patch
@@ -0,0 +1,20 @@
+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
[OE-core] [PATCH 2/2] screenshot: rename to sato-screenshot
To remove a name conflict with e17's screenshot tool (and possibly other
screenshot tools, as screenshot is a generic term), rename screenshot
to sato-screenshot.
Signed-off-by: Dmitry Eremin-Solenikov dbarysh...@gmail.com
---
.../sato-screenshot/files/fix_ldadd_order.patch| 15 +
.../sato-screenshot/sato-screenshot_git.bb | 23
.../screenshot/files/fix_ldadd_order.patch | 15 -
meta/recipes-sato/screenshot/screenshot_git.bb | 23
meta/recipes-sato/tasks/task-core-x11.bb |2 +-
5 files changed, 39 insertions(+), 39 deletions(-)
create mode 100644
meta/recipes-sato/sato-screenshot/files/fix_ldadd_order.patch
create mode 100644 meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb
delete mode 100644 meta/recipes-sato/screenshot/files/fix_ldadd_order.patch
delete mode 100644 meta/recipes-sato/screenshot/screenshot_git.bb
diff --git a/meta/recipes-sato/sato-screenshot/files/fix_ldadd_order.patch
b/meta/recipes-sato/sato-screenshot/files/fix_ldadd_order.patch
new file mode 100644
index 000..7d9689e
--- /dev/null
+++ b/meta/recipes-sato/sato-screenshot/files/fix_ldadd_order.patch
@@ -0,0 +1,15 @@
+Fix the ordering of LDADD options to fix a compilation failure.
+
+Signed-off-by: Scott Garman scott.a.gar...@intel.com
+
+Upstream-Status: Inappropriate [configuration]
+
+diff -urN screenshot.orig//Makefile.am screenshot/Makefile.am
+--- screenshot.orig//Makefile.am 2010-06-29 11:55:00.0 -0700
screenshot/Makefile.am 2011-03-01 11:09:01.215813968 -0800
+@@ -23,4 +23,4 @@
+ # A standalone tool for running from a terminal and scripts
+ bin_PROGRAMS = screenshot
+ screenshot_SOURCES = main.c
+-screenshot_LDADD = $(GTK_LIBS) libshot.la
++screenshot_LDADD = libshot.la $(GTK_LIBS)
diff --git a/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb
b/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb
new file mode 100644
index 000..5e51d3d
--- /dev/null
+++ b/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = An ultra-simple screen capture utility, aimed at handheld
devices
+HOMEPAGE = http://www.o-hand.com;
+BUGTRACKER = http://bugzilla.openedhand.com/;
+
+LICENSE = GPLv2 GPLv2+
+LIC_FILES_CHKSUM = file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
+
file://main.c;endline=9;md5=023e14d6404d0a961eb97cbd011fc141 \
+
file://screenshot-ui.h;endline=9;md5=638d9ffa83e9325a36df224166ed6ad0
+
+DEPENDS = matchbox-panel-2
+SRCREV = c792e4edc758bab21e0b01814979eacf0b1af945
+PV = 0.1+git${SRCPV}
+PR = r0
+
+SRC_URI = git://git.yoctoproject.org/screenshot;protocol=git \
+ file://fix_ldadd_order.patch
+
+S = ${WORKDIR}/git
+
+inherit autotools pkgconfig
+
+FILES_${PN} += ${libdir}/matchbox-panel/*.so
+FILES_${PN}-dbg += ${libdir}/matchbox-panel/.debug
diff --git a/meta/recipes-sato/screenshot/files/fix_ldadd_order.patch
b/meta/recipes-sato/screenshot/files/fix_ldadd_order.patch
deleted file mode 100644
index 7d9689e..000
--- a/meta/recipes-sato/screenshot/files/fix_ldadd_order.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix the ordering of LDADD options to fix a compilation failure.
-
-Signed-off-by: Scott Garman scott.a.gar...@intel.com
-
-Upstream-Status: Inappropriate [configuration]
-
-diff -urN screenshot.orig//Makefile.am screenshot/Makefile.am
screenshot.orig//Makefile.am 2010-06-29 11:55:00.0 -0700
-+++ screenshot/Makefile.am 2011-03-01 11:09:01.215813968 -0800
-@@ -23,4 +23,4 @@
- # A standalone tool for running from a terminal and scripts
- bin_PROGRAMS = screenshot
- screenshot_SOURCES = main.c
--screenshot_LDADD = $(GTK_LIBS) libshot.la
-+screenshot_LDADD = libshot.la $(GTK_LIBS)
diff --git a/meta/recipes-sato/screenshot/screenshot_git.bb
b/meta/recipes-sato/screenshot/screenshot_git.bb
deleted file mode 100644
index 917a27d..000
--- a/meta/recipes-sato/screenshot/screenshot_git.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = An ultra-simple screen capture utility, aimed at handheld
devices
-HOMEPAGE = http://www.o-hand.com;
-BUGTRACKER = http://bugzilla.openedhand.com/;
-
-LICENSE = GPLv2 GPLv2+
-LIC_FILES_CHKSUM = file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
-
file://main.c;endline=9;md5=023e14d6404d0a961eb97cbd011fc141 \
-
file://screenshot-ui.h;endline=9;md5=638d9ffa83e9325a36df224166ed6ad0
-
-DEPENDS = matchbox-panel-2
-SRCREV = c792e4edc758bab21e0b01814979eacf0b1af945
-PV = 0.1+git${SRCPV}
-PR = r0
-
-SRC_URI = git://git.yoctoproject.org/${BPN};protocol=git \
- file://fix_ldadd_order.patch
-
-S = ${WORKDIR}/git
-
-inherit autotools pkgconfig
-
-FILES_${PN} += ${libdir}/matchbox-panel/*.so
-FILES_${PN}-dbg += ${libdir}/matchbox-panel/.debug
diff --git a/meta/recipes-sato/tasks/task-core-x11.bb
b/meta/recipes-sato/tasks/task-core-x11.bb
index 106bc0f..f1b06f9 100644
---
Re: [OE-core] [RFC PATCH 1/1] busybox: update to 1.19.3
On 11 nov 2011, at 18:36, Saul Wold s...@linux.intel.com wrote:
On 11/11/2011 12:17 AM, Anders Darander wrote:
The updates to patch busybox-udhcpc-no_deconfig.patch is not fully verified.
Signed-off-by: Anders Daranderand...@chargestorm.se
---
.../B921600.patch |0
.../busybox-appletlib-dependency.patch |0
.../busybox-udhcpc-no_deconfig.patch | 66 +++--
.../{busybox-1.18.5 = busybox-1.19.3}/defconfig | 271
+---
What kind of changes did you make to the defconfig?
Are thy just reflective of the updated version or did you make addition
modifications to enable/disable various configurations?
There might be some new feature that's been enabled. I haven't actively
enabled/disabled any features; new features (not defined in the old defconfig)
have their default values.
So, yes, the changes are only reflecting the updated busybox version.
I did notice this in particular which may be different in different configs:
-CONFIG_CROSS_COMPILER_PREFIX=
-CONFIG_EXTRA_CFLAGS=
+CONFIG_CROSS_COMPILER_PREFIX=i586-oe-linux-
+CONFIG_EXTRA_CFLAGS= -O2 -pipe -g -feliminate-unused-debug-types
This might be different for a poky or other distro based build
Thanks for spotting this. The defconfig update was made just before submitting
the RFC. Most of the testings has been performed using custom configs, or just
running with the old defconfig.
I'll make sure to go over these before submitting the next revision.
Cheers,
Anders
___
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] libx11-diet: update to 1.4.4
On 11/11/2011 03:09 AM, Xiaofeng Yan wrote:
From: Xiaofeng Yanxiaofeng@windriver.com
I remove patch nodolt.patch because it is no use in the new version \
and change patch include_fix.patch to keysymdef_include.patch from
libx11-1.4.4.
Signed-off-by: Xiaofeng Yanxiaofeng@windriver.com
---
.../xorg-lib/libx11-diet-1.3/include_fix.patch | 25 --
.../xorg-lib/libx11-diet-1.3/nodolt.patch | 14
.../libx11-diet-1.3/x11_disable_makekeys.patch | 31 --
.../X18NCMSstubs.diff |1 +
.../fix-disable-xlocale.diff |1 +
.../fix-utf8-wrong-define.patch|2 +
.../libx11-diet-1.4.4/keysymdef_include.patch | 23 +
.../libx11-diet-1.4.4/x11_disable_makekeys.patch | 34
meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb | 25 --
.../recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb | 28
10 files changed, 89 insertions(+), 95 deletions(-)
delete mode 100644
meta/recipes-graphics/xorg-lib/libx11-diet-1.3/include_fix.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.3/nodolt.patch
delete mode 100644
meta/recipes-graphics/xorg-lib/libx11-diet-1.3/x11_disable_makekeys.patch
rename meta/recipes-graphics/xorg-lib/{libx11-diet-1.3 =
libx11-diet-1.4.4}/X18NCMSstubs.diff (99%)
rename meta/recipes-graphics/xorg-lib/{libx11-diet-1.3 =
libx11-diet-1.4.4}/fix-disable-xlocale.diff (90%)
rename meta/recipes-graphics/xorg-lib/{libx11-diet-1.3 =
libx11-diet-1.4.4}/fix-utf8-wrong-define.patch (88%)
create mode 100644
meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/keysymdef_include.patch
create mode 100644
meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/x11_disable_makekeys.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb
create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb
SNIP
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb
b/meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb
new file mode 100644
index 000..1762829
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb
@@ -0,0 +1,28 @@
+require libx11.inc
+
+DESCRIPTION += Support for XCB, UDC, XCMS and XLOCALE is disabled in \
+this version.
+
+LIC_FILES_CHKSUM = file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7
+
+PR = r0
+
+SRC_URI += file://x11_disable_makekeys.patch \
+file://X18NCMSstubs.diff \
+file://keysymdef_include.patch \
+file://fix-disable-xlocale.diff \
+file://fix-utf8-wrong-define.patch \
+
+
+
+SRC_URI[md5sum] = ed7c382cbf8c13425b6a66bcac0ca5d9
+SRC_URI[sha256sum] =
7fe62180f08ef5f0a0062fb444591e349cae2ab5af6ad834599f5c654e6c840d
+
+DEPENDS += bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
+libxdmcp xf86bigfontproto kbproto inputproto xproto-native
+
+FILESDIR = ${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11
+
Why did you need to add FILESDIR here?
Sau!
+EXTRA_OECONF += --without-xcb --disable-udc --disable-xcms --disable-xlocale
--with-keysymdefdir=${STAGING_INCDIR}/X11
+CFLAGS += -D_GNU_SOURCE
+
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 00/21] Updates and Fixes
Richard,
This set has been build tested and reviewed. I did have to update
bitbake.conf for both then gnu-config and base.bblcass changes to
modify ASSUME_PROVIDED, please review this.
Thanks
Sau!
The following changes since commit a8ed4fcd79f6283c1d45f347dce894d784183900:
xinit: rdepends on util-linux-mcookie to avoid brining whole util-linux
(2011-11-11 11:00:56 +)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib sgw/stage
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage
Martin Jansa (13):
libatomics-ops: force ARM mode
pulseaudio-0.9.23: force ARM mode
aspell: force ARM mode
webkit-gtk: force arm mode to work around binutils segfault
subversion: add 1.7.0 with native support and negative D_P for now
base.bbclass: add subversion-native to DEPENDS if there is svn:// in
SRC_URI
time: rename files dir to time-1.7 for faster lookup
time: drop default S and 2 useless comments
time: use u-a for time, conflicts with busybox
util-linux: use u-a for flock and blockdev, conflicts with busybox
util-linux: add missing u-a calls for setsid chrt
util-linux: bump PR after u-a changes
kbd: use u-a for chvt, deallocvt, fgconssole, openvt, conflicts with
busybox
Otavio Salvador (1):
dhcp: generate initial leases files for server
Saul Wold (5):
file: update to 5.09
gnu-config: update to git HEAD
boost: Update to 1.47.0 Cleanup
bitbake.conf: Update ASSUME_PROVIDED
distro_tracking: Refect Recipe Updates Status
Simon Busch (1):
qt4-x11-free: bring back pkg-config fixups
Xiaofeng Yan (1):
directfb: update to 1.4.15
meta/classes/base.bbclass |8 +-
meta/conf/bitbake.conf |7 +-
.../conf/distro/include/distro_tracking_fields.inc | 49 ++--
meta/recipes-connectivity/dhcp/dhcp.inc|9 +-
meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb |2 +-
meta/recipes-core/kbd/kbd_1.15.2.bb| 29 ++-
meta/recipes-core/util-linux/util-linux.inc| 14 +-
meta/recipes-core/util-linux/util-linux_2.19.1.bb |2 +-
.../file/file/fix_version_check.patch | 21 ++
.../file/{file_5.04.bb = file_5.09.bb}|9 +-
.../gnu-config/config-guess-uclibc.patch | 145 +--
.../{gnu-config_20080123.bb = gnu-config_git.bb} | 15 +-
.../subversion/subversion-1.7.0/libtool2.patch | 15 ++
.../subversion/subversion_1.7.0.bb | 37 +++
.../time/{files = time-1.7}/debian.patch |0
meta/recipes-extended/time/time.inc| 10 +
meta/recipes-extended/time/time_1.7.bb |5 +-
.../{directfb_1.4.12.bb = directfb_1.4.15.bb} |9 +-
.../directfb-1.2.x-fix-pkgconfig-cflags.patch | 36 ++--
.../pulseaudio/libatomics-ops_1.2.bb |2 +-
.../pulseaudio/pulseaudio_0.9.23.bb|2 +-
meta/recipes-qt/qt4/qt4-x11-free.inc | 16 ++-
meta/recipes-sato/webkit/webkit-gtk_svn.bb |2 +-
meta/recipes-support/aspell/aspell_0.60.6.1.bb |2 +-
meta/recipes-support/boost/boost-jam-native.inc| 32 ---
.../boost/boost-jam-native_3.1.18.bb |8 -
.../boost/{boost-36.inc = boost.inc} | 42 +++-
.../boost/{boost_1.44.0.bb = boost_1.47.0.bb} | 13 +-
.../recipes-support/boost/files/1.34.1-gcc43.patch | 226 -
.../boost/files/atomic_count_gcc_atomicity.patch | 15 --
meta/recipes-support/boost/files/gcc41.patch | 16 --
meta/recipes-support/boost/files/gcc43.patch | 258
.../recipes-support/boost/files/linux-uclibc.patch | 12 -
.../boost/files/unit_test_log10f.patch | 22 --
34 files changed, 333 insertions(+), 757 deletions(-)
create mode 100644 meta/recipes-devtools/file/file/fix_version_check.patch
rename meta/recipes-devtools/file/{file_5.04.bb = file_5.09.bb} (79%)
rename meta/recipes-devtools/gnu-config/{gnu-config_20080123.bb =
gnu-config_git.bb} (73%)
create mode 100644
meta/recipes-devtools/subversion/subversion-1.7.0/libtool2.patch
create mode 100644 meta/recipes-devtools/subversion/subversion_1.7.0.bb
rename meta/recipes-extended/time/{files = time-1.7}/debian.patch (100%)
rename meta/recipes-graphics/directfb/{directfb_1.4.12.bb =
directfb_1.4.15.bb} (63%)
delete mode 100644 meta/recipes-support/boost/boost-jam-native.inc
delete mode 100644 meta/recipes-support/boost/boost-jam-native_3.1.18.bb
rename meta/recipes-support/boost/{boost-36.inc = boost.inc} (88%)
rename meta/recipes-support/boost/{boost_1.44.0.bb = boost_1.47.0.bb} (66%)
delete mode 100644 meta/recipes-support/boost/files/1.34.1-gcc43.patch
delete mode 100644
meta/recipes-support/boost/files/atomic_count_gcc_atomicity.patch
delete mode 100644 meta/recipes-support/boost/files/gcc41.patch
delete mode 100644
[OE-core] [CONSOLIDATED PULL 01/21] dhcp: generate initial leases files for server
From: Otavio Salvador ota...@ossystems.com.br
If not using the init script it fails as the leases are created by it.
When used with systemd, this fails without the leases thus this allows
it to work out of box.
Signed-off-by: Otavio Salvador ota...@ossystems.com.br
Added commit meesage from Otavio's email
Signed-off-by: Saul Wold s...@linux.intel.com
---
meta/recipes-connectivity/dhcp/dhcp.inc |9 -
meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb |2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-connectivity/dhcp/dhcp.inc
b/meta/recipes-connectivity/dhcp/dhcp.inc
index 1cc529d..f9d80e7 100644
--- a/meta/recipes-connectivity/dhcp/dhcp.inc
+++ b/meta/recipes-connectivity/dhcp/dhcp.inc
@@ -51,13 +51,15 @@ do_install_append () {
mv ${D}${sbindir}/dhclient ${D}${base_sbindir}/
fi
install -m 0755 ${S}/client/scripts/linux
${D}${base_sbindir}/dhclient-script
+
+ install -d ${D}${localstatedir}/lib/dhcp/
}
PACKAGES += dhcp-server dhcp-server-config dhcp-client dhcp-relay
dhcp-omshell
FILES_${PN} =
-FILES_dhcp-server = ${sbindir}/dhcpd ${sysconfdir}/init.d/dhcp-server
+FILES_dhcp-server = ${sbindir}/dhcpd ${sysconfdir}/init.d/dhcp-server
${localstatedir}/lib/dhcp/
RRECOMMENDS_dhcp-server = dhcp-server-config
FILES_dhcp-server-config = ${sysconfdir}/default/dhcp-server
${sysconfdir}/dhcp/dhcpd.conf
@@ -68,3 +70,8 @@ FILES_dhcp-client = ${base_sbindir}/dhclient
${base_sbindir}/dhclient-script ${
RDEPENDS_dhcp-client = bash
FILES_dhcp-omshell = ${bindir}/omshell
+
+pkg_postinst_dhcp-server() {
+touch $D/${localstatedir}/lib/dhcp/dhcpd.leases
+touch $D/${localstatedir}/lib/dhcp/dhcpd6.leases
+}
diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb
b/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb
index 8ed7d76..2471d61 100644
--- a/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb
+++ b/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb
@@ -1,6 +1,6 @@
require dhcp.inc
-PR = r3
+PR = r4
SRC_URI += file://fixincludes.patch \
file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \
--
1.7.6.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 02/21] qt4-x11-free: bring back pkg-config fixups
From: Simon Busch morp...@gravedo.de
* With b40b9c024be5e1ec81a31961158b3e6b529acfe0 some pkg-config fixups where
removed from
qt4.inc which breaks the pkg-config files for qt4-embedded. Without that the
pkg-config
files for qt4-x11-free are broken. So this patch puts the fixes into the
qt4-x11-free.inc
file to be used by qt4-x11-free and not qt4-embedded.
* Resending because nobody replied on
http://www.mail-archive.com/openembedded-core@lists.openembedded.org/msg10609.html
Signed-off-by: Simon Busch morp...@gravedo.de
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta/recipes-qt/qt4/qt4-x11-free.inc | 16 +++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc
b/meta/recipes-qt/qt4/qt4-x11-free.inc
index f391028..04b7885 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
@@ -5,7 +5,7 @@ HOMEPAGE = http://qt.nokia.com;
SECTION = x11/libs
DEPENDS += virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender
libxrandr libxcursor
-INC_PR = r32
+INC_PR = r33
QT_GLFLAGS ?= ${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl',
'-no-opengl', d)}
QT_GLFLAGS_qemux86 = -opengl
@@ -16,3 +16,17 @@ QT_BASE_LIB ?= libqt
inherit qt4x11
+do_install_append() {
+ # fix pkgconfig, libtool and prl files
+ sed -i -e 's#I/usr/include#Iincludedir}#g' \
+-e 's#Iin#I${in#g' \
+${D}${libdir}/*.la ${D}${libdir}/*.prl ${D}${libdir}/pkgconfig/*.pc
+
+ # QT abuses $includedir to point to its headers, which breaks pkgconfig
sysroot, so
+ # manually fix it up here:
+ for pc in ${D}${libdir}/pkgconfig/*.pc ; do
+sed -i -e s:prefix}include/${QT_BASE_NAME}/$(basename $pc
.pc):prefix}/include: \
+ -e s,Cflags: ,Cflags: -IP{includedir}/${QT_BASE_NAME}/$(basename $pc
.pc) , \
+ -e 's:IP{:I${:g' $pc
+ done
+}
--
1.7.6.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 04/21] pulseaudio-0.9.23: force ARM mode
From: Martin Jansa martin.ja...@gmail.com * this is just work around, should be tested again after upgrade to pulseaudio-1.1 * otherwise build for armv4t (om-gta02) fails with this: | /bin/sh ../arm-oe-linux-gnueabi-libtool --tag=CC --mode=compile arm-oe-linux-gnueabi-gcc -march=armv4t -mthumb -mthumb-interwork -mtune=arm920t --sysroot=/OE/shr-core/tmp/sysroots/om-gta02 -std=gnu99 -DHAVE_CONFIG_H -I. -I..-I../src -I../src -I../src/modules -I../src/modules -I../src/modules/rtp -I../src/modules/rtp -I../src/modules/gconf -I../src/modules/gconf -I../src/modules/bluetooth -I../src/modules/bluetooth -I../src/modules/oss -I../src/modules/oss -I../src/modules/alsa -I../src/modules/alsa -I../src/modules/raop -I../src/modules/raop -I../src/modules/x11 -I../src/modules/x11 -I../src/modules/jack -I../src/modules/jack -I../src/modules/echo-cancel -I../src/modules/echo-cancel -pthread -D_POSIX_PTHREAD_SEMANTICS -DPA_BUILDDIR=\/OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/pulseaudio-0.9.23-r6/pulseaudio-0.9.23/src\ -DPA_DLSEARCHPATH=\/usr/lib/pulse-0.9.23/modules\ -DPA_DEFAULT_CONFIG_DIR=\/etc/pulse\ -DPA_BINARY=\/usr/bin/pulseaudio\ -DPA_SYSTEM_RUNTIME_PATH=\/var/run/pulse\ -DPA_SYSTEM_CONFIG_PATH=\/var/lib/pulse\ -DPA_SYSTEM_STATE_PATH=\/var/lib/pulse\ -DAO_REQUIRE_CAS -DPULSE_LOCALEDIR=\/usr/share/locale\ -DPA_MACHINE_ID=\/var/lib/dbus/machine-id\ -DPA_ALSA_PATHS_DIR=\/usr/share/pulseaudio/alsa-mixer/paths\ -DPA_ALSA_PROFILE_SETS_DIR=\/usr/share/pulseaudio/alsa-mixer/profile-sets\ -O2 -pipe -g -feliminate-unused-debug-types -Wall -W -Wextra -pipe -Wno-long-long -Winline -Wvla -Wno-overlength-strings -Wunsafe-loop-optimizations -Wundef -Wformat=2 -Wlogical-op -Wsign-compare -Wformat-security -Wmissing-include-dirs -Wformat-nonliteral -Wold-style-definition -Wpointer-arith -Winit-self -Wdeclaration-after-statement -Wfloat-equal -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-declarations -Wmissing-noreturn -Wshadow -Wendif-labels -Wcast-align -Wstrict-aliasing=2 -Wwrite-strings -Wno-unused-parameter -ffast-math -Wp,-D_FORTIFY_SOURCE=2 -fno-common -fdiagnostics-show-option -c -o libbluetooth_sbc_la-sbc.lo `test -f 'modules/bluetooth/sbc.c' || echo './'`modules/bluetooth/sbc.ci | arm-oe-linux-gnueabi-libtool: compile: arm-oe-linux-gnueabi-gcc -march=armv4t -mthumb -mthumb-interwork -mtune=arm920t --sysroot=/OE/shr-core/tmp/sysroots/om-gta02 -std=gnu99 -DHAVE_CONFIG_H -I. -I.. -I../src -I../src -I../src/modules -I../src/modules -I../src/modules/rtp -I../src/modules/rtp -I../src/modules/gconf -I../src/modules/gconf -I../src/modules/bluetooth -I../src/modules/bluetooth -I../src/modules/oss -I../src/modules/oss -I../src/modules/alsa -I../src/modules/alsa -I../src/modules/raop -I../src/modules/raop -I../src/modules/x11 -I../src/modules/x11 -I../src/modules/jack -I../src/modules/jack -I../src/modules/echo-cancel -I../src/modules/echo-cancel -pthread -D_POSIX_PTHREAD_SEMANTICS -DPA_BUILDDIR=\/OE/shr-core/tmp/work/armv4t-oe-linux-gnueabi/pulseaudio-0.9.23-r6/pulseaudio-0.9.23/src\ -DPA_DLSEARCHPATH=\/usr/lib/pulse-0.9.23/modules\ -DPA_DEFAULT_CONFIG_DIR=\/etc/pulse\ -DPA_BINARY=\/usr/bin/pulseaudio\ -DPA_SYSTEM_RUNTIME_PATH=\/var/run/pulse\ -DPA_SYSTEM_CONFIG_PATH=\/var/lib/pulse\ -DPA_SYSTEM_STATE_PATH=\/var/lib/pulse\ -DAO_REQUIRE_CAS -DPULSE_LOCALEDIR=\/usr/share/locale\ -DPA_MACHINE_ID=\/var/lib/dbus/machine-id\ -DPA_ALSA_PATHS_DIR=\/usr/share/pulseaudio/alsa-mixer/paths\ -DPA_ALSA_PROFILE_SETS_DIR=\/usr/share/pulseaudio/alsa-mixer/profile-sets\ -O2 -pipe -g -feliminate-unused-debug-types -Wall -W -Wextra -pipe -Wno-long-long -Winline -Wvla -Wno-overlength-strings -Wunsafe-loop-optimizations -Wundef -Wformat=2 -Wlogical-op -Wsign-compare -Wformat-security -Wmissing-include-dirs -Wformat-nonliteral -Wold-style-definition -Wpointer-arith -Winit-self -Wdeclaration-after-statement -Wfloat-equal -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-declarations -Wmissing-noreturn -Wshadow -Wendif-labels -Wcast-align -Wstrict-aliasing=2 -Wwrite-strings -Wno-unused-parameter -ffast-math -Wp,-D_FORTIFY_SOURCE=2 -fno-common -fdiagnostics-show-option -c modules/bluetooth/sbc.c -fPIC -DPIC -o .libs/libbluetooth_sbc_la-sbc.oi | modules/bluetooth/sbc.c: In function 'sbc_synthesize_four': | modules/bluetooth/sbc.c:553:18: warning: declaration of 'tmp' shadows a previous local [-Wshadow] | modules/bluetooth/sbc.c:553:18: warning: shadowed declaration is here [-Wshadow] | modules/bluetooth/sbc.c:553:18: warning: declaration of 'tmp' shadows a previous local [-Wshadow] | modules/bluetooth/sbc.c:553:18: warning: shadowed declaration is here [-Wshadow] | modules/bluetooth/sbc.c:553:18: warning: declaration of 'tmp' shadows a previous local [-Wshadow] | modules/bluetooth/sbc.c:553:18: warning: shadowed declaration is here [-Wshadow] | modules/bluetooth/sbc.c:553:18: warning: declaration of 'tmp' shadows a previous local [-Wshadow] | modules/bluetooth/sbc.c:553:18: warning: shadowed
[OE-core] [CONSOLIDATED PULL 03/21] libatomics-ops: force ARM mode
From: Martin Jansa martin.ja...@gmail.com
* otherwise ie spitz (armv5te) build fails with:
| make[3]: Entering directory
`/OE/shr-core/tmp/work/armv5te-oe-linux-gnueabi/libatomics-ops-1.2-r5/libatomic_ops-1.2/src'
| arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mthumb-interwork
-mtune=xscale --sysroot=/OE/shr-core/tmp/sysroots/spitz -DHAVE_CONFIG_H -I.
-fPIC -O
2 -pipe -g -feliminate-unused-debug-types -DNDEBUG -c atomic_ops.c
| arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mthumb-interwork
-mtune=xscale --sysroot=/OE/shr-core/tmp/sysroots/spitz -DHAVE_CONFIG_H -I.
-fPIC -O
2 -pipe -g -feliminate-unused-debug-types -DNDEBUG -c atomic_ops_stack.c
| arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mthumb-interwork
-mtune=xscale --sysroot=/OE/shr-core/tmp/sysroots/spitz -DHAVE_CONFIG_H -I.
-fPIC -O
2 -pipe -g -feliminate-unused-debug-types -DNDEBUG -c atomic_ops_malloc.c
| atomic_ops_malloc.c: In function 'msb':
| atomic_ops_malloc.c:223:2: warning: right shift count = width of type
[enabled by default]
| rm -f libatomic_ops_gpl.a
| ar cru libatomic_ops_gpl.a atomic_ops_stack.o atomic_ops_malloc.o
| arm-oe-linux-gnueabi-ranlib libatomic_ops_gpl.a
| {standard input}: Assembler messages:
| {standard input}:286: Error: selected processor does not support Thumb mode
`swp r1,r2,[r3]'
| {standard input}:329: Error: selected processor does not support Thumb mode
`swp r0,r1,[r3]'
* this is just work around, proper fix proposed by Henning Heinold
hm we should think of reworking this recipe now. Because since gcc 4.5
pulseaudio for arm can use the gcc internal atomicstuff and in oe-core
and meta-oe we have 4.5 or 4.6 only. The lib is
only needed for mips and it is still the old release, on cvs
is a much better version, which supports thumb too, if
remember correctly.
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
.../pulseaudio/libatomics-ops_1.2.bb |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-multimedia/pulseaudio/libatomics-ops_1.2.bb
b/meta/recipes-multimedia/pulseaudio/libatomics-ops_1.2.bb
index ab7ccbe..e5432f7 100644
--- a/meta/recipes-multimedia/pulseaudio/libatomics-ops_1.2.bb
+++ b/meta/recipes-multimedia/pulseaudio/libatomics-ops_1.2.bb
@@ -6,7 +6,7 @@ LICENSE = GPLv2 MIT
LIC_FILES_CHKSUM = file://doc/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://doc/LICENSING.txt;md5=607073e04548eac7d1f763e480477bab \
-PR = r6
+PR = r7
SRC_URI =
http://www.hpl.hp.com/research/linux/atomic_ops/download/libatomic_ops-${PV}.tar.gz
\
file://fedora/libatomic_ops-1.2-ppclwzfix.patch \
--
1.7.6.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 05/21] aspell: force ARM mode
From: Martin Jansa martin.ja...@gmail.com
* this is just work around for ICE, better fix would be to fix gcc
| ./common/fstream.hpp:23:9: note: the mangling of 'va_list' has changed in GCC
4.4
| modules/speller/default/typo_editdist.cpp: In function 'short int
aspeller::typo_edit_distance(acommon::ParmString, acommon::ParmString, const
aspeller::TypoEditDistanceInfo)':
| modules/speller/default/typo_editdist.cpp:77:3: internal compiler error: in
gen_thumb_movhi_clobber, at config/arm/arm.md:5937
| Please submit a full bug report,
| with preprocessed source if appropriate.
| See http://gcc.gnu.org/bugs.html for instructions.
| make[1]: *** [modules/speller/default/typo_editdist.lo] Error 1
| make[1]: *** Waiting for unfinished jobs
| make[1]: Leaving directory
`/OE/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/aspell-0.60.6.1-r0/aspell-0.60.6.1'
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta/recipes-support/aspell/aspell_0.60.6.1.bb |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-support/aspell/aspell_0.60.6.1.bb
b/meta/recipes-support/aspell/aspell_0.60.6.1.bb
index d773ee3..596cdf6 100644
--- a/meta/recipes-support/aspell/aspell_0.60.6.1.bb
+++ b/meta/recipes-support/aspell/aspell_0.60.6.1.bb
@@ -6,7 +6,7 @@ DESCRIPTION = GNU Aspell spell-checker
SECTION = console/utils
LICENSE=LGPLv2 | LGPLv2.1
LIC_FILES_CHKSUM = file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34
-PR = r0
+PR = r1
PACKAGES += libaspell libpspell libpspell-dev aspell-utils
FILES_${PN}-dbg += ${libdir}/aspell-0.60/.debu*
--
1.7.6.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 07/21] subversion: add 1.7.0 with native support and negative D_P for now
From: Martin Jansa martin.ja...@gmail.com
* intentionaly with negative D_P, bitbake fetcher should be improved to
detect old checkout with newer subversion available or vice versa and
do svn upgrade automaticaly or show better error, but subversion as
client for target or -native for distributions which explicitly say
they want 1.7 (with PREFERRED_VERSION) can be available already from
oe-core.
* be aware that checkouts from 1.7.0 are not compatible with older
subversion clients (ie when builder populating distro PREMIRROR is
using 1.7.0 all builders need to have also 1.7.0)
* and also 1.7.0 client needs to call svn upgrade in checkout first in
order to use it (so if PREMIRROR has tarball from 1.6.x it won't work
on client using 1.7.0 unless fetcher2 is improved to detect this and
call svn upgrade)
* tested on SHR distribution
http://wiki.shr-project.org/trac/wiki/Building%20SHR#subversion1.7inshr-chroot
* only missing part is to add subversion-native dependency, so that
native subversion is built, before building ie elementary (because EFL
are using svnversion from configure.ac to detect source revision and
.svn dir needs to be from compatible version).
* read http://subversion.apache.org/docs/release-notes/1.7.html
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
.../subversion/subversion-1.7.0/libtool2.patch | 15
.../subversion/subversion_1.7.0.bb | 37
2 files changed, 52 insertions(+), 0 deletions(-)
create mode 100644
meta/recipes-devtools/subversion/subversion-1.7.0/libtool2.patch
create mode 100644 meta/recipes-devtools/subversion/subversion_1.7.0.bb
diff --git a/meta/recipes-devtools/subversion/subversion-1.7.0/libtool2.patch
b/meta/recipes-devtools/subversion/subversion-1.7.0/libtool2.patch
new file mode 100644
index 000..5cd572b
--- /dev/null
+++ b/meta/recipes-devtools/subversion/subversion-1.7.0/libtool2.patch
@@ -0,0 +1,15 @@
+Upstream-Status: Inappropriate [embedded specific]
+
+--- a/configure.ac 2011-10-20 21:56:02.230663987 +0200
b/configure.ac 2011-08-17 15:01:30.0 +0200
+@@ -227,8 +227,8 @@
+ LIBTOOL=$sh_libtool
+ SVN_LIBTOOL=$sh_libtool
+ else
+- sh_libtool=$abs_builddir/libtool
+- SVN_LIBTOOL=\$(SHELL) $sh_libtool
++ sh_libtool=$abs_builddir/$host_alias-libtool
++ SVN_LIBTOOL=\$(SHELL) \$(abs_builddir)/$host_alias-libtool
+ fi
+ AC_SUBST(SVN_LIBTOOL)
+
diff --git a/meta/recipes-devtools/subversion/subversion_1.7.0.bb
b/meta/recipes-devtools/subversion/subversion_1.7.0.bb
new file mode 100644
index 000..396b35b
--- /dev/null
+++ b/meta/recipes-devtools/subversion/subversion_1.7.0.bb
@@ -0,0 +1,37 @@
+DESCRIPTION = The Subversion (svn) client
+SECTION = console/network
+DEPENDS = apr-util neon
+RDEPENDS_${PN} = neon
+LICENSE = Apache-2
+HOMEPAGE = http://subversion.tigris.org;
+
+BBCLASSEXTEND = native
+
+# negative, because of new checkout format in 1.7.0
+# and distro PREMIRRORs need to be in sync with users
+DEFAULT_PREFERENCE = -1
+
+SRC_URI = ${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
+ file://libtool2.patch \
+
+SRC_URI[md5sum] = 930e6644a1b6094efd268fde6a318f04
+SRC_URI[sha256sum] =
64fd5f263a80e609717a3ca42f1f2625606a5c4a40a85716f82c866033780978
+
+LIC_FILES_CHKSUM = file://LICENSE;md5=4a14fd2da3134e40a087eb4326a4ecd4
+
+EXTRA_OECONF = \
+--without-berkeley-db --without-apxs --without-apache \
+--without-swig --with-apr=${STAGING_BINDIR_CROSS} \
+--with-apr-util=${STAGING_BINDIR_CROSS}
+
+inherit autotools
+
+export LDFLAGS += -L${STAGING_LIBDIR}
+
+acpaths = -I build/ -I build/ac-macros/
+
+do_configure_prepend () {
+ rm -f ${S}/libtool
+ rm -f ${S}/build/libtool.m4
+ sed -i -e 's:with_sasl=/usr/local:with_sasl=${STAGING_DIR}:'
${S}/build/ac-macros/sasl.m4
+}
--
1.7.6.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 08/21] base.bbclass: add subversion-native to DEPENDS if there is svn:// in SRC_URI
From: Martin Jansa martin.ja...@gmail.com
* in some cases this could cause circual dependency (ie if we decide to
apr_svn.bb or something like that before subversion-native in dependency
tree), Saul said he had such case, but I wasn't able to reproduce it
here (here it builds subversion-native-1.7.0 fine).
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta/classes/base.bbclass |8 +++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index f3f798f..ba1f230 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -401,8 +401,14 @@ python () {
bb.note(SKIPPING %s because it's %s % (pn, this_license))
raise bb.parse.SkipPackage(incompatible with license %s
% this_license)
-# Git packages should DEPEND on git-native
srcuri = d.getVar('SRC_URI', 1)
+# Svn packages should DEPEND on subversion-native
+if svn:// in srcuri:
+depends = d.getVarFlag('do_fetch', 'depends') or
+depends = depends + subversion-native:do_populate_sysroot
+d.setVarFlag('do_fetch', 'depends', depends)
+
+# Git packages should DEPEND on git-native
if git:// in srcuri:
depends = d.getVarFlag('do_fetch', 'depends') or
depends = depends + git-native:do_populate_sysroot
--
1.7.6.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 13/21] util-linux: add missing u-a calls for setsid chrt
From: Martin Jansa martin.ja...@gmail.com
* someone added them to usrbinprogs_a, but without u-a calls added
* similar problem is with chfn chsh newgrp, but those are not built in
current version
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta/recipes-core/util-linux/util-linux.inc |4
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-core/util-linux/util-linux.inc
b/meta/recipes-core/util-linux/util-linux.inc
index 3b80736..855a545 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -191,6 +191,8 @@ pkg_postinst_${PN} () {
update-alternatives --install ${bindir}/mesg mesg mesg.${PN} 100
update-alternatives --install ${bindir}/renice renice renice.${PN} 100
update-alternatives --install ${bindir}/wall wall wall.${PN} 100
+ update-alternatives --install ${bindir}/setsid setsid setsid.${PN} 100
+ update-alternatives --install ${bindir}/chrt chrt chrt.${PN} 100
update-alternatives --install ${bindir}/flock flock flock.${PN} 100
# There seems to be problem, atleast on nslu2, with these, untill they
are
@@ -221,6 +223,8 @@ pkg_prerm_${PN} () {
update-alternatives --remove mesg mesg.${PN}
update-alternatives --remove renice renice.${PN}
update-alternatives --remove wall wall.${PN}
+ update-alternatives --remove setsid setsid.${PN}
+ update-alternatives --remove chrt chrt.${PN}
update-alternatives --remove flock flock.${PN}
}
--
1.7.6.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 20/21] bitbake.conf: Update ASSUME_PROVIDED
* Remove an obsolete comment about mercurial
* Remove cvs-native since we have removed cvs SRC_URIs
* Fix svn-native - subversion since that's the correct dependency name
* Add git-native since it's a core functionality and gnu-config requires it
and can cause a circular dependency.
Signed-off-by: Saul Wold s...@linux.intel.com
---
meta/conf/bitbake.conf |7 ++-
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 0d6b3b8..ffd7a85 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -146,18 +146,15 @@ DATETIME = ${DATE}${TIME}
# python-native should be here but python relies on building
# its own in staging
-# mercurial-native is required to pull mercurial repositories (hg://...)
-# we don't have it yet in the recipies so let's assume it's provided by
-# the underlying OS
ASSUME_PROVIDED = \
bzip2-native \
-cvs-native \
grep-native \
diffstat-native \
+git-native \
patch-native \
perl-native-runtime \
python-native-runtime \
-svn-native \
+subversion-native \
tar-native \
texinfo-native \
virtual/libintl-native \
--
1.7.6.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 19/21] boost: Update to 1.47.0 Cleanup
Removed boost-jam-native since it was an older version
no incompatible with boost 1.47.
Modified boost to use BBCLASSEXTEND native for the bjam
native binary.
Removed older unused patches.
Signed-off-by: Saul Wold s...@linux.intel.com
---
meta/recipes-support/boost/boost-jam-native.inc| 32 ---
.../boost/boost-jam-native_3.1.18.bb |8 -
.../boost/{boost-36.inc = boost.inc} | 42 +++-
.../boost/{boost_1.44.0.bb = boost_1.47.0.bb} | 13 +-
.../recipes-support/boost/files/1.34.1-gcc43.patch | 226 -
.../boost/files/atomic_count_gcc_atomicity.patch | 15 --
meta/recipes-support/boost/files/gcc41.patch | 16 --
meta/recipes-support/boost/files/gcc43.patch | 258
.../recipes-support/boost/files/linux-uclibc.patch | 12 -
.../boost/files/unit_test_log10f.patch | 22 --
10 files changed, 43 insertions(+), 601 deletions(-)
delete mode 100644 meta/recipes-support/boost/boost-jam-native.inc
delete mode 100644 meta/recipes-support/boost/boost-jam-native_3.1.18.bb
rename meta/recipes-support/boost/{boost-36.inc = boost.inc} (88%)
rename meta/recipes-support/boost/{boost_1.44.0.bb = boost_1.47.0.bb} (66%)
delete mode 100644 meta/recipes-support/boost/files/1.34.1-gcc43.patch
delete mode 100644
meta/recipes-support/boost/files/atomic_count_gcc_atomicity.patch
delete mode 100644 meta/recipes-support/boost/files/gcc41.patch
delete mode 100644 meta/recipes-support/boost/files/gcc43.patch
delete mode 100644 meta/recipes-support/boost/files/linux-uclibc.patch
delete mode 100644 meta/recipes-support/boost/files/unit_test_log10f.patch
diff --git a/meta/recipes-support/boost/boost-jam-native.inc
b/meta/recipes-support/boost/boost-jam-native.inc
deleted file mode 100644
index c5a9d99..000
--- a/meta/recipes-support/boost/boost-jam-native.inc
+++ /dev/null
@@ -1,32 +0,0 @@
-# The Boost web site provides free peer-reviewed portable
-# C++ source libraries. The emphasis is on libraries which
-# work well with the C++ Standard Library. The libraries are
-# intended to be widely useful, and are in regular use by
-# thousands of programmers across a broad spectrum of applications.
-DESCRIPTION = Make system for boost (native)
-HOMEPAGE = http://www.boost.org/;
-SECTION = devel
-LICENSE = Boost
-INC_PR = r1
-
-LIC_FILES_CHKSUM =
file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c
-
-SRC_URI = ${SOURCEFORGE_MIRROR}/boost/boost-jam-${PV}.tgz
-S = ${WORKDIR}/boost-jam-${PV}
-
-inherit native
-
-do_compile() {
- set -ex
- rm -rf bin.*
- ./build.sh gcc
-}
-
-# This is too terrible - the build script doesn't give any good
-# way I can see to find out where the binaries are placed, so
-# rely on only one bin.foo directory being created.
-do_install () {
- set -ex
- install -d ${D}${bindir}/
- install -c -m 755 bin.*/bjam ${D}${bindir}/
-}
diff --git a/meta/recipes-support/boost/boost-jam-native_3.1.18.bb
b/meta/recipes-support/boost/boost-jam-native_3.1.18.bb
deleted file mode 100644
index 7a0b1a8..000
--- a/meta/recipes-support/boost/boost-jam-native_3.1.18.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-include boost-jam-native.inc
-
-PR = ${INC_PR}.0
-
-SRC_URI = ${SOURCEFORGE_MIRROR}/boost/boost-jam-${PV}.tgz
-
-SRC_URI[md5sum] = f790e022d658db38db5cc4aeeccad3f1
-SRC_URI[sha256sum] =
85dbb72c29837ba89cb5408782c82459b34fdecaedea8b54ce1cb3cb9990121a
diff --git a/meta/recipes-support/boost/boost-36.inc
b/meta/recipes-support/boost/boost.inc
similarity index 88%
rename from meta/recipes-support/boost/boost-36.inc
rename to meta/recipes-support/boost/boost.inc
index 8b0622f..ddb65b7 100644
--- a/meta/recipes-support/boost/boost-36.inc
+++ b/meta/recipes-support/boost/boost.inc
@@ -6,15 +6,22 @@
DESCRIPTION = Free peer-reviewed portable C++ source libraries
HOMEPAGE = http://www.boost.org/;
SECTION = libs
-DEPENDS = boost-jam-native zlib
+DEPENDS = boost-native zlib
+DEPENDS_virtclass-native =
LICENSE = Boost
-PR = r4
ARM_INSTRUCTION_SET = arm
+
BOOST_VER = ${@_.join(d.getVar(PV,1).split(.))}
BOOST_MAJ = ${@_.join(d.getVar(PV,1).split(.)[0:2])}
BOOST_P = boost_${BOOST_VER}
+INC_PR = r0
+
+SRC_URI = ${SOURCEFORGE_MIRROR}/${BPN}/${BOOST_P}.tar.bz2
+
+S = ${WORKDIR}/${BOOST_P}
+
BOOST_LIBS = \
date_time \
filesystem \
@@ -37,8 +44,6 @@ BOOST_LIBS = \
#PYTHON_ROOT = ${STAGING_DIR_HOST}/${prefix}
#PYTHON_VERSION = 2.5
-S = ${WORKDIR}/${BOOST_P}
-
# Make a package for each library, plus -dev
PACKAGES = ${PN}-dbg ${BOOST_PACKAGES}
python __anonymous () {
@@ -148,3 +153,32 @@ do_install() {
--includedir=${D}${includedir} \
install
}
+
+BBCLASSEXTEND = native
+
+do_configure_virtclass-native() {
+ :
+}
+
+do_boostconfig_virtclass-native() {
+ :
+}
+
+do_compile_virtclass-native() {
+ set -ex
+ cd ${S}/tools/build/v2/engine
+ rm -rf bin.*
+ ./build.sh gcc
+}
+
+# This is too
[OE-core] [CONSOLIDATED PULL 17/21] file: update to 5.09
Signed-off-by: Saul Wold s...@linux.intel.com
---
.../file/file/fix_version_check.patch | 21
.../file/{file_5.04.bb = file_5.09.bb}|9 +++
2 files changed, 25 insertions(+), 5 deletions(-)
create mode 100644 meta/recipes-devtools/file/file/fix_version_check.patch
rename meta/recipes-devtools/file/{file_5.04.bb = file_5.09.bb} (79%)
diff --git a/meta/recipes-devtools/file/file/fix_version_check.patch
b/meta/recipes-devtools/file/file/fix_version_check.patch
new file mode 100644
index 000..bd24ccb
--- /dev/null
+++ b/meta/recipes-devtools/file/file/fix_version_check.patch
@@ -0,0 +1,21 @@
+Since we are cross-compiling and need to have a cover script this
+version check sees file.real-5.09 not file-5.09, so fix the
+sed.
+
+Upstream-Status: Inapproriate [build-specific]
+
+Signed-off-by: Saul Wold s...@linux.intel.com
+
+Index: file-5.09/magic/Makefile.am
+===
+--- file-5.09.orig/magic/Makefile.am
file-5.09/magic/Makefile.am
+@@ -260,7 +260,7 @@ ${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_D
+ @(if expr ${FILE_COMPILE} : '.*/.*' /dev/null; then \
+ echo Using ${FILE_COMPILE} to generate ${MAGIC} /dev/null; \
+ else \
+- v=$$(file --version | sed -e s/file-// -e q); \
++ v=$$(file --version | sed -e s/file.real-// -e q); \
+ if [ $$v != ${PACKAGE_VERSION} ]; then \
+ echo Cannot use the installed version of file ($$v) to; \
+ echo cross-compile file ${PACKAGE_VERSION}; \
diff --git a/meta/recipes-devtools/file/file_5.04.bb
b/meta/recipes-devtools/file/file_5.09.bb
similarity index 79%
rename from meta/recipes-devtools/file/file_5.04.bb
rename to meta/recipes-devtools/file/file_5.09.bb
index 1f9c78e..9b2f3a4 100644
--- a/meta/recipes-devtools/file/file_5.04.bb
+++ b/meta/recipes-devtools/file/file_5.09.bb
@@ -10,16 +10,15 @@ LIC_FILES_CHKSUM =
file://COPYING;beginline=2;md5=6a7382872edb68d33e1a9398b6e03
DEPENDS = zlib file-native
DEPENDS_virtclass-native = zlib-native
-PR = r2
+PR = r0
SRC_URI = ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \
- file://stringb-compat.patch \
- file://ge-le.patch \
+ file://fix_version_check.patch \
file://dump \
file://filesystems
-SRC_URI[md5sum] = accade81ff1cc774904b47c72c8aeea0
-SRC_URI[sha256sum] =
4c9e6e7994e74cb3386374ae91b055d26ac96b9d3e82fd157ae2d62e87a4260c
+SRC_URI[md5sum] = 6fd7cd6c4281e68fe9ec6644ce0fac6f
+SRC_URI[sha256sum] =
bde1c9830ee6c234871778faae8277fdcf775fbb16dea63c8251e24b7c2f869c
inherit autotools
--
1.7.6.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 18/21] gnu-config: update to git HEAD
Licence has update timestamp and Copyright year.
This change needs a coresponding change to ASSUME_PROVIDED
to add git-native
Signed-off-by: Saul Wold s...@linux.intel.com
---
.../gnu-config/config-guess-uclibc.patch | 145 +---
.../{gnu-config_20080123.bb = gnu-config_git.bb} | 15 +-
2 files changed, 75 insertions(+), 85 deletions(-)
rename meta/recipes-devtools/gnu-config/{gnu-config_20080123.bb =
gnu-config_git.bb} (73%)
diff --git
a/meta/recipes-devtools/gnu-config/gnu-config/config-guess-uclibc.patch
b/meta/recipes-devtools/gnu-config/gnu-config/config-guess-uclibc.patch
index f862c83..dc15d91 100644
--- a/meta/recipes-devtools/gnu-config/gnu-config/config-guess-uclibc.patch
+++ b/meta/recipes-devtools/gnu-config/gnu-config/config-guess-uclibc.patch
@@ -4,12 +4,14 @@ Patch courtesy
gentoo-portage/sys-devel/gnuconfig/files/automake-1.8.5-config-gu
updated to 20050516 by Marcin 'Hrw' Juszkiewicz (by hand)
updated to 20080123 by Nitin A Kamble (by hand)
+updated to 20111001 by Saul Wold (by hand)
+Signed-off-by: Saul Wold s...@linux.intel.com
-Index: config/config.guess
+Index: git/config.guess
===
config.orig/config.guess
-+++ config/config.guess
-@@ -139,6 +139,19 @@ UNAME_RELEASE=`(uname -r) 2/dev/null` |
+--- git.orig/config.guess 2011-10-20 15:15:25.0 -0700
git/config.guess 2011-10-20 16:56:43.810830229 -0700
+@@ -140,6 +140,19 @@
UNAME_SYSTEM=`(uname -s) 2/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2/dev/null` || UNAME_VERSION=unknown
@@ -29,14 +31,26 @@ Index: config/config.guess
# Note: order is significant - the case branches are not exclusive.
case ${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION} in
-@@ -840,13 +853,13 @@ EOF
+@@ -871,15 +884,15 @@
+ EV68*) UNAME_MACHINE=alphaev68 ;;
+ esac
+ objdump --private-headers /bin/sh | grep -q ld.so.1
+- if test $? = 0 ; then LIBC=libc1 ; else LIBC= ; fi
+- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++ if test $? = 0 ; then LIBC=gnulibc1 ; else LIBC= ; fi
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ arm*:Linux:*:*)
+ eval $set_cc_for_build
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2/dev/null \
| grep -q __ARM_EABI__
then
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
else
- echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2/dev/null \
+ | grep -q __ARM_PCS_VFP
+@@ -891,19 +904,19 @@
fi
exit ;;
avr32*:Linux:*:*)
@@ -44,13 +58,25 @@ Index: config/config.guess
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
cris:Linux:*:*)
- echo cris-axis-linux-gnu
-@@ -855,16 +868,16 @@ EOF
- echo crisv32-axis-linux-gnu
+- echo cris-axis-linux-gnu
++ echo cris-axis-linux-${LIBC}
+ exit ;;
+ crisv32:Linux:*:*)
+- echo crisv32-axis-linux-gnu
++ echo crisv32-axis-linux-${LIBC}
exit ;;
frv:Linux:*:*)
-- echo frv-unknown-linux-gnu
-+ echo frv-unknown-linux-${LIBC}
+- echo frv-unknown-linux-gnu
++ echo frv-unknown-linux-${LIBC}
+ exit ;;
+ hexagon:Linux:*:*)
+- echo hexagon-unknown-linux-gnu
++ echo hexagon-unknown-linux-${LIBC}
+ exit ;;
+ i*86:Linux:*:*)
+ LIBC=gnu
+@@ -917,13 +930,13 @@
+ echo ${UNAME_MACHINE}-pc-linux-${LIBC}
exit ;;
ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -64,21 +90,12 @@ Index: config/config.guess
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
- mips:Linux:*:*)
+ mips:Linux:*:* | mips64:Linux:*:*)
eval $set_cc_for_build
-@@ -887,7 +900,7 @@ EOF
- s: ::g
- p
- }'`
-- test x${CPU} != x { echo ${CPU}-unknown-linux-gnu; exit; }
-+ test x${CPU} != x { echo ${CPU}-unknown-linux-${LIBC}; exit; }
- ;;
- mips64:Linux:*:*)
- eval $set_cc_for_build
-@@ -910,16 +923,16 @@ EOF
- s: ::g
- p
- }'`
+@@ -942,54 +955,54 @@
+ #endif
+ EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2/dev/null | grep '^CPU'`
- test x${CPU} != x { echo ${CPU}-unknown-linux-gnu; exit; }
+ test x${CPU} != x { echo ${CPU}-unknown-linux-${LIBC}; exit; }
;;
@@ -86,24 +103,13 @@ Index: config/config.guess
- echo or32-unknown-linux-gnu
+ echo or32-unknown-linux-${LIBC}
exit ;;
- ppc:Linux:*:*)
-- echo powerpc-unknown-linux-gnu
-+ echo powerpc-unknown-linux-${LIBC}
- exit ;;
- ppc64:Linux:*:*)
-- echo powerpc64-unknown-linux-gnu
-+ echo powerpc64-unknown-linux-${LIBC}
+ padre:Linux:*:*)
+- echo
