fixes after glib-2.0 upgrade

PATCH New Martin Jansa 1 participant 10 messages May 7, 2012

lore

Share & tools

lore

Martin Jansa

author

2012-05-07 19:15 UTC #0 lore raw

cover fixes after glib-2.0 upgrade

The following changes since commit f769b97271cf4158ec700d32a56d18a756a1ddcb:

xfsprogs: misc fixes for recipe (2012-05-05 09:00:21 +0200)

are available in the git repository at:
git://git.openembedded.org/meta-openembedded-contrib jansa/pull2
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/pull2

Martin Jansa (5):
libsoup-2.4, gobject-introspection: upgraded in oe-core
libgee: upgrade to 0.6.4
glibmm: fix build with glib-2.32
loudmouth: fix build with glib-2.32
gpe-scap: migrate to use libsoup-2.4 instead of libsoup-2.2 API

 .../recipes-support/libsoup/libsoup-2.4_2.37.2.bb  |   25 ------------
 .../use-usr-bin-env-for-python.patch               |   20 ---------
 .../gobject-introspection_0.9.10.bb                |   32 ---------------
 .../gobject-introspection_git.bb                   |   34 ----------------
 .../gpe-scap/gpe-scap/use.libsoup-2.4.patch        |   42 ++++++++++++++++++++
 meta-gpe/recipes-graphics/gpe-scap/gpe-scap_1.4.bb |    8 ++-
 .../loudmouth/loudmouth-1.4.3/glib-2.32.patch      |   10 +++++
 .../loudmouth/loudmouth_1.4.3.bb                   |    5 ++-
 .../recipes-core/glib-2.0/glibmm/glib-2.32.patch   |   10 +++++
 meta-oe/recipes-core/glib-2.0/glibmm_2.28.2.bb     |    7 +--
 .../libgee/{libgee_0.6.0.bb => libgee_0.6.4.bb}    |   11 ++---
 11 files changed, 79 insertions(+), 125 deletions(-)
 delete mode 100644 meta-efl/recipes-support/libsoup/libsoup-2.4_2.37.2.bb
 delete mode 100644 meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection/use-usr-bin-env-for-python.patch
 delete mode 100644 meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection_0.9.10.bb
 delete mode 100644 meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection_git.bb
 create mode 100644 meta-gpe/recipes-graphics/gpe-scap/gpe-scap/use.libsoup-2.4.patch
 create mode 100644 meta-oe/recipes-connectivity/loudmouth/loudmouth-1.4.3/glib-2.32.patch
 create mode 100644 meta-oe/recipes-core/glib-2.0/glibmm/glib-2.32.patch
 rename meta-oe/recipes-devtools/libgee/{libgee_0.6.0.bb => libgee_0.6.4.bb} (46%)

Signature · 1 line

1.7.8.6

Martin Jansa

author

2012-05-07 19:15 UTC #1 lore raw

PATCH 1/5 libsoup-2.4, gobject-introspection: upgraded in oe-core

Signed-off-by Martin Jansa <[email protected]>

---
 .../recipes-support/libsoup/libsoup-2.4_2.37.2.bb  |   25 --------------
 .../use-usr-bin-env-for-python.patch               |   20 -----------
 .../gobject-introspection_0.9.10.bb                |   32 ------------------
 .../gobject-introspection_git.bb                   |   34 --------------------
 4 files changed, 0 insertions(+), 111 deletions(-)
 delete mode 100644 meta-efl/recipes-support/libsoup/libsoup-2.4_2.37.2.bb
 delete mode 100644 meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection/use-usr-bin-env-for-python.patch
 delete mode 100644 meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection_0.9.10.bb
 delete mode 100644 meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection_git.bb

meta-efl/recipes-support/libsoup/libsoup-2.4_2.37.2.bb deleted +0 ~~-25~~

deleted file mode 100644
index 4810b3a..0000000
@@ -1,25 +0,0 @@
-DESCRIPTION = "An HTTP library implementation in C"
-HOMEPAGE = "http://www.gnome.org/"
-BUGTRACKER = "https://bugzilla.gnome.org/"
-
-LICENSE = "LGPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
-
-PR = "r1"
-
-# unstable version
-DEFAULT_PREFERENCE = "-1"
-
-SECTION = "x11/gnome/libs"
-
-DEPENDS = "glib-2.0 gnutls libxml2 libproxy sqlite3 libgnome-keyring"
-
-SRC_URI = "${GNOME_MIRROR}/libsoup/2.37/libsoup-${PV}.tar.xz"
-
-SRC_URI[md5sum] = "7737dd5238efd593452ba3c365e63e8c"
-SRC_URI[sha256sum] = "df82c51b67f67c3128979d1f3bf20a8ceeea369b6e43aceb16d576d8fc4e8423"
-
-S = "${WORKDIR}/libsoup-${PV}"
-
-inherit autotools pkgconfig
-

meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection/use-usr-bin-env-for-python.patch deleted +0 ~~-20~~

deleted file mode 100644
index 67b8547..0000000
@@ -1,20 +0,0 @@
-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

meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection_0.9.10.bb deleted +0 ~~-32~~

deleted file mode 100644
index f1a46a1..0000000
@@ -1,32 +0,0 @@
-# NOTE: WIP! This recipe does not cross-compile atm., only -native
-SECTION = "libs"
-DEPENDS = "glib-2.0 libffi bison-native"
-BBCLASSEXTEND = "native"
-PR = "r1"
-
-LICENSE = "GPLv2+ & LGPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=90d577535a3898e1ae5dbf0ae3509a8c \
-                    file://COPYING.GPL;md5=94d55d512a9ba36caa9b7df079bae19f \
-                    file://COPYING.LGPL;md5=3bf50002aefd002f49e7bb854063f7e7"
-
-SRC_URI[md5sum] = "e5cd63d6bcc5c105e898e7c33cf42175"
-SRC_URI[sha256sum] = "4bf244db75df04499dea704e7734376c0fc5a3a17fb59be2123c8d76111e6fb8"
-
-SRC_URI = "\
-  ${GNOME_MIRROR}/gobject-introspection/0.9/${BPN}-${PV}.tar.bz2 \
-  file://use-usr-bin-env-for-python.patch \
-"
-S = "${WORKDIR}/${BPN}-${PV}"
-
-inherit autotools
-
-do_configure_prepend() {
-	touch -f gtk-doc.make
-}
-
-EXTRA_OECONF = "\
-  --disable-gtk-doc \
-  --disable-gtk-doc-html \
-  --disable-gtk-doc-pdf \
-  --disable-tests \
-"

meta-gnome/recipes-gnome/gobject-introspection/gobject-introspection_git.bb deleted +0 ~~-34~~

deleted file mode 100644
index f7e8907..0000000
@@ -1,34 +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
-
-BBCLASSEXTEND = "native"
-
-do_configure_prepend () {
-        echo "EXTRA_DIST = " > ${S}/gtk-doc.make
-}
-
-EXTRA_OECONF = "\
-  --disable-gtk-doc \
-  --disable-gtk-doc-html \
-  --disable-gtk-doc-pdf \
-  --disable-tests \
-"

Signature · 1 line

1.7.8.6

Martin Jansa

author

2012-05-07 19:16 UTC #2 lore raw

PATCH 2/5 libgee: upgrade to 0.6.4

In reply to Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

---
 .../libgee/{libgee_0.6.0.bb => libgee_0.6.4.bb}    |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)
 rename meta-oe/recipes-devtools/libgee/{libgee_0.6.0.bb => libgee_0.6.4.bb} (46%)

meta-oe/recipes-devtools/libgee/libgee_0.6.4.bb renamed from meta-oe/recipes-devtools/libgee/libgee_0.6.0.bb +5 -6

similarity index 46%
rename from meta-oe/recipes-devtools/libgee/libgee_0.6.0.bb
rename to meta-oe/recipes-devtools/libgee/libgee_0.6.4.bb
index 4e305b6..4e2c643 100644
@@ -1,12 +1,11 @@
 require libgee.inc
 PE = "1"
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.0"
 #autoreconf needs introspection.m4 (staged by gobject-introspection-native) after http://git.gnome.org/browse/libgee/commit/?id=d026a29b38ca1a3388981c6e75a92602212373d8
 DEPENDS += "gobject-introspection-native"
 DEPENDS_virtclass-native += "gobject-introspection-native"
 
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libgee/0.6/${BPN}-${PV}.tar.bz2"
-S = "${WORKDIR}/${BPN}-${PV}"
-
-SRC_URI[md5sum] = "4eb513b23ab6ea78884989518a4acf6f"
-SRC_URI[sha256sum] = "e586678d0a88637abeaaf850b62231000772e79ea6d9c4b45dc3cea99f778a7a"
+SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libgee/${SHRT_VER}/${BP}.tar.xz"
+SRC_URI[md5sum] = "a32bf498cf33d5e3417823a7b252ad22"
+SRC_URI[sha256sum] = "55f39f3b28e676f6cbd9377d83edd031084436a4da41280a9503c94faffb1665"

Signature · 1 line

1.7.8.6

Martin Jansa

author

2012-05-07 19:16 UTC #3 lore raw

PATCH 3/5 glibmm: fix build with glib-2.32

In reply to Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

---
 .../recipes-core/glib-2.0/glibmm/glib-2.32.patch   |   10 ++++++++++
 meta-oe/recipes-core/glib-2.0/glibmm_2.28.2.bb     |    7 +++----
 2 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 meta-oe/recipes-core/glib-2.0/glibmm/glib-2.32.patch

meta-oe/recipes-core/glib-2.0/glibmm/glib-2.32.patch new file +10 -0

