[OE-core] [PATCH 27/30] fuse: drop since it is not used by other recipes
From: Otavio Salvador This is unused and a newer version will be made available in meta-oe in meanwhile. Signed-off-by: Otavio Salvador --- .../fuse-2.7.2/not-run-updaterc.d-on-host.patch| 15 - meta-demoapps/recipes-kernel/fuse/fuse.inc | 13 --- meta-demoapps/recipes-kernel/fuse/fuse_2.7.2.bb| 22 3 files changed, 0 insertions(+), 50 deletions(-) delete mode 100644 meta-demoapps/recipes-kernel/fuse/fuse-2.7.2/not-run-updaterc.d-on-host.patch delete mode 100644 meta-demoapps/recipes-kernel/fuse/fuse.inc delete mode 100644 meta-demoapps/recipes-kernel/fuse/fuse_2.7.2.bb diff --git a/meta-demoapps/recipes-kernel/fuse/fuse-2.7.2/not-run-updaterc.d-on-host.patch b/meta-demoapps/recipes-kernel/fuse/fuse-2.7.2/not-run-updaterc.d-on-host.patch deleted file mode 100644 index 903a8ba..000 --- a/meta-demoapps/recipes-kernel/fuse/fuse-2.7.2/not-run-updaterc.d-on-host.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: fuse-2.7.2/util/Makefile.am -=== fuse-2.7.2.orig/util/Makefile.am 2007-04-26 01:36:47.0 +0930 -+++ fuse-2.7.2/util/Makefile.am2008-02-10 16:43:19.0 +1030 -@@ -33,10 +33,6 @@ - $(INSTALL_PROGRAM) $(srcdir)/mount.fuse $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse - $(mkdir_p) $(DESTDIR)$(INIT_D_PATH) - $(INSTALL_PROGRAM) $(srcdir)/init_script $(DESTDIR)$(INIT_D_PATH)/fuse -- @if test -x /usr/sbin/update-rc.d; then \ -- echo "/usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 . || true"; \ -- /usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 . || true; \ -- fi - - install-data-local: - $(mkdir_p) $(DESTDIR)$(UDEV_RULES_PATH) diff --git a/meta-demoapps/recipes-kernel/fuse/fuse.inc b/meta-demoapps/recipes-kernel/fuse/fuse.inc deleted file mode 100644 index c6755ac..000 --- a/meta-demoapps/recipes-kernel/fuse/fuse.inc +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "With FUSE it is possible to implement a fully functional filesystem in a userspace program" -HOMEPAGE = "http://fuse.sf.net"; -LICENSE = "GPL" -DEPENDS = "virtual/fakeroot-native" -RRECOMMENDS_fuse = "${@base_contains("MACHINE_FEATURES","kernel26","kernel-module-fuse","fuse-module",d)}" - -SRC_URI = "${SOURCEFORGE_MIRROR}/fuse/fuse-${PV}.tar.gz" - -inherit autotools pkgconfig - -fakeroot do_install() { - oe_runmake install DESTDIR=${D} -} diff --git a/meta-demoapps/recipes-kernel/fuse/fuse_2.7.2.bb b/meta-demoapps/recipes-kernel/fuse/fuse_2.7.2.bb deleted file mode 100644 index d284a25..000 --- a/meta-demoapps/recipes-kernel/fuse/fuse_2.7.2.bb +++ /dev/null @@ -1,22 +0,0 @@ -require fuse.inc - -PR = "r0" - -SRC_URI += "file://not-run-updaterc.d-on-host.patch;patch=1" - -EXTRA_OECONF = " --disable-kernel-module" - -#package utils in a sperate package and stop debian.bbclass renaming it to libfuse-utils, we want it to be fuse-utils -PACKAGES =+ "fuse-utils-dbg fuse-utils libulockmgr libulockmgr-dev libulockmgr-dbg" -FILES_${PN} += "${libdir}/libfuse.so.*" -FILES_${PN}-dev += "${libdir}/libfuse*.la" - -FILES_libulockmgr = "${libdir}/libulockmgr.so.*" -FILES_libulockmgr-dev += "${libdir}/libulock*.la" -FILES_libulockmgr-dbg += "${libdir}/.debug/libulock*" - -FILES_fuse-utils = "${bindir} ${base_sbindir}" -FILES_fuse-utils-dbg = "${bindir}/.debug ${base_sbindir}/.debug" -DEBIAN_NOAUTONAME_fuse-utils = "1" -DEBIAN_NOAUTONAME_fuse-utils-dbg = "1" - -- 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 23/30] libxkbfile: disable xcb
From: Otavio Salvador Currently libx11 defaults to build without xcb backend and thus this needs to explicit depends on it or disable it. We opted to disable it since it is not critical for it to work. Signed-off-by: Otavio Salvador --- meta/recipes-graphics/xorg-lib/libxkbfile_1.0.7.bb |4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/meta/recipes-graphics/xorg-lib/libxkbfile_1.0.7.bb b/meta/recipes-graphics/xorg-lib/libxkbfile_1.0.7.bb index ff2f90f..44e2fa0 100644 --- a/meta/recipes-graphics/xorg-lib/libxkbfile_1.0.7.bb +++ b/meta/recipes-graphics/xorg-lib/libxkbfile_1.0.7.bb @@ -10,9 +10,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=aa32e1b87f1da02948ab7b55e129bf5f" DEPENDS += "virtual/libx11 kbproto" -PR = "r0" +PR = "r1" PE = "1" +EXTRA_OECONF += "--without-xcb" + BBCLASSEXTEND = "native" SRC_URI[md5sum] = "59b4fe0bdf8d9b05e45b59e8fe9e7516" -- 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 18/30] gtkhtml2: Update to 1161
From: Saul Wold Signed-off-by: Saul Wold --- meta/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb b/meta/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb index 1e4e012..d6af820 100644 --- a/meta/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb +++ b/meta/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb @@ -4,7 +4,7 @@ DESCRIPTION = "A GTK+ HTML rendering library." LICENSE = "LGPLv2" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605" -SRCREV = "1144" +SRCREV = "1161" PV = "2.11.0+svnr${SRCPV}" PR = "r1" -- 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 13/30] readline: update version
From: Adrian Alonso * Readline new recipe version 6.2 Signed-off-by: Adrian Alonso --- meta/recipes-core/readline/readline_6.2.bb |6 ++ 1 files changed, 6 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-core/readline/readline_6.2.bb diff --git a/meta/recipes-core/readline/readline_6.2.bb b/meta/recipes-core/readline/readline_6.2.bb new file mode 100644 index 000..5e32bb5 --- /dev/null +++ b/meta/recipes-core/readline/readline_6.2.bb @@ -0,0 +1,6 @@ +require readline.inc + +PR = "r0" + +SRC_URI[md5sum] = "67948acb2ca081f23359d0256e9a271c" +SRC_URI[sha256sum] = "79a696070a058c233c72dd6ac697021cc64abd5ed51e59db867d66d196a89381" -- 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 08/30] kernel-arch: add microblaze to valid archs
From: Adrian Alonso * Add Microblaze target to valid arch list definition Signed-off-by: Adrian Alonso --- meta/classes/kernel-arch.bbclass |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/meta/classes/kernel-arch.bbclass b/meta/classes/kernel-arch.bbclass index d6ae2e7..692d4fb 100644 --- a/meta/classes/kernel-arch.bbclass +++ b/meta/classes/kernel-arch.bbclass @@ -12,7 +12,8 @@ valid_archs = "alpha cris ia64 \ m32r mips \ sh sh64 um h8300 \ parisc s390 v850 \ - avr32 blackfin" + avr32 blackfin \ + microblaze" def map_kernel_arch(a, d): import re -- 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 28/30] oe/patch.py: Remove series file during Clean()
From: Khem Raj Currently if there is a failed do_patch the series files get appended so if there were two patches a.patch b.patch and b.patch failed during next run it would append a.patch again a.patch b.patch a.patch and this would keep growing. We can remove series file in Clean() because we populate it in Import() anyway Signed-off-by: Khem Raj Acked-by: Chris Larson Acked-by: Eric Bénard --- meta/lib/oe/patch.py |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py index 16d3d08..1406e19 100644 --- a/meta/lib/oe/patch.py +++ b/meta/lib/oe/patch.py @@ -198,6 +198,7 @@ class QuiltTree(PatchSet): def Clean(self): try: self._runcmd(["pop", "-a", "-f"]) +oe.path.remove(os.path.join(self.dir, "patches","series")) except Exception: pass self.initialized = True -- 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 03/30] conf/layer.conf: Use .= to append to BBPATH and =+ for BBFILES
From: Khem Raj Appending to BBPATH gives a definite order to BBLAYERS which means paths are preferred in order from left to right. [sgw: merged in comment] Signed-off-by: Khem Raj Signed-off-by: Saul Wold --- meta/conf/layer.conf | 10 +- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf index 3f63c7d..10a6948 100644 --- a/meta/conf/layer.conf +++ b/meta/conf/layer.conf @@ -2,7 +2,15 @@ BBPATH ?= "" # We have a conf and classes directory, add to BBPATH BBPATH .= ":${LAYERDIR}" # We have a packages directory, add to BBFILES -BBFILES += "${LAYERDIR}/packages/*/*.bb ${LAYERDIR}/recipes-*/*/*.bb" +# packages is still there because metadata_scm.bbclass still uses +# it to deduce the repo directory and thats the reason to prepend +# to BBFILES here because this class uses the first entry in +# BBFILES to calculate the scm base. +# since the order of BBFLILES is not that important its acted upon +# using BBFILES_PRIORITY we are ok to keep the oe-core BBFILES dir +# at top + +BBFILES =+ "${LAYERDIR}/packages/*/*.bb ${LAYERDIR}/recipes-*/*/*.bb" BBFILE_COLLECTIONS += "normal" BBFILE_PATTERN_normal := "^${LAYERDIR}/" -- 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 30/30] toolchain-qte: include cross-compiler and fix env script
From: Ilya Yanok This patch fixes the meta-toolchain-qte recipe: 1. cross-compiler added to the TOOLCHAIN_HOST_TASK. 2. Corrected paths in the environment script. 3. TOOLCHAIN_OUTPUTNAME used instead of SDK_SUFFIX. Signed-off-by: Ilya Yanok --- meta/recipes-qt/meta/meta-toolchain-qte.bb | 33 ++- 1 files changed, 17 insertions(+), 16 deletions(-) diff --git a/meta/recipes-qt/meta/meta-toolchain-qte.bb b/meta/recipes-qt/meta/meta-toolchain-qte.bb index da0dda7..72fa702 100644 --- a/meta/recipes-qt/meta/meta-toolchain-qte.bb +++ b/meta/recipes-qt/meta/meta-toolchain-qte.bb @@ -1,26 +1,27 @@ # Qt Embedded toolchain PR = "r5" -TOOLCHAIN_HOST_TASK = "task-qte-toolchain-host" +TOOLCHAIN_HOST_TASK = "task-qte-toolchain-host task-cross-canadian-${TRANSLATED_TARGET_ARCH}" TOOLCHAIN_TARGET_TASK = "task-qte-toolchain-target" +TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-qte-${DISTRO_VERSION}" require recipes-core/meta/meta-toolchain.bb -SDK_SUFFIX = "toolchain-qte" QT_DIR_NAME = "qtopia" +QT_TOOLS_PREFIX = "${SDKPATHNATIVE}${bindir_nativesdk}" toolchain_create_sdk_env_script_append() { -echo 'export OE_QMAKE_CC=${TARGET_SYS}-gcc' >> $script -echo 'export OE_QMAKE_CXX=${TARGET_SYS}-g++' >> $script -echo 'export OE_QMAKE_LINK=${TARGET_SYS}-g++' >> $script -echo 'export OE_QMAKE_AR=${TARGET_SYS}-ar' >> $script -echo 'export OE_QMAKE_LIBDIR_QT=${SDKPATH}/${TARGET_SYS}/${libdir}' >> $script -echo 'export OE_QMAKE_INCDIR_QT=${SDKPATH}/${TARGET_SYS}/${includedir}/${QT_DIR_NAME}' >> $script -echo 'export OE_QMAKE_MOC=${SDKPATH}/bin/moc4' >> $script -echo 'export OE_QMAKE_UIC=${SDKPATH}/bin/uic4' >> $script -echo 'export OE_QMAKE_UIC3=${SDKPATH}/bin/uic34' >> $script -echo 'export OE_QMAKE_RCC=${SDKPATH}/bin/rcc4' >> $script -echo 'export OE_QMAKE_QDBUSCPP2XML=${SDKPATH}/bin/qdbuscpp2xml4' >> $script -echo 'export OE_QMAKE_QDBUSXML2CPP=${SDKPATH}/bin/qdbusxml2cpp4' >> $script -echo 'export OE_QMAKE_QT_CONFIG=${SDKPATH}/${TARGET_SYS}/${datadir}/${QT_DIR_NAME}/mkspecs/qconfig.pri' >> $script -echo 'export QMAKESPEC=${SDKPATH}/${TARGET_SYS}/${datadir}/${QT_DIR_NAME}/mkspecs/linux-g++' >> $script +echo 'export OE_QMAKE_CC=${TARGET_PREFIX}gcc' >> $script +echo 'export OE_QMAKE_CXX=${TARGET_PREFIX}g++' >> $script +echo 'export OE_QMAKE_LINK=${TARGET_PREFIX}g++' >> $script +echo 'export OE_QMAKE_AR=${TARGET_PREFIX}ar' >> $script +echo 'export OE_QMAKE_LIBDIR_QT=${SDKTARGETSYSROOT}/${libdir}' >> $script +echo 'export OE_QMAKE_INCDIR_QT=${SDKTARGETSYSROOT}/${includedir}/${QT_DIR_NAME}' >> $script +echo 'export OE_QMAKE_MOC=${QT_TOOLS_PREFIX}/moc4' >> $script +echo 'export OE_QMAKE_UIC=${QT_TOOLS_PREFIX}/uic4' >> $script +echo 'export OE_QMAKE_UIC3=${QT_TOOLS_PREFIX}/uic34' >> $script +echo 'export OE_QMAKE_RCC=${QT_TOOLS_PREFIX}/rcc4' >> $script +echo 'export OE_QMAKE_QDBUSCPP2XML=${QT_TOOLS_PREFIX}/qdbuscpp2xml4' >> $script +echo 'export OE_QMAKE_QDBUSXML2CPP=${QT_TOOLS_PREFIX}/qdbusxml2cpp4' >> $script +echo 'export OE_QMAKE_QT_CONFIG=${SDKTARGETSYSROOT}/${datadir}/${QT_DIR_NAME}/mkspecs/qconfig.pri' >> $script +echo 'export QMAKESPEC=${SDKTARGETSYSROOT}/${datadir}/${QT_DIR_NAME}/mkspecs/linux-g++' >> $script } -- 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 19/30] linux-yocto: remove non-core (qemu) machine compatibility
From: Bruce Ashfield The machine configuration of the non-core (non-qemu) machines exists in other layers. Moving the branch mappings, compatibility and SRCREVs of these machines out of the main linux-yocto recipe is the first step in that move. Signed-off-by: Bruce Ashfield Acked-by: Darren Hart --- .../recipes-kernel/linux/linux-yocto-stable_git.bb | 10 +- meta/recipes-kernel/linux/linux-yocto_git.bb | 11 +-- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-stable_git.bb b/meta/recipes-kernel/linux/linux-yocto-stable_git.bb index 93b06fd..66991ae 100644 --- a/meta/recipes-kernel/linux/linux-yocto-stable_git.bb +++ b/meta/recipes-kernel/linux/linux-yocto-stable_git.bb @@ -7,10 +7,6 @@ KMACHINE_qemux86-64 = "common_pc_64" KMACHINE_qemuppc = "qemu_ppc32" KMACHINE_qemumips = "mti_malta32_be" KMACHINE_qemuarm = "arm_versatile_926ejs" -KMACHINE_atom-pc = "atom-pc" -KMACHINE_routerstationpro = "routerstationpro" -KMACHINE_mpc8315e-rdb = "fsl-mpc8315e-rdb" -KMACHINE_beagleboard = "beagleboard" LINUX_VERSION ?= "2.6.34" LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE_EXTENSION}" @@ -23,10 +19,6 @@ SRCREV_machine_qemumips = "c32d40f960e3c89d07f079bec4c96dcbfc749f0b" SRCREV_machine_qemuppc = "96d6bc31d3caaf62a966255479cc5cee0e76b1e9" SRCREV_machine_qemux86 = "72ca49ab08b8eb475cec82a10049503602325791" SRCREV_machine_qemux86-64 = "72ca49ab08b8eb475cec82a10049503602325791" -SRCREV_machine_atom-pc = "72ca49ab08b8eb475cec82a10049503602325791" -SRCREV_machine_routerstationpro = "49745cd45c92a89e70c6e2334caa80818c134562" -SRCREV_machine_mpc8315e-rdb = "a1c0ed6bf4060c10874b2a8547d81b3169dcf16a" -SRCREV_machine_beagleboard = "ef7f944e773950d4016b7643f9ecf052bbe250cd" SRCREV_machine = "72ca49ab08b8eb475cec82a10049503602325791" SRCREV_meta = "ec26387cb168e9e0976999b528b5a9dd62e3157a" @@ -34,7 +26,7 @@ PR = "r1" PV = "${LINUX_VERSION}+git${SRCPV}" SRCREV_FORMAT = "meta_machine" -COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64|atom-pc|routerstationpro|mpc8315e-rdb|beagleboard)" +COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64)" # this performs a fixup on historical kernel types with embedded _'s python __anonymous () { diff --git a/meta/recipes-kernel/linux/linux-yocto_git.bb b/meta/recipes-kernel/linux/linux-yocto_git.bb index 3b4e77e..d4f2ece 100644 --- a/meta/recipes-kernel/linux/linux-yocto_git.bb +++ b/meta/recipes-kernel/linux/linux-yocto_git.bb @@ -7,10 +7,6 @@ KMACHINE_qemux86-64 = "yocto/standard/common-pc-64/base" KMACHINE_qemuppc = "yocto/standard/qemu-ppc32" KMACHINE_qemumips = "yocto/standard/mti-malta32-be" KMACHINE_qemuarm = "yocto/standard/arm-versatile-926ejs" -KMACHINE_atom-pc = "yocto/standard/common-pc/atom-pc" -KMACHINE_routerstationpro = "yocto/standard/routerstationpro" -KMACHINE_mpc8315e-rdb = "yocto/standard/fsl-mpc8315e-rdb" -KMACHINE_beagleboard = "yocto/standard/beagleboard" KBRANCH = ${KMACHINE} KMETA = meta @@ -23,11 +19,6 @@ SRCREV_machine_qemumips = "f5d26f2eda2be8b942172cda8f27de33ebf38ec3" SRCREV_machine_qemuppc = "7eb6c68d977d9039a2b5a734172b064a9d19cdc1" SRCREV_machine_qemux86 = "ad62d1aab734513cd96c8f4517f816420a218e77" SRCREV_machine_qemux86-64 = "b906f358fd404a1e74a961f25079274e0d933ee1" -SRCREV_machine_emenlow = "c3bbcb676f929c4fc0511a6e66494b8770d015a1" -SRCREV_machine_atom-pc = "b906f358fd404a1e74a961f25079274e0d933ee1" -SRCREV_machine_routerstationpro = "95ca94d2e71ca2db6822a37a7f575fa79c3d05d0" -SRCREV_machine_mpc8315e-rdb = "53c800c244e73d81d2832f6da306eeae3b09e5dc" -SRCREV_machine_beagleboard = "b906f358fd404a1e74a961f25079274e0d933ee1" SRCREV_machine = "b906f358fd404a1e74a961f25079274e0d933ee1" SRCREV_meta = "ecab1e2bc12a8b0c4d064a00acc3260f6e8528c5" @@ -37,7 +28,7 @@ SRCREV_FORMAT = "meta_machine" SRC_URI = "git://git.yoctoproject.org/linux-yocto-2.6.37;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta" -COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64|mpc8315e-rdb|routerstationpro|beagleboard)" +COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64)" # Functionality flags KERNEL_REVISION_CHECKING ?= "t" -- 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 29/30] libxmu: Add native function
From: Xiaofeng Yan Add native function to libxmu_1.1.0.bb file because qt3 native depends on its native. Signed-off-by: Xiaofeng Yan --- meta/recipes-graphics/xorg-lib/libxmu_1.1.0.bb |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/meta/recipes-graphics/xorg-lib/libxmu_1.1.0.bb b/meta/recipes-graphics/xorg-lib/libxmu_1.1.0.bb index 59f2c28..4195306 100644 --- a/meta/recipes-graphics/xorg-lib/libxmu_1.1.0.bb +++ b/meta/recipes-graphics/xorg-lib/libxmu_1.1.0.bb @@ -28,5 +28,7 @@ PACKAGES =+ "libxmuu libxmuu-dev" FILES_libxmuu = "${libdir}/libXmuu.so.*" FILES_libxmuu-dev = "${libdir}/libXmuu.so" +BBCLASSEXTEND = "native" + SRC_URI[md5sum] = "6836883a0120e8346cf7f58dc42e465a" SRC_URI[sha256sum] = "0fa91f303b70decc1ef6201c88c8a5f0b4ecd68c6c88bdcc891ecd1a689d36ad" -- 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 22/30] busybox: add support to mdev
From: Otavio Salvador This changes the packaging only if the configuration used has mdev support enabled. Signed-off-by: Otavio Salvador --- meta/recipes-core/busybox/busybox.inc | 14 +- meta/recipes-core/busybox/busybox_1.18.4.bb |2 + meta/recipes-core/busybox/files/mdev|7 + meta/recipes-core/busybox/files/mdev.conf | 35 +++ 4 files changed, 56 insertions(+), 2 deletions(-) create mode 100755 meta/recipes-core/busybox/files/mdev create mode 100644 meta/recipes-core/busybox/files/mdev.conf diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index be13c8a..341c5c4 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -12,20 +12,24 @@ SECTION = "base" PRIORITY = "required" export EXTRA_CFLAGS = "${CFLAGS}" -PACKAGES =+ "${PN}-httpd ${PN}-udhcpd ${PN}-udhcpc ${PN}-syslog" +PACKAGES =+ "${PN}-httpd ${PN}-udhcpd ${PN}-udhcpc ${PN}-syslog ${PN}-mdev" FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www" FILES_${PN}-syslog = "${sysconfdir}/init.d/syslog* ${sysconfdir}/syslog.conf*" +FILES_${PN}-mdev = "${sysconfdir}/init.d/mdev ${sysconfdir}/mdev.conf" FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd" FILES_${PN}-udhcpc = "${sysconfdir}/udhcpc.d ${datadir}/udhcpc ${sysconfdir}/init.d/busybox-udhcpc" -INITSCRIPT_PACKAGES = "${PN}-httpd ${PN}-syslog ${PN}-udhcpd ${PN}-udhcpc" +INITSCRIPT_PACKAGES = "${PN}-httpd ${PN}-syslog ${PN}-udhcpd ${PN}-udhcpc ${PN}-mdev" INITSCRIPT_NAME_${PN}-httpd = "busybox-httpd" INITSCRIPT_NAME_${PN}-syslog = "syslog" +INITSCRIPT_NAME_${PN}-mdev = "mdev" +INITSCRIPT_PARAMS_${PN}-mdev = "start 06 S ." INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd" INITSCRIPT_NAME_${PN}-udhcpc = "busybox-udhcpc" CONFFILES_${PN}-syslog = "${sysconfdir}/syslog.conf.${PN}" +CONFFILES_${PN}-mdev = "${sysconfdir}/mdev.conf" RRECOMMENDS_${PN} = "${PN}-syslog ${PN}-udhcpc" @@ -100,6 +104,12 @@ do_install () { install -m 0755 ${WORKDIR}/default.script ${D}${datadir}/udhcpc/default.script install -m 0755 ${WORKDIR}/busybox-udhcpc ${D}${sysconfdir}/init.d/ fi + if grep "CONFIG_MDEV=y" ${WORKDIR}/defconfig; then + install -m 0755 ${WORKDIR}/mdev ${D}${sysconfdir}/init.d/mdev + if grep "CONFIG_FEATURE_MDEV_CONF=y" ${WORKDIR}/defconfig; then + install -m 644 ${WORKDIR}/mdev.conf ${D}${sysconfdir}/mdev.conf + fi + fi install -m 0644 ${S}/busybox.links ${D}${sysconfdir} diff --git a/meta/recipes-core/busybox/busybox_1.18.4.bb b/meta/recipes-core/busybox/busybox_1.18.4.bb index 5f5c2ae..cf37650 100644 --- a/meta/recipes-core/busybox/busybox_1.18.4.bb +++ b/meta/recipes-core/busybox/busybox_1.18.4.bb @@ -20,6 +20,8 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://mount.busybox \ file://syslog \ file://syslog.conf \ + file://mdev \ + file://mdev.conf \ file://umount.busybox \ file://defconfig" diff --git a/meta/recipes-core/busybox/files/mdev b/meta/recipes-core/busybox/files/mdev new file mode 100755 index 000..4eba619 --- /dev/null +++ b/meta/recipes-core/busybox/files/mdev @@ -0,0 +1,7 @@ +#!/bin/sh + +mount -t tmpfs tmpfs /dev -o size=64k,mode=0755 +mkdir /dev/pts /dev/shm +mount -t devpts devpts /dev/pts +echo "/sbin/mdev" > /proc/sys/kernel/hotplug +mdev -s diff --git a/meta/recipes-core/busybox/files/mdev.conf b/meta/recipes-core/busybox/files/mdev.conf new file mode 100644 index 000..0e1d6bc --- /dev/null +++ b/meta/recipes-core/busybox/files/mdev.conf @@ -0,0 +1,35 @@ +console 0:0 0600 +cpu_dma_latency 0:0 0660 +fb0:0 44 0660 +full 0:0 0666 +initctl 0:0 0600 +ircomm[0-9].* 0:20 0660 +kmem 0:15 0640 +kmsg 0:0 0660 +log 0:0 0666 +loop[0-9].* 0:6 0640 +mem 0:15 0640 +network_latency 0:0 0660 +network_throughput 0:0 0660 +null 0:0 0666 +port 0:15 0640 +ptmx 0:5 0666 +ram[0-9].* 0:6 0640 +random 0:0 0666 +sda 0:6 0640 +tty 0:5 0666 +tty.* 0:0 0620 +urandom 0:0 0666 +usbdev.* 0:0 0660 */etc/mdev/usb.sh +vcs.* 0:5 0660 +zero 0:0 0666 + +pcm.* 0:0 0660 =snd/ +control.* 0:0 0660 =snd/ +timer 0:0 0660 =snd/ + +event.* 0:0 0660 =input/ @/etc/mdev/find-touchscreen.sh +mice 0:0 0660 =input/ +mouse.* 0:0 0660 =input/ + +tun[0-9]* 0:0 0660 =net/ -- 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 25/30] cmake.bbclass: fix qmake and rpath issues
From: Otavio Salvador Sync with OE at 3b7d83362027fde4f6850533ab83277d95dda961 however without changing the way of generating the toolchain file and making it branding agnostic. Signed-off-by: Otavio Salvador --- meta/classes/cmake.bbclass | 19 +-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass index a4b0c12..ac7bd62 100644 --- a/meta/classes/cmake.bbclass +++ b/meta/classes/cmake.bbclass @@ -24,15 +24,23 @@ OECMAKE_CXX_FLAGS ?= "${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS} ${TARGET_CPPFLAGS} -f OECMAKE_C_FLAGS_RELEASE ?= "${SELECTED_OPTIMIZATION} -DNDEBUG" OECMAKE_CXX_FLAGS_RELEASE ?= "${SELECTED_OPTIMIZATION} -DNDEBUG" +OECMAKE_RPATH ?= "" +python __anonymous() { +# Only set OECMAKE_RPATH if we build a native recipe +if bb.data.inherits_class('native', d) and not bb.data.inherits_class('cross', d): +bb.data.setVar('OECMAKE_RPATH', '${libdir}', d) +} + cmake_do_generate_toolchain_file() { cat > ${WORKDIR}/toolchain.cmake
[OE-core] [PATCH 26/30] qmake_base.bbclass: add generate_qt_config_file task
From: Otavio Salvador This writes a qt.conf inside WORKDIR to properly configure projects based on CMake. This is required since qmake variables (returned by -query command) are fixed into the binary and can only be changed using a qt.conf file. Signed-off-by: Otavio Salvador --- meta/classes/qmake_base.bbclass | 15 +++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/meta/classes/qmake_base.bbclass b/meta/classes/qmake_base.bbclass index 24a0f11..37c44c7 100644 --- a/meta/classes/qmake_base.bbclass +++ b/meta/classes/qmake_base.bbclass @@ -31,6 +31,21 @@ oe_qmake_mkspecs () { done } +do_generate_qt_config_file() { + export QT_CONF_PATH=${WORKDIR}/qt.conf + bbwarn "${WORKDIR}/qt.conf" + cat > ${WORKDIR}/qt.conf
[OE-core] [PATCH 20/30] linux-yocto: error if meta data not present
From: Bruce Ashfield There are valid reasons to build repositories without meta data present and there are times when this is an error. This change adds sanity tests to the build process to detect missing meta data and throw an informative error message. Sanity checking is only triggered from recipes (linux-yocto) that always require meta data to be present. Other recipes are not impacted and can auto-generate meta data as required. Without this change the build process suceeds, but incorrect meta data will be used (with no user knowledge), which is not the desired behaviour. Signed-off-by: Bruce Ashfield --- meta/classes/kernel-yocto.bbclass |5 - .../kern-tools/kern-tools-native_git.bb|2 +- meta/recipes-kernel/linux/linux-yocto_git.bb |4 +++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index ffc0b4c..818a07e 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -13,7 +13,10 @@ do_patch() { fi # simply ensures that a branch of the right name has been created - createme ${ARCH} ${kbranch} ${defconfig} + if [ -n "${YOCTO_KERNEL_META_DATA}" ]; then + createme_flags="--disable-meta-gen" + fi + createme ${createme_flags} ${ARCH} ${kbranch} ${defconfig} if [ $? -ne 0 ]; then echo "ERROR. Could not create ${kbranch}" exit 1 diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index 820765e..c808e17 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=e2bf4415f3d8 DEPENDS = "git-native guilt-native" -SRCREV = "c5896a60acc61f8966cfee3bb241ff564610cea4" +SRCREV = "ab49d8e48b7e66d1b4f924385d65d062d25e44f7" PR = r10 PV = "0.1+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_git.bb b/meta/recipes-kernel/linux/linux-yocto_git.bb index d4f2ece..f54033d 100644 --- a/meta/recipes-kernel/linux/linux-yocto_git.bb +++ b/meta/recipes-kernel/linux/linux-yocto_git.bb @@ -22,7 +22,7 @@ SRCREV_machine_qemux86-64 = "b906f358fd404a1e74a961f25079274e0d933ee1" SRCREV_machine = "b906f358fd404a1e74a961f25079274e0d933ee1" SRCREV_meta = "ecab1e2bc12a8b0c4d064a00acc3260f6e8528c5" -PR = "r17" +PR = "r18" PV = "${LINUX_VERSION}+git${SRCPV}" SRCREV_FORMAT = "meta_machine" @@ -36,6 +36,8 @@ KERNEL_FEATURES="features/netfilter" KERNEL_FEATURES_append_qemux86=" cfg/sound" KERNEL_FEATURES_append_qemux86-64=" cfg/sound" +YOCTO_KERNEL_META_DATA=t + # extra tasks addtask kernel_link_vmlinux after do_compile before do_install addtask validate_branches before do_patch after do_kernel_checkout -- 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 17/30] web-sato: Update for svn -> git transtion
From: Saul Wold Signed-off-by: Saul Wold --- meta/recipes-sato/web/{web_svn.bb => web_git.bb} | 10 +- 1 files changed, 5 insertions(+), 5 deletions(-) rename meta/recipes-sato/web/{web_svn.bb => web_git.bb} (72%) diff --git a/meta/recipes-sato/web/web_svn.bb b/meta/recipes-sato/web/web_git.bb similarity index 72% rename from meta/recipes-sato/web/web_svn.bb rename to meta/recipes-sato/web/web_git.bb index 0cfe89f..612a02d 100644 --- a/meta/recipes-sato/web/web_svn.bb +++ b/meta/recipes-sato/web/web_git.bb @@ -2,18 +2,18 @@ LICENSE = "GPLv2" SECTION = "x11" DEPENDS = "libxml2 glib-2.0 gtk+ libglade gtkhtml2 curl gconf js libowl" DESCRIPTION = "Web is a multi-platform web browsing application." -PR = "r4" +PR = "r0" -SRCREV = "131" -PV = "0.0+svnr${SRCPV}" +SRCREV = "96da839f65e17ecc6d5261c1d74accd88423dd7a" +PV = "0.0+git${SRCPV}" -SRC_URI = "svn://svn.o-hand.com/repos/${BPN};module=trunk;proto=http \ +SRC_URI = "git://git.yoctoproject.org/web-sato;protocol=git \ file://owl-window-menu.patch \ " LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -S = "${WORKDIR}/trunk" +S = "${WORKDIR}/git" do_unpack_append () { bb.build.exec_func('do_remove_patches', 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 21/30] meta/conf/local.conf.sample: fix mklibs comment line split and typo
From: Otavio Salvador Signed-off-by: Otavio Salvador --- meta/conf/local.conf.sample |7 --- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/meta/conf/local.conf.sample b/meta/conf/local.conf.sample index cf7f33f..c33dc0e 100644 --- a/meta/conf/local.conf.sample +++ b/meta/conf/local.conf.sample @@ -53,9 +53,10 @@ EXTRA_IMAGE_FEATURES = "tools-debug tools-profile tools-testapps debug-tweaks" #PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk" PACKAGE_CLASSES ?= "package_ipk" -# mklibs library size optimization is more useful to smaller images, -# and less useful for bigger images. Also mklibs library optimization can break the ABI compatibility, so should not be applied to the images which are tobe -# extended or upgraded later. +# mklibs library size optimization is more useful to smaller images, +# and less useful for bigger images. Also mklibs library optimization +# can break the ABI compatibility, so should not be applied to the +# images which are to be extended or upgraded later. #This enabled mklibs library size optimization just for the specified image. #MKLIBS_OPTIMIZED_IMAGES ?= "core-image-minimal" #This enable mklibs library size optimization will be for all the images. -- 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/30] gnome-doc-utils: Add additional missing -nonet options to xsltproc
From: Scott Garman I missed some instances of xsltproc when adding -nonet in my previous commit. This should take care of them all to fix the compilation errors. Signed-off-by: Scott Garman --- .../gnome/gnome-doc-utils/xsltproc_nonet.patch | 70 +++- meta/recipes-gnome/gnome/gnome-doc-utils_0.20.5.bb |2 +- 2 files changed, 69 insertions(+), 3 deletions(-) diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils/xsltproc_nonet.patch b/meta/recipes-gnome/gnome/gnome-doc-utils/xsltproc_nonet.patch index 73d22bf..ad81c2f 100644 --- a/meta/recipes-gnome/gnome/gnome-doc-utils/xsltproc_nonet.patch +++ b/meta/recipes-gnome/gnome/gnome-doc-utils/xsltproc_nonet.patch @@ -1,5 +1,5 @@ This adds the -nonet option to xsltproc invocations, which fixes -compile errors when building gnome-doc-xslt-de.omf. +compile errors when building the gnome-doc-utils docs. Upstream-Status: Pending @@ -7,7 +7,7 @@ Signed-off-by: Scott Garman diff -urN gnome-doc-utils-0.20.5.orig//doc/xslt/Makefile.am gnome-doc-utils-0.20.5/doc/xslt/Makefile.am --- gnome-doc-utils-0.20.5.orig//doc/xslt/Makefile.am 2011-03-22 06:56:17.0 -0700 -+++ gnome-doc-utils-0.20.5/doc/xslt/Makefile.am2011-05-04 21:03:29.382491164 -0700 gnome-doc-utils-0.20.5/doc/xslt/Makefile.am2011-05-09 09:35:04.946138220 -0700 @@ -21,14 +21,14 @@ $(xsldoc_docs): $(xsldoc_xsls) xsldoc.awk xsldoc-fill.xsl @@ -25,6 +25,15 @@ diff -urN gnome-doc-utils-0.20.5.orig//doc/xslt/Makefile.am gnome-doc-utils-0.20 --stringparam basename "$(basename $(notdir $@))" \ --stringparam xsl_file "$(filter %/$(basename $(notdir $@)).xsl,$(xsldoc_xsls))" \ "$(srcdir)/xsldoc-docbook.xsl" "$<" +@@ -62,7 +62,7 @@ + gnome-doc-xslt-check-xsldoc: $(xsldoc_docs) + @echo "Running xsldoc checks"; + @(echo ""; cat $(xsldoc_docs); echo "") \ +- | xsltproc "$(srcdir)/xsldoc-check.xsl" - 1> /dev/null ++ | xsltproc -nonet "$(srcdir)/xsldoc-check.xsl" - 1> /dev/null + + .PHONY: clean-xsldoc + clean-local: clean_xsldoc @@ -75,4 +75,4 @@ DOC_MODULE = gnome-doc-xslt DOC_INCLUDES = legal.xml translating.xml $(patsubst %,%.xml,$(xsldoc_base)) @@ -32,3 +41,60 @@ diff -urN gnome-doc-utils-0.20.5.orig//doc/xslt/Makefile.am gnome-doc-utils-0.20 -DOC_LINGUAS = de \ No newline at end of file +DOC_LINGUAS = de +diff -urN gnome-doc-utils-0.20.5.orig//tools/gnome-doc-utils.make gnome-doc-utils-0.20.5/tools/gnome-doc-utils.make +--- gnome-doc-utils-0.20.5.orig//tools/gnome-doc-utils.make2011-03-22 06:56:17.0 -0700 gnome-doc-utils-0.20.5/tools/gnome-doc-utils.make 2011-05-09 09:34:03.278985782 -0700 +@@ -37,7 +37,7 @@ + list='$(DOC_H_DOCS)'; for doc in $$list; do \ + xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`"; \ + if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \ +-xsltproc --path "$$xmlpath" $(_credits) $$doc; \ ++xsltproc -nonet --path "$$xmlpath" $(_credits) $$doc; \ + done | sort | uniq \ + | awk 'BEGIN{s=""}{n=split($$0,w,"<");if(s!=""&&s!=substr(w[1],1,length(w[1])-1)){print s};if(n>1){print $$0;s=""}else{s=$$0}};END{if(s!=""){print s}}' \ + | sed -e 's/\\//' -e 's/"/\\"/' -e 's/\(.*\)/\t"\1",/' >> $@.tmp +@@ -50,7 +50,7 @@ + docid=`echo "$$doc" | sed -e 's/.*\/\([^/]*\)\.xml/\1/' \ + | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`; \ + echo $$xmlpath; \ +-ids=`xsltproc --xinclude --path "$$xmlpath" $(_ids) $$doc`; \ ++ids=`xsltproc -nonet --xinclude --path "$$xmlpath" $(_ids) $$doc`; \ + for id in $$ids; do \ + echo '#define HELP_'`echo $$docid`'_'`echo $$id \ + | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`' "'$$id'"' >> $@.tmp; \ +@@ -180,7 +180,7 @@ + echo "The file '$(_skcontentslist)' does not exist." >&2; \ + echo "Please check your ScrollKeeper installation." >&2; \ + exit 1; } +- xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } ++ xsltproc -nonet -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } + + ## @ _DOC_OMF_HTML + ## The OMF files for HTML output +@@ -195,7 +195,7 @@ + echo "Please check your ScrollKeeper installation." >&2; \ + exit 1; } + endif +- xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } ++ xsltproc -nonet -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } + + ## @ _DOC_OMF_ALL + ## All OMF output files to be built +@@ -250,7 +250,7 @@ + ## All HTML documentation in the C locale + # FIXME: probably have to shell escape to determine the file names + _DOC_C_HTML = $(foreach f,\ +- $(shell xsltproc --xinclude \ ++ $(shell xsltpro
[OE-core] [PATCH 24/30] insane.bbclass: skip license checksum if LICENSE is "CLOSED"
From: Otavio Salvador Signed-off-by: Otavio Salvador --- meta/classes/insane.bbclass |4 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index e9d4bfa..35809b9 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -348,8 +348,12 @@ def package_qa_check_license(workdir, d): sane = True lic_files = bb.data.getVar('LIC_FILES_CHKSUM', d, True) +lic = bb.data.getVar('LICENSE', d, True) pn = bb.data.getVar('PN', d, True) +if lic == "CLOSED": +return True + if not lic_files: # just throw a warning now. Once licensing data in entered for enough of the recipes, # this will be converted into error and False will be returned. -- 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 15/30] syslinux: improve packaging
From: Otavio Salvador Usually only parts of syslinux are used by products and thus syslinux can be greatly reduced in size. This changes does it as: - syslinux: syslinux binary - syslinux-extlinux: extlinux binary - syslinux-mbr: mbr.bin - syslinux-chain: chain.c32 - syslinux-pxelinux: pxelinux.0 - syslinux-isolinux: isolinux.bin Signed-off-by: Otavio Salvador --- meta/recipes-devtools/syslinux/syslinux_4.03.bb | 12 +++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/meta/recipes-devtools/syslinux/syslinux_4.03.bb b/meta/recipes-devtools/syslinux/syslinux_4.03.bb index 05bcb21..dc0785e 100644 --- a/meta/recipes-devtools/syslinux/syslinux_4.03.bb +++ b/meta/recipes-devtools/syslinux/syslinux_4.03.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ # If you really want to run syslinux, you need mtools. We just want the # ldlinux.* stuff for now, so skip mtools-native DEPENDS = "nasm-native" -PR = "r0" +PR = "r1" SRC_URI = "${KERNELORG_MIRROR}/linux/utils/boot/syslinux/syslinux-${PV}.tar.bz2 \ file://cross-build.patch" @@ -46,4 +46,14 @@ do_install() { install -m 644 ${S}/core/ldlinux.bss ${D}${libdir}/syslinux/ } +PACKAGES =+ "${PN}-extlinux ${PN}-mbr ${PN}-chain ${PN}-pxelinux ${PN}-isolinux" + +FILES_${PN} = "${bindir}/syslinux" +FILES_${PN}-extlinux = "${sbindir}/extlinux" +FILES_${PN}-mbr = "${libdir}/${PN}/mbr.bin" +FILES_${PN}-chain = "${libdir}/${PN}/chain.c32" +FILES_${PN}-isolinux = "${libdir}/${PN}/isolinux.bin" +FILES_${PN}-pxelinux = "${libdir}/${PN}/pxelinux.0" +FILES_${PN}-dev += "${datadir}/${PN}/com32" + BBCLASSEXTEND = "native" -- 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/30] package_rpm: use target vendor information
From: Adrian Alonso * Instead of hardcoding target vendor string "-poky" use TARGET_VENDOR information in case of using external toolchains Signed-off-by: Adrian Alonso --- meta/classes/package_rpm.bbclass |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index 70170d1..1cf9f79 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass @@ -761,13 +761,14 @@ python do_package_rpm () { # Setup the rpmbuild arguments... rpmbuild = bb.data.getVar('RPMBUILD', d, True) targetsys = bb.data.getVar('TARGET_SYS', d, True) + targetvendor = bb.data.getVar('TARGET_VENDOR', d, True) pkgwritedir = bb.data.expand('${PKGWRITEDIRRPM}/${PACKAGE_ARCH}', d) pkgarch = bb.data.expand('${PACKAGE_ARCH}', d) bb.mkdirhier(pkgwritedir) os.chmod(pkgwritedir, 0755) cmd = rpmbuild - cmd = cmd + " --nodeps --short-circuit --target " + pkgarch + "-poky-linux-gnu --buildroot " + pkgd + cmd = cmd + " --nodeps --short-circuit --target " + pkgarch + targetvendor + "-linux-gnu --buildroot " + pkgd cmd = cmd + " --define '_topdir " + workdir + "' --define '_rpmdir " + pkgwritedir + "'" cmd = cmd + " --define '_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm'" cmd = cmd + " --define '_use_internal_dependency_generator 0'" -- 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/30] image-mklibs: add microblaze arch support
From: Adrian Alonso * In function mklibs_optimize_image_doit * Add microblaze arch case for setting the dynamic_loader used by "mklibs" call Signed-off-by: Adrian Alonso --- meta/classes/image-mklibs.bbclass |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta/classes/image-mklibs.bbclass b/meta/classes/image-mklibs.bbclass index 0e72b01..9f5a4ea 100644 --- a/meta/classes/image-mklibs.bbclass +++ b/meta/classes/image-mklibs.bbclass @@ -16,7 +16,7 @@ mklibs_optimize_image_doit() { > ${WORKDIR}/mklibs/executables.list case ${TARGET_ARCH} in - powerpc | mips ) + powerpc | mips | microblaze ) dynamic_loader="/lib/ld.so.1" ;; x86_64) -- 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 14/30] scripts/oe-setup-builddir: fix typo
From: Otavio Salvador Signed-off-by: Otavio Salvador --- scripts/oe-setup-builddir |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir index 2f8a064..7fefc52 100755 --- a/scripts/oe-setup-builddir +++ b/scripts/oe-setup-builddir @@ -60,7 +60,7 @@ if [ "x" = "x$OECORELOCALCONF" ]; then fi if ! (test -r "$BUILDDIR/conf/local.conf"); then cat
[OE-core] [PATCH 07/30] insane: add micrblaze target info
From: Adrian Alonso * package_qa_get_machine_dict * Add microblaze dic entry for QA * Prebuilt toolchain triplet microblaze-unknown-linux-gnu- * TARGET_OS is linux-gnu for this toolchain Signed-off-by: Adrian Alonso --- meta/classes/insane.bbclass |4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 742be5e..e9d4bfa 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -85,7 +85,9 @@ def package_qa_get_machine_dict(): "linux-uclibcspe" : { "powerpc":(20, 0,0, False, 32), }, - +"linux-gnu" : { +"microblaze": (47787, 0,0, False, 32), + }, } -- 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 10/30] linux-libc-headers: add microblaze ARCH definition
From: Adrian Alonso * Add Microblaze ARCH definition * Bump PR Signed-off-by: Adrian Alonso --- .../linux-libc-headers_2.6.37.2.bb |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.37.2.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.37.2.bb index 888d9e4..51c4926 100644 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.37.2.bb +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.37.2.bb @@ -2,7 +2,7 @@ require linux-libc-headers.inc INHIBIT_DEFAULT_DEPS = "1" DEPENDS += "unifdef-native" -PR = "r0" +PR = "r1" SRC_URI += " file://connector-msg-size-fix.patch" @@ -26,6 +26,7 @@ set_arch() { x86_64*) ARCH=x86_64 ;; avr32*) ARCH=avr32 ;; bfin*)ARCH=blackfin ;; + microblaze*) ARCH=microblaze ;; esac } -- 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 06/30] lttng-ust_0.12.bb: Fix compilation on uclibc
From: Khem Raj We provide alternative implementation of sched_getcpu() when compiling for uclibc Signed-off-by: Khem Raj --- .../lttng/lttng-ust/uclibc-sched_getcpu.patch | 50 meta/recipes-kernel/lttng/lttng-ust_0.12.bb|4 +- 2 files changed, 53 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-kernel/lttng/lttng-ust/uclibc-sched_getcpu.patch diff --git a/meta/recipes-kernel/lttng/lttng-ust/uclibc-sched_getcpu.patch b/meta/recipes-kernel/lttng/lttng-ust/uclibc-sched_getcpu.patch new file mode 100644 index 000..7102a69 --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-ust/uclibc-sched_getcpu.patch @@ -0,0 +1,50 @@ +uClibc does not have sched_getcpu() implemented. So we create a wrapper +to getcpu syscall when compiling for uclibc. + +So far execinfo.h does not exist on uclibc but it turns out to be that +this header is not needed even in eglibc case so it can be removed + +Signed-off-by: Khem Raj + +Upstream-status: Pending + +Index: ust-0.12/libust/tracer.h +=== +--- ust-0.12.orig/libust/tracer.h ust-0.12/libust/tracer.h +@@ -342,14 +342,22 @@ static __inline__ void ltt_write_trace_h + header->start_freq = trace->start_freq; + header->freq_scale = trace->freq_scale; + } +- ++#ifdef __UCLIBC__ ++#define sched_getcpu(cpu, node, cache) syscall(__NR_getcpu, cpu, node, cache) ++#endif + #ifndef UST_VALGRIND + + static __inline__ int ust_get_cpu(void) + { + int cpu; + ++#ifdef __UCLIBC__ ++ int c, s; ++ s = syscall(__NR_getcpu, &c, NULL, NULL); ++ cpu = (s == -1) ? s : c; ++#else + cpu = sched_getcpu(); ++#endif + if (likely(cpu >= 0)) + return cpu; + /* +Index: ust-0.12/libustcomm/ustcomm.c +=== +--- ust-0.12.orig/libustcomm/ustcomm.c ust-0.12/libustcomm/ustcomm.c +@@ -31,7 +31,6 @@ + #include + #include + #include +-#include + + #include "ustcomm.h" + #include "usterr.h" diff --git a/meta/recipes-kernel/lttng/lttng-ust_0.12.bb b/meta/recipes-kernel/lttng/lttng-ust_0.12.bb index 7dadc04..5fca949 100644 --- a/meta/recipes-kernel/lttng/lttng-ust_0.12.bb +++ b/meta/recipes-kernel/lttng/lttng-ust_0.12.bb @@ -12,7 +12,9 @@ DEPENDS = "liburcu" PR = "r0" -SRC_URI = "http://lttng.org/files/ust/releases/ust-${PV}.tar.gz"; +SRC_URI = "http://lttng.org/files/ust/releases/ust-${PV}.tar.gz \ + file://uclibc-sched_getcpu.patch \ + " SRC_URI[md5sum] = "fae6e324a56016658c5b83ec14ba0043" SRC_URI[sha256sum] = "215b05f47d0c9e3a2934926a7d14fa9c67025db917c3a1f641df40b08314ab0c" -- 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 02/30] recipes: Replace gconf-dbus with gconf
From: Khem Raj Some distributions e.g. angstrom do not support gconf-dbus anymore since its now provided by gconf and in oe-core we have PREFERRED_PROVIDER_gconf tunable, here we replace all dependencies on gconf-dbus with gconf, which should work in both cases where poky defines PREFERRED_PROVIDER-gconf = "gconf-dbus" and for angstrom it is simply gconf Without this meta-toolchain-sdk ends up with conflicts in runqueue and does not build Signed-off-by: Khem Raj --- .../recipes-gnome/gnome/libgnomekbd_2.26.0.bb |2 +- meta/recipes-gnome/gnome/gnome-desktop.inc |2 +- meta/recipes-gnome/gthumb/gthumb_2.12.2.bb |2 +- meta/recipes-gnome/tasks/task-sdk-gmae.inc |2 +- meta/recipes-support/libproxy/libproxy_0.4.6.bb|2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-demoapps/recipes-gnome/gnome/libgnomekbd_2.26.0.bb b/meta-demoapps/recipes-gnome/gnome/libgnomekbd_2.26.0.bb index f2e4ec5..68e4eee 100644 --- a/meta-demoapps/recipes-gnome/gnome/libgnomekbd_2.26.0.bb +++ b/meta-demoapps/recipes-gnome/gnome/libgnomekbd_2.26.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "GNOME keyboard library" LICENSE = "LGPL" -DEPENDS = "gconf-dbus dbus libxklavier gtk+" +DEPENDS = "gconf dbus libxklavier gtk+" inherit gnome diff --git a/meta/recipes-gnome/gnome/gnome-desktop.inc b/meta/recipes-gnome/gnome/gnome-desktop.inc index 123f82d..336b87f 100644 --- a/meta/recipes-gnome/gnome/gnome-desktop.inc +++ b/meta/recipes-gnome/gnome/gnome-desktop.inc @@ -1,7 +1,7 @@ DESCRIPTION = "GNOME library for reading .desktop files" SECTION = "x11/gnome" LICENSE = "GPLv2 & LGPLv2" -DEPENDS = "gconf-dbus libxrandr virtual/libx11 gtk+ glib-2.0 gnome-doc-utils" +DEPENDS = "gconf libxrandr virtual/libx11 gtk+ glib-2.0 gnome-doc-utils" EXTRA_OECONF = "--disable-scrollkeeper --disable-desktop-docs" diff --git a/meta/recipes-gnome/gthumb/gthumb_2.12.2.bb b/meta/recipes-gnome/gthumb/gthumb_2.12.2.bb index 0b3bd1a..258f2d5 100644 --- a/meta/recipes-gnome/gthumb/gthumb_2.12.2.bb +++ b/meta/recipes-gnome/gthumb/gthumb_2.12.2.bb @@ -2,7 +2,7 @@ DESCRIPTION = "gThumb is an image viewer and browser for the GNOME Desktop" SECTION = "x11/gnome" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" -DEPENDS = "glib-2.0 gtk+ libxml2 gnome-doc-utils libunique gconf-dbus libpng gstreamer jpeg tiff gst-plugins-base" +DEPENDS = "glib-2.0 gtk+ libxml2 gnome-doc-utils libunique gconf libpng gstreamer jpeg tiff gst-plugins-base" PR = "r0" EXTRA_OECONF = "--disable-gnome-keyring --disable-libsoup --disable-exiv2 --disable-clutter" diff --git a/meta/recipes-gnome/tasks/task-sdk-gmae.inc b/meta/recipes-gnome/tasks/task-sdk-gmae.inc index 586d76f..b24fc9e 100644 --- a/meta/recipes-gnome/tasks/task-sdk-gmae.inc +++ b/meta/recipes-gnome/tasks/task-sdk-gmae.inc @@ -4,7 +4,7 @@ SDK-GMAE = " \ gtk+-dev \ gstreamer-dev \ bluez4-dev \ -gconf-dbus-dev \ +gconf-dev \ avahi-dev \ telepathy-glib-dev \ eds-dbus-dev \ diff --git a/meta/recipes-support/libproxy/libproxy_0.4.6.bb b/meta/recipes-support/libproxy/libproxy_0.4.6.bb index 255cd5b..2e18065 100644 --- a/meta/recipes-support/libproxy/libproxy_0.4.6.bb +++ b/meta/recipes-support/libproxy/libproxy_0.4.6.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7d704a7b1b116e8783edcdb44ff4 \ file://utils/proxy.c;beginline=1;endline=18;md5=55152a1006d7dafbef32baf9c30a99c0" -DEPENDS = "virtual/libx11 xmu gconf-dbus" +DEPENDS = "virtual/libx11 xmu gconf" SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.tar.gz"; -- 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 05/30] liburcu_0.5.4.bb: Let it build on uclibc targets
From: Khem Raj uclibc requires -D_GNU_SOURCE to be defined for it to enable GNU extensions which CPU_SET/CPU_ZERO are used by this package. So we add -D_GNU_SOURCE to CFLAGS when compiling for uclibc. Signed-off-by: Khem Raj --- meta/recipes-support/liburcu/liburcu_0.5.4.bb |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta/recipes-support/liburcu/liburcu_0.5.4.bb b/meta/recipes-support/liburcu/liburcu_0.5.4.bb index 8e17e5d..b83d708 100644 --- a/meta/recipes-support/liburcu/liburcu_0.5.4.bb +++ b/meta/recipes-support/liburcu/liburcu_0.5.4.bb @@ -15,7 +15,7 @@ SRC_URI[md5sum] = "04147d24749be75200173859839207f7" SRC_URI[sha256sum] = "02aedbb16c16bd034e246d5c9637a9232be559c66fc2fe4eb28948e234bd89f1" S = "${WORKDIR}/userspace-rcu-${PV}" - +CFLAGS_append_libc-uclibc = " -D_GNU_SOURCE" inherit autotools # liburcu, which is only used by lttng-ust, may not build on other -- 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 09/30] siteinfo: add microblaze target info
From: Adrian Alonso * Add microblaze target info * Microblaze soft CPU can be configured as big-endian/little-endian * Currently target info support for microblaze big endian, using prebuilt toolchains. Signed-off-by: Adrian Alonso --- meta/classes/siteinfo.bbclass |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/meta/classes/siteinfo.bbclass b/meta/classes/siteinfo.bbclass index 892abc1..436bc39 100644 --- a/meta/classes/siteinfo.bbclass +++ b/meta/classes/siteinfo.bbclass @@ -40,6 +40,7 @@ def get_siteinfo_list(d): "i486-linux-uclibc": "endian-little bit-32 common-uclibc ix86-common",\ "i586-linux-uclibc": "endian-little bit-32 common-uclibc ix86-common",\ "i686-linux-uclibc": "endian-little bit-32 common-uclibc ix86-common",\ + "microblaze-linux-gnu":"endian-big bit-32 common-glibc microblaze-common",\ "mipsel-linux":"endian-little bit-32 common-glibc mips-common",\ "mipsel-linux-uclibc": "endian-little bit-32 common-uclibc mips-common",\ "mips-linux": "endian-big bit-32 common-glibc mips-common",\ -- 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/30] Consolidated Pull Request for 5/10/2011
From: Saul Wold Richard, There is a matching request to poky - master for the kernel recipe, please ensure you pull that one also. This contains support for the microblaze from Adrian and some uclibc from Khem, along with some changes from Otavio. I passed through the insane LICENSE == CLOSED check, but need to think more about this (ie we should never see this kind of license in oe-core). 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 --- Adrian Alonso (7): insane: add micrblaze target info kernel-arch: add microblaze to valid archs siteinfo: add microblaze target info linux-libc-headers: add microblaze ARCH definition image-mklibs: add microblaze arch support package_rpm: use target vendor information readline: update version Bruce Ashfield (2): linux-yocto: remove non-core (qemu) machine compatibility linux-yocto: error if meta data not present Ilya Yanok (1): toolchain-qte: include cross-compiler and fix env script Khem Raj (6): recipes: Replace gconf-dbus with gconf conf/layer.conf: Use .= to append to BBPATH and =+ for BBFILES libgalago_0.5.2.bb: Fix compile for uclibc liburcu_0.5.4.bb: Let it build on uclibc targets lttng-ust_0.12.bb: Fix compilation on uclibc oe/patch.py: Remove series file during Clean() Otavio Salvador (9): scripts/oe-setup-builddir: fix typo syslinux: improve packaging meta/conf/local.conf.sample: fix mklibs comment line split and typo busybox: add support to mdev libxkbfile: disable xcb insane.bbclass: skip license checksum if LICENSE is "CLOSED" cmake.bbclass: fix qmake and rpath issues qmake_base.bbclass: add generate_qt_config_file task fuse: drop since it is not used by other recipes Saul Wold (2): web-sato: Update for svn -> git transtion gtkhtml2: Update to 1161 Scott Garman (1): gnome-doc-utils: Add additional missing -nonet options to xsltproc Xiaofeng Yan (1): libxmu: Add native function Zhai Edwin (1): qemu-script: Fix qemu seg fault if install Nvidia proprietary driver. .../recipes-gnome/gnome/libgnomekbd_2.26.0.bb |2 +- .../fuse-2.7.2/not-run-updaterc.d-on-host.patch| 15 meta-demoapps/recipes-kernel/fuse/fuse.inc | 13 meta-demoapps/recipes-kernel/fuse/fuse_2.7.2.bb| 22 -- meta/classes/cmake.bbclass | 19 +- meta/classes/image-mklibs.bbclass |2 +- meta/classes/insane.bbclass|8 ++- meta/classes/kernel-arch.bbclass |3 +- meta/classes/kernel-yocto.bbclass |5 +- meta/classes/package_rpm.bbclass |3 +- meta/classes/qmake_base.bbclass| 15 meta/classes/siteinfo.bbclass |1 + meta/conf/layer.conf | 10 +++- meta/conf/local.conf.sample|7 +- meta/lib/oe/patch.py |1 + .../recipes-connectivity/galago/libgalago_0.5.2.bb |4 + meta/recipes-core/busybox/busybox.inc | 14 - meta/recipes-core/busybox/busybox_1.18.4.bb|2 + meta/recipes-core/busybox/files/mdev |7 ++ meta/recipes-core/busybox/files/mdev.conf | 35 ++ meta/recipes-core/readline/readline_6.2.bb |6 ++ meta/recipes-devtools/syslinux/syslinux_4.03.bb| 12 +++- meta/recipes-gnome/gnome/gnome-desktop.inc |2 +- .../gnome/gnome-doc-utils/xsltproc_nonet.patch | 70 +++- meta/recipes-gnome/gnome/gnome-doc-utils_0.20.5.bb |2 +- meta/recipes-gnome/gthumb/gthumb_2.12.2.bb |2 +- meta/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb|2 +- meta/recipes-gnome/tasks/task-sdk-gmae.inc |2 +- meta/recipes-graphics/xorg-lib/libxkbfile_1.0.7.bb |4 +- meta/recipes-graphics/xorg-lib/libxmu_1.1.0.bb |2 + .../kern-tools/kern-tools-native_git.bb|2 +- .../linux-libc-headers_2.6.37.2.bb |3 +- .../recipes-kernel/linux/linux-yocto-stable_git.bb | 10 +--- meta/recipes-kernel/linux/linux-yocto_git.bb | 15 +--- .../lttng/lttng-ust/uclibc-sched_getcpu.patch | 50 ++ meta/recipes-kernel/lttng/lttng-ust_0.12.bb|4 +- meta/recipes-qt/meta/meta-toolchain-qte.bb | 33 +- meta/recipes-sato/web/{web_svn.bb => web_git.bb} | 10 ++-- meta/recipes-support/libproxy/libproxy_0.4.6.bb|2 +- meta/recipes-support/liburcu/liburcu_0.5.4.bb |2 +- scripts/oe-setup-builddir |2 +- scripts/runqemu-internal | 13 +++- 42 files changed, 316 insertions(+), 122 deletions(-) delete mode 100644 meta-demoapps/recipes-kernel/fuse/fuse-2.7.2/not-run-updaterc.d-on-host.patc
[OE-core] [PATCH 01/30] qemu-script: Fix qemu seg fault if install Nvidia proprietary driver.
From: Zhai Edwin This fix works on Ubuntu, and other distro can add its own path of Mesa's libGL Signed-off-by: Zhai Edwin --- scripts/runqemu-internal | 13 +++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal index 9a786e4..ffac05e 100755 --- a/scripts/runqemu-internal +++ b/scripts/runqemu-internal @@ -448,20 +448,29 @@ else fi # qemu got segfault if linked with nVidia's libgl +GL_LD_PRELOAD=$LD_PRELOAD + if ldd $QEMUBIN | grep -i nvidia &> /dev/null then cat << EOM WARNING: nVidia proprietary OpenGL libraries detected. nVidia's OpenGL libraries are known to have compatibility issues with qemu, resulting in a segfault. Please uninstall these drivers or ensure the mesa libGL -libraries precede nvidia's via LD_PRELOAD. +libraries precede nvidia's via LD_PRELOAD(Already do it on Ubuntu). EOM + +# Automatically use Ubuntu system's mesa libGL, other distro can add its own path +if grep -i ubuntu /etc/lsb-release &> /dev/null +then +echo "Skip nVidia's libGL on Ubuntu!" +GL_LD_PRELOAD="/usr/lib/libGL.so $LD_PRELOAD" +fi fi echo "Running $QEMU..." # -no-reboot is a mandatory option - see bug #100 echo $QEMUBIN -kernel $KERNEL $QEMUOPTIONS $SERIALOPTS -no-reboot $SCRIPT_QEMU_OPT $SCRIPT_QEMU_EXTRA_OPT --append '"'$KERNCMDLINE $SCRIPT_KERNEL_OPT'"' -$QEMUBIN -kernel $KERNEL $QEMUOPTIONS $SERIALOPTS -no-reboot $SCRIPT_QEMU_OPT $SCRIPT_QEMU_EXTRA_OPT --append "$KERNCMDLINE $SCRIPT_KERNEL_OPT" +LD_PRELOAD="$GL_LD_PRELOAD" $QEMUBIN -kernel $KERNEL $QEMUOPTIONS $SERIALOPTS -no-reboot $SCRIPT_QEMU_OPT $SCRIPT_QEMU_EXTRA_OPT --append "$KERNCMDLINE $SCRIPT_KERNEL_OPT" cleanup -- 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 04/30] libgalago_0.5.2.bb: Fix compile for uclibc
From: Khem Raj uclibc targets may not have gettext but this package still needs config.rpath during regenerating configury so we provide it when libc is uclibc. Signed-off-by: Khem Raj --- .../recipes-connectivity/galago/libgalago_0.5.2.bb |4 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/meta/recipes-connectivity/galago/libgalago_0.5.2.bb b/meta/recipes-connectivity/galago/libgalago_0.5.2.bb index 6d9f76b..3a47620 100644 --- a/meta/recipes-connectivity/galago/libgalago_0.5.2.bb +++ b/meta/recipes-connectivity/galago/libgalago_0.5.2.bb @@ -18,3 +18,7 @@ PR = "r2" inherit autotools pkgconfig gettext EXTRA_OECONF = "--disable-tests --disable-check" + +do_configure_prepend_libc-uclibc() { +touch ${S}/config.rpath +} -- 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 1/1] rsync (GPLv2): fix security vulnerability CVE-2007-4091
Saul Wold wrote: > On 05/09/2011 10:03 PM, He, Qing wrote: >>> -Original Message- >>> From: openembedded-core-boun...@lists.openembedded.org >>> [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf >>> Of Saul Wold Sent: 2011年5月10日 13:02 >>> To: Patches and discussions about the oe-core layer >>> Subject: Re: [OE-core] [PATCH 1/1] rsync (GPLv2): fix security >>> vulnerability CVE-2007-4091 >>> >>> On 05/09/2011 07:54 PM, Dexuan Cui wrote: From: Dexuan Cui Added a patch to fix http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2007-4091 >>> This is missing a [YOCTO #bugid], please add and resend. (update >>> branch >>> is OK). >> >> Saul, >> Before the other two CVEs are specifically addressed, I don't think >> we can call a close on this bug. >> > Yes, that's true, but it's important to know that this patch > addresses a part of that bug. Hi Saul, I added "[YOCTO #984] is partially fixed by this commit" and did "git push" just now. Please use the same branch http://git.pokylinux.org/cgit/cgit.cgi/poky-contrib/commit/?h=dcui/master&id=898ce2ddf774646796af5c8700130916afe6dbc1 Thanks, -- Dexuan ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Pull request with misc changes
On 05/09/2011 12:15 PM, Otavio Salvador wrote: Hello, This pull request fixes some issues I found since the last pull request and should be preferred against the first. Otavio, Next time, please use the create-pull-request script, which will generate a set of patch emails so that we can review this information via email. I will make a couple of additional comments below associated with each patch. The following changes since commit d0dc2b5bb02ef55a41e7a97b6831c72391ae7f36: u-boot: correct COPYING MD5SUM (2011-05-08 23:56:11 -0700) are available in the git repository at: git://github.com/OSSystems/oe-core master Otavio Salvador (10): meta/conf/local.conf.sample: fix mklibs comment line split and typo scripts/oe-setup-builddir: fix typo syslinux: improve packaging busybox: add support to mdev libxkbfile: disable xcb insane.bbclass: skip license checksum if LICENSE is "CLOSED" I assume you are adding this for layers and commercial work, we should never have CLOSED in any open layer. cmake.bbclass: fix qmake and rpath issues qmake_base.bbclass: add generate_qt_config_file task cmake: add support for oe qt4 tools names Please add a comment to the patch explaining it's purpose and origin, and include a Signed-off-by: if appropriate. Any patches that you have modified or added should include the above info. fuse: drop since it is not used by other recipes .../fuse-2.7.2/not-run-updaterc.d-on-host.patch| 15 meta-demoapps/recipes-kernel/fuse/fuse.inc | 13 --- meta-demoapps/recipes-kernel/fuse/fuse_2.7.2.bb| 22 - meta/classes/cmake.bbclass | 19 - meta/classes/insane.bbclass|4 + meta/classes/qmake_base.bbclass| 15 meta/conf/local.conf.sample|7 +- meta/recipes-core/busybox/busybox.inc | 14 +++- meta/recipes-core/busybox/busybox_1.18.4.bb|2 + meta/recipes-core/busybox/files/mdev |7 ++ meta/recipes-core/busybox/files/mdev.conf | 35 meta/recipes-devtools/cmake/cmake-native_2.8.3.bb |2 +- meta/recipes-devtools/cmake/cmake.inc |3 +- .../cmake/cmake/support-oe-qt4-tools-names.patch | 85 meta/recipes-devtools/syslinux/syslinux_4.03.bb| 12 +++- meta/recipes-graphics/xorg-lib/libxkbfile_1.0.7.bb |4 +- scripts/oe-setup-builddir |2 +- 17 files changed, 199 insertions(+), 62 deletions(-) delete mode 100644 meta-demoapps/recipes-kernel/fuse/fuse-2.7.2/not-run-updaterc.d-on-host.patch delete mode 100644 meta-demoapps/recipes-kernel/fuse/fuse.inc delete mode 100644 meta-demoapps/recipes-kernel/fuse/fuse_2.7.2.bb create mode 100755 meta/recipes-core/busybox/files/mdev create mode 100644 meta/recipes-core/busybox/files/mdev.conf create mode 100644 meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch ___ 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] rsync (GPLv2): fix security vulnerability CVE-2007-4091
On 05/09/2011 10:03 PM, He, Qing wrote: >> -Original Message- >> From: openembedded-core-boun...@lists.openembedded.org >> [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of Saul >> Wold >> Sent: 2011年5月10日 13:02 >> To: Patches and discussions about the oe-core layer >> Subject: Re: [OE-core] [PATCH 1/1] rsync (GPLv2): fix security vulnerability >> CVE-2007-4091 >> >> On 05/09/2011 07:54 PM, Dexuan Cui wrote: >>> From: Dexuan Cui >>> >>> Added a patch to fix >>> http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2007-4091 >>> >> This is missing a [YOCTO #bugid], please add and resend. (update branch >> is OK). > > Saul, > Before the other two CVEs are specifically addressed, I don't think we > can call a close on this bug. > Yes, that's true, but it's important to know that this patch addresses a part of that bug. Sau! > Thanks, > Qing > >> >> Sau! >> >>> Signed-off-by: Dexuan Cui >>> --- >>>.../rsync/rsync-2.6.9/rsync-2.6.9-fname-obo.patch | 70 >> >>>meta/recipes-devtools/rsync/rsync_2.6.9.bb |3 +- >>>2 files changed, 72 insertions(+), 1 deletions(-) >>>create mode 100644 >> meta/recipes-devtools/rsync/rsync-2.6.9/rsync-2.6.9-fname-obo.patch >>> >>> diff --git >>> a/meta/recipes-devtools/rsync/rsync-2.6.9/rsync-2.6.9-fname-obo.patch >> b/meta/recipes-devtools/rsync/rsync-2.6.9/rsync-2.6.9-fname-obo.patch >>> new file mode 100644 >>> index 000..f054452 >>> --- /dev/null >>> +++ b/meta/recipes-devtools/rsync/rsync-2.6.9/rsync-2.6.9-fname-obo.patch >>> @@ -0,0 +1,70 @@ >>> +Upstream-Status: Backport [ The patch is rsync-2.6.9 specific ] >>> + >>> +The patch is from https://issues.rpath.com/browse/RPL-1647 and is used to >>> +address http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2007-4091 >>> + >>> +Date: Tue May 10 10:07:36 2011 +0800 >>> +Dexuan Cui >>> + >>> +diff --git a/sender.c b/sender.c >>> +index 6fcaa65..053a8f1 100644 >>> +--- a/sender.c >>> b/sender.c >>> +@@ -123,6 +123,7 @@ void successful_send(int ndx) >>> + char fname[MAXPATHLEN]; >>> + struct file_struct *file; >>> + unsigned int offset; >>> ++ size_t l = 0; >>> + >>> + if (ndx< 0 || ndx>= the_file_list->count) >>> + return; >>> +@@ -133,6 +134,20 @@ void successful_send(int ndx) >>> + file->dir.root, "/", NULL); >>> + } else >>> + offset = 0; >>> ++ >>> ++ l = offset + 1; >>> ++ if (file) { >>> ++ if (file->dirname) >>> ++ l += strlen(file->dirname); >>> ++ if (file->basename) >>> ++ l += strlen(file->basename); >>> ++ } >>> ++ >>> ++ if (l>= sizeof(fname)) { >>> ++ rprintf(FERROR, "Overlong pathname\n"); >>> ++ exit_cleanup(RERR_FILESELECT); >>> ++ } >>> ++ >>> + f_name(file, fname + offset); >>> + if (remove_source_files) { >>> + if (do_unlink(fname) == 0) { >>> +@@ -224,6 +239,7 @@ void send_files(struct file_list *flist, int f_out, >>> int f_in) >>> + enum logcode log_code = log_before_transfer ? FLOG : FINFO; >>> + int f_xfer = write_batch< 0 ? batch_fd : f_out; >>> + int i, j; >>> ++ size_t l = 0; >>> + >>> + if (verbose> 2) >>> + rprintf(FINFO, "send_files starting\n"); >>> +@@ -259,6 +275,20 @@ void send_files(struct file_list *flist, int f_out, >>> int f_in) >>> + fname[offset++] = '/'; >>> + } else >>> + offset = 0; >>> ++ >>> ++ l = offset + 1; >>> ++ if (file) { >>> ++ if (file->dirname) >>> ++ l += strlen(file->dirname); >>> ++ if (file->basename) >>> ++ l += strlen(file->basename); >>> ++ } >>> ++ >>> ++ if (l>= sizeof(fname)) { >>> ++ rprintf(FERROR, "Overlong pathname\n"); >>> ++ exit_cleanup(RERR_FILESELECT); >>> ++ } >>> ++ >>> + fname2 = f_name(file, fname + offset); >>> + >>> + if (verbose> 2) >>> diff --git a/meta/recipes-devtools/rsync/rsync_2.6.9.bb >> b/meta/recipes-devtools/rsync/rsync_2.6.9.bb >>> index 4337982..17c18a4 100644 >>> --- a/meta/recipes-devtools/rsync/rsync_2.6.9.bb >>> +++ b/meta/recipes-devtools/rsync/rsync_2.6.9.bb >>> @@ -8,6 +8,7 @@ PRIORITY = "optional" >>>DEPENDS = "popt" >>> >>>SRC_URI = "http://rsync.samba.org/ftp/rsync/src/rsync-${PV}.tar.gz \ >>> + file://rsync-2.6.9-fname-obo.patch \ >>> file://rsyncd.conf" >>> >>>inherit autotools >>> @@ -22,4 +23,4 @@ EXTRA_OEMAKE='STRIP=""' >>>LICENSE = "GPLv2+" >>>LIC_FILES_CHKSUM = >> "file://COPYING;md5=6d5a9d4c4d3af25cd68fd83e8a8cb09c" >>> >>> -PR = "r2" >>> +PR = "r3" >> >> ___ >> 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] rsync (GPLv2): fix security vulnerability CVE-2007-4091
>-Original Message- >From: openembedded-core-boun...@lists.openembedded.org >[mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of Saul >Wold >Sent: 2011年5月10日 13:02 >To: Patches and discussions about the oe-core layer >Subject: Re: [OE-core] [PATCH 1/1] rsync (GPLv2): fix security vulnerability >CVE-2007-4091 > >On 05/09/2011 07:54 PM, Dexuan Cui wrote: >> From: Dexuan Cui >> >> Added a patch to fix >> http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2007-4091 >> >This is missing a [YOCTO #bugid], please add and resend. (update branch >is OK). Saul, Before the other two CVEs are specifically addressed, I don't think we can call a close on this bug. Thanks, Qing > >Sau! > >> Signed-off-by: Dexuan Cui >> --- >> .../rsync/rsync-2.6.9/rsync-2.6.9-fname-obo.patch | 70 > >> meta/recipes-devtools/rsync/rsync_2.6.9.bb |3 +- >> 2 files changed, 72 insertions(+), 1 deletions(-) >> create mode 100644 >meta/recipes-devtools/rsync/rsync-2.6.9/rsync-2.6.9-fname-obo.patch >> >> diff --git >> a/meta/recipes-devtools/rsync/rsync-2.6.9/rsync-2.6.9-fname-obo.patch >b/meta/recipes-devtools/rsync/rsync-2.6.9/rsync-2.6.9-fname-obo.patch >> new file mode 100644 >> index 000..f054452 >> --- /dev/null >> +++ b/meta/recipes-devtools/rsync/rsync-2.6.9/rsync-2.6.9-fname-obo.patch >> @@ -0,0 +1,70 @@ >> +Upstream-Status: Backport [ The patch is rsync-2.6.9 specific ] >> + >> +The patch is from https://issues.rpath.com/browse/RPL-1647 and is used to >> +address http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2007-4091 >> + >> +Date: Tue May 10 10:07:36 2011 +0800 >> +Dexuan Cui >> + >> +diff --git a/sender.c b/sender.c >> +index 6fcaa65..053a8f1 100644 >> +--- a/sender.c >> b/sender.c >> +@@ -123,6 +123,7 @@ void successful_send(int ndx) >> +char fname[MAXPATHLEN]; >> +struct file_struct *file; >> +unsigned int offset; >> ++ size_t l = 0; >> + >> +if (ndx< 0 || ndx>= the_file_list->count) >> +return; >> +@@ -133,6 +134,20 @@ void successful_send(int ndx) >> +file->dir.root, "/", NULL); >> +} else >> +offset = 0; >> ++ >> ++ l = offset + 1; >> ++ if (file) { >> ++ if (file->dirname) >> ++ l += strlen(file->dirname); >> ++ if (file->basename) >> ++ l += strlen(file->basename); >> ++ } >> ++ >> ++ if (l>= sizeof(fname)) { >> ++ rprintf(FERROR, "Overlong pathname\n"); >> ++ exit_cleanup(RERR_FILESELECT); >> ++ } >> ++ >> +f_name(file, fname + offset); >> +if (remove_source_files) { >> +if (do_unlink(fname) == 0) { >> +@@ -224,6 +239,7 @@ void send_files(struct file_list *flist, int f_out, int >> f_in) >> +enum logcode log_code = log_before_transfer ? FLOG : FINFO; >> +int f_xfer = write_batch< 0 ? batch_fd : f_out; >> +int i, j; >> ++ size_t l = 0; >> + >> +if (verbose> 2) >> +rprintf(FINFO, "send_files starting\n"); >> +@@ -259,6 +275,20 @@ void send_files(struct file_list *flist, int f_out, >> int f_in) >> +fname[offset++] = '/'; >> +} else >> +offset = 0; >> ++ >> ++ l = offset + 1; >> ++ if (file) { >> ++ if (file->dirname) >> ++ l += strlen(file->dirname); >> ++ if (file->basename) >> ++ l += strlen(file->basename); >> ++ } >> ++ >> ++ if (l>= sizeof(fname)) { >> ++ rprintf(FERROR, "Overlong pathname\n"); >> ++ exit_cleanup(RERR_FILESELECT); >> ++ } >> ++ >> +fname2 = f_name(file, fname + offset); >> + >> +if (verbose> 2) >> diff --git a/meta/recipes-devtools/rsync/rsync_2.6.9.bb >b/meta/recipes-devtools/rsync/rsync_2.6.9.bb >> index 4337982..17c18a4 100644 >> --- a/meta/recipes-devtools/rsync/rsync_2.6.9.bb >> +++ b/meta/recipes-devtools/rsync/rsync_2.6.9.bb >> @@ -8,6 +8,7 @@ PRIORITY = "optional" >> DEPENDS = "popt" >> >> SRC_URI = "http://rsync.samba.org/ftp/rsync/src/rsync-${PV}.tar.gz \ >> + file://rsync-2.6.9-fname-obo.patch \ >> file://rsyncd.conf" >> >> inherit autotools >> @@ -22,4 +23,4 @@ EXTRA_OEMAKE='STRIP=""' >> LICENSE = "GPLv2+" >> LIC_FILES_CHKSUM = >"file://COPYING;md5=6d5a9d4c4d3af25cd68fd83e8a8cb09c" >> >> -PR = "r2" >> +PR = "r3" > >___ >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] rsync (GPLv2): fix security vulnerability CVE-2007-4091
On 05/09/2011 07:54 PM, Dexuan Cui wrote: From: Dexuan Cui Added a patch to fix http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2007-4091 This is missing a [YOCTO #bugid], please add and resend. (update branch is OK). Sau! Signed-off-by: Dexuan Cui --- .../rsync/rsync-2.6.9/rsync-2.6.9-fname-obo.patch | 70 meta/recipes-devtools/rsync/rsync_2.6.9.bb |3 +- 2 files changed, 72 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-devtools/rsync/rsync-2.6.9/rsync-2.6.9-fname-obo.patch diff --git a/meta/recipes-devtools/rsync/rsync-2.6.9/rsync-2.6.9-fname-obo.patch b/meta/recipes-devtools/rsync/rsync-2.6.9/rsync-2.6.9-fname-obo.patch new file mode 100644 index 000..f054452 --- /dev/null +++ b/meta/recipes-devtools/rsync/rsync-2.6.9/rsync-2.6.9-fname-obo.patch @@ -0,0 +1,70 @@ +Upstream-Status: Backport [ The patch is rsync-2.6.9 specific ] + +The patch is from https://issues.rpath.com/browse/RPL-1647 and is used to +address http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2007-4091 + +Date: Tue May 10 10:07:36 2011 +0800 +Dexuan Cui + +diff --git a/sender.c b/sender.c +index 6fcaa65..053a8f1 100644 +--- a/sender.c b/sender.c +@@ -123,6 +123,7 @@ void successful_send(int ndx) + char fname[MAXPATHLEN]; + struct file_struct *file; + unsigned int offset; ++ size_t l = 0; + + if (ndx< 0 || ndx>= the_file_list->count) + return; +@@ -133,6 +134,20 @@ void successful_send(int ndx) + file->dir.root, "/", NULL); + } else + offset = 0; ++ ++ l = offset + 1; ++ if (file) { ++ if (file->dirname) ++ l += strlen(file->dirname); ++ if (file->basename) ++ l += strlen(file->basename); ++ } ++ ++ if (l>= sizeof(fname)) { ++ rprintf(FERROR, "Overlong pathname\n"); ++ exit_cleanup(RERR_FILESELECT); ++ } ++ + f_name(file, fname + offset); + if (remove_source_files) { + if (do_unlink(fname) == 0) { +@@ -224,6 +239,7 @@ void send_files(struct file_list *flist, int f_out, int f_in) + enum logcode log_code = log_before_transfer ? FLOG : FINFO; + int f_xfer = write_batch< 0 ? batch_fd : f_out; + int i, j; ++ size_t l = 0; + + if (verbose> 2) + rprintf(FINFO, "send_files starting\n"); +@@ -259,6 +275,20 @@ void send_files(struct file_list *flist, int f_out, int f_in) + fname[offset++] = '/'; + } else + offset = 0; ++ ++ l = offset + 1; ++ if (file) { ++ if (file->dirname) ++ l += strlen(file->dirname); ++ if (file->basename) ++ l += strlen(file->basename); ++ } ++ ++ if (l>= sizeof(fname)) { ++ rprintf(FERROR, "Overlong pathname\n"); ++ exit_cleanup(RERR_FILESELECT); ++ } ++ + fname2 = f_name(file, fname + offset); + + if (verbose> 2) diff --git a/meta/recipes-devtools/rsync/rsync_2.6.9.bb b/meta/recipes-devtools/rsync/rsync_2.6.9.bb index 4337982..17c18a4 100644 --- a/meta/recipes-devtools/rsync/rsync_2.6.9.bb +++ b/meta/recipes-devtools/rsync/rsync_2.6.9.bb @@ -8,6 +8,7 @@ PRIORITY = "optional" DEPENDS = "popt" SRC_URI = "http://rsync.samba.org/ftp/rsync/src/rsync-${PV}.tar.gz \ + file://rsync-2.6.9-fname-obo.patch \ file://rsyncd.conf" inherit autotools @@ -22,4 +23,4 @@ EXTRA_OEMAKE='STRIP=""' LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=6d5a9d4c4d3af25cd68fd83e8a8cb09c" -PR = "r2" +PR = "r3" ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/5] Misc fixes related to gcc 4.6.0
On 05/09/2011 02:43 PM, Nitin A Kamble wrote: From: Nitin A Kamble Pull URL: git://git.pokylinux.org/poky-contrib.git Branch: nitin/misc Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=nitin/misc Thanks, Nitin A Kamble --- Khem Raj (1): gcc-4.6.0: Apply linaro patches Nitin A Kamble (4): mdadm: compilation fix for gcc 4.6.0 pax: fix for compiling with gcc 4.6.0 systemtap: fix for compilation with gcc 4.6.0 kexec-tools: fix compiler errors with gcc 4.6.0 Nitin, I noticed that you are using "=" instead of ": for the Upstream-status, it should be ":" just like "Signed-off-by:", also please use "Uptream-status" capitalization. If you used "=" before, my apologies for not catching it last time. Sau! meta/recipes-devtools/gcc/gcc-4.6.0.inc|4 + .../gcc-4.6.0/linaro/gcc-4.6-linaro-r106720.patch | 51 ++ .../gcc-4.6.0/linaro/gcc-4.6-linaro-r106723.patch | 63 ++ .../gcc-4.6.0/linaro/gcc-4.6-linaro-r106729.patch | 32 + .../gcc-4.6.0/linaro/gcc-4.6-linaro-r106731.patch | 28 + .../gcc-4.6.0/linaro/gcc-4.6-linaro-r106733.patch | 653 .../gcc-4.6.0/linaro/gcc-4.6-linaro-r106737.patch | 126 .../gcc-4.6.0/linaro/gcc-4.6-linaro-r106738.patch | 177 ++ .../gcc/gcc-4_6-branch-linaro-backports.inc|9 + .../mdadm/fix_for_compilation_with_gcc-4.6.0.patch | 174 ++ meta/recipes-extended/mdadm/mdadm_3.2.1.bb |5 +- .../pax/pax/fix_for_compile_with_gcc-4.6.0.patch | 25 + meta/recipes-extended/pax/pax_3.4.bb |5 +- .../fix_for_compiling_with_gcc-4.6.0.patch | 40 ++ meta/recipes-kernel/kexec/kexec-tools_2.0.2.bb |3 +- .../fix_for_compilation_with_gcc-4.6.0.patch | 119 meta/recipes-kernel/systemtap/systemtap_git.bb |3 +- 17 files changed, 1511 insertions(+), 6 deletions(-) create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/linaro/gcc-4.6-linaro-r106720.patch create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/linaro/gcc-4.6-linaro-r106723.patch create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/linaro/gcc-4.6-linaro-r106729.patch create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/linaro/gcc-4.6-linaro-r106731.patch create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/linaro/gcc-4.6-linaro-r106733.patch create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/linaro/gcc-4.6-linaro-r106737.patch create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/linaro/gcc-4.6-linaro-r106738.patch create mode 100644 meta/recipes-devtools/gcc/gcc-4_6-branch-linaro-backports.inc create mode 100644 meta/recipes-extended/mdadm/mdadm/fix_for_compilation_with_gcc-4.6.0.patch create mode 100644 meta/recipes-extended/pax/pax/fix_for_compile_with_gcc-4.6.0.patch create mode 100644 meta/recipes-kernel/kexec/kexec-tools/fix_for_compiling_with_gcc-4.6.0.patch create mode 100644 meta/recipes-kernel/systemtap/systemtap/fix_for_compilation_with_gcc-4.6.0.patch ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] rsync (GPLv2): fix security vulnerability CVE-2007-4091
From: Dexuan Cui The patch is from https://issues.rpath.com/browse/RPL-1647 and is used to address http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2007-4091 Pull URL: git://git.pokylinux.org/poky-contrib.git Branch: dcui/master Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dcui/master Thanks, Dexuan Cui --- Dexuan Cui (1): rsync (GPLv2): fix security vulnerability CVE-2007-4091 .../rsync/rsync-2.6.9/rsync-2.6.9-fname-obo.patch | 70 meta/recipes-devtools/rsync/rsync_2.6.9.bb |3 +- 2 files changed, 72 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-devtools/rsync/rsync-2.6.9/rsync-2.6.9-fname-obo.patch -- 1.7.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] rsync (GPLv2): fix security vulnerability CVE-2007-4091
From: Dexuan Cui Added a patch to fix http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2007-4091 Signed-off-by: Dexuan Cui --- .../rsync/rsync-2.6.9/rsync-2.6.9-fname-obo.patch | 70 meta/recipes-devtools/rsync/rsync_2.6.9.bb |3 +- 2 files changed, 72 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-devtools/rsync/rsync-2.6.9/rsync-2.6.9-fname-obo.patch diff --git a/meta/recipes-devtools/rsync/rsync-2.6.9/rsync-2.6.9-fname-obo.patch b/meta/recipes-devtools/rsync/rsync-2.6.9/rsync-2.6.9-fname-obo.patch new file mode 100644 index 000..f054452 --- /dev/null +++ b/meta/recipes-devtools/rsync/rsync-2.6.9/rsync-2.6.9-fname-obo.patch @@ -0,0 +1,70 @@ +Upstream-Status: Backport [ The patch is rsync-2.6.9 specific ] + +The patch is from https://issues.rpath.com/browse/RPL-1647 and is used to +address http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2007-4091 + +Date: Tue May 10 10:07:36 2011 +0800 +Dexuan Cui + +diff --git a/sender.c b/sender.c +index 6fcaa65..053a8f1 100644 +--- a/sender.c b/sender.c +@@ -123,6 +123,7 @@ void successful_send(int ndx) + char fname[MAXPATHLEN]; + struct file_struct *file; + unsigned int offset; ++ size_t l = 0; + + if (ndx < 0 || ndx >= the_file_list->count) + return; +@@ -133,6 +134,20 @@ void successful_send(int ndx) + file->dir.root, "/", NULL); + } else + offset = 0; ++ ++ l = offset + 1; ++ if (file) { ++ if (file->dirname) ++ l += strlen(file->dirname); ++ if (file->basename) ++ l += strlen(file->basename); ++ } ++ ++ if (l >= sizeof(fname)) { ++ rprintf(FERROR, "Overlong pathname\n"); ++ exit_cleanup(RERR_FILESELECT); ++ } ++ + f_name(file, fname + offset); + if (remove_source_files) { + if (do_unlink(fname) == 0) { +@@ -224,6 +239,7 @@ void send_files(struct file_list *flist, int f_out, int f_in) + enum logcode log_code = log_before_transfer ? FLOG : FINFO; + int f_xfer = write_batch < 0 ? batch_fd : f_out; + int i, j; ++ size_t l = 0; + + if (verbose > 2) + rprintf(FINFO, "send_files starting\n"); +@@ -259,6 +275,20 @@ void send_files(struct file_list *flist, int f_out, int f_in) + fname[offset++] = '/'; + } else + offset = 0; ++ ++ l = offset + 1; ++ if (file) { ++ if (file->dirname) ++ l += strlen(file->dirname); ++ if (file->basename) ++ l += strlen(file->basename); ++ } ++ ++ if (l >= sizeof(fname)) { ++ rprintf(FERROR, "Overlong pathname\n"); ++ exit_cleanup(RERR_FILESELECT); ++ } ++ + fname2 = f_name(file, fname + offset); + + if (verbose > 2) diff --git a/meta/recipes-devtools/rsync/rsync_2.6.9.bb b/meta/recipes-devtools/rsync/rsync_2.6.9.bb index 4337982..17c18a4 100644 --- a/meta/recipes-devtools/rsync/rsync_2.6.9.bb +++ b/meta/recipes-devtools/rsync/rsync_2.6.9.bb @@ -8,6 +8,7 @@ PRIORITY = "optional" DEPENDS = "popt" SRC_URI = "http://rsync.samba.org/ftp/rsync/src/rsync-${PV}.tar.gz \ + file://rsync-2.6.9-fname-obo.patch \ file://rsyncd.conf" inherit autotools @@ -22,4 +23,4 @@ EXTRA_OEMAKE='STRIP=""' LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=6d5a9d4c4d3af25cd68fd83e8a8cb09c" -PR = "r2" +PR = "r3" -- 1.7.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Patch for fixing build issues with external kernel modules.
Hi, Am Dienstag 10 Mai 2011, 03:40:04 schrieb Franz Leitl: > Am Montag 09 Mai 2011, 22:53:19 schrieben Sie: > > The kernel should not remove bounds.h, that is documented in the > > Makefile. If it does, it's a bug. > > After executing "bitbake -f -c compile virtual/kernel" I get bounds.h in > "${S}/includes/generated/". > Seems as if both > oe_runmake -C $kerneldir CC="${KERNEL_CC}" LD="${KERNEL_LD}" clean > and > make -C $kerneldir _mrproper_scripts > in kernel.bbclass are to blame for removing bounds.h from > "$kerneldir/includes/generated/". > I tested it twice. Only in case both lines are commented out bounds.h stays > in "$kerneldir/includes/generated/" I still would like to know, what to do next. > What to do with module.bbclass not setting KERNEL_PATH in > module_do_install? My Makefile relies on it, if KERNEL_PATH is not set it > will use > "/lib/modules/$(shell uname -r)/build" instead. But uname returns the > host's kernel version. > Is there any reason why oe_runmake in module_do_compile sets > "KERNEL_PATH=${STAGING_KERNEL_DIR}" while in module_do_install it doesn't? > Should I overwrite the do_install in my recipe or should module.bbclass be > fixed? Ok, I just remembered the hint to recipes-kernel/hello-mod/files/Makefile. Works as KERNEL_SRC is also set to ${STAGING_KERNEL_DIR}. But it does not explain what the real difference between KERNEL_SRC and KERNEL_PATH is, as both are set to the same value and why does module_do_install not set KERNEL_PATH but module_do_compile does? Regards, Franz ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Patch for fixing build issues with external kernel modules.
Hi, Am Montag 09 Mai 2011, 22:53:19 schrieben Sie: > The kernel should not remove bounds.h, that is documented in the > Makefile. If it does, it's a bug. After executing "bitbake -f -c compile virtual/kernel" I get bounds.h in "${S}/includes/generated/". Seems as if both oe_runmake -C $kerneldir CC="${KERNEL_CC}" LD="${KERNEL_LD}" clean and make -C $kerneldir _mrproper_scripts in kernel.bbclass are to blame for removing bounds.h from "$kerneldir/includes/generated/". I tested it twice. Only in case both lines are commented out bounds.h stays in "$kerneldir/includes/generated/". What to do next? > It's just about fixing it properly instead of applying a band-aid. > Regenerating something that shouldn't have been deleted in the first > place is a band-aid, and you can go that route in your own recipe if you > like (per Koen's patch), but that doesn't belong in the core kernel > classes. I prefer a proper fix, whatever it might look like. What to do with module.bbclass not setting KERNEL_PATH in module_do_install? My Makefile relies on it, if KERNEL_PATH is not set it will use "/lib/modules/$(shell uname -r)/build" instead. But uname returns the host's kernel version. Is there any reason why oe_runmake in module_do_compile sets "KERNEL_PATH=${STAGING_KERNEL_DIR}" while in module_do_install it doesn't? Should I overwrite the do_install in my recipe or should module.bbclass be fixed? Regards, Franz ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/5] systemtap: fix for compilation with gcc 4.6.0
From: Nitin A Kamble Signed-off-by: Nitin A Kamble --- .../fix_for_compilation_with_gcc-4.6.0.patch | 119 meta/recipes-kernel/systemtap/systemtap_git.bb |3 +- 2 files changed, 121 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-kernel/systemtap/systemtap/fix_for_compilation_with_gcc-4.6.0.patch diff --git a/meta/recipes-kernel/systemtap/systemtap/fix_for_compilation_with_gcc-4.6.0.patch b/meta/recipes-kernel/systemtap/systemtap/fix_for_compilation_with_gcc-4.6.0.patch new file mode 100644 index 000..5f60820 --- /dev/null +++ b/meta/recipes-kernel/systemtap/systemtap/fix_for_compilation_with_gcc-4.6.0.patch @@ -0,0 +1,119 @@ +Upstream-Status="Pending" + +Fix following compiler errors with gcc 4.6.0: +Nitin A Kamble 2011/05/09 + +| tapsets.cxx: In member function 'void sdt_query::handle_probe_entry()': +| tapsets.cxx:5295:8: error: variable 'kprobe_found' set but not used [-Werror=unused-but-set-variable] +| tapsets.cxx: In member function 'virtual void hwbkpt_builder::build(systemtap_session&, probe*, probe_point*, const literal_map_t&, std::vector&)': +| tapsets.cxx:7655:18: error: variable 'has_symbol_str' set but not used [-Werror=unused-but-set-variable] +| cc1plus: all warnings being treated as errors +| +| make[2]: *** [stap-tapsets.o] Error 1 +| translate.cxx: In member function 'virtual void c_unparser::visit_print_format(print_format*)': +| translate.cxx:4431:6: error: variable 'width_ix' set but not used [-Werror=unused-but-set-variable] +| cc1plus: all warnings being treated as errors +| +| make[2]: *** [stap-translate.o] Error 1 +| common.c: In function 'fatal_handler': +| common.c:397:13: error: variable 'rc' set but not used [-Werror=unused-but-set-variable] +| cc1: all warnings being treated as errors +| +| make[3]: *** [common.o] Error 1 +| make[3]: *** Waiting for unfinished jobs +| common.c: In function 'fatal_handler': +| common.c:397:13: error: variable 'rc' set but not used [-Werror=unused-but-set-variable] +| cc1: all warnings being treated as errors +| +| mainloop.c: In function 'chld_proc': +| mainloop.c:56:11: error: variable 'rc' set but not used [-Werror=unused-but-set-variable] +| mainloop.c: In function 'stp_main_loop': +| mainloop.c:623:17: error: variable 'rc' set but not used [-Werror=unused-but-set-variable] +| cc1: all warnings being treated as errors +| + +Index: git/tapsets.cxx +=== +--- git.orig/tapsets.cxx git/tapsets.cxx +@@ -5292,7 +5292,6 @@ sdt_query::handle_probe_entry() + probe *new_base = convert_location(); + probe_point *new_location = new_base->locations[0]; + +- bool kprobe_found = false; + bool need_debug_info = false; + + Dwarf_Addr bias; +@@ -5302,7 +5301,6 @@ sdt_query::handle_probe_entry() + if (have_kprobe()) + { + convert_probe(new_base); +- kprobe_found = true; + // Expand the local variables in the probe body + sdt_kprobe_var_expanding_visitor svv (module_val, + provider_name, +@@ -7652,7 +7650,7 @@ hwbkpt_builder::build(systemtap_session + { + string symbol_str_val; + int64_t hwbkpt_address, len; +- bool has_addr, has_symbol_str, has_write, has_rw, has_len; ++ bool has_addr, has_write, has_rw, has_len; + + if (! (sess.kernel_config["CONFIG_PERF_EVENTS"] == string("y"))) + throw semantic_error ("CONFIG_PERF_EVENTS not available on this kernel", +@@ -7662,7 +7660,6 @@ hwbkpt_builder::build(systemtap_session + location->components[0]->tok); + + has_addr = get_param (parameters, TOK_HWBKPT, hwbkpt_address); +- has_symbol_str = get_param (parameters, TOK_HWBKPT, symbol_str_val); + has_len = get_param (parameters, TOK_LENGTH, len); + has_write = (parameters.find(TOK_HWBKPT_WRITE) != parameters.end()); + has_rw = (parameters.find(TOK_HWBKPT_RW) != parameters.end()); +Index: git/translate.cxx +=== +--- git.orig/translate.cxx git/translate.cxx +@@ -4428,7 +4428,7 @@ c_unparser::visit_print_format (print_fo + continue; + + /* Take note of the width and precision arguments, if any. */ +- int width_ix = -1, prec_ix= -1; ++ int __attribute((__unused__)) width_ix = -1, prec_ix= -1; + if (components[i].widthtype == print_format::width_dynamic) + width_ix = arg_ix++; + if (components[i].prectype == print_format::prec_dynamic) +Index: git/runtime/staprun/common.c +=== +--- git.orig/runtime/staprun/common.c git/runtime/staprun/common.c +@@ -394,7 +394,7 @@ void parse_modpath(const char *inpath) + #define ERR_MSG "\nUNEXPECTED FATAL ERROR in staprun. Please file a bug report.\n" + static void fatal_handler (int signum) + { +-int rc; ++int __attribute__((__unused__)) rc; + cha
[OE-core] [PATCH 1/5] gcc-4.6.0: Apply linaro patches
From: Khem Raj We take the improvements done by linaro for gcc 4.6 Signed-off-by: Khem Raj --- meta/recipes-devtools/gcc/gcc-4.6.0.inc|4 + .../gcc-4.6.0/linaro/gcc-4.6-linaro-r106720.patch | 51 ++ .../gcc-4.6.0/linaro/gcc-4.6-linaro-r106723.patch | 63 ++ .../gcc-4.6.0/linaro/gcc-4.6-linaro-r106729.patch | 32 + .../gcc-4.6.0/linaro/gcc-4.6-linaro-r106731.patch | 28 + .../gcc-4.6.0/linaro/gcc-4.6-linaro-r106733.patch | 653 .../gcc-4.6.0/linaro/gcc-4.6-linaro-r106737.patch | 126 .../gcc-4.6.0/linaro/gcc-4.6-linaro-r106738.patch | 177 ++ .../gcc/gcc-4_6-branch-linaro-backports.inc|9 + 9 files changed, 1143 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/linaro/gcc-4.6-linaro-r106720.patch create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/linaro/gcc-4.6-linaro-r106723.patch create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/linaro/gcc-4.6-linaro-r106729.patch create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/linaro/gcc-4.6-linaro-r106731.patch create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/linaro/gcc-4.6-linaro-r106733.patch create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/linaro/gcc-4.6-linaro-r106737.patch create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/linaro/gcc-4.6-linaro-r106738.patch create mode 100644 meta/recipes-devtools/gcc/gcc-4_6-branch-linaro-backports.inc diff --git a/meta/recipes-devtools/gcc/gcc-4.6.0.inc b/meta/recipes-devtools/gcc/gcc-4.6.0.inc index 2c30d43..609b1df 100644 --- a/meta/recipes-devtools/gcc/gcc-4.6.0.inc +++ b/meta/recipes-devtools/gcc/gcc-4.6.0.inc @@ -7,6 +7,9 @@ require gcc-common.inc require gcc-4_6-branch-backports.inc +# Linaro patches for 4.6 branch +require gcc-4_6-branch-linaro-backports.inc + PR = "r1" DEPENDS =+ "mpfr gmp libmpc" @@ -22,6 +25,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ ${GCC-4_6-BRANCH-BACKPORTS} \ + ${GCC-4_6-BRANCH-LINARO-BACKPORTS} \ file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \ file://100-uclibc-conf.patch \ file://gcc-uclibc-locale-ctype_touplow_t.patch \ diff --git a/meta/recipes-devtools/gcc/gcc-4.6.0/linaro/gcc-4.6-linaro-r106720.patch b/meta/recipes-devtools/gcc/gcc-4.6.0/linaro/gcc-4.6-linaro-r106720.patch new file mode 100644 index 000..4c573f4 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-4.6.0/linaro/gcc-4.6-linaro-r106720.patch @@ -0,0 +1,51 @@ +2011-02-21 Andrew Stubbs + Julian Brown + Mark Shinwell + + Forward-ported from Linaro GCC 4.5 (bzr99324). + + gcc/ + * config/arm/arm.h (arm_class_likely_spilled_p): Check against + LO_REGS only for Thumb-1. + (MODE_BASE_REG_CLASS): Restrict base registers to those which can + be used in short instructions when optimising for size on Thumb-2. + +=== modified file 'gcc/config/arm/arm.c' +--- old/gcc/config/arm/arm.c 2011-01-29 03:20:57 + new/gcc/config/arm/arm.c 2011-02-21 14:04:51 + +@@ -22304,14 +22304,16 @@ + + /* Implement TARGET_CLASS_LIKELY_SPILLED_P. + +- We need to define this for LO_REGS on thumb. Otherwise we can end up +- using r0-r4 for function arguments, r7 for the stack frame and don't +- have enough left over to do doubleword arithmetic. */ +- ++ We need to define this for LO_REGS on Thumb-1. Otherwise we can end up ++ using r0-r4 for function arguments, r7 for the stack frame and don't have ++ enough left over to do doubleword arithmetic. For Thumb-2 all the ++ potentially problematic instructions accept high registers so this is not ++ necessary. Care needs to be taken to avoid adding new Thumb-2 patterns ++ that require many low registers. */ + static bool + arm_class_likely_spilled_p (reg_class_t rclass) + { +- if ((TARGET_THUMB && rclass == LO_REGS) ++ if ((TARGET_THUMB1 && rclass == LO_REGS) + || rclass == CC_REG) + return true; + + +=== modified file 'gcc/config/arm/arm.h' +--- old/gcc/config/arm/arm.h 2011-01-29 03:20:57 + new/gcc/config/arm/arm.h 2011-02-21 14:04:51 + +@@ -1185,7 +1185,7 @@ +when addressing quantities in QI or HI mode; if we don't know the +mode, then we must be conservative. */ + #define MODE_BASE_REG_CLASS(MODE) \ +-(TARGET_32BIT ? CORE_REGS : \ ++(TARGET_ARM || (TARGET_THUMB2 && !optimize_size) ? CORE_REGS : \ + (((MODE) == SImode) ? BASE_REGS : LO_REGS)) + + /* For Thumb we can not support SP+reg addressing, so we return LO_REGS + diff --git a/meta/recipes-devtools/gcc/gcc-4.6.0/linaro/gcc-4.6-linaro-r106723.patch b/meta/recipes-devtools/gcc/gcc-4.6.0/linaro/gcc-4.6-linaro-r106723.patch new file mode 100644 index 000..5271ffa --- /dev/null +++ b/meta/recipes-devto
[OE-core] [PATCH 2/5] mdadm: compilation fix for gcc 4.6.0
From: Nitin A Kamble Signed-off-by: Nitin A Kamble --- .../mdadm/fix_for_compilation_with_gcc-4.6.0.patch | 174 meta/recipes-extended/mdadm/mdadm_3.2.1.bb |5 +- 2 files changed, 177 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-extended/mdadm/mdadm/fix_for_compilation_with_gcc-4.6.0.patch diff --git a/meta/recipes-extended/mdadm/mdadm/fix_for_compilation_with_gcc-4.6.0.patch b/meta/recipes-extended/mdadm/mdadm/fix_for_compilation_with_gcc-4.6.0.patch new file mode 100644 index 000..31fc83c --- /dev/null +++ b/meta/recipes-extended/mdadm/mdadm/fix_for_compilation_with_gcc-4.6.0.patch @@ -0,0 +1,174 @@ +Upstream-Status="Pending" + +Nitin A Kamble 2011/05/06 + +Fix these compilation errors with gcc 4.6.0 + +| super1.c: In function 'calc_sb_1_csum': +| super1.c:114:6: error: variable 'i' set but not used [-Werror=unused-but-set-variable] +| Query.c: In function 'Query': +| Query.c:38:16: error: variable 'superrno' set but not used [-Werror=unused-but-set-variable] +| super1.c: In function 'examine_super1': +| super1.c:390:7: error: variable 'me' set but not used [-Werror=unused-but-set-variable] +| cc1: all warnings being treated as errors +| +| make: *** [Query.o] Error 1 +| make: *** Waiting for unfinished jobs +| mdadm.c: In function 'main': +| mdadm.c:106:6: error: variable 'auto_update_home' set but not used [-Werror=unused-but-set-variable] +| mdmon.c: In function 'mdmon': +| mdmon.c:354:6: error: variable 'ignore' set but not used [-Werror=unused-but-set-variable] +| cc1: all warnings being treated as errors +| +| make: *** [mdmon.o] Error 1 +| cc1: all warnings being treated as errors +| +| sysfs.c: In function 'sysfs_uevent': +| sysfs.c:421:6: error: variable 'n' set but not used [-Werror=unused-but-set-variable] +| cc1: all warnings being treated as errors +| +| make: *** [mdadm.o] Error 1 +| make: *** [super1.o] Error 1 +| cc1: all warnings being treated as errors +| +| make: *** [sysfs.o] Error 1 +| Grow.c: In function 'Grow_reshape': +| Grow.c:1315:6: error: variable 'changed' set but not used [-Werror=unused-but-set-variable] +| cc1: all warnings being treated as errors +| +| make: *** [Grow.o] Error 1 +| ERROR: oe_runmake failed + +Index: mdadm-3.2.1/Grow.c +=== +--- mdadm-3.2.1.orig/Grow.c mdadm-3.2.1/Grow.c +@@ -1312,7 +1312,6 @@ int Grow_reshape(char *devname, int fd, + char *subarray = NULL; + + int frozen; +- int changed = 0; + char *container = NULL; + char container_buf[20]; + int cfd = -1; +@@ -1479,7 +1478,6 @@ int Grow_reshape(char *devname, int fd, + if (!quiet) + fprintf(stderr, Name ": component size of %s has been set to %lluK\n", + devname, size); +- changed = 1; + } else if (array.level != LEVEL_CONTAINER) { + size = get_component_size(fd)/2; + if (size == 0) +Index: mdadm-3.2.1/Query.c +=== +--- mdadm-3.2.1.orig/Query.c mdadm-3.2.1/Query.c +@@ -35,7 +35,7 @@ int Query(char *dev) + int fd = open(dev, O_RDONLY); + int vers; + int ioctlerr; +- int superror, superrno; ++ int superror; + struct mdinfo info; + mdu_array_info_t array; + struct supertype *st = NULL; +@@ -84,7 +84,6 @@ int Query(char *dev) + st = guess_super(fd); + if (st) { + superror = st->ss->load_super(st, fd, dev); +- superrno = errno; + } else + superror = -1; + close(fd); +Index: mdadm-3.2.1/mdadm.c +=== +--- mdadm-3.2.1.orig/mdadm.c mdadm-3.2.1/mdadm.c +@@ -103,7 +103,7 @@ int main(int argc, char *argv[]) + char *shortopt = short_options; + int dosyslog = 0; + int rebuild_map = 0; +- int auto_update_home = 0; ++ int __attribute__((__unused__)) auto_update_home = 0; + char *subarray = NULL; + char *remove_path = NULL; + char *udev_filename = NULL; +Index: mdadm-3.2.1/mdmon.c +=== +--- mdadm-3.2.1.orig/mdmon.c mdadm-3.2.1/mdmon.c +@@ -351,7 +351,6 @@ static int mdmon(char *devname, int devn + struct sigaction act; + int pfd[2]; + int status; +- int ignore; + pid_t victim = -1; + int victim_sock = -1; + +@@ -459,7 +458,6 @@ static int mdmon(char *devname, int devn + if (victim >= 0) + victim_sock = connect_monitor(container->devname); + +- ignore = chdir("/"); + if (!takeover && victim > 0 && victim_sock >= 0) { + if (fping_monitor(victim_sock) == 0) { + fprintf(stderr, "mdmon: %s already managed\n", +@@ -507,10 +505,8 @@ static int mdmon(char *devname, int d
[OE-core] [PATCH 5/5] kexec-tools: fix compiler errors with gcc 4.6.0
From: Nitin A Kamble Signed-off-by: Nitin A Kamble --- .../fix_for_compiling_with_gcc-4.6.0.patch | 40 meta/recipes-kernel/kexec/kexec-tools_2.0.2.bb |3 +- 2 files changed, 42 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-kernel/kexec/kexec-tools/fix_for_compiling_with_gcc-4.6.0.patch diff --git a/meta/recipes-kernel/kexec/kexec-tools/fix_for_compiling_with_gcc-4.6.0.patch b/meta/recipes-kernel/kexec/kexec-tools/fix_for_compiling_with_gcc-4.6.0.patch new file mode 100644 index 000..65cf051 --- /dev/null +++ b/meta/recipes-kernel/kexec/kexec-tools/fix_for_compiling_with_gcc-4.6.0.patch @@ -0,0 +1,40 @@ +Upstream-Status="Pending" + +Fix following compiler warining/errors with gcc 4.6.0. +Nitin A Kamble 2011/05/09 + +| kexec/kexec.c: In function 'my_exec': +| kexec/kexec.c:818:6: warning: variable 'result' set but not used [-Wunused-but-set-variable] + +| ccache i586-poky-linux-gcc -march=i586 --sysroot=/build_disk/poky_build/build_gcc_4.6.0/tmp/sysroots/qemux86 --no-undefined -nostartfiles -nostdlib -nodefaultlibs -e purgatory_start -r -o purgatory/purgatory.ro purgatory/purgatory.o purgatory/printf.o purgatory/string.o purgatory/arch/i386/entry32-16.o purgatory/arch/i386/entry32-16-debug.o purgatory/arch/i386/entry32.o purgatory/arch/i386/setup-x86.o purgatory/arch/i386/stack.o purgatory/arch/i386/compat_x86_64.o purgatory/arch/i386/purgatory-x86.o purgatory/arch/i386/console-x86.o purgatory/arch/i386/vga.o purgatory/arch/i386/pic.o purgatory/arch/i386/crashdump_backup.o purgatory/sha256.o +| i586-poky-linux-gcc: error: unrecognized option '--no-undefined' +| make: *** [purgatory/purgatory.ro] Error 1 +| ERROR: oe_runmake failed + + +Index: kexec-tools-2.0.2/kexec/kexec.c +=== +--- kexec-tools-2.0.2.orig/kexec/kexec.c kexec-tools-2.0.2/kexec/kexec.c +@@ -815,7 +815,7 @@ static int my_shutdown(void) + */ + static int my_exec(void) + { +- int result; ++ int __attribute__((__unused__)) result; + + result = kexec_reboot(); + /* I have failed if I make it here */ +Index: kexec-tools-2.0.2/purgatory/Makefile +=== +--- kexec-tools-2.0.2.orig/purgatory/Makefile kexec-tools-2.0.2/purgatory/Makefile +@@ -56,7 +56,7 @@ $(PURGATORY): CPPFLAGS=$($(ARCH)_PURGATO + -I$(srcdir)/include \ + -I$(shell $(CC) -print-file-name=include) + $(PURGATORY): LDFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS)\ +- --no-undefined -nostartfiles -nostdlib -nodefaultlibs \ ++ -Wl,--no-undefined -nostartfiles -nostdlib -nodefaultlibs \ + -e purgatory_start -r + + $(PURGATORY): $(PURGATORY_OBJS) diff --git a/meta/recipes-kernel/kexec/kexec-tools_2.0.2.bb b/meta/recipes-kernel/kexec/kexec-tools_2.0.2.bb index 0d15b5b..caed816 100644 --- a/meta/recipes-kernel/kexec/kexec-tools_2.0.2.bb +++ b/meta/recipes-kernel/kexec/kexec-tools_2.0.2.bb @@ -2,7 +2,8 @@ require kexec-tools.inc export LDFLAGS = "-L${STAGING_LIBDIR}" EXTRA_OECONF = " --with-zlib=yes" -PR = "r0" +PR = "r1" +SRC_URI += " file://fix_for_compiling_with_gcc-4.6.0.patch" SRC_URI[md5sum] = "bc401cf3262b25ff7c9a51fc76c8ab91" SRC_URI[sha256sum] = "549ab65c18a2229b6bf21b6875ca6bbe0e579bca08c3543ce6aaf8287a0b4188" -- 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 3/5] pax: fix for compiling with gcc 4.6.0
From: Nitin A Kamble Signed-off-by: Nitin A Kamble --- .../pax/pax/fix_for_compile_with_gcc-4.6.0.patch | 25 meta/recipes-extended/pax/pax_3.4.bb |5 ++- 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-extended/pax/pax/fix_for_compile_with_gcc-4.6.0.patch diff --git a/meta/recipes-extended/pax/pax/fix_for_compile_with_gcc-4.6.0.patch b/meta/recipes-extended/pax/pax/fix_for_compile_with_gcc-4.6.0.patch new file mode 100644 index 000..33554cc --- /dev/null +++ b/meta/recipes-extended/pax/pax/fix_for_compile_with_gcc-4.6.0.patch @@ -0,0 +1,25 @@ +Upstream-Status="Pending" + +This patch fixes this compiler error with gcc 4.6.0 + +Nitin A Kamble 2011/05/08 + +| fts.c: In function 'pax_fts_set': +| fts.c:469:7: error: parameter 'sp' set but not used [-Werror=unused-but-set-parameter] +| cc1: all warnings being treated as errors +| +| make[2]: *** [fts.o] Error 1 + +Index: pax-3.4/lib/fts.c +=== +--- pax-3.4.orig/lib/fts.c pax-3.4/lib/fts.c +@@ -466,7 +466,7 @@ name: t = sp->fts_path + NAPPEND(p->fts + /* ARGSUSED */ + int + fts_set(sp, p, instr) +- FTS *sp; ++ FTS __attribute__((__unused__)) *sp; + FTSENT *p; + int instr; + { diff --git a/meta/recipes-extended/pax/pax_3.4.bb b/meta/recipes-extended/pax/pax_3.4.bb index b0f358a..e9c70d6 100644 --- a/meta/recipes-extended/pax/pax_3.4.bb +++ b/meta/recipes-extended/pax/pax_3.4.bb @@ -10,9 +10,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4b0b674dfdc56daa3832d4069b820ea0 \ file://lib/vis.h;endline=40;md5=b283f759abd4a5ad7e014b80f51fc053" SECTION = "base" -PR = "r0" +PR = "r1" -SRC_URI = "ftp://ftp.suse.com/pub/people/kukuk/pax/pax-${PV}.tar.bz2"; +SRC_URI = "ftp://ftp.suse.com/pub/people/kukuk/pax/pax-${PV}.tar.bz2 \ + file://fix_for_compile_with_gcc-4.6.0.patch" SRC_URI[md5sum] = "fbd9023b590b45ac3ade95870702a0d6" SRC_URI[sha256sum] = "ac3c06048e02828077cf7757d3d142241429238893b91d529af29a2e8cc5623b" -- 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 0/5] Misc fixes related to gcc 4.6.0
From: Nitin A Kamble Pull URL: git://git.pokylinux.org/poky-contrib.git Branch: nitin/misc Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=nitin/misc Thanks, Nitin A Kamble --- Khem Raj (1): gcc-4.6.0: Apply linaro patches Nitin A Kamble (4): mdadm: compilation fix for gcc 4.6.0 pax: fix for compiling with gcc 4.6.0 systemtap: fix for compilation with gcc 4.6.0 kexec-tools: fix compiler errors with gcc 4.6.0 meta/recipes-devtools/gcc/gcc-4.6.0.inc|4 + .../gcc-4.6.0/linaro/gcc-4.6-linaro-r106720.patch | 51 ++ .../gcc-4.6.0/linaro/gcc-4.6-linaro-r106723.patch | 63 ++ .../gcc-4.6.0/linaro/gcc-4.6-linaro-r106729.patch | 32 + .../gcc-4.6.0/linaro/gcc-4.6-linaro-r106731.patch | 28 + .../gcc-4.6.0/linaro/gcc-4.6-linaro-r106733.patch | 653 .../gcc-4.6.0/linaro/gcc-4.6-linaro-r106737.patch | 126 .../gcc-4.6.0/linaro/gcc-4.6-linaro-r106738.patch | 177 ++ .../gcc/gcc-4_6-branch-linaro-backports.inc|9 + .../mdadm/fix_for_compilation_with_gcc-4.6.0.patch | 174 ++ meta/recipes-extended/mdadm/mdadm_3.2.1.bb |5 +- .../pax/pax/fix_for_compile_with_gcc-4.6.0.patch | 25 + meta/recipes-extended/pax/pax_3.4.bb |5 +- .../fix_for_compiling_with_gcc-4.6.0.patch | 40 ++ meta/recipes-kernel/kexec/kexec-tools_2.0.2.bb |3 +- .../fix_for_compilation_with_gcc-4.6.0.patch | 119 meta/recipes-kernel/systemtap/systemtap_git.bb |3 +- 17 files changed, 1511 insertions(+), 6 deletions(-) create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/linaro/gcc-4.6-linaro-r106720.patch create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/linaro/gcc-4.6-linaro-r106723.patch create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/linaro/gcc-4.6-linaro-r106729.patch create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/linaro/gcc-4.6-linaro-r106731.patch create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/linaro/gcc-4.6-linaro-r106733.patch create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/linaro/gcc-4.6-linaro-r106737.patch create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/linaro/gcc-4.6-linaro-r106738.patch create mode 100644 meta/recipes-devtools/gcc/gcc-4_6-branch-linaro-backports.inc create mode 100644 meta/recipes-extended/mdadm/mdadm/fix_for_compilation_with_gcc-4.6.0.patch create mode 100644 meta/recipes-extended/pax/pax/fix_for_compile_with_gcc-4.6.0.patch create mode 100644 meta/recipes-kernel/kexec/kexec-tools/fix_for_compiling_with_gcc-4.6.0.patch create mode 100644 meta/recipes-kernel/systemtap/systemtap/fix_for_compilation_with_gcc-4.6.0.patch -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Patch for fixing build issues with external kernel modules.
On 05/09/2011 11:38 AM, Franz Leitl wrote: > Am Montag 09 Mai 2011, 20:23:19 schrieb Darren Hart: >> On 05/09/2011 10:53 AM, Koen Kooi wrote: >>> Op 9 mei 2011, om 19:32 heeft Franz Leitl het volgende geschreven: Hi, Am Montag 09 Mai 2011, 18:28:06 schrieben Sie: >> I've tried to get compcache kernel module building against 2.6.34 from >> shr- core but found some issues with kernel.bbclass and >> module.bbclass. >> >> The kernel.bbclass deletes the .c files from scripts directory which >> are later needed by make prepare to recreate bound.h and other files. >> Compcache kernel module, for example, depends on bounds.h. > > The bounds.h should not need to be recreated. It is created during the > build of the kernel, and since 2.6.26, the makefile knows not to remove > it. Compache does not build without bounds.h and this file is missing in the staging directory for what ever reason. >>> >>> I ran into the same and I did the following: >>> >>> http://git.angstrom-distribution.org/cgi-bin/cgit.cgi/meta-texasinstrumen >>> ts/commit/?id=7bcba149f05cc9c5d8ce956ee40e2c6849601470 >> >> Thanks Koen, I knew we had discussed this once before. In your case, >> IIRC, you found that the "make clean" deleted bounds.h, even with the >> fix from 2.6.26 applied. >> >> At the time we agreed that patching the kernel bbclasses for a bug in a >> particular kernel version wasn't a good plan. I'm concerned that Franz >> is hitting this with 2.6.34. >> >> Franz, can you confirm that bounds.h exists before the clean and does >> not exist after the clean? Some simple instrumentation to kernel.bbclass >> should be able to do this. > I'll try to find out. > >> If so, we need to look into why that is happening. Simply not deleting >> the C files from the source isn't an acceptable fix to save 1 file. > The c files are deleted by the kernel.bbclass not by "make clean" while make > clean deletes the bounds.h... Who is doing the wrong thing now? > kernel.bbclass > removing the bounds.c, kernel's make clean removing the bounds.h or the > module > author relying on modules.h? The kernel should not remove bounds.h, that is documented in the Makefile. If it does, it's a bug. > > I don't know if/what the problem is with regenerating some things in > module.bbclass. It is already done with "make scripts". Cleaning up > things to save diskspace and recreating if needed does not seem to > bad to me. Am I missing something? The scripts are regenerated as they are host specific. If you were to use an sstate package, you don't want host-specific binaries in it. (We aren't there yet, but we want to keep that in mind). It's just about fixing it properly instead of applying a band-aid. Regenerating something that shouldn't have been deleted in the first place is a band-aid, and you can go that route in your own recipe if you like (per Koen's patch), but that doesn't belong in the core kernel classes. Thanks, -- 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
[OE-core] Pull request with misc changes
Hello, This pull request fixes some issues I found since the last pull request and should be preferred against the first. The following changes since commit d0dc2b5bb02ef55a41e7a97b6831c72391ae7f36: u-boot: correct COPYING MD5SUM (2011-05-08 23:56:11 -0700) are available in the git repository at: git://github.com/OSSystems/oe-core master Otavio Salvador (10): meta/conf/local.conf.sample: fix mklibs comment line split and typo scripts/oe-setup-builddir: fix typo syslinux: improve packaging busybox: add support to mdev libxkbfile: disable xcb insane.bbclass: skip license checksum if LICENSE is "CLOSED" cmake.bbclass: fix qmake and rpath issues qmake_base.bbclass: add generate_qt_config_file task cmake: add support for oe qt4 tools names fuse: drop since it is not used by other recipes .../fuse-2.7.2/not-run-updaterc.d-on-host.patch| 15 meta-demoapps/recipes-kernel/fuse/fuse.inc | 13 --- meta-demoapps/recipes-kernel/fuse/fuse_2.7.2.bb| 22 - meta/classes/cmake.bbclass | 19 - meta/classes/insane.bbclass|4 + meta/classes/qmake_base.bbclass| 15 meta/conf/local.conf.sample|7 +- meta/recipes-core/busybox/busybox.inc | 14 +++- meta/recipes-core/busybox/busybox_1.18.4.bb|2 + meta/recipes-core/busybox/files/mdev |7 ++ meta/recipes-core/busybox/files/mdev.conf | 35 meta/recipes-devtools/cmake/cmake-native_2.8.3.bb |2 +- meta/recipes-devtools/cmake/cmake.inc |3 +- .../cmake/cmake/support-oe-qt4-tools-names.patch | 85 meta/recipes-devtools/syslinux/syslinux_4.03.bb| 12 +++- meta/recipes-graphics/xorg-lib/libxkbfile_1.0.7.bb |4 +- scripts/oe-setup-builddir |2 +- 17 files changed, 199 insertions(+), 62 deletions(-) delete mode 100644 meta-demoapps/recipes-kernel/fuse/fuse-2.7.2/not-run-updaterc.d-on-host.patch delete mode 100644 meta-demoapps/recipes-kernel/fuse/fuse.inc delete mode 100644 meta-demoapps/recipes-kernel/fuse/fuse_2.7.2.bb create mode 100755 meta/recipes-core/busybox/files/mdev create mode 100644 meta/recipes-core/busybox/files/mdev.conf create mode 100644 meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch -- Otavio Salvador O.S. Systems E-mail: ota...@ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/6] Fix recipes for uclibc and others
These patches address build failures when using uclibc oe/patch.py fix is a backport from oe, we need to fix BBFILES for oe-core since some class code expects it to be first entry in BBFILES. gconf-dbus to dbus is needed for SDKs to compile for angstrom Pull URL: git://git.openembedded.org/openembedded-core-contrib Branch: kraj/misc-fixes Browse: http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=kraj/misc-fixes Thanks, Khem Raj --- Khem Raj (6): recipes: Replace gconf-dbus with gconf conf/layer.conf: Use .= to append to BBPATH and =+ for BBFILES libgalago_0.5.2.bb: Fix compile for uclibc liburcu_0.5.4.bb: Let it build on uclibc targets lttng-ust_0.12.bb: Fix compilation on uclibc oe/patch.py: Remove series file during Clean() .../recipes-gnome/gnome/libgnomekbd_2.26.0.bb |2 +- meta/conf/layer.conf | 10 - meta/lib/oe/patch.py |1 + .../recipes-connectivity/galago/libgalago_0.5.2.bb |4 ++ meta/recipes-gnome/gnome/gnome-desktop.inc |2 +- meta/recipes-gnome/gthumb/gthumb_2.12.2.bb |2 +- meta/recipes-gnome/tasks/task-sdk-gmae.inc |2 +- .../lttng/lttng-ust/uclibc-sched_getcpu.patch | 50 meta/recipes-kernel/lttng/lttng-ust_0.12.bb|4 +- meta/recipes-support/libproxy/libproxy_0.4.6.bb|2 +- meta/recipes-support/liburcu/liburcu_0.5.4.bb |2 +- 11 files changed, 73 insertions(+), 8 deletions(-) create mode 100644 meta/recipes-kernel/lttng/lttng-ust/uclibc-sched_getcpu.patch -- 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 6/6] oe/patch.py: Remove series file during Clean()
Currently if there is a failed do_patch the series files get appended so if there were two patches a.patch b.patch and b.patch failed during next run it would append a.patch again a.patch b.patch a.patch and this would keep growing. We can remove series file in Clean() because we populate it in Import() anyway Signed-off-by: Khem Raj Acked-by: Chris Larson Acked-by: Eric Bénard --- meta/lib/oe/patch.py |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py index 16d3d08..1406e19 100644 --- a/meta/lib/oe/patch.py +++ b/meta/lib/oe/patch.py @@ -198,6 +198,7 @@ class QuiltTree(PatchSet): def Clean(self): try: self._runcmd(["pop", "-a", "-f"]) +oe.path.remove(os.path.join(self.dir, "patches","series")) except Exception: pass self.initialized = True -- 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 5/6] lttng-ust_0.12.bb: Fix compilation on uclibc
We provide alternative implementation of sched_getcpu() when compiling for uclibc Signed-off-by: Khem Raj --- .../lttng/lttng-ust/uclibc-sched_getcpu.patch | 50 meta/recipes-kernel/lttng/lttng-ust_0.12.bb|4 +- 2 files changed, 53 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-kernel/lttng/lttng-ust/uclibc-sched_getcpu.patch diff --git a/meta/recipes-kernel/lttng/lttng-ust/uclibc-sched_getcpu.patch b/meta/recipes-kernel/lttng/lttng-ust/uclibc-sched_getcpu.patch new file mode 100644 index 000..7102a69 --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-ust/uclibc-sched_getcpu.patch @@ -0,0 +1,50 @@ +uClibc does not have sched_getcpu() implemented. So we create a wrapper +to getcpu syscall when compiling for uclibc. + +So far execinfo.h does not exist on uclibc but it turns out to be that +this header is not needed even in eglibc case so it can be removed + +Signed-off-by: Khem Raj + +Upstream-status: Pending + +Index: ust-0.12/libust/tracer.h +=== +--- ust-0.12.orig/libust/tracer.h ust-0.12/libust/tracer.h +@@ -342,14 +342,22 @@ static __inline__ void ltt_write_trace_h + header->start_freq = trace->start_freq; + header->freq_scale = trace->freq_scale; + } +- ++#ifdef __UCLIBC__ ++#define sched_getcpu(cpu, node, cache) syscall(__NR_getcpu, cpu, node, cache) ++#endif + #ifndef UST_VALGRIND + + static __inline__ int ust_get_cpu(void) + { + int cpu; + ++#ifdef __UCLIBC__ ++ int c, s; ++ s = syscall(__NR_getcpu, &c, NULL, NULL); ++ cpu = (s == -1) ? s : c; ++#else + cpu = sched_getcpu(); ++#endif + if (likely(cpu >= 0)) + return cpu; + /* +Index: ust-0.12/libustcomm/ustcomm.c +=== +--- ust-0.12.orig/libustcomm/ustcomm.c ust-0.12/libustcomm/ustcomm.c +@@ -31,7 +31,6 @@ + #include + #include + #include +-#include + + #include "ustcomm.h" + #include "usterr.h" diff --git a/meta/recipes-kernel/lttng/lttng-ust_0.12.bb b/meta/recipes-kernel/lttng/lttng-ust_0.12.bb index 7dadc04..5fca949 100644 --- a/meta/recipes-kernel/lttng/lttng-ust_0.12.bb +++ b/meta/recipes-kernel/lttng/lttng-ust_0.12.bb @@ -12,7 +12,9 @@ DEPENDS = "liburcu" PR = "r0" -SRC_URI = "http://lttng.org/files/ust/releases/ust-${PV}.tar.gz"; +SRC_URI = "http://lttng.org/files/ust/releases/ust-${PV}.tar.gz \ + file://uclibc-sched_getcpu.patch \ + " SRC_URI[md5sum] = "fae6e324a56016658c5b83ec14ba0043" SRC_URI[sha256sum] = "215b05f47d0c9e3a2934926a7d14fa9c67025db917c3a1f641df40b08314ab0c" -- 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 4/6] liburcu_0.5.4.bb: Let it build on uclibc targets
uclibc requires -D_GNU_SOURCE to be defined for it to enable GNU extensions which CPU_SET/CPU_ZERO are used by this package. So we add -D_GNU_SOURCE to CFLAGS when compiling for uclibc. Signed-off-by: Khem Raj --- meta/recipes-support/liburcu/liburcu_0.5.4.bb |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta/recipes-support/liburcu/liburcu_0.5.4.bb b/meta/recipes-support/liburcu/liburcu_0.5.4.bb index 8e17e5d..b83d708 100644 --- a/meta/recipes-support/liburcu/liburcu_0.5.4.bb +++ b/meta/recipes-support/liburcu/liburcu_0.5.4.bb @@ -15,7 +15,7 @@ SRC_URI[md5sum] = "04147d24749be75200173859839207f7" SRC_URI[sha256sum] = "02aedbb16c16bd034e246d5c9637a9232be559c66fc2fe4eb28948e234bd89f1" S = "${WORKDIR}/userspace-rcu-${PV}" - +CFLAGS_append_libc-uclibc = " -D_GNU_SOURCE" inherit autotools # liburcu, which is only used by lttng-ust, may not build on other -- 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/6] recipes: Replace gconf-dbus with gconf
Some distributions e.g. angstrom do not support gconf-dbus anymore since its now provided by gconf and in oe-core we have PREFERRED_PROVIDER_gconf tunable, here we replace all dependencies on gconf-dbus with gconf, which should work in both cases where poky defines PREFERRED_PROVIDER-gconf = "gconf-dbus" and for angstrom it is simply gconf Without this meta-toolchain-sdk ends up with conflicts in runqueue and does not build Signed-off-by: Khem Raj --- .../recipes-gnome/gnome/libgnomekbd_2.26.0.bb |2 +- meta/recipes-gnome/gnome/gnome-desktop.inc |2 +- meta/recipes-gnome/gthumb/gthumb_2.12.2.bb |2 +- meta/recipes-gnome/tasks/task-sdk-gmae.inc |2 +- meta/recipes-support/libproxy/libproxy_0.4.6.bb|2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-demoapps/recipes-gnome/gnome/libgnomekbd_2.26.0.bb b/meta-demoapps/recipes-gnome/gnome/libgnomekbd_2.26.0.bb index f2e4ec5..68e4eee 100644 --- a/meta-demoapps/recipes-gnome/gnome/libgnomekbd_2.26.0.bb +++ b/meta-demoapps/recipes-gnome/gnome/libgnomekbd_2.26.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "GNOME keyboard library" LICENSE = "LGPL" -DEPENDS = "gconf-dbus dbus libxklavier gtk+" +DEPENDS = "gconf dbus libxklavier gtk+" inherit gnome diff --git a/meta/recipes-gnome/gnome/gnome-desktop.inc b/meta/recipes-gnome/gnome/gnome-desktop.inc index 123f82d..336b87f 100644 --- a/meta/recipes-gnome/gnome/gnome-desktop.inc +++ b/meta/recipes-gnome/gnome/gnome-desktop.inc @@ -1,7 +1,7 @@ DESCRIPTION = "GNOME library for reading .desktop files" SECTION = "x11/gnome" LICENSE = "GPLv2 & LGPLv2" -DEPENDS = "gconf-dbus libxrandr virtual/libx11 gtk+ glib-2.0 gnome-doc-utils" +DEPENDS = "gconf libxrandr virtual/libx11 gtk+ glib-2.0 gnome-doc-utils" EXTRA_OECONF = "--disable-scrollkeeper --disable-desktop-docs" diff --git a/meta/recipes-gnome/gthumb/gthumb_2.12.2.bb b/meta/recipes-gnome/gthumb/gthumb_2.12.2.bb index 0b3bd1a..258f2d5 100644 --- a/meta/recipes-gnome/gthumb/gthumb_2.12.2.bb +++ b/meta/recipes-gnome/gthumb/gthumb_2.12.2.bb @@ -2,7 +2,7 @@ DESCRIPTION = "gThumb is an image viewer and browser for the GNOME Desktop" SECTION = "x11/gnome" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" -DEPENDS = "glib-2.0 gtk+ libxml2 gnome-doc-utils libunique gconf-dbus libpng gstreamer jpeg tiff gst-plugins-base" +DEPENDS = "glib-2.0 gtk+ libxml2 gnome-doc-utils libunique gconf libpng gstreamer jpeg tiff gst-plugins-base" PR = "r0" EXTRA_OECONF = "--disable-gnome-keyring --disable-libsoup --disable-exiv2 --disable-clutter" diff --git a/meta/recipes-gnome/tasks/task-sdk-gmae.inc b/meta/recipes-gnome/tasks/task-sdk-gmae.inc index 586d76f..b24fc9e 100644 --- a/meta/recipes-gnome/tasks/task-sdk-gmae.inc +++ b/meta/recipes-gnome/tasks/task-sdk-gmae.inc @@ -4,7 +4,7 @@ SDK-GMAE = " \ gtk+-dev \ gstreamer-dev \ bluez4-dev \ -gconf-dbus-dev \ +gconf-dev \ avahi-dev \ telepathy-glib-dev \ eds-dbus-dev \ diff --git a/meta/recipes-support/libproxy/libproxy_0.4.6.bb b/meta/recipes-support/libproxy/libproxy_0.4.6.bb index 255cd5b..2e18065 100644 --- a/meta/recipes-support/libproxy/libproxy_0.4.6.bb +++ b/meta/recipes-support/libproxy/libproxy_0.4.6.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7d704a7b1b116e8783edcdb44ff4 \ file://utils/proxy.c;beginline=1;endline=18;md5=55152a1006d7dafbef32baf9c30a99c0" -DEPENDS = "virtual/libx11 xmu gconf-dbus" +DEPENDS = "virtual/libx11 xmu gconf" SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.tar.gz"; -- 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 3/6] libgalago_0.5.2.bb: Fix compile for uclibc
uclibc targets may not have gettext but this package still needs config.rpath during regenerating configury so we provide it when libc is uclibc. Signed-off-by: Khem Raj --- .../recipes-connectivity/galago/libgalago_0.5.2.bb |4 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/meta/recipes-connectivity/galago/libgalago_0.5.2.bb b/meta/recipes-connectivity/galago/libgalago_0.5.2.bb index 6d9f76b..3a47620 100644 --- a/meta/recipes-connectivity/galago/libgalago_0.5.2.bb +++ b/meta/recipes-connectivity/galago/libgalago_0.5.2.bb @@ -18,3 +18,7 @@ PR = "r2" inherit autotools pkgconfig gettext EXTRA_OECONF = "--disable-tests --disable-check" + +do_configure_prepend_libc-uclibc() { +touch ${S}/config.rpath +} -- 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 2/6] conf/layer.conf: Use .= to append to BBPATH and =+ for BBFILES
Appending to BBPATH gives a definite order to BBLAYERS which means paths are preferred in order from left to right. Signed-off-by: Khem Raj --- meta/conf/layer.conf | 10 +- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf index 3f63c7d..10a6948 100644 --- a/meta/conf/layer.conf +++ b/meta/conf/layer.conf @@ -2,7 +2,15 @@ BBPATH ?= "" # We have a conf and classes directory, add to BBPATH BBPATH .= ":${LAYERDIR}" # We have a packages directory, add to BBFILES -BBFILES += "${LAYERDIR}/packages/*/*.bb ${LAYERDIR}/recipes-*/*/*.bb" +# packages is still there because metadata_scm.bbclass still uses +# it to deduce the repo directory and thats the reason to prepend +# to BBFILES here because this class uses the first entry in +# BBFILES to calculate the scm base. +# since the order of BBFLILES is not that important its acted upon +# using BBFILES_PRIORITY we are ok to keep the oe-core BBFILES dir +# at top + +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
Re: [OE-core] Patch for fixing build issues with external kernel modules.
Am Montag 09 Mai 2011, 20:23:19 schrieb Darren Hart: > On 05/09/2011 10:53 AM, Koen Kooi wrote: > > Op 9 mei 2011, om 19:32 heeft Franz Leitl het volgende geschreven: > >> Hi, > >> > >> Am Montag 09 Mai 2011, 18:28:06 schrieben Sie: > I've tried to get compcache kernel module building against 2.6.34 from > shr- core but found some issues with kernel.bbclass and > module.bbclass. > > The kernel.bbclass deletes the .c files from scripts directory which > are later needed by make prepare to recreate bound.h and other files. > Compcache kernel module, for example, depends on bounds.h. > >>> > >>> The bounds.h should not need to be recreated. It is created during the > >>> build of the kernel, and since 2.6.26, the makefile knows not to remove > >>> it. > >> > >> Compache does not build without bounds.h and this file is missing in the > >> staging directory for what ever reason. > > > > I ran into the same and I did the following: > > > > http://git.angstrom-distribution.org/cgi-bin/cgit.cgi/meta-texasinstrumen > > ts/commit/?id=7bcba149f05cc9c5d8ce956ee40e2c6849601470 > > Thanks Koen, I knew we had discussed this once before. In your case, > IIRC, you found that the "make clean" deleted bounds.h, even with the > fix from 2.6.26 applied. > > At the time we agreed that patching the kernel bbclasses for a bug in a > particular kernel version wasn't a good plan. I'm concerned that Franz > is hitting this with 2.6.34. > > Franz, can you confirm that bounds.h exists before the clean and does > not exist after the clean? Some simple instrumentation to kernel.bbclass > should be able to do this. I'll try to find out. > If so, we need to look into why that is happening. Simply not deleting > the C files from the source isn't an acceptable fix to save 1 file. The c files are deleted by the kernel.bbclass not by "make clean" while make clean deletes the bounds.h... Who is doing the wrong thing now? kernel.bbclass removing the bounds.c, kernel's make clean removing the bounds.h or the module author relying on modules.h? I don't know if/what the problem is with regenerating some things in module.bbclass. It is already done with "make scripts". Cleaning up things to save diskspace and recreating if needed does not seem to bad to me. Am I missing something? Regards, Franz ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/3] linux-yocto: consolidated pull request
Saul/Richard, The first two patches are a split and resend of the machine movement patch: [ linux-yocto: move non-core machines to meta-yocto The machine configuration of the non-core (non-qemu) machines has moved to meta-yocto. Moving the branch mappings, compatibility and SRCREVs of these machines to meta-yocto should also be done. Anyone using meta-yocto to build these machines will see no impact from this change. ] Patch #3 is a sanity check that shows a problem that Tom managed to hit, and cause us some significant debug time. If for some reason (we still don't have a root cause) the kernel repo is cloned without tags and/or meta data, we can now detect it and throw an informative error message rather than generating meta data and building "something". cc: Darren Hart cc: Tom Zanussi Pull URL: git://git.pokylinux.org/poky-contrib.git Branch: zedd/kernel Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel Thanks, Bruce Ashfield --- Bruce Ashfield (3): linux-yocto: remove non-core (qemu) machine compatibility linux-yocto: move non-core machines to meta-yocto linux-yocto: error if meta data not present meta-yocto/conf/layer.conf |3 ++- .../linux/linux-yocto-stable_git.bbappend | 12 .../recipes-kernel/linux/linux-yocto_git.bbappend | 12 meta/classes/kernel-yocto.bbclass |5 - .../kern-tools/kern-tools-native_git.bb|2 +- .../recipes-kernel/linux/linux-yocto-stable_git.bb | 10 +- meta/recipes-kernel/linux/linux-yocto_git.bb | 15 --- 7 files changed, 36 insertions(+), 23 deletions(-) create mode 100644 meta-yocto/recipes-kernel/linux/linux-yocto-stable_git.bbappend create mode 100644 meta-yocto/recipes-kernel/linux/linux-yocto_git.bbappend ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] linux-yocto: error if meta data not present
There are valid reasons to build repositories without meta data present and there are times when this is an error. This change adds sanity tests to the build process to detect missing meta data and throw an informative error message. Sanity checking is only triggered from recipes (linux-yocto) that always require meta data to be present. Other recipes are not impacted and can auto-generate meta data as required. Without this change the build process suceeds, but incorrect meta data will be used (with no user knowledge), which is not the desired behaviour. Signed-off-by: Bruce Ashfield --- meta/classes/kernel-yocto.bbclass |5 - .../kern-tools/kern-tools-native_git.bb|2 +- meta/recipes-kernel/linux/linux-yocto_git.bb |4 +++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index ffc0b4c..818a07e 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -13,7 +13,10 @@ do_patch() { fi # simply ensures that a branch of the right name has been created - createme ${ARCH} ${kbranch} ${defconfig} + if [ -n "${YOCTO_KERNEL_META_DATA}" ]; then + createme_flags="--disable-meta-gen" + fi + createme ${createme_flags} ${ARCH} ${kbranch} ${defconfig} if [ $? -ne 0 ]; then echo "ERROR. Could not create ${kbranch}" exit 1 diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index 820765e..c808e17 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=e2bf4415f3d8 DEPENDS = "git-native guilt-native" -SRCREV = "c5896a60acc61f8966cfee3bb241ff564610cea4" +SRCREV = "ab49d8e48b7e66d1b4f924385d65d062d25e44f7" PR = r10 PV = "0.1+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_git.bb b/meta/recipes-kernel/linux/linux-yocto_git.bb index d4f2ece..f54033d 100644 --- a/meta/recipes-kernel/linux/linux-yocto_git.bb +++ b/meta/recipes-kernel/linux/linux-yocto_git.bb @@ -22,7 +22,7 @@ SRCREV_machine_qemux86-64 = "b906f358fd404a1e74a961f25079274e0d933ee1" SRCREV_machine = "b906f358fd404a1e74a961f25079274e0d933ee1" SRCREV_meta = "ecab1e2bc12a8b0c4d064a00acc3260f6e8528c5" -PR = "r17" +PR = "r18" PV = "${LINUX_VERSION}+git${SRCPV}" SRCREV_FORMAT = "meta_machine" @@ -36,6 +36,8 @@ KERNEL_FEATURES="features/netfilter" KERNEL_FEATURES_append_qemux86=" cfg/sound" KERNEL_FEATURES_append_qemux86-64=" cfg/sound" +YOCTO_KERNEL_META_DATA=t + # extra tasks addtask kernel_link_vmlinux after do_compile before do_install addtask validate_branches before do_patch after do_kernel_checkout -- 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 1/3] linux-yocto: remove non-core (qemu) machine compatibility
The machine configuration of the non-core (non-qemu) machines exists in other layers. Moving the branch mappings, compatibility and SRCREVs of these machines out of the main linux-yocto recipe is the first step in that move. Signed-off-by: Bruce Ashfield Acked-by: Darren Hart --- .../recipes-kernel/linux/linux-yocto-stable_git.bb | 10 +- meta/recipes-kernel/linux/linux-yocto_git.bb | 11 +-- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-stable_git.bb b/meta/recipes-kernel/linux/linux-yocto-stable_git.bb index 93b06fd..66991ae 100644 --- a/meta/recipes-kernel/linux/linux-yocto-stable_git.bb +++ b/meta/recipes-kernel/linux/linux-yocto-stable_git.bb @@ -7,10 +7,6 @@ KMACHINE_qemux86-64 = "common_pc_64" KMACHINE_qemuppc = "qemu_ppc32" KMACHINE_qemumips = "mti_malta32_be" KMACHINE_qemuarm = "arm_versatile_926ejs" -KMACHINE_atom-pc = "atom-pc" -KMACHINE_routerstationpro = "routerstationpro" -KMACHINE_mpc8315e-rdb = "fsl-mpc8315e-rdb" -KMACHINE_beagleboard = "beagleboard" LINUX_VERSION ?= "2.6.34" LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE_EXTENSION}" @@ -23,10 +19,6 @@ SRCREV_machine_qemumips = "c32d40f960e3c89d07f079bec4c96dcbfc749f0b" SRCREV_machine_qemuppc = "96d6bc31d3caaf62a966255479cc5cee0e76b1e9" SRCREV_machine_qemux86 = "72ca49ab08b8eb475cec82a10049503602325791" SRCREV_machine_qemux86-64 = "72ca49ab08b8eb475cec82a10049503602325791" -SRCREV_machine_atom-pc = "72ca49ab08b8eb475cec82a10049503602325791" -SRCREV_machine_routerstationpro = "49745cd45c92a89e70c6e2334caa80818c134562" -SRCREV_machine_mpc8315e-rdb = "a1c0ed6bf4060c10874b2a8547d81b3169dcf16a" -SRCREV_machine_beagleboard = "ef7f944e773950d4016b7643f9ecf052bbe250cd" SRCREV_machine = "72ca49ab08b8eb475cec82a10049503602325791" SRCREV_meta = "ec26387cb168e9e0976999b528b5a9dd62e3157a" @@ -34,7 +26,7 @@ PR = "r1" PV = "${LINUX_VERSION}+git${SRCPV}" SRCREV_FORMAT = "meta_machine" -COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64|atom-pc|routerstationpro|mpc8315e-rdb|beagleboard)" +COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64)" # this performs a fixup on historical kernel types with embedded _'s python __anonymous () { diff --git a/meta/recipes-kernel/linux/linux-yocto_git.bb b/meta/recipes-kernel/linux/linux-yocto_git.bb index 3b4e77e..d4f2ece 100644 --- a/meta/recipes-kernel/linux/linux-yocto_git.bb +++ b/meta/recipes-kernel/linux/linux-yocto_git.bb @@ -7,10 +7,6 @@ KMACHINE_qemux86-64 = "yocto/standard/common-pc-64/base" KMACHINE_qemuppc = "yocto/standard/qemu-ppc32" KMACHINE_qemumips = "yocto/standard/mti-malta32-be" KMACHINE_qemuarm = "yocto/standard/arm-versatile-926ejs" -KMACHINE_atom-pc = "yocto/standard/common-pc/atom-pc" -KMACHINE_routerstationpro = "yocto/standard/routerstationpro" -KMACHINE_mpc8315e-rdb = "yocto/standard/fsl-mpc8315e-rdb" -KMACHINE_beagleboard = "yocto/standard/beagleboard" KBRANCH = ${KMACHINE} KMETA = meta @@ -23,11 +19,6 @@ SRCREV_machine_qemumips = "f5d26f2eda2be8b942172cda8f27de33ebf38ec3" SRCREV_machine_qemuppc = "7eb6c68d977d9039a2b5a734172b064a9d19cdc1" SRCREV_machine_qemux86 = "ad62d1aab734513cd96c8f4517f816420a218e77" SRCREV_machine_qemux86-64 = "b906f358fd404a1e74a961f25079274e0d933ee1" -SRCREV_machine_emenlow = "c3bbcb676f929c4fc0511a6e66494b8770d015a1" -SRCREV_machine_atom-pc = "b906f358fd404a1e74a961f25079274e0d933ee1" -SRCREV_machine_routerstationpro = "95ca94d2e71ca2db6822a37a7f575fa79c3d05d0" -SRCREV_machine_mpc8315e-rdb = "53c800c244e73d81d2832f6da306eeae3b09e5dc" -SRCREV_machine_beagleboard = "b906f358fd404a1e74a961f25079274e0d933ee1" SRCREV_machine = "b906f358fd404a1e74a961f25079274e0d933ee1" SRCREV_meta = "ecab1e2bc12a8b0c4d064a00acc3260f6e8528c5" @@ -37,7 +28,7 @@ SRCREV_FORMAT = "meta_machine" SRC_URI = "git://git.yoctoproject.org/linux-yocto-2.6.37;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta" -COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64|mpc8315e-rdb|routerstationpro|beagleboard)" +COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64)" # Functionality flags KERNEL_REVISION_CHECKING ?= "t" -- 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 2/3] linux-yocto: move non-core machines to meta-yocto
The non-qemu compatibility references have been removed from the main linux-yocto recipe. This change restores them in the meta-yocto layer. Signed-off-by: Bruce Ashfield Acked-by: Darren Hart --- meta-yocto/conf/layer.conf |3 ++- .../linux/linux-yocto-stable_git.bbappend | 12 .../recipes-kernel/linux/linux-yocto_git.bbappend | 12 3 files changed, 26 insertions(+), 1 deletions(-) create mode 100644 meta-yocto/recipes-kernel/linux/linux-yocto-stable_git.bbappend create mode 100644 meta-yocto/recipes-kernel/linux/linux-yocto_git.bbappend diff --git a/meta-yocto/conf/layer.conf b/meta-yocto/conf/layer.conf index f11d8ed..68786b2 100644 --- a/meta-yocto/conf/layer.conf +++ b/meta-yocto/conf/layer.conf @@ -2,7 +2,8 @@ BBPATH := "${BBPATH}:${LAYERDIR}" # We have a packages directory, add to BBFILES -BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb" +BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ +${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "yocto" BBFILE_PATTERN_yocto := "^${LAYERDIR}/" diff --git a/meta-yocto/recipes-kernel/linux/linux-yocto-stable_git.bbappend b/meta-yocto/recipes-kernel/linux/linux-yocto-stable_git.bbappend new file mode 100644 index 000..ea0287d --- /dev/null +++ b/meta-yocto/recipes-kernel/linux/linux-yocto-stable_git.bbappend @@ -0,0 +1,12 @@ +KMACHINE_atom-pc = "atom-pc" +KMACHINE_routerstationpro = "routerstationpro" +KMACHINE_mpc8315e-rdb = "fsl-mpc8315e-rdb" +KMACHINE_beagleboard = "beagleboard" + +SRCREV_machine_atom-pc = "72ca49ab08b8eb475cec82a10049503602325791" +SRCREV_machine_routerstationpro = "49745cd45c92a89e70c6e2334caa80818c134562" +SRCREV_machine_mpc8315e-rdb = "a1c0ed6bf4060c10874b2a8547d81b3169dcf16a" +SRCREV_machine_beagleboard = "ef7f944e773950d4016b7643f9ecf052bbe250cd" + +COMPATIBLE_MACHINE += "(atom-pc|routerstationpro|mpc8315e-rdb|beagleboard)" + diff --git a/meta-yocto/recipes-kernel/linux/linux-yocto_git.bbappend b/meta-yocto/recipes-kernel/linux/linux-yocto_git.bbappend new file mode 100644 index 000..e4aa7fd --- /dev/null +++ b/meta-yocto/recipes-kernel/linux/linux-yocto_git.bbappend @@ -0,0 +1,12 @@ +KMACHINE_atom-pc = "yocto/standard/common-pc/atom-pc" +KMACHINE_routerstationpro = "yocto/standard/routerstationpro" +KMACHINE_mpc8315e-rdb = "yocto/standard/fsl-mpc8315e-rdb" +KMACHINE_beagleboard = "yocto/standard/beagleboard" + +SRCREV_machine_emenlow = "c3bbcb676f929c4fc0511a6e66494b8770d015a1" +SRCREV_machine_atom-pc = "b906f358fd404a1e74a961f25079274e0d933ee1" +SRCREV_machine_routerstationpro = "95ca94d2e71ca2db6822a37a7f575fa79c3d05d0" +SRCREV_machine_mpc8315e-rdb = "53c800c244e73d81d2832f6da306eeae3b09e5dc" +SRCREV_machine_beagleboard = "b906f358fd404a1e74a961f25079274e0d933ee1" + +COMPATIBLE_MACHINE = "(mpc8315e-rdb|routerstationpro|beagleboard)" -- 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 for fixing build issues with external kernel modules.
On 05/09/2011 10:53 AM, Koen Kooi wrote: > > Op 9 mei 2011, om 19:32 heeft Franz Leitl het volgende geschreven: > >> Hi, >> >> Am Montag 09 Mai 2011, 18:28:06 schrieben Sie: I've tried to get compcache kernel module building against 2.6.34 from shr- core but found some issues with kernel.bbclass and module.bbclass. The kernel.bbclass deletes the .c files from scripts directory which are later needed by make prepare to recreate bound.h and other files. Compcache kernel module, for example, depends on bounds.h. >>> >>> The bounds.h should not need to be recreated. It is created during the >>> build of the kernel, and since 2.6.26, the makefile knows not to remove >>> it. >> Compache does not build without bounds.h and this file is missing in the >> staging directory for what ever reason. > > I ran into the same and I did the following: > > http://git.angstrom-distribution.org/cgi-bin/cgit.cgi/meta-texasinstruments/commit/?id=7bcba149f05cc9c5d8ce956ee40e2c6849601470 Thanks Koen, I knew we had discussed this once before. In your case, IIRC, you found that the "make clean" deleted bounds.h, even with the fix from 2.6.26 applied. At the time we agreed that patching the kernel bbclasses for a bug in a particular kernel version wasn't a good plan. I'm concerned that Franz is hitting this with 2.6.34. Franz, can you confirm that bounds.h exists before the clean and does not exist after the clean? Some simple instrumentation to kernel.bbclass should be able to do this. If so, we need to look into why that is happening. Simply not deleting the C files from the source isn't an acceptable fix to save 1 file. -- Darren > > regards, > > Koen > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core -- 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 for fixing build issues with external kernel modules.
On 05/09/2011 10:32 AM, Franz Leitl wrote: > Hi, > > Am Montag 09 Mai 2011, 18:28:06 schrieben Sie: >>> I've tried to get compcache kernel module building against 2.6.34 from >>> shr- core but found some issues with kernel.bbclass and module.bbclass. >>> >>> The kernel.bbclass deletes the .c files from scripts directory which are >>> later needed by make prepare to recreate bound.h and other files. >>> Compcache kernel module, for example, depends on bounds.h. >> >> The bounds.h should not need to be recreated. It is created during the >> build of the kernel, and since 2.6.26, the makefile knows not to remove >> it. > Compache does not build without bounds.h and this file is missing in the > staging directory for what ever reason. Which version of oe-core are you using? > >>> The module.bbclass finally needs to call "make prepare" and also set >>> KERNEL_PATH in do_install when calling oe_runmake to get everything >>> installed correctly. >> >> Since we copy over the source tree after a simple clean, make prepare >> should also not be necessary: >> >> clean- Remove most generated files but keep the config and >> enough build support to build external modules > I could not find bounds.h in the staging directory, thus i tried to recreate > it with "make prepare" which failed as "make prepare" complains about missing > bounds.c which was note deleted by "make clean" but the kernel.bbclass' extra > cleaning of the script directory. > Even if "make prepare" may not be necessary in most cases shouldn't it be > fixed so that it would work properly in case someone really needs it? It should be fixed, yes, but not here. If bounds.h is being removed, the fix is to prevent that from happening, not regenerate later. -- Darren > >> So I'm curious about your workflow and why you are hitting these two >> issues. Can you share your recipes? > Workflow? I've just tried to build the compache recipe from classic OE which > I have modified to use the latest source from compcache mercurial repository > and added some stuff so it works with oe-core. > Why I'm hitting those problems is explained above. > I can send the recipe, but I have to prepare a patch first, as compcache > needs some additional patches to build with OE/bitbake. > >>> I also added KERNELDIR as compcache's Makefile is using it and the >>> classes from classic OE had it also set. >> >> I'm not familiar with compcache, but generally speaking we can't get in >> the habit of modifying the recipe classes to support whatever variables >> random external module Makefile expect. See recipes-kernel/hello-mod for >> an example Makefile that builds an external module using the existing >> infrastructure. You may just need a patch to the compcache Makefile for >> it to work within the existing infrastructure. > I already have to patch the Makefile, so changing the Makefile's KERNELDIR to > OE's KERNEL_PATH would be no problem. > > I removed the KERNELDIR as suggested, hope the patch is included and a bit > more acceptable this time. > > > Regards, > Franz > > > --- > meta/classes/kernel.bbclass |2 +- > meta/classes/module.bbclass |5 - > 2 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass > index 70a782f..9835130 100644 > --- a/meta/classes/kernel.bbclass > +++ b/meta/classes/kernel.bbclass > @@ -149,7 +149,7 @@ kernel_do_install() { > # > oe_runmake -C $kerneldir CC="${KERNEL_CC}" LD="${KERNEL_LD}" clean > make -C $kerneldir _mrproper_scripts > - find $kerneldir -path $kerneldir/scripts -prune -o -name "*.[csS]" > -exec rm '{}' \; > + find $kerneldir -path $kerneldir/scripts -prune -o -name "*.[sS]" -exec > rm '{}' \; > find $kerneldir/Documentation -name "*.txt" -exec rm '{}' \; > > # Remove the following binaries which cause strip errors > diff --git a/meta/classes/module.bbclass b/meta/classes/module.bbclass > index 572df0d..eeb7772 100644 > --- a/meta/classes/module.bbclass > +++ b/meta/classes/module.bbclass > @@ -11,7 +11,9 @@ inherit module-base > do_make_scripts() { > unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS > oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}" AR="${KERNEL_AR}" \ > --C ${STAGING_KERNEL_DIR} scripts > + -C ${STAGING_KERNEL_DIR} scripts > + oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}" AR="${KERNEL_AR}" \ > + -C ${STAGING_KERNEL_DIR} prepare > } > > module_do_compile() { > @@ -28,6 +30,7 @@ module_do_compile() { > module_do_install() { > unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS > oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" \ > + KERNEL_PATH=${STAGING_KERNEL_DIR} \ > KERNEL_SRC=${STAGING_KERNEL_DIR} \ > CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ > modules_install -- Darren Hart Intel Open Source Technology Center Yocto Proj
Re: [OE-core] Patch for fixing build issues with external kernel modules.
Op 9 mei 2011, om 19:32 heeft Franz Leitl het volgende geschreven: > Hi, > > Am Montag 09 Mai 2011, 18:28:06 schrieben Sie: >>> I've tried to get compcache kernel module building against 2.6.34 from >>> shr- core but found some issues with kernel.bbclass and module.bbclass. >>> >>> The kernel.bbclass deletes the .c files from scripts directory which are >>> later needed by make prepare to recreate bound.h and other files. >>> Compcache kernel module, for example, depends on bounds.h. >> >> The bounds.h should not need to be recreated. It is created during the >> build of the kernel, and since 2.6.26, the makefile knows not to remove >> it. > Compache does not build without bounds.h and this file is missing in the > staging directory for what ever reason. I ran into the same and I did the following: http://git.angstrom-distribution.org/cgi-bin/cgit.cgi/meta-texasinstruments/commit/?id=7bcba149f05cc9c5d8ce956ee40e2c6849601470 regards, Koen ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] fuse update
On Mon, May 9, 2011 at 13:46, Saul Wold wrote: > It would make sense for you to move it to meta-oe at this time, if we find > more recipes require it our other layers are needed it, then we can consider > it for oe-core. OK; I will queue a changeset removing it from OE-core. It makes no sense to have it there being not used. -- 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] Pull request with misc fixes
On Mon, May 9, 2011 at 14:06, Saul Wold wrote: > I am working on reviewing and staging them. I did not see a patch for the > libxbkfile, did I miss that email? I will be sending an updated pull request and post the patches with some fixes. Please wait for it for merging. -- 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] Patch for fixing build issues with external kernel modules.
Hi, Am Montag 09 Mai 2011, 18:28:06 schrieben Sie: > > I've tried to get compcache kernel module building against 2.6.34 from > > shr- core but found some issues with kernel.bbclass and module.bbclass. > > > > The kernel.bbclass deletes the .c files from scripts directory which are > > later needed by make prepare to recreate bound.h and other files. > > Compcache kernel module, for example, depends on bounds.h. > > The bounds.h should not need to be recreated. It is created during the > build of the kernel, and since 2.6.26, the makefile knows not to remove > it. Compache does not build without bounds.h and this file is missing in the staging directory for what ever reason. > > The module.bbclass finally needs to call "make prepare" and also set > > KERNEL_PATH in do_install when calling oe_runmake to get everything > > installed correctly. > > Since we copy over the source tree after a simple clean, make prepare > should also not be necessary: > > clean - Remove most generated files but keep the config and > enough build support to build external modules I could not find bounds.h in the staging directory, thus i tried to recreate it with "make prepare" which failed as "make prepare" complains about missing bounds.c which was note deleted by "make clean" but the kernel.bbclass' extra cleaning of the script directory. Even if "make prepare" may not be necessary in most cases shouldn't it be fixed so that it would work properly in case someone really needs it? > So I'm curious about your workflow and why you are hitting these two > issues. Can you share your recipes? Workflow? I've just tried to build the compache recipe from classic OE which I have modified to use the latest source from compcache mercurial repository and added some stuff so it works with oe-core. Why I'm hitting those problems is explained above. I can send the recipe, but I have to prepare a patch first, as compcache needs some additional patches to build with OE/bitbake. > > I also added KERNELDIR as compcache's Makefile is using it and the > > classes from classic OE had it also set. > > I'm not familiar with compcache, but generally speaking we can't get in > the habit of modifying the recipe classes to support whatever variables > random external module Makefile expect. See recipes-kernel/hello-mod for > an example Makefile that builds an external module using the existing > infrastructure. You may just need a patch to the compcache Makefile for > it to work within the existing infrastructure. I already have to patch the Makefile, so changing the Makefile's KERNELDIR to OE's KERNEL_PATH would be no problem. I removed the KERNELDIR as suggested, hope the patch is included and a bit more acceptable this time. Regards, Franz --- meta/classes/kernel.bbclass |2 +- meta/classes/module.bbclass |5 - 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 70a782f..9835130 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -149,7 +149,7 @@ kernel_do_install() { # oe_runmake -C $kerneldir CC="${KERNEL_CC}" LD="${KERNEL_LD}" clean make -C $kerneldir _mrproper_scripts - find $kerneldir -path $kerneldir/scripts -prune -o -name "*.[csS]" -exec rm '{}' \; + find $kerneldir -path $kerneldir/scripts -prune -o -name "*.[sS]" -exec rm '{}' \; find $kerneldir/Documentation -name "*.txt" -exec rm '{}' \; # Remove the following binaries which cause strip errors diff --git a/meta/classes/module.bbclass b/meta/classes/module.bbclass index 572df0d..eeb7772 100644 --- a/meta/classes/module.bbclass +++ b/meta/classes/module.bbclass @@ -11,7 +11,9 @@ inherit module-base do_make_scripts() { unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}" AR="${KERNEL_AR}" \ - -C ${STAGING_KERNEL_DIR} scripts + -C ${STAGING_KERNEL_DIR} scripts + oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}" AR="${KERNEL_AR}" \ + -C ${STAGING_KERNEL_DIR} prepare } module_do_compile() { @@ -28,6 +30,7 @@ module_do_compile() { module_do_install() { unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" \ + KERNEL_PATH=${STAGING_KERNEL_DIR} \ KERNEL_SRC=${STAGING_KERNEL_DIR} \ CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ modules_install -- 1.7.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Pull request with misc fixes
On 05/07/2011 12:14 PM, Otavio Salvador wrote: Hello, I have sent those patches to mailing list some days ago but they haven't been merged since it and some merged changes has conflicts that need to be fixed. So I did. Octavio, I am working on reviewing and staging them. I did not see a patch for the libxbkfile, did I miss that email? Sau! The following changes since commit 4f4bac0a459fe238e105e96b2b59b6af88e639c4: sanity.bbclass: Add cpio to list of required utilities tested for (2011-05-07 09:05:57 +0100) are available in the git repository at: git://github.com/OSSystems/oe-core.git master Otavio Salvador (5): meta/conf/local.conf.sample: fix mklibs comment line split and typo scripts/oe-setup-builddir: fix typo syslinux: improve packaging busybox: add support to mdev libxkbfile: disable xcb meta/conf/local.conf.sample|7 ++-- meta/recipes-core/busybox/busybox.inc | 14 +++- meta/recipes-core/busybox/busybox_1.18.4.bb|2 + meta/recipes-core/busybox/files/mdev |7 meta/recipes-core/busybox/files/mdev.conf | 35 meta/recipes-devtools/syslinux/syslinux_4.03.bb| 12 ++- meta/recipes-graphics/xorg-lib/libxkbfile_1.0.7.bb |4 ++- scripts/oe-setup-builddir |2 +- 8 files changed, 75 insertions(+), 8 deletions(-) create mode 100755 meta/recipes-core/busybox/files/mdev create mode 100644 meta/recipes-core/busybox/files/mdev.conf ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 8/8] scripts/send-pull-request: Add CC selectively
On Sat, 2011-05-07 at 10:57 -0700, Khem Raj wrote: > On Sat, May 7, 2011 at 9:23 AM, Darren Hart wrote: > > On Sat, 2011-05-07 at 00:54 -0700, Khem Raj wrote: Hi Khem, > >> Currently a consolidated pull request adds all the participants > >> to every patch, which in essence is good but might lose focus > >> of developers who would be interested to know about the patch > >> that developer contributed to. This patch fixes the script by > >> extracting the to and cc information from each patch one by one > >> and add it to patch mail header instead of doing a sweeping one > >> pass over all patches to collect all email addresses. It should > >> reduce some email traffic for developers. > > > > This behavior was intentional. If you don't want the CC applied to the > > entire series, you can just use git-send-email as this is its behavior. > > imho git request-pull would have been sufficient for us along with git > send-mail to post all patches for review Right. So some context on why I wrote this pair of scripts. There was an existing practice amongst the poky developers to only send a pull request and no patches, which effectively reduced the level of code review by complicating access to the patches for potential reviewers. IIRC there was an existing script to generate the pull request. In order to facilitate adoption of a new process which sent the patches to the list, but still kept the pull model that the community was accustomed to, I wrote the new scripts. I chose to avoid using git-send-email as not everyone had git setup to do mail, and I wasn't aware of "git request-pull" at the time. I always found not having all the CCs on the cover letter to be very frustrating, and defeating the purpose of the auto-cc feature, which is why I manually collect the CC. After some experience using these scripts, I agree that CC'ing the entire list on EVERY patch is probably overkill, and can lead to annoying people. I added a task to the Yocto Janitors list to use request-pull to generate the cover letter. One to keep the CC list local to each recipe is also a good idea. > and get acks and sign-offs then the they all can be collected using > patchwork or whatever way one likes and > then git pull-request can be sent > > Right now one one sends a pull requests and publishes the tree for > pull then feedback is given and one does another round and > repulishes the tree. So having all patches sent for review using git > send-mail and then form pull-requests once they are approved > would be a way to go > > > > In particular, it doesn't apply any of the addresses from the patches to > > the cover letter, which was my primary objection. > > yes once I did this I was sort of thinking that it would be > appropriate to CC all concerned on cover letter > Should be doable. > > > > > If you would like to modify this patch to apply the entire CC list to > > the cover letter, then I think you'll have addressed both of our > > concerns and I'll add my Acked-by. As it is, please do not accept this > > patch. I will nack it for poky and we don't want the two to diverge. > > > > Please include the primary author/maintainer of sources/recipes/etc. on > > CC. > > I guess this should be automated somehow too. That is a bit more tricky as there can be a long list of people involved with a particular file. Just doing a "git log FILE" is often enough to let you know who you're collaborating with, and who you need to CC. -- Darren > > > > > Thanks, > > > > -- > > Darren Hart > > Intel Open Source Technology Center > > Yocto Project - Linux Kernel > > > >> > >> Signed-off-by: Khem Raj > >> --- > >> scripts/send-pull-request | 51 > >> +--- > >> 1 files changed, 29 insertions(+), 22 deletions(-) > >> > >> diff --git a/scripts/send-pull-request b/scripts/send-pull-request > >> index 3af2a9f..36a89f4 100755 > >> --- a/scripts/send-pull-request > >> +++ b/scripts/send-pull-request > >> @@ -29,24 +29,38 @@ EOM > >> # Collect To and CC addresses from the patch files if they exist > >> # $1: Which header to add the recipients to, "TO" or "CC" > >> # $2: The regex to match and strip from the line with email addresses > >> +# $3: The patch which we are preparing to send > >> harvest_recipients() > >> { > >> TO_CC=$1 > >> REGX=$2 > >> +PATCH=$3 > >> export IFS=$',\n' > >> -for PATCH in $PDIR/*.patch; do > >> -# Grab To addresses > >> -for EMAIL in $(sed '/^---$/q' $PATCH | grep -e "$REGX" | sed > >> "s/$REGX//"); do > >> -if [ "$TO_CC" == "TO" ] && [ "${TO/$EMAIL/}" == "$TO" ] && [ > >> -n "$EMAIL" ]; then > >> -if [ -z "$TO" ]; then TO=$EMAIL; else TO="$TO,$EMAIL"; fi > >> -elif [ "$TO_CC" == "CC" ] && [ "${CC/$EMAIL/}" == "$CC" ] && > >> [ -n "$EMAIL" ]; then > >> -if [ -z "$CC" ]; then CC=$EMAIL; else CC="$CC,$EMAIL"; fi > >> -fi > >> -done > >> +# Grab To addr
Re: [OE-core] fuse update
On 05/03/2011 07:06 AM, Otavio Salvador wrote: Hello, I am migrating some stuff to oe-core and found it has fuse at meta-demoapps. It seems no recipes depends on fuse in oe-core and thus I am wondering how is better to deal with its updating as: - should it be done in oe-core? - should it be moved to meta-oe? The requirement for me to update it is due it being required by a new recipe I am adding to meta-oe and then it seems more logical to me to move fuse to meta-oe but I am curious to hear from others about it. It would make sense for you to move it to meta-oe at this time, if we find more recipes require it our other layers are needed it, then we can consider it for oe-core. Sau! Cheers, ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Patch for fixing build issues with external kernel modules.
On Mon, 2011-05-09 at 00:16 +0200, Franz Leitl wrote: > Hi, > > I've tried to get compcache kernel module building against 2.6.34 from shr- > core but found some issues with kernel.bbclass and module.bbclass. > > The kernel.bbclass deletes the .c files from scripts directory which are > later > needed by make prepare to recreate bound.h and other files. Compcache kernel > module, for example, depends on bounds.h. The bounds.h should not need to be recreated. It is created during the build of the kernel, and since 2.6.26, the makefile knows not to remove it. > The module.bbclass finally needs to call "make prepare" and also set > KERNEL_PATH in do_install when calling oe_runmake to get everything > installed correctly. Since we copy over the source tree after a simple clean, make prepare should also not be necessary: clean - Remove most generated files but keep the config and enough build support to build external modules So I'm curious about your workflow and why you are hitting these two issues. Can you share your recipes? > I also added KERNELDIR as compcache's Makefile is using it and the > classes from classic OE had it also set. I'm not familiar with compcache, but generally speaking we can't get in the habit of modifying the recipe classes to support whatever variables random external module Makefile expect. See recipes-kernel/hello-mod for an example Makefile that builds an external module using the existing infrastructure. You may just need a patch to the compcache Makefile for it to work within the existing infrastructure. > > Can someone please review the attached patch? > > > Regards, > Franz > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core -- 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] gettext.bbclass, bitbake.conf: Append nls options to EXTRA_OECONF instead of +=
On 05/05/2011 09:57 AM, Khem Raj wrote: 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 --- 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" ## Pulled 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] conf/layer.conf: Use .= to append to BBPATH and += for BBFILES
On 05/05/2011 10:00 PM, Khem Raj wrote: This helps bitbake in organising BBPATH and BBFILES with given BBFILE_PRIORITY order Signed-off-by: Khem Raj --- 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}/" 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 00/10] gcc-4.6.0 related fixes & patch upstream status updates
On 05/05/2011 08:36 PM, Nitin A Kamble wrote: From: Nitin A Kamble These are few commits for gcc 4.6.0& patch upstream status. Pull URL: git://git.pokylinux.org/poky-contrib.git Branch: nitin/misc Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=nitin/misc Thanks, Nitin A Kamble --- Khem Raj (2): gcc-4.6.0: Apply linaro patches linux-yocto_git.bb: Backport upstream fix for gcc 4.6 compilation Nitin A Kamble (8): libpcre: update upstream status for patches patch-2.6.1: update patch upstream status patch: update upstream status for patches python-imaging: update upstream status for patches subversion: update upstream status for patches sat-solver: fix compilation issue with gcc 4.6.0 gcc-4.5.1: update upstream status of patches binutils: update upstream status of patches .../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 + .../gcc/gcc-4.5.1/100-uclibc-conf.patch|2 + .../gcc/gcc-4.5.1/103-uclibc-conf-noupstream.patch |2 + .../gcc/gcc-4.5.1/200-uclibc-locale.patch |2 + .../gcc/gcc-4.5.1/203-uclibc-locale-no__x.patch|2 + .../gcc-4.5.1/204-uclibc-locale-wchar_fix.patch|2 + .../gcc/gcc-4.5.1/205-uclibc-locale-update.patch |2 + .../gcc/gcc-4.5.1/301-missing-execinfo_h.patch |2 + .../gcc/gcc-4.5.1/302-c99-snprintf.patch |2 + .../gcc/gcc-4.5.1/303-c99-complex-ugly-hack.patch |2 + .../gcc/gcc-4.5.1/304-index_macro.patch|2 + .../gcc-4.5.1/305-libmudflap-susv3-legacy.patch|2 + .../gcc/gcc-4.5.1/306-libstdc++-namespace.patch|2 + .../gcc/gcc-4.5.1/307-locale_facets.patch |2 + .../gcc/gcc-4.5.1/602-sdk-libstdc++-includes.patch |2 + .../recipes-devtools/gcc/gcc-4.5.1/64bithack.patch |2 + .../gcc/gcc-4.5.1/740-sh-pr24836.patch |2 + .../gcc/gcc-4.5.1/800-arm-bigendian.patch |2 + .../gcc/gcc-4.5.1/904-flatten-switch-stmt-00.patch |2 + .../gcc/gcc-4.5.1/arm-bswapsi2.patch |2 + .../gcc/gcc-4.5.1/arm-nolibfloat.patch |2 + .../gcc/gcc-4.5.1/arm-softfloat.patch |2 + meta/recipes-devtools/gcc/gcc-4.6.0.inc|4 + .../gcc-4.6.0/linaro/gcc-4.6-linaro-r106720.patch | 51 ++ .../gcc-4.6.0/linaro/gcc-4.6-linaro-r106723.patch | 63 ++ .../gcc-4.6.0/linaro/gcc-4.6-linaro-r106729.patch | 32 + .../gcc-4.6.0/linaro/gcc-4.6-linaro-r106731.patch | 28 + .../gcc-4.6.0/linaro/gcc-4.6-linaro-r106733.patch | 653 .../gcc-4.6.0/linaro/gcc-4.6-linaro-r106737.patch | 126 .../gcc-4.6.0/linaro/gcc-4.6-linaro-r106738.patch | 177 ++ .../gcc/gcc-4_6-branch-linaro-backports.inc|9 + .../patch/patch-2.6.1/global-reject-file.diff |2 + meta/recipes-devtools/patch/patch/debian.patch |2 + .../patch/patch/global-reject-file.diff|2 + meta/recipes-devtools/patch/patch/install.patch|2 + .../patch/patch/unified-reject-files.diff |2 + .../python/python-imaging/path.patch |2 + .../subversion/disable-revision-install.patch |2 + .../subversion/subversion/libtool2.patch |2 + .../subversion/subversion/neon-detection.patch |2 + .../sat-solver/fix_gcc-4.6.0_compile_issue.patch | 115 meta/recipes-extended/sat-solver/sat-solver_git.bb |5 +- .../perf-tool-Fix-gcc-4.6.0-issues.patch | 266 meta/recipes-kernel/linux/linux-yocto_git.bb |4 +- .../libpcre/files/fix-pcre-name-collision.patch|1 + .../recipes-support/libpcre/files/pcre-cross.patch |2 + 49 files changed, 1602 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/linaro/gcc-4.6-linaro-r106720.patch create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/linaro/gcc-4.6-linaro-r106723.patch create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/linaro/gcc-4.6-linaro-r106729.patch create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/linaro/gcc-4.6-linaro-r106731.patch create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/linaro/gcc-4.6-linaro-r106733.patch create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/linaro/gcc-4.6-linaro-r106737.patch create mode 100644 meta/recipes-devtools/gcc/gcc-4.6.0/linaro/gcc-4.6-linaro-r106738.patch create mode 100644 meta/recipes-devtools/gcc/gcc-4_6-branch-linaro-backports.inc create mode 100644 meta/recipes-extended/sat-solver/sat-solver/fix_gcc-4.6.0_compile_issue.patch create mode 100644 meta/recipes-kernel/linux/linux-yocto/perf-tool-Fix-gcc-4.6.0-issues.patch Merged in oe-core and Master Thanks Sau! _
Re: [OE-core] [PATCH] package.bbclass: convert unpackaged file message from 'info' to 'warn' so that it shows up on the console
On 05/06/2011 07:48 AM, Koen Kooi wrote: Signed-off-by: Koen Kooi --- meta/classes/package.bbclass |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index e6b3df7..082f233 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -676,9 +676,9 @@ python populate_packages () { unshipped.append(path) if unshipped != []: - bb.note("the following files were installed but not shipped in any package:") + bb.warn("the following files were installed but not shipped in any package:") for f in unshipped: - bb.note(" " + f) + bb.warn(" " + f) bb.build.exec_func("package_name_hook", d) Pulled 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 0/4] Misc sync up changes
On 05/05/2011 08:05 AM, Tom Rini wrote: 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 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 Pulled 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] [RFC] systemd units packaging
Op 6 mei 2011, om 16:51 heeft Koen Kooi het volgende geschreven: > > Op 6 mei 2011, om 16:20 heeft Richard Purdie het volgende geschreven: > >> On Fri, 2011-05-06 at 15:39 +0200, Koen Kooi wrote: >>> Now onto my issues: >>> >>> packaging: >>> In OE .dev I added FILES_${PN} += "${base_libdir}/systemd" to udev, >>> dbus, rsyslog and avahi. This means we end up with both sysV script >>> and systemd units. What I would like to have is ${PN}-sysvinit and >>> ${PN}-systemd and the image recipe can choose which init systems gets >>> used. Is something like that possible? >> >> I'm not sure that it is to be honest. We simply don't have the >> capability in the package managers to be able to say "if systemd is >> installed, install *-systemd where * is any currently installed >> package". Its the same problem we have with locales. >> >> Now if we had that functionality, great, but we simply don't :(. >> >>> Are there better ways? Note that systemd support sysV initscripts as >>> well, but it needs some care with naming. As I understand it, if a >>> unit is found with the same name as a sysV script, only the unit will >>> get used. >>> A rootfs postprocess command that deletes /etc/init.d won't work, >>> since it will come back when upgrading the packages. >>> >>> building: >>> At the moment systemd enabled software installs the units regardless >>> or config options. What should be do with software that has an option >>> for that? And what if we need to patch the units files in? The >>> initsystem is a choice at the image level, so artificially limiting it >>> to a distro choice is not a good idea. >> >> Its an artificial limit but our tools don't give us any other option, >> for now I think this has to be a distro config choice. > > Not quite, if we name the units correctly (or just alias them inside) the > sysv scripts will get skipped. So if having both systemd and sysv files > installed isn't a dealbreaker them we can make it an image choice. On debian > and gentoo it's parallel installable with sysvinit, making it a matter of > doing either init=/sbin/init or init=/bin/systemd in your bootloader. >From #systemd: 15:08 < koen> how can I have systemd skip sysv scripts with a slightly different name? 15:08 < koen> e.g. udevd vs udev 15:09 < sztanpet> symlink udevd.service to dev null, that should mask it 15:10 < sztanpet> automatically i dont know 15:10 < Mithrandir> add Names=udevd to udev.service? 15:10 < Mithrandir> Names=udevd.service, even 15:10 < Mithrandir> or symlink the .service file to the alias name ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 00/20] Consolidated Pull for 5/8/2011
On Sun, 2011-05-08 at 23:59 -0700, Saul Wold wrote: > Here is a batch of changes from last week. > > This contains a fix for gnu-config that is a workaround > for a Bernard Bug that we need to back port. > > I have test built for x86, arm and the toolchains 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] package.bbclass: convert unpackaged file message from 'info' to 'warn' so that it shows up on the console
On Sat, 2011-05-07 at 09:50 -0700, Darren Hart wrote: > According to my discussion with RP, bb.note() is supposed to appear on > the console. If it doesn't, that is a bug in bitbake, not the recipe > logging. I used this information to document the intended use of the > similarly named bbnote() in logging.bbclass. What we said was that bb.note from "core" context appears on the console, bb.note from task context does not as it makes the default console too verbose. I'm in agreement that unpackaged files should be a warning. 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] qemu-script: Fix qemu segfault with Nvidia's proprietary driver
Saul Wold wrote: On 05/06/2011 01:36 AM, Zhai Edwin wrote: > > > Pull URL: git://git.pokylinux.org/poky-contrib.git >Branch: gzhai/fix3 >Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=gzhai/fix3 > > Zhai Edwin (1): >qemu-script: Fix qemu seg fault if install Nvidia proprietary driver. > > scripts/poky-qemu-internal | 13 +++-- I think that you are using the old script name, I think that you should be changing runqemu-internal, not poky-qemu-internal Done. Pls. pull @ the same branch Thanks, edwin Please correct this. Sau! > 1 files changed, 11 insertions(+), 2 deletions(-) > > > ___ > 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] package.bbclass: convert unpackaged file message from 'info' to 'warn' so that it shows up on the console
On 09/05/2011 08:11, Koen Kooi wrote: Op 8 mei 2011, om 08:23 heeft Khem Raj het volgende geschreven: On 5/7/2011 9:50 AM, Darren Hart wrote: According to my discussion with RP, bb.note() is supposed to appear on the console. If it doesn't, that is a bug in bitbake, not the recipe it does if we increase verbosity but it also dumps a lot of other information along. Default is to print errors and warnings which seems a sane default to me. May be there is another level which dumps notes on top and then as you increase the level you get more info dumped would be a good to have I still think that all unpackaged files are a bug, so it's more than a note anyway. rpmbuild would agree with you there, so its not without precedence. G ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] package.bbclass: convert unpackaged file message from 'info' to 'warn' so that it shows up on the console
Op 8 mei 2011, om 08:23 heeft Khem Raj het volgende geschreven: > On 5/7/2011 9:50 AM, Darren Hart wrote: >> According to my discussion with RP, bb.note() is supposed to appear on >> the console. If it doesn't, that is a bug in bitbake, not the recipe > > it does if we increase verbosity but it also dumps a lot of other information > along. Default is to print errors and warnings which seems a sane default to > me. May be there is another level which dumps notes on > top and then as you increase the level you get more info dumped would be > a good to have I still think that all unpackaged files are a bug, so it's more than a note anyway. regards, Koen > >> logging. I used this information to document the intended use of the >> similarly named bbnote() in logging.bbclass. >> >> -- >> Darren >> >> On Fri, 2011-05-06 at 16:48 +0200, Koen Kooi wrote: >>> Signed-off-by: Koen Kooi >>> --- >>> meta/classes/package.bbclass |4 ++-- >>> 1 files changed, 2 insertions(+), 2 deletions(-) >>> >>> diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass >>> index e6b3df7..082f233 100644 >>> --- a/meta/classes/package.bbclass >>> +++ b/meta/classes/package.bbclass >>> @@ -676,9 +676,9 @@ python populate_packages () { >>> unshipped.append(path) >>> >>> if unshipped != []: >>> - bb.note("the following files were installed but not shipped in >>> any package:") >>> + bb.warn("the following files were installed but not shipped in >>> any package:") >>> for f in unshipped: >>> - bb.note(" " + f) >>> + bb.warn(" " + f) >>> >>> bb.build.exec_func("package_name_hook", d) >>> >> > > > ___ > 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 14/20] package.bbclass: convert unpackaged file message from 'info' to 'warn' so that it shows up on the console
From: Koen Kooi Signed-off-by: Koen Kooi --- meta/classes/package.bbclass |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index e6b3df7..082f233 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -676,9 +676,9 @@ python populate_packages () { unshipped.append(path) if unshipped != []: - bb.note("the following files were installed but not shipped in any package:") + bb.warn("the following files were installed but not shipped in any package:") for f in unshipped: - bb.note(" " + f) + bb.warn(" " + f) bb.build.exec_func("package_name_hook", 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 19/20] gettext.bbclass, bitbake.conf: Append nls options to EXTRA_OECONF instead of +=
From: Khem Raj 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 --- 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.1.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 02/20] clutter-gst-1.4: Add missing patch
From: Saul Wold Signed-off-by: Saul Wold --- .../clutter/clutter-gst/enable_tests-1.4.patch | 15 +++ 1 files changed, 15 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.4.patch diff --git a/meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.4.patch b/meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.4.patch new file mode 100644 index 000..f1f68ac --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.4.patch @@ -0,0 +1,15 @@ +Install example binary needed for core-image-clutter + +Signed-off-by: Zhai Edwin +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) \ -- 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 18/20] bash.inc: Add bison-native to DEPENDS
From: Tom Rini This is f0652d96ff5c3b08b8e4c4972f7fb0296df6d898 from OE. Signed-off-by: Tom Rini --- 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.1.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 10/20] gcc-4.5.1: update upstream status of patches
From: Nitin A Kamble Signed-off-by: Nitin A Kamble --- .../gcc/gcc-4.5.1/100-uclibc-conf.patch|2 ++ .../gcc/gcc-4.5.1/103-uclibc-conf-noupstream.patch |2 ++ .../gcc/gcc-4.5.1/200-uclibc-locale.patch |2 ++ .../gcc/gcc-4.5.1/203-uclibc-locale-no__x.patch|2 ++ .../gcc-4.5.1/204-uclibc-locale-wchar_fix.patch|2 ++ .../gcc/gcc-4.5.1/205-uclibc-locale-update.patch |2 ++ .../gcc/gcc-4.5.1/301-missing-execinfo_h.patch |2 ++ .../gcc/gcc-4.5.1/302-c99-snprintf.patch |2 ++ .../gcc/gcc-4.5.1/303-c99-complex-ugly-hack.patch |2 ++ .../gcc/gcc-4.5.1/304-index_macro.patch|2 ++ .../gcc-4.5.1/305-libmudflap-susv3-legacy.patch|2 ++ .../gcc/gcc-4.5.1/306-libstdc++-namespace.patch|2 ++ .../gcc/gcc-4.5.1/307-locale_facets.patch |2 ++ .../gcc/gcc-4.5.1/602-sdk-libstdc++-includes.patch |2 ++ .../recipes-devtools/gcc/gcc-4.5.1/64bithack.patch |2 ++ .../gcc/gcc-4.5.1/740-sh-pr24836.patch |2 ++ .../gcc/gcc-4.5.1/800-arm-bigendian.patch |2 ++ .../gcc/gcc-4.5.1/904-flatten-switch-stmt-00.patch |2 ++ .../gcc/gcc-4.5.1/arm-bswapsi2.patch |2 ++ .../gcc/gcc-4.5.1/arm-nolibfloat.patch |2 ++ .../gcc/gcc-4.5.1/arm-softfloat.patch |2 ++ 21 files changed, 42 insertions(+), 0 deletions(-) diff --git a/meta/recipes-devtools/gcc/gcc-4.5.1/100-uclibc-conf.patch b/meta/recipes-devtools/gcc/gcc-4.5.1/100-uclibc-conf.patch index 0b79960..87716ff 100644 --- a/meta/recipes-devtools/gcc/gcc-4.5.1/100-uclibc-conf.patch +++ b/meta/recipes-devtools/gcc/gcc-4.5.1/100-uclibc-conf.patch @@ -1,3 +1,5 @@ +Upstream-Status="Pending" + Index: gcc-4.3.1/contrib/regression/objs-gcc.sh === --- gcc-4.3.1.orig/contrib/regression/objs-gcc.sh 2007-12-24 15:18:57.0 -0800 diff --git a/meta/recipes-devtools/gcc/gcc-4.5.1/103-uclibc-conf-noupstream.patch b/meta/recipes-devtools/gcc/gcc-4.5.1/103-uclibc-conf-noupstream.patch index f9d8ad9..530d815 100644 --- a/meta/recipes-devtools/gcc/gcc-4.5.1/103-uclibc-conf-noupstream.patch +++ b/meta/recipes-devtools/gcc/gcc-4.5.1/103-uclibc-conf-noupstream.patch @@ -1,3 +1,5 @@ +Upstream-Status="Pending" + Corrects sub machine arch corectly Index: gcc-4.5.0/gcc/config.gcc diff --git a/meta/recipes-devtools/gcc/gcc-4.5.1/200-uclibc-locale.patch b/meta/recipes-devtools/gcc/gcc-4.5.1/200-uclibc-locale.patch index 32de11f..042cda5 100644 --- a/meta/recipes-devtools/gcc/gcc-4.5.1/200-uclibc-locale.patch +++ b/meta/recipes-devtools/gcc/gcc-4.5.1/200-uclibc-locale.patch @@ -1,3 +1,5 @@ +Upstream-Status="Pending" + Index: gcc-4.5.0/libstdc++-v3/acinclude.m4 === --- gcc-4.5.0.orig/libstdc++-v3/acinclude.m4 2010-04-05 18:27:44.0 -0700 diff --git a/meta/recipes-devtools/gcc/gcc-4.5.1/203-uclibc-locale-no__x.patch b/meta/recipes-devtools/gcc/gcc-4.5.1/203-uclibc-locale-no__x.patch index f39e652..eaa4a2b 100644 --- a/meta/recipes-devtools/gcc/gcc-4.5.1/203-uclibc-locale-no__x.patch +++ b/meta/recipes-devtools/gcc/gcc-4.5.1/203-uclibc-locale-no__x.patch @@ -1,3 +1,5 @@ +Upstream-Status="Pending" + Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c++locale_internal.h === --- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 2008-08-16 01:29:20.0 -0700 diff --git a/meta/recipes-devtools/gcc/gcc-4.5.1/204-uclibc-locale-wchar_fix.patch b/meta/recipes-devtools/gcc/gcc-4.5.1/204-uclibc-locale-wchar_fix.patch index 160ab35..e44414d 100644 --- a/meta/recipes-devtools/gcc/gcc-4.5.1/204-uclibc-locale-wchar_fix.patch +++ b/meta/recipes-devtools/gcc/gcc-4.5.1/204-uclibc-locale-wchar_fix.patch @@ -1,3 +1,5 @@ +Upstream-Status="Pending" + --- gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc.uclibc200_wchar~ 2006-03-10 15:32:37 +0100 +++ gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2006-03-10 15:37:27 +0100 @@ -401,7 +401,7 @@ diff --git a/meta/recipes-devtools/gcc/gcc-4.5.1/205-uclibc-locale-update.patch b/meta/recipes-devtools/gcc/gcc-4.5.1/205-uclibc-locale-update.patch index 48eaa1d..3c8fecf 100644 --- a/meta/recipes-devtools/gcc/gcc-4.5.1/205-uclibc-locale-update.patch +++ b/meta/recipes-devtools/gcc/gcc-4.5.1/205-uclibc-locale-update.patch @@ -1,3 +1,5 @@ +Upstream-Status="Pending" + Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/c_locale.cc === --- gcc-4.3.2.orig/libstdc++-v3/config/locale/uclibc/c_locale.cc 2008-09-17 22:35:28.0 -0700 diff --git a/meta/recipes-devtools/gcc/gcc-4.5.1/301-missing-execinfo_h.patch b/meta/recipes-devtools/gcc/gcc-4.5.1/301-missing-execinfo_h.patch index aaa5cee..133f9a6 100644 --- a/meta/recipes-devtools/gc
[OE-core] [PATCH 09/20] sat-solver: fix compilation issue with gcc 4.6.0
From: Nitin A Kamble Signed-off-by: Nitin A Kamble --- .../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 2011/05/05 + +Index: git/src/transaction.c +=== +--- git.orig/src/transaction.c git/src/transaction.c +@@ -1930,7 +1930,7 @@ transaction_add_obsoleted(Transaction *t + Repo *installed = pool->in
[OE-core] [PATCH 20/20] u-boot: correct COPYING MD5SUM
From: Darren Hart Signed-off-by: Darren Hart --- meta/recipes-bsp/uboot/u-boot_git.bb |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-bsp/uboot/u-boot_git.bb b/meta/recipes-bsp/uboot/u-boot_git.bb index 66e7898..d8c196a 100644 --- a/meta/recipes-bsp/uboot/u-boot_git.bb +++ b/meta/recipes-bsp/uboot/u-boot_git.bb @@ -1,14 +1,14 @@ require u-boot.inc LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb \ +LIC_FILES_CHKSUM = "file://COPYING;md5=4c6cde5df68eff615d36789dc18edd3b \ file://README;beginline=1;endline=22;md5=3a00ef51d3fc96e9d6c1bc4708ccd3b5" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/u-boot-git/${MACHINE}" SRCREV = "v2010.12" PV = "v2010.12+${PR}+git${SRCPV}" -PR="r1" +PR="r2" SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=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 17/20] sysstat.inc: Switch to inherit gettext
From: Tom Rini 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 --- 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.1.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 15/20] gcc-package-target: Switch to TARGET_PREFIX in symlinks
From: Tom Rini 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 --- 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.1.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 04/20] libpcre: update upstream status for patches
From: Nitin A Kamble Signed-off-by: Nitin A Kamble --- .../libpcre/files/fix-pcre-name-collision.patch|1 + .../recipes-support/libpcre/files/pcre-cross.patch |2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/meta/recipes-support/libpcre/files/fix-pcre-name-collision.patch b/meta/recipes-support/libpcre/files/fix-pcre-name-collision.patch index 6548353..4b21ffa 100644 --- a/meta/recipes-support/libpcre/files/fix-pcre-name-collision.patch +++ b/meta/recipes-support/libpcre/files/fix-pcre-name-collision.patch @@ -1,3 +1,4 @@ +Upstream-Status="Inappropriate [debian patch]" This patch address a namespace collision with libc. diff --git a/meta/recipes-support/libpcre/files/pcre-cross.patch b/meta/recipes-support/libpcre/files/pcre-cross.patch index 0626fb3..1867395 100644 --- a/meta/recipes-support/libpcre/files/pcre-cross.patch +++ b/meta/recipes-support/libpcre/files/pcre-cross.patch @@ -1,3 +1,5 @@ +Upstream-Status="Inappropriate [configuration]" + To be upstreamable, this patch requires check for *_FOR_BUILD, otherwise it needs to pass special variables. -- 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/20] binutils.inc: Switch to TARGET_PREFIX not TARGET_SYS
From: Tom Rini When TARGET_PREFIX and TARGET_SYS didn't match up, the symlinks and update-alternatives weren't working. TARGET_PREFIX is what we use when configuring so it's what we should be using here. This is 79b497edc0ce5d54db564818e59b690d3391d6ce from OE. Signed-off-by: Tom Rini --- meta/recipes-devtools/binutils/binutils.inc | 10 +- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc index d9e859e..882fe7b 100644 --- a/meta/recipes-devtools/binutils/binutils.inc +++ b/meta/recipes-devtools/binutils/binutils.inc @@ -110,7 +110,7 @@ do_install () { # Symlinks for ease of running these on the native target for p in ${TARGET_SYS}-* ; do - ln -sf $p `echo $p | sed -e s,${TARGET_SYS}-,,` + ln -sf $p `echo $p | sed -e s,${TARGET_PREFIX},,` done rm ${D}${bindir}/ar ${D}${bindir}/strings @@ -139,11 +139,11 @@ do_install_virtclass-native () { } pkg_postinst_${PN}-symlinks () { - update-alternatives --install ${bindir}/ar ar ${TARGET_SYS}-ar 100 - update-alternatives --install ${bindir}/strings strings ${TARGET_SYS}-strings 100 + update-alternatives --install ${bindir}/ar ar ${TARGET_PREFIX}ar 100 + update-alternatives --install ${bindir}/strings strings ${TARGET_PREFIX}strings 100 } pkg_prerm_${PN}-symlinks () { - update-alternatives --remove ar ${TARGET_SYS}-ar - update-alternatives --remove strings ${TARGET_SYS}-strings + update-alternatives --remove ar ${TARGET_PREFIX}ar + update-alternatives --remove strings ${TARGET_PREFIX}strings } -- 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 05/20] patch-2.6.1: update patch upstream status
From: Nitin A Kamble Signed-off-by: Nitin A Kamble --- .../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.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/20] binutils: update upstream status of patches
From: Nitin A Kamble Signed-off-by: Nitin A Kamble --- .../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 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.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/20] Consolidated Pull for 5/8/2011
From: Saul Wold Richard, Here is a batch of changes from last week. This contains a fix for gnu-config that is a workaround for a Bernard Bug that we need to back port. I have test built for x86, arm and the toolchains Sau! 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 --- Darren Hart (1): u-boot: correct COPYING MD5SUM Dexuan Cui (1): gnu-config-native: add dependency on perl-native Khem Raj (2): conf/layer.conf: Use .= to append to BBPATH and += for BBFILES gettext.bbclass, bitbake.conf: Append nls options to EXTRA_OECONF instead of += Koen Kooi (2): git: make it work on the target package.bbclass: convert unpackaged file message from 'info' to 'warn' so that it shows up on the console Nitin A Kamble (8): libpcre: update upstream status for patches patch-2.6.1: update patch upstream status patch: update upstream status for patches python-imaging: update upstream status for patches subversion: update upstream status for patches sat-solver: fix compilation issue with gcc 4.6.0 gcc-4.5.1: update upstream status of patches binutils: update upstream status of patches Saul Wold (2): clutter-gst-1.4: Add missing patch gtkhtml2, web: Sync version for API Change 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/classes/gettext.bbclass |6 +- meta/classes/package.bbclass |4 +- meta/conf/bitbake.conf |2 +- meta/conf/layer.conf |5 +- meta/recipes-bsp/uboot/u-boot_git.bb |4 +- .../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 + meta/recipes-devtools/binutils/binutils.inc| 10 +- .../gcc/gcc-4.5.1/100-uclibc-conf.patch|2 + .../gcc/gcc-4.5.1/103-uclibc-conf-noupstream.patch |2 + .../gcc/gcc-4.5.1/200-uclibc-locale.patch |2 + .../gcc/gcc-4.5.1/203-uclibc-locale-no__x.patch|2 + .../gcc-4.5.1/204-uclibc-locale-wchar_fix.patch|2 + .../gcc/gcc-4.5.1/205-uclibc-locale-update.patch |2 + .../gcc/gcc-4.5.1/301-missing-execinfo_h.patch |2 + .../gcc/gcc-4.5.1/302-c99-snprintf.patch |2 + .../gcc/gcc-4.5.1/303-c99-complex-ugly-hack.patch |2 + .../gcc/gcc-4.5.1/304-index_macro.patch|2 + .../gcc-4.5.1/305-libmudflap-susv3-legacy.patch|2 + .../gcc/gcc-4.5.1/306-libstdc++-namespace.patch|2 + .../gcc/gcc-4.5.1/307-locale_facets.patch |2 + .../gcc/gcc-4.5.1/602-sdk-libstdc++-includes.patch |2 + .../recipes-devtools/gcc/gcc-4.5.1/64bithack.patch |2 + .../gcc/gcc-4.5.1/740-sh-pr24836.patch |2 + .../gcc/gcc-4.5.1/800-arm-bigendian.patch |2 + .../gcc/gcc-4.5.1/904-flatten-switch-stmt-00.patch |2 + .../gcc/gcc-4.5.1/arm-bswapsi2.patch |2 + .../gcc/gcc-4.5.1/arm-nolibfloat.patch |2 + .../gcc/gcc-4.5.1/arm-softfloat.patch |2 + meta/recipes-devtools/gcc/gcc-package-target.inc | 10 +- meta/recipes-devtools/git/git.inc | 32 +- meta/recipes-devtools/git/git_1.7.4.3.bb |2 +- .../gnu-config/config-guess-uclibc.patch |2 + .../gnu-config/gnu-config_20080123.bb |6 +- .../patch/patch-2.6.1/global-reject-file.diff |2 + meta/recipes-devtools/patch/patch/debian.patch |2 + .../patch/patch/global-reject-file.diff|2 + meta/recipes-devtools/patch/patch/install.patch|2 + .../patch/patch/unified-reject-files.diff |2 + .../python/python-imaging/path.patch |2 + .../subversion/disable-revision-install.patch |2 + .../subversion/subversion/libtool2.patch |2 + .../subversion/subversion/neon-detection.patch |2 + meta/recipes-extended/bash/bash.inc|2 +- .../sat-solver/fix_gcc-4.6.0_compile_issue.patch | 115 meta/recipes-extended/sat-solver/sat-solver_git.bb |5 +- meta/recipes-extended/sysstat/sysstat.inc |4 +- meta/recipes-extended/sysstat/sysstat_9.1.5.bb |2 +- meta/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb|2 +- .../clutter/clutter-gst/enable_tests-1.4.patch | 15 +++ meta/recipes-sato/web/web_svn.bb |2 +- .../libpcre/files/fix-pcre-name-collision.patch|1 + .../recipes-support/libpcre/files/pcre-cross.patch |2 + 55 files
[OE-core] [PATCH 13/20] conf/layer.conf: Use .= to append to BBPATH and += for BBFILES
From: Khem Raj This helps bitbake in organising BBPATH and BBFILES with given BBFILE_PRIORITY order Signed-off-by: Khem Raj --- 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.1.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 07/20] python-imaging: update upstream status for patches
From: Nitin A Kamble Signed-off-by: Nitin A Kamble --- .../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.1.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 06/20] patch: update upstream status for patches
From: Nitin A Kamble Signed-off-by: Nitin A Kamble --- meta/recipes-devtools/patch/patch/debian.patch |2 ++ .../patch/patch/global-reject-file.diff|2 ++ meta/recipes-devtools/patch/patch/install.patch|2 ++ .../patch/patch/unified-reject-files.diff |2 ++ 4 files changed, 8 insertions(+), 0 deletions(-) diff --git a/meta/recipes-devtools/patch/patch/debian.patch b/meta/recipes-devtools/patch/patch/debian.patch index 4601858..e0106dc 100644 --- a/meta/recipes-devtools/patch/patch/debian.patch +++ b/meta/recipes-devtools/patch/patch/debian.patch @@ -1,3 +1,5 @@ +Upstream-Status="Inappropriate [debian patch]" + --- patch-2.5.9.orig/m4/hash.m4 +++ patch-2.5.9/m4/hash.m4 @@ -0,0 +1,15 @@ diff --git a/meta/recipes-devtools/patch/patch/global-reject-file.diff b/meta/recipes-devtools/patch/patch/global-reject-file.diff index 66065fc..d837896 100644 --- a/meta/recipes-devtools/patch/patch/global-reject-file.diff +++ b/meta/recipes-devtools/patch/patch/global-reject-file.diff @@ -1,3 +1,5 @@ +Upstream-Status="Inappropriate [debian patch]" + Index: patch-2.5.9/patch.man === --- patch-2.5.9.orig/patch.man diff --git a/meta/recipes-devtools/patch/patch/install.patch b/meta/recipes-devtools/patch/patch/install.patch index c959189..0359ccd 100644 --- a/meta/recipes-devtools/patch/patch/install.patch +++ b/meta/recipes-devtools/patch/patch/install.patch @@ -1,3 +1,5 @@ +Upstream-Status="Inappropriate [embedded specific]" + Index: patch-2.5.4/Makefile.in === --- patch-2.5.4.orig/Makefile.in 2005-03-09 07:23:54.779311824 -0500 diff --git a/meta/recipes-devtools/patch/patch/unified-reject-files.diff b/meta/recipes-devtools/patch/patch/unified-reject-files.diff index 6bfa00d..1608b5e 100644 --- a/meta/recipes-devtools/patch/patch/unified-reject-files.diff +++ b/meta/recipes-devtools/patch/patch/unified-reject-files.diff @@ -1,3 +1,5 @@ +Upstream-Status="Inappropriate [debian patch]" + Generate unified diff style reject files. Also include the C function names in reject files whenever possible. -- 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/20] gnu-config-native: add dependency on perl-native
From: Dexuan Cui Fixes [YOCTO #968] Signed-off-by: Dexuan Cui --- .../gnu-config/config-guess-uclibc.patch |2 ++ .../gnu-config/gnu-config_20080123.bb |6 -- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/gnu-config/gnu-config/config-guess-uclibc.patch b/meta/recipes-devtools/gnu-config/gnu-config/config-guess-uclibc.patch index f820cef..f862c83 100644 --- a/meta/recipes-devtools/gnu-config/gnu-config/config-guess-uclibc.patch +++ b/meta/recipes-devtools/gnu-config/gnu-config/config-guess-uclibc.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Patch courtesy gentoo-portage/sys-devel/gnuconfig/files/automake-1.8.5-config-guess-uclibc.patch. updated to 20050516 by Marcin 'Hrw' Juszkiewicz (by hand) diff --git a/meta/recipes-devtools/gnu-config/gnu-config_20080123.bb b/meta/recipes-devtools/gnu-config/gnu-config_20080123.bb index e0a8155..897984d 100644 --- a/meta/recipes-devtools/gnu-config/gnu-config_20080123.bb +++ b/meta/recipes-devtools/gnu-config/gnu-config_20080123.bb @@ -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" FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" PV = "0.1+cvs${FIXEDSRCDATE}" -PR = "r2" +PR = "r3" SRC_URI = "cvs://anonym...@cvs.sv.gnu.org/cvsroot/config;module=config;method=pserver;date=${FIXEDSRCDATE} \ file://config-guess-uclibc.patch \ -- 1.7.1.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core