Re: [OE-core] [PATCH] Rename 'BRANCH' variable to 'SRC_BRANCH' for clearness
On Aug 21, 2015, at 2:58 PM, Otavio Salvador otavio.salva...@ossystems.com.br wrote: On Fri, Aug 21, 2015 at 6:49 PM, Khem Raj raj.k...@gmail.com wrote: On Aug 21, 2015, at 2:38 PM, Otavio Salvador ota...@ossystems.com.br wrote: The 'BRANCH' variable name has no explicit relation with the SRC_URI. Using 'SRC_BRANCH' makes it more obvious and easier to identify. Look good to me, just may be avoid ‘_’ and call it SRCBRANCH I did this initially but looking at how it looks in the source code, it seems SRC_BRANCH makes easier to spot the relation with SRC_URI. So I took the second. since bitbake use ‘_’ as a override separator, its less confusing if variables don’t have underscore in them for future collision. -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://code.ossystems.com.br Mobile: +55 (53) 9981-7854Mobile: +1 (347) 903-9750 signature.asc Description: Message signed with OpenPGP using GPGMail -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] Rename 'BRANCH' variable to 'SRC_BRANCH' for clearness
On Fri, 2015-08-21 at 23:03 -0700, Khem Raj wrote: On Aug 21, 2015, at 2:58 PM, Otavio Salvador otavio.salva...@ossystems.com.br wrote: On Fri, Aug 21, 2015 at 6:49 PM, Khem Raj raj.k...@gmail.com wrote: On Aug 21, 2015, at 2:38 PM, Otavio Salvador ota...@ossystems.com.br wrote: The 'BRANCH' variable name has no explicit relation with the SRC_URI. Using 'SRC_BRANCH' makes it more obvious and easier to identify. Look good to me, just may be avoid ‘_’ and call it SRCBRANCH I did this initially but looking at how it looks in the source code, it seems SRC_BRANCH makes easier to spot the relation with SRC_URI. So I took the second. since bitbake use ‘_’ as a override separator, its less confusing if variables don’t have underscore in them for future collision. Names with '_' in them might look better but there is a small price to pay for it in that bitbake then has to track whether BRANCH is an override. Obviously it does this in many cases already (e.g. URI from SRC_URI) but when you've looked at what the datastore actually has to do to keep the system working, you start to lean against creating more work for it. I continue to believe we should probably find a better syntax for overrides. If someone had a good alternative, it would probably be worth the pain of switching... I'm not saying we shouldn't take the above patch here, just that this is something which does have a cost and all the uses do mount up significantly. Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] mtd-utils: add dependency on acl
On Sat, Aug 22, 2015 at 11:47 AM, Andrea Adami andrea.ad...@gmail.com
wrote:
On Sat, Aug 22, 2015 at 2:44 AM, Andre McCurdy armccu...@gmail.com
wrote:
On Fri, Aug 21, 2015 at 4:28 PM, Andrea Adami andrea.ad...@gmail.com
wrote:
After commit 24fde4d do_compile fails:
| mkfs.jffs2.c:70:21: fatal error: sys/acl.h: No such file or directory
| #include sys/acl.h
Adding acl to the list of dependencies fixes the build.
Unconditionally enabling xattr and acl support is OK for the native
build, but for the target both should probably be conditional on their
respective DISTRO_FEATURES.
I can agree, acl is one distro feature but atm it is not used by nodistro
and poky.
So the patch unconditionally -DWITHOUT_XATTR seems wrong...this should be
done only if acl is used.
ofc I meant unconditionally removing -DWITHOUT_XATTR
( commit24fde4d983cc8f056177de6c1ad308369f6279ad )
http://cgit.openembedded.org/openembedded-core/commit/meta/recipes-devtools/mtd/mtd-utils_git.bb?id=24fde4d983cc8f056177de6c1ad308369f6279ad
Andrea
Signed-off-by: Andrea Adami andrea.ad...@gmail.com
---
meta/recipes-devtools/mtd/mtd-utils_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/mtd/mtd-utils_git.bb
b/meta/recipes-devtools/mtd/mtd-utils_git.bb
index 8d4892a..72ce9ed 100644
--- a/meta/recipes-devtools/mtd/mtd-utils_git.bb
+++ b/meta/recipes-devtools/mtd/mtd-utils_git.bb
@@ -5,7 +5,7 @@ LICENSE = GPLv2+
LIC_FILES_CHKSUM =
file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
file://include/common.h;beginline=1;endline=17;md5=ba05b07912a44ea2bf81ce409380049c
-DEPENDS = zlib lzo e2fsprogs util-linux
+DEPENDS = zlib lzo e2fsprogs util-linux acl
PV = 1.5.1+git${SRCPV}
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 4/5] btrfs-tools: 4.1.1 - 4.1.2
On 08/21/2015 09:22 PM, alexander.kana...@linux.intel.com wrote:
Is there no PV change here?
Thanks, I updated in the repo.
-PV = 4.1.1+git${SRCPV}
+PV = 4.1.2+git${SRCPV}
You can also rename the recipe to btrfs-tools_4.1.2.bb and remove the PV
altogether. The above form is only needed if you're taking something from
git that is not a pristine tagged release (i.e. when it is a tagged
commit+additional commits).
Thanks, updated in the repo:
git://git.openembedded.org/openembedded-core-contrib rbt/PU
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/PU
Robert Yang (4):
gnupg: 2.1.6 - 2.1.7
gnu-efi: 3.0.2 - 3.0.3
btrfs-tools: 4.1.1 - 4.1.2
oprofile: 1.0.0 - 1.1.0
// Robert
Alex
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] mtd-utils: add dependency on acl
On Sat, Aug 22, 2015 at 2:44 AM, Andre McCurdy armccu...@gmail.com wrote:
On Fri, Aug 21, 2015 at 4:28 PM, Andrea Adami andrea.ad...@gmail.com
wrote:
After commit 24fde4d do_compile fails:
| mkfs.jffs2.c:70:21: fatal error: sys/acl.h: No such file or directory
| #include sys/acl.h
Adding acl to the list of dependencies fixes the build.
Unconditionally enabling xattr and acl support is OK for the native
build, but for the target both should probably be conditional on their
respective DISTRO_FEATURES.
I can agree, acl is one distro feature but atm it is not used by nodistro
and poky.
So the patch unconditionally -DWITHOUT_XATTR seems wrong...this should be
done only if acl is used.
Andrea
Signed-off-by: Andrea Adami andrea.ad...@gmail.com
---
meta/recipes-devtools/mtd/mtd-utils_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/mtd/mtd-utils_git.bb
b/meta/recipes-devtools/mtd/mtd-utils_git.bb
index 8d4892a..72ce9ed 100644
--- a/meta/recipes-devtools/mtd/mtd-utils_git.bb
+++ b/meta/recipes-devtools/mtd/mtd-utils_git.bb
@@ -5,7 +5,7 @@ LICENSE = GPLv2+
LIC_FILES_CHKSUM = file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3
\
file://include/common.h;beginline=1;endline=17;md5=ba05b07912a44ea2bf81ce409380049c
-DEPENDS = zlib lzo e2fsprogs util-linux
+DEPENDS = zlib lzo e2fsprogs util-linux acl
PV = 1.5.1+git${SRCPV}
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] Rename 'BRANCH' variable to 'SRC_BRANCH' for clearness
On Sat, Aug 22, 2015 at 6:08 AM, Richard Purdie richard.pur...@linuxfoundation.org wrote: On Fri, 2015-08-21 at 23:03 -0700, Khem Raj wrote: On Aug 21, 2015, at 2:58 PM, Otavio Salvador otavio.salva...@ossystems.com.br wrote: On Fri, Aug 21, 2015 at 6:49 PM, Khem Raj raj.k...@gmail.com wrote: On Aug 21, 2015, at 2:38 PM, Otavio Salvador ota...@ossystems.com.br wrote: The 'BRANCH' variable name has no explicit relation with the SRC_URI. Using 'SRC_BRANCH' makes it more obvious and easier to identify. Look good to me, just may be avoid ‘_’ and call it SRCBRANCH I did this initially but looking at how it looks in the source code, it seems SRC_BRANCH makes easier to spot the relation with SRC_URI. So I took the second. since bitbake use ‘_’ as a override separator, its less confusing if variables don’t have underscore in them for future collision. Names with '_' in them might look better but there is a small price to pay for it in that bitbake then has to track whether BRANCH is an override. Obviously it does this in many cases already (e.g. URI from SRC_URI) but when you've looked at what the datastore actually has to do to keep the system working, you start to lean against creating more work for it. I continue to believe we should probably find a better syntax for overrides. If someone had a good alternative, it would probably be worth the pain of switching... I'm not saying we shouldn't take the above patch here, just that this is something which does have a cost and all the uses do mount up significantly. So we should consider renaming SRC_URI for SRCURI. ;-) I am Ok sending it as SRCBRANCH but it does looks less obvious for news comers. -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://code.ossystems.com.br Mobile: +55 (53) 9981-7854Mobile: +1 (347) 903-9750 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/4 V2] systemd: Upgrade 219 - 224
On Fri, Aug 21, 2015 at 3:14 AM, ChenQi qi.c...@windriver.com wrote: Hi Khem, I built core-image-minimal for qemuarm64. There's a lot of failures and warnings at boot time and the system boots into rescue mode. And I also verified 199 has no such problem. I verified once again specifically on qemuarm64, and all came up fine, with no service failures, btw you need these three patches together http://git.openembedded.org/openembedded-core-contrib/commit/?h=kraj/masterid=31772f3fc4745100bedf2e0d67b140a9b22d3f4b http://git.openembedded.org/openembedded-core-contrib/commit/?h=kraj/masterid=fcba0329bc1a2b9d6d071247011cd43a9271d251 http://git.openembedded.org/openembedded-core-contrib/commit/?h=kraj/masterid=ddfe697d82e532e4c80e69f729170ca4571f7803 and I tried with gcc 4.9 this time. Best Regards, Chen Qi On 08/21/2015 09:46 AM, Randy MacLeod wrote: On 2015-08-20 09:17 PM, Khem Raj wrote: On Thu, Aug 20, 2015 at 6:04 AM, Philip Balister phi...@balister.org wrote: On 08/19/2015 10:21 PM, Khem Raj wrote: On Wed, Aug 19, 2015 at 12:55 PM, Burton, Ross ross.bur...@intel.com wrote: On 17 August 2015 at 16:41, Khem Raj raj.k...@gmail.com wrote: There are many reasons, for me its overlay support for systemd-nspawn, networkd has got many new features that is now usable w.r.t. IP forwarding, vxlan etc. and it has many bug fixed in those 2000 odd commits since 219, no different then any other package upgrades we do in general it keep the upgrade workload lower as we roll the releases. Any specific concerns ? Can we get an updated patch with a clearer commit log? I've also heard that as systemd evolves, more binaries are getting added to the base package that should be packaged separately for people interested in small images. I do not have personal experience here, but wanted to pass along the feedback. We should look at buildhistory packaging differences when we do upgrades. Here is the diff between files in 219 and 224, if you want to know more I can paste more info just let me know. https://gist.github.com/kraj/2a066973a5e5cf83ed24 sizes have gone up on daemons, no new daemons besides some new service files and scripts are added ubu-15.10 will use v224 as well: http://cdimage.ubuntu.com/daily-live/current/wily-desktop-amd64.manifest and Arch and a couple other distro are using this version already: http://pkgs.org/download/systemd v224 was released 3 weeks ago: --- $ git log -1 v224 commit b2a0ac5e5b29c73ca7c0da23369a4769d5a91ddd ... Date: Fri Jul 31 18:56:38 2015 +0200 --- Khem's summary of the binaries is reassuring given that there has been lots of churn: $ git log --oneline v219..v224 | wc -l 2167 $ git diff v219..v224 | diffstat | tail -1 1367 files changed, 109907 insertions(+), 166577 deletions(-) I'm skimming the NEWS file from 219-224 and I haven't seen anything that concerns me yet: https://github.com/systemd/systemd/blob/master/NEWS Qi, Please take a closer look at the NEWS file, review Khem's uprev and build and boot qemuarm64, qemuppc when you have time. Send partial feedback today even if you just review the commit and NEWS file. Qi may not be able to do that in the next couple of day due to SDK work. Khem, What testing have you done so far? Any ptest? What toolchain version are you building with, btw? It's late in M3 and we still have the kernel and toolchain coming in but unless we hear of known problems with v224, let's go for it once the new toolchain and kernel have settled. -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] mtd-utils: add dependency on acl
On Sat, Aug 22, 2015 at 11:50 AM, Andrea Adami andrea.ad...@gmail.com
wrote:
On Sat, Aug 22, 2015 at 11:47 AM, Andrea Adami andrea.ad...@gmail.com
wrote:
On Sat, Aug 22, 2015 at 2:44 AM, Andre McCurdy armccu...@gmail.com
wrote:
On Fri, Aug 21, 2015 at 4:28 PM, Andrea Adami andrea.ad...@gmail.com
wrote:
After commit 24fde4d do_compile fails:
| mkfs.jffs2.c:70:21: fatal error: sys/acl.h: No such file or directory
| #include sys/acl.h
Adding acl to the list of dependencies fixes the build.
Unconditionally enabling xattr and acl support is OK for the native
build, but for the target both should probably be conditional on their
respective DISTRO_FEATURES.
I can agree, acl is one distro feature but atm it is not used by nodistro
and poky.
So the patch unconditionally -DWITHOUT_XATTR seems wrong...this should
be done only if acl is used.
ofc I meant unconditionally removing -DWITHOUT_XATTR
( commit24fde4d983cc8f056177de6c1ad308369f6279ad )
http://cgit.openembedded.org/openembedded-core/commit/meta/recipes-devtools/mtd/mtd-utils_git.bb?id=24fde4d983cc8f056177de6c1ad308369f6279ad
Andrea
Signed-off-by: Andrea Adami andrea.ad...@gmail.com
---
meta/recipes-devtools/mtd/mtd-utils_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/mtd/mtd-utils_git.bb
b/meta/recipes-devtools/mtd/mtd-utils_git.bb
index 8d4892a..72ce9ed 100644
--- a/meta/recipes-devtools/mtd/mtd-utils_git.bb
+++ b/meta/recipes-devtools/mtd/mtd-utils_git.bb
@@ -5,7 +5,7 @@ LICENSE = GPLv2+
LIC_FILES_CHKSUM =
file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
file://include/common.h;beginline=1;endline=17;md5=ba05b07912a44ea2bf81ce409380049c
-DEPENDS = zlib lzo e2fsprogs util-linux
+DEPENDS = zlib lzo e2fsprogs util-linux acl
PV = 1.5.1+git${SRCPV}
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Please ignore, patch v2 will be sent now.
Cheers
Andrea
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] mtd-utils: disable xattr if DISTRO_FEATURES doesn't contain acl
After commit 24fde4d do_compile fails:
| mkfs.jffs2.c:70:21: fatal error: sys/acl.h: No such file or directory
| #include sys/acl.h
This is a missing dependency on acl.
To fix this we add a check to disable xattr when acl is not in
DISTRO_FEATURES.
Signed-off-by: Andrea Adami andrea.ad...@gmail.com
---
meta/recipes-devtools/mtd/mtd-utils_git.bb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/mtd/mtd-utils_git.bb
b/meta/recipes-devtools/mtd/mtd-utils_git.bb
index 8d4892a..6a388c8 100644
--- a/meta/recipes-devtools/mtd/mtd-utils_git.bb
+++ b/meta/recipes-devtools/mtd/mtd-utils_git.bb
@@ -19,7 +19,8 @@ SRC_URI = git://git.infradead.org/mtd-utils.git \
S = ${WORKDIR}/git/
-EXTRA_OEMAKE = 'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS}
-I${S}/include' 'BUILDDIR=${S}'
+DISABLE_XATTR = ${@bb.utils.contains('DISTRO_FEATURES', 'acl', '',
'-DWITHOUT_XATTR', d)}
+EXTRA_OEMAKE = 'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS}
-I${S}/include ${DISABLE_XATTR}' 'BUILDDIR=${S}'
do_install () {
oe_runmake install DESTDIR=${D} SBINDIR=${sbindir} MANDIR=${mandir}
INCLUDEDIR=${includedir}
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/5] libgcc-common.inc: overrides for libc-baremetal
Added TCLIBC=baremetal specific overrides.
Signed-off-by: Juro Bystricky juro.bystri...@intel.com
---
meta/recipes-devtools/gcc/libgcc-common.inc | 6 ++
1 file changed, 6 insertions(+)
diff --git a/meta/recipes-devtools/gcc/libgcc-common.inc
b/meta/recipes-devtools/gcc/libgcc-common.inc
index 22da03b..b09ea65 100644
--- a/meta/recipes-devtools/gcc/libgcc-common.inc
+++ b/meta/recipes-devtools/gcc/libgcc-common.inc
@@ -45,6 +45,12 @@ do_install () {
rm -rf ${D}${libdir}/${TARGET_SYS}/${BINV}/include
}
+do_install_append_libc-baremetal () {
+ rmdir ${D}${base_libdir}
+}
+
+RDEPENDS_${PN}-dev_libc-baremetal =
+
BBCLASSEXTEND = nativesdk
addtask multilib_install after do_install before do_package do_populate_sysroot
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/5] cross-canadian.bbclass: support for TCLIBC=baremetal
Allow baremetal builds.
Signed-off-by: Juro Bystricky juro.bystri...@intel.com
---
meta/classes/cross-canadian.bbclass | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta/classes/cross-canadian.bbclass
b/meta/classes/cross-canadian.bbclass
index 80fb472..65ba457 100644
--- a/meta/classes/cross-canadian.bbclass
+++ b/meta/classes/cross-canadian.bbclass
@@ -29,6 +29,9 @@ python () {
if d.getVar(MODIFYTOS, True) != 1:
return
+if d.getVar(TCLIBC, True) == baremetal:
+return
+
tos = d.getVar(TARGET_OS, True)
whitelist = []
for variant in [, spe, x32, eabi, n32]:
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/5] Support for baremetal toolchains
These patches allow building baremetal images, in particular baremetal cross-compilers. The cross-compilers make no assumtions about target OS and come with no C libraries. I tested the patches with the following in local.conf: PACKAGE_CLASSES=package_ipk SDKMACHINE=i686 TCLIBC=baremetal MACHINE=qemuarm MACHINE=qemux86 GCCVERSION=5.2.0 GCCVERSION=4.9.3 The patches are based on the original work by Richard Purdie. Juro Bystricky (5): tclibc-baremetal.inc: baremetal specific distro policy file gcc-cross-canadian.inc: overrides for libc-baremetal gcc-cross.inc: overrides for libc-baremetal libgcc-common.inc: overrides for libc-baremetal cross-canadian.bbclass: support for TCLIBC=baremetal meta/classes/cross-canadian.bbclass | 3 +++ meta/conf/distro/include/tclibc-baremetal.inc| 32 meta/recipes-devtools/gcc/gcc-cross-canadian.inc | 4 +++ meta/recipes-devtools/gcc/gcc-cross.inc | 4 +++ meta/recipes-devtools/gcc/libgcc-common.inc | 6 + 5 files changed, 49 insertions(+) create mode 100644 meta/conf/distro/include/tclibc-baremetal.inc -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/5] gcc-cross-canadian.inc: overrides for libc-baremetal
Modify configure arguments (EXTRA_OECONF) to support build for
TCLIBC=baremetal
Signed-off-by: Juro Bystricky juro.bystri...@intel.com
---
meta/recipes-devtools/gcc/gcc-cross-canadian.inc | 4
1 file changed, 4 insertions(+)
diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
index 07ecfee..54e4881 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
@@ -169,5 +169,9 @@ EXTRA_OECONF += \
--with-mpc=${STAGING_DIR_HOST}${layout_exec_prefix} \
+EXTRA_OECONF_append_libc-baremetal = --without-headers
+EXTRA_OECONF_remove_libc-baremetal = --with-sysroot=/not/exist
+EXTRA_OECONF_remove_libc-baremetal =
--with-build-sysroot=${STAGING_DIR_TARGET}
+
# gcc 4.7 needs -isystem
export ARCH_FLAGS_FOR_TARGET = --sysroot=${STAGING_DIR_TARGET}
-isystem=${target_includedir}
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/5] gcc-cross.inc: overrides for libc-baremetal
Modifications to to support build for TCLIBC=baremetal
Signed-off-by: Juro Bystricky juro.bystri...@intel.com
---
meta/recipes-devtools/gcc/gcc-cross.inc | 4
1 file changed, 4 insertions(+)
diff --git a/meta/recipes-devtools/gcc/gcc-cross.inc
b/meta/recipes-devtools/gcc/gcc-cross.inc
index 9792950..aa10633 100644
--- a/meta/recipes-devtools/gcc/gcc-cross.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross.inc
@@ -24,6 +24,10 @@ EXTRA_OECONF += \
--with-system-zlib \
+DEPENDS_remove_libc-baremetal := virtual/${TARGET_PREFIX}libc-for-gcc
+EXTRA_OECONF_append_libc-baremetal = --without-headers
+EXTRA_OECONF_remove_libc-baremetal = --enable-threads=posix
+
EXTRA_OECONF_PATHS = \
--with-gxx-include-dir=/not/exist${target_includedir}/c++/${BINV} \
--with-sysroot=/not/exist \
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/5] tclibc-baremetal.inc: baremetal specific distro policy file
Support for TCLIBC=baremetal.
Allows building baremetal toolchains.
Signed-off-by: Juro Bystricky juro.bystri...@intel.com
---
meta/conf/distro/include/tclibc-baremetal.inc | 32 +++
1 file changed, 32 insertions(+)
create mode 100644 meta/conf/distro/include/tclibc-baremetal.inc
diff --git a/meta/conf/distro/include/tclibc-baremetal.inc
b/meta/conf/distro/include/tclibc-baremetal.inc
new file mode 100644
index 000..a8ce6d3
--- /dev/null
+++ b/meta/conf/distro/include/tclibc-baremetal.inc
@@ -0,0 +1,32 @@
+#
+# baremetal configuration
+#
+
+LIBCEXTENSION =
+
+# Add baremetal libc overrides to the overrides.
+LIBCOVERRIDE = :libc-baremetal
+OVERRIDES .= ${LIBCOVERRIDE}
+
+ASSUME_PROVIDED += virtual/libc virtual/libiconv
+
+PREFERRED_PROVIDER_virtual/libc ?= musl
+PREFERRED_PROVIDER_virtual/libiconv ?= musl
+PREFERRED_PROVIDER_virtual/libintl ?= gettext
+PREFERRED_PROVIDER_virtual/nativesdk-libintl ?= nativesdk-glibc
+PREFERRED_PROVIDER_virtual/nativesdk-libiconv ?= nativesdk-glibc
+
+USE_NLS ?= no
+IMAGE_LINGUAS =
+LIBC_DEPENDENCIES =
+
+EXTRA_OECONF_pn-gcc-cross-${TARGET_ARCH}_append = --without-headers
+DEPENDS_remove_pn-meta-toolchain = virtual/libc
virtual/${TARGET_PREFIX}compilerlibs
+
+TARGET_OS = elf
+TARGET_OS_arm = eabi
+
+TOOLCHAIN_HOST_TASK ?= packagegroup-cross-canadian-${MACHINE}
+TOOLCHAIN_HOST_TASK_ATTEMPTONLY ?=
+TOOLCHAIN_TARGET_TASK ?= libgcc-dev
+TOOLCHAIN_NEED_CONFIGSITE_CACHE_remove = virtual/${MLPREFIX}libc zlib ncurses
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 6/6] mdadm: Upgrade mdadm_3.3.2.bb - mdadm_3.3.4.bb
Drop upstreamed patch for gcc5 compatibility
Forward port x32 patch
Signed-off-by: Khem Raj raj.k...@gmail.com
---
meta/recipes-extended/mdadm/files/inline.patch | 39 --
.../mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch | 23 ++---
.../mdadm/{mdadm_3.3.2.bb = mdadm_3.3.4.bb} | 6 ++--
3 files changed, 13 insertions(+), 55 deletions(-)
delete mode 100644 meta/recipes-extended/mdadm/files/inline.patch
rename meta/recipes-extended/mdadm/{mdadm_3.3.2.bb = mdadm_3.3.4.bb} (92%)
diff --git a/meta/recipes-extended/mdadm/files/inline.patch
b/meta/recipes-extended/mdadm/files/inline.patch
deleted file mode 100644
index 9009f06..000
--- a/meta/recipes-extended/mdadm/files/inline.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-with gnu11 turning on a default with gcc-5 we have to abide by new inline
semantics
-using 'inline' and using is in same translation unit means an external
definition has to exist
-same like external inline in gnu89, we simply make the functions static
inline since they
-are just meant to be used in this file
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj raj.k...@gmail.com
-
-Index: mdadm-3.3.2/bitmap.c
-===
mdadm-3.3.2.orig/bitmap.c
-+++ mdadm-3.3.2/bitmap.c
-@@ -20,7 +20,7 @@
-
- #include mdadm.h
-
--inline void sb_le_to_cpu(bitmap_super_t *sb)
-+static inline void sb_le_to_cpu(bitmap_super_t *sb)
- {
- sb-magic = __le32_to_cpu(sb-magic);
- sb-version = __le32_to_cpu(sb-version);
-@@ -34,7 +34,7 @@ inline void sb_le_to_cpu(bitmap_super_t
- sb-write_behind = __le32_to_cpu(sb-write_behind);
- }
-
--inline void sb_cpu_to_le(bitmap_super_t *sb)
-+static inline void sb_cpu_to_le(bitmap_super_t *sb)
- {
- sb_le_to_cpu(sb); /* these are really the same thing */
- }
-@@ -74,7 +74,7 @@ typedef struct bitmap_info_s {
- } bitmap_info_t;
-
- /* count the dirty bits in the first num_bits of byte */
--inline int count_dirty_bits_byte(char byte, int num_bits)
-+static inline int count_dirty_bits_byte(char byte, int num_bits)
- {
- int num = 0;
-
diff --git a/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch
b/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch
index 143a8d9..c656d07 100644
--- a/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch
+++ b/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch
@@ -5,22 +5,21 @@ Upstream-Status: Pending
Signed-off-by: Aníbal Limón anibal.li...@linux.intel.com
-diff --git a/monitor.c b/monitor.c
-index f81e707..19ea041 100644
a/monitor.c
-+++ b/monitor.c
-@@ -260,8 +260,13 @@ static int read_and_act(struct active_array *a)
+Index: mdadm-3.3.4/monitor.c
+===
+--- mdadm-3.3.4.orig/monitor.c
mdadm-3.3.4/monitor.c
+@@ -257,9 +257,12 @@ static int read_and_act(struct active_ar
+ mdi-curr_state = read_dev_state(mdi-state_fd);
+ }
}
-
+-
gettimeofday(tv, NULL);
+#if defined(__x86_64__) defined(__ILP32__)
-+ dprintf(%s(%d): %lld.%06lld state:%s prev:%s action:%s prev: %s
start:%llu\n,
++ dprintf((%d): %lld.%06lld state:%s prev:%s action:%s prev: %s
start:%llu\n,
+#else
- dprintf(%s(%d): %ld.%06ld state:%s prev:%s action:%s prev: %s
start:%llu\n,
-- __func__, a-info.container_member,
+ dprintf((%d): %ld.%06ld state:%s prev:%s action:%s prev: %s
start:%llu\n,
+#endif
-+ __func__,
-+ a-info.container_member,
+ a-info.container_member,
tv.tv_sec, tv.tv_usec,
array_states[a-curr_state],
- array_states[a-prev_state],
diff --git a/meta/recipes-extended/mdadm/mdadm_3.3.2.bb
b/meta/recipes-extended/mdadm/mdadm_3.3.4.bb
similarity index 92%
rename from meta/recipes-extended/mdadm/mdadm_3.3.2.bb
rename to meta/recipes-extended/mdadm/mdadm_3.3.4.bb
index b2fbe4a..460a430 100644
--- a/meta/recipes-extended/mdadm/mdadm_3.3.2.bb
+++ b/meta/recipes-extended/mdadm/mdadm_3.3.4.bb
@@ -12,12 +12,10 @@ SRC_URI =
${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \
file://mdadm-3.2.2_fix_for_x32.patch \
file://gcc-4.9.patch \
file://mdadm-3.3.2_x32_abi_time_t.patch \
- file://inline.patch \
file://run-ptest \
-
-SRC_URI[md5sum] = 44698d351501cac6a89072dc877eb220
-SRC_URI[sha256sum] =
0f3a7e1a76b13892b79f9fceaf99ecb23513260389a768ac644ffa3ae06e5b8c
+SRC_URI[md5sum] = 7ca8b114710f98f53f20c5787b674a09
+SRC_URI[sha256sum] =
8ae5f45306b873190e91f410709b00e51997b633c072b33f8efd9f7df022ca68
CFLAGS += -fno-strict-aliasing
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/6] psplash: Turn psplash_fb_plot_pixel() into static inline
This function is not used anywhere except psplash-fb.c so make it static
inline function which is portable across compilers
Fixes issues like
psplash-fb.o: In function `psplash_fb_draw_rect':
|
/mnt/home/kraj/work/angstrom/sources/openembedded-core/build/tmp-glibc/work/i586-oe-linux/psplash/0.1+gitAUTOINC+14c8f7b705-r15/git/psplash-fb.c:363:
undefined reference to `psplash_fb_plot_pixel'
Signed-off-by: Khem Raj raj.k...@gmail.com
---
...Convert-psplash_fb_plot_pixel-to-a-static.patch | 53 ++
meta/recipes-core/psplash/psplash_git.bb | 1 +
2 files changed, 54 insertions(+)
create mode 100644
meta/recipes-core/psplash/files/0001-psplash-fb-Convert-psplash_fb_plot_pixel-to-a-static.patch
diff --git
a/meta/recipes-core/psplash/files/0001-psplash-fb-Convert-psplash_fb_plot_pixel-to-a-static.patch
b/meta/recipes-core/psplash/files/0001-psplash-fb-Convert-psplash_fb_plot_pixel-to-a-static.patch
new file mode 100644
index 000..93b3c6b
--- /dev/null
+++
b/meta/recipes-core/psplash/files/0001-psplash-fb-Convert-psplash_fb_plot_pixel-to-a-static.patch
@@ -0,0 +1,53 @@
+From 8f5de12cc75bfaa8400adf32f30c015d8f813540 Mon Sep 17 00:00:00 2001
+From: Khem Raj raj.k...@gmail.com
+Date: Sat, 22 Aug 2015 07:12:20 -0700
+Subject: [PATCH] psplash-fb: Convert psplash_fb_plot_pixel() to a static
+ inline
+
+This function is not used outside psplash-fb.c and by making it
+static inline we keep the performance and also make it portable across
+multiple compilers and gcc versions
+
+Signed-off-by: Khem Raj raj.k...@gmail.com
+---
+Upstream-Status: Pending
+
+ psplash-fb.c | 2 +-
+ psplash-fb.h | 8
+ 2 files changed, 1 insertion(+), 9 deletions(-)
+
+diff --git a/psplash-fb.c b/psplash-fb.c
+index bd9cd9d..6d235db 100644
+--- a/psplash-fb.c
b/psplash-fb.c
+@@ -260,7 +260,7 @@ psplash_fb_new (int angle)
+
+ #define OFFSET(fb,x,y) (((y) * (fb)-stride) + ((x) * ((fb)-bpp 3)))
+
+-inline void
++static inline void
+ psplash_fb_plot_pixel (PSplashFB*fb,
+ int x,
+ int y,
+diff --git a/psplash-fb.h b/psplash-fb.h
+index 42592ed..c6c3144 100644
+--- a/psplash-fb.h
b/psplash-fb.h
+@@ -57,14 +57,6 @@ psplash_fb_destroy (PSplashFB *fb);
+ PSplashFB*
+ psplash_fb_new (int angle);
+
+-inline void
+-psplash_fb_plot_pixel (PSplashFB*fb,
+- int x,
+- int y,
+- uint8red,
+- uint8green,
+- uint8blue);
+-
+ void
+ psplash_fb_draw_rect (PSplashFB*fb,
+ int x,
+--
+2.1.4
+
diff --git a/meta/recipes-core/psplash/psplash_git.bb
b/meta/recipes-core/psplash/psplash_git.bb
index 7f0dc78..b3b6479 100644
--- a/meta/recipes-core/psplash/psplash_git.bb
+++ b/meta/recipes-core/psplash/psplash_git.bb
@@ -10,6 +10,7 @@ PV = 0.1+git${SRCPV}
PR = r15
SRC_URI = git://git.yoctoproject.org/${BPN} \
+
file://0001-psplash-fb-Convert-psplash_fb_plot_pixel-to-a-static.patch \
file://psplash-init \
${SPLASH_IMAGES}
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/6] sysvinit: Fix makefile bug found with clang
This is due to specifying .h files on linker cmdline
clang driver is picky about it, and its not entirely correct
either
Signed-off-by: Khem Raj raj.k...@gmail.com
---
...an-issue-that-clang-reports-about-mutlipl.patch | 52 ++
meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb | 1 +
2 files changed, 53 insertions(+)
create mode 100644
meta/recipes-core/sysvinit/sysvinit/0001-This-fixes-an-issue-that-clang-reports-about-mutlipl.patch
diff --git
a/meta/recipes-core/sysvinit/sysvinit/0001-This-fixes-an-issue-that-clang-reports-about-mutlipl.patch
b/meta/recipes-core/sysvinit/sysvinit/0001-This-fixes-an-issue-that-clang-reports-about-mutlipl.patch
new file mode 100644
index 000..f35c15c
--- /dev/null
+++
b/meta/recipes-core/sysvinit/sysvinit/0001-This-fixes-an-issue-that-clang-reports-about-mutlipl.patch
@@ -0,0 +1,52 @@
+From 36ac97bfe51797458442a6035219a504a42e703a Mon Sep 17 00:00:00 2001
+From: Khem Raj raj.k...@gmail.com
+Date: Fri, 21 Aug 2015 10:56:40 -0700
+Subject: [PATCH] This fixes an issue that clang reports about mutliple output
+ files
+
+Issue is that we are passing .h file to link step as seen below.
+
+| arm-oe-linux-gnueabi-clang -march=armv7-a -mthumb -mfloat-abi=hard
+-mfpu=neon-vfpv4 -mtune=cortex-a7 -D__extern_always_inline=inline
+-no-integrated-as
+--sysroot=/mnt/home/kraj/work/angstrom/sources/openembedded-core/build/tmp-glibc/sysroots/raspberrypi2
+-Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed halt.o ifdown.o hddown.o
+utmp.o reboot.h -o halt
+| clang-3.7: error: cannot specify -o when generating multiple output
+files
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj raj.k...@gmail.com
+---
+ src/Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index e77ed5f..a6f9f40 100644
+--- a/src/Makefile
b/src/Makefile
+@@ -103,9 +103,9 @@ all: $(BIN) $(SBIN) $(USRBIN)
+ init: LDLIBS += $(INITLIBS) $(STATIC)
+ init: init.o init_utmp.o
+
+-halt: halt.o ifdown.o hddown.o utmp.o reboot.h
++halt: halt.o ifdown.o hddown.o utmp.o
+
+-last: last.o oldutmp.h
++last: last.o
+
+ mesg: mesg.o
+
+@@ -120,7 +120,7 @@ sulogin: sulogin.o
+
+ wall: dowall.o wall.o
+
+-shutdown: dowall.o shutdown.o utmp.o reboot.h
++shutdown: dowall.o shutdown.o utmp.o
+
+ bootlogd: LDLIBS += -lutil
+ bootlogd: bootlogd.o
+--
+2.1.4
+
diff --git a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
index 6709a9b..5dfe39e 100644
--- a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
+++ b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
@@ -13,6 +13,7 @@ SRC_URI =
${SAVANNAH_GNU_MIRROR}/sysvinit/sysvinit-${PV}.tar.bz2 \
file://install.patch \
file://crypt-lib.patch \
file://pidof-add-m-option.patch \
+
file://0001-This-fixes-an-issue-that-clang-reports-about-mutlipl.patch \
file://rcS-default \
file://rc \
file://rcS \
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/6] libvorbis: Update libvorbis_1.3.4.bb - libvorbis_1.3.5.bb
Licence years have changes causing checksum changes
-Copyright (c) 2002-2008 Xiph.org Foundation
+Copyright (c) 2002-2015 Xiph.org Foundation
Signed-off-by: Khem Raj raj.k...@gmail.com
---
.../libvorbis/{libvorbis_1.3.4.bb = libvorbis_1.3.5.bb} | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
rename meta/recipes-multimedia/libvorbis/{libvorbis_1.3.4.bb =
libvorbis_1.3.5.bb} (78%)
diff --git a/meta/recipes-multimedia/libvorbis/libvorbis_1.3.4.bb
b/meta/recipes-multimedia/libvorbis/libvorbis_1.3.5.bb
similarity index 78%
rename from meta/recipes-multimedia/libvorbis/libvorbis_1.3.4.bb
rename to meta/recipes-multimedia/libvorbis/libvorbis_1.3.5.bb
index 0788c94..b7a0667 100644
--- a/meta/recipes-multimedia/libvorbis/libvorbis_1.3.4.bb
+++ b/meta/recipes-multimedia/libvorbis/libvorbis_1.3.5.bb
@@ -6,14 +6,13 @@ HOMEPAGE = http://www.vorbis.com/;
BUGTRACKER = https://trac.xiph.org;
SECTION = libs
LICENSE = BSD
-LIC_FILES_CHKSUM = file://COPYING;md5=ca77c6c3ea4d29cb68dce8ef5ab0d897 \
+LIC_FILES_CHKSUM = file://COPYING;md5=7d2c487d2fc7dd3e3c7c465a5b7f6217 \
file://include/vorbis/vorbisenc.h;beginline=1;endline=11;md5=d1c1d138863d6315131193d4046d81cb
DEPENDS = libogg
SRC_URI = http://downloads.xiph.org/releases/vorbis/${BP}.tar.xz;
-
-SRC_URI[md5sum] = 55f2288055e44754275a17c9a2497391
-SRC_URI[sha256sum] =
2f05497d29195dc23ee952a24ee3973a74e6277569c4c2eca0ec5968e541f372
+SRC_URI[md5sum] = 28cb28097c07a735d6af56e598e1c90f
+SRC_URI[sha256sum] =
54f94a9527ff0a88477be0a71c0bab09a4c3febe0ed878b24824906cd4b0e1d1
inherit autotools pkgconfig
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/6] alsa-lib: Lift the limitation to use gcc only cross compiler
alsa-lib configure tries to see that if CC variabled doesnt contain
'gcc' then it tries to guess and redefine CC to be something gcc, which
doesnt work with OE since we define CC to have sysroot and options
attached to it. So all tests fail when configure constructs the CC for
cross compiler like this. This portion is not needed at all
Signed-off-by: Khem Raj raj.k...@gmail.com
---
...build-Do-not-try-to-detect-cross-compiler.patch | 45 ++
meta/recipes-multimedia/alsa/alsa-lib_1.0.29.bb| 1 +
2 files changed, 46 insertions(+)
create mode 100644
meta/recipes-multimedia/alsa/alsa-lib/0001-build-Do-not-try-to-detect-cross-compiler.patch
diff --git
a/meta/recipes-multimedia/alsa/alsa-lib/0001-build-Do-not-try-to-detect-cross-compiler.patch
b/meta/recipes-multimedia/alsa/alsa-lib/0001-build-Do-not-try-to-detect-cross-compiler.patch
new file mode 100644
index 000..583bc3d
--- /dev/null
+++
b/meta/recipes-multimedia/alsa/alsa-lib/0001-build-Do-not-try-to-detect-cross-compiler.patch
@@ -0,0 +1,45 @@
+From 17aeb3565f411e7796cabe403f92d15948a8ca95 Mon Sep 17 00:00:00 2001
+From: Khem Raj raj.k...@gmail.com
+Date: Fri, 21 Aug 2015 14:42:45 -0700
+Subject: [PATCH] build: Do not try to detect cross-compiler
+
+cross compilers are passed via path may not be a gcc based cross
+compiler in such cases this check fails and try's to force gcc based
+cross compiler detection, This code is a convenience that limits the
+build system
+
+Signed-off-by: Khem Raj raj.k...@gmail.com
+---
+Upstream-Status: Pending
+
+ configure.ac | 14 --
+ 1 file changed, 14 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 3022cf8..9d77440 100644
+--- a/configure.ac
b/configure.ac
+@@ -27,20 +27,6 @@ AC_PREFIX_DEFAULT(/usr)
+
+ dnl Checks for programs.
+
+-dnl try to gues cross-compiler if not set
+-if test x$host != x$build -a -z `echo $CC | grep -e '-gcc'`;
+-then
+- AC_MSG_CHECKING(for cross-compiler)
+-
+- which ${program_prefix}gcc /dev/null 21 CC=${program_prefix}gcc
+- which ${host_cpu}-${host_os}-gcc /dev/null 21 \
+- CC=${host_cpu}-${host_os}-gcc
+- which ${host_cpu}-${host_vendor}-${host_os}-gcc /dev/null 21 \
+- CC=${host_cpu}-${host_vendor}-${host_os}-gcc
+-
+- AC_MSG_RESULT($CC)
+-fi
+-
+ CFLAGS=$CFLAGS -D_GNU_SOURCE
+
+
+--
+2.1.4
+
diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.0.29.bb
b/meta/recipes-multimedia/alsa/alsa-lib_1.0.29.bb
index fc6ba69..730f427 100644
--- a/meta/recipes-multimedia/alsa/alsa-lib_1.0.29.bb
+++ b/meta/recipes-multimedia/alsa/alsa-lib_1.0.29.bb
@@ -16,6 +16,7 @@ ARM_INSTRUCTION_SET = arm
SRC_URI = ftp://ftp.alsa-project.org/pub/lib/${BP}.tar.bz2 \
file://Check-if-wordexp-function-is-supported.patch \
+ file://0001-build-Do-not-try-to-detect-cross-compiler.patch \
SRC_URI[md5sum] = de67e0eca72474d6b1121037dafe1024
SRC_URI[sha256sum] =
73043c35eb9636be0f4af6a240235c213f12a25feb1f04aeeac8cb7e30fcbdd0
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/6] json-c: Include math_compat.c for NAN/INF values
The backport patch also fixes the warning which was being work arounded
by disabling unused-but-set-variable
Signed-off-by: Khem Raj raj.k...@gmail.com
---
.../0001-json_tokener-requires-INF-and-NAN.patch | 32 ++
meta/recipes-devtools/json-c/json-c_0.12.bb| 6 ++--
2 files changed, 35 insertions(+), 3 deletions(-)
create mode 100644
meta/recipes-devtools/json-c/json-c/0001-json_tokener-requires-INF-and-NAN.patch
diff --git
a/meta/recipes-devtools/json-c/json-c/0001-json_tokener-requires-INF-and-NAN.patch
b/meta/recipes-devtools/json-c/json-c/0001-json_tokener-requires-INF-and-NAN.patch
new file mode 100644
index 000..58ccf7b
--- /dev/null
+++
b/meta/recipes-devtools/json-c/json-c/0001-json_tokener-requires-INF-and-NAN.patch
@@ -0,0 +1,32 @@
+From 9be71700eb580c815688584a64621a38867c3fdd Mon Sep 17 00:00:00 2001
+From: James Myatt james.my...@tessella.com
+Date: Thu, 5 Feb 2015 15:57:14 +
+Subject: [PATCH] json_tokener requires INF and NAN
+
+---
+Upstream-Status: Backport
+
+ json_tokener.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+Index: json-c-0.12/json_tokener.c
+===
+--- json-c-0.12.orig/json_tokener.c
json-c-0.12/json_tokener.c
+@@ -16,6 +16,7 @@
+ #include config.h
+
+ #include math.h
++#include math_compat.h
+ #include stdio.h
+ #include stdlib.h
+ #include stddef.h
+@@ -353,7 +354,7 @@ struct json_object* json_tokener_parse_e
+ case json_tokener_state_inf: /* aka starts with 'i' */
+ {
+ int size;
+- int size_inf;
++ size_t size_inf;
+ int is_negative = 0;
+
+ printbuf_memappend_fast(tok-pb, c, 1);
diff --git a/meta/recipes-devtools/json-c/json-c_0.12.bb
b/meta/recipes-devtools/json-c/json-c_0.12.bb
index e9c5b31..cfef03d 100644
--- a/meta/recipes-devtools/json-c/json-c_0.12.bb
+++ b/meta/recipes-devtools/json-c/json-c_0.12.bb
@@ -4,7 +4,9 @@ HOMEPAGE = https://github.com/json-c/json-c/wiki;
LICENSE = MIT
LIC_FILES_CHKSUM = file://COPYING;md5=de54b60fbbc35123ba193fea8ee216f2
-SRC_URI = https://s3.amazonaws.com/json-c_releases/releases/${BP}.tar.gz;
+SRC_URI = https://s3.amazonaws.com/json-c_releases/releases/${BP}.tar.gz \
+ file://0001-json_tokener-requires-INF-and-NAN.patch \
+
SRC_URI[md5sum] = 3ca4bbb881dfc4017e8021b5e0a8c491
SRC_URI[sha256sum] =
000c01b2b3f82dcb4261751eb71f1b084404fb7d6a282f06074d3c17078b9f3f
@@ -17,5 +19,3 @@ do_configure_prepend() {
# Clean up autoconf cruft that should not be in the tarball
rm -f ${S}/config.status
}
-
-CFLAGS += -Wno-error=unused-but-set-variable
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
