[OE-core] [PATCH v3 meta-oe 1/4] gedit: Imported from OE classic
Signed-off-by: Joel A Fernandes
---
meta-gnome/recipes-gnome/gedit/gedit_2.30.0.bb | 24
1 files changed, 24 insertions(+), 0 deletions(-)
create mode 100644 meta-gnome/recipes-gnome/gedit/gedit_2.30.0.bb
diff --git a/meta-gnome/recipes-gnome/gedit/gedit_2.30.0.bb
b/meta-gnome/recipes-gnome/gedit/gedit_2.30.0.bb
new file mode 100644
index 000..7d1ff7b
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gedit/gedit_2.30.0.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "GNOME editor"
+SECTION = "x11/gnome"
+LICENSE = "GPLv2+"
+
+DEPENDS = "enchant gconf gnome-common gnome-doc-utils-native glib-2.0 gtk+
gtksourceview2 iso-codes virtual/gettext"
+RDEPENDS_${PN} += " gtksourceview2"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+
+PR = "r0"
+
+inherit gnome
+SRC_URI[archive.md5sum] = "aebd49797406fdde7b25624b71990860"
+SRC_URI[archive.sha256sum] =
"37598473372aab217e46f19726cff616ff0ea4121bbdbb170b4e264a4ca76690"
+
+EXTRA_OECONF = "--disable-scrollkeeper"
+
+do_configure_prepend () {
+ cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S}
+}
+
+FILES_${PN} += "${libdir}/gedit-2/plugin* ${datadir}/gedit-2"
+FILES_${PN}-dbg += "${libdir}/gedit-2/plugin-loaders/.debug
${libdir}/gedit-2/plugins/.debug"
+
--
1.7.0.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 meta-oe 3/4] libgnomecups: Imported from OE Classic
Signed-off-by: Joel A Fernandes
---
.../recipes-gnome/gnome/libgnomecups_0.2.3.bb | 17 +
1 files changed, 17 insertions(+), 0 deletions(-)
create mode 100644 meta-gnome/recipes-gnome/gnome/libgnomecups_0.2.3.bb
diff --git a/meta-gnome/recipes-gnome/gnome/libgnomecups_0.2.3.bb
b/meta-gnome/recipes-gnome/gnome/libgnomecups_0.2.3.bb
new file mode 100644
index 000..3f3ece1
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome/libgnomecups_0.2.3.bb
@@ -0,0 +1,17 @@
+DESCRIPTION="Gnome Cups Manager"
+LICENSE="GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+
+PR ="r0"
+
+DEPENDS="glib-2.0 gtk+ pango cups intltool libgnomeui"
+
+inherit gnome pkgconfig
+
+do_compile_append () {
+ cp libgnomecups-1.0.pc libgnomecups-1.0.pc.old
+ sed 's:${STAGING_DIR_HOST}::' < libgnomecups-1.0.pc.old >
libgnomecups-1.0.pc
+}
+
+SRC_URI[archive.md5sum] = "dc4920c15c9f886f73ea74fbff0ae48b"
+SRC_URI[archive.sha256sum] =
"e130e80942b386de19a288a4c194ff3dbe9140315b31e982058c8bffbb6a1d29"
--
1.7.0.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 meta-oe 0/4] gnome patches
Changes in v3: Updated LICENSE version numbers [PATCH v3 meta-oe 1/4] gedit: Imported from OE classic [PATCH v3 meta-oe 2/4] gtksourceview: Imported from OE classic [PATCH v3 meta-oe 3/4] libgnomecups: Imported from OE Classic [PATCH v3 meta-oe 4/4] libgnomeprint: Imported from OE classic ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 meta-oe 2/4] gtksourceview: Imported from OE classic
* Added LIC_FILES_CHKSUM
* Added virtual/gettext to DEPENDS
Signed-off-by: Joel A Fernandes
---
.../recipes-gnome/gtksourceview/files/acinclude.m4 | 90 ++
.../recipes-gnome/gtksourceview/files/gtk-doc.m4 | 53 ++
.../recipes-gnome/gtksourceview/files/gtk-doc.make | 173
.../gtksourceview/gtksourceview2_2.10.0.bb | 29
4 files changed, 345 insertions(+), 0 deletions(-)
create mode 100644 meta-gnome/recipes-gnome/gtksourceview/files/acinclude.m4
create mode 100644 meta-gnome/recipes-gnome/gtksourceview/files/gtk-doc.m4
create mode 100644 meta-gnome/recipes-gnome/gtksourceview/files/gtk-doc.make
create mode 100644
meta-gnome/recipes-gnome/gtksourceview/gtksourceview2_2.10.0.bb
diff --git a/meta-gnome/recipes-gnome/gtksourceview/files/acinclude.m4
b/meta-gnome/recipes-gnome/gtksourceview/files/acinclude.m4
new file mode 100644
index 000..53518fb
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gtksourceview/files/acinclude.m4
@@ -0,0 +1,90 @@
+## this one is commonly used with AM_PATH_PYTHONDIR ...
+dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]])
+dnl Check if a module containing a given symbol is visible to python.
+AC_DEFUN(AM_CHECK_PYMOD,
+[AC_REQUIRE([AM_PATH_PYTHON])
+py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'`
+AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1)
+AC_CACHE_VAL(py_cv_mod_$py_mod_var, [
+ifelse([$2],[], [prog="
+import sys
+try:
+import $1
+except ImportError:
+sys.exit(1)
+except:
+sys.exit(0)
+sys.exit(0)"], [prog="
+import $1
+$1.$2"])
+if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC
+ then
+eval "py_cv_mod_$py_mod_var=yes"
+ else
+eval "py_cv_mod_$py_mod_var=no"
+ fi
+])
+py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"`
+if test "x$py_val" != xno; then
+ AC_MSG_RESULT(yes)
+ ifelse([$3], [],, [$3
+])dnl
+else
+ AC_MSG_RESULT(no)
+ ifelse([$4], [],, [$4
+])dnl
+fi
+])
+
+dnl a macro to check for ability to create python extensions
+dnl AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE])
+dnl function also defines PYTHON_INCLUDES
+AC_DEFUN([AM_CHECK_PYTHON_HEADERS],
+[AC_REQUIRE([AM_PATH_PYTHON])
+AC_MSG_CHECKING(for headers required to compile python extensions)
+dnl deduce PYTHON_INCLUDES
+AC_ARG_WITH(python-includes,
+ [ --with-python-includes=DIR path to Python includes],
py_exec_prefix=$withval)
+if test x$py_exec_prefix != x; then
+PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+else
+py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
+py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
+PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
+if test "$py_prefix" != "$py_exec_prefix"; then
+ PYTHON_INCLUDES="$PYTHON_INCLUDES
-I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+fi
+fi
+AC_SUBST(PYTHON_INCLUDES)
+dnl check if the headers exist:
+save_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
+AC_TRY_CPP([#include ],dnl
+[AC_MSG_RESULT(found)
+$1],dnl
+[AC_MSG_RESULT(not found)
+$2])
+CPPFLAGS="$save_CPPFLAGS"
+])
+
+dnl
+dnl JH_ADD_CFLAG(FLAG)
+dnl checks whether the C compiler supports the given flag, and if so, adds
+dnl it to $CFLAGS. If the flag is already present in the list, then the
+dnl check is not performed.
+AC_DEFUN([JH_ADD_CFLAG],
+[
+case " $CFLAGS " in
+*@<:@\ \ @:>@$1@<:@\ \ @:>@*)
+ ;;
+*)
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $1"
+ AC_MSG_CHECKING([whether [$]CC understands $1])
+ AC_TRY_COMPILE([], [], [jh_has_option=yes], [jh_has_option=no])
+ AC_MSG_RESULT($jh_has_option)
+ if test $jh_has_option = no; then
+CFLAGS="$save_CFLAGS"
+ fi
+ ;;
+esac])
diff --git a/meta-gnome/recipes-gnome/gtksourceview/files/gtk-doc.m4
b/meta-gnome/recipes-gnome/gtksourceview/files/gtk-doc.m4
new file mode 100644
index 000..3ec4166
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gtksourceview/files/gtk-doc.m4
@@ -0,0 +1,53 @@
+dnl -*- mode: autoconf -*-
+
+# serial 1
+
+dnl Usage:
+dnl GTK_DOC_CHECK([minimum-gtk-doc-version])
+AC_DEFUN([GTK_DOC_CHECK],
+[
+ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
+ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
+ dnl for overriding the documentation installation directory
+ AC_ARG_WITH(html-dir,
+AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
+[with_html_dir='${datadir}/gtk-doc/html'])
+ HTML_DIR="$with_html_dir"
+ AC_SUBST(HTML_DIR)
+
+ dnl enable/disable documentation building
+ AC_ARG_ENABLE(gtk-doc,
+AC_HELP_STRING([--enable-gtk-doc],
+ [use gtk-doc to build documentation [default=no]]),,
+enable_gtk_doc=no)
+
+ have_gtk_doc=no
+ if test -z "$PKG_CONFIG"; then
+AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+ fi
+ if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then
+have_gtk_doc=yes
+ fi
+
+ dnl do we want to do a version check?
+ifelse([$1],[],,
+ [gtk_doc_min
[OE-core] [PATCH v3 meta-oe 4/4] libgnomeprint: Imported from OE classic
Signed-off-by: Joel A Fernandes
---
.../recipes-gnome/gnome/libgnomeprint_2.18.7.bb| 15 +++
1 files changed, 15 insertions(+), 0 deletions(-)
create mode 100644 meta-gnome/recipes-gnome/gnome/libgnomeprint_2.18.7.bb
diff --git a/meta-gnome/recipes-gnome/gnome/libgnomeprint_2.18.7.bb
b/meta-gnome/recipes-gnome/gnome/libgnomeprint_2.18.7.bb
new file mode 100644
index 000..c0ea12a
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome/libgnomeprint_2.18.7.bb
@@ -0,0 +1,15 @@
+LICENSE = "GPLv2"
+SECTION = "x11/gnome/libs"
+
+DEPENDS = "libxml2 libgnomecups glib-2.0 pango libart-lgpl fontconfig popt
gnome-common"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+
+inherit pkgconfig gnome
+
+SRC_URI[archive.md5sum] = "d66b81ee8aa3b3a33f5efc9a47ce07e3"
+SRC_URI[archive.sha256sum] =
"8b34f81599423ef3da9c43775495da602f83cbbee069c9e760ffeae6aa4768e6"
+
+FILES_${PN}-dbg += "${libdir}/libgnomeprint/${PV}/modules/transports/.debug \
+ ${libdir}/libgnomeprint/${PV}/modules/.debug
${libdir}/libgnomeprint/${PV}/modules/*/.debug"
+
--
1.7.0.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] (no subject)
On Fri, Aug 26, 2011 at 10:26 PM, Fernandes, Joel A wrote: > v2 Changes: > Addressing Koen's feedback on patches > * Added a PR to all recipes I thought you meant the PR when you said "Which version", didn't know you were talking about the LICENSE versions. Anyway, Can we leave the PRs I put into patches 2/4 and 4/4 in? Also, is it necessary to update LICENSE versions or can we leave it as is, as I've seen many recipes in oe-core that have it without a version number. thanks, Joel > * Changed meta-ti in subject to meta-oe > > Patches in the series: > > [PATCH v2 meta-oe 1/4] gedit: Imported from OE classic > [PATCH v2 meta-oe 2/4] gtksourceview: Imported from OE classic > [PATCH v2 meta-oe 3/4] libgnomecups: Imported from OE Classic > [PATCH v2 meta-oe 4/4] libgnomeprint: Imported from OE classic > ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH meta-oe 3/9] libmad: Imported from OE-classic
On Fri, Aug 26, 2011 at 2:59 AM, Koen Kooi wrote: > > Op 26 aug. 2011, om 02:28 heeft Joel A Fernandes het volgende geschreven: >> >> diff --git a/meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb >> b/meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb >> new file mode 100644 >> index 000..537d685 >> --- /dev/null >> +++ b/meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb >> @@ -0,0 +1,34 @@ >> +DESCRIPTION = "MPEG Audio Decoder Library" >> +SECTION = "libs" >> +PRIORITY = "optional" > > That field isn't used anymore > >> +DEPENDS = "libid3tag" >> +LICENSE = "GPL" > > Which version? Hi Koen, Isn't it implied that its GPL v1? I've seen several recipes in OE-core that did that. Thanks, Joel ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH meta-oe 1/9] schroedinger: Imported from OE classic
On Fri, Aug 26, 2011 at 3:01 AM, Koen Kooi wrote:
>
> Op 26 aug. 2011, om 02:28 heeft Joel A Fernandes het volgende geschreven:
>
>> Signed-off-by: Joel A Fernandes
>> ---
>> .../schroedinger/gst-plugin-schroedinger_1.0.9.bb | 15 +++
>> .../schroedinger/schroedinger.inc | 19 +++
>> .../schroedinger/schroedinger/configure.ac.patch | 13 +
>> .../schroedinger/schroedinger_1.0.9.bb | 13 +
>> 4 files changed, 60 insertions(+), 0 deletions(-)
>> create mode 100644
>> meta-oe/recipes-multimedia/schroedinger/gst-plugin-schroedinger_1.0.9.bb
>> create mode 100644 meta-oe/recipes-multimedia/schroedinger/schroedinger.inc
>> create mode 100644
>> meta-oe/recipes-multimedia/schroedinger/schroedinger/configure.ac.patch
>> create mode 100644
>> meta-oe/recipes-multimedia/schroedinger/schroedinger_1.0.9.bb
>>
>> diff --git
>> a/meta-oe/recipes-multimedia/schroedinger/gst-plugin-schroedinger_1.0.9.bb
>> b/meta-oe/recipes-multimedia/schroedinger/gst-plugin-schroedinger_1.0.9.bb
>> new file mode 100644
>> index 000..0a95646
>> --- /dev/null
>> +++
>> b/meta-oe/recipes-multimedia/schroedinger/gst-plugin-schroedinger_1.0.9.bb
>> @@ -0,0 +1,15 @@
>> +require schroedinger.inc
>> +PR = "r0"
>> +
>
>> +DEPENDS += "gstreamer gst-plugins-base"
>> +
>> +SRC_URI[schroedingertargz.md5sum] = "d67ec48b7c506db8c8b49156bf409e60"
>> +SRC_URI[schroedingertargz.sha256sum] =
>> "345abcaa72ff0f2e9c1075e22f7141475ee4e6eea23a7f568b69ffc13cc1c723"
>> +
>> +S = "${WORKDIR}/schroedinger-${PV}"
>> +
>> +PACKAGES = "gst-plugin-schroedinger gst-plugin-schroedinger-dev
>> gst-plugin-schroedinger-dbg"
>> +FILES_gst-plugin-schroedinger += "${libdir}/gstreamer-0.10/libgstschro.so"
>> +FILES_gst-plugin-schroedinger-dev +=
>> "${libdir}/gstreamer-0.10/libgstschro.*"
>> +FILES_gst-plugin-schroedinger-dbg +=
>> "${libdir}/gstreamer-0.10/.debug/libgstschro.so"
>> +
>> diff --git a/meta-oe/recipes-multimedia/schroedinger/schroedinger.inc
>> b/meta-oe/recipes-multimedia/schroedinger/schroedinger.inc
>> new file mode 100644
>> index 000..386fc73
>> --- /dev/null
>> +++ b/meta-oe/recipes-multimedia/schroedinger/schroedinger.inc
>> @@ -0,0 +1,19 @@
>> +HOMEPAGE = "http://schrodinger.sourceforge.net/";
>> +LICENSE = "MPL GPL LGPL MIT"
>> +DEPENDS = "liboil orc-native orc"
>> +
>> +INC_PR = "r1"
>
> reset that
Sure
>
>> +
>> +SRC_URI =
>> "http://www.diracvideo.org/download/schroedinger/${P}.tar.gz;name=schroedingertargz";
>> +SRC_URI += "file://configure.ac.patch"
>> +
>> +EXTRA_OECONF += "STAGING_DIR=${STAGING_DIR_NATIVE}"
>> +
>> +inherit autotools
>> +
>> +do_configure_append () {
>> + # Fix stupid libtool... handling.
>> + # rpath handling can't be disabled and the Makefile's can't be
>> regenerated..
>> + # (GNU sed required)
>> + sed -i s/^hardcode_libdir_flag_spec/#hardcode_libdir_flag_spec/
>> ${S}/*-libtool
>> +}
>> diff --git
>> a/meta-oe/recipes-multimedia/schroedinger/schroedinger/configure.ac.patch
>> b/meta-oe/recipes-multimedia/schroedinger/schroedinger/configure.ac.patch
>> new file mode 100644
>> index 000..ac5e7ee
>> --- /dev/null
>> +++ b/meta-oe/recipes-multimedia/schroedinger/schroedinger/configure.ac.patch
>> @@ -0,0 +1,13 @@
>> +Index: schroedinger-1.0.9/configure.ac
>> +===
>> +--- schroedinger-1.0.9.orig/configure.ac
>> schroedinger-1.0.9/configure.ac
>> +@@ -54,7 +54,7 @@ if test "x${HAVE_ORC}" != xyes ; then
>> + AC_ERROR([orc-0.4 >= $ORC_VER is required])
>> + fi
>> + SCHRO_PKG_DEPS="$SCHRO_PKG_DEPS orc-0.4 >= $ORC_VER"
>> +-ORCC=`$PKG_CONFIG --variable=orcc orc-0.4`
>> ++ORCC=$STAGING_DIR`$PKG_CONFIG --variable=orcc orc-0.4`
>> + AC_SUBST(ORCC)
>> +
>> + AC_ARG_WITH([thread],
>> diff --git a/meta-oe/recipes-multimedia/schroedinger/schroedinger_1.0.9.bb
>> b/meta-oe/recipes-multimedia/schroedinger/schroedinger_1.0.9.bb
>> new file mode 100644
>> index 000..2994428
>> --- /dev/null
>> +++ b/meta-oe/recipes-multimedia/schroedinger/schroedinger_1.0.9.bb
>> @@ -0,0 +1,13 @@
>> +require schroedinger.inc
>> +
>> +PR = "${INC_PR}.0"
>> +
>> +inherit autotools
>> +
>> +SRC_URI[schroedingertargz.md5sum] = "d67ec48b7c506db8c8b49156bf409e60"
>> +SRC_URI[schroedingertargz.sha256sum] =
>> "345abcaa72ff0f2e9c1075e22f7141475ee4e6eea23a7f568b69ffc13cc1c723"
>
> Why isn't this in the .inc and why is there a seperate recipe for the gst
> plugin?
It is that way in OE classic:
http://cgit.openembedded.org/cgit.cgi/openembedded/tree/recipes/schroedinger/schroedinger_1.0.9.bb
Thanks
Joel
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] (no subject)
v2 Changes: Addressing Koen's feedback on patches * Added a PR to all recipes * Changed meta-ti in subject to meta-oe Patches in the series: [PATCH v2 meta-oe 1/4] gedit: Imported from OE classic [PATCH v2 meta-oe 2/4] gtksourceview: Imported from OE classic [PATCH v2 meta-oe 3/4] libgnomecups: Imported from OE Classic [PATCH v2 meta-oe 4/4] libgnomeprint: Imported from OE classic ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 meta-oe 4/4] libgnomeprint: Imported from OE classic
Signed-off-by: Joel A Fernandes
---
.../recipes-gnome/gnome/libgnomeprint_2.18.7.bb| 17 +
1 files changed, 17 insertions(+), 0 deletions(-)
create mode 100644 meta-gnome/recipes-gnome/gnome/libgnomeprint_2.18.7.bb
diff --git a/meta-gnome/recipes-gnome/gnome/libgnomeprint_2.18.7.bb
b/meta-gnome/recipes-gnome/gnome/libgnomeprint_2.18.7.bb
new file mode 100644
index 000..13864e6
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome/libgnomeprint_2.18.7.bb
@@ -0,0 +1,17 @@
+LICENSE = "GPL"
+SECTION = "x11/gnome/libs"
+
+DEPENDS = "libxml2 libgnomecups glib-2.0 pango libart-lgpl fontconfig popt
gnome-common"
+
+PR = "r0"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+
+inherit pkgconfig gnome
+
+SRC_URI[archive.md5sum] = "d66b81ee8aa3b3a33f5efc9a47ce07e3"
+SRC_URI[archive.sha256sum] =
"8b34f81599423ef3da9c43775495da602f83cbbee069c9e760ffeae6aa4768e6"
+
+FILES_${PN}-dbg += "${libdir}/libgnomeprint/${PV}/modules/transports/.debug \
+ ${libdir}/libgnomeprint/${PV}/modules/.debug
${libdir}/libgnomeprint/${PV}/modules/*/.debug"
+
--
1.7.0.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 meta-oe 2/4] gtksourceview: Imported from OE classic
* Added LIC_FILES_CHKSUM
* Added virtual/gettext to DEPENDS
Signed-off-by: Joel A Fernandes
---
.../recipes-gnome/gtksourceview/files/acinclude.m4 | 90 ++
.../recipes-gnome/gtksourceview/files/gtk-doc.m4 | 53 ++
.../recipes-gnome/gtksourceview/files/gtk-doc.make | 173
.../gtksourceview/gtksourceview2_2.10.0.bb | 30
4 files changed, 346 insertions(+), 0 deletions(-)
create mode 100644 meta-gnome/recipes-gnome/gtksourceview/files/acinclude.m4
create mode 100644 meta-gnome/recipes-gnome/gtksourceview/files/gtk-doc.m4
create mode 100644 meta-gnome/recipes-gnome/gtksourceview/files/gtk-doc.make
create mode 100644
meta-gnome/recipes-gnome/gtksourceview/gtksourceview2_2.10.0.bb
diff --git a/meta-gnome/recipes-gnome/gtksourceview/files/acinclude.m4
b/meta-gnome/recipes-gnome/gtksourceview/files/acinclude.m4
new file mode 100644
index 000..53518fb
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gtksourceview/files/acinclude.m4
@@ -0,0 +1,90 @@
+## this one is commonly used with AM_PATH_PYTHONDIR ...
+dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]])
+dnl Check if a module containing a given symbol is visible to python.
+AC_DEFUN(AM_CHECK_PYMOD,
+[AC_REQUIRE([AM_PATH_PYTHON])
+py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'`
+AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1)
+AC_CACHE_VAL(py_cv_mod_$py_mod_var, [
+ifelse([$2],[], [prog="
+import sys
+try:
+import $1
+except ImportError:
+sys.exit(1)
+except:
+sys.exit(0)
+sys.exit(0)"], [prog="
+import $1
+$1.$2"])
+if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC
+ then
+eval "py_cv_mod_$py_mod_var=yes"
+ else
+eval "py_cv_mod_$py_mod_var=no"
+ fi
+])
+py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"`
+if test "x$py_val" != xno; then
+ AC_MSG_RESULT(yes)
+ ifelse([$3], [],, [$3
+])dnl
+else
+ AC_MSG_RESULT(no)
+ ifelse([$4], [],, [$4
+])dnl
+fi
+])
+
+dnl a macro to check for ability to create python extensions
+dnl AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE])
+dnl function also defines PYTHON_INCLUDES
+AC_DEFUN([AM_CHECK_PYTHON_HEADERS],
+[AC_REQUIRE([AM_PATH_PYTHON])
+AC_MSG_CHECKING(for headers required to compile python extensions)
+dnl deduce PYTHON_INCLUDES
+AC_ARG_WITH(python-includes,
+ [ --with-python-includes=DIR path to Python includes],
py_exec_prefix=$withval)
+if test x$py_exec_prefix != x; then
+PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+else
+py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
+py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
+PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
+if test "$py_prefix" != "$py_exec_prefix"; then
+ PYTHON_INCLUDES="$PYTHON_INCLUDES
-I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+fi
+fi
+AC_SUBST(PYTHON_INCLUDES)
+dnl check if the headers exist:
+save_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
+AC_TRY_CPP([#include ],dnl
+[AC_MSG_RESULT(found)
+$1],dnl
+[AC_MSG_RESULT(not found)
+$2])
+CPPFLAGS="$save_CPPFLAGS"
+])
+
+dnl
+dnl JH_ADD_CFLAG(FLAG)
+dnl checks whether the C compiler supports the given flag, and if so, adds
+dnl it to $CFLAGS. If the flag is already present in the list, then the
+dnl check is not performed.
+AC_DEFUN([JH_ADD_CFLAG],
+[
+case " $CFLAGS " in
+*@<:@\ \ @:>@$1@<:@\ \ @:>@*)
+ ;;
+*)
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $1"
+ AC_MSG_CHECKING([whether [$]CC understands $1])
+ AC_TRY_COMPILE([], [], [jh_has_option=yes], [jh_has_option=no])
+ AC_MSG_RESULT($jh_has_option)
+ if test $jh_has_option = no; then
+CFLAGS="$save_CFLAGS"
+ fi
+ ;;
+esac])
diff --git a/meta-gnome/recipes-gnome/gtksourceview/files/gtk-doc.m4
b/meta-gnome/recipes-gnome/gtksourceview/files/gtk-doc.m4
new file mode 100644
index 000..3ec4166
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gtksourceview/files/gtk-doc.m4
@@ -0,0 +1,53 @@
+dnl -*- mode: autoconf -*-
+
+# serial 1
+
+dnl Usage:
+dnl GTK_DOC_CHECK([minimum-gtk-doc-version])
+AC_DEFUN([GTK_DOC_CHECK],
+[
+ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
+ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
+ dnl for overriding the documentation installation directory
+ AC_ARG_WITH(html-dir,
+AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
+[with_html_dir='${datadir}/gtk-doc/html'])
+ HTML_DIR="$with_html_dir"
+ AC_SUBST(HTML_DIR)
+
+ dnl enable/disable documentation building
+ AC_ARG_ENABLE(gtk-doc,
+AC_HELP_STRING([--enable-gtk-doc],
+ [use gtk-doc to build documentation [default=no]]),,
+enable_gtk_doc=no)
+
+ have_gtk_doc=no
+ if test -z "$PKG_CONFIG"; then
+AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+ fi
+ if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then
+have_gtk_doc=yes
+ fi
+
+ dnl do we want to do a version check?
+ifelse([$1],[],,
+ [gtk_doc_min
[OE-core] [PATCH v2 meta-oe 3/4] libgnomecups: Imported from OE Classic
Signed-off-by: Joel A Fernandes
---
.../recipes-gnome/gnome/libgnomecups_0.2.3.bb | 17 +
1 files changed, 17 insertions(+), 0 deletions(-)
create mode 100644 meta-gnome/recipes-gnome/gnome/libgnomecups_0.2.3.bb
diff --git a/meta-gnome/recipes-gnome/gnome/libgnomecups_0.2.3.bb
b/meta-gnome/recipes-gnome/gnome/libgnomecups_0.2.3.bb
new file mode 100644
index 000..3f3ece1
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome/libgnomecups_0.2.3.bb
@@ -0,0 +1,17 @@
+DESCRIPTION="Gnome Cups Manager"
+LICENSE="GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+
+PR ="r0"
+
+DEPENDS="glib-2.0 gtk+ pango cups intltool libgnomeui"
+
+inherit gnome pkgconfig
+
+do_compile_append () {
+ cp libgnomecups-1.0.pc libgnomecups-1.0.pc.old
+ sed 's:${STAGING_DIR_HOST}::' < libgnomecups-1.0.pc.old >
libgnomecups-1.0.pc
+}
+
+SRC_URI[archive.md5sum] = "dc4920c15c9f886f73ea74fbff0ae48b"
+SRC_URI[archive.sha256sum] =
"e130e80942b386de19a288a4c194ff3dbe9140315b31e982058c8bffbb6a1d29"
--
1.7.0.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 meta-oe 1/4] gedit: Imported from OE classic
Signed-off-by: Joel A Fernandes
---
meta-gnome/recipes-gnome/gedit/gedit_2.30.0.bb | 24
1 files changed, 24 insertions(+), 0 deletions(-)
create mode 100644 meta-gnome/recipes-gnome/gedit/gedit_2.30.0.bb
diff --git a/meta-gnome/recipes-gnome/gedit/gedit_2.30.0.bb
b/meta-gnome/recipes-gnome/gedit/gedit_2.30.0.bb
new file mode 100644
index 000..7d1ff7b
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gedit/gedit_2.30.0.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "GNOME editor"
+SECTION = "x11/gnome"
+LICENSE = "GPLv2+"
+
+DEPENDS = "enchant gconf gnome-common gnome-doc-utils-native glib-2.0 gtk+
gtksourceview2 iso-codes virtual/gettext"
+RDEPENDS_${PN} += " gtksourceview2"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+
+PR = "r0"
+
+inherit gnome
+SRC_URI[archive.md5sum] = "aebd49797406fdde7b25624b71990860"
+SRC_URI[archive.sha256sum] =
"37598473372aab217e46f19726cff616ff0ea4121bbdbb170b4e264a4ca76690"
+
+EXTRA_OECONF = "--disable-scrollkeeper"
+
+do_configure_prepend () {
+ cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S}
+}
+
+FILES_${PN} += "${libdir}/gedit-2/plugin* ${datadir}/gedit-2"
+FILES_${PN}-dbg += "${libdir}/gedit-2/plugin-loaders/.debug
${libdir}/gedit-2/plugins/.debug"
+
--
1.7.0.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Use of multiple GIT repositories in SRCREV but updating PV
On Fri, Aug 26, 2011 at 2:40 PM, Richard Purdie
wrote:
> On Fri, 2011-08-26 at 18:06 -0300, Otavio Salvador wrote:
>> We have two recipes that use a common static library and every time we
>> change something on this library we need to bump PR of those recipes.
>> We want to avoid that specially for daily builds that will be using
>> GIT AUTOREV support.
>>
>> For it to work, we need to have a way to put two SRCREV in PV and then
>> it will be rebuit every time the library changes.
>>
>> Any clue how to do that?
>
> Set the PV as usual in the recipe:
>
> PV = "0.0+gitr${SRCPV}"
>
> and then set:
>
> SRCREV = "${AUTOREV}"
He has multiple git repositories involved here, and wants to ensure it
gets rebuilt if either change.
--
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Use of multiple GIT repositories in SRCREV but updating PV
On Fri, 2011-08-26 at 18:06 -0300, Otavio Salvador wrote:
> We have two recipes that use a common static library and every time we
> change something on this library we need to bump PR of those recipes.
> We want to avoid that specially for daily builds that will be using
> GIT AUTOREV support.
>
> For it to work, we need to have a way to put two SRCREV in PV and then
> it will be rebuit every time the library changes.
>
> Any clue how to do that?
Set the PV as usual in the recipe:
PV = "0.0+gitr${SRCPV}"
and then set:
SRCREV = "${AUTOREV}"
?
Cheers,
Richard
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] Use of multiple GIT repositories in SRCREV but updating PV
Hello, We have two recipes that use a common static library and every time we change something on this library we need to bump PR of those recipes. We want to avoid that specially for daily builds that will be using GIT AUTOREV support. For it to work, we need to have a way to put two SRCREV in PV and then it will be rebuit every time the library changes. Any clue how to do that? -- Otavio Salvador O.S. Systems E-mail: ota...@ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [RFC] IMAGE_CMD_sdimg first cut
Here's an initial version of the SDCard image build functionality. Its not a
direct copy paste from Narcissus, I had to replace paths and am copying files
from IMAGE_ROOTFS instead of how Narcissus untars into a mount point.
Not build tested.
@Koen and all, here are some questions:
1. Where in openembedded-core do we store the "img.gz" template files so that
they are available to image.bbclass?
I'm thinking in the images/ directory where the beagleboard-gnome-image bb
recipe is itself stored? What's a clean way?
2. I've hardcoded loop device names just like Narcissus, what's a cleaner way?
3. Same as 2. but for temporary mount point names?
4. For copying ubifs, how do we ensure IMAGE_CMD_ubifs runs first before
IMAGE_CMD_sdimg does?
Thanks, if you get a chance to work on it, that'll be cool. I will continue to
work on it after my class.
Signed-off-by: Joel A Fernandes
Cc: Koen Kooi
Cc: Jason Kridner
---
meta/classes/image_types.bbclass | 99 ++
1 files changed, 99 insertions(+), 0 deletions(-)
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index cd901c1..39e7984 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -88,6 +88,105 @@ IMAGE_CMD_ubi () {
}
IMAGE_CMD_ubifs = "mkfs.ubifs -r ${IMAGE_ROOTFS} -o
${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.ubifs.img ${MKUBIFS_ARGS}"
+IMAGE_CMD_sdimg () {
+MD5SUM_SD="$(md5sum ${IMAGE_ROOTFS}/boot/uImage | awk '{print $1}')"
+for sdsize in $(ls ${WORKDIR}/conf/sd/sd-master* | sed -e
s:${WORKDIR}/conf/sd/sd-master-::g -e 's:.img.gz::g' | xargs echo) ; do
+echo "SD size: $sdsize"
+
+if true ; then
+echo "No cached SD image found, generating new one"
+zcat ${WORKDIR}/conf/sd/sd-master-$sdsize.img.gz >
${WORKDIR}/sd.img
+/sbin/fdisk -l -u ${WORKDIR}/sd.img
+
+# Output looks like:
+# Disk sd-master-1GiB.img: 0 MB, 0 bytes
+# 255 heads, 63 sectors/track, 0 cylinders, total 0 sectors
+# Units = sectors of 1 * 512 = 512 bytes
+# Sector size (logical/physical): 512 bytes / 512 bytes
+# I/O size (minimum/optimal): 512 bytes / 512 bytes
+# Disk identifier: 0x
+#
+# Device Boot Start End Blocks
Id System
+# sd-master-1GiB.img1 * 63 144584 72261
c W95 FAT32 (LBA)
+# sd-master-1GiB.img2 144585 1959929 907672+
83 Linux
+
+
+BYTES_PER_SECTOR="$(/sbin/fdisk -l -u sd.img | grep Units |
awk '{print $9}')"
+VFAT_SECTOR_OFFSET="$(/sbin/fdisk -l -u sd.img | grep img1 |
awk '{print $3}')"
+EXT3_SECTOR_OFFSET="$(/sbin/fdisk -l -u sd.img | grep img2 |
awk '{print $2}')"
+
+LOOP_DEV="/dev/loop1"
+LOOP_DEV_FS="/dev/loop2"
+umount ${LOOP_DEV} || true
+umount ${LOOP_DEV_FS} || true
+/sbin/losetup -d ${LOOP_DEV} || true
+/sbin/losetup -d ${LOOP_DEV_FS} || true
+
+echo ""
+
+# VFAT
+echo "/sbin/losetup -v -o $(expr ${BYTES_PER_SECTOR} "*"
${VFAT_SECTOR_OFFSET}) ${LOOP_DEV} ${WORKDIR}/sd.img"
+/sbin/losetup -v -o $(expr ${BYTES_PER_SECTOR} "*"
${VFAT_SECTOR_OFFSET}) ${LOOP_DEV} ${WORKDIR}/sd.img
+
+# EXT3
+echo "/sbin/losetup -v -o $(expr ${BYTES_PER_SECTOR} "*"
${EXT3_SECTOR_OFFSET}) ${LOOP_DEV_FS} ${WORKDIR}/sd.img"
+/sbin/losetup -v -o $(expr ${BYTES_PER_SECTOR} "*"
${EXT3_SECTOR_OFFSET}) ${LOOP_DEV_FS} ${WORKDIR}/sd.img
+echo "/sbin/mkfs.ext3 -L Narcissus-rootfs ${LOOP_DEV_FS}"
+/sbin/mkfs.ext3 -L Narcissus-rootfs ${LOOP_DEV_FS}
+
+echo ""
+
+echo "mount ${LOOP_DEV}"
+mount ${LOOP_DEV}
+
+echo "mount ${LOOP_DEV_FS}"
+mount ${LOOP_DEV_FS}
+
+# report mount status to log
+mount | grep loop
+
+if [ -e ${IMAGE_ROOTFS}/boot/MLO ] ; then
+ cp -v ${IMAGE_ROOTFS}/boot/MLO
/mnt/narcissus/sd_image1/MLO
+fi
+
+echo "Remounting ${LOOP_DEV}"
+umount ${LOOP_DEV}
+mount ${LOOP_DEV}
+
+echo "Copying file system:"
+ cp -r ${IMAGE_ROOTFS}/* /mnt/narcissus/sd_images2/ || true
+
+ echo "Copying bootloaders into the boot partition"
+cp -v /mnt/narcissus/sd_image2/boot/u-boot-*.bin
/mnt/narcissus/sd_image1/u-boot.bin || true
+cp -v /mnt/narcissus/sd_image2/boot/uImage-2.6*
/mnt/narcissus/sd_image1/uImage || true
+cp -v /mnt/narcissus/sd_image2/boot/user.txt
/mnt/n
[OE-core] [CONSOLIDATED PULL 21/21] kernel.bbclass: Find the kernel consistently.
From: Mike Crowe
Use KERNEL_OUTPUT variable to find the generated kernel image rather than
duplicating the existing path. This also means it can be overridden simply.
Signed-off-by: Mike Crowe
---
meta/classes/kernel.bbclass |6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 229679c..bc1baa0 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -471,9 +471,9 @@ python populate_packages_prepend () {
# with a fixed length or there is a limit in transferring the kernel to memory
do_sizecheck() {
if [ ! -z "${KERNEL_IMAGE_MAXSIZE}" ]; then
- size=`ls -l arch/${ARCH}/boot/${KERNEL_IMAGETYPE} | awk '{
print $5}'`
+ size=`ls -l ${KERNEL_OUTPUT} | awk '{ print $5}'`
if [ $size -ge ${KERNEL_IMAGE_MAXSIZE} ]; then
- rm arch/${ARCH}/boot/${KERNEL_IMAGETYPE}
+ rm ${KERNEL_OUTPUT}
die "This kernel (size=$size >
${KERNEL_IMAGE_MAXSIZE}) is too big for your device. Please reduce the size of
the kernel by making more of it modular."
fi
fi
@@ -487,7 +487,7 @@ KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
KERNEL_IMAGE_SYMLINK_NAME ?= "${KERNEL_IMAGETYPE}-${MACHINE}"
kernel_do_deploy() {
- install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE}
${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin
+ install -m 0644 ${KERNEL_OUTPUT}
${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin
if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
tar -cvzf
${DEPLOYDIR}/modules-${KERNEL_VERSION}-${PR}-${MACHINE}.tgz -C ${D} lib
fi
--
1.7.6
___
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] pango: make x11 support conditional on DISTRO_FEATURES
From: Phil Blundell
This allows pango to build on DISTROs which don't enable x11.
Also adjust the SECTION since pango isn't really an X library.
Signed-off-by: Phil Blundell
---
meta/recipes-graphics/pango/pango.inc | 10 ++
meta/recipes-graphics/pango/pango_1.28.4.bb |2 +-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-graphics/pango/pango.inc
b/meta/recipes-graphics/pango/pango.inc
index 5a8a5ae..a8e99e2 100644
--- a/meta/recipes-graphics/pango/pango.inc
+++ b/meta/recipes-graphics/pango/pango.inc
@@ -6,14 +6,15 @@ been done in the context of the GTK+ widget toolkit. Pango
forms the \
core of text and font handling for GTK+-2.x."
HOMEPAGE = "http://www.pango.org/";
BUGTRACKER = "http://bugzilla.gnome.org";
-SECTION = "x11/libs"
+SECTION = "libs"
LICENSE = "LGPL"
-DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv virtual/libx11
libxft gtk-doc-native cairo"
+X11DEPENDS = "virtual/libx11 libxft"
+DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv gtk-doc-native
cairo ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}"
PACKAGES_DYNAMIC = "pango-module-*"
-RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc"
+RRECOMMENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'x11',
'pango-module-basic-x', '', d)} pango-module-basic-fc"
inherit gnome
@@ -24,7 +25,8 @@ FULL_OPTIMIZATION_arm = "-O2"
EXTRA_OECONF = "--disable-glibtest \
--enable-explicit-deps=no \
- --disable-debug"
+ --disable-debug \
+ ${@base_contains('DISTRO_FEATURES', 'x11', '--with-x',
'--without-x', d)}"
LEAD_SONAME = "libpango-1.0*"
LIBV = "1.6.0"
diff --git a/meta/recipes-graphics/pango/pango_1.28.4.bb
b/meta/recipes-graphics/pango/pango_1.28.4.bb
index 600f00b..68ab700 100644
--- a/meta/recipes-graphics/pango/pango_1.28.4.bb
+++ b/meta/recipes-graphics/pango/pango_1.28.4.bb
@@ -2,7 +2,7 @@ require pango.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
-PR = "r0"
+PR = "r1"
SRC_URI += "file://no-tests.patch"
--
1.7.6
___
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] eglibc: fix gconv packaging after 5486cac29db6e67051fff7637a0abc9aeab661e5
From: Martin Jansa
* gconv is directory so test -f was always false as reported by Phil Blundell in
http://lists.linuxtogo.org/pipermail/openembedded-core/2011-August/008973.html
* -e used also for localedef which is file, just to be more consistent
Signed-off-by: Martin Jansa
---
meta/recipes-core/eglibc/eglibc-package.inc |4 ++--
meta/recipes-core/eglibc/eglibc_2.12.bb |2 +-
meta/recipes-core/eglibc/eglibc_2.13.bb |2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc
b/meta/recipes-core/eglibc/eglibc-package.inc
index 5308bb9..adda5e9 100644
--- a/meta/recipes-core/eglibc/eglibc-package.inc
+++ b/meta/recipes-core/eglibc/eglibc-package.inc
@@ -100,10 +100,10 @@ do_install_locale () {
if [ "${base_libdir}" != "${libdir}" ]; then
cp -fpPR ${D}${base_libdir}/* ${dest}${base_libdir}
fi
- if [ -f ${D}${bindir}/localedef ]; then
+ if [ -e ${D}${bindir}/localedef ]; then
mv -f ${D}${bindir}/localedef ${dest}${bindir}
fi
- if [ -f ${D}${libdir}/gconv ]; then
+ if [ -e ${D}${libdir}/gconv ]; then
mv -f ${D}${libdir}/gconv ${dest}${libdir}
fi
cp -fpPR ${D}${libdir}/* ${dest}${libdir}
diff --git a/meta/recipes-core/eglibc/eglibc_2.12.bb
b/meta/recipes-core/eglibc/eglibc_2.12.bb
index 1a69bdc..a71c4d4 100644
--- a/meta/recipes-core/eglibc/eglibc_2.12.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.12.bb
@@ -1,7 +1,7 @@
require eglibc.inc
DEPENDS += "gperf-native"
-PR = "r22"
+PR = "r23"
SRCREV = "14158"
diff --git a/meta/recipes-core/eglibc/eglibc_2.13.bb
b/meta/recipes-core/eglibc/eglibc_2.13.bb
index f382448..3b19e7b 100644
--- a/meta/recipes-core/eglibc/eglibc_2.13.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.13.bb
@@ -3,7 +3,7 @@ require eglibc.inc
SRCREV = "14157"
DEPENDS += "gperf-native"
-PR = "r13"
+PR = "r14"
PR_append = "+svnr${SRCPV}"
EGLIBC_BRANCH="eglibc-2_13"
--
1.7.6
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 17/21] multilib.bbclass: add renaming for INITSCRIPT related variables
From: Dongxiao Xu
Initscripts are missing in target image in multilib case. This commit
adds the renaming logic for the related variables in multilib.bbclass.
This fixes the no response of mouse/keyboard in target system due to
the missing of udev startup script.
Signed-off-by: Dongxiao Xu
---
meta/classes/multilib.bbclass |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index 5976d5d..286b806 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -73,7 +73,7 @@ python __anonymous () {
d.setVar("PACKAGES", " ".join([row[1] for row in pkgs_mapping]))
for pkg_mapping in pkgs_mapping:
-for subs in ["FILES", "RDEPENDS", "RRECOMMENDS", "SUMMARY",
"DESCRIPTION", "RSUGGESTS", "RPROVIDES", "RCONFLICTS", "PKG", "ALLOW_EMPTY",
"pkg_postinst", "pkg_postrm"]:
+for subs in ["FILES", "RDEPENDS", "RRECOMMENDS", "SUMMARY",
"DESCRIPTION", "RSUGGESTS", "RPROVIDES", "RCONFLICTS", "PKG", "ALLOW_EMPTY",
"pkg_postinst", "pkg_postrm", "INITSCRIPT_NAME", "INITSCRIPT_PARAMS"]:
d.renameVar("%s_%s" % (subs, pkg_mapping[0]), "%s_%s" % (subs,
pkg_mapping[1]))
map_dependencies("DEPENDS", d)
@@ -89,4 +89,5 @@ python __anonymous () {
map_variable("PROVIDES", d)
map_variable("PACKAGES_DYNAMIC", d)
map_variable("PACKAGE_INSTALL", d)
+map_variable("INITSCRIPT_PACKAGES", d)
}
--
1.7.6
___
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] opkg-utils: ignore packages disapperaring filelist generation
From: Dmitry Eremin-Solenikov
Package files disappearing during index generation don't cause a fatal
error. Make package file disappearing during filelist generation also
a non-fatal error.
Signed-off-by: Dmitry Eremin-Solenikov
---
.../opkg-utils/index-ignore-filenotfound.patch | 17 +
meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb |2 +-
2 files changed, 18 insertions(+), 1 deletions(-)
diff --git
a/meta/recipes-devtools/opkg-utils/opkg-utils/index-ignore-filenotfound.patch
b/meta/recipes-devtools/opkg-utils/opkg-utils/index-ignore-filenotfound.patch
index 3664df6..f0f0fcf 100644
---
a/meta/recipes-devtools/opkg-utils/opkg-utils/index-ignore-filenotfound.patch
+++
b/meta/recipes-devtools/opkg-utils/opkg-utils/index-ignore-filenotfound.patch
@@ -54,3 +54,20 @@ Index: opkg-utils/opkg-make-index
if packages_filename:
sys.stdout.close()
sys.stdout = old_stdout
+@@ -197,7 +197,15 @@
+ names = packages.packages.keys()
+ names.sort()
+ for name in names:
+- for fn in packages[name].get_file_list():
++ try:
++ fnlist = packages[name].get_file_list()
++ except OSError, e:
++ sys.stderr.write("Package %s disappeared on us!\n" % (name))
++ continue
++ except IOError, e:
++ sys.stderr.write("Package %s disappeared on us!\n" % (name))
++ continue
++ for fn in fnlist:
+ (h,t) = os.path.split(fn)
+ if not t: continue
+ if not files.has_key(t): files[t] = name+':'+fn
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb
b/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb
index fd2b5e6..e04b74a 100644
--- a/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb
@@ -8,7 +8,7 @@ RDEPENDS_${PN} = "python"
RDEPENDS_${PN}_virtclass-native = ""
SRCREV = "4747"
PV = "0.1.8+svnr${SRCPV}"
-PR = "r4"
+PR = "r5"
SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=opkg-utils;proto=http
\
file://index-ignore-filenotfound.patch \
--
1.7.6
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 16/21] multilib.bbclass: add "pkg_postinst" and "pkg_postrm" as renaming elements
From: Dongxiao Xu
Add "pkg_postinst" and "pkg_postrm" as renaming elements, which fixes
missing post install/rm scripts in target image.
Signed-off-by: Dongxiao Xu
---
meta/classes/multilib.bbclass |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index 46c24e1..5976d5d 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -73,7 +73,7 @@ python __anonymous () {
d.setVar("PACKAGES", " ".join([row[1] for row in pkgs_mapping]))
for pkg_mapping in pkgs_mapping:
-for subs in ["FILES", "RDEPENDS", "RRECOMMENDS", "SUMMARY",
"DESCRIPTION", "RSUGGESTS", "RPROVIDES", "RCONFLICTS", "PKG", "ALLOW_EMPTY"]:
+for subs in ["FILES", "RDEPENDS", "RRECOMMENDS", "SUMMARY",
"DESCRIPTION", "RSUGGESTS", "RPROVIDES", "RCONFLICTS", "PKG", "ALLOW_EMPTY",
"pkg_postinst", "pkg_postrm"]:
d.renameVar("%s_%s" % (subs, pkg_mapping[0]), "%s_%s" % (subs,
pkg_mapping[1]))
map_dependencies("DEPENDS", d)
--
1.7.6
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 15/21] multilib.bbclass: Fix renaming logic for "FILES_", "RDEPENDS_", etc
From: Dongxiao Xu
In the orignal logic, the renaming will not work for "FILES_" if defined
variables as:
PACKAGES = "${PN}"
FILES_abc = "/usr/include/abc.h"
It is because ${PN} is "lib64-abc" so it will not be contained in
pkgrename.
This commit enumerates all element in PACKAGES, getting the original
packages and multilib packages, then doing renaming for "FILES_",
"RDEPENDS_", etc. This fixes a lot of missing files and incorrect
dependencies.
Signed-off-by: Dongxiao Xu
---
meta/classes/multilib.bbclass | 18 --
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index 571b7be..46c24e1 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -63,20 +63,18 @@ python __anonymous () {
newvar.append(extend_name(v))
d.setVar(varname, " ".join(newvar))
-pkgs = []
-pkgrename = {}
+pkgs_mapping = []
for pkg in (d.getVar("PACKAGES", True) or "").split():
if pkg.startswith(variant):
-pkgs.append(pkg)
+pkgs_mapping.append([pkg.split(variant + "-")[1], pkg])
continue
-pkgrename[pkg] = extend_name(pkg)
-pkgs.append(pkgrename[pkg])
+pkgs_mapping.append([pkg, extend_name(pkg)])
-if pkgrename:
-d.setVar("PACKAGES", " ".join(pkgs))
-for pkg in pkgrename:
-for subs in ["FILES", "RDEPENDS", "RRECOMMENDS", "SUMMARY",
"DESCRIPTION", "RSUGGESTS", "RPROVIDES", "RCONFLICTS", "PKG", "ALLOW_EMPTY"]:
-d.renameVar("%s_%s" % (subs, pkg), "%s_%s" % (subs,
pkgrename[pkg]))
+d.setVar("PACKAGES", " ".join([row[1] for row in pkgs_mapping]))
+
+for pkg_mapping in pkgs_mapping:
+for subs in ["FILES", "RDEPENDS", "RRECOMMENDS", "SUMMARY",
"DESCRIPTION", "RSUGGESTS", "RPROVIDES", "RCONFLICTS", "PKG", "ALLOW_EMPTY"]:
+d.renameVar("%s_%s" % (subs, pkg_mapping[0]), "%s_%s" % (subs,
pkg_mapping[1]))
map_dependencies("DEPENDS", d)
for pkg in (d.getVar("PACKAGES", True).split() + [""]):
--
1.7.6
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 14/21] bitbake.conf: Use BPN in FILES paths
From: Dongxiao Xu
Use BPN instead of PN in FILES path to support multilib.
Signed-off-by: Dongxiao Xu
---
meta/conf/bitbake.conf |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index b3ff047..a68be07 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -262,7 +262,7 @@ FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/*
${libdir}/lib*${SOLIBS}
${sysconfdir} ${sharedstatedir} ${localstatedir} \
${base_bindir}/* ${base_sbindir}/* \
${base_libdir}/*${SOLIBS} \
-${datadir}/${PN} ${libdir}/${PN}/* \
+${datadir}/${BPN} ${libdir}/${BPN}/* \
${datadir}/pixmaps ${datadir}/applications \
${datadir}/idl ${datadir}/omf ${datadir}/sounds \
${libdir}/bonobo/servers"
@@ -283,7 +283,7 @@ SECTION_${PN}-staticdev = "devel"
RDEPENDS_${PN}-staticdev = "${PN}-dev (= ${EXTENDPKGV})"
DOTDEBUG-dbg = "${bindir}/.debug ${sbindir}/.debug ${libexecdir}/.debug
${libdir}/.debug \
-${base_bindir}/.debug ${base_sbindir}/.debug ${base_libdir}/.debug
${libdir}/${PN}/.debug \
+${base_bindir}/.debug ${base_sbindir}/.debug ${base_libdir}/.debug
${libdir}/${BPN}/.debug \
${libdir}/matchbox-panel/.debug /usr/src/debug"
DEBUGFILEDIRECTORY-dbg = "/usr/lib/debug /usr/src/debug"
--
1.7.6
___
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] base-passwd: Use BPN in FILES paths
From: Dongxiao Xu
Use BPN instead of PN in FILES paths.
This fixes the login issue by /etc/passwd missing in multilib images.
Signed-off-by: Dongxiao Xu
---
.../recipes-core/base-passwd/base-passwd_3.5.22.bb | 10 +-
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-core/base-passwd/base-passwd_3.5.22.bb
b/meta/recipes-core/base-passwd/base-passwd_3.5.22.bb
index a155b41..137512d 100644
--- a/meta/recipes-core/base-passwd/base-passwd_3.5.22.bb
+++ b/meta/recipes-core/base-passwd/base-passwd_3.5.22.bb
@@ -30,11 +30,11 @@ do_install () {
install -o root -g root -p -m 644 passwd.master
${D}${datadir}/base-passwd/
install -o root -g root -p -m 644 group.master
${D}${datadir}/base-passwd/
- install -d -m 755 ${D}${docdir}/${PN}
- install -p -m 644 debian/changelog ${D}${docdir}/${PN}/
- gzip -9 ${D}${docdir}/${PN}/*
- install -p -m 644 README ${D}${docdir}/${PN}/
- install -p -m 644 debian/copyright ${D}${docdir}/${PN}/
+ install -d -m 755 ${D}${docdir}/${BPN}
+ install -p -m 644 debian/changelog ${D}${docdir}/${BPN}/
+ gzip -9 ${D}${docdir}/${BPN}/*
+ install -p -m 644 README ${D}${docdir}/${BPN}/
+ install -p -m 644 debian/copyright ${D}${docdir}/${BPN}/
}
pkg_postinst_${PN} () {
--
1.7.6
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 12/21] qt4e-demo-image: Fix bug 999
From: Xiaofeng Yan
[YOCTO #999]
Copy metadata of qt4e-demo-image from OE for easy testing qt4embeded on
embedded platform.
This image was tested on qemuarm and can run program "qtdemoE".
Signed-off-by: Xiaofeng Yan
---
meta/recipes-qt/images/qt4e-demo-image.bb | 19 ++
meta/recipes-qt/tasks/task-qt4e.bb| 56 +
2 files changed, 75 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-qt/images/qt4e-demo-image.bb
create mode 100644 meta/recipes-qt/tasks/task-qt4e.bb
diff --git a/meta/recipes-qt/images/qt4e-demo-image.bb
b/meta/recipes-qt/images/qt4e-demo-image.bb
new file mode 100644
index 000..f2150ca
--- /dev/null
+++ b/meta/recipes-qt/images/qt4e-demo-image.bb
@@ -0,0 +1,19 @@
+LICENSE = "MIT"
+PR="r1"
+
+LIC_FILES_CHKSUM =
"file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+DEPENDS += "task-qt4e"
+
+RDEPENDS_${PN} += " \
+ task-qt4e-base \
+ "
+
+IMAGE_INSTALL += "\
+ module-init-tools \
+ task-qt4e-base \
+"
+
+inherit core-image
+
diff --git a/meta/recipes-qt/tasks/task-qt4e.bb
b/meta/recipes-qt/tasks/task-qt4e.bb
new file mode 100644
index 000..c95c898
--- /dev/null
+++ b/meta/recipes-qt/tasks/task-qt4e.bb
@@ -0,0 +1,56 @@
+DESCRIPTION = "QT4 Embedded base Image Feed"
+PR = "r1"
+LICENSE = "MIT"
+
+LIC_FILES_CHKSUM =
"file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+inherit task
+
+TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib
tslib-calibrate tslib-tests", "",d)}'
+
+PACKAGES += " \
+ ${PN}-base \
+"
+
+RDEPENDS_${PN}-base = " \
+ qt4-embedded \
+ libqt-embedded3support4 \
+ libqt-embeddedclucene4 \
+ libqt-embeddedcore4 \
+ libqt-embeddeddbus4 \
+ libqt-embeddedgui4 \
+ libqt-embeddedhelp4 \
+ libqt-embeddedmultimedia4 \
+ libqt-embeddednetwork4 \
+ libqt-embeddedscript4 \
+ libqt-embeddedscripttools4 \
+ libqt-embeddedsql4 \
+ libqt-embeddedsvg4 \
+ libqt-embeddedtest4 \
+ libqt-embeddedwebkit4 \
+ libqt-embeddedxml4 \
+ qt4-embedded-fonts-ttf-dejavu \
+ qt4-embedded-fonts-ttf-vera \
+ qt4-embedded-plugin-iconengine-svgicon \
+ qt4-embedded-plugin-imageformat-gif \
+ qt4-embedded-plugin-imageformat-ico \
+ qt4-embedded-plugin-imageformat-jpeg \
+ qt4-embedded-plugin-imageformat-mng \
+ qt4-embedded-plugin-imageformat-svg \
+ qt4-embedded-plugin-imageformat-tiff \
+ qt4-embedded-plugin-mousedriver-tslib \
+ qt4-embedded-plugin-phonon-backend-gstreamer \
+ qt4-embedded-plugin-script-dbus \
+ qt4-embedded-plugin-sqldriver-sqlite \
+ ${TOUCH} \
+qt4-embedded-demos \
+qt4-embedded-examples \
+qt-demo-init \
+qt4-embedded-assistant \
+"
+
+RRECOMMENDS_${PN}-base = " \
+ libqt-embeddedxmlpatterns4 \
+"
+
--
1.7.6
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 11/21] linux-yocto-rt: qemumips: fix boot panic
From: Bruce Ashfield Fixes [YOCTO #1392] Updating the SRCREVs to pickup: [ mips/rt: convert cascade interrupt non threaded The preempt_rt kernel forces all irq interrupts to be threaded, but special interrupts can be excluded from this conversion. The cascade interrupt should be part of these exceptions. In this case, irq2 is initialized before "kthreadd" task, which converts irq interrupt to threaded. If this irq is threaded, the kernel calls "try_to_wake_up" function to wake up "kthreadd" task, but at that moment, "kthreadd" task has no been initialize and try_to_wake_up wakes up a NULL task. Signed-off-by: Liming Wang ] Signed-off-by: Bruce Ashfield --- meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb index 16daddf..2bee543 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb @@ -14,8 +14,8 @@ KBRANCH_qemuppc = "yocto/standard/preempt-rt/qemu-ppc32" LINUX_VERSION ?= "3.0.3" LINUX_KERNEL_TYPE = "preempt-rt" -SRCREV_machine ?= "67ce0924042a2faa12b71ac3e92175c789c32af6" -SRCREV_machine_qemuppc ?= "839638f4efda0c70c6f491161ab2c042f5bc3e66" +SRCREV_machine ?= "c86423d29c94525d18ef1c9b6c025f733c1e8252" +SRCREV_machine_qemuppc ?= "ccb47c9e8d85dc00ccd28bc6819d7769e2c11cb3" SRCREV_meta ?= "5b535279e61197cb194bb2dfceb8b7a04128387c" PR = "r0" -- 1.7.6 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 10/21] scripts/runqemu: disable unfs boot mode for qemuppc
From: Liming Wang Because unfs boot mode is unstable for qemuppc, disable it temporarily. Signed-off-by: Liming Wang --- scripts/runqemu |6 ++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/scripts/runqemu b/scripts/runqemu index 91c3c9e..113088e 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -354,6 +354,12 @@ if [ -z "$FSTYPE" ]; then usage fi fi + +if [ "$FSTYPE" = "nfs" -a "$MACHINE" = "qemuppc" ]; then +echo "Error: usermode NFS boot is not available for qemuppc." +exit 1 +fi + # FSTYPE is now set for all cases # Handle cases where a ROOTFS type is given instead of a filename, e.g. -- 1.7.6 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 09/21] kernel.bbclass: support kernel image type of vmlinux.gz
From: Mike Crowe
Add support for a gzipped vmlinux kernel by specifying:
KERNEL_IMAGETYPE = "vmlinux.gz"
Signed-off-by: Mike Crowe
---
meta/classes/kernel.bbclass |7 ++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 52aea97..229679c 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -75,10 +75,15 @@ EXTRA_OEMAKE = ""
KERNEL_ALT_IMAGETYPE ??= ""
+KERNEL_IMAGETYPE_FOR_MAKE = "${@(lambda s: s[:-3] if s[-3:] == ".gz" else
s)(bb.data.getVar('KERNEL_IMAGETYPE', d, 1))}"
+
kernel_do_compile() {
unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
oe_runmake include/linux/version.h CC="${KERNEL_CC}" LD="${KERNEL_LD}"
- oe_runmake ${KERNEL_IMAGETYPE} ${KERNEL_ALT_IMAGETYPE}
CC="${KERNEL_CC}" LD="${KERNEL_LD}"
+ oe_runmake ${KERNEL_IMAGETYPE_FOR_MAKE} ${KERNEL_ALT_IMAGETYPE}
CC="${KERNEL_CC}" LD="${KERNEL_LD}"
+ if test "${KERNEL_IMAGETYPE_FOR_MAKE}.gz" = "${KERNEL_IMAGETYPE}"; then
+ gzip -9c < "${KERNEL_IMAGETYPE_FOR_MAKE}" > "${KERNEL_OUTPUT}"
+ fi
}
do_compile_kernelmodules() {
--
1.7.6
___
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] cmake-nativesdk: remove gcc standard paths
From: Kang Kai
Because of the gcc-crosssdk bug, cmake-nativesdk needs to search gcc
standard paths itself. Right now it was fixed, so remove the additional
CXXFLAG for cmake-nativesdk.
Signed-off-by: Kang Kai
---
meta/recipes-devtools/cmake/cmake_2.8.5.bb |8 +---
1 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/meta/recipes-devtools/cmake/cmake_2.8.5.bb
b/meta/recipes-devtools/cmake/cmake_2.8.5.bb
index 64e7574..4fa9562 100644
--- a/meta/recipes-devtools/cmake/cmake_2.8.5.bb
+++ b/meta/recipes-devtools/cmake/cmake_2.8.5.bb
@@ -4,7 +4,7 @@ inherit cmake
DEPENDS += "curl expat zlib libarchive ncurses"
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
SRC_URI += "file://dont-run-cross-binaries.patch"
@@ -33,12 +33,6 @@ EXTRA_OECMAKE=" \
${@base_contains('DISTRO_FEATURES', 'largefile', '-DKWSYS_LFS_WORKS=1',
'-DKWSYS_LFS_DISABLE=1', d)} \
"
-# FIXME: Hack due gcc-crosssdk not being able to detect those automatically
-CXXFLAGS_virtclass-nativesdk += " \
- -I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/include/c++ \
- -I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/include/c++/${TARGET_SYS} \
- "
-
FILES_${PN} += "${datadir}/cmake-${CMAKE_MAJOR_VERSION}"
FILES_${PN}-doc += "${docdir}/cmake-${CMAKE_MAJOR_VERSION}"
--
1.7.6
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 03/21] script/runqemu: change boot command line for qemuppc
From: Liming Wang Because qemuppc has no graphic emulation, remove console=tty0 and make it run into 3 run level. This can reduce boot time for qemuppc booting. Signed-off-by: Liming Wang --- scripts/runqemu-internal |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal index c15632d..883fa5b 100755 --- a/scripts/runqemu-internal +++ b/scripts/runqemu-internal @@ -384,7 +384,7 @@ if [ "$MACHINE" = "qemuppc" ]; then BIOS=powerpc_rom.bin QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -nographic" if [ "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then -KERNCMDLINE="root=/dev/hda rw console=ttyS0 console=tty0 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" +KERNCMDLINE="root=/dev/hda rw console=ttyS0 3 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE -M $MACHINE_SUBTYPE -bios $BIOS -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS" fi if [ "$FSTYPE" = "nfs" ]; then @@ -393,7 +393,7 @@ if [ "$MACHINE" = "qemuppc" ]; then cleanup return fi -KERNCMDLINE="root=/dev/nfs console=ttyS0 console=tty0 nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" +KERNCMDLINE="root=/dev/nfs console=ttyS0 3 nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE -M $MACHINE_SUBTYPE -bios $BIOS -no-reboot $QEMU_UI_OPTIONS" fi fi -- 1.7.6 ___ 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]
Richard, A variety of changes Sau! The following changes since commit 81aa4bfbde871af1d569b64499c34a315bf6218e: classes/sanity: enhance the network connectivity test (2011-08-25 08:49:12 -0700) 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 Bruce Ashfield (1): linux-yocto-rt: qemumips: fix boot panic Dmitry Eremin-Solenikov (1): opkg-utils: ignore packages disapperaring filelist generation Dongxiao Xu (6): package.bbclass: Fix recrdeptask of image type recipes base-passwd: Use BPN in FILES paths bitbake.conf: Use BPN in FILES paths multilib.bbclass: Fix renaming logic for "FILES_", "RDEPENDS_", etc multilib.bbclass: add "pkg_postinst" and "pkg_postrm" as renaming elements multilib.bbclass: add renaming for INITSCRIPT related variables Jessica Zhang (1): [YOCTO #1396] Fix adt-installer for consistent naming for powerpc and add all arch template for installation Kang Kai (3): bitbake.conf: set includedir_nativesdk qt4-tools-nativesdk: remove gcc standard paths cmake-nativesdk: remove gcc standard paths Kumar Gala (2): gcc-4.6: Drop gcc-poison-parameters.patch as its not need gcc-4.5.1: Drop gcc-poison-parameters.patch, replace with bug fix patch Liming Wang (2): script/runqemu: change boot command line for qemuppc scripts/runqemu: disable unfs boot mode for qemuppc Martin Jansa (1): eglibc: fix gconv packaging after 5486cac29db6e67051fff7637a0abc9aeab661e5 Mike Crowe (2): kernel.bbclass: support kernel image type of vmlinux.gz kernel.bbclass: Find the kernel consistently. Phil Blundell (1): pango: make x11 support conditional on DISTRO_FEATURES Xiaofeng Yan (1): qt4e-demo-image: Fix bug 999 meta/classes/kernel.bbclass| 13 +- meta/classes/multilib.bbclass | 19 +- meta/classes/package.bbclass |2 +- meta/conf/bitbake.conf |5 +- .../recipes-core/base-passwd/base-passwd_3.5.22.bb | 10 +- meta/recipes-core/eglibc/eglibc-package.inc|4 +- meta/recipes-core/eglibc/eglibc_2.12.bb|2 +- meta/recipes-core/eglibc/eglibc_2.13.bb|2 +- meta/recipes-devtools/cmake/cmake_2.8.5.bb |8 +- meta/recipes-devtools/gcc/gcc-4.5.1.inc|4 +- .../gcc/gcc-4.5.1/gcc-poison-parameters.patch | 85 -- meta/recipes-devtools/gcc/gcc-4.5.1/pr44618.patch | 314 meta/recipes-devtools/gcc/gcc-4.6.inc |3 +- .../gcc/gcc-4.6/gcc-poison-parameters.patch| 76 - .../installer/adt-installer/adt_installer.conf | 17 +- .../adt-installer/scripts/adt_installer_internal |2 +- .../installer/adt-installer/scripts/data_define|2 +- .../opkg-utils/index-ignore-filenotfound.patch | 17 + meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb |2 +- meta/recipes-graphics/pango/pango.inc | 10 +- meta/recipes-graphics/pango/pango_1.28.4.bb|2 +- meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb|4 +- meta/recipes-qt/images/qt4e-demo-image.bb | 19 ++ meta/recipes-qt/qt4/qt4-tools-nativesdk.inc|9 +- meta/recipes-qt/tasks/task-qt4e.bb | 56 scripts/runqemu|6 + scripts/runqemu-internal |4 +- 27 files changed, 478 insertions(+), 219 deletions(-) delete mode 100644 meta/recipes-devtools/gcc/gcc-4.5.1/gcc-poison-parameters.patch create mode 100644 meta/recipes-devtools/gcc/gcc-4.5.1/pr44618.patch delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/gcc-poison-parameters.patch create mode 100644 meta/recipes-qt/images/qt4e-demo-image.bb create mode 100644 meta/recipes-qt/tasks/task-qt4e.bb -- 1.7.6 ___ 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] package.bbclass: Fix recrdeptask of image type recipes
From: Dongxiao Xu
For image type of recipes, we need to define do_package_write as its
do_build recrdeptask, which ensures that all packaging types listed in
PACKAGE_CLASSES will be built out.
[YOCTO 1370]
Signed-off-by: Dongxiao Xu
---
meta/classes/package.bbclass |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 96675de..15c4142 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -184,7 +184,7 @@ python () {
# shlibs requires any DEPENDS to have already packaged for the *.list
files
deps.append("do_package")
bb.data.setVarFlag('do_package', 'deptask', " ".join(deps), d)
-else:
+elif not bb.data.inherits_class('image', d):
d.setVar("PACKAGERDEPTASK", "")
}
--
1.7.6
___
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] qt4-tools-nativesdk: remove gcc standard paths
From: Kang Kai
gcc-crosssdk can't find the standard headers before, and it was fixed.
So it is not needed to search the gcc standard paths by
qt4-tools-nativesdk itself.
Signed-off-by: Kang Kai
---
meta/recipes-qt/qt4/qt4-tools-nativesdk.inc |9 ++---
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
index cc83b72..068528e 100644
--- a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
+++ b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
@@ -4,7 +4,7 @@ SECTION = "libs"
HOMEPAGE = "http://qt.nokia.com";
LICENSE = "LGPLv2.1 | GPLv3"
-INC_PR = "r4"
+INC_PR = "r5"
FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:"
@@ -43,13 +43,8 @@ EXTRA_OECONF = "-prefix ${prefix} \
-arch ${@qt_arch(d)} \
-embedded -no-freetype -no-glib -no-iconv \
-qt3support \
--I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/include \
-I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/include/dbus-1.0 \
--I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/lib/dbus-1.0/include
\
--I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/include/c++ \
-
-I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/include/c++/${TARGET_SYS} \
--L${STAGING_DIR_HOST}${SDKPATHNATIVE}/lib \
--L${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/lib"
+-I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/lib/dbus-1.0/include"
# yank default -e, otherwise we get the following error:
# moc_qbuffer.cpp: No such file or directory
--
1.7.6
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 01/21] gcc-4.6: Drop gcc-poison-parameters.patch as its not need
From: Kumar Gala
The gcc-poison-parameters was added specifically to deal with an issue
on ppc targets and a bug when we build with -Os -frename-registers.
This bug below reports the issue and is fixed in gcc-4.6.x:
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=44618
Signed-off-by: Kumar Gala
---
meta/recipes-devtools/gcc/gcc-4.6.inc |3 +-
.../gcc/gcc-4.6/gcc-poison-parameters.patch| 76
2 files changed, 1 insertions(+), 78 deletions(-)
delete mode 100644
meta/recipes-devtools/gcc/gcc-4.6/gcc-poison-parameters.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.6.inc
b/meta/recipes-devtools/gcc/gcc-4.6.inc
index 28a70f3..290d8f2 100644
--- a/meta/recipes-devtools/gcc/gcc-4.6.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.6.inc
@@ -1,6 +1,6 @@
require gcc-common.inc
-PR = "r7"
+PR = "r8"
# Third digit in PV should be incremented after a minor release
# happens from this branch on gcc e.g. currently its 4.6.0
@@ -62,7 +62,6 @@ SRC_URI =
"svn://gcc.gnu.org/svn/gcc/branches;module=${BRANCH};proto=http \
file://64bithack.patch \
file://optional_libstdc.patch \
file://disable_relax_pic_calls_flag.patch \
- file://gcc-poison-parameters.patch \
file://GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch \
file://COLLECT_GCC_OPTIONS.patch \
file://volatile_access_backport.patch \
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/gcc-poison-parameters.patch
b/meta/recipes-devtools/gcc/gcc-4.6/gcc-poison-parameters.patch
deleted file mode 100644
index 58bf32f..000
--- a/meta/recipes-devtools/gcc/gcc-4.6/gcc-poison-parameters.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-Upstream-Status: Pending
-
-gcc: add poison parameters detection
-
-Add the logic that, if not configured with "--enable-target-optspace",
-gcc will meet error when build target app with "-Os" option.
-This could avoid potential binary crash.
-
-Signed-off-by: Dongxiao Xu
-
-Index: gcc-4.6.0/gcc/config.in
-===
gcc-4.6.0.orig/gcc/config.in
-+++ gcc-4.6.0/gcc/config.in
-@@ -150,6 +150,12 @@
- #endif
-
-
-+/* Define to enable target optspace support. */
-+#ifndef USED_FOR_TARGET
-+#undef ENABLE_TARGET_OPTSPACE
-+#endif
-+
-+
- /* Define if you want all operations on RTL (the basic data structure of the
-optimizer and back end) to be checked for dynamic type safety at runtime.
-This is quite expensive. */
-Index: gcc-4.6.0/gcc/configure
-===
gcc-4.6.0.orig/gcc/configure
-+++ gcc-4.6.0/gcc/configure
-@@ -26434,6 +26434,13 @@ $as_echo "#define ENABLE_LIBQUADMATH_SUP
- fi
-
-
-+if test x"$enable_target_optspace" != x; then :
-+
-+$as_echo "#define ENABLE_TARGET_OPTSPACE 1" >>confdefs.h
-+
-+fi
-+
-+
- # Configure the subdirectories
- # AC_CONFIG_SUBDIRS($subdirs)
-
-Index: gcc-4.6.0/gcc/configure.ac
-===
gcc-4.6.0.orig/gcc/configure.ac
-+++ gcc-4.6.0/gcc/configure.ac
-@@ -4907,6 +4907,11 @@ if test "${ENABLE_LIBQUADMATH_SUPPORT}"
- fi
-
-
-+AC_SUBST(enable_target_optspace)
-+if test x"$enable_target_optspace" != x; then
-+ AC_DEFINE(ENABLE_TARGET_OPTSPACE, 1, [Define to enable target optspace
support.])
-+fi
-+
- # Configure the subdirectories
- # AC_CONFIG_SUBDIRS($subdirs)
-
-Index: gcc-4.6.0/gcc/opts.c
-===
gcc-4.6.0.orig/gcc/opts.c
-+++ gcc-4.6.0/gcc/opts.c
-@@ -605,6 +605,10 @@ default_options_optimization (struct gcc
- maybe_set_param_value (PARAM_MIN_CROSSJUMP_INSNS,
- default_param_value (PARAM_MIN_CROSSJUMP_INSNS),
- opts->x_param_values, opts_set->x_param_values);
-+#ifndef ENABLE_TARGET_OPTSPACE
-+ if (optimize_size == 1)
-+error ("Do not use -Os option if --enable-target-optspace is not set.");
-+#endif
-
- /* Allow default optimizations to be specified on a per-machine basis. */
- maybe_default_options (opts, opts_set,
--
1.7.6
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 06/21] bitbake.conf: set includedir_nativesdk
From: Kang Kai
Fixes [Yocto #1231]
crosssdk.bbclass uses ${includedir_nativesdk} to define target_includedir,
but includedir_nativesdk is not defined before. This makes gcc-crosssdk
can NOT search the correct standard headers and libraries search path.
Define includedir_nativesdk in bitbake.conf.
Signed-off-by: Kang Kai
---
meta/conf/bitbake.conf |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index b309516..b3ff047 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -53,6 +53,7 @@ bindir_cross = "/bin"
bindir_crossscripts = "${bindir}/crossscripts"
prefix_nativesdk = "/usr"
bindir_nativesdk = "${prefix_nativesdk}/bin"
+includedir_nativesdk = "${prefix_nativesdk}/include"
libdir_nativesdk = "${prefix_nativesdk}/lib"
base_libdir_nativesdk = "/lib"
localstatedir_nativesdk = "/var"
--
1.7.6
___
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] gcc-4.5.1: Drop gcc-poison-parameters.patch, replace with bug fix patch
From: Kumar Gala
The gcc-poison-parameters was added specifically to deal with an issue
on ppc targets and a bug when we build with -Os -frename-registers.
This bug below reports the issue and is fixed in gcc-4.6.x/mainline:
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=44618
Backport patch to gcc 4.5.1.
Signed-off-by: Kumar Gala
---
meta/recipes-devtools/gcc/gcc-4.5.1.inc|4 +-
.../gcc/gcc-4.5.1/gcc-poison-parameters.patch | 85 --
meta/recipes-devtools/gcc/gcc-4.5.1/pr44618.patch | 314
3 files changed, 316 insertions(+), 87 deletions(-)
delete mode 100644
meta/recipes-devtools/gcc/gcc-4.5.1/gcc-poison-parameters.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.5.1/pr44618.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.5.1.inc
b/meta/recipes-devtools/gcc/gcc-4.5.1.inc
index aa1cc95..f2991f2 100644
--- a/meta/recipes-devtools/gcc/gcc-4.5.1.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.5.1.inc
@@ -1,6 +1,6 @@
require gcc-common.inc
-PR = "r8"
+PR = "r9"
DEPENDS =+ "mpfr gmp libmpc elfutils"
NATIVEDEPS = "mpfr-native gmp-native gettext-native libmpc-native
elfutils-native"
@@ -56,7 +56,6 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
file://64bithack.patch \
file://optional_libstdc.patch \
file://disable_relax_pic_calls_flag.patch \
- file://gcc-poison-parameters.patch \
file://GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch \
file://COLLECT_GCC_OPTIONS.patch \
file://use-defaults.h-and-t-oe-in-B.patch \
@@ -66,6 +65,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
file://pr45094.patch \
file://pr45052.patch \
file://pr45886.patch \
+ file://pr44618.patch \
"
SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch "
diff --git a/meta/recipes-devtools/gcc/gcc-4.5.1/gcc-poison-parameters.patch
b/meta/recipes-devtools/gcc/gcc-4.5.1/gcc-poison-parameters.patch
deleted file mode 100644
index 74d4527..000
--- a/meta/recipes-devtools/gcc/gcc-4.5.1/gcc-poison-parameters.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-Upstream-Status: Pending
-
-gcc: add poison parameters detection
-
-Add the logic that, if not configured with "--enable-target-optspace",
-gcc will meet error when build target app with "-Os" option.
-This could avoid potential binary crash.
-
-Signed-off-by: Dongxiao Xu
-
-diff --git a/gcc/config.in b/gcc/config.in
-index a9e208f..3004321 100644
a/gcc/config.in
-+++ b/gcc/config.in
-@@ -132,6 +132,12 @@
- #endif
-
-
-+/* Define to enable target optspace support. */
-+#ifndef USED_FOR_TARGET
-+#undef ENABLE_TARGET_OPTSPACE
-+#endif
-+
-+
- /* Define if you want all operations on RTL (the basic data structure of the
-optimizer and back end) to be checked for dynamic type safety at runtime.
-This is quite expensive. */
-diff --git a/gcc/configure b/gcc/configure
-index 2e022ed..004ec0b 100755
a/gcc/configure
-+++ b/gcc/configure
-@@ -909,6 +909,7 @@ enable_maintainer_mode
- enable_version_specific_runtime_libs
- with_slibdir
- enable_plugin
-+enable_target_optspace
- '
- ac_precious_vars='build_alias
- host_alias
-@@ -25289,6 +25290,13 @@ $as_echo "#define ENABLE_PLUGIN 1" >>confdefs.h
-
- fi
-
-+if test x"$enable_target_optspace" != x; then :
-+
-+$as_echo "#define ENABLE_TARGET_OPTSPACE 1" >>confdefs.h
-+
-+fi
-+
-+
- # Configure the subdirectories
- # AC_CONFIG_SUBDIRS($subdirs)
-
-diff --git a/gcc/configure.ac b/gcc/configure.ac
-index ac4ca70..18ec0aa 100644
a/gcc/configure.ac
-+++ b/gcc/configure.ac
-@@ -4434,6 +4434,11 @@ if test x"$enable_plugin" = x"yes"; then
- AC_DEFINE(ENABLE_PLUGIN, 1, [Define to enable plugin support.])
- fi
-
-+AC_SUBST(enable_target_optspace)
-+if test x"$enable_target_optspace" != x; then
-+ AC_DEFINE(ENABLE_TARGET_OPTSPACE, 1, [Define to enable target optspace
support.])
-+fi
-+
- # Configure the subdirectories
- # AC_CONFIG_SUBDIRS($subdirs)
-
-diff --git a/gcc/opts.c b/gcc/opts.c
-index 139cd26..2fdd96a 100644
a/gcc/opts.c
-+++ b/gcc/opts.c
-@@ -945,6 +945,11 @@ decode_options (unsigned int argc, const char **argv)
- else
- set_param_value ("min-crossjump-insns", initial_min_crossjump_insns);
-
-+#ifndef ENABLE_TARGET_OPTSPACE
-+ if (optimize_size == 1)
-+error ("Do not use -Os option if --enable-target-optspace is not set.");
-+#endif
-+
- if (first_time_p)
- {
- /* Initialize whether `char' is signed. */
diff --git a/meta/recipes-devtools/gcc/gcc-4.5.1/pr44618.patch
b/meta/recipes-devtools/gcc/gcc-4.5.1/pr44618.patch
new file mode 100644
index 000..23f41cc
--- /dev/null
+++ b/meta/recipes-devtools/gcc/gcc-4.5.1/pr44618.patch
@@ -0,0 +1,314 @@
+Upstream-Status: Pending
+
+Backport of bugfix in gcc-4.6.x and mainline that address bug 44618 in
+which we get wrong code generation with -Os -frename-registers.
+
+ 2011-06-13 Edmar Wienskoski
+
+ P
[OE-core] [CONSOLIDATED PULL 05/21] [YOCTO #1396] Fix adt-installer for consistent naming for powerpc and add all arch template for installation
From: Jessica Zhang Signed-off-by: Jessica Zhang --- .../installer/adt-installer/adt_installer.conf | 17 +++-- .../adt-installer/scripts/adt_installer_internal |2 +- .../installer/adt-installer/scripts/data_define|2 +- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer.conf b/meta/recipes-devtools/installer/adt-installer/adt_installer.conf index 0c93237..e31f9af 100644 --- a/meta/recipes-devtools/installer/adt-installer/adt_installer.conf +++ b/meta/recipes-devtools/installer/adt-installer/adt_installer.conf @@ -27,7 +27,7 @@ YOCTOADT_REPO="http://adtrepo.yoctoproject.org/$YOCTOADT_VERSION"; # The following are for system wide setup # Target architectures that you want to setup host cross dev environment for -# valid values are: powerpc, mips, arm, x86, x86_64 with space separation between entries +# valid values are: arm, x86, x86_64, powerpc, mips with space separation between entries YOCTOADT_TARGETS="arm x86" # Whether install qemu or not, valid entries are: Y/N YOCTOADT_QEMU="Y" @@ -40,7 +40,7 @@ YOCTOADT_NFS_UTIL="Y" #The followings are for setting up specific target architecture #YOCTOADT_ROOTFS_$arch is for specifying what root filesystem image files you want to download from the repository. The valid values to replace $arch are: arm, x86, x86_64, powerpc, mips. The valid image files are: minimal, minimal-dev, sato, sato-dev, sato-sdk,lsb, lsb-dev, lsb-sdk. If you want to download multiple images, the entries are space separated -YOCTOADT_ROOTFS_arm="minimal sato-sdk" +YOCTOADT_ROOTFS_arm="minimal" #Specify which root filesystem file to use to extract as target sysroot. Please ensure the entry is in the list of downloaded root filesystem files that specified above in YOCTOADT_ROOTFS_$arch YOCTOADT_TARGET_SYSROOT_IMAGE_arm="minimal" #The location where the target sysroot will be setup @@ -50,3 +50,16 @@ YOCTOADT_TARGET_SYSROOT_LOC_arm="$HOME/test-yocto/arm" #YOCTOADT_ROOTFS_x86="sato-sdk" #YOCTOADT_TARGET_SYSROOT_IMAGE_x86="sato-sdk" #YOCTOADT_TARGET_SYSROOT_LOC_x86="$HOME/test-yocto/x86" + +#Here's some template of other arches, which you need to change the value in "" +#YOCTOADT_TARGET_SYSROOT_IMAGE_x86_64="" +#YOCTOADT_TARGET_SYSROOT_LOC_x86_64="" +#YOCTOADT_ROOTFS_x86_64="" + +#YOCTOADT_TARGET_SYSROOT_IMAGE_powerpc="" +#YOCTOADT_TARGET_SYSROOT_LOC_powerpc="" +#YOCTOADT_ROOTFS_powerpc="" + +#YOCTOADT_TARGET_SYSROOT_IMAGE_mips="" +#YOCTOADT_TARGET_SYSROOT_LOC_mips="" +#YOCTOADT_ROOTFS_mips="" diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal index 870931e..c7de0e2 100755 --- a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal +++ b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal @@ -105,7 +105,7 @@ $OPKG_INSTALL_NATIVE_CMD libtool-nativesdk &>> $YOCTOADT_INSTALL_LOG_FILE check_result for native_target_type in $YOCTOADT_TARGETS; do - native_target_type=`echo "$native_target_type" | sed -e 's/x86_64/x86-64/' -e 's/ppc/powerpc/' -e 's/x86$/i586/'` + native_target_type=`echo "$native_target_type" | sed -e 's/x86_64/x86-64/' -e 's/x86$/i586/'` echo_info "Installing cross toolchain for $native_target_type ..." echo_info "Installing binutils for $native_target_type ..." $OPKG_INSTALL_NATIVE_CMD binutils-cross-canadian-$native_target_type &>> $YOCTOADT_INSTALL_LOG_FILE diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/data_define b/meta/recipes-devtools/installer/adt-installer/scripts/data_define index 2781e77..1de21d7 100644 --- a/meta/recipes-devtools/installer/adt-installer/scripts/data_define +++ b/meta/recipes-devtools/installer/adt-installer/scripts/data_define @@ -32,7 +32,7 @@ OPKG_LIBDIR="/var/lib" # List all supported root fs types and target types, # it will be used in user configuration validity checking YOCTOADT_SUPPORTED_ROOTFS="minimal minimal-dev sato sato-dev sato-sdk lsb lsb-dev lsb-sdk" -YOCTOADT_SUPPORTED_TARGETS="x86 x86_64 arm ppc mips" +YOCTOADT_SUPPORTED_TARGETS="x86 x86_64 arm powerpc mips" # Different host (32 bit or 64 bit) will have different opkg # configuration files YOCTOADT_OPKG_CONF_FILE_32="./opkg/conf/opkg-sdk-i686.conf" -- 1.7.6 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] OE Changelog for 2011-08-15 to 2011-08-22
Changelog for 2011-08-15 to 2011-08-22. Projects included in this report:
bitbake: git://git.openembedded.org/bitbake
openembedded-core: git://git.openembedded.org/openembedded-core
meta-openembedded: git://git.openembedded.org/meta-openembedded
meta-angstrom: git://git.angstrom-distribution.org/meta-angstrom
meta-yocto: git://git.yoctoproject.org/poky
meta-texasinstruments: git://git.angstrom-distribution.org/meta-texasinstruments
meta-smartphone: http://git.shr-project.org/repo/meta-smartphone.git
meta-micro: git://git.openembedded.org/meta-micro
meta-slugos: git://github.com/kraj/meta-slugos
meta-nslu2: git://github.com/kraj/meta-nslu2
meta-intel: git://git.yoctoproject.org/meta-intel
openembedded: git://git.openembedded.org/openembedded
Changelog for bitbake:
Changelog for openembedded-core:
Anders Darander (7):
qmake_base: add uclibceabi
connman: use DISTRO_FEATURES to enable wifi and bluetooth
create-pull-request: increase likelihood of detecting a rename
ofono: conditionally enable bluetooth
qt4: allow a reduction in build time
qemu: modify search paths for libgl
scripts/runqemu: modify search paths for libgl
Beth Flanagan (1):
buildstats.bbclass: Fixing task endtime
Bruce Ashfield (3):
linux-yocto: bump version string to 3.0.1
qemu: change default kernel to 3.0.x
linux-yocto: meta SRCREV bump
Darren Hart (1):
kernel: restore crtsavres.o to enable building external modules on powerpc
Dexuan Cui (10):
bluez-hcidump: upgrade from 2.0 to 2.1
tcf-agent: add openssl into DEPENDS
cronie: upgrade from 1.4.7 to 1.4.8
mdadm: upgrade mdadm from 3.2.1 to 3.2.2
util-macros: upgrade from 1.14.0 to the latest version 0.15.0
freetype: upgrade from 2.4.4 to 2.4.6
xproto: upgrade from 7.0.21 to 7.0.22
glproto: upgrade from 1.4.13 to 1.4.14
dri2proto: upgrade from 2.4 to 2.6
distro_tracking_fields.inc: update the info for the following recipes
Dmitry Eremin-Solenikov (1):
libxcb: enable native/nativesdk builds as was done previously in meta-oe
Dongxiao Xu (10):
rootfs_rpm: Fix DEFAULTTUNE setting in multilib case
package_rpm: enhance strip_multilib function
package_rpm: Fix package rename issue in multilib case
gtk-icon-cache: Adding MLPREFIX when dynamically set RDEPENDS
busybox: Change ${PN} to ${BPN} in file names
sysvinit: Change ${PN} to ${BPN} in file names
curl: Use BPN instead of PN for style like lib${PN}
ea-acl: Use BPN instead of PN for style like lib${PN}
attr: Use BPN instead of PN for style like lib${PN}
acl: Use BPN instead of PN for style like lib${PN}
Jingdong Lu (1):
initrdscripts: fix init-live.sh
Joshua Lock (3):
shadow: switch to a fetchable SRC_URI
glib-2.0: explicitly disable dtrace and systemtap for native varaint
bluez4: drop usbpath from DEPENDS
Kang Kai (6):
at: make at usable for common user
eglibc: check dependencies among eglibc options
mailx: update license and distro tracking fileds
slang: add homepage and update distro tracking fields
alsa-tools: update license and add distro tracking fields
newt: update distro tracking fields
Khem Raj (2):
task-core-tools: Use LTTNGUST variable instead of hardcoding lttng-ust
gdb: Add lttng-ust to DEPENDS only for eglibc
Lianhao Lu (1):
package(_ipk).bbclass: opkg using ALL_MULTILIB_PACKAGE_ARCHS
Martin Jansa (2):
task-core-boot: allow distribution to override default dev_manager provider
bluez4: update recipe from meta-oe
Paul Eggleton (2):
image.bbclass, kernel.bbclass: create warning file about deleting deploydir
sanity.bbclass: add optional untested host distro warning
Phil Blundell (3):
cmake.bbclass, perlnative.bbclass: arrange for cmake to find perl-native
libproxy: remove dependency on X libs
libxslt: fix packaging of static libraries
Richard Purdie (2):
libgcc: Remove fetch/unpack/patch noexec stamps
xcb/libpthreads: Add BBCLASSEXTEND to resolve missing providers in world bui
Wenzong Fan (1):
perl-native: Update find_perl to find the perl wrapper
Zhai Edwin (1):
qemu: Make qemu buildable inside qemux86/qemuppc target
Changelog for meta-openembedded:
Anders Darander (5):
libx11: skip self if x11 not in DISTRO_FEATURES
ckermit: import from OE rev 5350bbef01b8979617e3d0fd38939f94f1fa5315
ckermit: update to version 9.0
connman: conditionally enable wifi and bluetooth
ckermit: revert the SRC_URI change
Andrea Adami (2):
klibc: initial commit of version 1.5.24
klibc.bbclass: shared include for building against klibc
Joel A Fernandes (1):
gnome-system-monitor: Add dependency on gnome-icon-theme
Khem Raj (1):
openssl-1.0.0: Remove spurious comment in recipe
Koen Kooi (7):
xcb: add missing bbappends
nodejs 0.4.2: import from OE rev e02237d7e46e60fbd9eb4a05a308e6adcf916ebb
libvpx 0.9.5: import from OE rev e02237d7e46e60fbd9eb4a05a
Re: [OE-core] [meta-oe][PATCH 0/4] pull request #1 for bechmark recipes
Kindly ignore this pull request. thanks > -Original Message- > From: Ahsan, Noor > Sent: Friday, August 26, 2011 9:32 PM > To: openembedded-core@lists.openembedded.org > Cc: Ahsan, Noor > Subject: [meta-oe][PATCH 0/4] pull request #1 for bechmark recipes > > From: Noor Ahsan > > *** BLURB HERE *** > The following changes since commit > 22ec18224f7a7c64850c76b14017dff2ff4345f2: > pespin (1): > elfe: Add LIC_FILES_CHKSUM to recipe > > are available in the git repository at: > > git://github.com/Noor-Ahsan/meta-oe master > https://github.com/Noor-Ahsan/meta-oe/tree/master > > Noor Ahsan (4): > dbench: Add version 4.0 (initial recipe) > lmbench: Add version 3.0-a9 (initial recipe) > iperf: Add version 2.0.4 (initial recipe) > tiobench: Add version 0.3.3 (initial recipe) > > meta-oe/recipes-benchmark/dbench/dbench_4.0.bb | 26 +++ > .../recipes-benchmark/dbench/files/destdir.patch | 28 +++ > .../recipes-benchmark/dbench/files/makefile.patch | 18 ++ > .../iperf/iperf-2.0.4/000-Iperf_Fix-CPU-Usage.diff | 164 > ++ > .../001-cast-to-max_size_t-instead-of-int.patch| 14 ++ > .../003-fix-hyphen-used-as-minus-sign.patch| 178 > > .../iperf/iperf-2.0.4/004-svn-r43-ro.patch | 117 > + > .../iperf-2.0.4/005-iperf-die-on-bind-fail.patch | 15 ++ > .../006-iperf-die-on-connect-fail.patch| 15 ++ > .../iperf-2.0.4/007-iperf-reporter-deadlock.patch | 68 > .../iperf/iperf-2.0.4/008-numofreport.patch| 15 ++ > .../iperf/iperf-2.0.4/009-delayloop.patch | 22 +++ > meta-oe/recipes-benchmark/iperf/iperf_2.0.4.bb | 47 + > .../lmbench/lmbench-3.0-a9/obey-ranlib.patch | 30 > .../lmbench-3.0-a9/update-results-script.patch | 160 > ++ > .../recipes-benchmark/lmbench/lmbench/lmbench-run | 23 +++ > .../lmbench/lmbench/rename-line-binary.patch | 19 ++ > .../recipes-benchmark/lmbench/lmbench_3.0-a9.bb| 56 ++ > .../tiobench-0.3.3/tiobench-makefile.patch | 49 ++ > .../recipes-benchmark/tiobench/tiobench_0.3.3.bb | 25 +++ > 20 files changed, 1089 insertions(+), 0 deletions(-) > create mode 100644 meta-oe/recipes-benchmark/dbench/dbench_4.0.bb > create mode 100644 meta-oe/recipes- > benchmark/dbench/files/destdir.patch > create mode 100644 meta-oe/recipes- > benchmark/dbench/files/makefile.patch > create mode 100644 meta-oe/recipes-benchmark/iperf/iperf-2.0.4/000- > Iperf_Fix-CPU-Usage.diff > create mode 100644 meta-oe/recipes-benchmark/iperf/iperf-2.0.4/001- > cast-to-max_size_t-instead-of-int.patch > create mode 100644 meta-oe/recipes-benchmark/iperf/iperf-2.0.4/003- > fix-hyphen-used-as-minus-sign.patch > create mode 100644 meta-oe/recipes-benchmark/iperf/iperf-2.0.4/004- > svn-r43-ro.patch > create mode 100644 meta-oe/recipes-benchmark/iperf/iperf-2.0.4/005- > iperf-die-on-bind-fail.patch > create mode 100644 meta-oe/recipes-benchmark/iperf/iperf-2.0.4/006- > iperf-die-on-connect-fail.patch > create mode 100644 meta-oe/recipes-benchmark/iperf/iperf-2.0.4/007- > iperf-reporter-deadlock.patch > create mode 100644 meta-oe/recipes-benchmark/iperf/iperf-2.0.4/008- > numofreport.patch > create mode 100644 meta-oe/recipes-benchmark/iperf/iperf-2.0.4/009- > delayloop.patch > create mode 100644 meta-oe/recipes-benchmark/iperf/iperf_2.0.4.bb > create mode 100644 meta-oe/recipes-benchmark/lmbench/lmbench-3.0- > a9/obey-ranlib.patch > create mode 100644 meta-oe/recipes-benchmark/lmbench/lmbench-3.0- > a9/update-results-script.patch > create mode 100644 meta-oe/recipes-benchmark/lmbench/lmbench/lmbench- > run > create mode 100644 meta-oe/recipes-benchmark/lmbench/lmbench/rename- > line-binary.patch > create mode 100644 meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb > create mode 100644 meta-oe/recipes-benchmark/tiobench/tiobench- > 0.3.3/tiobench-makefile.patch > create mode 100644 meta-oe/recipes- > benchmark/tiobench/tiobench_0.3.3.bb ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Core image recipes
On Friday 26 August 2011 17:18:15 Saul Wold wrote: > On 08/26/2011 02:47 AM, Paul Eggleton wrote: > > meta/recipes-extended/images/core-image-basic.bb > > This image should NOT contain any X11, this is supposed to be an > extention of core-image-minimal with many of the busybox related > commands substituted for the real command set. The intention of this > image is two fold, first it's the largest image that we test against > non-GPLv3 and it's the non-graphical LSB image (I am not sure if there > is a spec test defined for that. Hmm, I'm not sure what I was thinking earlier, you're right it doesn't appear to have X. I can't access the LSB specs website right now unfortunately but does this have an official name within LSB? It's not "LSB-Core" is it? > So, no I do not think they can be merged. But renaming core-image-core > to core-image-x11-base might make sense, also renaming core-image-basic > to core-image-lsb-basic may clear things up. Sounds good to me. Should I send a patch? > > Then, we have core-image-base, which whilst it doesn't remove package > > management files, does not have "package-management" in its features, so > > it's not a whole lot different to core-image-minimal AFAICT. > > On this one I might agree, I know that we have not built that image, nor > does it seem to be used by anything else. If there's demand for a minimal image with package management (someone asked for this on IRC just the other day, and it makes sense to me at least) then that's what I'd suggest turning this into. In which case it ought to be called core-image-minimal-pkgmgmt or something similar. Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [meta-oe][PATCH 0/4] pull request #1 for bechmark recipes
Op 26 aug. 2011, om 18:31 heeft Noor, Ahsan het volgende geschreven: > From: Noor Ahsan > > *** BLURB HERE *** where? Some general remarks: 1) LICENSE = GPL needs a version 2) PR = r0 needs to get deleted 3) RDEPENDS not allowed, only RDEPENDS_pkgname 4) RDEPENDS and friends are grouped with FILES_, not at the top ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [meta-oe][PATCH 2/4] lmbench: Add version 3.0-a9 (initial recipe)
Op 26 aug. 2011, om 18:31 heeft Noor, Ahsan het volgende geschreven:
> From: Noor Ahsan
>
>
> +++ b/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb
> @@ -0,0 +1,56 @@
> +DESCRIPTION = "Tools for performance analysis."
> +HOMEPAGE = "http://lmbench.sourceforge.net/";
> +SECTION = "console/utils"
> +LICENSE = "GPL"
which version?
>
> +RDEPENDS_${PN} = "debianutils"
That needs to go next to FILES_* and friends
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [meta-oe][PATCH 3/4] iperf: Add version 2.0.4 (initial recipe)
From: Noor Ahsan
* Imported from oe.dev commit id 0ff10ecb88de73074ae4857046643cef15dc4e97 and
c10c33f86903c93611023197a7f812459c2dfe2d.
* Combined .inc and bb file from oe.dev and made a single bb file.
* Removed EXTRA_OECONF_append_epia = " --disable-threads" while importing as
this should go in epia layer.
Signed-off-by: Noor Ahsan
---
.../iperf/iperf-2.0.4/000-Iperf_Fix-CPU-Usage.diff | 164 ++
.../001-cast-to-max_size_t-instead-of-int.patch| 14 ++
.../003-fix-hyphen-used-as-minus-sign.patch| 178
.../iperf/iperf-2.0.4/004-svn-r43-ro.patch | 117 +
.../iperf-2.0.4/005-iperf-die-on-bind-fail.patch | 15 ++
.../006-iperf-die-on-connect-fail.patch| 15 ++
.../iperf-2.0.4/007-iperf-reporter-deadlock.patch | 68
.../iperf/iperf-2.0.4/008-numofreport.patch| 15 ++
.../iperf/iperf-2.0.4/009-delayloop.patch | 22 +++
meta-oe/recipes-benchmark/iperf/iperf_2.0.4.bb | 47 +
10 files changed, 655 insertions(+), 0 deletions(-)
create mode 100644
meta-oe/recipes-benchmark/iperf/iperf-2.0.4/000-Iperf_Fix-CPU-Usage.diff
create mode 100644
meta-oe/recipes-benchmark/iperf/iperf-2.0.4/001-cast-to-max_size_t-instead-of-int.patch
create mode 100644
meta-oe/recipes-benchmark/iperf/iperf-2.0.4/003-fix-hyphen-used-as-minus-sign.patch
create mode 100644
meta-oe/recipes-benchmark/iperf/iperf-2.0.4/004-svn-r43-ro.patch
create mode 100644
meta-oe/recipes-benchmark/iperf/iperf-2.0.4/005-iperf-die-on-bind-fail.patch
create mode 100644
meta-oe/recipes-benchmark/iperf/iperf-2.0.4/006-iperf-die-on-connect-fail.patch
create mode 100644
meta-oe/recipes-benchmark/iperf/iperf-2.0.4/007-iperf-reporter-deadlock.patch
create mode 100644
meta-oe/recipes-benchmark/iperf/iperf-2.0.4/008-numofreport.patch
create mode 100644
meta-oe/recipes-benchmark/iperf/iperf-2.0.4/009-delayloop.patch
create mode 100644 meta-oe/recipes-benchmark/iperf/iperf_2.0.4.bb
diff --git
a/meta-oe/recipes-benchmark/iperf/iperf-2.0.4/000-Iperf_Fix-CPU-Usage.diff
b/meta-oe/recipes-benchmark/iperf/iperf-2.0.4/000-Iperf_Fix-CPU-Usage.diff
new file mode 100644
index 000..7e89953
--- /dev/null
+++ b/meta-oe/recipes-benchmark/iperf/iperf-2.0.4/000-Iperf_Fix-CPU-Usage.diff
@@ -0,0 +1,164 @@
+[Thread]: Replace thread_rest() with condition variables
+
+This applies the patch by Ingo Molnar from
+
+ http://marc.info/?l=linux-kernel&m=119088670113210&w=2
+
+by reverting previous changes that coincided with changes made by this
+patch. Other than that, the patch is the original from the above URL.
+
+Gerrit
+---
+ compat/Thread.c |6 --
+ src/Reporter.c | 37 +
+ src/main.cpp|2 ++
+ 3 files changed, 11 insertions(+), 34 deletions(-)
+
+rover: changed two remaining thread_rest.
+
+--- a/compat/Thread.c
b/compat/Thread.c
+@@ -405,12 +405,6 @@ int thread_numuserthreads( void ) {
+ void thread_rest ( void ) {
+ #if defined( HAVE_THREAD )
+ #if defined( HAVE_POSIX_THREAD )
+-#if defined( _POSIX_PRIORITY_SCHEDULING )
+-sched_yield();
+-#else
+-usleep( 0 );
+-#endif
+-
+ #else // Win32
+ SwitchToThread( );
+ #endif
+--- a/src/Reporter.c
b/src/Reporter.c
+@@ -110,9 +110,8 @@
+
+ char buffer[64]; // Buffer for printing
+ ReportHeader *ReportRoot = NULL;
+-int threadWait = 0;
+-int threadSleeping = 0;
+ extern Condition ReportCond;
++extern Condition ReportDoneCond;
+ int reporter_process_report ( ReportHeader *report );
+ void process_report ( ReportHeader *report );
+ int reporter_handle_packet( ReportHeader *report );
+@@ -340,7 +339,7 @@
+ // item
+ while ( index == 0 ) {
+ Condition_Signal( &ReportCond );
+-thread_rest();
++Condition_Wait( &ReportDoneCond );
+ index = agent->reporterindex;
+ }
+ agent->agentindex = 0;
+@@ -348,11 +347,9 @@
+ // Need to make sure that reporter is not about to be "lapped"
+ while ( index - 1 == agent->agentindex ) {
+ Condition_Signal( &ReportCond );
+-thread_rest();
++Condition_Wait( &ReportDoneCond );
+ index = agent->reporterindex;
+ }
+- if (threadSleeping)
+- Condition_Signal( &ReportCond );
+
+ // Put the information there
+ memcpy( agent->data + agent->agentindex, packet, sizeof(ReportStruct)
);
+@@ -382,9 +379,6 @@
+ packet->packetLen = 0;
+ ReportPacket( agent, packet );
+ packet->packetID = agent->report.cntDatagrams;
+- if (threadSleeping)
+- Condition_Signal( &ReportCond );
+-
+ }
+ }
+
+@@ -396,11 +390,8 @@
+ void EndReport( ReportHeader *agent ) {
+ if ( agent != NULL ) {
+ int index = agent->reporterindex;
+- if (threadSleeping)
+- Condition_Signal( &ReportCond );
+-
+ while ( index != -1 ) {
+-thr
[OE-core] [meta-oe][PATCH 4/4] tiobench: Add version 0.3.3 (initial recipe)
From: Noor Ahsan
* Imported from oe.dev commit id 821f47e170dddabaef3925fd62c5423210dcb363.
Signed-off-by: Noor Ahsan
---
.../tiobench-0.3.3/tiobench-makefile.patch | 49
.../recipes-benchmark/tiobench/tiobench_0.3.3.bb | 25 ++
2 files changed, 74 insertions(+), 0 deletions(-)
create mode 100644
meta-oe/recipes-benchmark/tiobench/tiobench-0.3.3/tiobench-makefile.patch
create mode 100644 meta-oe/recipes-benchmark/tiobench/tiobench_0.3.3.bb
diff --git
a/meta-oe/recipes-benchmark/tiobench/tiobench-0.3.3/tiobench-makefile.patch
b/meta-oe/recipes-benchmark/tiobench/tiobench-0.3.3/tiobench-makefile.patch
new file mode 100644
index 000..f820c7e
--- /dev/null
+++ b/meta-oe/recipes-benchmark/tiobench/tiobench-0.3.3/tiobench-makefile.patch
@@ -0,0 +1,49 @@
+Adapt tiobench to OE
+Author: Ludovic Desroches
+
+Upstream-Status: Inappropriate [not author]
+
+Index: Makefile
+===
+--- a/Makefile 2011-05-26 07:48:46.341400974 +0200
b/Makefile 2011-05-30 06:32:38.091401358 +0200
+@@ -1,8 +1,9 @@
+ # Makefile for tiotest
+
+-CC=gcc
++CC?=gcc
+ #CFLAGS=-O3 -fomit-frame-pointer -Wall
+ CFLAGS=-O2 -Wall
++LDFLAGS?=
+
+ #DEFINES=-DUSE_MMAP
+ #-DUSE_MADVISE
+@@ -14,16 +15,16 @@
+
+ #DEFINES=
+
+-LINK=gcc
++LINK?=$(CC)
+ EXE=tiotest
+ PROJECT=tiobench
+ # do it once instead of each time referenced
+ VERSION=$(shell egrep "tiotest v[0-9]+.[0-9]+" tiotest.c | cut -d " " -f 7 |
sed "s/v//g")
+ DISTNAME=$(PROJECT)-$(VERSION)
+ INSTALL=install
+-PREFIX=/usr/local
++PREFIX?=/usr/local
+ BINDIR=$(PREFIX)/bin
+-DOCDIR=/usr/local/doc/$(DISTNAME)
++DOCDIR=$(PREFIX)/share/doc/$(DISTNAME)
+
+ all: $(EXE)
+
+@@ -34,7 +35,7 @@
+ $(CC) -c $(CFLAGS) $(DEFINES) tiotest.c -o tiotest.o
+
+ $(EXE): tiotest.o crc32.o
+- $(LINK) -o $(EXE) tiotest.o crc32.o -lpthread
++ $(LINK) -o $(EXE) tiotest.o crc32.o -lpthread $(LDFLAGS)
+ @echo
+ @echo "./tiobench.pl --help for usage options"
+ @echo
diff --git a/meta-oe/recipes-benchmark/tiobench/tiobench_0.3.3.bb
b/meta-oe/recipes-benchmark/tiobench/tiobench_0.3.3.bb
new file mode 100644
index 000..636e2d1
--- /dev/null
+++ b/meta-oe/recipes-benchmark/tiobench/tiobench_0.3.3.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "Threaded I/O tester"
+HOMEPAGE = "http://sourceforge.net/projects/tiobench/";
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b"
+RDEPENDS = "\
+perl \
+perl-module-exporter-heavy \
+perl-module-getopt-long \
+perl-module-overload \
+perl-module-strict \
+"
+PR = "r0"
+
+SRC_URI = "\
+http://sourceforge.net/projects/tiobench/files/tiobench/${PV}/${P}.tar.gz \
+file://tiobench-makefile.patch \
+"
+SRC_URI[md5sum] = "bf485bf820e693c79e6bd2a38702a128"
+SRC_URI[sha256sum] =
"8ad011059a35ac70cdb5e3d3999ceee44a8e8e9078926844b0685b7ea9db2bcc"
+
+EXTRA_OEMAKE = "PREFIX=${D}/usr"
+
+do_install() {
+oe_runmake install
+}
--
1.7.0.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [meta-oe][PATCH 2/4] lmbench: Add version 3.0-a9 (initial recipe)
From: Noor Ahsan
* Imported from oe.dev commit id bac6441118e0b78d55c98afdc108f03b6c655909.
Signed-off-by: Noor Ahsan
---
.../lmbench/lmbench-3.0-a9/obey-ranlib.patch | 30
.../lmbench-3.0-a9/update-results-script.patch | 160
.../recipes-benchmark/lmbench/lmbench/lmbench-run | 23 +++
.../lmbench/lmbench/rename-line-binary.patch | 19 +++
.../recipes-benchmark/lmbench/lmbench_3.0-a9.bb| 56 +++
5 files changed, 288 insertions(+), 0 deletions(-)
create mode 100644
meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/obey-ranlib.patch
create mode 100644
meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/update-results-script.patch
create mode 100644 meta-oe/recipes-benchmark/lmbench/lmbench/lmbench-run
create mode 100644
meta-oe/recipes-benchmark/lmbench/lmbench/rename-line-binary.patch
create mode 100644 meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb
diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/obey-ranlib.patch
b/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/obey-ranlib.patch
new file mode 100644
index 000..41a3b32
--- /dev/null
+++ b/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/obey-ranlib.patch
@@ -0,0 +1,30 @@
+In some cases the host may have too old of a ranlib to work. Since it's
+not exactly a great idea to not be using the cross ranlib anyhow, fix the
+Makefile so we can override ranlib and then override it
+
+Upstream-Status: Inappropriate [build system specific change]
+---
+ src/Makefile |3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+Index: lmbench-3.0-a9/src/Makefile
+===
+--- lmbench-3.0-a9.orig/src/Makefile
lmbench-3.0-a9/src/Makefile
+@@ -38,6 +38,7 @@ CC=`../scripts/compiler`
+ MAKE=`../scripts/make`
+ AR=ar
+ ARCREATE=cr
++RANLIB=ranlib
+
+ # base of installation location
+ BASE=/usr/local
+@@ -217,7 +218,7 @@ $O/lmbench : ../scripts/lmbench version.
+ $O/lmbench.a: $(LIBOBJS)
+ /bin/rm -f $O/lmbench.a
+ $(AR) $(ARCREATE) $O/lmbench.a $(LIBOBJS)
+- -ranlib $O/lmbench.a
++ -$(RANLIB) $O/lmbench.a
+
+ $O/lib_timing.o : lib_timing.c $(INCS)
+ $(COMPILE) -c lib_timing.c -o $O/lib_timing.o
diff --git
a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/update-results-script.patch
b/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/update-results-script.patch
new file mode 100644
index 000..894f146
--- /dev/null
+++
b/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/update-results-script.patch
@@ -0,0 +1,160 @@
+Now that we have our binaries in /usr/bin rather than the normal
+lmbench hierarchy we need to update the scripts as well to behave well here.
+
+Upstream-Status: Inappropriate [This is related to the OE-specific behavior
+of installing into /usr/bin, etc, rather than dumping everything into
+/usr/share/lmbench or similar]
+
+Index: lmbench-3.0-a9/scripts/results
+===
+--- lmbench-3.0-a9.orig/scripts/results
lmbench-3.0-a9/scripts/results
+@@ -8,11 +8,11 @@ RESULTS=results/$OS
+ BASE=../$RESULTS/`uname -n`
+ EXT=0
+
+-if [ ! -f "../bin/$OS/$CONFIG" ]
++if [ ! -f "$CONFIG" ]
+ then echo "No config file?"
+ exit 1
+ fi
+-. ../bin/$OS/$CONFIG
++. $CONFIG
+
+ if [ ! -d ../$RESULTS ]
+ then mkdir -p ../$RESULTS
+@@ -23,11 +23,9 @@ do EXT=`expr $EXT + 1`
+ RESULTS=$BASE.$EXT
+ done
+
+-cd ../bin/$OS
+-PATH=.:${PATH}; export PATH
+ export SYNC_MAX
+ export OUTPUT
+-lmbench $CONFIG 2>../${RESULTS}
++lmbench $CONFIG 2>${RESULTS}
+
+ if [ X$MAIL = Xyes ]
+ then echo Mailing results
+Index: lmbench-3.0-a9/scripts/config-run
+===
+--- lmbench-3.0-a9.orig/scripts/config-run
lmbench-3.0-a9/scripts/config-run
+@@ -132,20 +132,20 @@ export LMBENCH_SCHED
+
+ echo $L; echo "";
+ echo "Hang on, we are calculating your timing granularity."
+-../bin/$OS/msleep 250
+-ENOUGH=`../bin/$OS/enough`
++msleep 250
++ENOUGH=`enough`
+ export ENOUGH
+ echo "OK, it looks like you can time stuff down to $ENOUGH usec resolution."
+ echo ""
+ echo "Hang on, we are calculating your timing overhead."
+-../bin/$OS/msleep 250
+-TIMING_O=`../bin/$OS/timing_o`
++msleep 250
++TIMING_O=`timing_o`
+ export TIMING_O
+ echo "OK, it looks like your gettimeofday() costs $TIMING_O usecs."
+ echo ""
+ echo "Hang on, we are calculating your loop overhead."
+-../bin/$OS/msleep 250
+-LOOP_O=`../bin/$OS/loop_o`
++msleep 250
++LOOP_O=`loop_o`
+ export LOOP_O
+ echo "OK, it looks like your benchmark loop costs $LOOP_O usecs."
+ echo ""
+@@ -177,7 +177,7 @@ then
+ fi
+ if [ X$MB = X ]
+ then $ECHON "Probing system for available memory: $ECHOC"
+- MB=`../bin/$OS/memsize 4096`
++ MB=`memsize 4096`
+ fi
+ TOTAL_MEM=$MB
+ MB=`echo \( $MB \* 7 \) / 10 | bc 2>/dev/null`
+@@ -205,9 +20
[OE-core] [meta-oe][PATCH 1/4] dbench: Add version 4.0 (initial recipe)
From: Noor Ahsan
* Imported from oe.dev commit id d6f49fe115206047b41b0195724ba872897ef531
Signed-off-by: Noor Ahsan
---
meta-oe/recipes-benchmark/dbench/dbench_4.0.bb | 26 ++
.../recipes-benchmark/dbench/files/destdir.patch | 28
.../recipes-benchmark/dbench/files/makefile.patch | 18
3 files changed, 72 insertions(+), 0 deletions(-)
create mode 100644 meta-oe/recipes-benchmark/dbench/dbench_4.0.bb
create mode 100644 meta-oe/recipes-benchmark/dbench/files/destdir.patch
create mode 100644 meta-oe/recipes-benchmark/dbench/files/makefile.patch
diff --git a/meta-oe/recipes-benchmark/dbench/dbench_4.0.bb
b/meta-oe/recipes-benchmark/dbench/dbench_4.0.bb
new file mode 100644
index 000..60163d1
--- /dev/null
+++ b/meta-oe/recipes-benchmark/dbench/dbench_4.0.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "The dbench (disk) and tbench (TCP) benchmarks"
+DESCRIPTION_dbench = "Filesystem load benchmark"
+DESCRIPTION_tbench = "TCP load benchmark"
+HOMEPAGE = "http://samba.org/ftp/tridge/dbench/";
+LICENSE = "GPL"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+
+DEPENDS = "popt"
+PR = "r0"
+
+SRC_URI = "\
+ http://samba.org/ftp/tridge/dbench/dbench-${PV}.tar.gz \
+ file://destdir.patch \
+ file://makefile.patch"
+
+inherit autotools
+
+PACKAGES =+ "tbench tbench-dbg"
+
+TARGET_CC_ARCH += "${LDFLAGS}"
+
+FILES_tbench = "${bindir}/tbench* ${prefix}/share/client.txt"
+FILES_tbench-dbg += "${bindir}/.debug/tbench*"
+
+SRC_URI[md5sum] = "1fe56ff71b9a416f8889d7150ac54da4"
+SRC_URI[sha256sum] =
"6001893f34e68a3cfeb5d424e1f2bfef005df96a22d86f35dc770c5bccf3aa8a"
diff --git a/meta-oe/recipes-benchmark/dbench/files/destdir.patch
b/meta-oe/recipes-benchmark/dbench/files/destdir.patch
new file mode 100644
index 000..ca9a8ee
--- /dev/null
+++ b/meta-oe/recipes-benchmark/dbench/files/destdir.patch
@@ -0,0 +1,28 @@
+Append $(DESTDIR) to all $(bindir), $(datadir) and $(mandir). Got
+this patch from OE commit id 709c4d66e0b107ca606941b988bad717c0b45d9b
+
+Upstream-Status: Inappropriate [not author]
+
+Index: dbench-3.04/Makefile.in
+===
+--- dbench-3.04.orig/Makefile.in 2006-09-17 20:21:07.0 +0200
dbench-3.04/Makefile.in2006-09-17 20:21:36.0 +0200
+@@ -32,12 +32,12 @@
+
+ # Careful here: don't install client.txt over itself.
+ install: all
+- ${INSTALLCMD} -d $(bindir) $(datadir) $(mandir)
+- ${INSTALLCMD} dbench tbench tbench_srv $(bindir)
+- ${INSTALLCMD} client.txt $(datadir)
+- ${INSTALLCMD} -m644 dbench.1 $(mandir)
+- ln -sf dbench.1 $(mandir)/tbench.1
+- ln -sf dbench.1 $(mandir)/tbench_srv.1
++ ${INSTALLCMD} -d $(DESTDIR)$(bindir) $(DESTDIR)$(datadir)
$(DESTDIR)$(mandir)
++ ${INSTALLCMD} dbench tbench tbench_srv $(DESTDIR)$(bindir)
++ ${INSTALLCMD} client.txt $(DESTDIR)$(datadir)
++ ${INSTALLCMD} -m644 dbench.1 $(DESTDIR)$(mandir)
++ ln -sf dbench.1 $(DESTDIR)$(mandir)/tbench.1
++ ln -sf dbench.1 $(DESTDIR)$(mandir)/tbench_srv.1
+
+ clean:
+ rm -f *.o *~ dbench tbench tbench_srv
diff --git a/meta-oe/recipes-benchmark/dbench/files/makefile.patch
b/meta-oe/recipes-benchmark/dbench/files/makefile.patch
new file mode 100644
index 000..09d619a
--- /dev/null
+++ b/meta-oe/recipes-benchmark/dbench/files/makefile.patch
@@ -0,0 +1,18 @@
+Add space between install -m option and its argument. Got this patch from
+OE 709c4d66e0b107ca606941b988bad717c0b45d9b
+
+Upstream-Status: Inappropriate [not author]
+
+Index: dbench-4.0/Makefile.in
+===
+--- dbench-4.0.orig/Makefile.in
dbench-4.0/Makefile.in
+@@ -35,7 +35,7 @@ install: all
+ ${INSTALLCMD} -d $(DESTDIR)$(bindir) $(DESTDIR)$(datadir)
$(DESTDIR)$(mandir)
+ ${INSTALLCMD} dbench tbench tbench_srv $(DESTDIR)$(bindir)
+ ${INSTALLCMD} client.txt $(DESTDIR)$(datadir)
+- ${INSTALLCMD} -m644 dbench.1 $(DESTDIR)$(mandir)
++ ${INSTALLCMD} -m 644 dbench.1 $(DESTDIR)$(mandir)
+ ln -sf dbench.1 $(DESTDIR)$(mandir)/tbench.1
+ ln -sf dbench.1 $(DESTDIR)$(mandir)/tbench_srv.1
+
--
1.7.0.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [meta-oe][PATCH 0/4] pull request #1 for bechmark recipes
From: Noor Ahsan *** BLURB HERE *** The following changes since commit 22ec18224f7a7c64850c76b14017dff2ff4345f2: pespin (1): elfe: Add LIC_FILES_CHKSUM to recipe are available in the git repository at: git://github.com/Noor-Ahsan/meta-oe master https://github.com/Noor-Ahsan/meta-oe/tree/master Noor Ahsan (4): dbench: Add version 4.0 (initial recipe) lmbench: Add version 3.0-a9 (initial recipe) iperf: Add version 2.0.4 (initial recipe) tiobench: Add version 0.3.3 (initial recipe) meta-oe/recipes-benchmark/dbench/dbench_4.0.bb | 26 +++ .../recipes-benchmark/dbench/files/destdir.patch | 28 +++ .../recipes-benchmark/dbench/files/makefile.patch | 18 ++ .../iperf/iperf-2.0.4/000-Iperf_Fix-CPU-Usage.diff | 164 ++ .../001-cast-to-max_size_t-instead-of-int.patch| 14 ++ .../003-fix-hyphen-used-as-minus-sign.patch| 178 .../iperf/iperf-2.0.4/004-svn-r43-ro.patch | 117 + .../iperf-2.0.4/005-iperf-die-on-bind-fail.patch | 15 ++ .../006-iperf-die-on-connect-fail.patch| 15 ++ .../iperf-2.0.4/007-iperf-reporter-deadlock.patch | 68 .../iperf/iperf-2.0.4/008-numofreport.patch| 15 ++ .../iperf/iperf-2.0.4/009-delayloop.patch | 22 +++ meta-oe/recipes-benchmark/iperf/iperf_2.0.4.bb | 47 + .../lmbench/lmbench-3.0-a9/obey-ranlib.patch | 30 .../lmbench-3.0-a9/update-results-script.patch | 160 ++ .../recipes-benchmark/lmbench/lmbench/lmbench-run | 23 +++ .../lmbench/lmbench/rename-line-binary.patch | 19 ++ .../recipes-benchmark/lmbench/lmbench_3.0-a9.bb| 56 ++ .../tiobench-0.3.3/tiobench-makefile.patch | 49 ++ .../recipes-benchmark/tiobench/tiobench_0.3.3.bb | 25 +++ 20 files changed, 1089 insertions(+), 0 deletions(-) create mode 100644 meta-oe/recipes-benchmark/dbench/dbench_4.0.bb create mode 100644 meta-oe/recipes-benchmark/dbench/files/destdir.patch create mode 100644 meta-oe/recipes-benchmark/dbench/files/makefile.patch create mode 100644 meta-oe/recipes-benchmark/iperf/iperf-2.0.4/000-Iperf_Fix-CPU-Usage.diff create mode 100644 meta-oe/recipes-benchmark/iperf/iperf-2.0.4/001-cast-to-max_size_t-instead-of-int.patch create mode 100644 meta-oe/recipes-benchmark/iperf/iperf-2.0.4/003-fix-hyphen-used-as-minus-sign.patch create mode 100644 meta-oe/recipes-benchmark/iperf/iperf-2.0.4/004-svn-r43-ro.patch create mode 100644 meta-oe/recipes-benchmark/iperf/iperf-2.0.4/005-iperf-die-on-bind-fail.patch create mode 100644 meta-oe/recipes-benchmark/iperf/iperf-2.0.4/006-iperf-die-on-connect-fail.patch create mode 100644 meta-oe/recipes-benchmark/iperf/iperf-2.0.4/007-iperf-reporter-deadlock.patch create mode 100644 meta-oe/recipes-benchmark/iperf/iperf-2.0.4/008-numofreport.patch create mode 100644 meta-oe/recipes-benchmark/iperf/iperf-2.0.4/009-delayloop.patch create mode 100644 meta-oe/recipes-benchmark/iperf/iperf_2.0.4.bb create mode 100644 meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/obey-ranlib.patch create mode 100644 meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/update-results-script.patch create mode 100644 meta-oe/recipes-benchmark/lmbench/lmbench/lmbench-run create mode 100644 meta-oe/recipes-benchmark/lmbench/lmbench/rename-line-binary.patch create mode 100644 meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb create mode 100644 meta-oe/recipes-benchmark/tiobench/tiobench-0.3.3/tiobench-makefile.patch create mode 100644 meta-oe/recipes-benchmark/tiobench/tiobench_0.3.3.bb ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] libc-package bbclass: fix binary localedata dependency code
Op 26 aug. 2011, om 17:30 heeft Phil Blundell het volgende geschreven: > On Fri, 2011-08-26 at 17:26 +0200, Koen Kooi wrote: >> And that gives me >> http://git.angstrom-distribution.org/cgi-bin/cgit.cgi/testlab/commit/?h=yocto&id=9b2e08e0c4da4881ba8c83be39697a40a63b75fd >> >> -locale_base_en_us -> eglibc_binary_localedata_en_us; >> +locale_base_en_us -> eglibc_binary_localedata_en_u_; >> >> So something regexp is being a bit too greedy by the looks of it. > > Ah whoops, the old missing backslash. Could you try this one instead? That one doesn't seem to apply: koen@dominion:/OE/tentacle/sources/openembedded-core$ git am -s /tmp/0001-libc-package-restore-correct-mangling-behavior-for-l-1.patch Applying: libc-package: restore correct mangling behavior for locale names error: patch failed: meta/classes/libc-package.bbclass:241 error: meta/classes/libc-package.bbclass: patch does not apply Patch failed at 0001 libc-package: restore correct mangling behavior for locale names When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Core image recipes
On 08/26/2011 02:47 AM, Paul Eggleton wrote: Hi all, Seems we have a few overlapping images in OE-core, with not especially obvious naming. The following two seem very similar in scope (basic X11 image): meta/recipes-core/images/core-image-core.bb This contains X11_IMAGE_FEATURES meta/recipes-extended/images/core-image-basic.bb This image should NOT contain any X11, this is supposed to be an extention of core-image-minimal with many of the busybox related commands substituted for the real command set. The intention of this image is two fold, first it's the largest image that we test against non-GPLv3 and it's the non-graphical LSB image (I am not sure if there is a spec test defined for that. Maybe we could just have one of these and call it core-image-x11-base or similar? So, no I do not think they can be merged. But renaming core-image-core to core-image-x11-base might make sense, also renaming core-image-basic to core-image-lsb-basic may clear things up. Then, we have core-image-base, which whilst it doesn't remove package management files, does not have "package-management" in its features, so it's not a whole lot different to core-image-minimal AFAICT. On this one I might agree, I know that we have not built that image, nor does it seem to be used by anything else. Sau! Comments? Cheers, Paul ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] libc-package bbclass: fix binary localedata dependency code
On Fri, 2011-08-26 at 17:26 +0200, Koen Kooi wrote:
> And that gives me
> http://git.angstrom-distribution.org/cgi-bin/cgit.cgi/testlab/commit/?h=yocto&id=9b2e08e0c4da4881ba8c83be39697a40a63b75fd
>
> -locale_base_en_us -> eglibc_binary_localedata_en_us;
> +locale_base_en_us -> eglibc_binary_localedata_en_u_;
>
> So something regexp is being a bit too greedy by the looks of it.
Ah whoops, the old missing backslash. Could you try this one instead?
p.
>From 1cd91a91802776ddede041cfa222b603da6c8453 Mon Sep 17 00:00:00 2001
From: Phil Blundell
Date: Fri, 26 Aug 2011 15:05:11 +0100
Subject: [PATCH v2] libc-package: restore correct mangling behavior for locale names
This reverts 19fb07bf337e1d724798e2eb4479c35fc45b1941 and restores
the behaviour of the code to the way it was prior to 561d875404ef1783f94f37314b6e756766db8411.
See http://lists.linuxtogo.org/pipermail/openembedded-core/2011-August/007407.html and subsequent messages.
Signed-off-by: Phil Blundell
---
meta/classes/libc-package.bbclass |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass
index d3b33d6..f8df6a4 100644
--- a/meta/classes/libc-package.bbclass
+++ b/meta/classes/libc-package.bbclass
@@ -241,10 +241,9 @@ python package_do_split_gconvs () {
(locale, encoding, locale), d)
def output_locale_binary_rdepends(name, pkgname, locale, encoding):
- m = re.match("(.*)_(.*)", name)
+ m = re.match("(.*)\.(.*)", name)
if m:
- libc_name = "%s-%s" % (m.group(1), m.group(2).lower().replace("-",""))
+ libc_name = "%s.%s" % (m.group(1), m.group(2).lower().replace("-",""))
else:
libc_name = name
bb.data.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('%s-binary-localedata-%s' \
--
1.7.4.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] libc-package bbclass: fix binary localedata dependency code
Op 26 aug. 2011, om 16:12 heeft Phil Blundell het volgende geschreven:
> On Thu, 2011-08-25 at 07:58 -0700, Richard Purdie wrote:
>> On Thu, 2011-08-25 at 10:24 +0100, Phil Blundell wrote:
>>> On Wed, 2011-08-24 at 20:32 +0200, Koen Kooi wrote:
diff --git a/meta/classes/libc-package.bbclass
b/meta/classes/libc-package.bbclass
index 0d5ce20..d3b33d6 100644
--- a/meta/classes/libc-package.bbclass
+++ b/meta/classes/libc-package.bbclass
@@ -243,7 +243,7 @@ python package_do_split_gconvs () {
def output_locale_binary_rdepends(name, pkgname, locale, encoding):
m = re.match("(.*)_(.*)", name)
if m:
- libc_name = "%s.%s" % (m.group(1),
m.group(2).lower().replace("-",""))
+ libc_name = "%s-%s" % (m.group(1),
m.group(2).lower().replace("-",""))
else:
libc_name = name
bb.data.setVar('RDEPENDS_%s' % pkgname,
legitimize_package_name('%s-binary-localedata-%s' \
>>>
>>> For what it's worth (probably not much), this is not quite the right
>>> fix. Joining with "." was correct; it was the splitting on "_" that was
>>> wrong. The right thing would be to put it back how it was before the
>>> glibc/eglibc merge commit, i.e. change the re to "(*.)\.(*.)" and leave
>>> the output pattern alone. That ought to fix your problem and also allow
>>> the encoding to be correctly canonicalised.
>>
>> Can someone please send me the correct patch against master? :)
>
> I think the attached is what you need. Koen, maybe you could confirm
> whether this does indeed fix your original problem.
I built some images before applying this patch and then:
bitbake -ccleansstate eglibc eglibc-locale
bitbake systemd-image
And that gives me
http://git.angstrom-distribution.org/cgi-bin/cgit.cgi/testlab/commit/?h=yocto&id=9b2e08e0c4da4881ba8c83be39697a40a63b75fd
-locale_base_en_us -> eglibc_binary_localedata_en_us;
+locale_base_en_us -> eglibc_binary_localedata_en_u_;
So something regexp is being a bit too greedy by the looks of it.
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] libc-package bbclass: fix binary localedata dependency code
Op 26 aug. 2011, om 16:12 heeft Phil Blundell het volgende geschreven:
> On Thu, 2011-08-25 at 07:58 -0700, Richard Purdie wrote:
>> On Thu, 2011-08-25 at 10:24 +0100, Phil Blundell wrote:
>>> On Wed, 2011-08-24 at 20:32 +0200, Koen Kooi wrote:
diff --git a/meta/classes/libc-package.bbclass
b/meta/classes/libc-package.bbclass
index 0d5ce20..d3b33d6 100644
--- a/meta/classes/libc-package.bbclass
+++ b/meta/classes/libc-package.bbclass
@@ -243,7 +243,7 @@ python package_do_split_gconvs () {
def output_locale_binary_rdepends(name, pkgname, locale, encoding):
m = re.match("(.*)_(.*)", name)
if m:
- libc_name = "%s.%s" % (m.group(1),
m.group(2).lower().replace("-",""))
+ libc_name = "%s-%s" % (m.group(1),
m.group(2).lower().replace("-",""))
else:
libc_name = name
bb.data.setVar('RDEPENDS_%s' % pkgname,
legitimize_package_name('%s-binary-localedata-%s' \
>>>
>>> For what it's worth (probably not much), this is not quite the right
>>> fix. Joining with "." was correct; it was the splitting on "_" that was
>>> wrong. The right thing would be to put it back how it was before the
>>> glibc/eglibc merge commit, i.e. change the re to "(*.)\.(*.)" and leave
>>> the output pattern alone. That ought to fix your problem and also allow
>>> the encoding to be correctly canonicalised.
>>
>> Can someone please send me the correct patch against master? :)
>
> I think the attached is what you need. Koen, maybe you could confirm
> whether this does indeed fix your original problem.
doing a test build now, will report back later
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] gcc-4.5.1: Drop gcc-poison-parameters.patch, replace with bug fix patch
The gcc-poison-parameters was added specifically to deal with an issue
on ppc targets and a bug when we build with -Os -frename-registers.
This bug below reports the issue and is fixed in gcc-4.6.x/mainline:
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=44618
Backport patch to gcc 4.5.1.
Signed-off-by: Kumar Gala
---
meta/recipes-devtools/gcc/gcc-4.5.1.inc|4 +-
.../gcc/gcc-4.5.1/gcc-poison-parameters.patch | 85 --
meta/recipes-devtools/gcc/gcc-4.5.1/pr44618.patch | 314
3 files changed, 316 insertions(+), 87 deletions(-)
delete mode 100644
meta/recipes-devtools/gcc/gcc-4.5.1/gcc-poison-parameters.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.5.1/pr44618.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.5.1.inc
b/meta/recipes-devtools/gcc/gcc-4.5.1.inc
index aa1cc95..f2991f2 100644
--- a/meta/recipes-devtools/gcc/gcc-4.5.1.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.5.1.inc
@@ -1,6 +1,6 @@
require gcc-common.inc
-PR = "r8"
+PR = "r9"
DEPENDS =+ "mpfr gmp libmpc elfutils"
NATIVEDEPS = "mpfr-native gmp-native gettext-native libmpc-native
elfutils-native"
@@ -56,7 +56,6 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
file://64bithack.patch \
file://optional_libstdc.patch \
file://disable_relax_pic_calls_flag.patch \
- file://gcc-poison-parameters.patch \
file://GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch \
file://COLLECT_GCC_OPTIONS.patch \
file://use-defaults.h-and-t-oe-in-B.patch \
@@ -66,6 +65,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
file://pr45094.patch \
file://pr45052.patch \
file://pr45886.patch \
+ file://pr44618.patch \
"
SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch "
diff --git a/meta/recipes-devtools/gcc/gcc-4.5.1/gcc-poison-parameters.patch
b/meta/recipes-devtools/gcc/gcc-4.5.1/gcc-poison-parameters.patch
deleted file mode 100644
index 74d4527..000
--- a/meta/recipes-devtools/gcc/gcc-4.5.1/gcc-poison-parameters.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-Upstream-Status: Pending
-
-gcc: add poison parameters detection
-
-Add the logic that, if not configured with "--enable-target-optspace",
-gcc will meet error when build target app with "-Os" option.
-This could avoid potential binary crash.
-
-Signed-off-by: Dongxiao Xu
-
-diff --git a/gcc/config.in b/gcc/config.in
-index a9e208f..3004321 100644
a/gcc/config.in
-+++ b/gcc/config.in
-@@ -132,6 +132,12 @@
- #endif
-
-
-+/* Define to enable target optspace support. */
-+#ifndef USED_FOR_TARGET
-+#undef ENABLE_TARGET_OPTSPACE
-+#endif
-+
-+
- /* Define if you want all operations on RTL (the basic data structure of the
-optimizer and back end) to be checked for dynamic type safety at runtime.
-This is quite expensive. */
-diff --git a/gcc/configure b/gcc/configure
-index 2e022ed..004ec0b 100755
a/gcc/configure
-+++ b/gcc/configure
-@@ -909,6 +909,7 @@ enable_maintainer_mode
- enable_version_specific_runtime_libs
- with_slibdir
- enable_plugin
-+enable_target_optspace
- '
- ac_precious_vars='build_alias
- host_alias
-@@ -25289,6 +25290,13 @@ $as_echo "#define ENABLE_PLUGIN 1" >>confdefs.h
-
- fi
-
-+if test x"$enable_target_optspace" != x; then :
-+
-+$as_echo "#define ENABLE_TARGET_OPTSPACE 1" >>confdefs.h
-+
-+fi
-+
-+
- # Configure the subdirectories
- # AC_CONFIG_SUBDIRS($subdirs)
-
-diff --git a/gcc/configure.ac b/gcc/configure.ac
-index ac4ca70..18ec0aa 100644
a/gcc/configure.ac
-+++ b/gcc/configure.ac
-@@ -4434,6 +4434,11 @@ if test x"$enable_plugin" = x"yes"; then
- AC_DEFINE(ENABLE_PLUGIN, 1, [Define to enable plugin support.])
- fi
-
-+AC_SUBST(enable_target_optspace)
-+if test x"$enable_target_optspace" != x; then
-+ AC_DEFINE(ENABLE_TARGET_OPTSPACE, 1, [Define to enable target optspace
support.])
-+fi
-+
- # Configure the subdirectories
- # AC_CONFIG_SUBDIRS($subdirs)
-
-diff --git a/gcc/opts.c b/gcc/opts.c
-index 139cd26..2fdd96a 100644
a/gcc/opts.c
-+++ b/gcc/opts.c
-@@ -945,6 +945,11 @@ decode_options (unsigned int argc, const char **argv)
- else
- set_param_value ("min-crossjump-insns", initial_min_crossjump_insns);
-
-+#ifndef ENABLE_TARGET_OPTSPACE
-+ if (optimize_size == 1)
-+error ("Do not use -Os option if --enable-target-optspace is not set.");
-+#endif
-+
- if (first_time_p)
- {
- /* Initialize whether `char' is signed. */
diff --git a/meta/recipes-devtools/gcc/gcc-4.5.1/pr44618.patch
b/meta/recipes-devtools/gcc/gcc-4.5.1/pr44618.patch
new file mode 100644
index 000..23f41cc
--- /dev/null
+++ b/meta/recipes-devtools/gcc/gcc-4.5.1/pr44618.patch
@@ -0,0 +1,314 @@
+Upstream-Status: Pending
+
+Backport of bugfix in gcc-4.6.x and mainline that address bug 44618 in
+which we get wrong code generation with -Os -frename-registers.
+
+ 2011-06-13 Edmar Wienskoski
+
+ PR target/44618
+
[OE-core] [PATCH] pango: make x11 support conditional on DISTRO_FEATURES
This allows pango to build on DISTROs which don't enable x11.
Also adjust the SECTION since pango isn't really an X library.
Signed-off-by: Phil Blundell
---
meta/recipes-graphics/pango/pango.inc | 10 ++
meta/recipes-graphics/pango/pango_1.28.4.bb |2 +-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-graphics/pango/pango.inc
b/meta/recipes-graphics/pango/pango.inc
index 5a8a5ae..a8e99e2 100644
--- a/meta/recipes-graphics/pango/pango.inc
+++ b/meta/recipes-graphics/pango/pango.inc
@@ -6,14 +6,15 @@ been done in the context of the GTK+ widget toolkit. Pango
forms the \
core of text and font handling for GTK+-2.x."
HOMEPAGE = "http://www.pango.org/";
BUGTRACKER = "http://bugzilla.gnome.org";
-SECTION = "x11/libs"
+SECTION = "libs"
LICENSE = "LGPL"
-DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv virtual/libx11
libxft gtk-doc-native cairo"
+X11DEPENDS = "virtual/libx11 libxft"
+DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv gtk-doc-native
cairo ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}"
PACKAGES_DYNAMIC = "pango-module-*"
-RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc"
+RRECOMMENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'x11',
'pango-module-basic-x', '', d)} pango-module-basic-fc"
inherit gnome
@@ -24,7 +25,8 @@ FULL_OPTIMIZATION_arm = "-O2"
EXTRA_OECONF = "--disable-glibtest \
--enable-explicit-deps=no \
- --disable-debug"
+ --disable-debug \
+ ${@base_contains('DISTRO_FEATURES', 'x11', '--with-x',
'--without-x', d)}"
LEAD_SONAME = "libpango-1.0*"
LIBV = "1.6.0"
diff --git a/meta/recipes-graphics/pango/pango_1.28.4.bb
b/meta/recipes-graphics/pango/pango_1.28.4.bb
index 600f00b..68ab700 100644
--- a/meta/recipes-graphics/pango/pango_1.28.4.bb
+++ b/meta/recipes-graphics/pango/pango_1.28.4.bb
@@ -2,7 +2,7 @@ require pango.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
-PR = "r0"
+PR = "r1"
SRC_URI += "file://no-tests.patch"
--
1.7.4.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] libc-package bbclass: fix binary localedata dependency code
On Thu, 2011-08-25 at 07:58 -0700, Richard Purdie wrote:
> On Thu, 2011-08-25 at 10:24 +0100, Phil Blundell wrote:
> > On Wed, 2011-08-24 at 20:32 +0200, Koen Kooi wrote:
> > > diff --git a/meta/classes/libc-package.bbclass
> > > b/meta/classes/libc-package.bbclass
> > > index 0d5ce20..d3b33d6 100644
> > > --- a/meta/classes/libc-package.bbclass
> > > +++ b/meta/classes/libc-package.bbclass
> > > @@ -243,7 +243,7 @@ python package_do_split_gconvs () {
> > > def output_locale_binary_rdepends(name, pkgname, locale, encoding):
> > > m = re.match("(.*)_(.*)", name)
> > > if m:
> > > - libc_name = "%s.%s" % (m.group(1),
> > > m.group(2).lower().replace("-",""))
> > > + libc_name = "%s-%s" % (m.group(1),
> > > m.group(2).lower().replace("-",""))
> > > else:
> > > libc_name = name
> > > bb.data.setVar('RDEPENDS_%s' % pkgname,
> > > legitimize_package_name('%s-binary-localedata-%s' \
> >
> > For what it's worth (probably not much), this is not quite the right
> > fix. Joining with "." was correct; it was the splitting on "_" that was
> > wrong. The right thing would be to put it back how it was before the
> > glibc/eglibc merge commit, i.e. change the re to "(*.)\.(*.)" and leave
> > the output pattern alone. That ought to fix your problem and also allow
> > the encoding to be correctly canonicalised.
>
> Can someone please send me the correct patch against master? :)
I think the attached is what you need. Koen, maybe you could confirm
whether this does indeed fix your original problem.
p.
>From 1cd91a91802776ddede041cfa222b603da6c8453 Mon Sep 17 00:00:00 2001
From: Phil Blundell
Date: Fri, 26 Aug 2011 15:05:11 +0100
Subject: [PATCH] libc-package: restore correct mangling behavior for locale names
This reverts 19fb07bf337e1d724798e2eb4479c35fc45b1941 and restores
the behaviour of the code to the way it was prior to 561d875404ef1783f94f37314b6e756766db8411.
See http://lists.linuxtogo.org/pipermail/openembedded-core/2011-August/007407.html and subsequent messages.
Signed-off-by: Phil Blundell
---
meta/classes/libc-package.bbclass |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass
index d3b33d6..f8df6a4 100644
--- a/meta/classes/libc-package.bbclass
+++ b/meta/classes/libc-package.bbclass
@@ -241,9 +241,9 @@ python package_do_split_gconvs () {
(locale, encoding, locale), d)
def output_locale_binary_rdepends(name, pkgname, locale, encoding):
- m = re.match("(.*)_(.*)", name)
+ m = re.match("(.*).(.*)", name)
if m:
- libc_name = "%s-%s" % (m.group(1), m.group(2).lower().replace("-",""))
+ libc_name = "%s.%s" % (m.group(1), m.group(2).lower().replace("-",""))
else:
libc_name = name
bb.data.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('%s-binary-localedata-%s' \
--
1.7.4.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [oe-core][V2] opkg-utils: ignore packages disapperaring filelist generation
Package files disappearing during index generation don't cause a fatal
error. Make package file disappearing during filelist generation also
a non-fatal error.
Signed-off-by: Dmitry Eremin-Solenikov
---
.../opkg-utils/index-ignore-filenotfound.patch | 17 +
meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb |2 +-
2 files changed, 18 insertions(+), 1 deletions(-)
diff --git
a/meta/recipes-devtools/opkg-utils/opkg-utils/index-ignore-filenotfound.patch
b/meta/recipes-devtools/opkg-utils/opkg-utils/index-ignore-filenotfound.patch
index 3664df6..f0f0fcf 100644
---
a/meta/recipes-devtools/opkg-utils/opkg-utils/index-ignore-filenotfound.patch
+++
b/meta/recipes-devtools/opkg-utils/opkg-utils/index-ignore-filenotfound.patch
@@ -54,3 +54,20 @@ Index: opkg-utils/opkg-make-index
if packages_filename:
sys.stdout.close()
sys.stdout = old_stdout
+@@ -197,7 +197,15 @@
+ names = packages.packages.keys()
+ names.sort()
+ for name in names:
+- for fn in packages[name].get_file_list():
++ try:
++ fnlist = packages[name].get_file_list()
++ except OSError, e:
++ sys.stderr.write("Package %s disappeared on us!\n" % (name))
++ continue
++ except IOError, e:
++ sys.stderr.write("Package %s disappeared on us!\n" % (name))
++ continue
++ for fn in fnlist:
+ (h,t) = os.path.split(fn)
+ if not t: continue
+ if not files.has_key(t): files[t] = name+':'+fn
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb
b/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb
index fd2b5e6..e04b74a 100644
--- a/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb
@@ -8,7 +8,7 @@ RDEPENDS_${PN} = "python"
RDEPENDS_${PN}_virtclass-native = ""
SRCREV = "4747"
PV = "0.1.8+svnr${SRCPV}"
-PR = "r4"
+PR = "r5"
SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=opkg-utils;proto=http
\
file://index-ignore-filenotfound.patch \
--
1.7.2.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] eglibc: fix gconv packaging after 5486cac29db6e67051fff7637a0abc9aeab661e5
* gconv is directory so test -f was always false as reported by Phil Blundell in
http://lists.linuxtogo.org/pipermail/openembedded-core/2011-August/008973.html
* -e used also for localedef which is file, just to be more consistent
Signed-off-by: Martin Jansa
---
meta/recipes-core/eglibc/eglibc-package.inc |4 ++--
meta/recipes-core/eglibc/eglibc_2.12.bb |2 +-
meta/recipes-core/eglibc/eglibc_2.13.bb |2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc
b/meta/recipes-core/eglibc/eglibc-package.inc
index 5308bb9..adda5e9 100644
--- a/meta/recipes-core/eglibc/eglibc-package.inc
+++ b/meta/recipes-core/eglibc/eglibc-package.inc
@@ -100,10 +100,10 @@ do_install_locale () {
if [ "${base_libdir}" != "${libdir}" ]; then
cp -fpPR ${D}${base_libdir}/* ${dest}${base_libdir}
fi
- if [ -f ${D}${bindir}/localedef ]; then
+ if [ -e ${D}${bindir}/localedef ]; then
mv -f ${D}${bindir}/localedef ${dest}${bindir}
fi
- if [ -f ${D}${libdir}/gconv ]; then
+ if [ -e ${D}${libdir}/gconv ]; then
mv -f ${D}${libdir}/gconv ${dest}${libdir}
fi
cp -fpPR ${D}${libdir}/* ${dest}${libdir}
diff --git a/meta/recipes-core/eglibc/eglibc_2.12.bb
b/meta/recipes-core/eglibc/eglibc_2.12.bb
index 1a69bdc..a71c4d4 100644
--- a/meta/recipes-core/eglibc/eglibc_2.12.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.12.bb
@@ -1,7 +1,7 @@
require eglibc.inc
DEPENDS += "gperf-native"
-PR = "r22"
+PR = "r23"
SRCREV = "14158"
diff --git a/meta/recipes-core/eglibc/eglibc_2.13.bb
b/meta/recipes-core/eglibc/eglibc_2.13.bb
index f382448..3b19e7b 100644
--- a/meta/recipes-core/eglibc/eglibc_2.13.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.13.bb
@@ -3,7 +3,7 @@ require eglibc.inc
SRCREV = "14157"
DEPENDS += "gperf-native"
-PR = "r13"
+PR = "r14"
PR_append = "+svnr${SRCPV}"
EGLIBC_BRANCH="eglibc-2_13"
--
1.7.6.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 02/10] eglibc-package: don't fail without localedef/gconv
On Fri, Aug 26, 2011 at 11:12:43AM +0100, Phil Blundell wrote:
> On Wed, 2011-07-20 at 23:06 +0200, Martin Jansa wrote:
> >- mv ${D}${libdir}/gconv ${dest}${libdir}
> > + if [ -f ${D}${libdir}/gconv ]; then
> > + mv -f ${D}${libdir}/gconv ${dest}${libdir}
> > + fi
>
> This can't be right: gconv will be a directory if it exists at all and
> hence "test -f gconv" will never be true.
>
> Since this patch was applied I'm getting a whole bunch of "installed but
> not shipped" warnings for /lib/gconv/*. Could you please look into
> that?
You're right, sorry about that (I didn't notice that because I didn't
have them built at all and later didn't get that those not packaged
files are caused by me).
Sending patch changing it to -e in few seconds.
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 02/10] eglibc-package: don't fail without localedef/gconv
On Wed, 2011-07-20 at 23:06 +0200, Martin Jansa wrote:
>- mv ${D}${libdir}/gconv ${dest}${libdir}
> + if [ -f ${D}${libdir}/gconv ]; then
> + mv -f ${D}${libdir}/gconv ${dest}${libdir}
> + fi
This can't be right: gconv will be a directory if it exists at all and
hence "test -f gconv" will never be true.
Since this patch was applied I'm getting a whole bunch of "installed but
not shipped" warnings for /lib/gconv/*. Could you please look into
that?
thanks
p.
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] Core image recipes
Hi all, Seems we have a few overlapping images in OE-core, with not especially obvious naming. The following two seem very similar in scope (basic X11 image): meta/recipes-core/images/core-image-core.bb meta/recipes-extended/images/core-image-basic.bb Maybe we could just have one of these and call it core-image-x11-base or similar? Then, we have core-image-base, which whilst it doesn't remove package management files, does not have "package-management" in its features, so it's not a whole lot different to core-image-minimal AFAICT. Comments? Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] kernel.bbclass: Find the kernel consistently.
On Thu, Aug 25, 2011 at 12:32:25PM -0700, Saul Wold wrote:
> On 08/25/2011 05:59 AM, Mike Crowe wrote:
> >Use KERNEL_OUTPUT variable to find the generated kernel image rather than
> >duplicating the existing path. This also means it can be overridden simply.
> >
> There are other places in kernel.bbclass that use the path vs
> KERNEL_OUTPUT, is there a reason you did not change those also?
The patch came out of an earlier attempt to do what I was doing in
PATCH 2/2 and I hadn't needed to change the other places. :(
Looking at the other places now I think that the two in do_sizecheck
are candidates for changing to KERNEL_OUTPUT. I'm less sure about the
uImage ones in kernel_do_deploy due to there being other references to
arch/${ARCH}/boot/... nearby. I wouldn't want to make the code less
clear.
Updated patch follows.
Thanks for your comments.
Mike.
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] eglibc-locale.inc: Add eglibc-binaries, eglibc-localedatas, eglibc-gconvs and eglibc-charmps to variable PACKAGE
From: Xiaofeng Yan
There are no locales resources in an lsb image because the locale resources
were splitted from eglibc-package.inc \
and putted into a new file "eglibc-locale.inc". So the above variables lost
their function in eglibc-package.inc and
caused no locale resources in an lsb image. The purpose of moving the above
variables from eglibc-package.inc to \
eglibc-locale.inc is to make the above variables to take effect.
eglibc-binaries include packages "eglibc-binary-*"
eglibc-localedatas include packages "eglibc-localedata-*"
eglibc-gconvs include packages "eglibc-gconv-*"
eglibc-charmaps include packages "eglibc-charmap-*"
Signed-off-by: Xiaofeng Yan
---
meta/recipes-core/eglibc/eglibc-locale.inc | 20
meta/recipes-core/eglibc/eglibc-package.inc | 20
2 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/meta/recipes-core/eglibc/eglibc-locale.inc
b/meta/recipes-core/eglibc/eglibc-locale.inc
index b8107ee..9424ff5 100644
--- a/meta/recipes-core/eglibc/eglibc-locale.inc
+++ b/meta/recipes-core/eglibc/eglibc-locale.inc
@@ -39,6 +39,26 @@ PACKAGES_DYNAMIC = "locale-base-* \
eglibc-gconv-* eglibc-charmap-* eglibc-localedata-*
eglibc-binary-localedata-* \
glibc-gconv-*${PKGSUFFIX} glibc-charmap-*
glibc-localedata-* glibc-binary-localedata-*"
+# Create a eglibc-binaries package
+ALLOW_EMPTY_${BPN}-binaries = "1"
+PACKAGES += "${BPN}-binaries"
+RRECOMMENDS_${BPN}-binaries = "${@" ".join([p for p in d.getVar('PACKAGES',
True).split() if p.find("eglibc-binary") != -1])}"
+
+# Create a eglibc-charmaps package
+ALLOW_EMPTY_${BPN}-charmaps = "1"
+PACKAGES += "${BPN}-charmaps"
+RRECOMMENDS_${BPN}-charmaps = "${@" ".join([p for p in d.getVar('PACKAGES',
True).split() if p.find("eglibc-charmap") != -1])}"
+
+# Create a eglibc-gconvs package
+ALLOW_EMPTY_${BPN}-gconvs = "1"
+PACKAGES += "${BPN}-gconvs"
+RRECOMMENDS_${BPN}-gconvs = "${@" ".join([p for p in d.getVar('PACKAGES',
True).split() if p.find("eglibc-gconv") != -1])}"
+
+# Create a eglibc-localedatas package
+ALLOW_EMPTY_${BPN}-localedatas = "1"
+PACKAGES += "${BPN}-localedatas"
+RRECOMMENDS_${BPN}-localedatas = "${@" ".join([p for p in
d.getVar('PACKAGES', True).split() if p.find("eglibc-localedata") != -1])}"
+
DESCRIPTION_localedef = "eglibc: compile locale definition files"
# eglibc-gconv is dynamically added into PACKAGES, thus
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc
b/meta/recipes-core/eglibc/eglibc-package.inc
index 5308bb9..37f9f25 100644
--- a/meta/recipes-core/eglibc/eglibc-package.inc
+++ b/meta/recipes-core/eglibc/eglibc-package.inc
@@ -22,26 +22,6 @@ PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
PACKAGES = "${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX}
nscd${PKGSUFFIX} ldd${PKGSUFFIX} ${PN}-utils eglibc-extra-nss${PKGSUFFIX}
eglibc-thread-db${PKGSUFFIX} ${PN}-pic ${PN}-dev ${PN}-doc libcidn${PKGSUFFIX}
libmemusage${PKGSUFFIX} libsegfault${PKGSUFFIX} ${PN}-pcprofile
libsotruss${PKGSUFFIX}"
-# Create a eglibc-binaries
-ALLOW_EMPTY_${PN}-binaries = "1"
-PACKAGES += "${PN}-binaries"
-RRECOMMENDS_${PN}-binaries = "${@" ".join([p for p in d.getVar('PACKAGES',
True).split() if p.find("eglibc-binary") != -1])}"
-
-# Create a eglibc-charmaps package
-ALLOW_EMPTY_${PN}-charmaps = "1"
-PACKAGES += "${PN}-charmaps"
-RRECOMMENDS_${PN}-charmaps = "${@" ".join([p for p in d.getVar('PACKAGES',
True).split() if p.find("eglibc-charmap") != -1])}"
-
-# Create a eglibc-gconvs package
-ALLOW_EMPTY_${PN}-gconvs = "1"
-PACKAGES += "${PN}-gconvs"
-RRECOMMENDS_${PN}-gconvs = "${@" ".join([p for p in d.getVar('PACKAGES',
True).split() if p.find("eglibc-gconv") != -1])}"
-
-# Create a eglibc-localedatas package
-ALLOW_EMPTY_${PN}-localedatas = "1"
-PACKAGES += "${PN}-localedatas"
-RRECOMMENDS_${PN}-localedatas = "${@" ".join([p for p in d.getVar('PACKAGES',
True).split() if p.find("eglibc-localedata") != -1])}"
-
RPROVIDES_${PN} = "glibc${PKGSUFFIX}"
RPROVIDES_${PN}-utils = "glibc${PKGSUFFIX}-utils"
RPROVIDES_${PN}-pic = "glibc${PKGSUFFIX}-pic"
--
1.7.0.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] eglibc-locale.inc: Add eglibc-binaries, eglibc-localedatas, eglibc-gconvs and eglibc-charmps to variable PACKAGE
From: Xiaofeng Yan The above variables lost their function, which caused no locale resources in an lsb image because locale resources were splitted from eglibc-package.inc and put into "eglibc-locale.inc". For continuing to effect the above variables, I move them from eglibc-package.inc to eglibc-locale.inc. Pull URL: git://git.pokylinux.org/poky-contrib.git Branch: xiaofeng/eglibc-locale Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=xiaofeng/eglibc-locale Thanks, Xiaofeng Yan --- Xiaofeng Yan (1): eglibc-locale.inc: Add eglibc-binaries, eglibc-localedatas, eglibc-gconvs and eglibc-charmps to variable PACKAGE meta/recipes-core/eglibc/eglibc-locale.inc | 20 meta/recipes-core/eglibc/eglibc-package.inc | 20 2 files changed, 20 insertions(+), 20 deletions(-) ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] opkg-utils: ignore packages disapperaring filelist generation
On 8/25/11, Dmitry Eremin-Solenikov wrote:
> Package files disappearing during index generation don't cause a fatal
> error. Make package file disappearing during filelist generation also
> a non-fatal error.
Please ignore this, I'll send a V2 soon.
>
> Signed-off-by: Dmitry Eremin-Solenikov
> ---
> .../opkg-utils/no-ioerror-during-filelist.patch| 31
>
> meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb |3 +-
> 2 files changed, 33 insertions(+), 1 deletions(-)
> create mode 100644
> meta/recipes-devtools/opkg-utils/no-ioerror-during-filelist.patch
>
> diff --git
> a/meta/recipes-devtools/opkg-utils/no-ioerror-during-filelist.patch
> b/meta/recipes-devtools/opkg-utils/no-ioerror-during-filelist.patch
> new file mode 100644
> index 000..dc85cb6
> --- /dev/null
> +++ b/meta/recipes-devtools/opkg-utils/no-ioerror-during-filelist.patch
> @@ -0,0 +1,31 @@
> +From: Dmitry Eremin-Solenikov
> +Subject: Ignore IOError errors while populating filelist
> +Upstream-Status: Pending/Not-Applicable
> +
> +While populating Packages.filelist there is a possibility that the package
> file
> +will disappear while reading. So ignore errors during filelist generation.
> +
> +
> +Signed-off-by: Dmitry Eremin-Solenikov
> +
> +Index: opkg-utils/opkg-make-index
> +===
> +--- opkg-utils.orig/opkg-make-index 2011-08-25 16:45:41.0 +0400
> opkg-utils/opkg-make-index 2011-08-25 17:38:57.0 +0400
> +@@ -197,7 +197,15 @@
> + names = packages.packages.keys()
> + names.sort()
> + for name in names:
> +- for fn in packages[name].get_file_list():
> ++ try:
> ++ fnlist = packages[name].get_file_list()
> ++ except OSError, e:
> ++ sys.stderr.write(e)
> ++ continue
> ++ except IOError, e:
> ++ sys.stderr.write(e)
> ++ continue
> ++ for fn in fnlist:
> + (h,t) = os.path.split(fn)
> + if not t: continue
> + if not files.has_key(t): files[t] = name+':'+fn
> diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb
> b/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb
> index fd2b5e6..7659465 100644
> --- a/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb
> +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb
> @@ -8,12 +8,13 @@ RDEPENDS_${PN} = "python"
> RDEPENDS_${PN}_virtclass-native = ""
> SRCREV = "4747"
> PV = "0.1.8+svnr${SRCPV}"
> -PR = "r4"
> +PR = "r5"
>
> SRC_URI =
> "svn://svn.openmoko.org/trunk/src/host/;module=opkg-utils;proto=http \
> file://index-ignore-filenotfound.patch \
> file://mtime-int.patch \
> file://add-license-field.patch \
> + file://no-ioerror-during-filelist.patch \
> "
>
> S = "${WORKDIR}/opkg-utils"
> --
> 1.7.2.5
>
>
--
With best wishes
Dmitry
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] kernel.bbclass: Find the kernel consistently.
Use KERNEL_OUTPUT variable to find the generated kernel image rather than
duplicating the existing path. This also means it can be overridden simply.
Signed-off-by: Mike Crowe
---
meta/classes/kernel.bbclass |6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index a2b10f2..6ebc7de 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -460,9 +460,9 @@ python populate_packages_prepend () {
# with a fixed length or there is a limit in transferring the kernel to memory
do_sizecheck() {
if [ ! -z "${KERNEL_IMAGE_MAXSIZE}" ]; then
- size=`ls -l arch/${ARCH}/boot/${KERNEL_IMAGETYPE} | awk '{
print $5}'`
+ size=`ls -l ${KERNEL_OUTPUT} | awk '{ print $5}'`
if [ $size -ge ${KERNEL_IMAGE_MAXSIZE} ]; then
- rm arch/${ARCH}/boot/${KERNEL_IMAGETYPE}
+ rm ${KERNEL_OUTPUT}
die "This kernel (size=$size >
${KERNEL_IMAGE_MAXSIZE}) is too big for your device. Please reduce the size of
the kernel by making more of it modular."
fi
fi
@@ -476,7 +476,7 @@ KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
KERNEL_IMAGE_SYMLINK_NAME ?= "${KERNEL_IMAGETYPE}-${MACHINE}"
kernel_do_deploy() {
- install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE}
${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin
+ install -m 0644 ${KERNEL_OUTPUT}
${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin
if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
tar -cvzf
${DEPLOYDIR}/modules-${KERNEL_VERSION}-${PR}-${MACHINE}.tgz -C ${D} lib
fi
--
1.7.2.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] new feature? (for "DL_DIR")
On 2011-08-25 20:47, Ni Qingliang wrote: I found that: for every vcs (e.g. git) package, except a directory in "git" or "git2", there is another file "*.tar.gz" in the downloads dir. but for my own package, e.g linux 2.6.35 for i.mx28, only the directory under "git2", I can't found the tar.gz file in downloads, why? On Fri, 2011-08-26 at 10:27 +0800, 倪庆亮 wrote: thanks again, I have setup an internal package server (http), and the client can use it in poky. but I have another problem for git svn( for the .gz .bz2 package, no problem), the source code of the packages using git/svn/hg are directories in the server, does the client can use it??? On Mon, 2011-08-22 at 15:56 +0800, 倪庆亮 wrote: Do we can assign all package be downloaded from the same path? I want setup one internal server to store the files in upstreamsources, and all developer's PC use it but not the original package address. Set this in your .conf BB_GENERATE_MIRROR_TARBALLS ?= "1" When you use 'own-mirrors', you'll end up with a "downloads" directory in your build tree. This will include symbolic links to files already found in your cache, as well as any files newly downloaded during a build. You probably want to push out the new files to your cache from this downloads directory. -- Gary Thomas | Consulting for the MLB Associates |Embedded world ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [meta-ti PATCH 1/4] gedit: Imported from OE classic
meta-oe, right?
Op 26 aug. 2011, om 02:59 heeft Joel A Fernandes het volgende geschreven:
> Signed-off-by: Joel A Fernandes
> ---
> meta-gnome/recipes-gnome/gedit/gedit_2.30.0.bb | 24
> 1 files changed, 24 insertions(+), 0 deletions(-)
> create mode 100644 meta-gnome/recipes-gnome/gedit/gedit_2.30.0.bb
>
> diff --git a/meta-gnome/recipes-gnome/gedit/gedit_2.30.0.bb
> b/meta-gnome/recipes-gnome/gedit/gedit_2.30.0.bb
> new file mode 100644
> index 000..64ea644
> --- /dev/null
> +++ b/meta-gnome/recipes-gnome/gedit/gedit_2.30.0.bb
> @@ -0,0 +1,24 @@
> +DESCRIPTION = "GNOME editor"
> +SECTION = "x11/gnome"
> +LICENSE = "GPLv2+"
> +
> +DEPENDS = "enchant gconf gnome-common gnome-doc-utils-native glib-2.0 gtk+
> gtksourceview2 iso-codes virtual/gettext"
> +RDEPENDS_${PN} += " gtksourceview2"
> +
> +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
> +
> +PR = "r2"
reset that
> +
> +inherit gnome
> +SRC_URI[archive.md5sum] = "aebd49797406fdde7b25624b71990860"
> +SRC_URI[archive.sha256sum] =
> "37598473372aab217e46f19726cff616ff0ea4121bbdbb170b4e264a4ca76690"
> +
> +EXTRA_OECONF = "--disable-scrollkeeper"
> +
> +do_configure_prepend () {
> + cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S}
> +}
> +
> +FILES_${PN} += "${libdir}/gedit-2/plugin* ${datadir}/gedit-2"
> +FILES_${PN}-dbg += "${libdir}/gedit-2/plugin-loaders/.debug
> ${libdir}/gedit-2/plugins/.debug"
> +
> --
> 1.7.0.4
>
>
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [meta-ti PATCH 2/4] gtksourceview: Imported from OE classic
meta-oe, right?
Op 26 aug. 2011, om 02:59 heeft Joel A Fernandes het volgende geschreven:
>
> +++ b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2_2.10.0.bb
> @@ -0,0 +1,29 @@
> +DESCRIPTION = "Portable C library for multiline text editing"
> +HOMEPAGE = "http://projects.gnome.org/gtksourceview/";
> +LICENSE = "LGPL"
which version?
> +DEPENDS = "gtk+ libgnomeprint virtual/gettext"
> +
> +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
> +
> +PNAME = "gtksourceview"
> +
> +S = "${WORKDIR}/${PNAME}-${PV}"
> +
> +inherit gnome lib_package
> +
> +# overrule SRC_URI from gnome.conf
> +SRC_URI =
> "${GNOME_MIRROR}/${PNAME}/${@gnome_verdir("${PV}")}/${PNAME}-${PV}.tar.bz2;name=archive"
> +SRC_URI[archive.md5sum] = "04279db5d4fda41a35bf3d9aafa3a6c1"
> +SRC_URI[archive.sha256sum] =
> "a72484ff661d3515130911b59f78a88afc1344421431e05e99e9dab791be948f"
> +
> +SRC_URI += " \
> + file://gtk-doc.make \
> +"
> +
> +do_configure_prepend() {
> +cp ${WORKDIR}/gtk-doc.make ${S}/
> +sed -i -e s:docs::g ${S}/Makefile.am
> +echo "EXTRA_DIST = version.xml" > gnome-doc-utils.make
> +}
> +
> +FILES_${PN} += " ${datadir}/gtksourceview-2.0"
> --
> 1.7.0.4
>
>
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [meta-ti PATCH 4/4] libgnomeprint: Imported from OE classic
You mean meta-oe, right?
Op 26 aug. 2011, om 02:59 heeft Joel A Fernandes het volgende geschreven:
> Signed-off-by: Joel A Fernandes
> ---
> .../recipes-gnome/gnome/libgnomeprint_2.18.7.bb| 15 +++
> 1 files changed, 15 insertions(+), 0 deletions(-)
> create mode 100644 meta-gnome/recipes-gnome/gnome/libgnomeprint_2.18.7.bb
>
> diff --git a/meta-gnome/recipes-gnome/gnome/libgnomeprint_2.18.7.bb
> b/meta-gnome/recipes-gnome/gnome/libgnomeprint_2.18.7.bb
> new file mode 100644
> index 000..57e7910
> --- /dev/null
> +++ b/meta-gnome/recipes-gnome/gnome/libgnomeprint_2.18.7.bb
> @@ -0,0 +1,15 @@
> +LICENSE = "GPL"
Which version?
> +SECTION = "x11/gnome/libs"
> +
> +DEPENDS = "libxml2 libgnomecups glib-2.0 pango libart-lgpl fontconfig popt
> gnome-common"
> +
> +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
> +
> +inherit pkgconfig gnome
> +
> +SRC_URI[archive.md5sum] = "d66b81ee8aa3b3a33f5efc9a47ce07e3"
> +SRC_URI[archive.sha256sum] =
> "8b34f81599423ef3da9c43775495da602f83cbbee069c9e760ffeae6aa4768e6"
> +
> +FILES_${PN}-dbg += "${libdir}/libgnomeprint/${PV}/modules/transports/.debug \
> + ${libdir}/libgnomeprint/${PV}/modules/.debug
> ${libdir}/libgnomeprint/${PV}/modules/*/.debug"
> +
> --
> 1.7.0.4
>
>
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH meta-oe 5/9] libdvdcss: Imported from OE classic, vlc depends on it
Op 26 aug. 2011, om 02:28 heeft Joel A Fernandes het volgende geschreven:
> Signed-off-by: Joel A Fernandes
> ---
> meta-oe/recipes-multimedia/vlc/libdvdcss_1.2.10.bb | 13 +
> 1 files changed, 13 insertions(+), 0 deletions(-)
> create mode 100644 meta-oe/recipes-multimedia/vlc/libdvdcss_1.2.10.bb
>
> diff --git a/meta-oe/recipes-multimedia/vlc/libdvdcss_1.2.10.bb
> b/meta-oe/recipes-multimedia/vlc/libdvdcss_1.2.10.bb
> new file mode 100644
> index 000..1a0b7b8
> --- /dev/null
> +++ b/meta-oe/recipes-multimedia/vlc/libdvdcss_1.2.10.bb
> @@ -0,0 +1,13 @@
> +DESCRIPTION = "libdvdcss is a simple library designed for accessing DVDs
> like a block device without having to bother about the decryption."
> +LICENSE = "GPLv2"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
> +PR = "r1"
reset that
> +
> +SRC_URI =
> "http://download.videolan.org/pub/libdvdcss/${PV}/libdvdcss-${PV}.tar.bz2";
> +
> +inherit autotools
> +
> +EXTRA_OECONF = " --disable-doc "
> +
> +SRC_URI[md5sum] = "ebd5370b79ac5a83e5c61b24a214cf74"
> +SRC_URI[sha256sum] =
> "2394a75013ab66b592d8c91d53529ede392bc9faee37fe279bd29b455eff2220"
> --
> 1.7.0.4
>
>
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH meta-oe 1/9] schroedinger: Imported from OE classic
Op 26 aug. 2011, om 02:28 heeft Joel A Fernandes het volgende geschreven:
> Signed-off-by: Joel A Fernandes
> ---
> .../schroedinger/gst-plugin-schroedinger_1.0.9.bb | 15 +++
> .../schroedinger/schroedinger.inc | 19 +++
> .../schroedinger/schroedinger/configure.ac.patch | 13 +
> .../schroedinger/schroedinger_1.0.9.bb | 13 +
> 4 files changed, 60 insertions(+), 0 deletions(-)
> create mode 100644
> meta-oe/recipes-multimedia/schroedinger/gst-plugin-schroedinger_1.0.9.bb
> create mode 100644 meta-oe/recipes-multimedia/schroedinger/schroedinger.inc
> create mode 100644
> meta-oe/recipes-multimedia/schroedinger/schroedinger/configure.ac.patch
> create mode 100644
> meta-oe/recipes-multimedia/schroedinger/schroedinger_1.0.9.bb
>
> diff --git
> a/meta-oe/recipes-multimedia/schroedinger/gst-plugin-schroedinger_1.0.9.bb
> b/meta-oe/recipes-multimedia/schroedinger/gst-plugin-schroedinger_1.0.9.bb
> new file mode 100644
> index 000..0a95646
> --- /dev/null
> +++ b/meta-oe/recipes-multimedia/schroedinger/gst-plugin-schroedinger_1.0.9.bb
> @@ -0,0 +1,15 @@
> +require schroedinger.inc
> +PR = "r0"
> +
> +DEPENDS += "gstreamer gst-plugins-base"
> +
> +SRC_URI[schroedingertargz.md5sum] = "d67ec48b7c506db8c8b49156bf409e60"
> +SRC_URI[schroedingertargz.sha256sum] =
> "345abcaa72ff0f2e9c1075e22f7141475ee4e6eea23a7f568b69ffc13cc1c723"
> +
> +S = "${WORKDIR}/schroedinger-${PV}"
> +
> +PACKAGES = "gst-plugin-schroedinger gst-plugin-schroedinger-dev
> gst-plugin-schroedinger-dbg"
> +FILES_gst-plugin-schroedinger += "${libdir}/gstreamer-0.10/libgstschro.so"
> +FILES_gst-plugin-schroedinger-dev += "${libdir}/gstreamer-0.10/libgstschro.*"
> +FILES_gst-plugin-schroedinger-dbg +=
> "${libdir}/gstreamer-0.10/.debug/libgstschro.so"
> +
> diff --git a/meta-oe/recipes-multimedia/schroedinger/schroedinger.inc
> b/meta-oe/recipes-multimedia/schroedinger/schroedinger.inc
> new file mode 100644
> index 000..386fc73
> --- /dev/null
> +++ b/meta-oe/recipes-multimedia/schroedinger/schroedinger.inc
> @@ -0,0 +1,19 @@
> +HOMEPAGE = "http://schrodinger.sourceforge.net/";
> +LICENSE = "MPL GPL LGPL MIT"
> +DEPENDS = "liboil orc-native orc"
> +
> +INC_PR = "r1"
reset that
> +
> +SRC_URI =
> "http://www.diracvideo.org/download/schroedinger/${P}.tar.gz;name=schroedingertargz";
> +SRC_URI += "file://configure.ac.patch"
> +
> +EXTRA_OECONF += "STAGING_DIR=${STAGING_DIR_NATIVE}"
> +
> +inherit autotools
> +
> +do_configure_append () {
> +# Fix stupid libtool... handling.
> +# rpath handling can't be disabled and the Makefile's can't be
> regenerated..
> +# (GNU sed required)
> +sed -i s/^hardcode_libdir_flag_spec/#hardcode_libdir_flag_spec/
> ${S}/*-libtool
> +}
> diff --git
> a/meta-oe/recipes-multimedia/schroedinger/schroedinger/configure.ac.patch
> b/meta-oe/recipes-multimedia/schroedinger/schroedinger/configure.ac.patch
> new file mode 100644
> index 000..ac5e7ee
> --- /dev/null
> +++ b/meta-oe/recipes-multimedia/schroedinger/schroedinger/configure.ac.patch
> @@ -0,0 +1,13 @@
> +Index: schroedinger-1.0.9/configure.ac
> +===
> +--- schroedinger-1.0.9.orig/configure.ac
> schroedinger-1.0.9/configure.ac
> +@@ -54,7 +54,7 @@ if test "x${HAVE_ORC}" != xyes ; then
> + AC_ERROR([orc-0.4 >= $ORC_VER is required])
> + fi
> + SCHRO_PKG_DEPS="$SCHRO_PKG_DEPS orc-0.4 >= $ORC_VER"
> +-ORCC=`$PKG_CONFIG --variable=orcc orc-0.4`
> ++ORCC=$STAGING_DIR`$PKG_CONFIG --variable=orcc orc-0.4`
> + AC_SUBST(ORCC)
> +
> + AC_ARG_WITH([thread],
> diff --git a/meta-oe/recipes-multimedia/schroedinger/schroedinger_1.0.9.bb
> b/meta-oe/recipes-multimedia/schroedinger/schroedinger_1.0.9.bb
> new file mode 100644
> index 000..2994428
> --- /dev/null
> +++ b/meta-oe/recipes-multimedia/schroedinger/schroedinger_1.0.9.bb
> @@ -0,0 +1,13 @@
> +require schroedinger.inc
> +
> +PR = "${INC_PR}.0"
> +
> +inherit autotools
> +
> +SRC_URI[schroedingertargz.md5sum] = "d67ec48b7c506db8c8b49156bf409e60"
> +SRC_URI[schroedingertargz.sha256sum] =
> "345abcaa72ff0f2e9c1075e22f7141475ee4e6eea23a7f568b69ffc13cc1c723"
Why isn't this in the .inc and why is there a seperate recipe for the gst
plugin?
> +
> +PACKAGES =+ "gst-plugin-schroedinger-dbg gst-plugin-schroedinger-dev
> gst-plugin-schroedinger"
> +FILES_gst-plugin-schroedinger = "${libdir}/gstreamer-0.10/*.so"
> +FILES_gst-plugin-schroedinger-dbg = "${libdir}/gstreamer-0.10/.debug"
> +FILES_gst-plugin-schroedinger-dev = "${libdir}/gstreamer-0.10/*.*a"
> --
> 1.7.0.4
>
>
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtog
Re: [OE-core] [PATCH meta-oe 8/9] xsp: Imported from OE classic
Op 26 aug. 2011, om 02:28 heeft Joel A Fernandes het volgende geschreven:
> Signed-off-by: Joel A Fernandes
> ---
> .../recipes-multimedia/xsp/xsp/xsp-fix-pc.patch| 10 ++
> meta-oe/recipes-multimedia/xsp/xsp_1.0.0-8.bb | 15 +++
> 2 files changed, 25 insertions(+), 0 deletions(-)
> create mode 100644 meta-oe/recipes-multimedia/xsp/xsp/xsp-fix-pc.patch
> create mode 100644 meta-oe/recipes-multimedia/xsp/xsp_1.0.0-8.bb
>
> diff --git a/meta-oe/recipes-multimedia/xsp/xsp/xsp-fix-pc.patch
> b/meta-oe/recipes-multimedia/xsp/xsp/xsp-fix-pc.patch
> new file mode 100644
> index 000..18bc67c
> --- /dev/null
> +++ b/meta-oe/recipes-multimedia/xsp/xsp/xsp-fix-pc.patch
> @@ -0,0 +1,10 @@
> +--- Xsp/xsp.pc.in~ 2009-01-07 13:06:07.0 +0100
> Xsp/xsp.pc.in2009-01-07 13:06:07.0 +0100
> +@@ -6,5 +6,5 @@
> + Name: Xsp
> + Description: X Sputnik Library
> + Version: @PACKAGE_VERSION@
> +-Cflags: -I${includedir} @XSP_CFLAGS@ @X_CFLAGS@
> +-Libs: -L${libdir} -lXsp @XSP_LIBS@ @X_LIBS@
> ++Cflags: -I${includedir}
> ++Libs: -L${libdir} -lXsp -lX11
> diff --git a/meta-oe/recipes-multimedia/xsp/xsp_1.0.0-8.bb
> b/meta-oe/recipes-multimedia/xsp/xsp_1.0.0-8.bb
> new file mode 100644
> index 000..2bc3e83
> --- /dev/null
> +++ b/meta-oe/recipes-multimedia/xsp/xsp_1.0.0-8.bb
> @@ -0,0 +1,15 @@
> +PR = "r2"
drop that
> +LICENSE= "MIT"
> +DESCRIPTION = "X Server Nokia 770 extensions library"
> +SECTION = "x11/libs"
> +PRIORITY = "optional"
That field isn't used anymore
> +DEPENDS = "virtual/libx11 libxext xpext"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=ea2bda168c508c7cd8afa567b2fcc549"
> +SRC_URI =
> "http://repository.maemo.org/pool/maemo/ossw/source/x/xsp/${PN}_${PV}.tar.gz \
> + file://xsp-fix-pc.patch"
> +S = "${WORKDIR}/Xsp"
> +
> +inherit autotools pkgconfig
> +
> +SRC_URI[md5sum] = "2a0d8d02228d4cbd28b6e07bb7c17cf5"
> +SRC_URI[sha256sum] =
> "8b722b952b64841d996c70c3278499886c81bb5012991beed5f66f4158418f59"
> --
> 1.7.0.4
>
>
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH meta-oe 3/9] libmad: Imported from OE-classic
Op 26 aug. 2011, om 02:28 heeft Joel A Fernandes het volgende geschreven:
>
> diff --git a/meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb
> b/meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb
> new file mode 100644
> index 000..537d685
> --- /dev/null
> +++ b/meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb
> @@ -0,0 +1,34 @@
> +DESCRIPTION = "MPEG Audio Decoder Library"
> +SECTION = "libs"
> +PRIORITY = "optional"
That field isn't used anymore
> +DEPENDS = "libid3tag"
> +LICENSE = "GPL"
Which version?
> +PR = "r5"
reset that
> +
> +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
> +
> +SRC_URI = "${SOURCEFORGE_MIRROR}/mad/libmad-${PV}.tar.gz \
> + file://add-pkgconfig.patch \
> +file://mad.diff \
> +file://mad-mips-h-constraint.patch"
> +
> +S = "${WORKDIR}/libmad-${PV}"
> +
> +SRC_URI_append_avr32 = " file://libmad-0.15.1b-avr32-optimization.patch"
> +
> +inherit autotools pkgconfig
> +
> +EXTRA_OECONF = "-enable-speed --enable-shared"
> +# The ASO's don't take any account of thumb...
> +EXTRA_OECONF_append_thumb = " --disable-aso --enable-fpm=default"
> +EXTRA_OECONF_append_arm = " --enable-fpm=arm"
> +
> +do_configure_prepend () {
> +#damn picky automake...
> + touch NEWS AUTHORS ChangeLog
> +}
> +
> +ARM_INSTRUCTION_SET = "arm"
> +
> +SRC_URI[md5sum] = "1be543bc30c56fb6bea1d7bf6a64e66c"
> +SRC_URI[sha256sum] =
> "bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690"
> --
> 1.7.0.4
>
>
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH meta-oe 9/9] xpext: Imported from OE classic
Op 26 aug. 2011, om 02:28 heeft Joel A Fernandes het volgende geschreven:
> Signed-off-by: Joel A Fernandes
> ---
> .../recipes-multimedia/xpext/xpext/auxdir.patch| 13 +++
> meta-oe/recipes-multimedia/xpext/xpext_1.0-5.bb| 23
> 2 files changed, 36 insertions(+), 0 deletions(-)
> create mode 100644 meta-oe/recipes-multimedia/xpext/xpext/auxdir.patch
> create mode 100644 meta-oe/recipes-multimedia/xpext/xpext_1.0-5.bb
>
> diff --git a/meta-oe/recipes-multimedia/xpext/xpext/auxdir.patch
> b/meta-oe/recipes-multimedia/xpext/xpext/auxdir.patch
> new file mode 100644
> index 000..da5841a
> --- /dev/null
> +++ b/meta-oe/recipes-multimedia/xpext/xpext/auxdir.patch
> @@ -0,0 +1,13 @@
> +--- configure.ac.old 2005-06-03 12:53:28.0 +0200
> configure.ac 2005-06-03 12:54:29.0 +0200
> +@@ -25,9 +25,9 @@
> +
> + AC_PREREQ([2.57])
> + AC_INIT([spext], [1.0], [lauri.leukku...@nokia.com], spext)
> ++AC_CONFIG_AUX_DIR(.)
> + AM_INIT_AUTOMAKE([dist-bzip2])
> + AM_MAINTAINER_MODE
> +-AC_CONFIG_AUX_DIR(.)
> +
> + dnl PKG_CHECK_MODULES(FIXESEXT, fixesext)
> +
The patch about is lacking a patch header with upstream status.
> diff --git a/meta-oe/recipes-multimedia/xpext/xpext_1.0-5.bb
> b/meta-oe/recipes-multimedia/xpext/xpext_1.0-5.bb
> new file mode 100644
> index 000..e6c1a5d
> --- /dev/null
> +++ b/meta-oe/recipes-multimedia/xpext/xpext_1.0-5.bb
> @@ -0,0 +1,23 @@
> +PR = "r1"
please reset that
> +LICENSE= "MIT"
> +DESCRIPTION = "X Server Nokia 770 extensions library"
> +SECTION = "x11/libs"
> +PRIORITY = "optional"
> +DEPENDS = "virtual/libx11 libxext"
> +
> +LIC_FILES_CHKSUM = "file://COPYING;md5=db043791349ba57ad1169e1c92477cb6"
> +
> +SRC_URI =
> "http://repository.maemo.org/pool/maemo/ossw/source/x/${PN}/${PN}_${PV}.tar.gz
> \
> + file://auxdir.patch;striplevel=0"
> +S = "${WORKDIR}/xpext-1.0"
> +
> +inherit autotools pkgconfig
> +
> +do_configure_prepend () {
> + cd ${S}
> + chmod +x ./autogen.sh
> + ./autogen.sh
> +}
> +
> +SRC_URI[md5sum] = "1b0cb67b6f2bd7c4abef17648b062896"
> +SRC_URI[sha256sum] =
> "a3b06f5188fd9effd0799ae31352b3cd65cb913b964e2c1a923ffa9d3c08abbe"
> --
> 1.7.0.4
>
>
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH meta-oe 6/9] vlc: Imported from OE classic
Op 26 aug. 2011, om 02:28 heeft Joel A Fernandes het volgende geschreven:
> Signed-off-by: Joel A Fernandes
> ---
> vlc is not an mplayer depdency, but libdvdcss is an mplayer depedency and it
> is included in the recipes/vlc directory in oe-classic. I have imported vlc
> as well for completeness.
>
> meta-oe/recipes-multimedia/vlc/vlc.inc| 61 +
> meta-oe/recipes-multimedia/vlc/vlc_1.1.4.1.bb | 51 +
> 2 files changed, 112 insertions(+), 0 deletions(-)
> create mode 100644 meta-oe/recipes-multimedia/vlc/vlc.inc
> create mode 100644 meta-oe/recipes-multimedia/vlc/vlc_1.1.4.1.bb
>
> diff --git a/meta-oe/recipes-multimedia/vlc/vlc.inc
> b/meta-oe/recipes-multimedia/vlc/vlc.inc
> new file mode 100644
> index 000..0435e87
> --- /dev/null
> +++ b/meta-oe/recipes-multimedia/vlc/vlc.inc
> @@ -0,0 +1,61 @@
> +DESCRIPTION = "Video player and streamer - davinci edition"
> +HOMEPAGE = "http://www.videolan.org";
> +LICENSE = "GPL"
Which version?
> +PRIORITY = "optional"
That field isn't used anymore
> +SECTION = "multimedia"
> +
> +DEPENDS = "libfribidi libtool hal gettext libgcrypt schroedinger
> virtual/libsdl qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac \
> + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad
> libid3tag liba52 mpeg2dec', d)}"
> +
> +INC_PR = "r4"
reset that
>
> +++ b/meta-oe/recipes-multimedia/vlc/vlc_1.1.4.1.bb
> @@ -0,0 +1,51 @@
> +# This recipe packages vlc as a library as well, so qt4 dependencies
> +# can be avoided when ony the library is installed.
> +# Would be cool if when newer vlc is added to OE and older ones are phased
> +# out that could be made the default.
Can be made the default now?
> +
> +require vlc.inc
> +
> +PR = "${INC_PR}.1"
> +
> +SRC_URI[md5sum] = "ce17c335b38b322949694313173fcd49"
> +SRC_URI[sha256sum] =
> "61c9ea30a17ea40c6ccbfd507026e5c83ad9e0691f221d3667c8e49696d7c2aa"
Why isn't anll of the below in the .inc?
> +# ffmpeg from git (library version => 52) is required
> +# libtool-native must be >= 2.2.4
> +DEPENDS += "libdvdcss libdvdread lua5.1-native lua5.1"
> +RDEPENDS_${PN} += "lua5.1"
> +
> +EXTRA_OECONF += "\
> + --enable-dvdread \
> +"
> +
> +LEAD_SONAME = "libvlc.so.5"
> +
> +PACKAGES =+ "libvlc-dbg libvlc-dev libvlc"
> +
> +FILES_libvlc-dev = "${libdir}/lib*.so"
> +
> +FILES_libvlc-dbg = "\
> + ${libdir}/.debug \
> + ${libdir}/vlc/meta_engine/.debug \
> + ${libdir}/vlc/audio_filter/.debug ${libdir}/vlc/audio_output/.debug \
> + ${libdir}/vlc/demux/.debug ${libdir}/vlc/control/.debug \
> + ${libdir}/vlc/gui/.debug ${libdir}/vlc/packetizer/.debug \
> + ${libdir}/vlc/audio_mixer/.debug ${libdir}/vlc/stream_out/.debug \
> + ${libdir}/vlc/mux/.debug ${libdir}/vlc/access/.debug \
> + ${libdir}/vlc/visualization/.debug ${libdir}/vlc/access_filter/.debug \
> + ${libdir}/vlc/access_output/.debug ${libdir}/vlc/video_output/.debug \
> + ${libdir}/vlc/services_discovery/.debug
> ${libdir}/vlc/video_chroma/.debug \
> + ${libdir}/vlc/video_codec/.debug ${libdir}/vlc/video_filter/.debug \
> + ${libdir}/vlc/misc/.debug ${libdir}/vlc/codec/.debug \
> + "
> +
> +FILES_libvlc = "${libdir}/lib*.so.*"
> +
> +FILES_${PN} += "${bindir}/vlc \
> + ${datadir}/applications \
> + ${datadir}/vlc/ \
> + "
> +
> +FILES_${PN}-dbg += "${libdir}/vlc/*/.debug"
> +
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH meta-oe 7/9] live555: Imported from OE classic
Op 26 aug. 2011, om 02:28 heeft Joel A Fernandes het volgende geschreven: > > +LICENSE = "LGPL" Which version? > +SECTION = "devel" > + > +INC_PR = "r2" please reset *PR when adding new recipes ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/5] multilib.bbclass: add "pkg_postinst" and "pkg_postrm" as renaming elements
Add "pkg_postinst" and "pkg_postrm" as renaming elements, which fixes
missing post install/rm scripts in target image.
Signed-off-by: Dongxiao Xu
---
meta/classes/multilib.bbclass |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index 46c24e1..5976d5d 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -73,7 +73,7 @@ python __anonymous () {
d.setVar("PACKAGES", " ".join([row[1] for row in pkgs_mapping]))
for pkg_mapping in pkgs_mapping:
-for subs in ["FILES", "RDEPENDS", "RRECOMMENDS", "SUMMARY",
"DESCRIPTION", "RSUGGESTS", "RPROVIDES", "RCONFLICTS", "PKG", "ALLOW_EMPTY"]:
+for subs in ["FILES", "RDEPENDS", "RRECOMMENDS", "SUMMARY",
"DESCRIPTION", "RSUGGESTS", "RPROVIDES", "RCONFLICTS", "PKG", "ALLOW_EMPTY",
"pkg_postinst", "pkg_postrm"]:
d.renameVar("%s_%s" % (subs, pkg_mapping[0]), "%s_%s" % (subs,
pkg_mapping[1]))
map_dependencies("DEPENDS", d)
--
1.7.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/5] multilib.bbclass: add renaming for INITSCRIPT related variables
Initscripts are missing in target image in multilib case. This commit
adds the renaming logic for the related variables in multilib.bbclass.
This fixes the no response of mouse/keyboard in target system due to
the missing of udev startup script.
Signed-off-by: Dongxiao Xu
---
meta/classes/multilib.bbclass |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index 5976d5d..286b806 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -73,7 +73,7 @@ python __anonymous () {
d.setVar("PACKAGES", " ".join([row[1] for row in pkgs_mapping]))
for pkg_mapping in pkgs_mapping:
-for subs in ["FILES", "RDEPENDS", "RRECOMMENDS", "SUMMARY",
"DESCRIPTION", "RSUGGESTS", "RPROVIDES", "RCONFLICTS", "PKG", "ALLOW_EMPTY",
"pkg_postinst", "pkg_postrm"]:
+for subs in ["FILES", "RDEPENDS", "RRECOMMENDS", "SUMMARY",
"DESCRIPTION", "RSUGGESTS", "RPROVIDES", "RCONFLICTS", "PKG", "ALLOW_EMPTY",
"pkg_postinst", "pkg_postrm", "INITSCRIPT_NAME", "INITSCRIPT_PARAMS"]:
d.renameVar("%s_%s" % (subs, pkg_mapping[0]), "%s_%s" % (subs,
pkg_mapping[1]))
map_dependencies("DEPENDS", d)
@@ -89,4 +89,5 @@ python __anonymous () {
map_variable("PROVIDES", d)
map_variable("PACKAGES_DYNAMIC", d)
map_variable("PACKAGE_INSTALL", d)
+map_variable("INITSCRIPT_PACKAGES", d)
}
--
1.7.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/5] bitbake.conf: Use BPN in FILES paths
Use BPN instead of PN in FILES path to support multilib.
Signed-off-by: Dongxiao Xu
---
meta/conf/bitbake.conf |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index b309516..2a77483 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -261,7 +261,7 @@ FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/*
${libdir}/lib*${SOLIBS}
${sysconfdir} ${sharedstatedir} ${localstatedir} \
${base_bindir}/* ${base_sbindir}/* \
${base_libdir}/*${SOLIBS} \
-${datadir}/${PN} ${libdir}/${PN}/* \
+${datadir}/${BPN} ${libdir}/${BPN}/* \
${datadir}/pixmaps ${datadir}/applications \
${datadir}/idl ${datadir}/omf ${datadir}/sounds \
${libdir}/bonobo/servers"
@@ -282,7 +282,7 @@ SECTION_${PN}-staticdev = "devel"
RDEPENDS_${PN}-staticdev = "${PN}-dev (= ${EXTENDPKGV})"
DOTDEBUG-dbg = "${bindir}/.debug ${sbindir}/.debug ${libexecdir}/.debug
${libdir}/.debug \
-${base_bindir}/.debug ${base_sbindir}/.debug ${base_libdir}/.debug
${libdir}/${PN}/.debug \
+${base_bindir}/.debug ${base_sbindir}/.debug ${base_libdir}/.debug
${libdir}/${BPN}/.debug \
${libdir}/matchbox-panel/.debug /usr/src/debug"
DEBUGFILEDIRECTORY-dbg = "/usr/lib/debug /usr/src/debug"
--
1.7.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/5] base-passwd: Use BPN in FILES paths
Use BPN instead of PN in FILES paths.
This fixes the login issue by /etc/passwd missing in multilib images.
Signed-off-by: Dongxiao Xu
---
.../recipes-core/base-passwd/base-passwd_3.5.22.bb | 10 +-
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-core/base-passwd/base-passwd_3.5.22.bb
b/meta/recipes-core/base-passwd/base-passwd_3.5.22.bb
index a155b41..137512d 100644
--- a/meta/recipes-core/base-passwd/base-passwd_3.5.22.bb
+++ b/meta/recipes-core/base-passwd/base-passwd_3.5.22.bb
@@ -30,11 +30,11 @@ do_install () {
install -o root -g root -p -m 644 passwd.master
${D}${datadir}/base-passwd/
install -o root -g root -p -m 644 group.master
${D}${datadir}/base-passwd/
- install -d -m 755 ${D}${docdir}/${PN}
- install -p -m 644 debian/changelog ${D}${docdir}/${PN}/
- gzip -9 ${D}${docdir}/${PN}/*
- install -p -m 644 README ${D}${docdir}/${PN}/
- install -p -m 644 debian/copyright ${D}${docdir}/${PN}/
+ install -d -m 755 ${D}${docdir}/${BPN}
+ install -p -m 644 debian/changelog ${D}${docdir}/${BPN}/
+ gzip -9 ${D}${docdir}/${BPN}/*
+ install -p -m 644 README ${D}${docdir}/${BPN}/
+ install -p -m 644 debian/copyright ${D}${docdir}/${BPN}/
}
pkg_postinst_${PN} () {
--
1.7.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/5] multilib.bbclass: Fix renaming logic for "FILES_", "RDEPENDS_", etc
In the orignal logic, the renaming will not work for "FILES_" if defined
variables as:
PACKAGES = "${PN}"
FILES_abc = "/usr/include/abc.h"
It is because ${PN} is "lib64-abc" so it will not be contained in
pkgrename.
This commit enumerates all element in PACKAGES, getting the original
packages and multilib packages, then doing renaming for "FILES_",
"RDEPENDS_", etc. This fixes a lot of missing files and incorrect
dependencies.
Signed-off-by: Dongxiao Xu
---
meta/classes/multilib.bbclass | 18 --
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index 571b7be..46c24e1 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -63,20 +63,18 @@ python __anonymous () {
newvar.append(extend_name(v))
d.setVar(varname, " ".join(newvar))
-pkgs = []
-pkgrename = {}
+pkgs_mapping = []
for pkg in (d.getVar("PACKAGES", True) or "").split():
if pkg.startswith(variant):
-pkgs.append(pkg)
+pkgs_mapping.append([pkg.split(variant + "-")[1], pkg])
continue
-pkgrename[pkg] = extend_name(pkg)
-pkgs.append(pkgrename[pkg])
+pkgs_mapping.append([pkg, extend_name(pkg)])
-if pkgrename:
-d.setVar("PACKAGES", " ".join(pkgs))
-for pkg in pkgrename:
-for subs in ["FILES", "RDEPENDS", "RRECOMMENDS", "SUMMARY",
"DESCRIPTION", "RSUGGESTS", "RPROVIDES", "RCONFLICTS", "PKG", "ALLOW_EMPTY"]:
-d.renameVar("%s_%s" % (subs, pkg), "%s_%s" % (subs,
pkgrename[pkg]))
+d.setVar("PACKAGES", " ".join([row[1] for row in pkgs_mapping]))
+
+for pkg_mapping in pkgs_mapping:
+for subs in ["FILES", "RDEPENDS", "RRECOMMENDS", "SUMMARY",
"DESCRIPTION", "RSUGGESTS", "RPROVIDES", "RCONFLICTS", "PKG", "ALLOW_EMPTY"]:
+d.renameVar("%s_%s" % (subs, pkg_mapping[0]), "%s_%s" % (subs,
pkg_mapping[1]))
map_dependencies("DEPENDS", d)
for pkg in (d.getVar("PACKAGES", True).split() + [""]):
--
1.7.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/5 v2][PULL] multilib: various fixes related with login, postinst, etc
Hi Richard, This pull request contains several multilib fixes addressing issues like login failure, missing init/postinst/postrm scripts, missing package files, etc. Please help to review and pull. Chages from v1: Add a new patch that adds renaming logic for INITSCRIPT related variables, which fixes the issue of no response of mouse/keyboard in multilib sato image. With those fixes, pure multilib sato image lib64-core-image-sato works fine with my current testings. Thanks, Dongxiao The following changes since commit 81aa4bfbde871af1d569b64499c34a315bf6218e: classes/sanity: enhance the network connectivity test (2011-08-25 08:49:12 -0700) are available in the git repository at: git://git.pokylinux.org/poky-contrib dxu4/ml http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dxu4/ml Dongxiao Xu (5): base-passwd: Use BPN in FILES paths bitbake.conf: Use BPN in FILES paths multilib.bbclass: Fix renaming logic for "FILES_", "RDEPENDS_", etc multilib.bbclass: add "pkg_postinst" and "pkg_postrm" as renaming elements multilib.bbclass: add renaming for INITSCRIPT related variables meta/classes/multilib.bbclass | 19 +-- meta/conf/bitbake.conf |4 ++-- .../recipes-core/base-passwd/base-passwd_3.5.22.bb | 10 +- 3 files changed, 16 insertions(+), 17 deletions(-) ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [meta-ti PATCH 1/4] gedit: Imported from OE classic
On Friday 26 August 2011 01:59:56 Joel A Fernandes wrote: > Signed-off-by: Joel A Fernandes > --- > meta-gnome/recipes-gnome/gedit/gedit_2.30.0.bb | 24 Are these really for meta-ti? If so, surely they belong in meta-gnome within the meta-openembedded repo? They aren't exactly BSP-related. Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
