* [meta-oe][PATCH 0/5] Small fixes [not found] <]> @ 2012-08-30 9:13 ` Martin Jansa 2012-08-30 9:13 ` [meta-oe][PATCH 1/5] pixman: fix qemu workaround Martin Jansa ` (4 more replies) 0 siblings, 5 replies; 7+ messages in thread From: Martin Jansa @ 2012-08-30 9:13 UTC (permalink / raw) To: openembedded-devel Small fixes: * pixman to build emacs * systemd-systemctl-native to be able to have WantedBy=xserver-nodm.service * gpsd: to remove MACHINE var dependency from gpsd bbappend we had (changes sstate checksum for gpsd and all apps depending on it) * meta-gnome: gail as only virtual/gail provider is removed in oe-core already The following changes since commit cc5eda871fcb68fcd36d578b3fe4b52df2dac568: gcc: Delete gcc intermediate recipes (2012-08-28 17:21:06 +0200) are available in the git repository at: git://git.openembedded.org/meta-openembedded-contrib jansa/pull http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/pull Andreas Müller (1): pixman: fix qemu workaround Denis 'GNUtoo' Carikli (1): meta-systemd: systemd-systemctl-native: Also add support for WantedBy=*.service Martin Jansa (2): gpsd: add gpsd-machine-conf to RRECOMMENDS gpsd-machine-conf: add empty recipe for BSP layers to bbappend it Ross Burton (1): meta-gnome: replace virtual/gail dependency with gtk+ .../recipes-gnome/gnome/libgnomecanvas_2.20.0.bb | 2 +- .../libgnome/libgnomecanvas_2.26.0.bb | 2 +- meta-oe/conf/layer.conf | 1 + ...lated-workarounds-in-cpu-features-detecti.patch | 63 +++++++++++----------- .../xorg-lib/pixman_0.27.2.bbappend | 2 + .../gpsd/gpsd-machine-conf_1.0.bb | 7 +++ meta-oe/recipes-navigation/gpsd/gpsd_3.7.bb | 4 +- .../systemd/systemd-systemctl-native.bb | 2 +- .../systemd/systemd-systemctl-native/systemctl | 2 +- 9 files changed, 47 insertions(+), 38 deletions(-) create mode 100644 meta-oe/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb -- 1.7.12 ^ permalink raw reply [flat|nested] 7+ messages in thread
* [meta-oe][PATCH 1/5] pixman: fix qemu workaround 2012-08-30 9:13 ` [meta-oe][PATCH 0/5] Small fixes Martin Jansa @ 2012-08-30 9:13 ` Martin Jansa 2012-08-30 9:13 ` [meta-oe][PATCH 2/5] gpsd: add gpsd-machine-conf to RRECOMMENDS Martin Jansa ` (3 subsequent siblings) 4 siblings, 0 replies; 7+ messages in thread From: Martin Jansa @ 2012-08-30 9:13 UTC (permalink / raw) To: openembedded-devel From: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- ...lated-workarounds-in-cpu-features-detecti.patch | 63 +++++++++++----------- .../xorg-lib/pixman_0.27.2.bbappend | 2 + 2 files changed, 33 insertions(+), 32 deletions(-) diff --git a/meta-oe/recipes-graphics/xorg-lib/pixman-0.27.2/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch b/meta-oe/recipes-graphics/xorg-lib/pixman-0.27.2/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch index 8a1c524..4569dca 100644 --- a/meta-oe/recipes-graphics/xorg-lib/pixman-0.27.2/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch +++ b/meta-oe/recipes-graphics/xorg-lib/pixman-0.27.2/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch @@ -1,25 +1,27 @@ -From d140e69c1d76ed61d1feb53b79820951707ee5a6 Mon Sep 17 00:00:00 2001 +From a0f53e1dbb3851bb0f0efcfdbd565b05e4be9cac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Sun, 19 Aug 2012 15:15:45 +0200 +Date: Thu, 23 Aug 2012 18:10:57 +0200 Subject: [PATCH 1/2] ARM: qemu related workarounds in cpu features detection code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -This was ported from meta-oe's patch [1] +This was ported from meta-oe's patch [1]. The original pixman patch is found +at [2]. [1] http://cgit.openembedded.org/meta-openembedded/tree/meta-oe/recipes-graphics/xorg-lib/pixman-0.26.2/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch +[2] http://lists.freedesktop.org/archives/pixman/2011-January/000906.html Upstream-Status: Inappropriate [other] qemu fix Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> --- - pixman/pixman-arm.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++--- - 1 files changed, 69 insertions(+), 5 deletions(-) + pixman/pixman-arm.c | 82 ++++++++++++++++++++++++++++++++++++++++---------- + 1 files changed, 65 insertions(+), 17 deletions(-) diff --git a/pixman/pixman-arm.c b/pixman/pixman-arm.c -index 23374e4..d0771fd 100644 +index 23374e4..d98bda6 100644 --- a/pixman/pixman-arm.c +++ b/pixman/pixman-arm.c @@ -129,16 +129,35 @@ detect_cpu_features (void) @@ -58,40 +60,34 @@ index 23374e4..d0771fd 100644 fd = open ("/proc/self/auxv", O_RDONLY); if (fd >= 0) -@@ -147,22 +166,23 @@ detect_cpu_features (void) +@@ -147,32 +166,61 @@ detect_cpu_features (void) { if (aux.a_type == AT_HWCAP) { - uint32_t hwcap = aux.a_un.a_val; -+ hwcap = aux.a_un.a_val; - - /* hardcode these values to avoid depending on specific - * versions of the hwcap header, e.g. HWCAP_NEON - */ +- +- /* hardcode these values to avoid depending on specific +- * versions of the hwcap header, e.g. HWCAP_NEON +- */ - if ((hwcap & 64) != 0) -+ if ((hwcap & ARM_HWCAP_VFP) != 0) - features |= ARM_VFP; +- features |= ARM_VFP; - if ((hwcap & 512) != 0) -+ if ((hwcap & ARM_HWCAP_IWMMXT) != 0) - features |= ARM_IWMMXT; - /* this flag is only present on kernel 2.6.29 */ +- features |= ARM_IWMMXT; +- /* this flag is only present on kernel 2.6.29 */ - if ((hwcap & 4096) != 0) -+ if ((hwcap & ARM_HWCAP_NEON) != 0) - features |= ARM_NEON; +- features |= ARM_NEON; ++ hwcap = aux.a_un.a_val; } else if (aux.a_type == AT_PLATFORM) { - const char *plat = (const char*) aux.a_un.a_val; +- +- if (strncmp (plat, "v7l", 3) == 0) + plat = (const char*) aux.a_un.a_val; + plat_cnt++; - - if (strncmp (plat, "v7l", 3) == 0) - features |= (ARM_V7 | ARM_V6); -@@ -171,8 +191,52 @@ detect_cpu_features (void) - } - } - close (fd); -+ ++ } ++ } ++ close (fd); + if (plat == NULL || plat_cnt != 1 || *plat != 'v') + { + /* @@ -106,17 +102,19 @@ index 23374e4..d0771fd 100644 + { + if (strcmp (u.machine, "armv7l") == 0) + { -+ features |= (ARM_V7 | ARM_V6); + features |= (ARM_V7 | ARM_V6); +- else if (strncmp (plat, "v6l", 3) == 0) + hwcap |= ARM_HWCAP_VFP; /* qemu is supposed to emulate vfp */ + hwcap |= ARM_HWCAP_NEON; /* qemu is supposed to emulate neon */ + } + else if (strcmp (u.machine, "armv6l") == 0) + { -+ features |= ARM_V6; + features |= ARM_V6; + hwcap |= ARM_HWCAP_VFP; /* qemu is supposed to emulate vfp */ + } -+ } -+ } + } + } +- close (fd); + else if (strncmp (plat, "v7l", 3) == 0) + { + features |= (ARM_V7 | ARM_V6); @@ -134,6 +132,7 @@ index 23374e4..d0771fd 100644 + features |= ARM_VFP; + if ((hwcap & ARM_HWCAP_IWMMXT) != 0) + features |= ARM_IWMMXT; ++ /* this flag is only present on kernel 2.6.29 */ + if ((hwcap & ARM_HWCAP_NEON) != 0) + features |= ARM_NEON; + @@ -141,5 +140,5 @@ index 23374e4..d0771fd 100644 } -- -1.7.4.4 +1.7.6.5 diff --git a/meta-oe/recipes-graphics/xorg-lib/pixman_0.27.2.bbappend b/meta-oe/recipes-graphics/xorg-lib/pixman_0.27.2.bbappend index a04a549..c677167 100644 --- a/meta-oe/recipes-graphics/xorg-lib/pixman_0.27.2.bbappend +++ b/meta-oe/recipes-graphics/xorg-lib/pixman_0.27.2.bbappend @@ -1,5 +1,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:" +PRINC := "${@int(PRINC) + 1}" + SRC_URI += " \ file://0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch \ file://0002-Generic-C-implementation-of-pixman_blt-with-overlapp.patch \ -- 1.7.12 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [meta-oe][PATCH 2/5] gpsd: add gpsd-machine-conf to RRECOMMENDS 2012-08-30 9:13 ` [meta-oe][PATCH 0/5] Small fixes Martin Jansa 2012-08-30 9:13 ` [meta-oe][PATCH 1/5] pixman: fix qemu workaround Martin Jansa @ 2012-08-30 9:13 ` Martin Jansa 2012-08-30 9:13 ` [meta-oe][PATCH 3/5] gpsd-machine-conf: add empty recipe for BSP layers to bbappend it Martin Jansa ` (2 subsequent siblings) 4 siblings, 0 replies; 7+ messages in thread From: Martin Jansa @ 2012-08-30 9:13 UTC (permalink / raw) To: openembedded-devel * it could be something machine specific (config + hoooks) and we don't want gpsd sstate checksum depending on MACHINE var * gpsd-machine-conf itself is using u-a to select right config Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- meta-oe/conf/layer.conf | 1 + meta-oe/recipes-navigation/gpsd/gpsd_3.7.bb | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf index 550f8cf..dcacb32 100644 --- a/meta-oe/conf/layer.conf +++ b/meta-oe/conf/layer.conf @@ -28,4 +28,5 @@ SIGGEN_EXCLUDERECIPES_ABISAFE += " \ mplayer-common \ task-x11-server \ fbset-modes \ + gpsd-machine-conf \ " diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.7.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.7.bb index e8f4cad..eff0dcb 100644 --- a/meta-oe/recipes-navigation/gpsd/gpsd_3.7.bb +++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.7.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800" DEPENDS = "dbus dbus-glib ncurses python libusb1 chrpath-native" PROVIDES = "virtual/gpsd" -PR = "r0" +PR = "r1" SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \ file://0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch \ @@ -94,7 +94,7 @@ FILES_gpsd-dev += "${libdir}/pkgconfdir/libgpsd.pc ${libdir}/pkgconfdir/libgps.p FILES_python-pygps-dbg += " ${libdir}/python*/site-packages/gps/.debug" RDEPENDS_${PN} = "gpsd-gpsctl" -RRECOMMENDS_${PN} = "gpsd-conf gpsd-udev" +RRECOMMENDS_${PN} = "gpsd-conf gpsd-udev gpsd-machine-conf" DESCRIPTION_gpsd-udev = "udev relevant files to use gpsd hotplugging" FILES_gpsd-udev = "${base_libdir}/udev ${sysconfdir}/udev/*" -- 1.7.12 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [meta-oe][PATCH 3/5] gpsd-machine-conf: add empty recipe for BSP layers to bbappend it 2012-08-30 9:13 ` [meta-oe][PATCH 0/5] Small fixes Martin Jansa 2012-08-30 9:13 ` [meta-oe][PATCH 1/5] pixman: fix qemu workaround Martin Jansa 2012-08-30 9:13 ` [meta-oe][PATCH 2/5] gpsd: add gpsd-machine-conf to RRECOMMENDS Martin Jansa @ 2012-08-30 9:13 ` Martin Jansa 2012-08-30 9:13 ` [meta-oe][PATCH 4/5] meta-systemd: systemd-systemctl-native: Also add support for WantedBy=*.service Martin Jansa 2012-08-30 9:13 ` [meta-oe][PATCH 5/5] meta-gnome: replace virtual/gail dependency with gtk+ Martin Jansa 4 siblings, 0 replies; 7+ messages in thread From: Martin Jansa @ 2012-08-30 9:13 UTC (permalink / raw) To: openembedded-devel Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- meta-oe/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 meta-oe/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb diff --git a/meta-oe/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb b/meta-oe/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb new file mode 100644 index 0000000..2042383 --- /dev/null +++ b/meta-oe/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb @@ -0,0 +1,7 @@ +DESCRIPTION = "Machine specific gpsd config" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD;md5=3775480a712fc46a69647678acb234cb" + +# empty by default +# BSP layers can add stuff like meta-openmoko example: +# -- 1.7.12 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [meta-oe][PATCH 4/5] meta-systemd: systemd-systemctl-native: Also add support for WantedBy=*.service 2012-08-30 9:13 ` [meta-oe][PATCH 0/5] Small fixes Martin Jansa ` (2 preceding siblings ...) 2012-08-30 9:13 ` [meta-oe][PATCH 3/5] gpsd-machine-conf: add empty recipe for BSP layers to bbappend it Martin Jansa @ 2012-08-30 9:13 ` Martin Jansa 2012-08-30 9:13 ` [meta-oe][PATCH 5/5] meta-gnome: replace virtual/gail dependency with gtk+ Martin Jansa 4 siblings, 0 replies; 7+ messages in thread From: Martin Jansa @ 2012-08-30 9:13 UTC (permalink / raw) To: openembedded-devel From: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> Right now there was only WantedBy=*.target, which prevented some services from beeing installed, which prevent them from running at boot. Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- meta-systemd/recipes-core/systemd/systemd-systemctl-native.bb | 2 +- meta-systemd/recipes-core/systemd/systemd-systemctl-native/systemctl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-systemd/recipes-core/systemd/systemd-systemctl-native.bb b/meta-systemd/recipes-core/systemd/systemd-systemctl-native.bb index 25ddbda..5940584 100644 --- a/meta-systemd/recipes-core/systemd/systemd-systemctl-native.bb +++ b/meta-systemd/recipes-core/systemd/systemd-systemctl-native.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Wrapper to enable of systemd services" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" -PR = "r5" +PR = "r6" inherit native diff --git a/meta-systemd/recipes-core/systemd/systemd-systemctl-native/systemctl b/meta-systemd/recipes-core/systemd/systemd-systemctl-native/systemctl index 5c21e7f..d71c7ed 100755 --- a/meta-systemd/recipes-core/systemd/systemd-systemctl-native/systemctl +++ b/meta-systemd/recipes-core/systemd/systemd-systemctl-native/systemctl @@ -81,7 +81,7 @@ for service in $services; do wanted_by=$(grep WantedBy $ROOT/$service_file \ | sed 's,WantedBy=,,g' \ | tr ',' '\n' \ - | grep '\.target$') + | grep '\(\.target$\)\|\(\.service$\)') for r in $wanted_by; do echo "WantedBy=$r found in $service" -- 1.7.12 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [meta-oe][PATCH 5/5] meta-gnome: replace virtual/gail dependency with gtk+ 2012-08-30 9:13 ` [meta-oe][PATCH 0/5] Small fixes Martin Jansa ` (3 preceding siblings ...) 2012-08-30 9:13 ` [meta-oe][PATCH 4/5] meta-systemd: systemd-systemctl-native: Also add support for WantedBy=*.service Martin Jansa @ 2012-08-30 9:13 ` Martin Jansa 4 siblings, 0 replies; 7+ messages in thread From: Martin Jansa @ 2012-08-30 9:13 UTC (permalink / raw) To: openembedded-devel From: Ross Burton <ross.burton@intel.com> GTK+ integrated the gail module back in 2009, so we can safely drop the explicit gail dependency. Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- meta-gnome/recipes-gnome/gnome/libgnomecanvas_2.20.0.bb | 2 +- meta-gnome/recipes-gnome/libgnome/libgnomecanvas_2.26.0.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-gnome/recipes-gnome/gnome/libgnomecanvas_2.20.0.bb b/meta-gnome/recipes-gnome/gnome/libgnomecanvas_2.20.0.bb index 266d44b..9562956 100644 --- a/meta-gnome/recipes-gnome/gnome/libgnomecanvas_2.20.0.bb +++ b/meta-gnome/recipes-gnome/gnome/libgnomecanvas_2.20.0.bb @@ -5,7 +5,7 @@ PR = "r2" inherit gnome -DEPENDS = "libglade libart-lgpl virtual/gail" +DEPENDS = "gtk+ libglade libart-lgpl" EXTRA_OECONF = "--disable-gtk-doc" diff --git a/meta-gnome/recipes-gnome/libgnome/libgnomecanvas_2.26.0.bb b/meta-gnome/recipes-gnome/libgnome/libgnomecanvas_2.26.0.bb index 936872f..79e9e8a 100644 --- a/meta-gnome/recipes-gnome/libgnome/libgnomecanvas_2.26.0.bb +++ b/meta-gnome/recipes-gnome/libgnome/libgnomecanvas_2.26.0.bb @@ -5,7 +5,7 @@ SECTION = "x11/gnome/libs" inherit gnome -DEPENDS = "libglade libart-lgpl virtual/gail xineramaproto" +DEPENDS = "gtk+ libglade libart-lgpl xineramaproto" EXTRA_OECONF = "--disable-gtk-doc" -- 1.7.12 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [meta-oe][PATCH 0/5] Small fixes
@ 2012-02-24 22:24 Martin Jansa
0 siblings, 0 replies; 7+ messages in thread
From: Martin Jansa @ 2012-02-24 22:24 UTC (permalink / raw)
To: openembedded-devel
The following changes since commit 2eaec194016ba357bb02db8859b2b3737d759865:
meta-multimedia: initial add (2012-02-24 13:53:17 +0100)
are available in the git repository at:
git://git.openembedded.org/meta-openembedded-contrib jansa/pull
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/pull
Martin Jansa (5):
mpfr: drop from meta-oe, 3.1.0 is in oe-core
task-x11-illume: use allarch
task-cli-tools: move ltrace to RRECOMMENDS as it's probably not
available for shr4 and sh3 and use allarch
task-x11: use allarch
meta-oe: add mplayer-common to SIGGEN_EXCLUDERECIPES_ABISAFE
meta-efl/recipes-efl/tasks/task-x11-illume.bb | 2 +-
meta-oe/conf/layer.conf | 6 +-
meta-oe/recipes-core/tasks/task-cli-tools.bb | 14 +-
meta-oe/recipes-core/tasks/task-x11_1.0.bb | 2 +-
.../mpfr/mpfr-3.0.0/long-long-thumb.patch | 11 -
meta-oe/recipes-support/mpfr/mpfr-3.0.0/p4.patch | 1752 --------------------
meta-oe/recipes-support/mpfr/mpfr_3.0.0.bb | 30 -
7 files changed, 13 insertions(+), 1804 deletions(-)
delete mode 100644 meta-oe/recipes-support/mpfr/mpfr-3.0.0/long-long-thumb.patch
delete mode 100644 meta-oe/recipes-support/mpfr/mpfr-3.0.0/p4.patch
delete mode 100644 meta-oe/recipes-support/mpfr/mpfr_3.0.0.bb
--
1.7.8.4
^ permalink raw reply [flat|nested] 7+ messages in threadend of thread, other threads:[~2012-08-30 9:26 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <]>
2012-08-30 9:13 ` [meta-oe][PATCH 0/5] Small fixes Martin Jansa
2012-08-30 9:13 ` [meta-oe][PATCH 1/5] pixman: fix qemu workaround Martin Jansa
2012-08-30 9:13 ` [meta-oe][PATCH 2/5] gpsd: add gpsd-machine-conf to RRECOMMENDS Martin Jansa
2012-08-30 9:13 ` [meta-oe][PATCH 3/5] gpsd-machine-conf: add empty recipe for BSP layers to bbappend it Martin Jansa
2012-08-30 9:13 ` [meta-oe][PATCH 4/5] meta-systemd: systemd-systemctl-native: Also add support for WantedBy=*.service Martin Jansa
2012-08-30 9:13 ` [meta-oe][PATCH 5/5] meta-gnome: replace virtual/gail dependency with gtk+ Martin Jansa
2012-02-24 22:24 [meta-oe][PATCH 0/5] Small fixes Martin Jansa
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox