Re: [OE-core] qemu segfaulting when booting ext3 image
Khem Raj wrote: On Wed, May 4, 2011 at 5:40 PM, Zhai, Edwin edwin.z...@intel.com wrote: Raj, We have a bug for Nvidia driver @ http://bugzilla.pokylinux.org/show_bug.cgi?id=649 and a fix @ http://git.pokylinux.org/cgit.cgi/poky-contrib/commit/?h=gzhai/fix2id=f596757000465a4b8350e16f21553a23b8bbedfa http://git.pokylinux.org/cgit.cgi/poky-contrib/commit/?h=gzhai/fix2id=f596757000465a4b8350e16f21553a23b8bbedfa I think it deserves a try. BTW, where is your gl library, including original one and Nvidia's? I doubt the layout may changes in ubuntu 11.04, so that our code failed to detect it. yes this helps indeed. Please propose this patch for oe-core's scripts/runqemu-internal After discussion, we found this patch only works for Ubuntu(Fedora installed Nvidia driver in different way), and there is no elegant fix for all distribution. So we decided that just give out useful info and let end user to do the right thing for their own distribution. Thanks -Khem ___ 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] [PATCH 02/26] Remove distro-specific metadata for distros not in oe-core
From: Paul Eggleton paul.eggle...@linux.intel.com
Signed-off-by: Paul Eggleton paul.eggle...@linux.intel.com
---
.../openswan/openswan_2.4.7.bb |3 +-
meta/recipes-connectivity/dhcp/dhcp3.inc |4 ---
meta/recipes-connectivity/dhcp/dhcp4.inc |4 ---
meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb |2 +-
meta/recipes-connectivity/ppp/ppp_2.4.5.bb |5 +---
meta/recipes-core/base-files/base-files_3.0.14.bb | 29
.../recipes-core/base-passwd/base-passwd_3.5.22.bb |7 +
meta/recipes-core/busybox/busybox.inc |3 --
meta/recipes-core/busybox/busybox_1.18.4.bb|2 +-
meta/recipes-core/dropbear/dropbear.inc|2 +-
meta/recipes-core/dropbear/dropbear_0.52.bb|2 +-
.../netbase/netbase-4.45/colinux/interfaces|8 -
.../recipes-core/netbase/netbase-4.45/openmn/hosts |2 -
.../netbase/netbase-4.45/openmn/interfaces | 10 ---
meta/recipes-core/netbase/netbase_4.45.bb |5 ---
.../recipes-core/udev/files/slugos/mount.blacklist |4 ---
meta/recipes-devtools/dpkg/dpkg.inc|1 -
meta/recipes-devtools/dpkg/dpkg_1.15.8.7.bb|2 +-
meta/recipes-devtools/perl/perl-native_5.12.3.bb |8 +-
.../update-modules-1.0/openmn/update-modules |3 --
.../update-modules/update-modules_1.0.bb | 11 +---
21 files changed, 10 insertions(+), 107 deletions(-)
delete mode 100644 meta/recipes-core/netbase/netbase-4.45/colinux/interfaces
delete mode 100644 meta/recipes-core/netbase/netbase-4.45/openmn/hosts
delete mode 100644 meta/recipes-core/netbase/netbase-4.45/openmn/interfaces
delete mode 100644 meta/recipes-core/udev/files/slugos/mount.blacklist
delete mode 100755
meta/recipes-kernel/update-modules/update-modules-1.0/openmn/update-modules
diff --git a/meta-demoapps/recipes-connectivity/openswan/openswan_2.4.7.bb
b/meta-demoapps/recipes-connectivity/openswan/openswan_2.4.7.bb
index d647f68..f783a85 100644
--- a/meta-demoapps/recipes-connectivity/openswan/openswan_2.4.7.bb
+++ b/meta-demoapps/recipes-connectivity/openswan/openswan_2.4.7.bb
@@ -6,8 +6,7 @@ HOMEPAGE = http://www.openswan.org;
LICENSE = GPLv2
DEPENDS = gmp flex-native
RRECOMMENDS_${PN} = kernel-module-ipsec
-RDEPENDS_${PN}_nylon = perl
-PR = r1
+PR = r2
SRC_URI = http://www.openswan.org/download/old/openswan-${PV}.tar.gz \
file://openswan-2.4.7-gentoo.patch;patch=1 \
diff --git a/meta/recipes-connectivity/dhcp/dhcp3.inc
b/meta/recipes-connectivity/dhcp/dhcp3.inc
index 3f68f45..6c7483e 100644
--- a/meta/recipes-connectivity/dhcp/dhcp3.inc
+++ b/meta/recipes-connectivity/dhcp/dhcp3.inc
@@ -47,7 +47,3 @@ FILES_dhcp-client = ${base_sbindir}/dhclient
${base_sbindir}/dhclient-script ${
RDEPENDS_dhcp-client = bash
FILES_dhcp-omshell = ${bindir}/omshell
-
-CONFFILES_dhcp-server_nylon = /etc/dhcp/dhcpd.conf
-CONFFILES_dhcp-relay_nylon = /etc/default/dhcp-relay
-CONFFILES_dhcp-client_nylon = /etc/dhcp/dhclient.conf
diff --git a/meta/recipes-connectivity/dhcp/dhcp4.inc
b/meta/recipes-connectivity/dhcp/dhcp4.inc
index e7cff3e..159ae89 100644
--- a/meta/recipes-connectivity/dhcp/dhcp4.inc
+++ b/meta/recipes-connectivity/dhcp/dhcp4.inc
@@ -60,7 +60,3 @@ FILES_dhcp-client = ${base_sbindir}/dhclient
${base_sbindir}/dhclient-script ${
RDEPENDS_dhcp-client = bash
FILES_dhcp-omshell = ${bindir}/omshell
-
-CONFFILES_dhcp-server_nylon = /etc/dhcp/dhcpd.conf
-CONFFILES_dhcp-relay_nylon = /etc/default/dhcp-relay
-CONFFILES_dhcp-client_nylon = /etc/dhcp/dhclient.conf
diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb
b/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb
index c273b2c..85f473d 100644
--- a/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb
+++ b/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb
@@ -1,6 +1,6 @@
require dhcp4.inc
-PR = r1
+PR = r2
SRC_URI += file://fixincludes.patch \
file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \
diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.5.bb
b/meta/recipes-connectivity/ppp/ppp_2.4.5.bb
index bbbcb32..785eab1 100644
--- a/meta/recipes-connectivity/ppp/ppp_2.4.5.bb
+++ b/meta/recipes-connectivity/ppp/ppp_2.4.5.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM =
file://pppd/ccp.c;beginline=1;endline=29;md5=e2c43fe6e81ff77
file://pppd/plugins/passprompt.c;beginline=1;endline=10;md5=3bcbcdbf0e369c9a3e0b8c8275b065d8
\
file://pppd/tdb.c;beginline=1;endline=27;md5=4ca3a9991b011038d085d6675ae7c4e6 \
file://chat/chat.c;beginline=1;endline=15;md5=0d374b8545ee5c62d7aff1acbd38add2
-PR = r0
+PR = r1
SRC_URI = http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \
file://makefile.patch \
@@ -29,8 +29,6 @@ SRC_URI = http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \
SRC_URI[md5sum] = 4621bc56167b6953ec4071043fe0ec57
SRC_URI[sha256sum] =
[OE-core] [PATCH 04/26] initscripts: remove -i from halt/reboot arguments and allow override
From: Paul Eggleton paul.eggle...@linux.intel.com
Introduces a variable HALTARGS which specifies the arguments sent to
halt and reboot, and sets the default value to -d -f, dropping the
previous -i (shut down all network interfaces before halt/reboot, which
causes a freeze with NFS root.)
Fixes [YOCTO #997].
Signed-off-by: Paul Eggleton paul.eggle...@linux.intel.com
---
meta/recipes-core/initscripts/initscripts-1.0/halt |2 +-
.../initscripts/initscripts-1.0/reboot |2 +-
meta/recipes-core/initscripts/initscripts_1.0.bb |9 -
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/halt
b/meta/recipes-core/initscripts/initscripts-1.0/halt
index 609b793..021d9be 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/halt
+++ b/meta/recipes-core/initscripts/initscripts-1.0/halt
@@ -24,6 +24,6 @@ then
hddown=
fi
-halt -d -f -i -p $hddown
+halt SED_HALTARGS -p $hddown
: exit 0
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/reboot
b/meta/recipes-core/initscripts/initscripts-1.0/reboot
index 4c55885..cf32e95 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/reboot
+++ b/meta/recipes-core/initscripts/initscripts-1.0/reboot
@@ -12,4 +12,4 @@
PATH=/sbin:/bin:/usr/sbin:/usr/bin
echo -n Rebooting...
-reboot -d -f -i
+reboot SED_HALTARGS
diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb
b/meta/recipes-core/initscripts/initscripts_1.0.bb
index d990925..720c252 100644
--- a/meta/recipes-core/initscripts/initscripts_1.0.bb
+++ b/meta/recipes-core/initscripts/initscripts_1.0.bb
@@ -6,7 +6,7 @@ DEPENDS = makedevs
RDEPENDS_${PN} = makedevs
LICENSE = GPLv2
LIC_FILES_CHKSUM = file://COPYING;md5=751419260aa954499f7abaabaa882bbe
-PR = r124
+PR = r125
SRC_URI = file://functions \
file://halt \
@@ -38,6 +38,13 @@ SRC_URI_append_arm = file://alignment.sh
KERNEL_VERSION =
+HALTARGS ?= -d -f
+
+do_configure() {
+ sed -i -e s:SED_HALTARGS:${HALTARGS}:g ${WORKDIR}/halt
+ sed -i -e s:SED_HALTARGS:${HALTARGS}:g ${WORKDIR}/reboot
+}
+
do_install () {
#
# Create directories and install device independent scripts
--
1.7.1.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 00/26] Consolidated Pull for 05-May-2011
From: Saul Wold s...@linux.intel.com Richard, This has some major updates for cleaning up machine and distro usage in oe-core, it also includes the SRC_REV removal. In addition, a updated set of kernel recipes and GCC4.6 fixes. There are also fixes that will be targeted for Bernard and general build and lsb fixes. Community Folks, if you are up for testing GCC 4.6, please take this opportinuty to check out what Khem as provide, if need please file bugs in bugzilla. This has been build for x86 and ARM (world builds, minus target qemu). Thanks Pull URL: git://git.openembedded.org/openembedded-core-contrib Branch: sgw/stage Browse: http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage Thanks, Saul Wold s...@linux.intel.com --- Bruce Ashfield (3): linux-yocto: apply meta data to external repos linux-yocto: safely process unbranched repositories linux-yocto: update SRCREVs Dexuan Cui (2): task-core-tools.bb: properly enable lttng-ust for ARM lttng-viewer: explicitly add linkage to lttvwindow Gary Thomas (1): setuptools: Make options for setup.py more flexible Kang Kai (2): foomatic-filters: added to pass LSB commands check ghostscript: added to pass LSB commands check Khem Raj (6): util-linux.inc: remove virtual/libintl from DEPENDS gcc-4.6.0: Add missing recipes for gcc-cross-canadian and gcc-crosssdk gcc-4.6.0: Backport FSF 4.6 branch patches eglibc-2.13: Add recipes for eglibc 2.13 gypsy_0.8.bb: Fix build with gcc 4.6 linux-yocto_git.bb: Backport upstream fix for gcc 4.6 compilation Paul Eggleton (5): Remove machine-specific metadata for machines no longer in oe-core Remove distro-specific metadata for distros not in oe-core initscripts: remove -i from halt/reboot arguments and allow override Remove machine-specific metadata for machines no longer in oe-core meta-yocto: add pieces removed from oe-core for beagleboard atom-pc Saul Wold (4): clutter-gst-1.4: Rebase patches and update checksum clutter-gtk-1.4: Rebase patches yaffs2: Update patch and checksums web: fix SRCREV Scott Garman (1): gnome-doc-utils: Add -nonet option to xsltproc Tom Zanussi (1): boot-directdisk: fix bzImage source location Yu Ke (1): yaffs2-utils_cvs: fix the SRCDATE typo .../openswan/openswan_2.4.7.bb |3 +- .../formfactor/formfactor}/atom-pc/machconfig |0 .../formfactor/formfactor}/beagleboard/machconfig |0 .../recipes-bsp/formfactor/formfactor_0.0.bbappend |3 + .../recipes-core/tasks/task-core-tools.bbappend|2 + .../uclibc/uclibc}/atom-pc/uClibc.machine |0 .../recipes-core/uclibc/uclibc_0.9.30.1.bbappend |3 + .../tasks/task-poky-sdk-gmae.bbappend |1 + .../task-poky-standalone-gmae-sdk-target.bbappend |1 + .../clutter/clutter-1.4_1.4.2.bbappend |4 + .../clutter/clutter-1.6_1.6.14.bbappend|4 + .../recipes-graphics/clutter/clutter_git.bbappend |4 + .../recipes-graphics/mesa/mesa-dri_7.10.2.bbappend |3 + .../recipes-graphics/mesa/mesa-dri_git.bbappend|3 + .../xserver-xf86-config/atom-pc/xorg.conf |0 .../xorg-xserver/xserver-xf86-config_0.1.bbappend |3 + .../recipes-qt/qt4/qt4-x11-free_4.6.3.bbappend |2 + .../recipes-qt/qt4/qt4-x11-free_4.7.2.bbappend |2 + meta/classes/boot-directdisk.bbclass |2 +- meta/classes/kernel-yocto.bbclass | 34 +- meta/classes/setuptools.bbclass|3 +- meta/recipes-bsp/formfactor/files/akita/machconfig | 15 - .../formfactor/files/bootcdx86/machconfig |5 - meta/recipes-bsp/formfactor/files/c7x0/machconfig | 15 - .../formfactor/files/cm-x270/machconfig|9 - .../formfactor/files/em-x270/machconfig| 15 - .../formfactor/files/htcuniversal/machconfig | 15 - .../formfactor/files/igep0020/machconfig |3 - .../formfactor/files/nokia800/machconfig | 13 - .../formfactor/files/om-gta01/machconfig | 14 - .../formfactor/files/omap-3430ldp/machconfig | 15 - .../formfactor/files/omap-3430sdp/machconfig | 15 - meta/recipes-bsp/formfactor/files/spitz/machconfig | 15 - .../formfactor/files/zylonite/machconfig | 12 - .../recipes-bsp/keymaps/files/akita/keymap-2.4.map | 128 - .../recipes-bsp/keymaps/files/akita/keymap-2.6.map | 228 - meta/recipes-bsp/keymaps/files/c7x0/keymap-2.6.map | 213 - .../keymaps/files/collie/keymap-2.4.map| 114 - .../keymaps/files/collie/keymap-2.6.map| 262 - .../recipes-bsp/keymaps/files/h2200/keymap-2.6.map | 17 - .../keymaps/files/htcuniversal/keymap-2.6.map | 20 - .../keymaps/files/jornada6xx/keymap-de.map | 597 - .../keymaps/files/jornada6xx/keymap-sp.map | 222 - .../keymaps/files/jornada6xx/keymap-uk.map | 278 -
[OE-core] [PATCH 08/26] gcc-4.6.0: Add missing recipes for gcc-cross-canadian and gcc-crosssdk
From: Khem Raj raj.k...@gmail.com
Reset PR in gcc-crosssdk-initial_4.6.0.bb and
gcc-crosssdk-intermediate_4.6.0.bb
Signed-off-by: Khem Raj raj.k...@gmail.com
---
.../gcc/gcc-cross-canadian_4.6.0.bb| 23
.../gcc/gcc-crosssdk-initial_4.6.0.bb |2 -
.../gcc/gcc-crosssdk-intermediate_4.6.0.bb |2 -
meta/recipes-devtools/gcc/gcc-crosssdk_4.6.0.bb|2 +
4 files changed, 25 insertions(+), 4 deletions(-)
create mode 100644 meta/recipes-devtools/gcc/gcc-cross-canadian_4.6.0.bb
create mode 100644 meta/recipes-devtools/gcc/gcc-crosssdk_4.6.0.bb
diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian_4.6.0.bb
b/meta/recipes-devtools/gcc/gcc-cross-canadian_4.6.0.bb
new file mode 100644
index 000..da3210f
--- /dev/null
+++ b/meta/recipes-devtools/gcc/gcc-cross-canadian_4.6.0.bb
@@ -0,0 +1,23 @@
+inherit cross-canadian
+
+require gcc-${PV}.inc
+require gcc-cross-canadian.inc
+require gcc-configure-sdk.inc
+require gcc-package-sdk.inc
+
+DEPENDS += gmp-nativesdk mpfr-nativesdk libmpc-nativesdk elfutils-nativesdk
+RDEPENDS_${PN} += mpfr-nativesdk libmpc-nativesdk elfutils-nativesdk
+
+SYSTEMHEADERS = /usr/include
+SYSTEMLIBS = /lib/
+SYSTEMLIBS1 = /usr/lib/
+
+EXTRA_OECONF += --disable-libunwind-exceptions --disable-libssp \
+ --disable-libgomp --disable-libmudflap \
+ --with-mpfr=${STAGING_DIR_HOST}${layout_exec_prefix} \
+ --with-mpc=${STAGING_DIR_HOST}${layout_exec_prefix}
+
+# to find libmpfr
+# export LD_LIBRARY_PATH = {STAGING_DIR_HOST}${layout_exec_prefix}
+
+PARALLEL_MAKE =
diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.6.0.bb
b/meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.6.0.bb
index 9708248..0c9fdd3 100644
--- a/meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.6.0.bb
+++ b/meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.6.0.bb
@@ -1,4 +1,2 @@
require gcc-cross-initial_${PV}.bb
require gcc-crosssdk-initial.inc
-
-PR = r4
diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk-intermediate_4.6.0.bb
b/meta/recipes-devtools/gcc/gcc-crosssdk-intermediate_4.6.0.bb
index d235969..1aa588a 100644
--- a/meta/recipes-devtools/gcc/gcc-crosssdk-intermediate_4.6.0.bb
+++ b/meta/recipes-devtools/gcc/gcc-crosssdk-intermediate_4.6.0.bb
@@ -1,4 +1,2 @@
require gcc-cross-intermediate_${PV}.bb
require gcc-crosssdk-intermediate.inc
-
-PR = r4
diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk_4.6.0.bb
b/meta/recipes-devtools/gcc/gcc-crosssdk_4.6.0.bb
new file mode 100644
index 000..7430888
--- /dev/null
+++ b/meta/recipes-devtools/gcc/gcc-crosssdk_4.6.0.bb
@@ -0,0 +1,2 @@
+require gcc-cross_${PV}.bb
+require gcc-crosssdk.inc
--
1.7.1.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 11/26] ghostscript: added to pass LSB commands check
From: Kang Kai kai.k...@windriver.com Add ghostscript to pass LSB commands check and Printing test, and ghostscript-native is added to help cross compilation. Signed-off-by: Kang Kai kai.k...@windriver.com --- .../ghostscript-9.02-prevent_recompiling.patch | 95 .../ghostscript/ghostscript_9.02.bb| 67 ++ 2 files changed, 162 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-prevent_recompiling.patch create mode 100644 meta/recipes-extended/ghostscript/ghostscript_9.02.bb diff --git a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-prevent_recompiling.patch b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-prevent_recompiling.patch new file mode 100644 index 000..def8596 --- /dev/null +++ b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-prevent_recompiling.patch @@ -0,0 +1,95 @@ +Just use commands provided by ghostscript-native, preventing recompile them when +compile ghostscript. +Way to enable cross compile. + +Upstream-status: Pending + +Signed-off-by: Kang Kai kai.k...@windriver.com + +--- a/base/unix-aux.mak.orig 2011-05-03 15:35:55.196887997 +0800 b/base/unix-aux.mak2011-05-03 15:37:57.766888003 +0800 +@@ -57,45 +57,45 @@ $(GLOBJ)gp_sysv.$(OBJ): $(GLSRC)gp_sysv. + + # -- Auxiliary programs --- # + +-$(ECHOGS_XE): $(GLSRC)echogs.c $(AK) $(stdpre_h) +- $(CCAUX) $(I_)$(GLSRCDIR)$(_I) $(O_)$(ECHOGS_XE) $(GLSRC)echogs.c +- +-# On the RS/6000 (at least), compiling genarch.c with gcc with -O +-# produces a buggy executable. +-$(GENARCH_XE): $(GLSRC)genarch.c $(AK) $(GENARCH_DEPS) +- $(CCAUX) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENARCH_XE) $(GLSRC)genarch.c +- +-$(GENCONF_XE): $(GLSRC)genconf.c $(AK) $(GENCONF_DEPS) +- $(CCAUX) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENCONF_XE) $(GLSRC)genconf.c +- +-$(GENDEV_XE): $(GLSRC)gendev.c $(AK) $(GENDEV_DEPS) +- $(CCAUX) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENDEV_XE) $(GLSRC)gendev.c +- +-$(GENHT_XE): $(GLSRC)genht.c $(AK) $(GENHT_DEPS) +- $(CCAUX) $(GENHT_CFLAGS) $(O_)$(GENHT_XE) $(GLSRC)genht.c +- +-# To get GS to use the system zlib, you remove/hide the gs/zlib directory +-# which means that the mkromfs build can't find the zlib source it needs. +-# So it's split into two targets, one using the zlib source directly. +-MKROMFS_OBJS_0=$(MKROMFS_ZLIB_OBJS) $(GLOBJ)gscdefs.$(OBJ) $(GLOBJ)gsmisc.$(OBJ) \ +- $(GLOBJ)gpmisc.$(OBJ) $(GLOBJ)gslibctx.$(OBJ) $(GLOBJ)gp_getnv.$(OBJ) \ +- $(GLOBJ)gp_unix.$(OBJ) $(GLOBJ)gp_unifs.$(OBJ) $(GLOBJ)gp_unifn.$(OBJ) \ +- $(GLOBJ)gp_stdia.$(OBJ) $(GLOBJ)gsutil.$(OBJ) +- +-$(MKROMFS_XE)_0: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_0) +- $(CCAUX) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_0 $(MKROMFS_OBJS_0) -lm $(EXTRALIBS) +- +-# and one using the zlib library linked via the command line +-MKROMFS_OBJS_1=$(GLOBJ)gscdefs.$(OBJ) $(GLOBJ)gsmisc.$(OBJ) \ +- $(GLOBJ)gpmisc.$(OBJ) $(GLOBJ)gslibctx.$(OBJ) $(GLOBJ)gp_getnv.$(OBJ) \ +- $(GLOBJ)gp_unix.$(OBJ) $(GLOBJ)gp_unifs.$(OBJ) $(GLOBJ)gp_unifn.$(OBJ) \ +- $(GLOBJ)gp_stdia.$(OBJ) $(GLOBJ)gsutil.$(OBJ) +- +-$(MKROMFS_XE)_1: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_1) +- $(CCAUX) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_1 $(MKROMFS_OBJS_1) -lm $(EXTRALIBS) +- +-$(MKROMFS_XE): $(MKROMFS_XE)_$(SHARE_ZLIB) +- $(CP_) $(MKROMFS_XE)_$(SHARE_ZLIB) $(MKROMFS_XE) ++#$(ECHOGS_XE): $(GLSRC)echogs.c $(AK) $(stdpre_h) ++# $(CCAUX) $(I_)$(GLSRCDIR)$(_I) $(O_)$(ECHOGS_XE) $(GLSRC)echogs.c ++# ++## On the RS/6000 (at least), compiling genarch.c with gcc with -O ++## produces a buggy executable. ++#$(GENARCH_XE): $(GLSRC)genarch.c $(AK) $(GENARCH_DEPS) ++# $(CCAUX) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENARCH_XE) $(GLSRC)genarch.c ++# ++#$(GENCONF_XE): $(GLSRC)genconf.c $(AK) $(GENCONF_DEPS) ++# $(CCAUX) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENCONF_XE) $(GLSRC)genconf.c ++# ++#$(GENDEV_XE): $(GLSRC)gendev.c $(AK) $(GENDEV_DEPS) ++# $(CCAUX) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENDEV_XE) $(GLSRC)gendev.c ++# ++#$(GENHT_XE): $(GLSRC)genht.c $(AK) $(GENHT_DEPS) ++# $(CCAUX) $(GENHT_CFLAGS) $(O_)$(GENHT_XE) $(GLSRC)genht.c ++# ++## To get GS to use the system zlib, you remove/hide the gs/zlib directory ++## which means that the mkromfs build can't find the zlib source it needs. ++## So it's split into two targets, one using the zlib source directly. ++#MKROMFS_OBJS_0=$(MKROMFS_ZLIB_OBJS) $(GLOBJ)gscdefs.$(OBJ) $(GLOBJ)gsmisc.$(OBJ) \ ++# $(GLOBJ)gpmisc.$(OBJ) $(GLOBJ)gslibctx.$(OBJ) $(GLOBJ)gp_getnv.$(OBJ) \ ++# $(GLOBJ)gp_unix.$(OBJ) $(GLOBJ)gp_unifs.$(OBJ) $(GLOBJ)gp_unifn.$(OBJ) \ ++# $(GLOBJ)gp_stdia.$(OBJ) $(GLOBJ)gsutil.$(OBJ) ++# ++#$(MKROMFS_XE)_0:
[OE-core] [PATCH 13/26] meta-yocto: add pieces removed from oe-core for beagleboard atom-pc
From: Paul Eggleton paul.eggle...@linux.intel.com
Signed-off-by: Paul Eggleton paul.eggle...@linux.intel.com
---
.../formfactor/formfactor/atom-pc/machconfig |6 ++
.../formfactor/formfactor/beagleboard/machconfig |3 +
.../recipes-bsp/formfactor/formfactor_0.0.bbappend |3 +
.../recipes-core/tasks/task-core-tools.bbappend|2 +
.../uclibc/uclibc/atom-pc/uClibc.machine | 69
.../recipes-core/uclibc/uclibc_0.9.30.1.bbappend |3 +
.../tasks/task-poky-sdk-gmae.bbappend |1 +
.../task-poky-standalone-gmae-sdk-target.bbappend |1 +
.../clutter/clutter-1.4_1.4.2.bbappend |4 +
.../clutter/clutter-1.6_1.6.14.bbappend|4 +
.../recipes-graphics/clutter/clutter_git.bbappend |4 +
.../recipes-graphics/mesa/mesa-dri_7.10.2.bbappend |3 +
.../recipes-graphics/mesa/mesa-dri_git.bbappend|3 +
.../xserver-xf86-config/atom-pc/xorg.conf | 26 +++
.../xorg-xserver/xserver-xf86-config_0.1.bbappend |3 +
.../recipes-qt/qt4/qt4-x11-free_4.6.3.bbappend |2 +
.../recipes-qt/qt4/qt4-x11-free_4.7.2.bbappend |2 +
17 files changed, 139 insertions(+), 0 deletions(-)
create mode 100644
meta-yocto/recipes-bsp/formfactor/formfactor/atom-pc/machconfig
create mode 100755
meta-yocto/recipes-bsp/formfactor/formfactor/beagleboard/machconfig
create mode 100644 meta-yocto/recipes-bsp/formfactor/formfactor_0.0.bbappend
create mode 100644 meta-yocto/recipes-core/tasks/task-core-tools.bbappend
create mode 100644 meta-yocto/recipes-core/uclibc/uclibc/atom-pc/uClibc.machine
create mode 100644 meta-yocto/recipes-core/uclibc/uclibc_0.9.30.1.bbappend
create mode 100644 meta-yocto/recipes-gnome/tasks/task-poky-sdk-gmae.bbappend
create mode 100644
meta-yocto/recipes-gnome/tasks/task-poky-standalone-gmae-sdk-target.bbappend
create mode 100644
meta-yocto/recipes-graphics/clutter/clutter-1.4_1.4.2.bbappend
create mode 100644
meta-yocto/recipes-graphics/clutter/clutter-1.6_1.6.14.bbappend
create mode 100644 meta-yocto/recipes-graphics/clutter/clutter_git.bbappend
create mode 100644 meta-yocto/recipes-graphics/mesa/mesa-dri_7.10.2.bbappend
create mode 100644 meta-yocto/recipes-graphics/mesa/mesa-dri_git.bbappend
create mode 100644
meta-yocto/recipes-graphics/xorg-xserver/xserver-xf86-config/atom-pc/xorg.conf
create mode 100644
meta-yocto/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
create mode 100644 meta-yocto/recipes-qt/qt4/qt4-x11-free_4.6.3.bbappend
create mode 100644 meta-yocto/recipes-qt/qt4/qt4-x11-free_4.7.2.bbappend
diff --git a/meta-yocto/recipes-bsp/formfactor/formfactor/atom-pc/machconfig
b/meta-yocto/recipes-bsp/formfactor/formfactor/atom-pc/machconfig
new file mode 100644
index 000..bef4ce3
--- /dev/null
+++ b/meta-yocto/recipes-bsp/formfactor/formfactor/atom-pc/machconfig
@@ -0,0 +1,6 @@
+HAVE_TOUCHSCREEN=0
+HAVE_KEYBOARD=1
+
+DISPLAY_CAN_ROTATE=0
+DISPLAY_ORIENTATION=0
+DISPLAY_DPI=133
diff --git
a/meta-yocto/recipes-bsp/formfactor/formfactor/beagleboard/machconfig
b/meta-yocto/recipes-bsp/formfactor/formfactor/beagleboard/machconfig
new file mode 100755
index 000..a46859f
--- /dev/null
+++ b/meta-yocto/recipes-bsp/formfactor/formfactor/beagleboard/machconfig
@@ -0,0 +1,3 @@
+# Assume a USB mouse and touchscreen are connected
+HAVE_TOUCHSCREEN=0
+HAVE_KEYBOARD=1
diff --git a/meta-yocto/recipes-bsp/formfactor/formfactor_0.0.bbappend
b/meta-yocto/recipes-bsp/formfactor/formfactor_0.0.bbappend
new file mode 100644
index 000..4b8d0e6
--- /dev/null
+++ b/meta-yocto/recipes-bsp/formfactor/formfactor_0.0.bbappend
@@ -0,0 +1,3 @@
+THISDIR := ${@os.path.dirname(bb.data.getVar('FILE', d, True))}
+FILESPATH =. ${@base_set_filespath([${THISDIR}/${PN}], d)}:
+
diff --git a/meta-yocto/recipes-core/tasks/task-core-tools.bbappend
b/meta-yocto/recipes-core/tasks/task-core-tools.bbappend
new file mode 100644
index 000..ad9dcf4
--- /dev/null
+++ b/meta-yocto/recipes-core/tasks/task-core-tools.bbappend
@@ -0,0 +1,2 @@
+RDEPENDS_task-core-tools-profile_append_atom-pc = lttng-ust systemtap
+
diff --git a/meta-yocto/recipes-core/uclibc/uclibc/atom-pc/uClibc.machine
b/meta-yocto/recipes-core/uclibc/uclibc/atom-pc/uClibc.machine
new file mode 100644
index 000..5df15f9
--- /dev/null
+++ b/meta-yocto/recipes-core/uclibc/uclibc/atom-pc/uClibc.machine
@@ -0,0 +1,69 @@
+#
+# Automatically generated make config: don't edit
+# Fri Nov 23 15:49:33 2007
+#
+# TARGET_alpha is not set
+# TARGET_arm is not set
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+TARGET_i386=y
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not
[OE-core] [PATCH 14/26] clutter-gst-1.4: Rebase patches and update checksum
From: Saul Wold s...@linux.intel.com
Signed-off-by: Saul Wold s...@linux.intel.com
---
.../clutter/clutter-gst-1.4/enable_tests.patch | 15 +++
.../clutter/clutter-gst-1.4_git.bb |4 ++--
2 files changed, 17 insertions(+), 2 deletions(-)
create mode 100644
meta/recipes-graphics/clutter/clutter-gst-1.4/enable_tests.patch
diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.4/enable_tests.patch
b/meta/recipes-graphics/clutter/clutter-gst-1.4/enable_tests.patch
new file mode 100644
index 000..f1f68ac
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-gst-1.4/enable_tests.patch
@@ -0,0 +1,15 @@
+Install example binary needed for core-image-clutter
+
+Signed-off-by: Zhai Edwin edwin.z...@intel.com
+Index: git/examples/Makefile.am
+===
+--- git.orig/examples/Makefile.am 2011-05-04 14:07:21.0 -0700
git/examples/Makefile.am 2011-05-04 14:24:38.625984314 -0700
+@@ -1,6 +1,6 @@
+ NULL = #
+
+-noinst_PROGRAMS = video-player video-sink audio-player
++bin_PROGRAMS = video-player video-sink audio-player
+
+ INCLUDES = -I$(top_srcdir) \
+ $(MAINTAINER_CFLAGS) \
diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.4_git.bb
b/meta/recipes-graphics/clutter/clutter-gst-1.4_git.bb
index 94d6885..1ab867d 100644
--- a/meta/recipes-graphics/clutter/clutter-gst-1.4_git.bb
+++ b/meta/recipes-graphics/clutter/clutter-gst-1.4_git.bb
@@ -4,12 +4,12 @@ SRCREV = 8a087fabc888a6a4a939760c392109dbb610adbf
PV = 1.3.4+git${SRCPV}
LIC_FILES_CHKSUM = file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \
-
file://clutter-gst/clutter-gst.h;beginline=1;endline=24;md5=95baacba194e814c110ea3bdf25ddbf4
+
file://clutter-gst/clutter-gst.h;beginline=1;endline=24;md5=3275ae5179d58dccf8852cdad3a44574
DEPENDS += clutter-1.4
SRC_URI =
git://git.clutter-project.org/clutter-gst.git;protocol=git;branch=master \
- file://enable_tests.patch
+ file://enable_tests-1.4.patch
S = ${WORKDIR}/git
--
1.7.1.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 12/26] Remove machine-specific metadata for machines no longer in oe-core
From: Paul Eggleton paul.eggle...@linux.intel.com
Signed-off-by: Paul Eggleton paul.eggle...@linux.intel.com
---
meta/recipes-core/base-files/base-files_3.0.14.bb | 19 +++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb
b/meta/recipes-core/base-files/base-files_3.0.14.bb
index 4445081..c80faaa 100644
--- a/meta/recipes-core/base-files/base-files_3.0.14.bb
+++ b/meta/recipes-core/base-files/base-files_3.0.14.bb
@@ -131,6 +131,25 @@ do_install_basefilesissue () {
fi
}
+ HEAD
+===
+do_install_append_nylon() {
+ printf ${D}${sysconfdir}/resolv.conf
+ rm -r ${D}/mnt/*
+ rm -r ${D}/media
+ rm -rf ${D}/tmp
+ ln -sf /var/tmp ${D}/tmp
+}
+
+do_install_append_slugos() {
+ printf ${D}${sysconfdir}/resolv.conf
+ rm -r ${D}/mnt/*
+ rmdir ${D}/home/root
+ install -m 0755 -d ${D}/root
+ ln -s ../root ${D}/home/root
+}
+
+ d67f12d... Remove machine-specific metadata for machines no longer in
oe-core
do_install_append_linuxstdbase() {
for d in ${dirs3755}; do
install -m 0755 -d ${D}$d
--
1.7.1.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 16/26] yaffs2: Update patch and checksums
From: Saul Wold s...@linux.intel.com
Signed-off-by: Saul Wold s...@linux.intel.com
---
.../yaffs2/files/mkyaffs2image.patch | 116 ++--
meta/recipes-devtools/yaffs2/yaffs2-utils.inc |2 +-
2 files changed, 61 insertions(+), 57 deletions(-)
diff --git a/meta/recipes-devtools/yaffs2/files/mkyaffs2image.patch
b/meta/recipes-devtools/yaffs2/files/mkyaffs2image.patch
index 521f1ba..e55d58b 100644
--- a/meta/recipes-devtools/yaffs2/files/mkyaffs2image.patch
+++ b/meta/recipes-devtools/yaffs2/files/mkyaffs2image.patch
@@ -18,10 +18,11 @@
* And BTW, what was one supposed to do with that file that this horror
* occasionally managed to generate?
*/
-diff -urN yaffs2.orig/utils/mkyaffs2image.c yaffs2/utils/mkyaffs2image.c
yaffs2.orig/utils/mkyaffs2image.c 2005-12-12 16:34:58.0 -0800
-+++ yaffs2/utils/mkyaffs2image.c2006-02-10 16:56:13.0 -0800
-@@ -31,10 +47,10 @@
+Index: yaffs2/utils/mkyaffs2image.c
+===
+--- yaffs2.orig/utils/mkyaffs2image.c 2010-01-11 13:43:18.0 -0800
yaffs2/utils/mkyaffs2image.c 2011-05-04 14:50:42.045984700 -0700
+@@ -29,10 +29,10 @@
#include dirent.h
#include string.h
#include unistd.h
@@ -33,53 +34,55 @@ diff -urN yaffs2.orig/utils/mkyaffs2image.c
yaffs2/utils/mkyaffs2image.c
#include yaffs_packedtags2.h
unsigned yaffs_traceMask=0;
-@@ -43,9 +59,45 @@
+@@ -41,9 +41,47 @@
#define chunkSize 2048
#define spareSize 64
+#define PT2_BYTES 25
++
- const char * mkyaffsimage_c_version = $Id: mkyaffs2image.c,v 1.4 2007-02-14
01:09:06 wookey Exp $;
+ const char * mkyaffsimage_c_version = $Id: mkyaffs2image.c,v 1.5 2010-01-11
21:43:18 charles Exp $;
-+static intlayout_no;
++static int layout_no;
+
+static struct nand_oobinfo oob_layout[] = {
-+/* KSI:
-+ * Dummy raw layout - no ECC, all the bytes are free. Does NOT
-+ * really work, only used for compatibility with CVS YAFFS2 that
-+ * never ever worked with any stock MTD.
-+ */
-+{
-+ .useecc = MTD_NANDECC_AUTOPLACE,
-+ .eccbytes = 0,
-+ .eccpos = {},
-+ .oobfree = { {0, 64} }
-+},
-+/* KSI:
-+ * Regular MTD AUTOPLACED ECC for large page NAND devices, the
-+ * only one existing in stock MTD so far. It corresponds to layout# 1
-+ * in command line arguments. Any other layouts could be added to
-+ * the list when they made their way in kernel's MTD. The structure
-+ * is simply copied from kernel's drivers/mtd/nand/nand_base.c as-is.
-+ */
-+{
-+ .useecc = MTD_NANDECC_AUTOPLACE,
-+ .eccbytes = 24,
-+ .eccpos = {
-+ 40, 41, 42, 43, 44, 45, 46, 47,
-+ 48, 49, 50, 51, 52, 53, 54, 55,
-+ 56, 57, 58, 59, 60, 61, 62, 63},
-+ .oobfree = { {2, 38} }
-+},
-+/* End-of-list marker */
-+{
-+.useecc = -1,
-+}
++ /* KSI:
++ * Dummy raw layout - no ECC, all the bytes are free. Does NOT
++ * really work, only used for compatibility with CVS YAFFS2 that
++ * never ever worked with any stock MTD.
++ */
++ {
++ .useecc = MTD_NANDECC_AUTOPLACE,
++ .eccbytes = 0,
++ .eccpos = {},
++ .oobfree = { {0, 64} }
++ },
++ /* KSI:
++ * Regular MTD AUTOPLACED ECC for large page NAND devices, the
++ * only one existing in stock MTD so far. It corresponds to layout# 1
++ * in command line arguments. Any other layouts could be added to
++ * the list when they made their way in kernel's MTD. The structure
++ * is simply copied from kernel's drivers/mtd/nand/nand_base.c as-is.
++ */
++ {
++ .useecc = MTD_NANDECC_AUTOPLACE,
++ .eccbytes = 24,
++ .eccpos = {
++ 40, 41, 42, 43, 44, 45, 46, 47,
++ 48, 49, 50, 51, 52, 53, 54, 55,
++ 56, 57, 58, 59, 60, 61, 62, 63},
++ .oobfree = { {2, 38} }
++ },
++ /* End-of-list marker */
++ {
++ .useecc = -1,
++ }
+};
++
typedef struct
{
-@@ -59,7 +111,7 @@
+@@ -57,7 +95,7 @@
static int n_obj = 0;
static int obj_id = YAFFS_NOBJECT_BUCKETS + 1;
@@ -88,7 +91,7 @@ diff -urN yaffs2.orig/utils/mkyaffs2image.c
yaffs2/utils/mkyaffs2image.c
static int outFile;
-@@ -123,6 +175,11 @@
+@@ -121,6 +159,11 @@
return -1;
}
@@ -100,7 +103,7 @@ diff -urN yaffs2.orig/utils/mkyaffs2image.c
yaffs2/utils/mkyaffs2image.c
/* This little function converts a little endian tag to a big endian tag.
* NOTE: The tag is not usable after this other than calculating the CRC
* with.
-@@ -155,11 +212,56 @@
+@@ -153,11 +196,56 @@
[OE-core] [PATCH 18/26] gypsy_0.8.bb: Fix build with gcc 4.6
From: Khem Raj raj.k...@gmail.com
Signed-off-by: Khem Raj raj.k...@gmail.com
---
.../fix-unused-but-set-variable-warning.patch | 16
meta/recipes-connectivity/gypsy/gypsy_0.8.bb |7 ---
2 files changed, 20 insertions(+), 3 deletions(-)
create mode 100644
meta/recipes-connectivity/gypsy/files/fix-unused-but-set-variable-warning.patch
diff --git
a/meta/recipes-connectivity/gypsy/files/fix-unused-but-set-variable-warning.patch
b/meta/recipes-connectivity/gypsy/files/fix-unused-but-set-variable-warning.patch
new file mode 100644
index 000..d826970
--- /dev/null
+++
b/meta/recipes-connectivity/gypsy/files/fix-unused-but-set-variable-warning.patch
@@ -0,0 +1,16 @@
+Index: gypsy-0.8/gypsy/gypsy-time.c
+===
+--- gypsy-0.8.orig/gypsy/gypsy-time.c
gypsy-0.8/gypsy/gypsy-time.c
+@@ -156,10 +156,10 @@ get_property (GObject*object,
+ GParamSpec *pspec)
+ {
+ GypsyTimePrivate *priv;
+-
+ priv = GET_PRIVATE (object);
+ switch (prop_id) {
+ case PROP_PATH:
++ g_value_set_string (value, priv-object_path);
+ break;
+
+ default:
diff --git a/meta/recipes-connectivity/gypsy/gypsy_0.8.bb
b/meta/recipes-connectivity/gypsy/gypsy_0.8.bb
index ab7f6b0..f3d3fa7 100644
--- a/meta/recipes-connectivity/gypsy/gypsy_0.8.bb
+++ b/meta/recipes-connectivity/gypsy/gypsy_0.8.bb
@@ -13,9 +13,10 @@ LIC_FILES_CHKSUM =
file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
SECTION = x11
DEPENDS = glib-2.0 dbus bluez4 dbus-glib libxslt
-SRC_URI = http://gypsy.freedesktop.org/releases/gypsy-${PV}.tar.gz;
-
-PR = r0
+SRC_URI = http://gypsy.freedesktop.org/releases/gypsy-${PV}.tar.gz \
+ file://fix-unused-but-set-variable-warning.patch \
+
+PR = r1
inherit autotools pkgconfig
--
1.7.1.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 05/26] setuptools: Make options for setup.py more flexible
I NAK'ed this before, and will NAK it again.
See
http://lists.linuxtogo.org/pipermail/openembedded-core/2011-April/001265.html
Op 5 mei 2011, om 09:55 heeft Saul Wold het volgende geschreven:
From: Gary Thomas g...@mlbassoc.com
The setuptools class uses hard-wired options for 'setup.py' during
the install step. In particular, not all versions of setup.py
support the --single-version-externally-managed option. This
patch allows for a recipe to easily override these options, while
leaving the majority (important) setup options intact.
--
Gary Thomas | Consulting for the
MLB Associates |Embedded world
From 0afbe6b9477c207e37009c8ef5aa47b3438640a9 Mon Sep 17 00:00:00 2001
From: Gary Thomas g...@mlbassoc.com
Date: Wed, 13 Apr 2011 15:12:57 -0600
Subject: [PATCH] setuptools: Make options for setup.py more flexible
Signed-off-by: Gary Thomas g...@mlbassoc.com
Signed-off-by: Saul Wold s...@linux.intel.com
---
meta/classes/setuptools.bbclass |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/classes/setuptools.bbclass b/meta/classes/setuptools.bbclass
index ced9509..cf1c224 100644
--- a/meta/classes/setuptools.bbclass
+++ b/meta/classes/setuptools.bbclass
@@ -2,7 +2,8 @@ inherit distutils
DEPENDS += python-setuptools-native
+DISTUTILS_INSTALL_OPTS ?= --single-version-externally-managed
DISTUTILS_INSTALL_ARGS = --root=${D} \
---single-version-externally-managed \
+${DISTUTILS_INSTALL_OPTS} \
--prefix=${prefix} \
--install-data=${datadir}
--
1.7.1.1
___
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 05/26] setuptools: Make options for setup.py more flexible
On 05/05/2011 01:09 AM, Koen Kooi wrote:
I NAK'ed this before, and will NAK it again.
Sorry, this one slipped in with a load of others, I meant to delete it,
but it got missed.
RP, Please remove this one
Sau!
See
http://lists.linuxtogo.org/pipermail/openembedded-core/2011-April/001265.html
Op 5 mei 2011, om 09:55 heeft Saul Wold het volgende geschreven:
From: Gary Thomasg...@mlbassoc.com
The setuptools class uses hard-wired options for 'setup.py' during
the install step. In particular, not all versions of setup.py
support the --single-version-externally-managed option. This
patch allows for a recipe to easily override these options, while
leaving the majority (important) setup options intact.
--
Gary Thomas | Consulting for the
MLB Associates |Embedded world
From 0afbe6b9477c207e37009c8ef5aa47b3438640a9 Mon Sep 17 00:00:00 2001
From: Gary Thomasg...@mlbassoc.com
Date: Wed, 13 Apr 2011 15:12:57 -0600
Subject: [PATCH] setuptools: Make options for setup.py more flexible
Signed-off-by: Gary Thomasg...@mlbassoc.com
Signed-off-by: Saul Wolds...@linux.intel.com
---
meta/classes/setuptools.bbclass |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/classes/setuptools.bbclass b/meta/classes/setuptools.bbclass
index ced9509..cf1c224 100644
--- a/meta/classes/setuptools.bbclass
+++ b/meta/classes/setuptools.bbclass
@@ -2,7 +2,8 @@ inherit distutils
DEPENDS += python-setuptools-native
+DISTUTILS_INSTALL_OPTS ?= --single-version-externally-managed
DISTUTILS_INSTALL_ARGS = --root=${D} \
---single-version-externally-managed \
+${DISTUTILS_INSTALL_OPTS} \
--prefix=${prefix} \
--install-data=${datadir}
--
1.7.1.1
___
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 12/26] Remove machine-specific metadata for machines no longer in oe-core
On Thu, 2011-05-05 at 00:57 -0700, Saul Wold wrote:
From: Paul Eggleton paul.eggle...@linux.intel.com
Signed-off-by: Paul Eggleton paul.eggle...@linux.intel.com
---
meta/recipes-core/base-files/base-files_3.0.14.bb | 19 +++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb
b/meta/recipes-core/base-files/base-files_3.0.14.bb
index 4445081..c80faaa 100644
--- a/meta/recipes-core/base-files/base-files_3.0.14.bb
+++ b/meta/recipes-core/base-files/base-files_3.0.14.bb
@@ -131,6 +131,25 @@ do_install_basefilesissue () {
fi
}
+ HEAD
+===
+do_install_append_nylon() {
+ printf ${D}${sysconfdir}/resolv.conf
+ rm -r ${D}/mnt/*
+ rm -r ${D}/media
+ rm -rf ${D}/tmp
+ ln -sf /var/tmp ${D}/tmp
+}
+
+do_install_append_slugos() {
+ printf ${D}${sysconfdir}/resolv.conf
+ rm -r ${D}/mnt/*
+ rmdir ${D}/home/root
+ install -m 0755 -d ${D}/root
+ ln -s ../root ${D}/home/root
+}
+
+ d67f12d... Remove machine-specific metadata for machines no longer
in oe-core
do_install_append_linuxstdbase() {
for d in ${dirs3755}; do
install -m 0755 -d ${D}$d
Er, I didn't take 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 19/26] linux-yocto_git.bb: Backport upstream fix for gcc 4.6 compilation
On Thu, 2011-05-05 at 00:57 -0700, Saul Wold wrote: From: Khem Raj raj.k...@gmail.com Signed-off-by: Khem Raj raj.k...@gmail.com --- .../perf-tool-Fix-gcc-4.6.0-issues.patch | 266 meta/recipes-kernel/linux/linux-yocto_git.bb |4 +- 2 files changed, 269 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-kernel/linux/linux-yocto/perf-tool-Fix-gcc-4.6.0-issues.patch diff --git a/meta/recipes-kernel/linux/linux-yocto/perf-tool-Fix-gcc-4.6.0-issues.patch b/meta/recipes-kernel/linux/linux-yocto/perf-tool-Fix-gcc-4.6.0-issues.patch new file mode 100644 index 000..c3510ad --- /dev/null +++ b/meta/recipes-kernel/linux/linux-yocto/perf-tool-Fix-gcc-4.6.0-issues.patch @@ -0,0 +1,266 @@ +Backported to linux-yocto kernel git version + +Signed-off-by: Khem Raj raj.k...@gmail.com + + +From patchwork Tue Apr 19 20:09:19 2011 +Content-Type: text/plain; charset=utf-8 +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [70/70] perf tool: Fix gcc 4.6.0 issues +Date: Tue, 19 Apr 2011 20:09:19 - +From: Greg Kroah-Hartman gre...@suse.de +X-Patchwork-Id: 719212 +Message-Id: 20110419201050.665258...@clark.kroah.org +To: linux-ker...@vger.kernel.org, sta...@kernel.org +Cc: stable-rev...@kernel.org, torva...@linux-foundation.org, + a...@linux-foundation.org, a...@lxorguk.ukuu.org.uk, + Ingo Molnar mi...@redhat.com, Kyle McMartin k...@redhat.com, + Arnaldo Carvalho de Melo a...@redhat.com, Thomas Meyer tho...@m3y3r.de + +2.6.38-stable review patch. If anyone has any objections, please let us know. Bruce, can you confirm that with your SRCREV change, this patch isn't required as you've integrated it directly? I've not taken it for now... 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 00/26] Consolidated Pull for 05-May-2011
On Thu, 2011-05-05 at 00:55 -0700, Saul Wold wrote: This has some major updates for cleaning up machine and distro usage in oe-core, it also includes the SRC_REV removal. In addition, a updated set of kernel recipes and GCC4.6 fixes. There are also fixes that will be targeted for Bernard and general build and lsb fixes. Community Folks, if you are up for testing GCC 4.6, please take this opportinuty to check out what Khem as provide, if need please file bugs in bugzilla. This has been build for x86 and ARM (world builds, minus target qemu). I merged this with the exceptions I've replied to or where it was requested I skip the patch. The meta-yocto patch was only merged to poky. 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/1] poky-default-revisions: move SRCREV to every recipe
On Wed, 2011-05-04 at 11:39 -0400, Bruce Ashfield wrote: On Wed, May 4, 2011 at 10:05 AM, Yu Ke ke...@intel.com wrote: From: Yu Ke ke...@intel.com move the SRCREV from poky-default-revisions.inc to its corresponding recipe, in this case, those non poky distro can also use its SRCREV. Pull URL: git://git.pokylinux.org/poky-contrib.git Branch: kyu3/srcrev-recipe Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kyu3/srcrev-recipe Thanks, Yu Ke ke...@intel.com --- Yu Ke (1): poky-default-revisions: move the SRCREV to recipe file meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb |1 + .../recipes-graphics/clutter/table_git.bb |1 + meta-demoapps/recipes-graphics/clutter/tidy_git.bb |1 + snip meta/recipes-kernel/blktrace/blktrace_git.bb |2 + meta/recipes-kernel/dtc/dtc_git.inc|2 + .../kern-tools/kern-tools-native_git.bb|1 + .../linux-firmware/linux-firmware_git.bb |1 + .../linux-libc-headers-yocto_git.bb|1 + .../recipes-kernel/linux/linux-yocto-stable_git.bb | 12 ++ meta/recipes-kernel/linux/linux-yocto_git.bb | 14 ++\ Would it be possible to get direct cc on changes to the linux-yocto recipes ? I didn't expect this and it is causing me a bit of pain at the moment. A direct cc' would have helped, since I would have preferred to stage the change in with my other items. Sorry about that. Hopefully everyone agrees the end result is worth it though as we're rid of that central file finally :) 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 3/3] meta-yocto: add pieces removed from oe-core for beagleboard atom-pc
Op 5 mei 2011, om 13:38 heeft Richard Purdie het volgende geschreven: Hi Paul, Great work in doing this, thanks. I was just looking at it with a view to making machine support cleaner and I think there are still things we can likely to do help with this. As one example: On Wed, 2011-05-04 at 15:51 +0100, Paul Eggleton wrote: +++ b/meta-yocto/recipes-qt/qt4/qt4-x11-free_4.6.3.bbappend @@ -0,0 +1,2 @@ +QT_GLFLAGS_atom-pc = -opengl + diff --git a/meta-yocto/recipes-qt/qt4/qt4-x11-free_4.7.2.bbappend b/meta-yocto/recipes-qt/qt4/qt4-x11-free_4.7.2.bbappend new file mode 100644 index 000..076ade2 --- /dev/null +++ b/meta-yocto/recipes-qt/qt4/qt4-x11-free_4.7.2.bbappend @@ -0,0 +1,2 @@ +QT_GLFLAGS_atom-pc = -opengl could we set QT_GLFLAGS in the machine.conf file instead of using a bbappend? Putting such USEFLAGS in machines sounds like a bad idea. In this case enabling it globally and falling back to mesa sw rendering at runtime is a better idea. The GL flag only enables extra API and libs, so it's good to have. regards, Koen ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [poky] [PATCH 1/3] Remove machine-specific metadata for machines no longer in oe-core
On Wed, 2011-05-04 at 16:21 +0100, Paul Eggleton wrote:
On Wednesday 04 May 2011 16:07:17 Gary Thomas wrote:
Perhaps it makes sense to always package netbase in ${MACHINE_ARCH} since
it almost always will have machine specific data?
I'll let someone else comment on this, I don't have a hard opinion either way.
Since the exception machines are clearly listed I think its fine as it
stands at the moment. If we start getting lots of overrides there we can
rethink it though. Lets see how it goes...
Cheers,
Richard
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [poky] [PATCH 3/3] meta-yocto: add pieces removed from oe-core for beagleboard atom-pc
On Thu, 2011-05-05 at 13:46 +0200, Koen Kooi wrote: Op 5 mei 2011, om 13:38 heeft Richard Purdie het volgende geschreven: Hi Paul, Great work in doing this, thanks. I was just looking at it with a view to making machine support cleaner and I think there are still things we can likely to do help with this. As one example: On Wed, 2011-05-04 at 15:51 +0100, Paul Eggleton wrote: +++ b/meta-yocto/recipes-qt/qt4/qt4-x11-free_4.6.3.bbappend @@ -0,0 +1,2 @@ +QT_GLFLAGS_atom-pc = -opengl + diff --git a/meta-yocto/recipes-qt/qt4/qt4-x11-free_4.7.2.bbappend b/meta-yocto/recipes-qt/qt4/qt4-x11-free_4.7.2.bbappend new file mode 100644 index 000..076ade2 --- /dev/null +++ b/meta-yocto/recipes-qt/qt4/qt4-x11-free_4.7.2.bbappend @@ -0,0 +1,2 @@ +QT_GLFLAGS_atom-pc = -opengl could we set QT_GLFLAGS in the machine.conf file instead of using a bbappend? Putting such USEFLAGS in machines sounds like a bad idea. In this case enabling it globally and falling back to mesa sw rendering at runtime is a better idea. The GL flag only enables extra API and libs, so it's good to have. Agreed, longer term I think this is going to be the better way to handle this. In this day and age, defaulting to sw rendering is probably the sane thing to do. Equally, moving this from a .bbappend to the machine file is a bit cleaner too though :) Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [poky] [PATCH 3/3] meta-yocto: add pieces removed from oe-core for beagleboard atom-pc
Op 5 mei 2011, om 14:21 heeft Richard Purdie het volgende geschreven: On Thu, 2011-05-05 at 13:46 +0200, Koen Kooi wrote: Op 5 mei 2011, om 13:38 heeft Richard Purdie het volgende geschreven: Hi Paul, Great work in doing this, thanks. I was just looking at it with a view to making machine support cleaner and I think there are still things we can likely to do help with this. As one example: On Wed, 2011-05-04 at 15:51 +0100, Paul Eggleton wrote: +++ b/meta-yocto/recipes-qt/qt4/qt4-x11-free_4.6.3.bbappend @@ -0,0 +1,2 @@ +QT_GLFLAGS_atom-pc = -opengl + diff --git a/meta-yocto/recipes-qt/qt4/qt4-x11-free_4.7.2.bbappend b/meta-yocto/recipes-qt/qt4/qt4-x11-free_4.7.2.bbappend new file mode 100644 index 000..076ade2 --- /dev/null +++ b/meta-yocto/recipes-qt/qt4/qt4-x11-free_4.7.2.bbappend @@ -0,0 +1,2 @@ +QT_GLFLAGS_atom-pc = -opengl could we set QT_GLFLAGS in the machine.conf file instead of using a bbappend? Putting such USEFLAGS in machines sounds like a bad idea. In this case enabling it globally and falling back to mesa sw rendering at runtime is a better idea. The GL flag only enables extra API and libs, so it's good to have. Agreed, longer term I think this is going to be the better way to handle this. In this day and age, defaulting to sw rendering is probably the sane thing to do. Something like SOC_FAMILY would help here. Equally, moving this from a .bbappend to the machine file is a bit cleaner too though :) Is it? Do you really want the machine to know about all the knobs in all the different layers? The .bbappends clearly signals a change to the recipe, hiding it in the machine.conf will just confuse people. And when changing options you need to edit the machine and then use PR_INC in a different file. Using a bbappend limits that to a single file ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/1] poky-default-revisions: move SRCREV to every recipe
On Thu, May 5, 2011 at 7:31 AM, Richard Purdie richard.pur...@linuxfoundation.org wrote: On Wed, 2011-05-04 at 11:39 -0400, Bruce Ashfield wrote: On Wed, May 4, 2011 at 10:05 AM, Yu Ke ke...@intel.com wrote: From: Yu Ke ke...@intel.com move the SRCREV from poky-default-revisions.inc to its corresponding recipe, in this case, those non poky distro can also use its SRCREV. Pull URL: git://git.pokylinux.org/poky-contrib.git Branch: kyu3/srcrev-recipe Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kyu3/srcrev-recipe Thanks, Yu Ke ke...@intel.com --- Yu Ke (1): poky-default-revisions: move the SRCREV to recipe file meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb | 1 + .../recipes-graphics/clutter/table_git.bb | 1 + meta-demoapps/recipes-graphics/clutter/tidy_git.bb | 1 + snip meta/recipes-kernel/blktrace/blktrace_git.bb | 2 + meta/recipes-kernel/dtc/dtc_git.inc | 2 + .../kern-tools/kern-tools-native_git.bb | 1 + .../linux-firmware/linux-firmware_git.bb | 1 + .../linux-libc-headers-yocto_git.bb | 1 + .../recipes-kernel/linux/linux-yocto-stable_git.bb | 12 ++ meta/recipes-kernel/linux/linux-yocto_git.bb | 14 ++\ Would it be possible to get direct cc on changes to the linux-yocto recipes ? I didn't expect this and it is causing me a bit of pain at the moment. A direct cc' would have helped, since I would have preferred to stage the change in with my other items. Sorry about that. Hopefully everyone agrees the end result is worth it though as we're rid of that central file finally :) Indeed! My minor issue about how it got done shouldn't be taken as a criticism. This is great and something I was happy to use on my last update. :) Bruce Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core -- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 37/58] gnu-config-native: add dependency on perl-native
Richard Purdie wrote:
On Mon, 2011-04-18 at 13:43 +0800, Cui, Dexuan wrote:
Richard Purdie wrote:
On Fri, 2011-04-15 at 23:54 -0700, Saul Wold wrote:
@@ -3,12 +3,14 @@ DESCRIPTION = Tool that installs the GNU
config.guess / config.sub into a direc SECTION = devel LICENSE
= GPLv1+ LIC_FILES_CHKSUM =
file://config.guess;endline=39;md5=a089987af4a25cb0419d1c2fd6d495e3
-DEPENDS = + +DEPENDS_virtclass-native = perl-native +
INHIBIT_DEFAULT_DEPS = 1
I haven't taken this. Having looked at the shear number of horrible
perl-native issues, I'd like to take the same approach we took with
the toolchain staging and place perl into its own bin directory we
add to PATH when needed.
If a recipe does need perl-native but we fail to realize that, the
host's perl (e.g. /usr/bin/perl) will be used -- this will further
hinder us from realizing the recipe needs perl-native.
As to bug #968, the build failure happens because perl-native's
do_populate_sysroot has begun but hasn't finished. If perl-native
hasn't started to populate_sysroot, running gnu-configize won't fail
since host's perl will be used.
so I've 3 questions:
1) in poky how to exclude host's perl from PATH? need to write a
python function to filter out various possible host perl paths? e.g.,
~/bin/perl, /usr/local/bin/perl, /usr/bin/perl, /bin/perl,... too
many paths...
2) how to identify the recipes that need perl-native? I think we have
to identify them manually one by one? This is time comsuming?
3) Even if we solve the above 2 issues, we still need to add
perl-native into the recipes' (that need perl-native) DEPENDS,
correct?
I'm not sure my above understanding is ok. Please correct me if I'm
wrong.
What I'd like to do is have perl install into a bindir which isn't
part of our PATH by default. For anything which has DEPENDS =
perl-native, we add this directory to PATH. Anything that doesn't
have the DEPENDS doesn't see it. We can probably make this a
perlnative.bbclass or something which just contains
PATH_prepend = ${STAGING_BINDIR_NATIVE}/perl-native:
DEPENDS += perl-native
This should ensure that anything that really needs perl-native finds
it but we don't have *everything* depending on it unnecessarily.
Hi RP,
(Sorry for my delay for the task as I was working on other bugs...)
Recently I have been looking into it and I've made some commits (the
top 5 small commits) in
http://git.pokylinux.org/cgit/cgit.cgi/poky-contrib/log/?h=dcui/master_perl-native
BTW: the work is not done completely as some recipes don't build
with the changes. Please have a look anyway to see if I'm in the correct
direction.
However, I've got some difficulties and hope to get your help:
1) As you said, after we install perl-native into its own directory, any
recipe not depending on perl-native doesn't see
${STAGING_BINDIR_NATIVE}/perl-native/perl unnecessarily.
However, if we keep the current code, what's the bad consequence if the recipe
not depending on perl-native does see perl of perl-native? looks no?
2) In poky, I see many places hardcodedly use the system perl(i.e.,
/usr/bin/perl) explicitly or implicitly(e.g,
meta/recipes-devtools/gnu-config/gnu-config/gnu-configize.in contains
/usr/bin/perl; another example, in perl-5.12.3's source code,
Cross/generate_config_sh also contains #!/usr/bin/perl). Should we fix all of
them?
And what's the relationship between the system perl and perl-native? Since
perl-native is not less functional than the system perl, will we eliminate the
system perl as a prerequisite to bitbake in future?
3) In gnu-config_20080123.bb's do_install, I don't understand this lines: here
the != should be =?
if [ ${BUILD_ARCH} != ${TARGET_ARCH} ]; then
sed -i -e 's,/usr/bin/env,${bindir}/env,g' ${D}${bindir}/gnu-configize
fi
e.g. when building gnu-config-native for MACHINE qemux86 on a 32-bit host,
BUILD_ARCH=TARGET_ARCH=i686-linux and the sed isn't invoked; when building
gnu-config, the sed will be invoked, but bindir is just /usr/bin, so the
replacement operation actually does nothing.
And for gnu-config-native, I think we need do a
sed -i -e 's,/usr/bin/perl,${STAGING_BINDIR_NATIVE}/perl-native/perl,g'
${D}${bindir}/gnu-configize
Correct?
4) My last commit of the top 5 commits is a chaos... I'm trying to replace
every DEPENDS on perl-native with inherit perlnative.
I'm now stuck in fixing the build issues for libxml-parser-perl and
libxml-parser-perl-native.
I don't know how to fix get_perl_version and perl_get_libdirs in
cpan-base.bbclass -- for libxml-parser-perl-native, I have to manage to add a
/perl-native into STAGING_LIBDIR and libdir, but for libxml-parser-perl, I
can't change STAGING_LIBDIR and libdir. Can you please help me out?
Thanks!
-- Dexuan
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/4] Misc sync up changes
The following series brings in a few fixups I pushed to openembedded today. In short, in gcc/binutils we were referencing TARGET_SYS in places where we had told configure to mangle things based on TARGET_PREFIX and in the cases where they don't match, it wasn't working. I had also just run into some missing DEPENDS cases so they are included in this branch as well. Pull URL: git://git.openembedded.org/openembedded-core-contrib Branch: trini/misc-sync-up Browse: http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=trini/misc-sync-up Thanks, Tom Rini tom_r...@mentor.com --- Tom Rini (4): gcc-package-target: Switch to TARGET_PREFIX in symlinks binutils.inc: Switch to TARGET_PREFIX not TARGET_SYS sysstat.inc: Switch to inherit gettext bash.inc: Add bison-native to DEPENDS meta/recipes-devtools/binutils/binutils.inc | 10 +- meta/recipes-devtools/gcc/gcc-package-target.inc | 10 +- meta/recipes-extended/bash/bash.inc |2 +- meta/recipes-extended/sysstat/sysstat.inc|4 +--- meta/recipes-extended/sysstat/sysstat_9.1.5.bb |2 +- 5 files changed, 13 insertions(+), 15 deletions(-) ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/4] gcc-package-target: Switch to TARGET_PREFIX in symlinks
When TARGET_PREFIX and TARGET_SYS didn't match up, the symlinks we made
were invalid. TARGET_PREFIX is what we use when configuring so it's what we
should be using here.
This is 05143e9b5d0a42e32ee0dd3c7fde482ff8d63f63 from OE.
Signed-off-by: Tom Rini tom_r...@mentor.com
---
meta/recipes-devtools/gcc/gcc-package-target.inc | 10 +-
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-devtools/gcc/gcc-package-target.inc
b/meta/recipes-devtools/gcc/gcc-package-target.inc
index d61e96b..e7f1b80 100644
--- a/meta/recipes-devtools/gcc/gcc-package-target.inc
+++ b/meta/recipes-devtools/gcc/gcc-package-target.inc
@@ -91,13 +91,13 @@ do_install () {
find -name libiberty.h ${D}${exec_prefix}/lib | xargs rm -f
# Symlinks so we can use these trivially on the target
- ln -sf ${TARGET_SYS}-g77 g77 || true
- ln -sf ${TARGET_SYS}-gfortran gfortran || true
- ln -sf ${TARGET_SYS}-g++ g++
- ln -sf ${TARGET_SYS}-gcc gcc
+ ln -sf ${TARGET_PREFIX}g77 g77 || true
+ ln -sf ${TARGET_PREFIX}gfortran gfortran || true
+ ln -sf ${TARGET_PREFIX}g++ g++
+ ln -sf ${TARGET_PREFIX}gcc gcc
ln -sf g77 f77 || true
ln -sf gfortran f95 || true
ln -sf g++ c++
ln -sf gcc cc
- ln -sf ${bindir}/${TARGET_SYS}-cpp ${D}${bindir}/cpp
+ ln -sf ${bindir}/${TARGET_PREFIX}cpp ${D}${bindir}/cpp
}
--
1.7.0.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/4] sysstat.inc: Switch to inherit gettext
This needs to use both virtual/libnl as well as gettext-native in order
to build. So we switch to using inherit gettext.
This is 4a022cf3fe3e39aab478bfc13332d358ed80348c from OE where it was tested
with qemuarm+angstrom-2010.x+eglibc and qemuarm+minimal-uclibc.
Signed-off-by: Tom Rini tom_r...@mentor.com
---
meta/recipes-extended/sysstat/sysstat.inc |4 +---
meta/recipes-extended/sysstat/sysstat_9.1.5.bb |2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-extended/sysstat/sysstat.inc
b/meta/recipes-extended/sysstat/sysstat.inc
index aeb33cf..a4cad0e 100644
--- a/meta/recipes-extended/sysstat/sysstat.inc
+++ b/meta/recipes-extended/sysstat/sysstat.inc
@@ -4,12 +4,10 @@ HOMEPAGE = http://sebastien.godard.pagesperso-orange.fr/;
LICENSE = GPLv2+
SECTION = console/utils
-DEPENDS = virtual/libintl
-
SRC_URI = http://pagesperso-orange.fr/sebastien.godard/sysstat-${PV}.tar.gz \
file://99_sysstat
-inherit autotools
+inherit autotools gettext
do_install() {
autotools_do_install
diff --git a/meta/recipes-extended/sysstat/sysstat_9.1.5.bb
b/meta/recipes-extended/sysstat/sysstat_9.1.5.bb
index a9071b3..49ac988 100644
--- a/meta/recipes-extended/sysstat/sysstat_9.1.5.bb
+++ b/meta/recipes-extended/sysstat/sysstat_9.1.5.bb
@@ -2,7 +2,7 @@ require sysstat.inc
LIC_FILES_CHKSUM = file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b
-PR = r0
+PR = r1
--
1.7.0.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/4] bash.inc: Add bison-native to DEPENDS
This is f0652d96ff5c3b08b8e4c4972f7fb0296df6d898 from OE. Signed-off-by: Tom Rini tom_r...@mentor.com --- meta/recipes-extended/bash/bash.inc |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc index ecbd75d..e218304 100644 --- a/meta/recipes-extended/bash/bash.inc +++ b/meta/recipes-extended/bash/bash.inc @@ -5,7 +5,7 @@ SECTION = base/shell # GPLv2+ ( 4.0), GPLv3+ (= 4.0) LICENSE = GPLv3+ LIC_FILES_CHKSUM = file://COPYING;md5=d32239bcb673463ab874e80d47fae504 -DEPENDS = ncurses +DEPENDS = ncurses bison-native inherit autotools gettext -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 03/26] util-linux.inc: remove virtual/libintl from DEPENDS
On Thu, May 5, 2011 at 12:55 AM, Saul Wold s...@linux.intel.com wrote:
From: Khem Raj raj.k...@gmail.com
inherit gettext should do it.
Signed-off-by: Khem Raj raj.k...@gmail.com
---
meta/recipes-core/util-linux/util-linux.inc | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-core/util-linux/util-linux.inc
b/meta/recipes-core/util-linux/util-linux.inc
index 913bb1b..447e5b7 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -13,10 +13,10 @@ LIC_FILES_CHKSUM =
file://README.licensing;md5=1530e36fe1304d4535513de90a290df9
file://licenses/COPYING.UCB;md5=263860f8968d8bafa5392cab74285262 \
file://getopt/COPYING;md5=8ca43cbc842c2336e835926c2166c28b
-DEPENDS = zlib ncurses virtual/libintl
-DEPENDS_virtclass-native = zlib-native ncurses-native lzo-native
gettext-native
-
inherit autotools gettext
+DEPENDS = zlib ncurses
+DEPENDS_virtclass-native_append = lzo-native
+
This patch is not needed with the applied gettext changes
SRC_URI =
${KERNELORG_MIRROR}/linux/utils/util-linux-ng/v${MAJOR_VERSION}/util-linux-ng-${PV}.tar.bz2
\
file://MCONFIG \
--
1.7.1.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] gettext.bbclass, bitbake.conf: Append nls options to EXTRA_OECONF instead of +=
Some recipes do not defined EXTRA_OECONF in such cases += drops
the --enable|--disable-nls options. In another case where recipe
defines EXTRA_OECONF instead of adding/appending to it then
--enable|--disable-nls options are lost from EXTRA_OECONF
We define EXTRA_OECONF = in bitbake.conf so the variable exists
always.
We use _append instead of += so the option is added at very end
and not lost.
We only return empty gettext dependencies if its a target recipe
in case when USE_NLS is not set because the native/cross/nativesdk recipes still
need the gettext dependencies
Signed-off-by: Khem Raj raj.k...@gmail.com
---
meta/classes/gettext.bbclass |6 +++---
meta/conf/bitbake.conf |2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/classes/gettext.bbclass b/meta/classes/gettext.bbclass
index 6f79e5e..86b505b 100644
--- a/meta/classes/gettext.bbclass
+++ b/meta/classes/gettext.bbclass
@@ -1,7 +1,7 @@
def gettext_dependencies(d):
-if d.getVar('USE_NLS', True) == 'no':
+if d.getVar('USE_NLS', True) == 'no' and not oe.utils.inherits(d,
'native', 'nativesdk', 'cross'):
return
-if bb.data.getVar('INHIBIT_DEFAULT_DEPS', d, True) and not
oe.utils.inherits(d, 'cross-canadian'):
+if d.getVar('INHIBIT_DEFAULT_DEPS', True) and not oe.utils.inherits(d,
'cross-canadian'):
return
return d.getVar('DEPENDS_GETTEXT', False)
@@ -14,4 +14,4 @@ def gettext_oeconf(d):
DEPENDS_GETTEXT = virtual/gettext gettext-native
BASEDEPENDS =+ ${@gettext_dependencies(d)}
-EXTRA_OECONF += ${@gettext_oeconf(d)}
+EXTRA_OECONF_append = ${@gettext_oeconf(d)}
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index a2b36bd..4a1bfa1 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -395,7 +395,7 @@ export BUILD_NM = ${BUILD_PREFIX}nm
export MAKE = make
EXTRA_OEMAKE = -e MAKEFLAGS=
-
+EXTRA_OECONF =
export LC_ALL = C
##
--
1.7.4.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 36/52] gettext.bbclass: Use _append instead of =+
On Thu, May 5, 2011 at 2:41 AM, Richard Purdie
richard.pur...@linuxfoundation.org wrote:
On Wed, 2011-05-04 at 18:07 -0700, Khem Raj wrote:
a build from scratch revealed few more issues with this patch too.
1. We have to only remove gettext from dependencies if its a target
package for all other it still it needed otherwise all native and
cross tools start failing to build
e.g. binutils-cross this can be easily solved by a patch
iff --git a/meta/classes/gettext.bbclass b/meta/classes/gettext.bbclass
index 6f79e5e..cc39204 100644
--- a/meta/classes/gettext.bbclass
+++ b/meta/classes/gettext.bbclass
@@ -1,5 +1,5 @@
def gettext_dependencies(d):
- if d.getVar('USE_NLS', True) == 'no':
+ if d.getVar('USE_NLS', True) == 'no' and not oe.utils.inherits(d,
'native', 'nativesdk', 'cross')
return
if bb.data.getVar('INHIBIT_DEFAULT_DEPS', d, True) and not
oe.utils.inherits(d, 'cross-canadian')
return
This looks reasonable, its still much clearer what is happening and why
compared to the original version...
second problem is that EXTRA_OECONF when recipes override it instead
of += or appending etc.
then --enable|--disable-nls that we added via gettext_oeconf() is lost
as a result some packages complain about config.rpath
when USE_NLS is set to no the reason is their configure is missing the
argument --disable-nls this works ok
for eglibc based targets since default is to enable-nls if nothing is
specified but uclibc fails. As a testcase try to preprocess
utils-linux
recipe and check the contents of EXTRA_OECONF
I suspect we can fix this with:
-EXTRA_OECONF += ${@gettext_oeconf(d)}
+EXTRA_OECONF_append = ${@gettext_oeconf(d)}
?
yes something like that
somehow the patch I attached did not make it to ml
I have sent it separately now.
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 37/58] gnu-config-native: add dependency on perl-native
On Thu, 2011-05-05 at 22:18 +0800, Cui, Dexuan wrote:
(Sorry for my delay for the task as I was working on other bugs...)
Recently I have been looking into it and I've made some commits (the
top 5 small commits) in
http://git.pokylinux.org/cgit/cgit.cgi/poky-contrib/log/?h=dcui/master_perl-native
BTW: the work is not done completely as some recipes don't build
with the changes. Please have a look anyway to see if I'm in the correct
direction.
However, I've got some difficulties and hope to get your help:
1) As you said, after we install perl-native into its own directory,
any recipe not depending on perl-native doesn't see
${STAGING_BINDIR_NATIVE}/perl-native/perl unnecessarily.
However, if we keep the current code, what's the bad consequence if
the recipe not depending on perl-native does see perl of perl-native?
looks no?
We have an assumption that perl is already on the system we're building
on. Perl is a relatively stable language with defined compatibility and
interoperability. Most recipes are therefore fine using perl from the
build system directly and don't need perl-native. I think we defined a
special name for the build system perl (perl-native-runtime?). Better
names are welcome but we should ensure we use the right dependency in
the right places.
The time to use perl-native instead of perl-native-runtime is where any
perl module is being built, perl itself is being built or anything that
has an explicit dependency on the perl version present.
2) In poky, I see many places hardcodedly use the system
perl(i.e., /usr/bin/perl) explicitly or implicitly(e.g,
meta/recipes-devtools/gnu-config/gnu-config/gnu-configize.in
contains /usr/bin/perl; another example, in perl-5.12.3's source
code, Cross/generate_config_sh also contains #!/usr/bin/perl). Should
we fix all of them?
Most of these should be generated locations and I think this is fine
since most of these are perl-native-runtime uses and its fine to use
the build system perl.
And what's the relationship between the system perl and
perl-native? Since perl-native is not less functional than the system
perl, will we eliminate the system perl as a prerequisite to bitbake
in future?
No, I think you have this backwards. The intent is to have
perl-native-runtime denoting a requirement on the build system perl
and perl-native being a perl that exactly the same as the target perl
for cross purposes.
3) In gnu-config_20080123.bb's do_install, I don't understand this lines:
here the != should be =?
if [ ${BUILD_ARCH} != ${TARGET_ARCH} ]; then
sed -i -e 's,/usr/bin/env,${bindir}/env,g' ${D}${bindir}/gnu-configize
fi
This means it only applies for non-native packages. (native has
BUILD_ARCH=TARGET_ARCH). The path to env is ${bindir} and this assists
with things like the nativesdk packages where bindir != /usr/bin.
e.g. when building gnu-config-native for MACHINE qemux86 on a 32-bit
host, BUILD_ARCH=TARGET_ARCH=i686-linux and the sed isn't invoked;
when building gnu-config, the sed will be invoked, but bindir is
just /usr/bin, so the replacement operation actually does nothing.
You can define a system where exec_prefix is and bindir is hence
/bin when it wouldn't do nothing.
And for gnu-config-native, I think we need do a
sed -i -e 's,/usr/bin/perl,${STAGING_BINDIR_NATIVE}/perl-native/perl,g'
${D}${bindir}/gnu-configize
Correct?
No, the whole point is to stop it seeing perl-native. Only perl itself
and modules should be using perl-native.
4) My last commit of the top 5 commits is a chaos... I'm trying to
replace every DEPENDS on perl-native with inherit perlnative.
I'm now stuck in fixing the build issues for libxml-parser-perl and
libxml-parser-perl-native.
I don't know how to fix get_perl_version and perl_get_libdirs in
cpan-base.bbclass -- for libxml-parser-perl-native, I have to manage
to add a /perl-native into STAGING_LIBDIR and libdir, but for
libxml-parser-perl, I can't change STAGING_LIBDIR and libdir. Can you
please help me out?
I'd suggest splitting this into two steps:
a) Check through all perl-native references and correct the ones that
should be perl-native-runtime.
b) Replace all remaining perl-native references with the class
dependency.
In step a), gnu-config would have a dependency on perl-native-runtime so
wouldn't use the perlnative class.
Just for reference, using perl-native-runtime means that someone can
remove it from ASSUME_PROVIDED and provide a version of it themselves if
they so wish (using perl-native or otherwise).
I suspect you'll still have the libxml-parser-perl problem but lets take
this one step at a time! :)
Cheers,
Richard
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 06/10] subversion: update upstream status for patches
From: Nitin A Kamble nitin.a.kam...@intel.com Signed-off-by: Nitin A Kamble nitin.a.kam...@intel.com --- .../subversion/disable-revision-install.patch |2 ++ .../subversion/subversion/libtool2.patch |2 ++ .../subversion/subversion/neon-detection.patch |2 ++ 3 files changed, 6 insertions(+), 0 deletions(-) diff --git a/meta/recipes-devtools/subversion/subversion/disable-revision-install.patch b/meta/recipes-devtools/subversion/subversion/disable-revision-install.patch index ad716d0..ffe6330 100644 --- a/meta/recipes-devtools/subversion/subversion/disable-revision-install.patch +++ b/meta/recipes-devtools/subversion/subversion/disable-revision-install.patch @@ -1,3 +1,5 @@ +Upstream-Status=Inappropriate [embedded specific] + Index: subversion-1.6.15/Makefile.in === --- subversion-1.6.15.orig/Makefile.in 2010-11-17 06:47:23.0 -0800 diff --git a/meta/recipes-devtools/subversion/subversion/libtool2.patch b/meta/recipes-devtools/subversion/subversion/libtool2.patch index 08343b0..12872db 100644 --- a/meta/recipes-devtools/subversion/subversion/libtool2.patch +++ b/meta/recipes-devtools/subversion/subversion/libtool2.patch @@ -1,3 +1,5 @@ +Upstream-Status=Inappropriate [embedded specific] + Index: subversion-1.5.5/configure.ac === --- subversion-1.5.5.orig/configure.ac 2008-08-26 18:27:56.0 +0100 diff --git a/meta/recipes-devtools/subversion/subversion/neon-detection.patch b/meta/recipes-devtools/subversion/subversion/neon-detection.patch index eaf6de0..3d28fb2 100644 --- a/meta/recipes-devtools/subversion/subversion/neon-detection.patch +++ b/meta/recipes-devtools/subversion/subversion/neon-detection.patch @@ -1,3 +1,5 @@ +Upstream-Status=Inappropriate [embedded specific] + Index: subversion-1.6.13/build/ac-macros/neon.m4 === --- subversion-1.6.13.orig/build/ac-macros/neon.m4 -- 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 03/10] patch-2.6.1: update patch upstream status
From: Nitin A Kamble nitin.a.kam...@intel.com Signed-off-by: Nitin A Kamble nitin.a.kam...@intel.com --- .../patch/patch-2.6.1/global-reject-file.diff |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/meta/recipes-devtools/patch/patch-2.6.1/global-reject-file.diff b/meta/recipes-devtools/patch/patch-2.6.1/global-reject-file.diff index cd3a600..c88bc80 100644 --- a/meta/recipes-devtools/patch/patch-2.6.1/global-reject-file.diff +++ b/meta/recipes-devtools/patch/patch-2.6.1/global-reject-file.diff @@ -1,3 +1,5 @@ +Upstream-Status=Inappropriate [debian patch] + Index: patch-2.6.1/patch.man === --- patch-2.6.1.orig/patch.man -- 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 10/10] binutils: update upstream status of patches
From: Nitin A Kamble nitin.a.kam...@intel.com Signed-off-by: Nitin A Kamble nitin.a.kam...@intel.com --- .../binutils/binutils-2.21/110-arm-eabi-conf.patch |2 ++ .../binutils-2.21/binutils-2.19.1-ld-sysroot.patch |2 ++ .../binutils/binutils-2.21/binutils-poison.patch |2 ++ .../binutils-uclibc-100-uclibc-conf.patch |2 ++ 4 files changed, 8 insertions(+), 0 deletions(-) diff --git a/meta/recipes-devtools/binutils/binutils-2.21/110-arm-eabi-conf.patch b/meta/recipes-devtools/binutils/binutils-2.21/110-arm-eabi-conf.patch index eace3e9..e17be35 100644 --- a/meta/recipes-devtools/binutils/binutils-2.21/110-arm-eabi-conf.patch +++ b/meta/recipes-devtools/binutils/binutils-2.21/110-arm-eabi-conf.patch @@ -1,3 +1,5 @@ +Upstream-Status=Pending + --- /tmp/configure.ac 2008-06-22 14:14:59.0 +0200 +++ binutils-2.18.50.0.7/configure.ac 2008-06-22 14:15:30.0 +0200 @@ -561,7 +561,7 @@ diff --git a/meta/recipes-devtools/binutils/binutils-2.21/binutils-2.19.1-ld-sysroot.patch b/meta/recipes-devtools/binutils/binutils-2.21/binutils-2.19.1-ld-sysroot.patch index adcabb4..e6bea3c 100644 --- a/meta/recipes-devtools/binutils/binutils-2.21/binutils-2.19.1-ld-sysroot.patch +++ b/meta/recipes-devtools/binutils/binutils-2.21/binutils-2.19.1-ld-sysroot.patch @@ -1,3 +1,5 @@ +Upstream-Status=Pending + http://sourceware.org/bugzilla/show_bug.cgi?id=10340 Signed-off-by: Sven Rebhan odinsho...@googlemail.com diff --git a/meta/recipes-devtools/binutils/binutils-2.21/binutils-poison.patch b/meta/recipes-devtools/binutils/binutils-2.21/binutils-poison.patch index 1fe713a..6d8fd42 100644 --- a/meta/recipes-devtools/binutils/binutils-2.21/binutils-poison.patch +++ b/meta/recipes-devtools/binutils/binutils-2.21/binutils-poison.patch @@ -1,3 +1,5 @@ +Upstream-Status=Inappropriate [distribution: codesourcery] + Patch originally created by Mark Hatle, forward-ported to binutils 2.21 by Scott Garman. diff --git a/meta/recipes-devtools/binutils/binutils-2.21/binutils-uclibc-100-uclibc-conf.patch b/meta/recipes-devtools/binutils/binutils-2.21/binutils-uclibc-100-uclibc-conf.patch index 8de04e0..64ed132 100644 --- a/meta/recipes-devtools/binutils/binutils-2.21/binutils-uclibc-100-uclibc-conf.patch +++ b/meta/recipes-devtools/binutils/binutils-2.21/binutils-uclibc-100-uclibc-conf.patch @@ -1,3 +1,5 @@ +Upstream-Status=Pending + --- binutils-2.18.orig/configure +++ binutils-2.18/configure @@ -2206,7 +2206,7 @@ -- 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 05/10] python-imaging: update upstream status for patches
From: Nitin A Kamble nitin.a.kam...@intel.com Signed-off-by: Nitin A Kamble nitin.a.kam...@intel.com --- .../python/python-imaging/path.patch |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/meta/recipes-devtools/python/python-imaging/path.patch b/meta/recipes-devtools/python/python-imaging/path.patch index 264dcc0..30bf692 100644 --- a/meta/recipes-devtools/python/python-imaging/path.patch +++ b/meta/recipes-devtools/python/python-imaging/path.patch @@ -1,3 +1,5 @@ +Upstream-Status=Inappropriate [embedded specific] + Index: Imaging-1.1.7/setup.py === --- Imaging-1.1.7.orig/setup.py -- 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 08/10] sat-solver: fix compilation issue with gcc 4.6.0
From: Nitin A Kamble nitin.a.kam...@intel.com Signed-off-by: Nitin A Kamble nitin.a.kam...@intel.com --- .../sat-solver/fix_gcc-4.6.0_compile_issue.patch | 115 meta/recipes-extended/sat-solver/sat-solver_git.bb |5 +- 2 files changed, 119 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-extended/sat-solver/sat-solver/fix_gcc-4.6.0_compile_issue.patch diff --git a/meta/recipes-extended/sat-solver/sat-solver/fix_gcc-4.6.0_compile_issue.patch b/meta/recipes-extended/sat-solver/sat-solver/fix_gcc-4.6.0_compile_issue.patch new file mode 100644 index 000..11c727d --- /dev/null +++ b/meta/recipes-extended/sat-solver/sat-solver/fix_gcc-4.6.0_compile_issue.patch @@ -0,0 +1,115 @@ +Upstream-Status=Pending + +Fix the following compilation issues with gcc 4.6.0 + +| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_updateinfoxml.c: In function 'startElement': +| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_updateinfoxml.c:278:25: error: variable 'status' set but not used [-Werror=unused-but-set-variable] +| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_updateinfoxml.c:386:36: error: variable 'src' set but not used [-Werror=unused-but-set-variable] +| cc1: all warnings being treated as errors +| +| make[2]: *** [ext/CMakeFiles/satsolverext.dir/repo_updateinfoxml.o] Error 1 +| make[2]: *** Waiting for unfinished jobs +| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/src/transaction.c: In function 'transaction_add_obsoleted': +| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/src/transaction.c:1933:21: error: variable 'oldcount' set but not used [-Werror=unused-but-set-variable] +| cc1: all warnings being treated as errors +| +| make[2]: *** [src/CMakeFiles/satsolver.dir/transaction.o] Error 1 +| make[2]: Leaving directory `/build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git' +| make[1]: *** [src/CMakeFiles/satsolver.dir/all] Error 2 +| make[1]: *** Waiting for unfinished jobs +| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_rpmdb.c: In function 'rpm_byfp': +| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_rpmdb.c:2406:20: error: variable 'headerend' set but not used [-Werror=unused-but-set-variable] +| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_rpmdb.c: In function 'parsekeydata': +| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_rpmdb.c:2833:29: error: variable 'scr' set but not used [-Werror=unused-but-set-variable] +| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_rpmdb.c:2669:7: error: variable 'useridl' set but not used [-Werror=unused-but-set-variable] +| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_rpmdb.c:2667:7: error: variable 'pubkeyl' set but not used [-Werror=unused-but-set-variable] +| cc1: all warnings being treated as errors +| +| make[2]: *** [ext/CMakeFiles/satsolverext.dir/repo_rpmdb.o] Error 1 +| make[2]: Leaving directory `/build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git' +| make[1]: *** [ext/CMakeFiles/satsolverext.dir/all] Error 2 +| make[1]: Leaving directory `/build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git' +| make: *** [all] Error 2 +| FATAL: oe_runmake failed +| ERROR: Function 'do_compile' failed (see /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/temp/log.do_compile.21830 for further information) +NOTE: package sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9: task do_compile: Failed + +Nitin A Kamble nitin.a.kam...@intel.com 2011/05/05 + +Index: git/src/transaction.c +=== +--- git.orig/src/transaction.c git/src/transaction.c +@@ -1930,7 +1930,7 @@
Re: [OE-core] [PATCH 07/10] linux-yocto_git.bb: Backport upstream fix for gcc 4.6 compilation
On Thu, May 5, 2011 at 11:36 PM, Nitin A Kamble
nitin.a.kam...@intel.com wrote:
From: Khem Raj raj.k...@gmail.com
This has already been merged into the kernel tree itself, so can
be dropped from this series.
Bruce
Signed-off-by: Khem Raj raj.k...@gmail.com
---
.../perf-tool-Fix-gcc-4.6.0-issues.patch | 266
meta/recipes-kernel/linux/linux-yocto_git.bb | 4 +-
2 files changed, 269 insertions(+), 1 deletions(-)
create mode 100644
meta/recipes-kernel/linux/linux-yocto/perf-tool-Fix-gcc-4.6.0-issues.patch
diff --git
a/meta/recipes-kernel/linux/linux-yocto/perf-tool-Fix-gcc-4.6.0-issues.patch
b/meta/recipes-kernel/linux/linux-yocto/perf-tool-Fix-gcc-4.6.0-issues.patch
new file mode 100644
index 000..c3510ad
--- /dev/null
+++
b/meta/recipes-kernel/linux/linux-yocto/perf-tool-Fix-gcc-4.6.0-issues.patch
@@ -0,0 +1,266 @@
+Backported to linux-yocto kernel git version
+
+Signed-off-by: Khem Raj raj.k...@gmail.com
+
+
+From patchwork Tue Apr 19 20:09:19 2011
+Content-Type: text/plain; charset=utf-8
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [70/70] perf tool: Fix gcc 4.6.0 issues
+Date: Tue, 19 Apr 2011 20:09:19 -
+From: Greg Kroah-Hartman gre...@suse.de
+X-Patchwork-Id: 719212
+Message-Id: 20110419201050.665258...@clark.kroah.org
+To: linux-ker...@vger.kernel.org, sta...@kernel.org
+Cc: stable-rev...@kernel.org, torva...@linux-foundation.org,
+ a...@linux-foundation.org, a...@lxorguk.ukuu.org.uk,
+ Ingo Molnar mi...@redhat.com, Kyle McMartin k...@redhat.com,
+ Arnaldo Carvalho de Melo a...@redhat.com, Thomas Meyer tho...@m3y3r.de
+
+2.6.38-stable review patch. If anyone has any objections, please let us
know.
+
+--
+
+From: Kyle McMartin k...@mcmartin.ca
+
+commit fb7d0b3cefb80a105f7fd26bbc62e0cbf9192822 upstream.
+
+GCC 4.6.0 in Fedora rawhide turned up some compile errors in tools/perf
+due to the -Werror=unused-but-set-variable flag.
+
+I've gone through and annotated some of the assignments that had side
+effects (ie: return value from a function) with the __used annotation,
+and in some cases, just removed unused code.
+
+In a few cases, we were assigning something useful, but not using it in
+later parts of the function.
+
+kyle@dreadnought:~/src% gcc --version
+gcc (GCC) 4.6.0 20110122 (Red Hat 4.6.0-0.3)
+
+Cc: Ingo Molnar mi...@redhat.com
+LKML-Reference: 20110124161304.gk27...@bombadil.infradead.org
+Signed-off-by: Kyle McMartin k...@redhat.com
+[ committer note: Fixed up the annotation fixes, as that code moved recently
]
+Signed-off-by: Arnaldo Carvalho de Melo a...@redhat.com
+[Backported to 2.6.38.2 by deleting unused but set variables]
+Signed-off-by: Thomas Meyer tho...@m3y3r.de
+Signed-off-by: Greg Kroah-Hartman gre...@suse.de
+
+---
+tools/perf/bench/sched-pipe.c | 2 +-
+ tools/perf/builtin-sched.c | 12 +++-
+ tools/perf/builtin-top.c | 5 +
+ tools/perf/util/header.c | 2 +-
+ tools/perf/util/hist.c | 3 ---
+ tools/perf/util/scripting-engines/trace-event-python.c | 3 +--
+ tools/perf/util/symbol.c | 4 ++--
+ tools/perf/util/trace-event-parse.c | 2 +-
+ tools/perf/util/ui/browsers/map.c | 2 +-
+ 9 files changed, 11 insertions(+), 24 deletions(-)
+
+
+
+--
+To unsubscribe from this list: send the line unsubscribe linux-kernel in
+the body of a message to majord...@vger.kernel.org
+More majordomo info at http://vger.kernel.org/majordomo-info.html
+Please read the FAQ at http://www.tux.org/lkml/
+
+Index: linux/tools/perf/bench/sched-pipe.c
+===
+--- linux.orig/tools/perf/bench/sched-pipe.c
linux/tools/perf/bench/sched-pipe.c
+@@ -55,7 +55,7 @@ int bench_sched_pipe(int argc, const cha
+ * discarding returned value of read(), write()
+ * causes error in building environment for perf
+ */
+- int ret, wait_stat;
++ int __used ret, wait_stat;
+ pid_t pid, retpid;
+
+ argc = parse_options(argc, argv, options,
+Index: linux/tools/perf/builtin-sched.c
+===
+--- linux.orig/tools/perf/builtin-sched.c
linux/tools/perf/builtin-sched.c
+@@ -369,11 +369,6 @@ static void
+ process_sched_event(struct task_desc *this_task __used, struct sched_atom
*atom)
+ {
+ int ret = 0;
+- u64 now;
+- long long delta;
+-
+- now = get_nsecs();
+- delta = start_time + atom-timestamp - now;
+
+ switch (atom-type) {
+ case SCHED_EVENT_RUN:
+@@ -561,7 +556,7 @@ static void wait_for_tasks(void)
+
+ static void run_one_test(void)
+ {
+- u64
[OE-core] [PATCH] conf/layer.conf: Use .= to append to BBPATH and += for BBFILES
This helps bitbake in organising BBPATH and BBFILES with given
BBFILE_PRIORITY order
Signed-off-by: Khem Raj raj.k...@gmail.com
---
meta/conf/layer.conf |5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
index 5287417..3f63c7d 100644
--- a/meta/conf/layer.conf
+++ b/meta/conf/layer.conf
@@ -1,9 +1,8 @@
BBPATH ?=
# We have a conf and classes directory, add to BBPATH
-BBPATH := ${BBPATH}:${LAYERDIR}
-
+BBPATH .= :${LAYERDIR}
# We have a packages directory, add to BBFILES
-BBFILES := ${BBFILES} ${LAYERDIR}/packages/*/*.bb
${LAYERDIR}/recipes-*/*/*.bb
+BBFILES += ${LAYERDIR}/packages/*/*.bb ${LAYERDIR}/recipes-*/*/*.bb
BBFILE_COLLECTIONS += normal
BBFILE_PATTERN_normal := ^${LAYERDIR}/
--
1.7.4.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
