[PATCH 14/27] lxc_0.8.0-rc1.bb: point lxc at kernel source
Matthew McClintock <msm@...>
Fixes:
| powerpc-fsl-linux-gcc: error: default/arch/powerpc/include/asm/unistd.h: No such file or directory | powerpc-fsl-linux-gcc: fatal error: no input files | compilation terminated. | attach.c:45:19: fatal error: setns.h: No such file or directory | compilation terminated. | make[3]: [setns.h] Error 1 (ignored) | powerpc-fsl-linux-gcc -E --sysroot=/opt/yocto/cache-build/p4080ds/build_p4080ds_release/tmp/sysroots/p4080ds -m32 -mhard-float -mcpu=e500mc -dM default/arch/powerpc/include/asm/unistd.h |grep setns > setns.h | make[3]: *** [liblxc_so-attach.o] Error 1 | make[3]: *** Waiting for unfinished jobs.... | powerpc-fsl-linux-gcc: error: default/arch/powerpc/include/asm/unistd.h: No such file or directory | powerpc-fsl-linux-gcc: fatal error: no input files | compilation terminated. | make[3]: [setns.h] Error 1 (ignored) | make[3]: Leaving directory `/opt/yocto/cache-build/p4080ds/build_p4080ds_release/tmp/work/ppce500mc-fsl-linux/lxc-0.8.0-rc1-r4/lxc-0.8.0-rc1/src/lxc' | make[2]: *** [all-recursive] Error 1 | make[2]: Leaving directory `/opt/yocto/cache-build/p4080ds/build_p4080ds_release/tmp/work/ppce500mc-fsl-linux/lxc-0.8.0-rc1-r4/lxc-0.8.0-rc1/src' | make[1]: *** [all] Error 2 | make[1]: Leaving directory `/opt/yocto/cache-build/p4080ds/build_p4080ds_release/tmp/work/ppce500mc-fsl-linux/lxc-0.8.0-rc1-r4/lxc-0.8.0-rc1/src' | make: *** [all-recursive] Error 1 | ERROR: oe_runmake failed Signed-off-by: Matthew McClintock <msm@...> --- recipes-tools/lxc/lxc_0.8.0-rc1.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-tools/lxc/lxc_0.8.0-rc1.bb b/recipes-tools/lxc/lxc_0.8.0-rc1.bb index 64f36b3..accc16f 100644 --- a/recipes-tools/lxc/lxc_0.8.0-rc1.bb +++ b/recipes-tools/lxc/lxc_0.8.0-rc1.bb @@ -3,8 +3,8 @@ SECTION = "console/utils" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" PRIORITY = "optional" -PR = "r4" -DEPENDS = "libxml2 libcap" +PR = "r5" +DEPENDS = "libxml2 libcap virtual/kernel" RDEPENDS_${PN} = " \ rsync \ gzip \ @@ -31,7 +31,7 @@ SRC_URI[sha256sum] = "32bf83902c07387646c55de440d6d12cf61bd54c97417109c2d1ac47d1 S = "${WORKDIR}/${PN}-${PV}" -EXTRA_OECONF = "--disable-doc --disable-rpath" +EXTRA_OECONF = "--disable-doc --disable-rpath --with-linuxdir=${STAGING_KERNEL_DIR}" inherit autotools -- 1.7.9.7
|
|
[PATCH 15/27] lxc_0.8.0-rc1.bb: fix parallel makefile issue
Matthew McClintock <msm@...>
Signed-off-by: Matthew McClintock <msm@...>
--- recipes-tools/lxc/files/fix_setns_deps.patch | 12 ++++++++++++ recipes-tools/lxc/lxc_0.8.0-rc1.bb | 3 ++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 recipes-tools/lxc/files/fix_setns_deps.patch diff --git a/recipes-tools/lxc/files/fix_setns_deps.patch b/recipes-tools/lxc/files/fix_setns_deps.patch new file mode 100644 index 0000000..7ec875c --- /dev/null +++ b/recipes-tools/lxc/files/fix_setns_deps.patch @@ -0,0 +1,12 @@ +Index: lxc-0.8.0-rc1/src/lxc/Makefile.am +=================================================================== +--- lxc-0.8.0-rc1.orig/src/lxc/Makefile.am ++++ lxc-0.8.0-rc1/src/lxc/Makefile.am +@@ -133,6 +133,7 @@ uninstall-local: + $(RM) $(DESTDIR)$(libdir)/liblxc.so* + + namespace.c: setns.h ++attach.c: setns.h + + setns.h: + -$(CC) $(CPPFLAGS) -M -MT$@ $(LINUX_DIR)/arch/$(LINUX_SRCARCH)/include/asm/unistd.h >setns.P diff --git a/recipes-tools/lxc/lxc_0.8.0-rc1.bb b/recipes-tools/lxc/lxc_0.8.0-rc1.bb index accc16f..5100937 100644 --- a/recipes-tools/lxc/lxc_0.8.0-rc1.bb +++ b/recipes-tools/lxc/lxc_0.8.0-rc1.bb @@ -3,7 +3,7 @@ SECTION = "console/utils" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" PRIORITY = "optional" -PR = "r5" +PR = "r6" DEPENDS = "libxml2 libcap virtual/kernel" RDEPENDS_${PN} = " \ rsync \ @@ -24,6 +24,7 @@ SRC_URI = "http://lxc.sourceforge.net/download/lxc/${PN}-${PV}.tar.gz \ file://libmounts.patch \ file://busybox_remove_dhcp.patch \ file://remove_vlan_hwaddr.patch \ + file://fix_setns_deps.patch \ " SRC_URI[md5sum] ="06ceecf4dbe1be988fc903ad8dd34d29" -- 1.7.9.7
|
|
[PATCH 16/27] qemu_1.0.bb: lock down SHA
Matthew McClintock <msm@...>
Signed-off-by: Matthew McClintock <msm@...>
--- recipes-devtools/qemu/qemu_1.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-devtools/qemu/qemu_1.0.bb b/recipes-devtools/qemu/qemu_1.0.bb index 7a6e545..91a12dc 100644 --- a/recipes-devtools/qemu/qemu_1.0.bb +++ b/recipes-devtools/qemu/qemu_1.0.bb @@ -9,7 +9,7 @@ PV = "1.0+fsl" DEPENDS += "dtc" SRC_URI = "git://git.freescale.com/ppc/sdk/qemu.git" -SRCREV = "${AUTOREV}" +SRCREV = "deccbc3b81951f826df805f10c0a0318a80af011" S = "${WORKDIR}/git" -- 1.7.9.7
|
|
[PATCH 17/27] set preferred version of oprofile to 0.9.6 for e5500/e5500-64b targets
Matthew McClintock <msm@...>
From: Zhenhua Luo <b19537@...>
the patches of e5500/e5500-64b support are only available for oprofile-0.9.6. Signed-off-by: Zhenhua Luo <b19537@...> --- conf/machine/e5500-64b.inc | 1 + conf/machine/e5500.inc | 1 + 2 files changed, 2 insertions(+) diff --git a/conf/machine/e5500-64b.inc b/conf/machine/e5500-64b.inc index 650585f..b3ed424 100644 --- a/conf/machine/e5500-64b.inc +++ b/conf/machine/e5500-64b.inc @@ -10,6 +10,7 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk" PREFERRED_VERSION_virtual/kernel ?= "3.0.34" PREFERRED_PROVIDER_linux-libc-headers ?= "linux-qoriq-sdk-headers" PREFERRED_VERSION_qemu = "1.0+fsl" +PREFERRED_VERSION_oprofile = "0.9.6" KERNEL_IMAGETYPE ?= "uImage" # disable the images below for now diff --git a/conf/machine/e5500.inc b/conf/machine/e5500.inc index 1a1bb20..4e3e8dc 100644 --- a/conf/machine/e5500.inc +++ b/conf/machine/e5500.inc @@ -9,6 +9,7 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk" PREFERRED_VERSION_virtual/kernel ?= "3.0.34" PREFERRED_PROVIDER_linux-libc-headers ?= "linux-qoriq-sdk-headers" PREFERRED_VERSION_qemu = "1.0+fsl" +PREFERRED_VERSION_oprofile = "0.9.6" KERNEL_IMAGETYPE ?= "uImage" # disable the images below for now -- 1.7.9.7
|
|
[PATCH 18/27] qemu_1.0.bb: lock down SHA for release
Matthew McClintock <msm@...>
Signed-off-by: Matthew McClintock <msm@...>
--- recipes-devtools/qemu/qemu_1.0.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes-devtools/qemu/qemu_1.0.bb b/recipes-devtools/qemu/qemu_1.0.bb index 91a12dc..ff4afde 100644 --- a/recipes-devtools/qemu/qemu_1.0.bb +++ b/recipes-devtools/qemu/qemu_1.0.bb @@ -5,11 +5,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ # This means v1.0 with FSL specific patches applied PV = "1.0+fsl" +PR = "r2" DEPENDS += "dtc" SRC_URI = "git://git.freescale.com/ppc/sdk/qemu.git" -SRCREV = "deccbc3b81951f826df805f10c0a0318a80af011" +SRCREV = "7feabd47a814214dc4bebfd97d0eaf30dc50a68f" S = "${WORKDIR}/git" -- 1.7.9.7
|
|
[PATCH 19/27] rcw_git.bb: lock down SHA for release
Matthew McClintock <msm@...>
Signed-off-by: Matthew McClintock <msm@...>
--- recipes-tools/rcw/rcw_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-tools/rcw/rcw_git.bb b/recipes-tools/rcw/rcw_git.bb index 7451a9e..efccf4c 100644 --- a/recipes-tools/rcw/rcw_git.bb +++ b/recipes-tools/rcw/rcw_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Reset Control Words (RCW)" SECTION = "rcw" LICENSE = "BSD" -PR = "r5" +PR = "r6" LIC_FILES_CHKSUM = "file://rcw.py;beginline=8;endline=28;md5=9ba0b28922dd187b06b6c8ebcfdd208e" @@ -11,7 +11,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" inherit deploy -SRCREV = "a84434258ac4a1f0c7cb6e9ea709dc8c3267f788" +SRCREV = "e9529eac512f7dc2ada3c6ff3ef1b934e5afae57" SRC_URI = "git://git.freescale.com/ppc/sdk/rcw.git" S = "${WORKDIR}/git" -- 1.7.9.7
|
|
[PATCH 20/27] u-boot_git.bb: lock down SHA for release
Matthew McClintock <msm@...>
Also update p5040 u-boot builds and add cst-native dep which is
required by some machines Signed-off-by: Matthew McClintock <msm@...> --- conf/machine/p5040ds-64b.conf | 2 +- conf/machine/p5040ds.conf | 2 +- recipes-kernel/u-boot/u-boot_git.bb | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/machine/p5040ds-64b.conf b/conf/machine/p5040ds-64b.conf index 9e6b770..07ed3b2 100644 --- a/conf/machine/p5040ds-64b.conf +++ b/conf/machine/p5040ds-64b.conf @@ -3,7 +3,7 @@ require e5500-64b.inc -UBOOT_MACHINES ?= "P5040DS P5040DS_NAND P5040DS_SECURE_BOOT" +UBOOT_MACHINES ?= "P5040DS P5040DS_NAND P5040DS_SECURE_BOOT P5040DS_SDCARD P5040DS_SPIFLASH" KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p5040ds.dts \ ${S}/arch/powerpc/boot/dts/p5040ds-usdpaa.dts" KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet64_smp_defconfig" diff --git a/conf/machine/p5040ds.conf b/conf/machine/p5040ds.conf index 7c982fd..bda7fac 100644 --- a/conf/machine/p5040ds.conf +++ b/conf/machine/p5040ds.conf @@ -3,7 +3,7 @@ require e5500.inc -UBOOT_MACHINES ?= "P5040DS P5040DS_NAND P5040DS_SECURE_BOOT" +UBOOT_MACHINES ?= "P5040DS P5040DS_NAND P5040DS_SECURE_BOOT P5040DS_SDCARD P5040DS_SPIFLASH" KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p5040ds.dts \ ${S}/arch/powerpc/boot/dts/p5040ds-usdpaa.dts" KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet32_smp_defconfig" diff --git a/recipes-kernel/u-boot/u-boot_git.bb b/recipes-kernel/u-boot/u-boot_git.bb index e0b99a6..18842d8 100644 --- a/recipes-kernel/u-boot/u-boot_git.bb +++ b/recipes-kernel/u-boot/u-boot_git.bb @@ -5,13 +5,13 @@ PROVIDES = "virtual/bootloader" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb" -PR = "r28" +PR = "r29" INHIBIT_DEFAULT_DEPS = "1" DEPENDS = "boot-format-native virtual/${TARGET_PREFIX}gcc libgcc" inherit deploy -SRCREV = "6d1aef1c02ba9472215234696faa8ce8745a40a9" +SRCREV = "c6d9d502924ade8877f53eecdd5cf37e05d6d6b4" SRC_URI = "git://git.freescale.com/ppc/sdk/u-boot.git" SRCREV_e6500 = "59852d03867108217fe88e3bfc3e1e9cedfe63c5" -- 1.7.9.7
|
|
[PATCH 21/27] hv-cfg: lock down SHA for release
Matthew McClintock <msm@...>
From: Zhenhua Luo <b19537@...>
Signed-off-by: Zhenhua Luo <b19537@...> --- recipes-tools/hv-cfg/hv-cfg_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-tools/hv-cfg/hv-cfg_git.bb b/recipes-tools/hv-cfg/hv-cfg_git.bb index e137575..3126138 100644 --- a/recipes-tools/hv-cfg/hv-cfg_git.bb +++ b/recipes-tools/hv-cfg/hv-cfg_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Hypervisor Config" SECTION = "hv-cfg" LICENSE = "BSD" -PR = "r5" +PR = "r6" LIC_FILES_CHKSUM = " \ file://p2041rdb/LICENSE;md5=96dd72f26e9bb861de5c76c60e35e1bc \ @@ -18,7 +18,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" inherit deploy -SRCREV = "102ab848d94f3c04f364ed273d0e00b21b0266f4" +SRCREV = "deb55b9564ef8fb9e1fda1112233f11ae2a12d4a" SRC_URI = "git://git.freescale.com/ppc/sdk/hv-cfg.git" S = "${WORKDIR}/git" -- 1.7.9.7
|
|
[PATCH 22/27] linux-qoriq-sdk: lock down SHA for release
Matthew McClintock <msm@...>
Signed-off-by: Matthew McClintock <msm@...>
--- recipes-kernel/linux/linux-qoriq-sdk.inc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/recipes-kernel/linux/linux-qoriq-sdk.inc b/recipes-kernel/linux/linux-qoriq-sdk.inc index 6cd9cc4..8489ca2 100644 --- a/recipes-kernel/linux/linux-qoriq-sdk.inc +++ b/recipes-kernel/linux/linux-qoriq-sdk.inc @@ -1,11 +1,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" +PV = "3.0.48" +PR = "r9" - -PV = "3.0.34" -PR = "r8" - -SRCREV = "058c67be272af9ab95b88c941f31fb3eda05a4d3" +SRCREV = "dd5a5aac3e15b16a4bccbab29c736bda0e7d55e7" SRC_URI = "git://git.freescale.com/ppc/sdk/linux.git \ file://0001-compiler.h-Undef-before-redefining-__attribute_const.patch \ file://0001-powerpc-Fix-build-dependencies-for-c-files-requiring.patch \ -- 1.7.9.7
|
|
[PATCH 23/27] flib: add recipe to build external git tree
Matthew McClintock <msm@...>
From: Zhenhua Luo <b19537@...>
Signed-off-by: Zhenhua Luo <b19537@...> --- recipes-tools/flib/flib_git.bb | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 recipes-tools/flib/flib_git.bb diff --git a/recipes-tools/flib/flib_git.bb b/recipes-tools/flib/flib_git.bb new file mode 100644 index 0000000..78210dd --- /dev/null +++ b/recipes-tools/flib/flib_git.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Foundation Library" +SECTION = "flib" +LICENSE = "BSD & GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=3f16fa8e677e45af3127c5c4bafc3c00" + +SRC_URI = "git://git.freescale.com/ppc/sdk/flib.git" +SRCREV = "110eef5dab66064580d6d8627421ea5a19decb80" + +S = "${WORKDIR}/git" + +do_install(){ + oe_runmake install DESTDIR=${D} +} -- 1.7.9.7
|
|
[PATCH 24/27] update README
Matthew McClintock <msm@...>
Signed-off-by: Matthew McClintock <msm@...>
--- README | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/README b/README index 31ccba0..645afbb 100644 --- a/README +++ b/README @@ -2,3 +2,35 @@ meta-fsl-ppc ========== This is the location for Freescale PowerPC maintained BSP's + +This layer depends on: +URI: git://git.openembedded.org/openembedded-core +branch: master +revision: HEAD + +It's testing to be working against YP 1.1 (edison) onwards after +checking out the appropriate branch + +Contributing +------------ + +To contribute to this layer you should the patches for review to the +mailing list. + +Mailing list: + + https://lists.yoctoproject.org/listinfo/meta-freescale + +Source code: + + git://git.yoctoproject.org/meta-fsl-ppc + http://git.yoctoproject.org/git/meta-fsl-ppc + +When sending patches, please use something like: + +git send-email --to meta-freescale@... --subject-prefix='meta-fsl-ppc][PATCH' + +optionally include a branch if the patch applies to multiple branches, +otherwise master is assumed + +git send-email --to meta-freescale@... --subject-prefix='meta-fsl-ppc][PATCH][denzil][danny][master' -- 1.7.9.7
|
|
[PATCH 25/27] libxml: update the version number to 2.9.0 to match the upgrade in poky
Matthew McClintock <msm@...>
From: Zhenhua Luo <b19537@...>
upgrade the version to 2.9.0 to fix following version mismatch issue: ERROR: No recipes available for: /srv/home/pokybuild/yocto-autobuilder/yocto-slave/p1022ds/build/yocto/meta-fsl-ppc/recipes-append/libxml/libxml2_2.8.0.bbappend [YOCTO #3476] Signed-off-by: Zhenhua Luo <b19537@...> --- recipes-append/libxml/libxml2_2.8.0.bbappend | 3 --- recipes-append/libxml/libxml2_2.9.0.bbappend | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 recipes-append/libxml/libxml2_2.8.0.bbappend create mode 100644 recipes-append/libxml/libxml2_2.9.0.bbappend diff --git a/recipes-append/libxml/libxml2_2.8.0.bbappend b/recipes-append/libxml/libxml2_2.8.0.bbappend deleted file mode 100644 index 13c1fd7..0000000 --- a/recipes-append/libxml/libxml2_2.8.0.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -EXTRA_OECONF_fsl += "--with-fexceptions" - -PR_fsl .= "+${DISTRO}.0" diff --git a/recipes-append/libxml/libxml2_2.9.0.bbappend b/recipes-append/libxml/libxml2_2.9.0.bbappend new file mode 100644 index 0000000..13c1fd7 --- /dev/null +++ b/recipes-append/libxml/libxml2_2.9.0.bbappend @@ -0,0 +1,3 @@ +EXTRA_OECONF_fsl += "--with-fexceptions" + +PR_fsl .= "+${DISTRO}.0" -- 1.7.9.7
|
|
[PATCH 26/27] README: add message about git.freescale.com vs. git.yp.org
Matthew McClintock <msm@...>
Signed-off-by: Matthew McClintock <msm@...>
--- README | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README b/README index 645afbb..1c87788 100644 --- a/README +++ b/README @@ -34,3 +34,12 @@ optionally include a branch if the patch applies to multiple branches, otherwise master is assumed git send-email --to meta-freescale@... --subject-prefix='meta-fsl-ppc][PATCH][denzil][danny][master' + +git.yoctoproject.org vs. git.freescale.com: +------------------------------------------- + +git.yoctoproject.org hosts the official upstream work of Freescale's OE/YP repos, +for official SDK releases at times we need to do last minute fixes or include things +not supported upstream so we have a different repo on git.freescale.com for the +official release. git.freescale.com should be based off repos from git.yoctoproject.org + -- 1.7.9.7
|
|
[PATCH 27/27] linux-qoriq-sdk: move patches to default search path
Matthew McClintock <msm@...>
Signed-off-by: Matthew McClintock <msm@...>
--- ...Undef-before-redefining-__attribute_const.patch | 28 ------------- ...-build-dependencies-for-c-files-requiring.patch | 44 -------------------- ...Undef-before-redefining-__attribute_const.patch | 28 +++++++++++++ ...-build-dependencies-for-c-files-requiring.patch | 44 ++++++++++++++++++++ 4 files changed, 72 insertions(+), 72 deletions(-) delete mode 100644 recipes-kernel/linux/0001-compiler.h-Undef-before-redefining-__attribute_const.patch delete mode 100644 recipes-kernel/linux/0001-powerpc-Fix-build-dependencies-for-c-files-requiring.patch create mode 100644 recipes-kernel/linux/files/0001-compiler.h-Undef-before-redefining-__attribute_const.patch create mode 100644 recipes-kernel/linux/files/0001-powerpc-Fix-build-dependencies-for-c-files-requiring.patch diff --git a/recipes-kernel/linux/0001-compiler.h-Undef-before-redefining-__attribute_const.patch b/recipes-kernel/linux/0001-compiler.h-Undef-before-redefining-__attribute_const.patch deleted file mode 100644 index 597fd3b..0000000 --- a/recipes-kernel/linux/0001-compiler.h-Undef-before-redefining-__attribute_const.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 6f92ab6de9d8daeb575949bbbcbc7bcdcebc60af Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem at gmail.com> -Date: Thu, 5 Jan 2012 11:42:35 -0800 -Subject: [PATCH] compiler.h: Undef before redefining __attribute_const__ - -This is required to avoid warnings like -util/include/linux/compiler.h:8:0: error: "__attribute_const__" redefined [-Werror] - -Signed-off-by: Khem Raj <raj.khem at gmail.com> ---- - tools/perf/util/include/linux/compiler.h | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - ---- a/tools/perf/util/include/linux/compiler.h -+++ b/tools/perf/util/include/linux/compiler.h -@@ -4,9 +4,11 @@ - #ifndef __always_inline - #define __always_inline inline - #endif -+#undef __user - #define __user -+#undef __attribute_const__ - #define __attribute_const__ -- -+#undef __used - #define __used __attribute__((__unused__)) - - #endif diff --git a/recipes-kernel/linux/0001-powerpc-Fix-build-dependencies-for-c-files-requiring.patch b/recipes-kernel/linux/0001-powerpc-Fix-build-dependencies-for-c-files-requiring.patch deleted file mode 100644 index d3464fb..0000000 --- a/recipes-kernel/linux/0001-powerpc-Fix-build-dependencies-for-c-files-requiring.patch +++ /dev/null @@ -1,44 +0,0 @@ -Upstream-Status: Pending - -From 2e7ffea0c0c09c6d9219d604e0351423f43844f4 Mon Sep 17 00:00:00 2001 -From: Matthew McClintock <msm@...> -Date: Thu, 6 Sep 2012 13:45:21 -0500 -Subject: powerpc: Fix build dependencies for c files requiring libfdt.h - -Several files in obj-plat depend on libfdt header file. Sometimes -when building one can see the following issue. This patch adds -libfdt as dependency to those object files - -| In file included from arch/powerpc/boot/treeboot-iss4xx.c:33:0: -| arch/powerpc/boot/libfdt.h:854:1: error: unterminated comment -| In file included from arch/powerpc/boot/treeboot-iss4xx.c:33:0: -| arch/powerpc/boot/libfdt.h:1:0: error: unterminated #ifndef -| BOOTCC arch/powerpc/boot/inffast.o -| make[1]: *** [arch/powerpc/boot/treeboot-iss4xx.o] Error 1 -| make[1]: *** Waiting for unfinished jobs.... -| BOOTCC arch/powerpc/boot/inflate.o -| make: *** [uImage] Error 2 -| ERROR: oe_runmake failed -| ERROR: Function failed: do_compile (see /srv/home/pokybuild/yocto-autobuilder/yocto-slave/p1022ds/build/build/tmp/work/p1022ds-poky-linux-gnuspe/linux-qoriq-sdk-3.0.34-r5/temp/log.do_compile.2167 for further information) -NOTE: recipe linux-qoriq-sdk-3.0.34-r5: task do_compile: Failed - -Signed-off-by: Matthew McClintock <msm@...> ---- - arch/powerpc/boot/Makefile | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile -index b7d8333..6a15c96 100644 ---- a/arch/powerpc/boot/Makefile -+++ b/arch/powerpc/boot/Makefile -@@ -107,6 +107,7 @@ src-boot := $(addprefix $(obj)/, $(src-boot)) - obj-boot := $(addsuffix .o, $(basename $(src-boot))) - obj-wlib := $(addsuffix .o, $(basename $(addprefix $(obj)/, $(src-wlib)))) - obj-plat := $(addsuffix .o, $(basename $(addprefix $(obj)/, $(src-plat)))) -+obj-plat: $(libfdt) - - quiet_cmd_copy_zlib = COPY $@ - cmd_copy_zlib = sed "s@__used@@;s@<linux/\([^>]*\).*@\"\1\"@" $< > $@ --- -1.7.9.7 - diff --git a/recipes-kernel/linux/files/0001-compiler.h-Undef-before-redefining-__attribute_const.patch b/recipes-kernel/linux/files/0001-compiler.h-Undef-before-redefining-__attribute_const.patch new file mode 100644 index 0000000..597fd3b --- /dev/null +++ b/recipes-kernel/linux/files/0001-compiler.h-Undef-before-redefining-__attribute_const.patch @@ -0,0 +1,28 @@ +From 6f92ab6de9d8daeb575949bbbcbc7bcdcebc60af Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem at gmail.com> +Date: Thu, 5 Jan 2012 11:42:35 -0800 +Subject: [PATCH] compiler.h: Undef before redefining __attribute_const__ + +This is required to avoid warnings like +util/include/linux/compiler.h:8:0: error: "__attribute_const__" redefined [-Werror] + +Signed-off-by: Khem Raj <raj.khem at gmail.com> +--- + tools/perf/util/include/linux/compiler.h | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +--- a/tools/perf/util/include/linux/compiler.h ++++ b/tools/perf/util/include/linux/compiler.h +@@ -4,9 +4,11 @@ + #ifndef __always_inline + #define __always_inline inline + #endif ++#undef __user + #define __user ++#undef __attribute_const__ + #define __attribute_const__ +- ++#undef __used + #define __used __attribute__((__unused__)) + + #endif diff --git a/recipes-kernel/linux/files/0001-powerpc-Fix-build-dependencies-for-c-files-requiring.patch b/recipes-kernel/linux/files/0001-powerpc-Fix-build-dependencies-for-c-files-requiring.patch new file mode 100644 index 0000000..d3464fb --- /dev/null +++ b/recipes-kernel/linux/files/0001-powerpc-Fix-build-dependencies-for-c-files-requiring.patch @@ -0,0 +1,44 @@ +Upstream-Status: Pending + +From 2e7ffea0c0c09c6d9219d604e0351423f43844f4 Mon Sep 17 00:00:00 2001 +From: Matthew McClintock <msm@...> +Date: Thu, 6 Sep 2012 13:45:21 -0500 +Subject: powerpc: Fix build dependencies for c files requiring libfdt.h + +Several files in obj-plat depend on libfdt header file. Sometimes +when building one can see the following issue. This patch adds +libfdt as dependency to those object files + +| In file included from arch/powerpc/boot/treeboot-iss4xx.c:33:0: +| arch/powerpc/boot/libfdt.h:854:1: error: unterminated comment +| In file included from arch/powerpc/boot/treeboot-iss4xx.c:33:0: +| arch/powerpc/boot/libfdt.h:1:0: error: unterminated #ifndef +| BOOTCC arch/powerpc/boot/inffast.o +| make[1]: *** [arch/powerpc/boot/treeboot-iss4xx.o] Error 1 +| make[1]: *** Waiting for unfinished jobs.... +| BOOTCC arch/powerpc/boot/inflate.o +| make: *** [uImage] Error 2 +| ERROR: oe_runmake failed +| ERROR: Function failed: do_compile (see /srv/home/pokybuild/yocto-autobuilder/yocto-slave/p1022ds/build/build/tmp/work/p1022ds-poky-linux-gnuspe/linux-qoriq-sdk-3.0.34-r5/temp/log.do_compile.2167 for further information) +NOTE: recipe linux-qoriq-sdk-3.0.34-r5: task do_compile: Failed + +Signed-off-by: Matthew McClintock <msm@...> +--- + arch/powerpc/boot/Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile +index b7d8333..6a15c96 100644 +--- a/arch/powerpc/boot/Makefile ++++ b/arch/powerpc/boot/Makefile +@@ -107,6 +107,7 @@ src-boot := $(addprefix $(obj)/, $(src-boot)) + obj-boot := $(addsuffix .o, $(basename $(src-boot))) + obj-wlib := $(addsuffix .o, $(basename $(addprefix $(obj)/, $(src-wlib)))) + obj-plat := $(addsuffix .o, $(basename $(addprefix $(obj)/, $(src-plat)))) ++obj-plat: $(libfdt) + + quiet_cmd_copy_zlib = COPY $@ + cmd_copy_zlib = sed "s@__used@@;s@<linux/\([^>]*\).*@\"\1\"@" $< > $@ +-- +1.7.9.7 + -- 1.7.9.7
|
|
Re: [meta-fsl-arm] [meta-ivi] layer stable branch request
Alonso Lazcano Adrian-B38018 <B38018@...>
Hi Florin,
In that case 3.0 branch will be ok, I will also give it a try.
Regards Adrian
From: otavio.salvador@... [mailto:otavio.salvador@...]
On Behalf Of Otavio Salvador
Sent: Thursday, November 29, 2012 1:08 PM To: Sarbu, Florin-Ionut (Florin) Cc: Alonso Lazcano Adrian-B38018; Behrens, Holger; meta-freescale@...; Li Yi i.MX-R80015; Dunham Ragan-B37558; Gherzan, Andrei; Angolini Daiane-B19406 Subject: Re: [meta-fsl-arm] [meta-ivi] layer stable branch request
On Thu, Nov 29, 2012 at 5:07 PM, Sarbu, Florin-Ionut (Florin) <Florin.Sarbu@...> wrote: Hi Adrian,
I will give it a try.
-- Otavio Salvador O.S. Systems
|
|
Re: [PATCH 09/27] set preferred version of oprofile to 0.9.6 for e500mc targets
Daiane
it looks OK to me.
Daiane
|
|
Re: [PATCH 04/27] lm_sensors: added recipe for v3.3.2
Daiane
On Thu, Nov 29, 2012 at 5:15 PM, Matthew McClintock <msm@...> wrote:
From: Zhenhua Luo <b19537@...>Is this a must or is it optional? I only want to understand. Because it looks like it´s defined just like default value would be. +It looks great to me. Daiane
|
|
Re: [PATCH 06/27] u-boot_git.bb: libgcc is required for multilib builds too
Daiane
it looks ok to me
Daiane
|
|
Re: [PATCH 05/27] u-boot_git.bb: hack in support for building 32-bit u-boot with 64-bit machine
Daiane
On Thu, Nov 29, 2012 at 5:15 PM, Matthew McClintock <msm@...> wrote:
This really was already partially applied, so it's just adding moreThis patch does not BUMP PR.
|
|
Re: [PATCH 14/27] lxc_0.8.0-rc1.bb: point lxc at kernel source
Daiane
it looks OK to me
Daiane
|
|