Re: [OE-core] [RFC v1 PATCH 01/16] native.bbclass: allow a native package to be populated into its own dir
Phil Blundell wrote:
On Wed, 2011-06-01 at 21:18 +0800, Dexuan Cui wrote:
+PACKAGE_OWN_DIR =
+bindir .= ${PACKAGE_OWN_DIR}
+libdir .= ${PACKAGE_OWN_DIR}
+libexecdir .= ${PACKAGE_OWN_DIR}
I think the general idea of this patch is a good one but I'm not
terribly fond of the name of that variable. If this is meant to be a
path suffix that you can optionally set for native packages then how
about calling it something like NATIVE_PACKAGE_PATH_SUFFIX?
Hi Phil,
Thanks a lot for the suggestion.
Surely NATIVE_PACKAGE_PATH_SUFFIX is a much better naming! :-)
I'll change to use it.
Thanks,
-- Dexuan
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [CONSOLIDATED PULL 24/32] bitbake.conf: Create static-dev pacakge for static libraries
On 06/01/2011 11:27 AM, Koen Kooi wrote: Op 1 jun 2011, om 20:19 heeft Phil Blundell het volgende geschreven: On Wed, 2011-06-01 at 18:29 +0100, Richard Purdie wrote: I've also a slight preference for staticdev just to make these clearly different from -dev packages. Agreed. I think even -static might be better still. That's what we did in OE and it caused some troubles in the busybox-static and mplayer-static cases. But that were the only ones I encountered. What about -staticlibs since that what they the packages actaully contain? Sau! regards, Koen ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 01/12] m4: upgrade from 1.4.15 to 1.4.16
From: Nitin A Kamble nitin.a.kam...@intel.com
Signed-off-by: Nitin A Kamble nitin.a.kam...@intel.com
---
.../{m4-native_1.4.15.bb = m4-native_1.4.16.bb} |0
.../m4/{m4_1.4.15.bb = m4_1.4.16.bb} |6 +++---
2 files changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-devtools/m4/{m4-native_1.4.15.bb = m4-native_1.4.16.bb}
(100%)
rename meta/recipes-devtools/m4/{m4_1.4.15.bb = m4_1.4.16.bb} (75%)
diff --git a/meta/recipes-devtools/m4/m4-native_1.4.15.bb
b/meta/recipes-devtools/m4/m4-native_1.4.16.bb
similarity index 100%
rename from meta/recipes-devtools/m4/m4-native_1.4.15.bb
rename to meta/recipes-devtools/m4/m4-native_1.4.16.bb
diff --git a/meta/recipes-devtools/m4/m4_1.4.15.bb
b/meta/recipes-devtools/m4/m4_1.4.16.bb
similarity index 75%
rename from meta/recipes-devtools/m4/m4_1.4.15.bb
rename to meta/recipes-devtools/m4/m4_1.4.16.bb
index 586071f..53ef5ae 100644
--- a/meta/recipes-devtools/m4/m4_1.4.15.bb
+++ b/meta/recipes-devtools/m4/m4_1.4.16.bb
@@ -4,14 +4,14 @@ compatible although it has some extensions (for example,
handling more than 9 po
GNU M4 also has built-in functions for including files, running shell
commands, doing arithmetic, etc.
LICENSE = GPLv3
LIC_FILES_CHKSUM = file://COPYING;md5=d32239bcb673463ab874e80d47fae504\
- file://examples/COPYING;md5=380fd7d57d3fd009a5716e074a845d6d
+ file://examples/COPYING;md5=fbc986d45b3dae6725c29870dd6b669d
PR = r0
SRC_URI = ${GNU_MIRROR}/m4/m4-${PV}.tar.gz \
file://ac_config_links.patch;patch=1
-SRC_URI[md5sum] = 5649a2e593b6c639deae9e72ede777dd
-SRC_URI[sha256sum] =
3d66dfeb609007062265a67b9a2c08d3686a74068830bacae60a6d58413c9367
+SRC_URI[md5sum] = a5dfb4f2b7370e9d34293d23fd09b280
+SRC_URI[sha256sum] =
e9176a35bb13a1b08482359aa554ee8072794f58f00e4827bf0e06b570c827da
inherit autotools
--
1.7.3.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 05/12] u-boot: package up u-boot.bin for field upgrades
From: Koen Kooi k...@dominion.thruhere.net
Signed-off-by: Koen Kooi k...@dominion.thruhere.net
---
meta/recipes-bsp/uboot/u-boot.inc| 11 +++
meta/recipes-bsp/uboot/u-boot_2011.03.bb |2 +-
2 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-bsp/uboot/u-boot.inc
b/meta/recipes-bsp/uboot/u-boot.inc
index 83dfb6f..2be9fc9 100644
--- a/meta/recipes-bsp/uboot/u-boot.inc
+++ b/meta/recipes-bsp/uboot/u-boot.inc
@@ -21,6 +21,7 @@ python () {
}
UBOOT_IMAGE ?= u-boot-${MACHINE}-${PV}-${PR}.bin
+UBOOT_BINARY ?= u-boot.bin
UBOOT_SYMLINK ?= u-boot-${MACHINE}.bin
UBOOT_MAKE_TARGET ?= all
@@ -32,6 +33,16 @@ do_compile () {
oe_runmake ${UBOOT_MAKE_TARGET}
}
+do_install () {
+install -d ${D}/boot
+install ${S}/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE}
+ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY}
+}
+
+FILES_${PN} = /boot
+# no gnu_hash in uboot.bin, by design, so skip QA
+INSANE_SKIP_${PN} = True
+
do_deploy () {
install ${S}/u-boot.bin ${DEPLOYDIR}/${UBOOT_IMAGE}
diff --git a/meta/recipes-bsp/uboot/u-boot_2011.03.bb
b/meta/recipes-bsp/uboot/u-boot_2011.03.bb
index 0fbb9ba..07f0609 100644
--- a/meta/recipes-bsp/uboot/u-boot_2011.03.bb
+++ b/meta/recipes-bsp/uboot/u-boot_2011.03.bb
@@ -14,7 +14,7 @@ FILESDIR =
${@os.path.dirname(bb.data.getVar('FILE',d,1))}/u-boot-git/${MACHINE
SRCREV = v2011.03
PV = v2011.03+git${SRCPV}
-PR=r3
+PR=r4
SRC_URI = git://git.denx.de/u-boot.git;branch=master;protocol=git
--
1.7.3.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 02/12] autoconf: upgrade from 2.65 to 2.68
From: Nitin A Kamble nitin.a.kam...@intel.com
And rebase the patches to the newer code.
Signed-off-by: Nitin A Kamble nitin.a.kam...@intel.com
---
.../{autoconf-2.65 = autoconf}/autoconf-x.patch |0
.../autoheader-nonfatal-warnings.patch |0
.../autoreconf-exclude.patch |0
.../autoreconf-foreign.patch |0
.../autoreconf-gnuconfigize.patch |0
.../autoreconf-include.patch |0
.../{autoconf-2.65 = autoconf}/config_site.patch | 19 ++-
.../fix_path_xtra.patch| 14 +++---
.../path_prog_fixes.patch |0
.../program_prefix.patch |0
.../{autoconf_2.65.bb = autoconf_2.68.bb} |6 +++---
11 files changed, 24 insertions(+), 15 deletions(-)
rename meta/recipes-devtools/autoconf/{autoconf-2.65 =
autoconf}/autoconf-x.patch (100%)
rename meta/recipes-devtools/autoconf/{autoconf-2.65 =
autoconf}/autoheader-nonfatal-warnings.patch (100%)
rename meta/recipes-devtools/autoconf/{autoconf-2.65 =
autoconf}/autoreconf-exclude.patch (100%)
rename meta/recipes-devtools/autoconf/{autoconf-2.65 =
autoconf}/autoreconf-foreign.patch (100%)
rename meta/recipes-devtools/autoconf/{autoconf-2.65 =
autoconf}/autoreconf-gnuconfigize.patch (100%)
rename meta/recipes-devtools/autoconf/{autoconf-2.65 =
autoconf}/autoreconf-include.patch (100%)
rename meta/recipes-devtools/autoconf/{autoconf-2.65 =
autoconf}/config_site.patch (60%)
rename meta/recipes-devtools/autoconf/{autoconf-2.65 =
autoconf}/fix_path_xtra.patch (90%)
rename meta/recipes-devtools/autoconf/{autoconf-2.65 =
autoconf}/path_prog_fixes.patch (100%)
rename meta/recipes-devtools/autoconf/{autoconf-2.65 =
autoconf}/program_prefix.patch (100%)
rename meta/recipes-devtools/autoconf/{autoconf_2.65.bb = autoconf_2.68.bb}
(85%)
diff --git a/meta/recipes-devtools/autoconf/autoconf-2.65/autoconf-x.patch
b/meta/recipes-devtools/autoconf/autoconf/autoconf-x.patch
similarity index 100%
rename from meta/recipes-devtools/autoconf/autoconf-2.65/autoconf-x.patch
rename to meta/recipes-devtools/autoconf/autoconf/autoconf-x.patch
diff --git
a/meta/recipes-devtools/autoconf/autoconf-2.65/autoheader-nonfatal-warnings.patch
b/meta/recipes-devtools/autoconf/autoconf/autoheader-nonfatal-warnings.patch
similarity index 100%
rename from
meta/recipes-devtools/autoconf/autoconf-2.65/autoheader-nonfatal-warnings.patch
rename to
meta/recipes-devtools/autoconf/autoconf/autoheader-nonfatal-warnings.patch
diff --git
a/meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-exclude.patch
b/meta/recipes-devtools/autoconf/autoconf/autoreconf-exclude.patch
similarity index 100%
rename from
meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-exclude.patch
rename to meta/recipes-devtools/autoconf/autoconf/autoreconf-exclude.patch
diff --git
a/meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-foreign.patch
b/meta/recipes-devtools/autoconf/autoconf/autoreconf-foreign.patch
similarity index 100%
rename from
meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-foreign.patch
rename to meta/recipes-devtools/autoconf/autoconf/autoreconf-foreign.patch
diff --git
a/meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-gnuconfigize.patch
b/meta/recipes-devtools/autoconf/autoconf/autoreconf-gnuconfigize.patch
similarity index 100%
rename from
meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-gnuconfigize.patch
rename to meta/recipes-devtools/autoconf/autoconf/autoreconf-gnuconfigize.patch
diff --git
a/meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-include.patch
b/meta/recipes-devtools/autoconf/autoconf/autoreconf-include.patch
similarity index 100%
rename from
meta/recipes-devtools/autoconf/autoconf-2.65/autoreconf-include.patch
rename to meta/recipes-devtools/autoconf/autoconf/autoreconf-include.patch
diff --git a/meta/recipes-devtools/autoconf/autoconf-2.65/config_site.patch
b/meta/recipes-devtools/autoconf/autoconf/config_site.patch
similarity index 60%
rename from meta/recipes-devtools/autoconf/autoconf-2.65/config_site.patch
rename to meta/recipes-devtools/autoconf/autoconf/config_site.patch
index e3ff318..9f04440 100644
--- a/meta/recipes-devtools/autoconf/autoconf-2.65/config_site.patch
+++ b/meta/recipes-devtools/autoconf/autoconf/config_site.patch
@@ -6,17 +6,26 @@ them.
RP 1/2/10
-Index: autoconf-2.65/lib/autoconf/general.m4
+Updated for 2.68 version: the CONFIG_SITE var was not getting used at all
+fixed the 2.68 code
+Nitin A Kamble nitin.a.kam...@intel.com 2011/05/27
+
+Index: autoconf-2.68/lib/autoconf/general.m4
===
autoconf-2.65.orig/lib/autoconf/general.m4 2010-02-01 12:41:32.329073138
+
-+++ autoconf-2.65/lib/autoconf/general.m4 2010-02-01 12:41:56.769040799
+
-@@ -1863,17 +1863,10 @@
+---
[OE-core] [CONSOLIDATED PULL 04/12] gettext-0.16.1: mark upstream status for gplv2 recipe's patches
From: Nitin A Kamble nitin.a.kam...@intel.com Signed-off-by: Nitin A Kamble nitin.a.kam...@intel.com --- .../gettext/gettext-0.16.1/disable_java.patch |3 ++- .../gettext-0.16.1/fix_aclocal_version.patch |1 + .../gettext-0.16.1/fix_gnu_source_circular.patch |3 ++- .../gettext/gettext-0.16.1/fixchicken.patch|3 ++- .../gettext/gettext-0.16.1/getline.m4.patch|3 ++- .../gettext-autoconf-lib-link-no-L.patch |3 ++- .../gettext-error_print_progname.patch |3 ++- .../gettext/gettext-0.16.1/gettext-vpath.patch |3 ++- .../gettext-0.16.1/hardcode_macro_version.patch|3 ++- .../gettext/gettext-0.16.1/linklib_from_0.17.patch |3 ++- 10 files changed, 19 insertions(+), 9 deletions(-) diff --git a/meta/recipes-core/gettext/gettext-0.16.1/disable_java.patch b/meta/recipes-core/gettext/gettext-0.16.1/disable_java.patch index 2f8478a..e4c5f15 100644 --- a/meta/recipes-core/gettext/gettext-0.16.1/disable_java.patch +++ b/meta/recipes-core/gettext/gettext-0.16.1/disable_java.patch @@ -1,8 +1,9 @@ + # Pulled from OpenEmbedded # # Commented by: Saul Wold saul.w...@intel.com -Upstream-Status: Inappropriate [embedded] +Upstream-Status: Inappropriate [licensing] Index: gettext-0.16.1/gettext-tools/configure.ac === diff --git a/meta/recipes-core/gettext/gettext-0.16.1/fix_aclocal_version.patch b/meta/recipes-core/gettext/gettext-0.16.1/fix_aclocal_version.patch index 8fe7712..7293f5b 100644 --- a/meta/recipes-core/gettext/gettext-0.16.1/fix_aclocal_version.patch +++ b/meta/recipes-core/gettext/gettext-0.16.1/fix_aclocal_version.patch @@ -1,3 +1,4 @@ + This patch updates the required version number from 2.61 to the current 2.65 version of aclocal, this will need to be updated when we update aclocal diff --git a/meta/recipes-core/gettext/gettext-0.16.1/fix_gnu_source_circular.patch b/meta/recipes-core/gettext/gettext-0.16.1/fix_gnu_source_circular.patch index d1c0bbb..0686149 100644 --- a/meta/recipes-core/gettext/gettext-0.16.1/fix_gnu_source_circular.patch +++ b/meta/recipes-core/gettext/gettext-0.16.1/fix_gnu_source_circular.patch @@ -1,9 +1,10 @@ + This patch removes the circular dependency on AC_GNU_SOURCE in AC_USE_SYSTEM_EXTENSIONS. Thanks to Mark Hatle for the timely pointers and fixes. -Upstream-Status: Inappropriate [configuration] +Upstream-Status: Inappropriate [licensing] Signed-off-by Saul Wold s...@linux.intel.com diff --git a/meta/recipes-core/gettext/gettext-0.16.1/fixchicken.patch b/meta/recipes-core/gettext/gettext-0.16.1/fixchicken.patch index d6bb7b0..36ce463 100644 --- a/meta/recipes-core/gettext/gettext-0.16.1/fixchicken.patch +++ b/meta/recipes-core/gettext/gettext-0.16.1/fixchicken.patch @@ -1,8 +1,9 @@ + # Pulled from OpenEmbedded # # Commented by: Saul Wold saul.w...@intel.com -Upstream-Status: Inappropriate [embedded] +Upstream-Status: Inappropriate [licensing] Index: gettext-tools/m4/csharpcomp.m4 === diff --git a/meta/recipes-core/gettext/gettext-0.16.1/getline.m4.patch b/meta/recipes-core/gettext/gettext-0.16.1/getline.m4.patch index 34965fc..bf995bc 100644 --- a/meta/recipes-core/gettext/gettext-0.16.1/getline.m4.patch +++ b/meta/recipes-core/gettext/gettext-0.16.1/getline.m4.patch @@ -1,8 +1,9 @@ + # Pulled from OpenEmbedded # # Commented by: Saul Wold saul.w...@intel.com -Upstream-Status: Inappropriate [configuration] +Upstream-Status: Inappropriate [licensing] --- /gettext-tools/m4/orig-getline.m4 2003-07-18 18:11:37.0 +0300 +++ /gettext-tools/m4/getline.m4 2007-02-03 13:33:41.0 +0200 diff --git a/meta/recipes-core/gettext/gettext-0.16.1/gettext-autoconf-lib-link-no-L.patch b/meta/recipes-core/gettext/gettext-0.16.1/gettext-autoconf-lib-link-no-L.patch index 82775d6..072fe5f 100644 --- a/meta/recipes-core/gettext/gettext-0.16.1/gettext-autoconf-lib-link-no-L.patch +++ b/meta/recipes-core/gettext/gettext-0.16.1/gettext-autoconf-lib-link-no-L.patch @@ -1,8 +1,9 @@ + # Pulled from OpenEmbedded # # Commented by: Saul Wold saul.w...@intel.com -Upstream-Status: Pending +Upstream-Status: Inappropriate [licensing] --- gettext-0.17/autoconf-lib-link/m4/lib-link.m4~ 2009-04-17 15:12:30.0 -0700 +++ gettext-0.17/autoconf-lib-link/m4/lib-link.m4 2009-04-17 15:37:39.0 -0700 diff --git a/meta/recipes-core/gettext/gettext-0.16.1/gettext-error_print_progname.patch b/meta/recipes-core/gettext/gettext-0.16.1/gettext-error_print_progname.patch index abb7195..93d9194 100644 --- a/meta/recipes-core/gettext/gettext-0.16.1/gettext-error_print_progname.patch +++ b/meta/recipes-core/gettext/gettext-0.16.1/gettext-error_print_progname.patch @@ -1,8 +1,9 @@ + # Pulled from OpenEmbedded # # Commented by: Saul Wold saul.w...@intel.com -Upstream-Status: Inappropriate
[OE-core] [CONSOLIDATED PULL 03/12] bison: upgrade from 2.4.3 to 2.5
From: Nitin A Kamble nitin.a.kam...@intel.com
This version of bison needs m4 1.4.16 or newer
Signed-off-by: Nitin A Kamble nitin.a.kam...@intel.com
---
meta/recipes-devtools/bison/bison/m4.patch | 131
.../bison/bison/uclibc-sched_param-def.patch | 21 ---
.../bison/{bison_2.4.3.bb = bison_2.5.bb} |7 +-
3 files changed, 3 insertions(+), 156 deletions(-)
delete mode 100644
meta/recipes-devtools/bison/bison/uclibc-sched_param-def.patch
rename meta/recipes-devtools/bison/{bison_2.4.3.bb = bison_2.5.bb} (85%)
diff --git a/meta/recipes-devtools/bison/bison/m4.patch
b/meta/recipes-devtools/bison/bison/m4.patch
index 0754a90..d139da5 100644
--- a/meta/recipes-devtools/bison/bison/m4.patch
+++ b/meta/recipes-devtools/bison/bison/m4.patch
@@ -75,109 +75,6 @@ Index: bison-2.4.2/m4/uintmax_t.m4
+ if inttypes.h and stdint.h don't define.])
+ fi
+])
-Index: bison-2.4.2/m4/glibc21.m4
-===
/dev/null
-+++ bison-2.4.2/m4/glibc21.m4
-@@ -0,0 +1,32 @@
-+# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40)
-+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License. As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+# Test for the GNU C Library, version 2.1 or newer.
-+# From Bruno Haible.
-+
-+AC_DEFUN([jm_GLIBC21],
-+ [
-+AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
-+ ac_cv_gnu_library_2_1,
-+ [AC_EGREP_CPP([Lucky GNU user],
-+ [
-+#include features.h
-+#ifdef __GNU_LIBRARY__
-+ #if (__GLIBC__ == 2 __GLIBC_MINOR__ = 1) || (__GLIBC__ 2)
-+ Lucky GNU user
-+ #endif
-+#endif
-+ ],
-+ ac_cv_gnu_library_2_1=yes,
-+ ac_cv_gnu_library_2_1=no)
-+ ]
-+)
-+AC_SUBST(GLIBC21)
-+GLIBC21=$ac_cv_gnu_library_2_1
-+ ]
-+)
-Index: bison-2.4.2/m4/stdint_h.m4
-===
/dev/null
-+++ bison-2.4.2/m4/stdint_h.m4
-@@ -0,0 +1,28 @@
-+# stdint_h.m4 serial 2 (gettext-0.11.4)
-+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License. As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Paul Eggert.
-+
-+# Define HAVE_STDINT_H_WITH_UINTMAX if stdint.h exists,
-+# doesn't clash with sys/types.h, and declares uintmax_t.
-+
-+AC_DEFUN([jm_AC_HEADER_STDINT_H],
-+[
-+ AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h,
-+ [AC_TRY_COMPILE(
-+[#include sys/types.h
-+#include stdint.h],
-+[uintmax_t i = (uintmax_t) -1;],
-+jm_ac_cv_header_stdint_h=yes,
-+jm_ac_cv_header_stdint_h=no)])
-+ if test $jm_ac_cv_header_stdint_h = yes; then
-+AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1,
-+[Define if stdint.h exists, doesn't clash with sys/types.h,
-+ and declares uintmax_t. ])
-+ fi
-+])
-Index: bison-2.4.2/m4/inttypes_h.m4
-===
/dev/null
-+++ bison-2.4.2/m4/inttypes_h.m4
-@@ -0,0 +1,28 @@
-+# inttypes_h.m4 serial 4 (gettext-0.11.4)
-+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License. As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Paul Eggert.
-+
-+# Define HAVE_INTTYPES_H_WITH_UINTMAX if inttypes.h exists,
-+# doesn't clash with sys/types.h, and declares uintmax_t.
-+
-+AC_DEFUN([jm_AC_HEADER_INTTYPES_H],
-+[
-+ AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h,
-+ [AC_TRY_COMPILE(
-+[#include sys/types.h
-+#include inttypes.h],
-+[uintmax_t i = (uintmax_t) -1;],
-+jm_ac_cv_header_inttypes_h=yes,
-+jm_ac_cv_header_inttypes_h=no)])
-+ if test $jm_ac_cv_header_inttypes_h = yes; then
-+AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1,
-+[Define if inttypes.h exists, doesn't clash with sys/types.h,
-+ and declares uintmax_t. ])
-+ fi
-+])
Index: bison-2.4.2/m4/ulonglong.m4
===
--- /dev/null
@@ -206,34 +103,6 @@ Index: bison-2.4.2/m4/ulonglong.m4
+ [Define if you have the unsigned long long type.])
+ fi
+])
-Index: bison-2.4.2/m4/codeset.m4
[OE-core] [CONSOLIDATED PULL 06/12] shadow: remove selinux entry from pam.d/login
From: Koen Kooi k...@dominion.thruhere.net SElinux has been disabled in the recipe, leading to messages like this: [ 167.643218] login[312]: PAM unable to dlopen(/lib/security/pam_selinux.so): /lib/security/pam_selinux.so: cannot open shared object file: No such file or directory [ 167.670837] login[312]: PAM adding faulty module: /lib/security/pam_selinux.so Signed-off-by: Koen Kooi k...@dominion.thruhere.net --- meta/recipes-extended/shadow/files/pam.d/login |7 --- meta/recipes-extended/shadow/shadow.inc|2 ++ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/meta/recipes-extended/shadow/files/pam.d/login b/meta/recipes-extended/shadow/files/pam.d/login index e41eb04..e4dacc2 100644 --- a/meta/recipes-extended/shadow/files/pam.d/login +++ b/meta/recipes-extended/shadow/files/pam.d/login @@ -26,13 +26,6 @@ auth [success=ok ignore=ignore user_unknown=ignore default=die] pam_secur # (Replaces the `NOLOGINS_FILE' option from login.defs) auth requisite pam_nologin.so -# SELinux needs to be the first session rule. This ensures that any -# lingering context has been cleared. Without out this it is possible -# that a module could execute code in the wrong domain. -# When the module is present, required would be sufficient (When SELinux -# is disabled, this returns success.) -session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close - # This module parses environment configuration file(s) # and also allows you to use an extended config # file /etc/security/pam_env.conf. diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc index 42f92a7..35bd6a8 100644 --- a/meta/recipes-extended/shadow/shadow.inc +++ b/meta/recipes-extended/shadow/shadow.inc @@ -6,6 +6,8 @@ LICENSE = BSD | Artistic LIC_FILES_CHKSUM = file://COPYING;md5=08c553a87d4e51bbed50b20e0adcaede \ file://src/passwd.c;firstline=8;endline=30;md5=2899a045e90511d0e043b85a7db7e2fe +PR = r1 + PAM_PLUGINS = libpam-runtime \ pam-plugin-faildelay \ pam-plugin-securetty \ -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 07/12] rootfs_ipk: delete opkg metadata if package management not required and all packages are configured
From: Phil Blundell p...@pbcl.net
If all the postinsts were successfully run in offline mode, and
package-management hasn't been requested as an IMAGE_FEATURE, the opkg
metadata is now redundant and can safely be deleted.
Also, the update-rc.d and base-passwd packages can be removed since
they will serve no further purpose in this situation.
If some packages are still unconfigured at this point then we need to
keep their metadata around so that either opkg or the awk script can
configure the packages at boot time. In theory it would be possible to
strip out the data for packages that have already been configured, but
right now we just hold on to the whole status file in that situation.
Signed-off-by: Phil Blundell ph...@gnu.org
---
meta/classes/rootfs_ipk.bbclass | 11 +++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass
index edd84fb..3b4b4da 100644
--- a/meta/classes/rootfs_ipk.bbclass
+++ b/meta/classes/rootfs_ipk.bbclass
@@ -82,6 +82,17 @@ fakeroot rootfs_ipk_do_rootfs () {
rm -f ${IMAGE_ROOTFS}${opkglibdir}/lists/*
+ if ${@base_contains(IMAGE_FEATURES, package-management, false,
true, d)}; then
+ if [ $runtime_script_required -eq 0 ]; then
+ # All packages were successfully configured.
+ # update-rc.d, base-passwd are no further use, remove
them now
+ opkg-cl ${IPKG_ARGS} --force-depends remove update-rc.d
base-passwd || true
+
+ # Also delete the status files
+ rm -rf ${IMAGE_ROOTFS}${opkglibdir}
+ fi
+ fi
+
log_check rootfs
}
--
1.7.3.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 11/12] task-core-lsb: add cups and ghostscript into image
From: Kang Kai kai.k...@windriver.com [Yocto 1030] Because it is fixed by Qing He, then add cups and ghostscipt into image Signed-off-by: Kang Kai kai.k...@windriver.com --- meta/recipes-extended/tasks/task-core-lsb.bb |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/meta/recipes-extended/tasks/task-core-lsb.bb b/meta/recipes-extended/tasks/task-core-lsb.bb index b6c5ae5..9fbacf9 100644 --- a/meta/recipes-extended/tasks/task-core-lsb.bb +++ b/meta/recipes-extended/tasks/task-core-lsb.bb @@ -133,8 +133,9 @@ RDEPENDS_task-core-lsb-command-add = \ chkconfig \ xdg-utils \ foomatic-filters \ +cups \ +ghostscript \ -#cups RDEPENDS_task-core-lsb-perl-add = \ perl-modules \ -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 09/12] ghostscript: Fix up file locations and add i686
Signed-off-by: Saul Wold s...@linux.intel.com
---
.../ghostscript/{ = }/ghostscript/arm/objarch.h |0
.../ghostscript/{ = }/ghostscript/arm/soobjarch.h |0
.../ghostscript/{ = }/ghostscript/i586/objarch.h |0
.../{ = }/ghostscript/i586/soobjarch.h|0
meta/recipes-extended/ghostscript/ghostscript/i686 |1 +
.../ghostscript/{ = }/ghostscript/mips/objarch.h |0
.../{ = }/ghostscript/mips/soobjarch.h|0
.../{ = }/ghostscript/powerpc/objarch.h |0
.../{ = }/ghostscript/powerpc/soobjarch.h |0
.../{ = }/ghostscript/x86_64/objarch.h|0
.../{ = }/ghostscript/x86_64/soobjarch.h |0
11 files changed, 1 insertions(+), 0 deletions(-)
rename meta/recipes-extended/ghostscript/{ = }/ghostscript/arm/objarch.h
(100%)
rename meta/recipes-extended/ghostscript/{ = }/ghostscript/arm/soobjarch.h
(100%)
rename meta/recipes-extended/ghostscript/{ = }/ghostscript/i586/objarch.h
(100%)
rename meta/recipes-extended/ghostscript/{ = }/ghostscript/i586/soobjarch.h
(100%)
create mode 12 meta/recipes-extended/ghostscript/ghostscript/i686
rename meta/recipes-extended/ghostscript/{ = }/ghostscript/mips/objarch.h
(100%)
rename meta/recipes-extended/ghostscript/{ = }/ghostscript/mips/soobjarch.h
(100%)
rename meta/recipes-extended/ghostscript/{ = }/ghostscript/powerpc/objarch.h
(100%)
rename meta/recipes-extended/ghostscript/{ =
}/ghostscript/powerpc/soobjarch.h (100%)
rename meta/recipes-extended/ghostscript/{ = }/ghostscript/x86_64/objarch.h
(100%)
rename meta/recipes-extended/ghostscript/{ = }/ghostscript/x86_64/soobjarch.h
(100%)
diff --git a/meta/recipes-extended/ghostscript/arm/objarch.h
b/meta/recipes-extended/ghostscript/ghostscript/arm/objarch.h
similarity index 100%
rename from meta/recipes-extended/ghostscript/arm/objarch.h
rename to meta/recipes-extended/ghostscript/ghostscript/arm/objarch.h
diff --git a/meta/recipes-extended/ghostscript/arm/soobjarch.h
b/meta/recipes-extended/ghostscript/ghostscript/arm/soobjarch.h
similarity index 100%
rename from meta/recipes-extended/ghostscript/arm/soobjarch.h
rename to meta/recipes-extended/ghostscript/ghostscript/arm/soobjarch.h
diff --git a/meta/recipes-extended/ghostscript/i586/objarch.h
b/meta/recipes-extended/ghostscript/ghostscript/i586/objarch.h
similarity index 100%
rename from meta/recipes-extended/ghostscript/i586/objarch.h
rename to meta/recipes-extended/ghostscript/ghostscript/i586/objarch.h
diff --git a/meta/recipes-extended/ghostscript/i586/soobjarch.h
b/meta/recipes-extended/ghostscript/ghostscript/i586/soobjarch.h
similarity index 100%
rename from meta/recipes-extended/ghostscript/i586/soobjarch.h
rename to meta/recipes-extended/ghostscript/ghostscript/i586/soobjarch.h
diff --git a/meta/recipes-extended/ghostscript/ghostscript/i686
b/meta/recipes-extended/ghostscript/ghostscript/i686
new file mode 12
index 000..87aaca5
--- /dev/null
+++ b/meta/recipes-extended/ghostscript/ghostscript/i686
@@ -0,0 +1 @@
+i586
\ No newline at end of file
diff --git a/meta/recipes-extended/ghostscript/mips/objarch.h
b/meta/recipes-extended/ghostscript/ghostscript/mips/objarch.h
similarity index 100%
rename from meta/recipes-extended/ghostscript/mips/objarch.h
rename to meta/recipes-extended/ghostscript/ghostscript/mips/objarch.h
diff --git a/meta/recipes-extended/ghostscript/mips/soobjarch.h
b/meta/recipes-extended/ghostscript/ghostscript/mips/soobjarch.h
similarity index 100%
rename from meta/recipes-extended/ghostscript/mips/soobjarch.h
rename to meta/recipes-extended/ghostscript/ghostscript/mips/soobjarch.h
diff --git a/meta/recipes-extended/ghostscript/powerpc/objarch.h
b/meta/recipes-extended/ghostscript/ghostscript/powerpc/objarch.h
similarity index 100%
rename from meta/recipes-extended/ghostscript/powerpc/objarch.h
rename to meta/recipes-extended/ghostscript/ghostscript/powerpc/objarch.h
diff --git a/meta/recipes-extended/ghostscript/powerpc/soobjarch.h
b/meta/recipes-extended/ghostscript/ghostscript/powerpc/soobjarch.h
similarity index 100%
rename from meta/recipes-extended/ghostscript/powerpc/soobjarch.h
rename to meta/recipes-extended/ghostscript/ghostscript/powerpc/soobjarch.h
diff --git a/meta/recipes-extended/ghostscript/x86_64/objarch.h
b/meta/recipes-extended/ghostscript/ghostscript/x86_64/objarch.h
similarity index 100%
rename from meta/recipes-extended/ghostscript/x86_64/objarch.h
rename to meta/recipes-extended/ghostscript/ghostscript/x86_64/objarch.h
diff --git a/meta/recipes-extended/ghostscript/x86_64/soobjarch.h
b/meta/recipes-extended/ghostscript/ghostscript/x86_64/soobjarch.h
similarity index 100%
rename from meta/recipes-extended/ghostscript/x86_64/soobjarch.h
rename to meta/recipes-extended/ghostscript/ghostscript/x86_64/soobjarch.h
--
1.7.3.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
[OE-core] [CONSOLIDATED PULL 10/12] gcc: Fix volatile access issue for ARM
[YOCTO #1130]
This patch brings in a patch from gcc for the following issue:
http://gcc.gnu.org/ml/gcc-patches/2011-03/msg01477.html
Signed-off-by: Saul Wold s...@linux.intel.com
---
meta/recipes-devtools/gcc/gcc-4.6.0.inc|4 ++-
.../gcc/gcc-4.6.0/volatile_access_backport.patch | 28
2 files changed, 31 insertions(+), 1 deletions(-)
create mode 100644
meta/recipes-devtools/gcc/gcc-4.6.0/volatile_access_backport.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.6.0.inc
b/meta/recipes-devtools/gcc/gcc-4.6.0.inc
index fb5c70d..cb9eb8e 100644
--- a/meta/recipes-devtools/gcc/gcc-4.6.0.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.6.0.inc
@@ -7,7 +7,7 @@ require gcc-common.inc
require gcc-4_6-branch-backports.inc
-PR = r2
+PR = r3
DEPENDS =+ mpfr gmp libmpc
NATIVEDEPS = mpfr-native gmp-native gettext-native libmpc-native
@@ -53,7 +53,9 @@ SRC_URI = ${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
file://gcc-poison-parameters.patch \
file://GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch \
file://COLLECT_GCC_OPTIONS.patch \
+ file://volatile_access_backport.patch \
+
SRC_URI_append_sh3 = file://sh3-installfix-fixheaders.patch;patch=1
SRC_URI[md5sum] = 93d1c436bf991564524701259b6285a2
diff --git a/meta/recipes-devtools/gcc/gcc-4.6.0/volatile_access_backport.patch
b/meta/recipes-devtools/gcc/gcc-4.6.0/volatile_access_backport.patch
new file mode 100644
index 000..9c86817
--- /dev/null
+++ b/meta/recipes-devtools/gcc/gcc-4.6.0/volatile_access_backport.patch
@@ -0,0 +1,28 @@
+Pulled from http://gcc.gnu.org/ml/gcc-patches/2011-03/msg01477.html
+
+Upstream-Status: Backport
+
+Signed-off-by: Saul Wold s...@linux.intel.com
+
+gcc/
+* expr.c (expand_expr_real_1): Only use BLKmode for volatile
+accesses which are not naturally aligned.
+
+Index: gcc-4.6.0/gcc/expr.c
+===
+--- gcc-4.6.0.orig/gcc/expr.c 2011-06-01 15:28:55.0 -0700
gcc-4.6.0/gcc/expr.c 2011-06-01 15:41:17.154848182 -0700
+@@ -9178,8 +9178,11 @@
+modifier != EXPAND_CONST_ADDRESS
+modifier != EXPAND_INITIALIZER)
+ /* If the field is volatile, we always want an aligned
+- access. */
+- || (volatilep flag_strict_volatile_bitfields 0)
++ access. Only do this if the access is not already naturally
++ aligned, otherwise normal (non-bitfield) volatile fields
++ become non-addressable. */
++ || (volatilep flag_strict_volatile_bitfields 0
++ (bitpos % GET_MODE_ALIGNMENT (mode) != 0))
+ /* If the field isn't aligned enough to fetch as a memref,
+ fetch it as a bit field. */
+ || (mode1 != BLKmode
--
1.7.3.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 12/12] libx11: fix libX11 keysyms to pass xts5 of lsb
From: Jingdong Lu jingdong...@windriver.com
Fixes bug: [YOCTO #1095]
Because of cross-compiling libx11 keysyms will cause Xts5 test of LSB fail.
libx11 use a tool named makekey which compiled as a native tool to generate
ks_tables.h. Because the size of unsigned long is different between 32-bit
and 64-bit, we should judge whether our target is 32-bit or 64-bit and tell
makekey.
I add a patch to makekeys_crosscompile.patch to src/utils/makekeys.c in
order to deal with the different targets. If our target is 32-bit, we force
the variable its type is unsigned long to uint32_t. So we can generate a
correct keysyms.
Signed-off-by: Jingdong Lu jingdong...@windriver.com
---
.../libx11-1.3.4/makekeys_crosscompile.patch | 45
.../recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb |5 +-
meta/recipes-graphics/xorg-lib/libx11.inc |8 +++-
meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb |5 +-
4 files changed, 58 insertions(+), 5 deletions(-)
create mode 100644
meta/recipes-graphics/xorg-lib/libx11-1.3.4/makekeys_crosscompile.patch
diff --git
a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/makekeys_crosscompile.patch
b/meta/recipes-graphics/xorg-lib/libx11-1.3.4/makekeys_crosscompile.patch
new file mode 100644
index 000..e5eacf0
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-1.3.4/makekeys_crosscompile.patch
@@ -0,0 +1,45 @@
+Because the size of unsigned long is different between 32-bit
+and 64-bit, judge whether target is 32-bit or 64-bit and tell
+makekey.
+
+Upstream-Status: Pending
+
+Signed-off-by: dbuit...@windriver.com
+
+--- libX11-1.3.4.orig/src/util/makekeys.c 2010-01-15 09:11:36.0
+0800
libX11-1.3.4/src/util/makekeys.c 2011-05-24 19:04:25.454774908 +0800
+@@ -33,6 +33,7 @@
+ #include X11/keysymdef.h
+ #include stdio.h
+ #include stdlib.h
++#include stdint.h
+
+ typedef unsigned long Signature;
+
+@@ -124,7 +125,12 @@
+ name = info[i].name;
+ sig = 0;
+ while ((c = *name++))
+- sig = (sig 1) + c;
++#ifdef USE32
++ sig = (uint32_t)(sig 1) + c;
++#else
++ sig = (uint64_t)(sig 1) + c;
++#endif
++
+ first = j = sig % z;
+ for (k = 0; tab[j]; k++) {
+ j += first + 1;
+@@ -163,7 +169,11 @@
+ name = info[i].name;
+ sig = 0;
+ while ((c = *name++))
+- sig = (sig 1) + c;
++#ifdef USE32
++ sig = (uint32_t)(sig 1) + c;
++#else
++ sig = (uint64_t)(sig 1) + c;
++#endif
+ first = j = sig % z;
+ while (offsets[j]) {
+ j += first + 1;
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb
b/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb
index b013498..1469bc1 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb
@@ -5,12 +5,13 @@ DESCRIPTION += Support for XCB, and XCMS is disabled in
this version.
LICENSE = MIT MIT-style BSD
LIC_FILES_CHKSUM = file://COPYING;md5=bf75bfe4d05068311b5e6862d4b5f2c5
-PR = r0
+PR = r1
DEPENDS += libxcb xproto xextproto xtrans libxau kbproto inputproto
xf86bigfontproto xproto-native
SRC_URI += file://../libx11-${PV}/x11_disable_makekeys.patch \
file://../libx11-${PV}/include_fix.patch \
-file://../libx11-${PV}/nodolt.patch
+file://../libx11-${PV}/nodolt.patch \
+file://../libx11-${PV}/makekeys_crosscompile.patch
EXTRA_OECONF += --disable-xcms --with-xcb
diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc
b/meta/recipes-graphics/xorg-lib/libx11.inc
index 030b0db..c156ce6 100644
--- a/meta/recipes-graphics/xorg-lib/libx11.inc
+++ b/meta/recipes-graphics/xorg-lib/libx11.inc
@@ -6,6 +6,8 @@ basic functions of the window system.
require xorg-lib-common.inc
+inherit siteinfo
+
PROVIDES = virtual/libx11
XORG_PN = libX11
@@ -22,7 +24,11 @@ do_compile() {
touch makekeys-makekeys.o
(
unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
- ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE}
makekeys.c -o makekeys
+ if [ ${SITEINFO_BITS} == 64 ]; then
+${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE}
makekeys.c -o makekeys
+else
+${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE}
-DUSE32 makekeys.c -o makekeys
+fi
)
if [ $? != 0 ]; then
exit 1
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb
b/meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb
index 08ba07b..3e046a1 100644
--- a/meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb
@@ -5,11 +5,12 @@ LICENSE = MIT MIT-style BSD
LIC_FILES_CHKSUM = file://COPYING;md5=bf75bfe4d05068311b5e6862d4b5f2c5
PE = 1
-PR = r0
+PR = r1
SRC_URI += file://x11_disable_makekeys.patch \
[OE-core] [CONSOLIDATED PULL 08/12] avahi: enable service when using systemd
From: Koen Kooi k...@dominion.thruhere.net
Signed-off-by: Koen Kooi k...@dominion.thruhere.net
---
meta/recipes-connectivity/avahi/avahi.inc | 18 ++
meta/recipes-connectivity/avahi/avahi_0.6.30.bb |2 +-
2 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-connectivity/avahi/avahi.inc
b/meta/recipes-connectivity/avahi/avahi.inc
index 099c5a4..9e26a20 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -46,6 +46,24 @@ PACKAGES =+ avahi-systemd avahi-daemon libavahi-common
libavahi-core libavahi-c
FILES_avahi-systemd = ${base_libdir}/systemd
RDEPENDS_avahi-systemd = avahi-daemon
+pkg_postinst_avahi-systemd() {
+ # can't do this offline
+ if [ x$D != x ]; then
+ exit 1
+ fi
+
+ systemctl enable avahi-daemon.service
+}
+
+pkg_postrm_avahi-systemd() {
+ # can't do this offline
+ if [ x$D != x ]; then
+ exit 1
+ fi
+
+ systemctl disable avahi-daemon.service
+}
+
FILES_libavahi-common = ${libdir}/libavahi-common.so.*
FILES_libavahi-core = ${libdir}/libavahi-core.so.*
FILES_libavahi-ui = ${libdir}/libavahi-ui.so.*
diff --git a/meta/recipes-connectivity/avahi/avahi_0.6.30.bb
b/meta/recipes-connectivity/avahi/avahi_0.6.30.bb
index e63f406..23c0fa0 100644
--- a/meta/recipes-connectivity/avahi/avahi_0.6.30.bb
+++ b/meta/recipes-connectivity/avahi/avahi_0.6.30.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM =
file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf
RDEPENDS_avahi-daemon = sysvinit-pidof
-PR = r1
+PR = r3
EXTRA_OECONF += --disable-gtk3
--
1.7.3.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] recipes: Upstream-status -- Upstream-Status: for multiple patches
As a keyword, Upstream-Status is case sensitive. Signed-off-by: Dexuan Cui dexuan@intel.com --- .../eglibc/eglibc-2.13/IO-acquire-lock-fix.patch |2 +- .../eglibc-svn-arm-lowlevellock-include-tls.patch |2 +- .../eglibc/eglibc-2.13/mips-rld-map-check.patch|2 +- .../eglibc-2.13/shorten-build-commands.patch |2 +- .../eglibc/eglibc-2.13/stack-protector-test.patch |2 +- .../elfutils/elfutils-0.148/mempcpy.patch |2 +- .../ghostscript/ghostscript-9.02-genarch.patch |2 +- .../ghostscript-9.02-prevent_recompiling.patch |2 +- .../lttng/lttng-ust/uclibc-sched_getcpu.patch |2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/meta/recipes-core/eglibc/eglibc-2.13/IO-acquire-lock-fix.patch b/meta/recipes-core/eglibc/eglibc-2.13/IO-acquire-lock-fix.patch index 7bfb67c..cf58035 100644 --- a/meta/recipes-core/eglibc/eglibc-2.13/IO-acquire-lock-fix.patch +++ b/meta/recipes-core/eglibc/eglibc-2.13/IO-acquire-lock-fix.patch @@ -1,6 +1,6 @@ import http://sourceware.org/ml/libc-ports/2007-12/msg0.html -Upstream-status: Pending +Upstream-Status: Pending Index: libc/bits/stdio-lock.h === diff --git a/meta/recipes-core/eglibc/eglibc-2.13/eglibc-svn-arm-lowlevellock-include-tls.patch b/meta/recipes-core/eglibc/eglibc-2.13/eglibc-svn-arm-lowlevellock-include-tls.patch index a667d56..4313aa5 100644 --- a/meta/recipes-core/eglibc/eglibc-2.13/eglibc-svn-arm-lowlevellock-include-tls.patch +++ b/meta/recipes-core/eglibc/eglibc-2.13/eglibc-svn-arm-lowlevellock-include-tls.patch @@ -7,7 +7,7 @@ In file included from ../nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c:21: ../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: error: 'header' undeclared (first use in this function) make[4]: *** [/var/tmp/portage/sys-libs/glibc-2.7-r1/work/build-default-armv4l-unknown-linux-gnu-nptl/nptl/rtld-libc-lowlevellock.os] Error 1 -Upstream-status: Pending +Upstream-Status: Pending --- libc/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h.orig +++ libc/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h diff --git a/meta/recipes-core/eglibc/eglibc-2.13/mips-rld-map-check.patch b/meta/recipes-core/eglibc/eglibc-2.13/mips-rld-map-check.patch index 9740e17..7772e6f 100644 --- a/meta/recipes-core/eglibc/eglibc-2.13/mips-rld-map-check.patch +++ b/meta/recipes-core/eglibc/eglibc-2.13/mips-rld-map-check.patch @@ -8,7 +8,7 @@ see also: http://sourceware.org/bugilla/show_bug.cgi?id=11615 9/19/2010 - added by Qing He qing...@intel.com -Upstream-status: Pending +Upstream-Status: Pending --- diff -ru glibc-2.10.1.orig/ports/sysdeps/mips/dl-machine.h glibc-2.10.1/ports/sysdeps/mips/dl-machine.h diff --git a/meta/recipes-core/eglibc/eglibc-2.13/shorten-build-commands.patch b/meta/recipes-core/eglibc/eglibc-2.13/shorten-build-commands.patch index 9153258..c17d58b 100644 --- a/meta/recipes-core/eglibc/eglibc-2.13/shorten-build-commands.patch +++ b/meta/recipes-core/eglibc/eglibc-2.13/shorten-build-commands.patch @@ -24,7 +24,7 @@ CodeSourcery * Makerules ($(common-objpfx)includes.mk): Include and create includes.mk. Create includes. -Upstream-status: Pending +Upstream-Status: Pending Index: libc/Makeconfig === diff --git a/meta/recipes-core/eglibc/eglibc-2.13/stack-protector-test.patch b/meta/recipes-core/eglibc/eglibc-2.13/stack-protector-test.patch index 63a86c9..dbf70a9 100644 --- a/meta/recipes-core/eglibc/eglibc-2.13/stack-protector-test.patch +++ b/meta/recipes-core/eglibc/eglibc-2.13/stack-protector-test.patch @@ -3,7 +3,7 @@ might have build the compiler with --disable-ssp which means ssp should not be enabled. Therefore we change the test to a link time test. It will fail if libssp is not available. -Upstream-status: Pending +Upstream-Status: Pending Signed-off-by: Khem Raj raj.k...@gmail.com diff --git a/meta/recipes-devtools/elfutils/elfutils-0.148/mempcpy.patch b/meta/recipes-devtools/elfutils/elfutils-0.148/mempcpy.patch index 2c1e823..218a57b 100644 --- a/meta/recipes-devtools/elfutils/elfutils-0.148/mempcpy.patch +++ b/meta/recipes-devtools/elfutils/elfutils-0.148/mempcpy.patch @@ -5,7 +5,7 @@ This patch may make sense for upstream but elfutils uses more glibc specific features like obstack_printf which are missing in uclibc they need to be fixed along to make it work all the way -Upstream-status: Inappropriate[Elfutils uses more glibc specific features] +Upstream-Status: Inappropriate[Elfutils uses more glibc specific features] Signed-off-by: Khem Raj raj.k...@gmail.com diff --git a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patch b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patch index 149f9fc..3c2a4c8 100644 ---
[OE-core] [CONSOLIDATED PULL 00/12] 2-June-2011
Richard:
Pulling a number of patches and updates from the list, they have been
built on the autobuild.
This has the gcc fix for qt4-x11-free in the form of a gcc patch
Sau!
The following changes since commit 0a496df0209c93fd00ea929b5f27faa1a6e600c0:
clutter-1.6: Add patch to update gettext macro version (2011-06-01 18:32:30
+0100)
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
Jingdong Lu (1):
libx11: fix libX11 keysyms to pass xts5 of lsb
Kang Kai (1):
task-core-lsb: add cups and ghostscript into image
Koen Kooi (3):
u-boot: package up u-boot.bin for field upgrades
shadow: remove selinux entry from pam.d/login
avahi: enable service when using systemd
Nitin A Kamble (4):
m4: upgrade from 1.4.15 to 1.4.16
autoconf: upgrade from 2.65 to 2.68
bison: upgrade from 2.4.3 to 2.5
gettext-0.16.1: mark upstream status for gplv2 recipe's patches
Phil Blundell (1):
rootfs_ipk: delete opkg metadata if package management not required
and all packages are configured
Saul Wold (2):
ghostscript: Fix up file locations and add i686
gcc: Fix volatile access issue for ARM
meta/classes/rootfs_ipk.bbclass| 11 ++
meta/recipes-bsp/uboot/u-boot.inc | 11 ++
meta/recipes-bsp/uboot/u-boot_2011.03.bb |2 +-
meta/recipes-connectivity/avahi/avahi.inc | 18 +++
meta/recipes-connectivity/avahi/avahi_0.6.30.bb|2 +-
.../gettext/gettext-0.16.1/disable_java.patch |3 +-
.../gettext-0.16.1/fix_aclocal_version.patch |1 +
.../gettext-0.16.1/fix_gnu_source_circular.patch |3 +-
.../gettext/gettext-0.16.1/fixchicken.patch|3 +-
.../gettext/gettext-0.16.1/getline.m4.patch|3 +-
.../gettext-autoconf-lib-link-no-L.patch |3 +-
.../gettext-error_print_progname.patch |3 +-
.../gettext/gettext-0.16.1/gettext-vpath.patch |3 +-
.../gettext-0.16.1/hardcode_macro_version.patch|3 +-
.../gettext/gettext-0.16.1/linklib_from_0.17.patch |3 +-
.../{autoconf-2.65 = autoconf}/autoconf-x.patch |0
.../autoheader-nonfatal-warnings.patch |0
.../autoreconf-exclude.patch |0
.../autoreconf-foreign.patch |0
.../autoreconf-gnuconfigize.patch |0
.../autoreconf-include.patch |0
.../{autoconf-2.65 = autoconf}/config_site.patch | 19 ++-
.../fix_path_xtra.patch| 14 +-
.../path_prog_fixes.patch |0
.../program_prefix.patch |0
.../{autoconf_2.65.bb = autoconf_2.68.bb} |6 +-
meta/recipes-devtools/bison/bison/m4.patch | 131
.../bison/bison/uclibc-sched_param-def.patch | 21 ---
.../bison/{bison_2.4.3.bb = bison_2.5.bb} |7 +-
meta/recipes-devtools/gcc/gcc-4.6.0.inc|4 +-
.../gcc/gcc-4.6.0/volatile_access_backport.patch | 28
.../{m4-native_1.4.15.bb = m4-native_1.4.16.bb} |0
.../m4/{m4_1.4.15.bb = m4_1.4.16.bb} |6 +-
.../ghostscript/{ = }/ghostscript/arm/objarch.h |0
.../ghostscript/{ = }/ghostscript/arm/soobjarch.h |0
.../ghostscript/{ = }/ghostscript/i586/objarch.h |0
.../{ = }/ghostscript/i586/soobjarch.h|0
meta/recipes-extended/ghostscript/ghostscript/i686 |1 +
.../ghostscript/{ = }/ghostscript/mips/objarch.h |0
.../{ = }/ghostscript/mips/soobjarch.h|0
.../{ = }/ghostscript/powerpc/objarch.h |0
.../{ = }/ghostscript/powerpc/soobjarch.h |0
.../{ = }/ghostscript/x86_64/objarch.h|0
.../{ = }/ghostscript/x86_64/soobjarch.h |0
meta/recipes-extended/shadow/files/pam.d/login |7 -
meta/recipes-extended/shadow/shadow.inc|2 +
meta/recipes-extended/tasks/task-core-lsb.bb |3 +-
.../libx11-1.3.4/makekeys_crosscompile.patch | 45 +++
.../recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb |5 +-
meta/recipes-graphics/xorg-lib/libx11.inc |8 +-
meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb |5 +-
51 files changed, 185 insertions(+), 199 deletions(-)
rename meta/recipes-devtools/autoconf/{autoconf-2.65 =
autoconf}/autoconf-x.patch (100%)
rename meta/recipes-devtools/autoconf/{autoconf-2.65 =
autoconf}/autoheader-nonfatal-warnings.patch (100%)
rename meta/recipes-devtools/autoconf/{autoconf-2.65 =
autoconf}/autoreconf-exclude.patch (100%)
rename meta/recipes-devtools/autoconf/{autoconf-2.65 =
autoconf}/autoreconf-foreign.patch (100%)
rename meta/recipes-devtools/autoconf/{autoconf-2.65 =
autoconf}/autoreconf-gnuconfigize.patch (100%)
rename meta/recipes-devtools/autoconf/{autoconf-2.65 =
Re: [OE-core] rpmdeps, was Re: dbus-native --with-x
On Wed, 2011-06-01 at 16:17 -0500, Mark Hatle wrote: I'm not sure if the libraries that RPM uses would even be able to link w/o openssl. (I never tried it.) But that will affect people who are using RPM packages as signing and validation routines come from openssl. Sure, but if rpmdeps doesn't need those bits then we could have two recipes: a heavy one for those people who want rpm packages, and a lighter one for those who need rpmdeps to make package.bbclass work but don't otherwise have any requirement for rpm. p. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/3] gnutls: link against 'dl' library
On Thu, 2011-06-02 at 08:31 +0200, Martin Jansa wrote:
what do you have in configlog for LIBDL?
here it's all empty
LIBDL=''
LIBDL_PREFIX=''
LTLIBDL=''
if I add
+ --with-libdl-prefix=${STAGING_DIR_HOST}${prefix} \
+ --with-libpthread-prefix=${STAGING_DIR_HOST}${prefix} \
to EXTRA_OE_CONF (we already have couple of --with-*-prefix there) it's
found correctly (and this is at least better workarround then forcing
-ldl directly to LDFLAGS):
LIBDL='/OE/shr-core/tmp/sysroots/om-gta02/usr/lib/libdl.so'
LIBDL_PREFIX='/OE/shr-core/tmp/sysroots/om-gta02/usr'
LTLIBDL='-L/OE/shr-core/tmp/sysroots/om-gta02/usr/lib -ldl'
same problem is with libpthread..
maybe their m4/lib-link.m4 does something wrong in
AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
[
AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
AC_REQUIRE([AC_LIB_RPATH])
I just looked at the code in lib/configure and concluded that its just
luck whether it figures out the correct values or does something really
nasty. Its poking about ${libdir} for this stuff so you end up with
something like the following combinations:
a) 64 bit system with 64 bit libs in /usr/lib64 and no 32 bit libs:
Finds no -ldl
Something else may or may not link it indirectly so the build may or
may not work.
b) 64 bit system with 64 bit libs in /usr/lib64 and 32 bit libs in /usr/lib,
building for 32 bit:
Finds a -ldl which works.
Things appear to work.
c) Other variations
The correct fix would appear to be to set the paths specifically using
the options Martin mentions above.
Cheers,
Richard
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] rpm: avoid dependency on perl and python for -native build
Update override naming (_native - _virtclass-native) to disable perl
and python bindings when building native rpm, and adjust the DEPENDS to
match.
Perl bindings were, in fact, already disabled for both native and target
builds so it's only the python ones that have really changed.
Signed-off-by: Phil Blundell ph...@gnu.org
---
meta/recipes-devtools/rpm/rpm_5.4.0.bb | 10 ++
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.0.bb
b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
index d3f85f2..5c30f1c 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.0.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
@@ -42,8 +42,10 @@ HOMEPAGE = http://rpm5.org/;
LICENSE = LGPL 2.1
LIC_FILES_CHKSUM = file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1
-DEPENDS = bzip2 zlib python perl db openssl elfutils expat libpcre attr acl
popt
-PR = r16
+rpmdeps = bzip2 zlib db openssl elfutils expat libpcre attr acl popt
+DEPENDS = ${rpmdeps} python perl
+DEPENDS_virtclass-native = ${rpmdeps}
+PR = r17
# rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed
# in order to extract the distribution SRPM into a format we can extract...
@@ -92,7 +94,7 @@ WITH_PYTHON =--with-python=${PYTHON_BASEVERSION} \
--without-pythonembed \
-WITH_PYTHON_native = --without-python
+WITH_PYTHON_virtclass-native = --without-python
# Perl modules are not built, but they could be enabled fairly easily
# the perl module creation and installation would need to be patched.
@@ -100,7 +102,7 @@ WITH_PYTHON_native = --without-python
#WITH_PERL = --with-perl --without-perlembed
WITH_PERL = --without-perl
-WITH_PERL_native = --without-perl
+WITH_PERL_virtclass-native = --without-perl
WITH_DB = --with-db --with-dbsql --without-db-tools-integrated
--without-sqlite
--
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] gnutls: add --with-libdl-prefix and --with-libpthread-prefix
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta/recipes-support/gnutls/gnutls.inc |2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-support/gnutls/gnutls.inc
b/meta/recipes-support/gnutls/gnutls.inc
index 9f8d81b..03aed6a 100644
--- a/meta/recipes-support/gnutls/gnutls.inc
+++ b/meta/recipes-support/gnutls/gnutls.inc
@@ -22,6 +22,8 @@ inherit autotools binconfig pkgconfig gettext
EXTRA_OECONF=--with-included-opencdk --with-included-libcfg --disable-rpath \
--with-libtasn1-prefix=${STAGING_DIR_HOST}${prefix} \
--with-libgcrypt
--with-libgcrypt-prefix=${STAGING_DIR_HOST}${prefix} \
+ --with-libdl-prefix=${STAGING_DIR_HOST}${prefix} \
+ --with-libpthread-prefix=${STAGING_DIR_HOST}${prefix} \
--with-lzo --disable-guile \
do_configure_prepend() {
--
1.7.5.3
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libc-package: fix typo causing annoying diagnostic
We don't package /etc/rpc and do_install() makes some effort to remove
that file so as to avoid the installed but not shipped diagnostic. But,
due to a typo in the command line, the file wasn't actually being removed
and the diagnostic continued to be issued.
Signed-off-by: Phil Blundell ph...@gnu.org
---
meta/classes/libc-package.bbclass |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/classes/libc-package.bbclass
b/meta/classes/libc-package.bbclass
index 047464e..55e3d48 100644
--- a/meta/classes/libc-package.bbclass
+++ b/meta/classes/libc-package.bbclass
@@ -98,7 +98,7 @@ do_install() {
grep -v $i ${WORKDIR}/SUPPORTED ${WORKDIR}/SUPPORTED.tmp
mv ${WORKDIR}/SUPPORTED.tmp ${WORKDIR}/SUPPORTED
done
- rm -f ${D}{sysconfdir}/rpc
+ rm -f ${D}${sysconfdir}/rpc
rm -rf ${D}${datadir}/zoneinfo
rm -rf ${D}${libexecdir}/getconf
}
--
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 mispackaging of libcidn
The glob for libc_baselibs was too permissive, causing some of the libcidn
symlinks to be placed in ${PN} rather than the intended subpackage. Worse,
the .so itself was actually landing in ${PN}-dev, so the net effect was to
make libc6-dev a dependency of libc6.
Bump PRs for both 2.12 and 2.13 as a result.
Signed-off-by: Phil Blundell ph...@gnu.org
---
meta/recipes-core/eglibc/eglibc-package.inc |6 +++---
meta/recipes-core/eglibc/eglibc_2.12.bb |2 +-
meta/recipes-core/eglibc/eglibc_2.13.bb |2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc
b/meta/recipes-core/eglibc/eglibc-package.inc
index 1d3fa9e..76ebdc3 100644
--- a/meta/recipes-core/eglibc/eglibc-package.inc
+++ b/meta/recipes-core/eglibc/eglibc-package.inc
@@ -37,7 +37,7 @@ USE_LDCONFIG ?= 1
PKGSUFFIX =
PKGSUFFIX_virtclass-nativesdk = -nativesdk
-PACKAGES = ${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX}
nscd${PKGSUFFIX} ldd${PKGSUFFIX} localedef${PKGSUFFIX} ${PN}-utils ${PN}-pic
${PN}-dev eglibc-doc eglibc-locale libcidn libmemusage libsegfault${PKGSUFFIX}
eglibc-extra-nss eglibc-thread-db${PKGSUFFIX} eglibc-pcprofile
+PACKAGES = ${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX}
nscd${PKGSUFFIX} ldd${PKGSUFFIX} localedef${PKGSUFFIX} libcidn ${PN}-utils
${PN}-pic ${PN}-dev eglibc-doc eglibc-locale libmemusage
libsegfault${PKGSUFFIX} eglibc-extra-nss eglibc-thread-db${PKGSUFFIX}
eglibc-pcprofile
PACKAGES_DYNAMIC = \
glibc-gconv-*${PKGSUFFIX} glibc-charmap-*
glibc-localedata-* glibc-binary-localedata-* \
@@ -74,12 +74,12 @@ RPROVIDES_eglibc-extra-nss = glibc-extra-nss
RPROVIDES_eglibc-thread-db = glibc-thread-db
RPROVIDES_eglibc-pcprofile = glibc-pcprofile
RPROVIDES_eglibc-dbg = glibc-dbg
-libc_baselibs = ${base_libdir}/libcrypt*.so.* ${base_libdir}/libcrypt-*.so
${base_libdir}/libc*.so.* ${base_libdir}/libc-*.so ${base_libdir}/libm*.so.*
${base_libdir}/libm-*.so ${base_libdir}/ld*.so.* ${base_libdir}/ld-*.so
${base_libdir}/libpthread*.so.* ${base_libdir}/libpthread-*.so
${base_libdir}/libresolv*.so.* ${base_libdir}/libresolv-*.so
${base_libdir}/librt*.so.* ${base_libdir}/librt-*.so
${base_libdir}/libutil*.so.* ${base_libdir}/libutil-*.so
${base_libdir}/libnsl*.so.* ${base_libdir}/libnsl-*.so
${base_libdir}/libnss_files*.so.* ${base_libdir}/libnss_files-*.so
${base_libdir}/libnss_compat*.so.* ${base_libdir}/libnss_compat-*.so
${base_libdir}/libnss_dns*.so.* ${base_libdir}/libnss_dns-*.so
${base_libdir}/libdl*.so.* ${base_libdir}/libdl-*.so
${base_libdir}/libanl*.so.* ${base_libdir}/libanl-*.so
${base_libdir}/libBrokenLocale*.so.* ${base_libdir}/libBrokenLocale-*.so
+libc_baselibs = ${base_libdir}/libcrypt*.so.* ${base_libdir}/libcrypt-*.so
${base_libdir}/libc.so.* ${base_libdir}/libc-*.so ${base_libdir}/libm*.so.*
${base_libdir}/libm-*.so ${base_libdir}/ld*.so.* ${base_libdir}/ld-*.so
${base_libdir}/libpthread*.so.* ${base_libdir}/libpthread-*.so
${base_libdir}/libresolv*.so.* ${base_libdir}/libresolv-*.so
${base_libdir}/librt*.so.* ${base_libdir}/librt-*.so
${base_libdir}/libutil*.so.* ${base_libdir}/libutil-*.so
${base_libdir}/libnsl*.so.* ${base_libdir}/libnsl-*.so
${base_libdir}/libnss_files*.so.* ${base_libdir}/libnss_files-*.so
${base_libdir}/libnss_compat*.so.* ${base_libdir}/libnss_compat-*.so
${base_libdir}/libnss_dns*.so.* ${base_libdir}/libnss_dns-*.so
${base_libdir}/libdl*.so.* ${base_libdir}/libdl-*.so
${base_libdir}/libanl*.so.* ${base_libdir}/libanl-*.so
${base_libdir}/libBrokenLocale*.so.* ${base_libdir}/libBrokenLocale-*.so
FILES_${PN} = ${libc_baselibs} ${libexecdir}/*
${@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig
${sysconfdir}/ld.so.conf', '', d)}
FILES_ldd${PKGSUFFIX} = ${bindir}/ldd
FILES_libsegfault${PKGSUFFIX} = ${base_libdir}/libSegFault*
-FILES_libcidn = ${base_libdir}/libcidn*.so
+FILES_libcidn = ${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*
FILES_libmemusage = ${base_libdir}/libmemusage.so
FILES_eglibc-extra-nss = ${base_libdir}/libnss*
FILES_sln = /sbin/sln
diff --git a/meta/recipes-core/eglibc/eglibc_2.12.bb
b/meta/recipes-core/eglibc/eglibc_2.12.bb
index 715b873..e69cd0f 100644
--- a/meta/recipes-core/eglibc/eglibc_2.12.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.12.bb
@@ -2,7 +2,7 @@ require eglibc.inc
DEPENDS += gperf-native
FILESPATHPKG =. eglibc-svn:
-PR = r13
+PR = r14
SRCREV = 11982
diff --git a/meta/recipes-core/eglibc/eglibc_2.13.bb
b/meta/recipes-core/eglibc/eglibc_2.13.bb
index 398da69..c77bf3c 100644
--- a/meta/recipes-core/eglibc/eglibc_2.13.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.13.bb
@@ -4,7 +4,7 @@ SRCREV = 13356
DEPENDS += gperf-native
FILESPATHPKG =. eglibc-svn:
-PR = r0
+PR = r1
PR_append = +svnr${SRCPV}
EGLIBC_BRANCH=eglibc-2_13
--
1.7.2.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
Re: [OE-core] [PATCH] rpm: avoid dependency on perl and python for -native build
On 6/2/11 4:48 AM, Phil Blundell wrote:
Update override naming (_native - _virtclass-native) to disable perl
and python bindings when building native rpm, and adjust the DEPENDS to
match.
Perl bindings were, in fact, already disabled for both native and target
builds so it's only the python ones that have really changed.
Signed-off-by: Phil Blundell ph...@gnu.org
Acked-by: Mark Hatle mark.ha...@windriver.com
---
meta/recipes-devtools/rpm/rpm_5.4.0.bb | 10 ++
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.0.bb
b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
index d3f85f2..5c30f1c 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.0.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
@@ -42,8 +42,10 @@ HOMEPAGE = http://rpm5.org/;
LICENSE = LGPL 2.1
LIC_FILES_CHKSUM = file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1
-DEPENDS = bzip2 zlib python perl db openssl elfutils expat libpcre attr acl
popt
-PR = r16
+rpmdeps = bzip2 zlib db openssl elfutils expat libpcre attr acl popt
+DEPENDS = ${rpmdeps} python perl
+DEPENDS_virtclass-native = ${rpmdeps}
+PR = r17
# rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed
# in order to extract the distribution SRPM into a format we can extract...
@@ -92,7 +94,7 @@ WITH_PYTHON = --with-python=${PYTHON_BASEVERSION} \
--without-pythonembed \
-WITH_PYTHON_native = --without-python
+WITH_PYTHON_virtclass-native = --without-python
# Perl modules are not built, but they could be enabled fairly easily
# the perl module creation and installation would need to be patched.
@@ -100,7 +102,7 @@ WITH_PYTHON_native = --without-python
#WITH_PERL =--with-perl --without-perlembed
WITH_PERL = --without-perl
-WITH_PERL_native = --without-perl
+WITH_PERL_virtclass-native = --without-perl
WITH_DB = --with-db --with-dbsql --without-db-tools-integrated
--without-sqlite
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC v1 PATCH 00/16] populate perl-native into its own directory
Tom Rini wrote: On 06/01/2011 01:05 PM, Phil Blundell wrote: On Wed, 2011-06-01 at 12:39 -0700, Tom Rini wrote: Maybe race isn't quite the right word. But recipe A depends on lib$something-perl-native, and brings in perl-native. It also checks for perl in its auto-foo and finds our perl. It now also uses our perl when it wants a host perl and all of the potential bad things happen, yes? What are the circumstances in which it would want a host perl? I don't quite understand the issue here. Surely anything that the host perl can do, perl-native plus some combination of libfoo-perl-native can also do, right? So, here's the two things going on: - In some cases (libfoo-perl-native) we need to install various perl modules in order to build other target apps. This is the cpan case, iirc. We don't currently (and can't?) just play whatever games perl would like to do to use system-wide perl and a local to TMPDIR cpan directory. We instead go down the path of having perl-native. - In order to build perl for the target we need to have the same perl version available for use. What we do in oe-core (and oe.dev, historically) is provide perl-native for both of these cases. What falls down in this case is that once perl-native is built (and in our PATH), if it's a different version than system-wide perl, stuff starts failing on version mis-match. The patch series here fixes that by saying stuff must opt-in to having perl-native be in PATH rather than just system-wide perl. What I'm saying is that while in oe-core nothing falls down here (since nothing that gets perl-native also tries to just run 'perl') meta-oe is or will have failures. Unfortunately I don't have the test cases that drove me to make oe.dev like it is handy but I have a feeling that if we go down this path it won't be the last we see of the problem, but it might well pop up again. There is another option here, which is to make perl-native be perl-cross, live in its own special directory and figure out how to make a TMPDIR-specific cpan repository available for use by system-wide perl. Hi Tom, Thank you very much for the detailed explanation! However I'm actually new to cpan and know few about the history of that in oe.dev, so I'm not sure I know enough about the background to make a proper decision now. I suppose Richard would comment here. :-) Thanks, -- Dexuan ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC v1 PATCH 01/16] native.bbclass: allow a native package to be populated into its own dir
Cui, Dexuan wrote:
Phil Blundell wrote:
On Wed, 2011-06-01 at 21:18 +0800, Dexuan Cui wrote:
+PACKAGE_OWN_DIR =
+bindir .= ${PACKAGE_OWN_DIR}
+libdir .= ${PACKAGE_OWN_DIR}
+libexecdir .= ${PACKAGE_OWN_DIR}
I think the general idea of this patch is a good one but I'm not
terribly fond of the name of that variable. If this is meant to be a
path suffix that you can optionally set for native packages then how
about calling it something like NATIVE_PACKAGE_PATH_SUFFIX?
Hi Phil,
Thanks a lot for the suggestion.
Surely NATIVE_PACKAGE_PATH_SUFFIX is a much better naming! :-)
I'll change to use it.
Hi RP, Phil,
A new branch dcui/master_perl-native_v2 was created for this better naming(this
is the only difference compared with the previous version):
http://git.pokylinux.org/cgit/cgit.cgi/poky-contrib/log/?h=dcui/master_perl-native_v2
Thanks,
-- Dexuan
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [CONSOLIDATED PULL 00/12] 2-June-2011
On Thu, 2011-06-02 at 01:04 -0700, Saul Wold wrote: Pulling a number of patches and updates from the list, they have been built on the autobuild. This has the gcc fix for qt4-x11-free in the form of a gcc patch The following changes since commit 0a496df0209c93fd00ea929b5f27faa1a6e600c0: clutter-1.6: Add patch to update gettext macro version (2011-06-01 18:32:30 +0100) 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 Jingdong Lu (1): libx11: fix libX11 keysyms to pass xts5 of lsb Kang Kai (1): task-core-lsb: add cups and ghostscript into image Koen Kooi (3): u-boot: package up u-boot.bin for field upgrades shadow: remove selinux entry from pam.d/login avahi: enable service when using systemd Nitin A Kamble (4): gettext-0.16.1: mark upstream status for gplv2 recipe's patches Phil Blundell (1): rootfs_ipk: delete opkg metadata if package management not required and all packages are configured I merged the above. m4: upgrade from 1.4.15 to 1.4.16 Khem asked what the license change was here and it should have been mentioned in the commit message. autoconf: upgrade from 2.65 to 2.68 Not pulled as likely dependent on the above. bison: upgrade from 2.4.3 to 2.5 Likewise. Saul Wold (2): ghostscript: Fix up file locations and add i686 Why did this need the location fixups? Something sounds wrong here and needs digging into. gcc: Fix volatile access issue for ARM I merged this. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/2] Upstream-status -- Upstream-Status and a fix to send-pull-request
On Thu, 2011-06-02 at 16:17 +0800, Dexuan Cui wrote: Upstream-status -- Upstream-Status: As a keyword, it's case sensitive, so let's fix the lowercase s here. The fix to send-pull-request: I don't know why othes doesn't complain about this, but without this patch, the script can't run properly in my side. Thanks, -- Dexuan The following changes since commit 484c4e73245c93a08413cd204513bf5c5698b994: clutter-1.6: Add patch to update gettext macro version (2011-06-01 18:34:37 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib dcui/master http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dcui/master Dexuan Cui (2): recipes: Upstream-status -- Upstream-Status: for multiple patches send-pull-request: fix a small typo that fails the script Merged to master, thanks. Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] rpm: avoid dependency on perl and python for -native build
On Thu, 2011-06-02 at 10:48 +0100, Phil Blundell wrote: Update override naming (_native - _virtclass-native) to disable perl and python bindings when building native rpm, and adjust the DEPENDS to match. Perl bindings were, in fact, already disabled for both native and target builds so it's only the python ones that have really changed. Signed-off-by: Phil Blundell ph...@gnu.org --- Merged to master, thanks. Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gnutls: add --with-libdl-prefix and --with-libpthread-prefix
On Thu, 2011-06-02 at 13:00 +0200, Martin Jansa wrote:
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta/recipes-support/gnutls/gnutls.inc |2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-support/gnutls/gnutls.inc
b/meta/recipes-support/gnutls/gnutls.inc
index 9f8d81b..03aed6a 100644
--- a/meta/recipes-support/gnutls/gnutls.inc
+++ b/meta/recipes-support/gnutls/gnutls.inc
@@ -22,6 +22,8 @@ inherit autotools binconfig pkgconfig gettext
EXTRA_OECONF=--with-included-opencdk --with-included-libcfg --disable-rpath
\
--with-libtasn1-prefix=${STAGING_DIR_HOST}${prefix} \
--with-libgcrypt
--with-libgcrypt-prefix=${STAGING_DIR_HOST}${prefix} \
+ --with-libdl-prefix=${STAGING_DIR_HOST}${prefix} \
+ --with-libpthread-prefix=${STAGING_DIR_HOST}${prefix} \
--with-lzo --disable-guile \
do_configure_prepend() {
Merged to master, thanks.
Richard
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] dbus: avoid dependency on x11 for -native build
On Thu, 2011-06-02 at 10:15 +0100, Phil Blundell wrote:
The native variant already configures --without-x so the X11 libs are
redundant. Adjust the DEPENDS to match.
Signed-off-by: Phil Blundell ph...@gnu.org
---
meta/recipes-core/dbus/dbus.inc |7 +--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index fb2f6d4..5f9a8a3 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -5,8 +5,11 @@ SECTION = base
LICENSE = AFL-2 | GPLv2+
LIC_FILES_CHKSUM = file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \
file://dbus/dbus.h;firstline=6;endline=20;md5=6eea2e0c7750dd8e620dcb1437312fa5
-DEPENDS = expat virtual/libintl virtual/libx11 libsm
-DEPENDS_virtclass-nativesdk = expat virtual/libintl virtual/libx11
+x11deps = virtual/libx11 libsm
+basedeps = expat virtual/libintl
+DEPENDS = ${basedeps} ${x11deps}
+DEPENDS_virtclass-native = ${basedeps}
+DEPENDS_virtclass-nativesdk = ${basedeps} virtual/libx11
SRC_URI = http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
file://tmpdir.patch; \
Merged to master, thanks.
Richard
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC v1 PATCH 00/16] populate perl-native into its own directory
On Wed, 2011-06-01 at 13:59 -0700, Tom Rini wrote: On 06/01/2011 01:45 PM, Phil Blundell wrote: On Wed, 2011-06-01 at 13:42 -0700, Tom Rini wrote: What falls down in this case is that once perl-native is built (and in our PATH), if it's a different version than system-wide perl, stuff starts failing on version mis-match. I think that's the bit that I'm not properly understanding. Which versions are mismatching, exactly? Surely the local perl from the sysroot ought to be completely self-contained and shouldn't be using any bits from the host perl install at that point. So this jogs my memory a bit! It's not so much perl itself but stuff that uses perl that can get dirty and then no, you have stuff thats built for system perl and stuff that's built with perl-native clashing. Relying even more on memory, I think help2man was one of the easy culprits and since we also modify the env, we do things like have help2man run with PERL5LIB and so on pointing system-wide perl at perl-native's lib directory and so forth. But with the proposed patch series either: a) help2man depends perlnative.bbclass In this case it can depend on perl-native being there, its in path and things work as per OE.dev. b) help2man doesn't depend in perlnative.bbclass It only sees the system perl. So I'm still not clear where the problem is? Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Tell me your build error message annoyances!
On Wed, 2011-06-01 at 16:06 +0100, Phil Blundell wrote: On Tue, 2011-05-31 at 15:26 -0700, Scott Garman wrote: I'd like to collect some feedback on error messages while building that you find confusing/annoying/unhelpful. I'm going to be working on trying to improve the situation and would like to hear from you about what could be more helpful. Funnily enough we were just having a discussion about this on irc. My personal top two least favourite diagnostics are: Another non-favourite: if you fail to specify the right protocol for the git fetcher then you end up with something like: ERROR: Function 'Fetcher failure for URL: 'None'. Fetch command export HOME=/home/pb; export GIT_CONFIG=/home/pb/oe/build/tmp-eglibc/sysroots/x86_64-linux/usr/etc/gitconfig; export PATH=...; git ls-remote rsync://gitolite@cam-git/pb/linux-2.6.35 master failed with signal 128, output: fatal: Could not make temporary directory: No such file or directory ' failed Usually the value of $PATH is about half a screenful so this error looks more monstrous in real life than it probably does above, and it isn't immediately apparent that the no such file or directory thing is a result of having tried to fetch with the wrong URI scheme. This is made slightly more irritating by the fact that there isn't much consistency between the different fetchers about the URI structure; some of them want a proto attribute whereas others (including git) want protocol, so it's harder than perhaps it ought to be to remember what the correct naming is. p. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC v1 PATCH 00/16] populate perl-native into its own directory
On 06/02/2011 07:06 AM, Richard Purdie wrote: On Wed, 2011-06-01 at 13:59 -0700, Tom Rini wrote: On 06/01/2011 01:45 PM, Phil Blundell wrote: On Wed, 2011-06-01 at 13:42 -0700, Tom Rini wrote: What falls down in this case is that once perl-native is built (and in our PATH), if it's a different version than system-wide perl, stuff starts failing on version mis-match. I think that's the bit that I'm not properly understanding. Which versions are mismatching, exactly? Surely the local perl from the sysroot ought to be completely self-contained and shouldn't be using any bits from the host perl install at that point. So this jogs my memory a bit! It's not so much perl itself but stuff that uses perl that can get dirty and then no, you have stuff thats built for system perl and stuff that's built with perl-native clashing. Relying even more on memory, I think help2man was one of the easy culprits and since we also modify the env, we do things like have help2man run with PERL5LIB and so on pointing system-wide perl at perl-native's lib directory and so forth. But with the proposed patch series either: a) help2man depends perlnative.bbclass In this case it can depend on perl-native being there, its in path and things work as per OE.dev. b) help2man doesn't depend in perlnative.bbclass It only sees the system perl. So I'm still not clear where the problem is? Well, help2man-native is (or needs to be) a dep listed in autotools.bbclass (since so many things need it, hence why it oe-core still just has it as a required host utility instead of building it). But help2man is just the easy/common case. Heck, it _may_ blow up even with the host help2man instead of help2man-native, if a recipe uses system-wide help2man and perlnative.bbclass. The root problem (again, from memory) is that since we modify PERL5LIB and so on, when we do that, we've opened ourselves up for system-wide perl trying to use perl-native's stuff. -- Tom Rini Mentor Graphics Corporation ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC v1 PATCH 00/16] populate perl-native into its own directory
On Thu, 2011-06-02 at 07:25 -0700, Tom Rini wrote: But help2man is just the easy/common case. Heck, it _may_ blow up even with the host help2man instead of help2man-native, if a recipe uses system-wide help2man and perlnative.bbclass. The root problem (again, from memory) is that since we modify PERL5LIB and so on, when we do that, we've opened ourselves up for system-wide perl trying to use perl-native's stuff. Ah right, I think I see what you're getting at now. If we've got a clean separation between perl-native and host perl, though, can't we now just eliminate all of that futzing with PERL5LIB in cpan.bbclass and such like places? perl-native already knows how to look in the right places within the sysroot for its modules so there should be no need for anything else to be overriding it. p. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [CONSOLIDATED PULL 00/12] 2-June-2011
On 06/02/2011 06:50 AM, Richard Purdie wrote: On Thu, 2011-06-02 at 01:04 -0700, Saul Wold wrote: Pulling a number of patches and updates from the list, they have been built on the autobuild. This has the gcc fix for qt4-x11-free in the form of a gcc patch The following changes since commit 0a496df0209c93fd00ea929b5f27faa1a6e600c0: clutter-1.6: Add patch to update gettext macro version (2011-06-01 18:32:30 +0100) 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 Jingdong Lu (1): libx11: fix libX11 keysyms to pass xts5 of lsb Kang Kai (1): task-core-lsb: add cups and ghostscript into image Koen Kooi (3): u-boot: package up u-boot.bin for field upgrades shadow: remove selinux entry from pam.d/login avahi: enable service when using systemd Nitin A Kamble (4): gettext-0.16.1: mark upstream status for gplv2 recipe's patches Phil Blundell (1): rootfs_ipk: delete opkg metadata if package management not required and all packages are configured I merged the above. m4: upgrade from 1.4.15 to 1.4.16 Khem asked what the license change was here and it should have been mentioned in the commit message. I will update the commit message since Nitin is not available for the rest of this week. autoconf: upgrade from 2.65 to 2.68 Not pulled as likely dependent on the above. bison: upgrade from 2.4.3 to 2.5 Likewise. Saul Wold (2): ghostscript: Fix up file locations and add i686 Why did this need the location fixups? Something sounds wrong here and needs digging into. So what I changed was to move the architecture header files (in architecture directories) into the ghostscript directory instead of being in the top level of the recipe directory. I also need to add an i686 directory in addition to the i586 directory, if there is a way to map this for the native then more digging is needed. This is required to build ghostscript-native. gcc: Fix volatile access issue for ARM I merged this. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [CONSOLIDATED PULL 00/12] 2-June-2011
On Thu, 2011-06-02 at 07:57 -0700, Saul Wold wrote: Not pulled as likely dependent on the above. bison: upgrade from 2.4.3 to 2.5 Likewise. Saul Wold (2): ghostscript: Fix up file locations and add i686 Why did this need the location fixups? Something sounds wrong here and needs digging into. So what I changed was to move the architecture header files (in architecture directories) into the ghostscript directory instead of being in the top level of the recipe directory. I also need to add an i686 directory in addition to the i586 directory, if there is a way to map this for the native then more digging is needed. This is required to build ghostscript-native. Sorry, I misread this diff. What you've done is what I'd have expected was needed and I'm find with that. I've merged it. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] eglibc: fix mispackaging of libcidn
On Thu, 2011-06-02 at 13:15 +0100, Phil Blundell wrote:
The glob for libc_baselibs was too permissive, causing some of the libcidn
symlinks to be placed in ${PN} rather than the intended subpackage. Worse,
the .so itself was actually landing in ${PN}-dev, so the net effect was to
make libc6-dev a dependency of libc6.
Bump PRs for both 2.12 and 2.13 as a result.
Signed-off-by: Phil Blundell ph...@gnu.org
Merged to master, thanks.
Richard
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC v1 PATCH 00/16] populate perl-native into its own directory
On 06/02/2011 07:37 AM, Phil Blundell wrote:
On Thu, 2011-06-02 at 07:25 -0700, Tom Rini wrote:
But help2man is just the easy/common case. Heck, it _may_ blow up even
with the host help2man instead of help2man-native, if a recipe uses
system-wide help2man and perlnative.bbclass. The root problem (again,
from memory) is that since we modify PERL5LIB and so on, when we do
that, we've opened ourselves up for system-wide perl trying to use
perl-native's stuff.
Ah right, I think I see what you're getting at now.
If we've got a clean separation between perl-native and host perl,
though, can't we now just eliminate all of that futzing with PERL5LIB in
cpan.bbclass and such like places? perl-native already knows how to
look in the right places within the sysroot for its modules so there
should be no need for anything else to be overriding it.
Well, my question is, does it, really? Even if we're using the sstate
cache from /foo/oecore/tmp over in /bar/oecore/tmp (and /foo/oecore/tmp
is rm -rf'd) ? Since we've got a create_wrapper around perl and
perl${PV} it should be I suppose (or is easily added there), but I'd
feel a lot better with some testing of the above case (and the updates
to cpan*bbclass).
--
Tom Rini
Mentor Graphics Corporation
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC v1 PATCH 00/16] populate perl-native into its own directory
On Thu, 2011-06-02 at 09:28 -0700, Tom Rini wrote:
On 06/02/2011 07:37 AM, Phil Blundell wrote:
On Thu, 2011-06-02 at 07:25 -0700, Tom Rini wrote:
But help2man is just the easy/common case. Heck, it _may_ blow up even
with the host help2man instead of help2man-native, if a recipe uses
system-wide help2man and perlnative.bbclass. The root problem (again,
from memory) is that since we modify PERL5LIB and so on, when we do
that, we've opened ourselves up for system-wide perl trying to use
perl-native's stuff.
Ah right, I think I see what you're getting at now.
If we've got a clean separation between perl-native and host perl,
though, can't we now just eliminate all of that futzing with PERL5LIB in
cpan.bbclass and such like places? perl-native already knows how to
look in the right places within the sysroot for its modules so there
should be no need for anything else to be overriding it.
Well, my question is, does it, really?
If it doesn't it really does need to get fixed. I've not seen any
evidence this has been the problem but it still could be.
Even if we're using the sstate
cache from /foo/oecore/tmp over in /bar/oecore/tmp (and /foo/oecore/tmp
is rm -rf'd) ? Since we've got a create_wrapper around perl and
perl${PV} it should be I suppose (or is easily added there), but I'd
feel a lot better with some testing of the above case (and the updates
to cpan*bbclass).
I only took the perl-native DEPENDS patch on the condition this gets
fixed properly. The patches that are there look to do that, at least for
OE-Core. If there are further issues we're going to have to take them as
they arise as I have an objection to crippling the build dependencies
because perl is broken. Really this could use some TLC from someone with
experience in the area...
Cheers,
Richard
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/3] busybox: enable mdev by default
On Wed, 2011-06-01 at 20:40 +, Otavio Salvador wrote: On Wed, Jun 1, 2011 at 20:37, Phil Blundell p...@pbcl.net wrote: On Wed, 2011-06-01 at 20:09 +, Otavio Salvador wrote: -# CONFIG_MDEV is not set +CONFIG_MDEV=y Per previous discussion, I am still uneasy about this change. I think we really need some sort of coherent policy for what exactly the default busybox configuration in oe-core is meant to be doing, and then (if necessary) a set of patches to make it match the policy. Just flipping random features on and off does not seem like a good way to proceed. OE-core has support to mdev as device handling mechanism as such this ought to be enabled by default IMO. Personally it doesn't matter since I have already overriden it in my internal layer. I'm afraid I'm with Phil on this. I don't like the idea of enabling something we don't actually use. This really needs to become some kind of configure option which would at the same time disable/replace udev so the patch in its currently form isn't acceptable. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/3] busybox: enable mdev by default
On Thu, Jun 2, 2011 at 16:37, Richard Purdie richard.pur...@linuxfoundation.org wrote: I'm afraid I'm with Phil on this. I don't like the idea of enabling something we don't actually use. This really needs to become some kind of configure option which would at the same time disable/replace udev so the patch in its currently form isn't acceptable. I'll drop it from my tree since I am using an bbappend on our local layer. Cheers, -- 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
Re: [OE-core] [RFC v1 PATCH 00/16] populate perl-native into its own directory
On 06/02/2011 09:35 AM, Richard Purdie wrote:
On Thu, 2011-06-02 at 09:28 -0700, Tom Rini wrote:
On 06/02/2011 07:37 AM, Phil Blundell wrote:
On Thu, 2011-06-02 at 07:25 -0700, Tom Rini wrote:
But help2man is just the easy/common case. Heck, it _may_ blow up even
with the host help2man instead of help2man-native, if a recipe uses
system-wide help2man and perlnative.bbclass. The root problem (again,
from memory) is that since we modify PERL5LIB and so on, when we do
that, we've opened ourselves up for system-wide perl trying to use
perl-native's stuff.
Ah right, I think I see what you're getting at now.
If we've got a clean separation between perl-native and host perl,
though, can't we now just eliminate all of that futzing with PERL5LIB in
cpan.bbclass and such like places? perl-native already knows how to
look in the right places within the sysroot for its modules so there
should be no need for anything else to be overriding it.
Well, my question is, does it, really?
If it doesn't it really does need to get fixed. I've not seen any
evidence this has been the problem but it still could be.
I agree it needs to be fixed, yes. One way or another...
Even if we're using the sstate
cache from /foo/oecore/tmp over in /bar/oecore/tmp (and /foo/oecore/tmp
is rm -rf'd) ? Since we've got a create_wrapper around perl and
perl${PV} it should be I suppose (or is easily added there), but I'd
feel a lot better with some testing of the above case (and the updates
to cpan*bbclass).
I only took the perl-native DEPENDS patch on the condition this gets
fixed properly. The patches that are there look to do that, at least for
OE-Core. If there are further issues we're going to have to take them as
they arise as I have an objection to crippling the build dependencies
because perl is broken. Really this could use some TLC from someone with
experience in the area...
Well, I guess I'd boil down what I said above into a request like this
for v3:
- Modify cpan.bbclass to NOT set PERL_INC / PERL_LIB / PERL_ARCHLIB /
PERLHOSTLIB.
- In /scratch/oecore/tmp0 build the images that were built for v1
- In /scratch/oecore/tmp1 build perl-native's full sstate cache.
- Keep the sstate cache from tmp1 and otherwise rm -rf tmp1.
- In /scratch/oecore/tmp2 using the sstate from tmp1, build the same
images that were built for tmp0.
If all of that works, I think we can call this safe enough for now and
possibly even really fixed, while we have someone actively kicking
around the recipes in question.
--
Tom Rini
Mentor Graphics Corporation
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/3] qmake_base.bbclass: fix lrelease/lupdate binary names
On Wednesday 01 June 2011 21:09:54 Otavio Salvador wrote:
To support translation, qmake based projects usually call lrelease and
lupdate however OE changes the binary names so this needs some mangle
to work out of box.
Signed-off-by: Otavio Salvador ota...@ossystems.com.br
---
meta/classes/qmake_base.bbclass |5 +
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/meta/classes/qmake_base.bbclass
b/meta/classes/qmake_base.bbclass index a054efd..165d689 100644
--- a/meta/classes/qmake_base.bbclass
+++ b/meta/classes/qmake_base.bbclass
@@ -92,6 +92,11 @@ qmake_base_do_configure() {
bbnote qmake prevar substitution: ${EXTRA_QMAKEVARS_PRE}
fi
+ # Hack .pro files to use OE utilities
+ find -name '*.pro' \
+ -exec sed -i -e 's,=\s*.*/lrelease,= ${OE_QMAKE_LRELEASE},g' \
+ -e 's,=\s*.*/lupdate,= ${OE_QMAKE_LUPDATE},g' '{}' ';'
+
#bbnote Calling '${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o
Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST' unset
QMAKESPEC || true
${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o Makefile
$QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST || die Error
calling ${OE_QMAKE_QMAKE} on $PROFILES
Acked-by: Paul Eggleton paul.eggle...@linux.intel.com
--
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] dbus-native --with-x
On 06/02/2011 02:08 AM, Phil Blundell wrote: On Wed, 2011-06-01 at 15:22 -0700, Tom Rini wrote: On 06/01/2011 03:07 PM, Henning Heinold wrote: On Wed, Jun 01, 2011 at 03:00:37PM -0700, Tom Rini wrote: On 06/01/2011 01:22 PM, Phil Blundell wrote: On Wed, 2011-06-01 at 11:58 -0500, Mark Hatle wrote: It should be as simple and adding --without-perl and --without-python to the configuration line... but I haven't tried it. Turns out that rpm-native already does this, but (like the dbus case) there is no matching logic to get the DEPENDS right. Another instance of a similar thing appears to be sqlite3-native, which DEPENDS on tcl-native even though it's configured --without-tcl. Since this keeps coming up, maybe it needs a comment. sqlite3 needs tcl-native (tclsh) to generate a header file. No tclsh, no sqlite3. I thought that is diffrent with 3.7.x version of sqlite3. Nope. That's what I checked this against. In oe.dev a2c3af2d608b1b713018d688b00e03873a538993 is where we set all of this right. Actually, it looks to me like Henning is right. In 3.7.6.2, which seems to be what we have in oe-core right now, I can't find any trace of the old tcl script that was being used for header generation. Which file(s) did you find the tcl requirement in? I guess I've just gone crazy (or crazier if you prefer) and I can't find it anymore in 3.7.x. -- Tom Rini Mentor Graphics Corporation ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/3] qmake_base.bbclass: fix lrelease/lupdate binary names
On Thu, 2011-06-02 at 17:51 +0100, Paul Eggleton wrote:
On Wednesday 01 June 2011 21:09:54 Otavio Salvador wrote:
To support translation, qmake based projects usually call lrelease and
lupdate however OE changes the binary names so this needs some mangle
to work out of box.
Signed-off-by: Otavio Salvador ota...@ossystems.com.br
---
meta/classes/qmake_base.bbclass |5 +
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/meta/classes/qmake_base.bbclass
b/meta/classes/qmake_base.bbclass index a054efd..165d689 100644
--- a/meta/classes/qmake_base.bbclass
+++ b/meta/classes/qmake_base.bbclass
@@ -92,6 +92,11 @@ qmake_base_do_configure() {
bbnote qmake prevar substitution: ${EXTRA_QMAKEVARS_PRE}
fi
+ # Hack .pro files to use OE utilities
+ find -name '*.pro' \
+-exec sed -i -e 's,=\s*.*/lrelease,= ${OE_QMAKE_LRELEASE},g' \
+ -e 's,=\s*.*/lupdate,= ${OE_QMAKE_LUPDATE},g' '{}' ';'
+
#bbnote Calling '${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o
Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST' unset
QMAKESPEC || true
${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o Makefile
$QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST || die Error
calling ${OE_QMAKE_QMAKE} on $PROFILES
Acked-by: Paul Eggleton paul.eggle...@linux.intel.com
Merged to master, thanks.
Richard
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] base.bbclass: add cleansstate task between clean and cleanall
* sometimes it's usefull to remove only sstate cache and keep downloaded
sources for rebuild
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta/classes/base.bbclass |7 +--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 8f4ef1e..6f0484e 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -408,10 +408,13 @@ def check_gcc3(data):
return False
-addtask cleanall after do_clean
-python do_cleanall() {
+addtask cleansstate after do_clean
+python do_cleansstate() {
sstate_clean_cachefiles(d)
+}
+addtask cleanall after do_cleansstate
+python do_cleanall() {
src_uri = (bb.data.getVar('SRC_URI', d, True) or ).split()
if len(src_uri) == 0:
return
--
1.7.5.3
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] dbus-native --with-x
On Thu, 2011-06-02 at 10:04 -0700, Tom Rini wrote: I guess I've just gone crazy (or crazier if you prefer) and I can't find it anymore in 3.7.x. Okay. So do we think the tcl dependency can be dropped? p. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/4] gnutls: add p11tool into gnutls-bin
Signed-off-by: Otavio Salvador ota...@ossystems.com.br
---
meta/recipes-support/gnutls/gnutls.inc |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-support/gnutls/gnutls.inc
b/meta/recipes-support/gnutls/gnutls.inc
index 03aed6a..9257880 100644
--- a/meta/recipes-support/gnutls/gnutls.inc
+++ b/meta/recipes-support/gnutls/gnutls.inc
@@ -3,7 +3,7 @@ HOMEPAGE = http://www.gnu.org/software/gnutls/;
BUGTRACKER = https://savannah.gnu.org/support/?group=gnutls;
DEPENDS = zlib lzo libtasn1 libgcrypt (= 1.4.2) libcap
-INC_PR = r1
+INC_PR = r2
LICENSE = GPLv3+ LGPLv2.1+
LICENSE_${PN} = LGPLv2.1+
@@ -39,6 +39,7 @@ FILES_${PN}-bin = ${bindir}/gnutls-serv \
${bindir}/gnutls-cli \
${bindir}/srptool \
${bindir}/psktool \
+ ${bindir}/p11tool \
${bindir}/certtool \
${bindir}/gnutls-srpcrypt
--
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 4/4] package.bbclass: add support to split Qt translation files
There're many Qt applications that provide translation files in '.qm'
format however those weren't being splitted as GetText based
ones.
Signed-off-by: Otavio Salvador ota...@ossystems.com.br
---
meta/classes/package.bbclass | 41 +
1 files changed, 37 insertions(+), 4 deletions(-)
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 1e6a872..e4be20f 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -343,6 +343,8 @@ python package_do_split_locales() {
bb.debug(1, package requested not splitting locales)
return
+ import re
+
packages = (bb.data.getVar('PACKAGES', d, True) or ).split()
datadir = bb.data.getVar('datadir', d, True)
@@ -358,12 +360,29 @@ python package_do_split_locales() {
localedir = os.path.join(dvar + datadir, 'locale')
- if not os.path.isdir(localedir):
+ locales = []
+ if os.path.isdir(localedir):
+ locales = os.listdir(localedir)
+
+ # Check of Qt translation files
+ qm_re = re.compile((.*)\.qm$)
+ qm_files = {}
+ for root, dirs, files in os.walk(dvar):
+ for file in files:
+ qm_file = qm_re.match(file)
+ if qm_file:
+ locale = qm_file.group(1)
+ relpath = os.path.join(root,
file).replace(dvar, '', 1)
+ if relpath:
+ if not qm_files.has_key(locale):
+ qm_files[locale] = []
+
+ qm_files[locale].append(relpath)
+
+ if len(locales) == 0 and len(qm_files) == 0:
bb.debug(1, No locale files in this package)
return
- locales = os.listdir(localedir)
-
# This is *really* broken
mainpkg = packages[0]
# At least try and patch it up I guess...
@@ -372,13 +391,27 @@ python package_do_split_locales() {
if mainpkg.find('-dev'):
mainpkg = mainpkg.replace('-dev', '')
+ # Queue Qt locales for spliting
+ for l in qm_files.keys():
+ if l not in locales:
+ locales.append(l)
+
+ # Split the locales into different packages
summary = bb.data.getVar('SUMMARY', d, True) or pn
description = bb.data.getVar('DESCRIPTION', d, True) or
for l in locales:
ln = legitimize_package_name(l)
pkg = pn + '-locale-' + ln
packages.append(pkg)
- bb.data.setVar('FILES_' + pkg, os.path.join(datadir, 'locale',
l), d)
+ files = []
+ files.append(os.path.join(datadir, 'locale', l))
+
+ if qm_files.has_key(l):
+ locale_re = re.compile(^.*([a-z]{2}(_[A-Z]{2})?)$)
+ ln =
legitimize_package_name(locale_re.match(l).group(1))
+ files += qm_files[l]
+
+ bb.data.setVar('FILES_' + pkg, .join(files), d)
bb.data.setVar('RDEPENDS_' + pkg, '%s virtual-locale-%s' %
(mainpkg, ln), d)
bb.data.setVar('RPROVIDES_' + pkg, '%s-locale %s-translation' %
(pn, ln), d)
bb.data.setVar('SUMMARY_' + pkg, '%s - %s translations' %
(summary, l), d)
--
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 0/4] Pending patches from O.S. Systems tree
The following changes since commit 2a52f806f3789f717219651b97dc64fec3881f7f: qmake_base.bbclass: fix lrelease/lupdate binary names (2011-06-02 18:26:19 +0100) are available in the git repository at: git://github.com/OSSystems/oe-core master https://github.com/OSSystems/oe-core/tree/master Otavio Salvador (4): xf86-driver-common.inc: remove .la files to avoid unpackaged warning gnutls: use INC_PR on 2.12.5 version recipe gnutls: add p11tool into gnutls-bin package.bbclass: add support to split Qt translation files meta/classes/package.bbclass | 41 ++-- .../xorg-driver/xf86-driver-common.inc |6 ++- meta/recipes-support/gnutls/gnutls.inc |3 +- meta/recipes-support/gnutls/gnutls_2.12.5.bb |2 +- 4 files changed, 45 insertions(+), 7 deletions(-) -- 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] dbus-native --with-x
On 06/02/2011 12:21 PM, Phil Blundell wrote: On Thu, 2011-06-02 at 10:04 -0700, Tom Rini wrote: I guess I've just gone crazy (or crazier if you prefer) and I can't find it anymore in 3.7.x. Okay. So do we think the tcl dependency can be dropped? Yes. -- Tom Rini Mentor Graphics Corporation ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] util-linux_2.19.1.bb: Fix compliation on uclibc
util-linux 2.19 needs this patch to successfully compile on uclibc systems. This is a bug in util-linux that goes unnoticed on eglibc builds. Signed-off-by: Khem Raj raj.k...@gmail.com --- .../uclibc-__progname-conflict.patch | 31 meta/recipes-core/util-linux/util-linux_2.19.1.bb |4 ++- 2 files changed, 34 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-core/util-linux/util-linux-2.19.1/uclibc-__progname-conflict.patch diff --git a/meta/recipes-core/util-linux/util-linux-2.19.1/uclibc-__progname-conflict.patch b/meta/recipes-core/util-linux/util-linux-2.19.1/uclibc-__progname-conflict.patch new file mode 100644 index 000..45826b1 --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux-2.19.1/uclibc-__progname-conflict.patch @@ -0,0 +1,31 @@ +configure should include errno.h instead of argp.h when +checking for presence of program_invocation_short_name +uclibc defines this to be const char* unlike util-linux-ng +which defines this to be char* so this error goes unnoticed +on glibc/eglibc systems. + +here is the error it fixes + +in file included from mountP.h:14:0, + from cache.c:29: +/home/kraj/work/slugos/build/tmp-slugos-uclibc/sysroots/nslu2le/usr/include/errno.h:55:46: error: conflicting types for '__progname' +../../../include/c.h:118:14: note: previous declaration of '__progname' was here +make[3]: *** [cache.lo] Error 1 + + +Signed-off-by: Khem Raj raj.k...@gmail.com + +Upstream-Status: Pending +Index: util-linux-2.19.1/configure.ac +=== +--- util-linux-2.19.1.orig/configure.ac util-linux-2.19.1/configure.ac +@@ -250,7 +250,7 @@ esac + + + AC_MSG_CHECKING(whether program_invocation_short_name is defined) +-AC_TRY_COMPILE([#include argp.h], ++AC_TRY_COMPILE([#include errno.h], +[program_invocation_short_name = test;], +AC_DEFINE(HAVE_PROGRAM_INVOCATION_SHORT_NAME, 1, + [Define if program_invocation_short_name is defined]) diff --git a/meta/recipes-core/util-linux/util-linux_2.19.1.bb b/meta/recipes-core/util-linux/util-linux_2.19.1.bb index 7fe7497..8067ab5 100644 --- a/meta/recipes-core/util-linux/util-linux_2.19.1.bb +++ b/meta/recipes-core/util-linux/util-linux_2.19.1.bb @@ -6,7 +6,9 @@ require util-linux.inc LICENSE_util-linux-lscpu = GPLv3+ SRC_URI += file://util-linux-ng-replace-siginterrupt.patch \ - file://util-linux-ng-2.16-mount_lock_path.patch +file://util-linux-ng-2.16-mount_lock_path.patch \ +file://uclibc-__progname-conflict.patch \ + SRC_URI[md5sum] = 3eab06f05163dfa65479c44e5231932c SRC_URI[sha256sum] = d3eac4afcc687b3ae1ffedcab2dc12df84c7ba7045cce31386d2b7040a011c7d -- 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] [PATCH 1/7] shadow: recipe and patch cleanup
Taking over maintenance of the shadow recipe. Cleaning it up in preparation of adding a -native version that will be used to add users/groups during postinstall. Signed-off-by: Scott Garman scott.a.gar...@intel.com --- .../files/shadow-4.1.3-dots-in-usernames.patch |4 + .../shadow-4.1.4.2-env-reset-keep-locale.patch |4 + .../files/shadow-4.1.4.2-groupmod-pam-check.patch |4 + .../files/shadow-4.1.4.2-su_no_sanitize_env.patch |4 + .../shadow/files/shadow.automake-1.11.patch|4 + meta/recipes-extended/shadow/shadow.inc| 121 - meta/recipes-extended/shadow/shadow_4.1.4.3.bb | 141 ++-- 7 files changed, 152 insertions(+), 130 deletions(-) delete mode 100644 meta/recipes-extended/shadow/shadow.inc diff --git a/meta/recipes-extended/shadow/files/shadow-4.1.3-dots-in-usernames.patch b/meta/recipes-extended/shadow/files/shadow-4.1.3-dots-in-usernames.patch index 7a2ff2e..a7bb0a9 100644 --- a/meta/recipes-extended/shadow/files/shadow-4.1.3-dots-in-usernames.patch +++ b/meta/recipes-extended/shadow/files/shadow-4.1.3-dots-in-usernames.patch @@ -9,6 +9,10 @@ # # comment added by Kevin Tian kevin.t...@intel.com, 2010-08-11 +Upstream-Status: Pending + +Signed-off-by: Scott Garman scott.a.gar...@intel.com + Index: shadow-4.1.4.2/libmisc/chkname.c === --- shadow-4.1.4.2.orig/libmisc/chkname.c 2009-04-28 12:14:04.0 -0700 diff --git a/meta/recipes-extended/shadow/files/shadow-4.1.4.2-env-reset-keep-locale.patch b/meta/recipes-extended/shadow/files/shadow-4.1.4.2-env-reset-keep-locale.patch index 124065c..6514746 100644 --- a/meta/recipes-extended/shadow/files/shadow-4.1.4.2-env-reset-keep-locale.patch +++ b/meta/recipes-extended/shadow/files/shadow-4.1.4.2-env-reset-keep-locale.patch @@ -12,6 +12,10 @@ http://bugs.gentoo.org/283725 https://alioth.debian.org/tracker/index.php?func=detailaid=311740group_id=30580atid=411480 +Upstream-Status: Pending + +Signed-off-by: Scott Garman scott.a.gar...@intel.com + Index: shadow-4.1.4.2/libmisc/env.c === --- shadow-4.1.4.2.orig/libmisc/env.c 2009-04-27 13:07:56.0 -0700 diff --git a/meta/recipes-extended/shadow/files/shadow-4.1.4.2-groupmod-pam-check.patch b/meta/recipes-extended/shadow/files/shadow-4.1.4.2-groupmod-pam-check.patch index 6682fe8..640200b 100644 --- a/meta/recipes-extended/shadow/files/shadow-4.1.4.2-groupmod-pam-check.patch +++ b/meta/recipes-extended/shadow/files/shadow-4.1.4.2-groupmod-pam-check.patch @@ -17,6 +17,10 @@ http://lists.alioth.debian.org/pipermail/pkg-shadow-devel/2009-November/007850.h * NEWS, src/groupmod.c: Fixed groupmod when configured with --enable-account-tools-setuid. +Upstream-Status: Pending + +Signed-off-by: Scott Garman scott.a.gar...@intel.com + Index: shadow-4.1.4.2/src/groupmod.c === --- shadow-4.1.4.2.orig/src/groupmod.c 2009-06-05 15:16:58.0 -0700 diff --git a/meta/recipes-extended/shadow/files/shadow-4.1.4.2-su_no_sanitize_env.patch b/meta/recipes-extended/shadow/files/shadow-4.1.4.2-su_no_sanitize_env.patch index f67251c..0dc4d75 100644 --- a/meta/recipes-extended/shadow/files/shadow-4.1.4.2-su_no_sanitize_env.patch +++ b/meta/recipes-extended/shadow/files/shadow-4.1.4.2-su_no_sanitize_env.patch @@ -12,6 +12,10 @@ http://bugs.gentoo.org/show_bug.cgi?id=301957 https://alioth.debian.org/scm/browser.php?group_id=30580 +Upstream-Status: Pending + +Signed-off-by: Scott Garman scott.a.gar...@intel.com + Index: shadow-4.1.4.2/src/su.c === --- shadow-4.1.4.2.orig/src/su.c 2009-07-23 13:38:56.0 -0700 diff --git a/meta/recipes-extended/shadow/files/shadow.automake-1.11.patch b/meta/recipes-extended/shadow/files/shadow.automake-1.11.patch index 36d7be6..a793f09 100644 --- a/meta/recipes-extended/shadow/files/shadow.automake-1.11.patch +++ b/meta/recipes-extended/shadow/files/shadow.automake-1.11.patch @@ -11,6 +11,10 @@ man_nopan is for !USE_PAM already included in man_MANS and automake-1.11 hates to install some file twice +Upstream-Status: Pending + +Signed-off-by: Scott Garman scott.a.gar...@intel.com + diff -uNr shadow-4.1.4.2.orig/man/Makefile.am shadow-4.1.4.2/man/Makefile.am --- shadow-4.1.4.2.orig/man/Makefile.am2009-03-14 15:40:10.0 +0100 +++ shadow-4.1.4.2/man/Makefile.am 2010-04-02 07:31:17.0 +0200 diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc deleted file mode 100644 index 42f92a7..000 --- a/meta/recipes-extended/shadow/shadow.inc +++ /dev/null @@ -1,121 +0,0 @@ -DESCRIPTION = Tools to change and administer password and group data. -HOMEPAGE = http://pkg-shadow.alioth.debian.org/; -BUGTRACKER =
[OE-core] [PATCH 7/7] package_rpm.bbclass: make RPM use on-disk permissions
Instruct RPM to use the on-disk permissions, owners, groups,
and directory permissions, instead of defaulting to root:root
Code changes suggested by Mark Hatle.
Signed-off-by: Scott Garman scott.a.gar...@intel.com
---
meta/classes/package_rpm.bbclass |2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 1d8c686..d124c01 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -484,6 +484,7 @@ python write_specfile () {
else:
bb.note(Creating RPM package for %s %
splitname)
spec_files_top.append('%files')
+ spec_files_top.append('%defattr(-,-,-,-)')
if file_list:
spec_files_top.extend(file_list)
spec_files_top.append('')
@@ -570,6 +571,7 @@ python write_specfile () {
else:
bb.note(Creating RPM package for %s % splitname)
spec_files_bottom.append('%%files -n %s' % splitname)
+ spec_files_bottom.append('%defattr(-,-,-,-)')
if file_list:
spec_files_bottom.extend(file_list)
spec_files_bottom.append('')
--
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/7] shadow: add a -native recipe with customized utilities
This adds a -native recipe for the shadow utilities.
The custom --root option allows the the following utilities to be
run within a chroot when invoked under pseudo:
* useradd
* groupadd
* usermod
* groupmod
* userdel
* groupdel
* passwd
* gpasswd
* pwconv
* pwunconv
* grpconv
* grpunconv
They can then be used to manipulate user and group account information
in target sysroots.
useradd was also modified to create home directories recursively when
necessary.
Signed-off-by: Scott Garman scott.a.gar...@intel.com
---
.../shadow/files/add_root_cmd_options.patch| 1296
.../shadow/shadow-native_4.1.4.3.bb| 66 +
2 files changed, 1362 insertions(+), 0 deletions(-)
create mode 100644
meta/recipes-extended/shadow/files/add_root_cmd_options.patch
create mode 100644 meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb
diff --git a/meta/recipes-extended/shadow/files/add_root_cmd_options.patch
b/meta/recipes-extended/shadow/files/add_root_cmd_options.patch
new file mode 100644
index 000..db969bb
--- /dev/null
+++ b/meta/recipes-extended/shadow/files/add_root_cmd_options.patch
@@ -0,0 +1,1296 @@
+Add a --root command option to the following utilties:
+
+* useradd
+* groupadd
+* usermod
+* groupmod
+* userdel
+* groupdel
+* passwd
+* gpasswd
+* pwconv
+* pwunconv
+* grpconv
+* grpunconv
+
+This option allows the utilities to be chrooted when run under pseudo.
+They can then be used to manipulate user and group account information
+in target sysroots.
+
+The useradd utility was also modified to create home directories
+recursively when necessary.
+
+Upstream-Status: Inappropriate [Other]
+Workaround is specific to our build system.
+
+Signed-off-by: Scott Garman scott.a.gar...@intel.com
+
+diff -urN shadow-4.1.4.3.orig//src/gpasswd.c shadow-4.1.4.3//src/gpasswd.c
+--- shadow-4.1.4.3.orig//src/gpasswd.c 2011-02-13 09:58:16.0 -0800
shadow-4.1.4.3//src/gpasswd.c 2011-05-28 17:09:52.346013331 -0700
+@@ -63,6 +63,7 @@
+ * (/etc/gshadow present) */
+ static bool is_shadowgrp;
+ #endif
++static const char *newroot = ;
+
+ /* Flags set by options */
+ static bool aflg = false;
+@@ -97,6 +98,7 @@
+ static void usage (void);
+ static RETSIGTYPE catch_signals (int killed);
+ static bool is_valid_user_list (const char *users);
++static void process_root_flag (int argc, char **argv);
+ static void process_flags (int argc, char **argv);
+ static void check_flags (int argc, int opt_index);
+ static void open_files (void);
+@@ -136,6 +138,7 @@
+ Options:\n
+-a, --add USERadd USER to GROUP\n
+-d, --delete USER remove USER from GROUP\n
++ -Q --root CHROOT_DIR directory to chroot into\n
+-r, --remove-password remove the GROUP's
password\n
+-R, --restrictrestrict access to GROUP to
its members\n
+-M, --members USER,...set the list of members of
GROUP\n
+@@ -226,6 +229,55 @@
+ }
+
+ /*
++ * process_root_flag - chroot if given the --root option
++ *
++ * We do this outside of process_flags() because
++ * the is_shadow_pwd boolean needs to be set before
++ * process_flags(), and if we do need to chroot() we
++ * must do so before is_shadow_pwd gets set.
++ */
++static void process_root_flag (int argc, char **argv)
++{
++ /*
++ * Parse the command line options.
++ */
++ int flag;
++ int option_index = 0;
++ static struct option long_options[] = {
++ {root, required_argument, NULL, 'Q'},
++ {NULL, 0, NULL, '\0'}
++ };
++
++ while ((flag = getopt_long (argc, argv, a:A:d:gM:Q:rR, long_options,
option_index)) != -1) {
++ switch (flag) {
++ case 'Q':
++ if ('/' != optarg[0]) {
++ fprintf (stderr,
++ _(%s: invalid chroot path '%s'\n),
++ Prog, optarg);
++ exit (E_BAD_ARG);
++ }
++ newroot = optarg;
++
++ if (access (newroot, F_OK) != 0) {
++ fprintf(stderr,
++ _(%s: chroot directory %s does not
exist\n),
++ Prog, newroot);
++ exit (E_BAD_ARG);
++ }
++ if ( chroot(newroot) != 0 ) {
++ fprintf(stderr,
++ _(%s: unable to chroot to directory
%s\n),
++ Prog, newroot);
++ exit (E_BAD_ARG);
++ }
++ break;
++ /* no-op on everything else - they will be hanled by
process_flags() */
++ }
++ }
Re: [OE-core] [PATCH] dbus 1.4.1: disable sysv script properly when using systemd
On 05/31/2011 01:27 AM, Koen Kooi wrote:
OE-core uses 'dbus-1' as initscript name, which no other
distribution(-buildsys) does, so we have to take special measures.
Signed-off-by: Koen Kooik...@dominion.thruhere.net
---
meta/recipes-core/dbus/dbus.inc |4
meta/recipes-core/dbus/dbus_1.4.1.bb |2 +-
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index 22514e9..fb2f6d4 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -89,6 +89,10 @@ do_install() {
install -d ${D}${sysconfdir}/init.d
install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1
+
+ # disable dbus-1 sysv script on systemd installs
+ # nearly all distros call the initscript plain 'dbus', but OE-core is
different
+ ln -sf /dev/null ${D}/${base_libdir}/systemd/system/dbus-1.service
}
do_install_virtclass-native() {
diff --git a/meta/recipes-core/dbus/dbus_1.4.1.bb
b/meta/recipes-core/dbus/dbus_1.4.1.bb
index f65ef35..252d160 100644
--- a/meta/recipes-core/dbus/dbus_1.4.1.bb
+++ b/meta/recipes-core/dbus/dbus_1.4.1.bb
@@ -1,6 +1,6 @@
include dbus.inc
-PR = r5
+PR = r6
SRC_URI[md5sum] = 99cb057700c0455fb68f8d57902f77ac
SRC_URI[sha256sum] =
caa1a0ded2d0f2e95c1d4ec7e3c8bd44834928c5b0ed41a7189963f3593983bd
Merged in oe-core
Thanks
Sau!
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [oe-core][PATCH 0/1] Small create-pull-request fix
On 05/31/2011 08:48 AM, Martin Jansa wrote: The following changes since commit 26e5e5feb695864b11e47e24017e254c28f14494: Improve handling of 'all' architecture recipes and their interaction with sstate (2011-05-31 12:56:38 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib jansa/pull http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/pull Martin Jansa (1): create-pull-request: allow '+' in git PROTO_RE, ie for 'git+ssh://' scripts/create-pull-request |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Merged into oe-core Thanks Sau! ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] binconfig: improve handling of empty prefixes
On 05/31/2011 09:06 AM, Phil Blundell wrote:
This is a backport of 952e5e2b7a5c1deefc939594d40b81a71fb16a54 from oe master.
Without this the script mangling goes very wrong if ${prefix}=. There
isn't really any way to fix this in the completely general case, but
this patch does work with the two cases I tested (freetype and
gpg-error) which were unusable previously.
Signed-off-by: Phil Blundellph...@gnu.org
---
meta/classes/binconfig.bbclass |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/classes/binconfig.bbclass b/meta/classes/binconfig.bbclass
index 8e22d2d..3deb541 100644
--- a/meta/classes/binconfig.bbclass
+++ b/meta/classes/binconfig.bbclass
@@ -6,8 +6,8 @@ def get_binconfig_mangle(d):
s += -e 's:=%s${libdir}:=\\1OELIBDIR:;' % optional_quote
s += -e 's:=%s${includedir}:=\\1OEINCDIR:;' % optional_quote
s += -e 's:=%s${datadir}:=\\1OEDATADIR:' % optional_quote
- s += -e 's:=%s${prefix}:=\\1OEPREFIX:' % optional_quote
- s += -e 's:=%s${exec_prefix}:=\\1OEEXECPREFIX:' %
optional_quote
+ s += -e 's:=%s${prefix}/:=\\1OEPREFIX/:' % optional_quote
+ s += -e 's:=%s${exec_prefix}/:=\\1OEEXECPREFIX/:' %
optional_quote
s += -e 's:-L${libdir}:-LOELIBDIR:;'
s += -e 's:-I${includedir}:-IOEINCDIR:;'
s += -e 's:OELIBDIR:${STAGING_LIBDIR}:;'
Merged into OE-Core
Thanks
Sau!
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] shadow: remove selinux entry from pam.d/login
On 05/31/2011 11:33 AM, Koen Kooi wrote: SElinux has been disabled in the recipe, leading to messages like this: [ 167.643218] login[312]: PAM unable to dlopen(/lib/security/pam_selinux.so): /lib/security/pam_selinux.so: cannot open shared object file: No such file or directory [ 167.670837] login[312]: PAM adding faulty module: /lib/security/pam_selinux.so Signed-off-by: Koen Kooik...@dominion.thruhere.net --- meta/recipes-extended/shadow/files/pam.d/login |7 --- meta/recipes-extended/shadow/shadow.inc|2 ++ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/meta/recipes-extended/shadow/files/pam.d/login b/meta/recipes-extended/shadow/files/pam.d/login index e41eb04..e4dacc2 100644 --- a/meta/recipes-extended/shadow/files/pam.d/login +++ b/meta/recipes-extended/shadow/files/pam.d/login @@ -26,13 +26,6 @@ auth [success=ok ignore=ignore user_unknown=ignore default=die] pam_secur # (Replaces the `NOLOGINS_FILE' option from login.defs) auth requisite pam_nologin.so -# SELinux needs to be the first session rule. This ensures that any -# lingering context has been cleared. Without out this it is possible -# that a module could execute code in the wrong domain. -# When the module is present, required would be sufficient (When SELinux -# is disabled, this returns success.) -session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close - # This module parses environment configuration file(s) # and also allows you to use an extended config # file /etc/security/pam_env.conf. diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc index 42f92a7..35bd6a8 100644 --- a/meta/recipes-extended/shadow/shadow.inc +++ b/meta/recipes-extended/shadow/shadow.inc @@ -6,6 +6,8 @@ LICENSE = BSD | Artistic LIC_FILES_CHKSUM = file://COPYING;md5=08c553a87d4e51bbed50b20e0adcaede \ file://src/passwd.c;firstline=8;endline=30;md5=2899a045e90511d0e043b85a7db7e2fe +PR = r1 + PAM_PLUGINS = libpam-runtime \ pam-plugin-faildelay \ pam-plugin-securetty \ Merged into oe-core Thanks Sau! ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] avahi: enable service when using systemd
On 06/01/2011 07:27 AM, Koen Kooi wrote:
Signed-off-by: Koen Kooik...@dominion.thruhere.net
---
meta/recipes-connectivity/avahi/avahi.inc | 18 ++
meta/recipes-connectivity/avahi/avahi_0.6.30.bb |2 +-
2 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-connectivity/avahi/avahi.inc
b/meta/recipes-connectivity/avahi/avahi.inc
index 099c5a4..9e26a20 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -46,6 +46,24 @@ PACKAGES =+ avahi-systemd avahi-daemon libavahi-common
libavahi-core libavahi-c
FILES_avahi-systemd = ${base_libdir}/systemd
RDEPENDS_avahi-systemd = avahi-daemon
+pkg_postinst_avahi-systemd() {
+ # can't do this offline
+ if [ x$D != x ]; then
+ exit 1
+ fi
+
+ systemctl enable avahi-daemon.service
+}
+
+pkg_postrm_avahi-systemd() {
+ # can't do this offline
+ if [ x$D != x ]; then
+ exit 1
+ fi
+
+ systemctl disable avahi-daemon.service
+}
+
FILES_libavahi-common = ${libdir}/libavahi-common.so.*
FILES_libavahi-core = ${libdir}/libavahi-core.so.*
FILES_libavahi-ui = ${libdir}/libavahi-ui.so.*
diff --git a/meta/recipes-connectivity/avahi/avahi_0.6.30.bb
b/meta/recipes-connectivity/avahi/avahi_0.6.30.bb
index e63f406..23c0fa0 100644
--- a/meta/recipes-connectivity/avahi/avahi_0.6.30.bb
+++ b/meta/recipes-connectivity/avahi/avahi_0.6.30.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM =
file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf
RDEPENDS_avahi-daemon = sysvinit-pidof
-PR = r1
+PR = r3
EXTRA_OECONF += --disable-gtk3
Really merged this version, not the first one!
Sorry for the confusion.
Sau!
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] libc-package: fix typo causing annoying diagnostic
On 06/02/2011 05:12 AM, Phil Blundell wrote:
We don't package /etc/rpc and do_install() makes some effort to remove
that file so as to avoid the installed but not shipped diagnostic. But,
due to a typo in the command line, the file wasn't actually being removed
and the diagnostic continued to be issued.
Signed-off-by: Phil Blundellph...@gnu.org
---
meta/classes/libc-package.bbclass |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/classes/libc-package.bbclass
b/meta/classes/libc-package.bbclass
index 047464e..55e3d48 100644
--- a/meta/classes/libc-package.bbclass
+++ b/meta/classes/libc-package.bbclass
@@ -98,7 +98,7 @@ do_install() {
grep -v $i ${WORKDIR}/SUPPORTED ${WORKDIR}/SUPPORTED.tmp
mv ${WORKDIR}/SUPPORTED.tmp ${WORKDIR}/SUPPORTED
done
- rm -f ${D}{sysconfdir}/rpc
+ rm -f ${D}${sysconfdir}/rpc
rm -rf ${D}${datadir}/zoneinfo
rm -rf ${D}${libexecdir}/getconf
}
Merged into oe-core
Thanks
Sau!
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/3] busybox: enable mdev by default
On Thursday, June 02, 2011 09:37:41 AM Richard Purdie wrote: On Wed, 2011-06-01 at 20:40 +, Otavio Salvador wrote: On Wed, Jun 1, 2011 at 20:37, Phil Blundell p...@pbcl.net wrote: On Wed, 2011-06-01 at 20:09 +, Otavio Salvador wrote: -# CONFIG_MDEV is not set +CONFIG_MDEV=y Per previous discussion, I am still uneasy about this change. I think we really need some sort of coherent policy for what exactly the default busybox configuration in oe-core is meant to be doing, and then (if necessary) a set of patches to make it match the policy. Just flipping random features on and off does not seem like a good way to proceed. OE-core has support to mdev as device handling mechanism as such this ought to be enabled by default IMO. Personally it doesn't matter since I have already overriden it in my internal layer. I'm afraid I'm with Phil on this. I don't like the idea of enabling something we don't actually use. This really needs to become some kind of configure option which would at the same time disable/replace udev so the patch in its currently form isn't acceptable. mdev or udev are image features so probably should be controlled by IMAGE_FEATURES or some such Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] eglibc: migrate configurability from oe
On 06/02/2011 02:41 AM, Kang Kai wrote:
From: Kang Kaikai.k...@windriver.com
Migrate configurability from oe, try to shrink minimal image size
The switch is in local.conf.sample, uncomment the line
DISTRO_FEATURES_EGLIBC =
and write what options you want to enable.
If want to disable locale-code charsets or locales, you have to uncomment
PACKAGE_NO_GCONV = 1
Because without this, it fails on package_do_split_gconvs in
libc-package.bbclass
This should really be posted on the
openembedded-core@lists.openembedded.org alias so that all can see it.
Signed-off-by: Kang Kaikai.k...@windriver.com
---
meta-yocto/conf/local.conf.sample | 17 ++
.../eglibc-2.13-fix-macro-RTLD_DEBUG.patch | 20 +++
meta/recipes-core/eglibc/eglibc-options.inc| 55
meta/recipes-core/eglibc/eglibc.inc|6 ++
meta/recipes-core/eglibc/eglibc_2.13.bb|4 +-
5 files changed, 101 insertions(+), 1 deletions(-)
create mode 100644
meta/recipes-core/eglibc/eglibc-2.13/eglibc-2.13-fix-macro-RTLD_DEBUG.patch
create mode 100644 meta/recipes-core/eglibc/eglibc-options.inc
diff --git a/meta-yocto/conf/local.conf.sample
b/meta-yocto/conf/local.conf.sample
index 359e510..310e51e 100644
--- a/meta-yocto/conf/local.conf.sample
+++ b/meta-yocto/conf/local.conf.sample
@@ -87,6 +87,23 @@ PACKAGE_CLASSES ?= package_rpm package_ipk
# NOTE: if listing mklibs prelink both, then make sure mklibs is before
prelink
USER_CLASSES ?= image-mklibs image-prelink
+# eglibc configurability is used to reduce minimal images's size.
+# PACKAGE_NO_GCONV should be set to 1, or locale-code posix-clang-wchar
+# charsets locales need to be include in DISTRO_FEATURES_EGLIBC, please check
+# package_do_split_gconvs in libc-package.bbclass for detail
+#PACKAGE_NO_GCONV = 1
+
+# if you want to enable any option listed below, please uncomment next line
and copy it here
+#DISTRO_FEATURES_EGLIBC =
+
+DISTRO_FEATURES_EGLIBC ??= ipv6 backtrace big-macros bsd cxx-tests catgets
charsets \
+ crypt crypt-ufc db-aliases envz fcvt fmtmsg fstab
ftraverse \
+ getlogin idn inet inet-anl libm libm-big locales
locale-code \
+ memusage nis nsswitch rcmd rtld-debug spawn streams
sunrpc utmp \
+ utmpx wordexp posix-clang-wchar posix-regexp
posix-regexp-glibc \
+ posix-wchar-io
+
+
I have some concern with this change being in sample, are these features
enabled by default, is that the intention?
If someone already has a local.conf then this will not be used, I think
that the initial soft assignment (??=) needs to be someplace else, like
in eglibc.inc maybe
Sau!
# POKYMODE controls the characteristics of the generated packages/images by
# telling poky which type of toolchain to use.
#
diff --git
a/meta/recipes-core/eglibc/eglibc-2.13/eglibc-2.13-fix-macro-RTLD_DEBUG.patch
b/meta/recipes-core/eglibc/eglibc-2.13/eglibc-2.13-fix-macro-RTLD_DEBUG.patch
new file mode 100644
index 000..dffc648
--- /dev/null
+++
b/meta/recipes-core/eglibc/eglibc-2.13/eglibc-2.13-fix-macro-RTLD_DEBUG.patch
@@ -0,0 +1,20 @@
+When disable OPTION_EGLIBC_RTLD_DEBUG, compilation fails.
+Created on Jun 1, 2011 by Kang Kaikai.k...@windriver.com
+
+Upstream-Status: Submitted
+
+Signed-off-by: Kang Kaikai.k...@windriver.com
+Index: libc/elf/dl-lookup.c
+===
+--- libc/elf/dl-lookup.c (revision 13356)
libc/elf/dl-lookup.c (working copy)
+@@ -423,7 +423,9 @@
+hash table. */
+ if (__builtin_expect (tab-size, 0))
+ {
++ #if __OPTION_EGLIBC_RTLD_DEBUG
+ assert (GLRO(dl_debug_mask) DL_DEBUG_PRELINK);
++ #endif
+ __rtld_lock_unlock_recursive (tab-lock);
+ goto success;
+ }
diff --git a/meta/recipes-core/eglibc/eglibc-options.inc
b/meta/recipes-core/eglibc/eglibc-options.inc
new file mode 100644
index 000..7cd0287
--- /dev/null
+++ b/meta/recipes-core/eglibc/eglibc-options.inc
@@ -0,0 +1,55 @@
+def eglibc_cfg(feature, features, tokens, cnf):
+ if type(tokens) == type():
+ tokens = [tokens]
+ if type(features) == type([]) and feature in features:
+ cnf.extend([token + ' = y' for token in tokens])
+ else:
+ for token in tokens:
+ cnf.extend([token + ' = n'])
+ if token == 'OPTION_EGLIBC_NSSWITCH':
+ cnf.extend([OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG =
${S}/nss/nsswitch.conf])
+ cnf.extend([OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS
= ${S}/nss/fixed-nsswitch.functions])
+
+# Map distro features to eglibc options settings
+def
[OE-core] [PATCH 0/1] eglibc: enable eglibc configurability
From: Kang Kai kai.k...@windriver.com Migrate configurability from oe, try to shrink minimal image size The switch is in local.conf.sample, uncomment the line DISTRO_FEATURES_EGLIBC = and write what options you want to enable. If want to disable locale-code charsets or locales, you have to uncomment PACKAGE_NO_GCONV = 1 Because without this, it fails on package_do_split_gconvs in libc-package.bbclass The following changes since commit fabfd7ec97af3ae2eef39b94d52b49ad565aed90: task-core-lsb: add cups and ghostscript into image (2011-06-02 15:51:23 +0800) are available in the git repository at: git://git.pokylinux.org/poky-contrib.git kangkai/distro http://git.pokylinux.org/cgit.cgi//log/?h=kangkai/distro Kang Kai (1): eglibc: migrate configurability from oe meta-yocto/conf/local.conf.sample | 17 ++ .../eglibc-2.13-fix-macro-RTLD_DEBUG.patch | 20 +++ meta/recipes-core/eglibc/eglibc-options.inc| 55 meta/recipes-core/eglibc/eglibc.inc|6 ++ meta/recipes-core/eglibc/eglibc_2.13.bb|4 +- 5 files changed, 101 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-core/eglibc/eglibc-2.13/eglibc-2.13-fix-macro-RTLD_DEBUG.patch create mode 100644 meta/recipes-core/eglibc/eglibc-options.inc -- 1.7.5.1.300.gc565c ___ 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: migrate configurability from oe
From: Kang Kai kai.k...@windriver.com
Migrate configurability from oe, try to shrink minimal image size
The switch is in local.conf.sample, uncomment the line
DISTRO_FEATURES_EGLIBC =
and write what options you want to enable.
If want to disable locale-code charsets or locales, you have to uncomment
PACKAGE_NO_GCONV = 1
Because without this, it fails on package_do_split_gconvs in
libc-package.bbclass
Signed-off-by: Kang Kai kai.k...@windriver.com
---
meta-yocto/conf/local.conf.sample | 17 ++
.../eglibc-2.13-fix-macro-RTLD_DEBUG.patch | 20 +++
meta/recipes-core/eglibc/eglibc-options.inc| 55
meta/recipes-core/eglibc/eglibc.inc|6 ++
meta/recipes-core/eglibc/eglibc_2.13.bb|4 +-
5 files changed, 101 insertions(+), 1 deletions(-)
create mode 100644
meta/recipes-core/eglibc/eglibc-2.13/eglibc-2.13-fix-macro-RTLD_DEBUG.patch
create mode 100644 meta/recipes-core/eglibc/eglibc-options.inc
diff --git a/meta-yocto/conf/local.conf.sample
b/meta-yocto/conf/local.conf.sample
index 359e510..310e51e 100644
--- a/meta-yocto/conf/local.conf.sample
+++ b/meta-yocto/conf/local.conf.sample
@@ -87,6 +87,23 @@ PACKAGE_CLASSES ?= package_rpm package_ipk
# NOTE: if listing mklibs prelink both, then make sure mklibs is before
prelink
USER_CLASSES ?= image-mklibs image-prelink
+# eglibc configurability is used to reduce minimal images's size.
+# PACKAGE_NO_GCONV should be set to 1, or locale-code posix-clang-wchar
+# charsets locales need to be include in DISTRO_FEATURES_EGLIBC, please check
+# package_do_split_gconvs in libc-package.bbclass for detail
+#PACKAGE_NO_GCONV = 1
+
+# if you want to enable any option listed below, please uncomment next line
and copy it here
+#DISTRO_FEATURES_EGLIBC =
+
+DISTRO_FEATURES_EGLIBC ??= ipv6 backtrace big-macros bsd cxx-tests catgets
charsets \
+ crypt crypt-ufc db-aliases envz fcvt fmtmsg fstab
ftraverse \
+ getlogin idn inet inet-anl libm libm-big locales
locale-code \
+ memusage nis nsswitch rcmd rtld-debug spawn streams
sunrpc utmp \
+ utmpx wordexp posix-clang-wchar posix-regexp
posix-regexp-glibc \
+ posix-wchar-io
+
+
# POKYMODE controls the characteristics of the generated packages/images by
# telling poky which type of toolchain to use.
#
diff --git
a/meta/recipes-core/eglibc/eglibc-2.13/eglibc-2.13-fix-macro-RTLD_DEBUG.patch
b/meta/recipes-core/eglibc/eglibc-2.13/eglibc-2.13-fix-macro-RTLD_DEBUG.patch
new file mode 100644
index 000..dffc648
--- /dev/null
+++
b/meta/recipes-core/eglibc/eglibc-2.13/eglibc-2.13-fix-macro-RTLD_DEBUG.patch
@@ -0,0 +1,20 @@
+When disable OPTION_EGLIBC_RTLD_DEBUG, compilation fails.
+Created on Jun 1, 2011 by Kang Kai kai.k...@windriver.com
+
+Upstream-Status: Submitted
+
+Signed-off-by: Kang Kai kai.k...@windriver.com
+Index: libc/elf/dl-lookup.c
+===
+--- libc/elf/dl-lookup.c (revision 13356)
libc/elf/dl-lookup.c (working copy)
+@@ -423,7 +423,9 @@
+hash table. */
+ if (__builtin_expect (tab-size, 0))
+ {
++ #if __OPTION_EGLIBC_RTLD_DEBUG
+ assert (GLRO(dl_debug_mask) DL_DEBUG_PRELINK);
++ #endif
+ __rtld_lock_unlock_recursive (tab-lock);
+ goto success;
+ }
diff --git a/meta/recipes-core/eglibc/eglibc-options.inc
b/meta/recipes-core/eglibc/eglibc-options.inc
new file mode 100644
index 000..7cd0287
--- /dev/null
+++ b/meta/recipes-core/eglibc/eglibc-options.inc
@@ -0,0 +1,55 @@
+def eglibc_cfg(feature, features, tokens, cnf):
+ if type(tokens) == type():
+ tokens = [tokens]
+ if type(features) == type([]) and feature in features:
+ cnf.extend([token + ' = y' for token in tokens])
+ else:
+ for token in tokens:
+ cnf.extend([token + ' = n'])
+ if token == 'OPTION_EGLIBC_NSSWITCH':
+
cnf.extend([OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG = ${S}/nss/nsswitch.conf])
+
cnf.extend([OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS =
${S}/nss/fixed-nsswitch.functions])
+
+# Map distro features to eglibc options settings
+def features_to_eglibc_settings(d):
+cnf = ([])
+distro_features = (bb.data.getVar('DISTRO_FEATURES_EGLIBC', d, True)
or '').split()
+eglibc_cfg('ipv6', distro_features,
'OPTION_EGLIBC_ADVANCED_INET6', cnf)
+eglibc_cfg('backtrace', distro_features,
'OPTION_EGLIBC_BACKTRACE', cnf)
+eglibc_cfg('big-macros', distro_features,
'OPTION_EGLIBC_BIG_MACROS', cnf)
+eglibc_cfg('bsd', distro_features,
Re: [OE-core] [PATCH 1/1] eglibc: migrate configurability from oe
Hi Saul Koen,
On 06/02/2011 02:41 AM, Kang Kai wrote:
From: Kang Kaikai.k...@windriver.com
Migrate configurability from oe, try to shrink minimal image size
The switch is in local.conf.sample, uncomment the line
DISTRO_FEATURES_EGLIBC =
and write what options you want to enable.
If want to disable locale-code charsets or locales, you have to
uncomment
PACKAGE_NO_GCONV = 1
Because without this, it fails on package_do_split_gconvs in
libc-package.bbclass
This should really be posted on the
openembedded-core@lists.openembedded.org alias so that all can see it.
I'll send it to oe-core right now.
Thanks.
Regards,
Kai
Signed-off-by: Kang Kaikai.k...@windriver.com
---
meta-yocto/conf/local.conf.sample | 17 ++
.../eglibc-2.13-fix-macro-RTLD_DEBUG.patch | 20 +++
meta/recipes-core/eglibc/eglibc-options.inc| 55
meta/recipes-core/eglibc/eglibc.inc|6 ++
meta/recipes-core/eglibc/eglibc_2.13.bb|4 +-
5 files changed, 101 insertions(+), 1 deletions(-)
create mode 100644
meta/recipes-core/eglibc/eglibc-2.13/eglibc-2.13-fix-macro-RTLD_DEBUG.patch
create mode 100644 meta/recipes-core/eglibc/eglibc-options.inc
diff --git a/meta-yocto/conf/local.conf.sample
b/meta-yocto/conf/local.conf.sample
index 359e510..310e51e 100644
--- a/meta-yocto/conf/local.conf.sample
+++ b/meta-yocto/conf/local.conf.sample
@@ -87,6 +87,23 @@ PACKAGE_CLASSES ?= package_rpm package_ipk
# NOTE: if listing mklibs prelink both, then make sure mklibs is
before prelink
USER_CLASSES ?= image-mklibs image-prelink
+# eglibc configurability is used to reduce minimal images's size.
+# PACKAGE_NO_GCONV should be set to 1, or locale-code posix-clang-wchar
+# charsets locales need to be include in DISTRO_FEATURES_EGLIBC,
please check
+# package_do_split_gconvs in libc-package.bbclass for detail
+#PACKAGE_NO_GCONV = 1
+
+# if you want to enable any option listed below, please uncomment
next line and copy it here
+#DISTRO_FEATURES_EGLIBC =
+
+DISTRO_FEATURES_EGLIBC ??= ipv6 backtrace big-macros bsd cxx-tests
catgets charsets \
+ crypt crypt-ufc db-aliases envz fcvt
fmtmsg fstab ftraverse \
+ getlogin idn inet inet-anl libm libm-big
locales locale-code \
+ memusage nis nsswitch rcmd rtld-debug
spawn streams sunrpc utmp \
+ utmpx wordexp posix-clang-wchar
posix-regexp posix-regexp-glibc \
+ posix-wchar-io
+
+
I have some concern with this change being in sample, are these
features enabled by default, is that the intention?
If someone already has a local.conf then this will not be used, I
think that the initial soft assignment (??=) needs to be someplace
else, like in eglibc.inc maybe
Sau!
# POKYMODE controls the characteristics of the generated
packages/images by
# telling poky which type of toolchain to use.
#
diff --git
a/meta/recipes-core/eglibc/eglibc-2.13/eglibc-2.13-fix-macro-RTLD_DEBUG.patch
b/meta/recipes-core/eglibc/eglibc-2.13/eglibc-2.13-fix-macro-RTLD_DEBUG.patch
new file mode 100644
index 000..dffc648
--- /dev/null
+++
b/meta/recipes-core/eglibc/eglibc-2.13/eglibc-2.13-fix-macro-RTLD_DEBUG.patch
@@ -0,0 +1,20 @@
+When disable OPTION_EGLIBC_RTLD_DEBUG, compilation fails.
+Created on Jun 1, 2011 by Kang Kaikai.k...@windriver.com
+
+Upstream-Status: Submitted
+
+Signed-off-by: Kang Kaikai.k...@windriver.com
+Index: libc/elf/dl-lookup.c
+===
+--- libc/elf/dl-lookup.c(revision 13356)
libc/elf/dl-lookup.c(working copy)
+@@ -423,7 +423,9 @@
+ hash table. */
+ if (__builtin_expect (tab-size, 0))
+ {
++ #if __OPTION_EGLIBC_RTLD_DEBUG
+ assert (GLRO(dl_debug_mask) DL_DEBUG_PRELINK);
++ #endif
+ __rtld_lock_unlock_recursive (tab-lock);
+ goto success;
+ }
diff --git a/meta/recipes-core/eglibc/eglibc-options.inc
b/meta/recipes-core/eglibc/eglibc-options.inc
new file mode 100644
index 000..7cd0287
--- /dev/null
+++ b/meta/recipes-core/eglibc/eglibc-options.inc
@@ -0,0 +1,55 @@
+def eglibc_cfg(feature, features, tokens, cnf):
+if type(tokens) == type():
+tokens = [tokens]
+if type(features) == type([]) and feature in features:
+cnf.extend([token + ' = y' for token in tokens])
+else:
+for token in tokens:
+cnf.extend([token + ' = n'])
+if token == 'OPTION_EGLIBC_NSSWITCH':
+cnf.extend([OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG =
${S}/nss/nsswitch.conf])
+cnf.extend([OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS
= ${S}/nss/fixed-nsswitch.functions])
+
+# Map distro features to eglibc options settings
+def features_to_eglibc_settings(d):
+cnf = ([])
+distro_features
Re: [OE-core] [oe-core][PATCH 1/1] create-pull-request: allow '+' in git PROTO_RE, ie for 'git+ssh://'
Hi Martin,
No objection if this is a valid URL. I didn't include this because 1) I
didn't know about it and 2) it isn't listed in the git pull man page,
which is what I developed to. Is git+ssh... equivalent to ssh:// ?
As a minor nit, please include a body message for anything more
complicated than whitespace or typographical fixes.
Thanks,
--
Darren
On 05/31/2011 08:48 AM, Martin Jansa wrote:
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
scripts/create-pull-request |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/scripts/create-pull-request b/scripts/create-pull-request
index 19b640f..d52098e 100755
--- a/scripts/create-pull-request
+++ b/scripts/create-pull-request
@@ -102,7 +102,7 @@ while getopts b:chi:m:o:p:r:s:u: OPT; do
case $REMOTE_URL in
*@*)
USER_RE=[A-Za-z0-9_.@][A-Za-z0-9_.@-]*\$\?
- PROTO_RE=[a-z][a-z]*://
+ PROTO_RE=[a-z][a-z+]*://
GIT_RE=\(^\($PROTO_RE\)\?$USER_RE@\)\([^:/]*\)[:/]\(.*\)
REMOTE_URL=${REMOTE_URL%.git}
REMOTE_REPO=$(echo $REMOTE_URL | sed s#$GIT_RE#\4#)
--
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] base.bbclass: add cleansstate task between clean and cleanall
On 06/02/2011 11:56 AM, Martin Jansa wrote:
* sometimes it's usefull to remove only sstate cache and keep downloaded
sources for rebuild
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta/classes/base.bbclass |7 +--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 8f4ef1e..6f0484e 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -408,10 +408,13 @@ def check_gcc3(data):
return False
-addtask cleanall after do_clean
-python do_cleanall() {
+addtask cleansstate after do_clean
+python do_cleansstate() {
sstate_clean_cachefiles(d)
+}
+addtask cleanall after do_cleansstate
+python do_cleanall() {
src_uri = (bb.data.getVar('SRC_URI', d, True) or ).split()
if len(src_uri) == 0:
return
I do this _a lot_ manually. This would take some of the guesswork and
lazy wildcard usage deleting more than is necessary. Is there any
documentation necessary to make it clear how this new clean directive
would be used? I know there is some resistance to adding additional
clean variants - some docs might help assuage that?
--
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