new file mode 100644
index 0000000..50b7367
@@ -0,0 +1,10 @@
+--- glibmm-2.28.2.orig/glib/glibmm/varianttype.cc	2011-06-09 20:29:48.000000000 +0200
++++ glibmm-2.28.2/glib/glibmm/varianttype.cc	2012-05-06 08:15:32.760680295 +0200
+@@ -23,7 +23,6 @@
+ 
+ #include <glibmm/varianttype.h>
+ #include <glibmm/utility.h>
+-#include <glib/gvarianttype.h>
+ 
+ namespace Glib
+ {

meta-oe/recipes-core/glib-2.0/glibmm_2.28.2.bb +3 -4

index 7e77a1c..6604091 100644
@@ -1,10 +1,9 @@
 require glibmm.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI[archive.md5sum] = "cf33d1861d09fb2952a6a1d69e0502e3"
 SRC_URI[archive.sha256sum] = "7b67178363f8494c94f8b3dd704a4c8db7ad75a253fc84a4ad229e5e179ec192"
 
-SRC_URI += " file://remove-examples.patch"
-
-
+SRC_URI += " file://remove-examples.patch \
+             file://glib-2.32.patch"

Signature · 1 line

1.7.8.6

Martin Jansa

author

2012-05-07 19:16 UTC #4 lore raw

PATCH 4/5 loudmouth: fix build with glib-2.32

In reply to Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

---
 .../loudmouth/loudmouth-1.4.3/glib-2.32.patch      |   10 ++++++++++
 .../loudmouth/loudmouth_1.4.3.bb                   |    5 ++++-
 2 files changed, 14 insertions(+), 1 deletions(-)
 create mode 100644 meta-oe/recipes-connectivity/loudmouth/loudmouth-1.4.3/glib-2.32.patch

meta-oe/recipes-connectivity/loudmouth/loudmouth-1.4.3/glib-2.32.patch new file +10 -0

new file mode 100644
index 0000000..b6c9422
@@ -0,0 +1,10 @@
+--- loudmouth-1.4.3.orig/loudmouth/lm-error.c	2008-10-29 21:48:15.000000000 +0100
++++ loudmouth-1.4.3/loudmouth/lm-error.c	2012-05-06 08:27:07.455739440 +0200
+@@ -19,7 +19,6 @@
+  */
+ 
+ #include <config.h>
+-#include <glib/gerror.h>
+ #include "lm-error.h"
+ 
+ /**

meta-oe/recipes-connectivity/loudmouth/loudmouth_1.4.3.bb +4 -1

index f91fdff..87852ee 100644
@@ -8,7 +8,10 @@ DEPENDS = "glib-2.0 check openssl"
 
 inherit gnomebase
 
-SRC_URI += "file://04-use-pkg-config-for-gnutls.patch"
+PR = "r1"
+
+SRC_URI += "file://04-use-pkg-config-for-gnutls.patch \
+            file://glib-2.32.patch"
 
 SRC_URI[archive.md5sum] = "55339ca42494690c3942ee1465a96937"
 SRC_URI[archive.sha256sum] = "95a93f5d009b71ea8193d994aa11f311bc330a3efe1b7cd74dc48f11c7f929e3"

Signature · 1 line

1.7.8.6

Martin Jansa

author

2012-05-07 19:16 UTC #5 lore raw

PATCH 5/5 gpe-scap: migrate to use libsoup-2.4 instead of libsoup-2.2 API

In reply to Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

---
 .../gpe-scap/gpe-scap/use.libsoup-2.4.patch        |   42 ++++++++++++++++++++
 meta-gpe/recipes-graphics/gpe-scap/gpe-scap_1.4.bb |    8 ++-
 2 files changed, 47 insertions(+), 3 deletions(-)
 create mode 100644 meta-gpe/recipes-graphics/gpe-scap/gpe-scap/use.libsoup-2.4.patch

meta-gpe/recipes-graphics/gpe-scap/gpe-scap/use.libsoup-2.4.patch new file +42 -0

new file mode 100644
index 0000000..3cfe5d7
@@ -0,0 +1,42 @@
+diff -uNr gpe-scap-1.4.orig/configure.ac gpe-scap-1.4/configure.ac
+--- gpe-scap-1.4.orig/configure.ac	2009-03-05 18:53:53.000000000 +0100
++++ gpe-scap-1.4/configure.ac	2012-05-06 10:18:29.348308322 +0200
+@@ -24,7 +24,7 @@
+ AC_SUBST(LDFLAGS)
+ 
+ dnl libraries
+-GTK_MODULES="gtk+-2.0 >= 2.6.0 gthread-2.0 libsoup-2.2"
++GTK_MODULES="gtk+-2.0 >= 2.6.0 gthread-2.0 libsoup-2.4"
+ PKG_CHECK_MODULES(GTK, $GTK_MODULES)
+ AC_SUBST(GTK_CFLAGS)
+ AC_SUBST(GTK_LIBS)
+diff -uNr gpe-scap-1.4.orig/src/scr-shot-common.c gpe-scap-1.4/src/scr-shot-common.c
+--- gpe-scap-1.4.orig/src/scr-shot-common.c	2009-03-05 12:13:20.000000000 +0100
++++ gpe-scap-1.4/src/scr-shot-common.c	2012-05-06 10:30:52.299371576 +0200
+@@ -182,12 +182,12 @@
+   /* create session and message */
+   session = soup_session_sync_new ();
+   message = soup_message_new ("POST", url);
+-  soup_message_add_header (message->request_headers, "User-Agent", "gpe-scap/" VERSION);
+-  soup_message_add_header (message->request_headers, "Accept",
++  soup_message_headers_append (message->request_headers, "User-Agent", "gpe-scap/" VERSION);
++  soup_message_headers_append (message->request_headers, "Accept",
+ 			   "text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5");
+-/*  soup_message_add_header (message->request_headers, "Accept-Charset", "Accept-Charset=ISO-8859-1,utf-8;q=0.7,*;q=0.7");
+-  soup_message_add_header (message->request_headers, "Keep-Alive", "100");
+-  soup_message_add_header (message->request_headers, "Connection", "keep-alive");
++/*  soup_message_headers_append (message->request_headers, "Accept-Charset", "Accept-Charset=ISO-8859-1,utf-8;q=0.7,*;q=0.7");
++  soup_message_headers_append (message->request_headers, "Keep-Alive", "100");
++  soup_message_headers_append (message->request_headers, "Connection", "keep-alive");
+   soup_message_wire	add_header (message->request_headers, "Accept-Encoding", "gzip,deflate");
+ */
+   /* build message body */
+@@ -207,7 +207,7 @@
+   memcpy (body + strlen (cmd) + len, tail, strlen (tail));
+ 
+   soup_message_set_request (message, "multipart/form-data; boundary="SEP,
+-                            SOUP_BUFFER_SYSTEM_OWNED, body, content_len);
++                            SOUP_MEMORY_TAKE, body, content_len);
+ 
+   soup_session_send_message (session, message);
+

meta-gpe/recipes-graphics/gpe-scap/gpe-scap_1.4.bb +5 -3

index 9577f2f..c416ff5 100644
@@ -4,9 +4,9 @@ SECTION = "gpe"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
 
-DEPENDS = "glib-2.0 gtk+ libgpewidget libglade libsoup"
+DEPENDS = "glib-2.0 gtk+ libgpewidget libglade libsoup-2.4"
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI[md5sum] = "eaf545561b0ad981c9d01833f30fcf95"
 SRC_URI[sha256sum] = "762778421fae7c62d5ec6a9d27986166c0dbbe2ff51fc10bb9b8baff5c367534"

@@ -15,7 +15,9 @@ GPE_TARBALL_SUFFIX = "bz2"
 
 inherit gpe autotools
 
-SRC_URI += "file://0001-Fix-the-ordering-of-LDADD-options-to-fix-a-compilati.patch"
+SRC_URI += "file://0001-Fix-the-ordering-of-LDADD-options-to-fix-a-compilati.patch \
+  file://use.libsoup-2.4.patch \
+"
 
 RREPLACES_${PN} = "gpe-screenshot"

Signature · 1 line

1.7.8.6

Martin Jansa

author

2012-05-07 19:27 UTC #6 lore raw

PATCH 6/7 kernel.bbclass: move kernel-vmlinux up in PACKAGES

In reply to Martin Jansa

From: Christopher Larson <[email protected]>

If KERNEL_IMAGETYPE is vmlinux, the expectation is most likely that there will be no kernel image package, but we still want a vmlinux package for debugging, so move kernel-vmlinux in front of kernel-image in PACKAGES.

Signed-off-by Christopher Larson <[email protected]>

Signed-off-by Richard Purdie <[email protected]>

Signed-off-by Martin Jansa <[email protected]>

---
 meta-oe/classes/kernel.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

meta-oe/classes/kernel.bbclass +1 -1

index 98320fe..66398ef 100644
@@ -252,7 +252,7 @@ EXPORT_FUNCTIONS do_compile do_install do_configure
 
 # kernel-base becomes kernel-${KERNEL_VERSION}
 # kernel-image becomes kernel-image-${KERNEL_VERISON}
-PACKAGES = "kernel kernel-base kernel-image kernel-dev kernel-vmlinux kernel-misc"
+PACKAGES = "kernel kernel-base kernel-vmlinux kernel-image kernel-dev kernel-misc"
 FILES = ""
 FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*"
 FILES_kernel-dev = "/boot/System.map* /boot/Module.symvers* /boot/config*"

Signature · 1 line

1.7.8.6

Martin Jansa

author

2012-05-07 19:27 UTC #7 lore raw

PATCH 7/7 kernel.bbclass: Use kmod-native instead of module-init-tools-cross

From: Khem Raj <[email protected]>

Signed-off-by Khem Raj <[email protected]>

Signed-off-by Martin Jansa <[email protected]>

---
 meta-oe/classes/kernel.bbclass |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

meta-oe/classes/kernel.bbclass +3 -4

index 66398ef..b431f8e 100644
@@ -1,7 +1,7 @@
 inherit linux-kernel-base module_strip
 
 PROVIDES += "virtual/kernel"
-DEPENDS += "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}gcc${KERNEL_CCSUFFIX} update-modules"
+DEPENDS += "virtual/${TARGET_PREFIX}gcc kmod-native virtual/${TARGET_PREFIX}gcc${KERNEL_CCSUFFIX} update-modules"
 
 # we include gcc above, we dont need virtual/libc
 INHIBIT_DEFAULT_DEPS = "1"

@@ -274,7 +274,7 @@ if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then
 	mkdir -p $D/lib/modules/${KERNEL_VERSION}
 fi
 if [ -n "$D" ]; then
-	${HOST_PREFIX}depmod -A -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
+	depmod -a -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
 else
 	depmod -a
 fi

@@ -352,9 +352,8 @@ python populate_packages_prepend () {
 		if m:
 			kernelver_stripped = m.group(1)
 		path = d.getVar("PATH", True)
-		host_prefix = d.getVar("HOST_PREFIX", True) or ""
 
-		cmd = "PATH=\"%s\" %sdepmod -n -a -r -b %s -F %s/boot/System.map-%s %s" % (path, host_prefix, dvar, dvar, kernelver, kernelver_stripped)
+		cmd = "PATH=\"%s\" depmod -n -a -b %s -F %s/boot/System.map-%s %s" % (path, dvar, dvar, kernelver, kernelver_stripped)
 		f = os.popen(cmd, 'r')
 
 		deps = {}

Signature · 1 line

1.7.8.6

Martin Jansa

author

2012-05-07 19:51 UTC #8 lore raw

Re: [meta-oe][meta-efl][meta-gpe][PATCH 7/7] kernel.bbclass: Use kmod-native instead of module-init-tools-cross

Quoted 1 line · Martin Jansa

From: Khem Raj <[email protected]>

This is needed in meta-oe because without module-init-tools in oe-core we get failures like this:

ERROR: Nothing PROVIDES 'virtual/arm-oe-linux-gnueabi-depmod' (but /OE/shr-core/meta-smartphone/meta-openmoko/recipes-kernel/linux/linux-openmoko_3.2.bb, /OE/shr-core/meta-smartphone/meta-samsung/recipes-kernel/linux/linux-samsung-crespo_git.bb, /OE/shr-core/meta-handheld/recipes-kernel/linux/linux_3.0.1.bb DEPENDS
on or otherwise requires it)
NOTE: Runtime target 'kernel' is unbuildable, removing...
Missing or unbuildable dependency chain was: ['kernel', 'virtual/arm-oe-linux-gnueabi-depmod']

kmod recipes should be droped from meta-oe too to get rid of this warning:
ERROR: Multiple .bb files are due to be built which each provide kmod (/OE/shr-core/openembedded-core/meta/recipes-kernel/kmod/kmod_git.bb /OE/shr-core/meta-openembedded/meta-oe/recipes-kernel/kmod/kmod_git.bb).

I have patch for it in jansa/pull2 too, but
ERROR: Package version for package kmod went backwards which would break package feeds from (0:git-r3 to 0:7+git02629fa02e96763db7460a930239cc93649a52f8-r0.0)
so we need PE bump preferably in oe-core.

And also libkmod*so.* is now packaged in kmod package not libkmod but that's probably bug in oe-core recipe... because
FILES_libkmod = "${base_libdir}/libkmod*${SOLIBS}"
and they are installed in ${libdir}.
probably that's from where this comment in kmod recipe comes from

# libdir = "${base_libdir}"

Cheers,

Quoted 42 lines

Signed-off-by Khem Raj <[email protected]>

Signed-off-by Martin Jansa <[email protected]>

---
 meta-oe/classes/kernel.bbclass |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

meta-oe/classes/kernel.bbclass +3 -4

index 66398ef..b431f8e 100644
@@ -1,7 +1,7 @@
 inherit linux-kernel-base module_strip
 
 PROVIDES += "virtual/kernel"
-DEPENDS += "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}gcc${KERNEL_CCSUFFIX} update-modules"
+DEPENDS += "virtual/${TARGET_PREFIX}gcc kmod-native virtual/${TARGET_PREFIX}gcc${KERNEL_CCSUFFIX} update-modules"
 
 # we include gcc above, we dont need virtual/libc
 INHIBIT_DEFAULT_DEPS = "1"

@@ -274,7 +274,7 @@ if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then
 	mkdir -p $D/lib/modules/${KERNEL_VERSION}
 fi
 if [ -n "$D" ]; then
-	${HOST_PREFIX}depmod -A -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
+	depmod -a -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
 else
 	depmod -a
 fi

@@ -352,9 +352,8 @@ python populate_packages_prepend () {
 		if m:
 			kernelver_stripped = m.group(1)
 		path = d.getVar("PATH", True)
-		host_prefix = d.getVar("HOST_PREFIX", True) or ""
 
-		cmd = "PATH=\"%s\" %sdepmod -n -a -r -b %s -F %s/boot/System.map-%s %s" % (path, host_prefix, dvar, dvar, kernelver, kernelver_stripped)
+		cmd = "PATH=\"%s\" depmod -n -a -b %s -F %s/boot/System.map-%s %s" % (path, dvar, dvar, kernelver, kernelver_stripped)
 		f = os.popen(cmd, 'r')
 
 		deps = {}

Signature · 1 line

1.7.8.6

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Martin Jansa

author

2012-05-07 20:27 UTC #9 lore raw

Re: [meta-oe][meta-efl][meta-gpe][PATCH 7/7] kernel.bbclass: Use kmod-native instead of module-init-tools-cross

Quoted 21 lines · Martin Jansa

Quoted 1 line · Martin Jansa
From: Khem Raj <[email protected]>
This is needed in meta-oe because without module-init-tools in oe-core we get failures like this:
ERROR: Nothing PROVIDES 'virtual/arm-oe-linux-gnueabi-depmod' (but /OE/shr-core/meta-smartphone/meta-openmoko/recipes-kernel/linux/linux-openmoko_3.2.bb, /OE/shr-core/meta-smartphone/meta-samsung/recipes-kernel/linux/linux-samsung-crespo_git.bb, /OE/shr-core/meta-handheld/recipes-kernel/linux/linux_3.0.1.bb DEPENDS
on or otherwise requires it)
NOTE: Runtime target 'kernel' is unbuildable, removing...
Missing or unbuildable dependency chain was: ['kernel', 'virtual/arm-oe-linux-gnueabi-depmod']
kmod recipes should be droped from meta-oe too to get rid of this warning:
ERROR: Multiple .bb files are due to be built which each provide kmod (/OE/shr-core/openembedded-core/meta/recipes-kernel/kmod/kmod_git.bb /OE/shr-core/meta-openembedded/meta-oe/recipes-kernel/kmod/kmod_git.bb).

Quoted 5 lines

I have patch for it in jansa/pull2 too, but
ERROR: Package version for package kmod went backwards which would break package feeds from (0:git-r3 to 0:7+git02629fa02e96763db7460a930239cc93649a52f8-r0.0)
so we need PE bump preferably in oe-core.

This seems to be fine for opkg.. only buildhistory doesn't play nice with gitpkgv.bbclass, because actual version was 7-r3 and opkg upgrades it on target (this is after "fixing" libkmod packaging by including libdir as well as base_libdir pattern..)
Upgrading libkmod2 on root from 7-r3 to 7+git02629fa02e96763db7460a930239cc93649a52f8-r0.0...

And
CONFLICTS_${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" should be probably
RCONFLICTS_${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" RREPLACES_${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools"

Cheers,

Quoted 55 lines

# libdir = "${base_libdir}"

Cheers,

Quoted 42 lines

Signed-off-by Khem Raj <[email protected]>

Signed-off-by Martin Jansa <[email protected]>

---
 meta-oe/classes/kernel.bbclass |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

meta-oe/classes/kernel.bbclass +3 -4

index 66398ef..b431f8e 100644
@@ -1,7 +1,7 @@
 inherit linux-kernel-base module_strip
 
 PROVIDES += "virtual/kernel"
-DEPENDS += "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}gcc${KERNEL_CCSUFFIX} update-modules"
+DEPENDS += "virtual/${TARGET_PREFIX}gcc kmod-native virtual/${TARGET_PREFIX}gcc${KERNEL_CCSUFFIX} update-modules"
 
 # we include gcc above, we dont need virtual/libc
 INHIBIT_DEFAULT_DEPS = "1"

@@ -274,7 +274,7 @@ if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then
 	mkdir -p $D/lib/modules/${KERNEL_VERSION}
 fi
 if [ -n "$D" ]; then
-	${HOST_PREFIX}depmod -A -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
+	depmod -a -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
 else
 	depmod -a
 fi

@@ -352,9 +352,8 @@ python populate_packages_prepend () {
 		if m:
 			kernelver_stripped = m.group(1)
 		path = d.getVar("PATH", True)
-		host_prefix = d.getVar("HOST_PREFIX", True) or ""
 
-		cmd = "PATH=\"%s\" %sdepmod -n -a -r -b %s -F %s/boot/System.map-%s %s" % (path, host_prefix, dvar, dvar, kernelver, kernelver_stripped)
+		cmd = "PATH=\"%s\" depmod -n -a -b %s -F %s/boot/System.map-%s %s" % (path, dvar, dvar, kernelver, kernelver_stripped)
 		f = os.popen(cmd, 'r')
 
 		deps = {}

Signature · 1 line

1.7.8.6

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]