* Re: [PATCH] meta/conf/layer.conf: Add recommended download layer
From: Mark Hatle @ 2016-11-23 18:38 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-core
In-Reply-To: <20161123181039.GF3265@jama>
On 11/23/16 12:10 PM, Martin Jansa wrote:
> On Wed, Nov 23, 2016 at 11:42:09AM -0600, Mark Hatle wrote:
>> This is a Wind River specific patch and not generally applicable.
>
> Then why is it sent to oe-core ML?
As noted in the cover letter, I'm required to by Yocto Project compliance
requirements.
As indicated LAST time I got scolded, I was told to indicate this in the patch
summary email -- which I did.
--Mark
>>
>> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
>> ---
>> meta/conf/layer.conf | 2 ++
>> 1 file changed, 2 insertions(+)
>>
>> diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
>> index 24b4df0..a94e524 100644
>> --- a/meta/conf/layer.conf
>> +++ b/meta/conf/layer.conf
>> @@ -11,6 +11,8 @@ BBFILE_PRIORITY_core = "5"
>> # cause compatibility issues with other layers
>> LAYERVERSION_core = "9"
>>
>> +LAYERRECOMMENDS_core = "oe-core-dl-2-2"
>> +
>> BBLAYERS_LAYERINDEX_NAME_core = "openembedded-core"
>>
>> # Set a variable to get to the top of the metadata location
>> --
>> 2.9.3
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
^ permalink raw reply
* Re: [oe-commits] [openembedded-core] 02/05: linux-yocto/4.8: update to 4.8.6
From: Martin Jansa @ 2016-11-23 18:25 UTC (permalink / raw)
To: Bruce Ashfield
Cc: openembedded-commits@lists.openembedded.org,
Patches and discussions about the oe-core layer
In-Reply-To: <e3fde391-64a2-12b2-7dc8-5845bf9e699b@windriver.com>
[-- Attachment #1: Type: text/plain, Size: 8010 bytes --]
I know it's not a fix and doesn't help to find the root cause of this
issue, but it built OK after cleansstate.
On Wed, Nov 23, 2016 at 7:12 PM, Bruce Ashfield <
bruce.ashfield@windriver.com> wrote:
> On 2016-11-23 12:12 PM, Martin Jansa wrote:
>
>> On Thu, Nov 03, 2016 at 01:33:47PM +0000, git@git.openembedded.org wrote:
>>
>>> rpurdie pushed a commit to branch master-next
>>> in repository openembedded-core.
>>>
>>> commit 2a7d3173c7a05cd09bbcf5fe465403b2d4b2b589
>>> Author: Bruce Ashfield <bruce.ashfield@windriver.com>
>>> AuthorDate: Thu Nov 3 09:25:14 2016 -0400
>>>
>>> linux-yocto/4.8: update to 4.8.6
>>>
>>> Integrating the korg -stable release.
>>>
>>
>> Not sure if it's caused by this upgrade or one of kernel tooling
>> improvements, but now it fails to build for me in default qemux86
>> config:
>>
>
>
> Interesting. The latest set of commits that I pushed are building with
> that same addon feature enabled.
>
> I can rewind to that older commit and see if something is broken, but
> the new tools and error checking shouldn't be coming into play with
> a commit of that vintage.
>
> Bruce
>
>
>
>
>> ERROR: linux-yocto-4.8.6+gitAUTOINC+87e5fc8b7c_9d5f74f941-r0
>> do_kernel_metadata: Function failed: do_kernel_metadata (log file is
>> located at /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yoct
>> o/4.8.6+gitAUTOINC+87e5fc8b7c_9d5f74f941-r0/temp/log.do_
>> kernel_metadata.441)
>> ERROR: Logfile of failure stored in: /OE/build/oe-core/tmp-glibc/wo
>> rk/qemux86-oe-linux/linux-yocto/4.8.6+gitAUTOINC+87e5fc8b7c_
>> 9d5f74f941-r0/temp/log.do_kernel_metadata.441
>> Log data follows:
>> | DEBUG: Executing shell function do_kernel_metadata
>> | ERROR. input file "features/nfsd/nfsd-enable.scc" does not exist
>> | ERROR: could not process input files: features/nfsd/nfsd-enable.scc
>> features/debug/printk.scc features/netfilter/netfilter.scc
>> cfg/virtio.scc cfg/sound.scc cfg/paravirt_kvm.scc
>> | See /tmp/tmp.tLkBgIybCS for details
>> | ERROR. input file "features/nfsd/nfsd-enable.scc" does not exist
>> | ERROR: could not process input files: features/nfsd/nfsd-enable.scc
>> features/debug/printk.scc features/netfilter/netfilter.scc
>> cfg/virtio.scc cfg/sound.scc cfg/paravirt_kvm.scc
>> | See /tmp/tmp.T7cBZctbo1 for details
>> | ERROR: Function failed: do_kernel_metadata (log file is located at
>> /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yoct
>> o/4.8.6+gitAUTOINC+87e5fc8b7c_9d5f74f941-r0/temp/log.do_
>> kernel_metadata.441)
>> ERROR: Task (/OE/build/oe-core/openembedded-core/meta/recipes-kernel/
>> linux/linux-yocto_4.8.bb:do_kernel_metadata) failed with exit code '1'
>>
>>
>>
>>
>>> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
>>> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>>> ---
>>> meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb | 6 +++---
>>> meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb | 6 +++---
>>> meta/recipes-kernel/linux/linux-yocto_4.8.bb | 20
>>> ++++++++++----------
>>> 3 files changed, 16 insertions(+), 16 deletions(-)
>>>
>>> diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb
>>> b/meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb
>>> index e51c9cd..26b309d 100644
>>> --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb
>>> +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb
>>> @@ -11,13 +11,13 @@ python () {
>>> raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel
>>> to linux-yocto-rt to enable it")
>>> }
>>>
>>> -SRCREV_machine ?= "4057556c041f6aac0d29aa3425587d414c9a0090"
>>> -SRCREV_meta ?= "83110d94edeb856a3667b62903ed4ae91c24117d"
>>>
>>
>> +SRCREV_machine ?= "b99b6fac437104e206d30540a5cb12103049af1e"
>>> +SRCREV_meta ?= "87e5fc8b7cb387f197cdd098cdde4e96e9e8ed0d"
>>>
>>> SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.8.git;branch=${KBR
>>> ANCH};name=machine
>>> <http://git.yoctoproject.org/linux-yocto-4.8.git;branch=$%7BKBRANCH%7D;name=machine>
>>> \
>>> git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;nam
>>> e=meta;branch=yocto-4.8;destsuffix=${KMETA}
>>> <http://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.8;destsuffix=$%7BKMETA%7D>
>>> "
>>>
>>> -LINUX_VERSION ?= "4.8.3"
>>> +LINUX_VERSION ?= "4.8.6"
>>>
>>> PV = "${LINUX_VERSION}+git${SRCPV}"
>>>
>>> diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb
>>> b/meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb
>>> index c8ddbd9..63dd11b 100644
>>> --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb
>>> +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb
>>> @@ -4,13 +4,13 @@ KCONFIG_MODE = "--allnoconfig"
>>>
>>> require recipes-kernel/linux/linux-yocto.inc
>>>
>>> -LINUX_VERSION ?= "4.8.3"
>>> +LINUX_VERSION ?= "4.8.6"
>>>
>>> KMETA = "kernel-meta"
>>> KCONF_BSP_AUDIT_LEVEL = "2"
>>>
>>> -SRCREV_machine ?= "1adf9d36338dc3c63cdbf6f98bcbdc7bba42a794"
>>> -SRCREV_meta ?= "83110d94edeb856a3667b62903ed4ae91c24117d"
>>> +SRCREV_machine ?= "9d5f74f941c3ca234f58ff8e539f5ca64458c0a7"
>>> +SRCREV_meta ?= "87e5fc8b7cb387f197cdd098cdde4e96e9e8ed0d"
>>>
>>> PV = "${LINUX_VERSION}+git${SRCPV}"
>>>
>>> diff --git a/meta/recipes-kernel/linux/linux-yocto_4.8.bb
>>> b/meta/recipes-kernel/linux/linux-yocto_4.8.bb
>>> index 13778b9..0369198 100644
>>> --- a/meta/recipes-kernel/linux/linux-yocto_4.8.bb
>>> +++ b/meta/recipes-kernel/linux/linux-yocto_4.8.bb
>>> @@ -11,20 +11,20 @@ KBRANCH_qemux86 ?= "standard/base"
>>> KBRANCH_qemux86-64 ?= "standard/base"
>>> KBRANCH_qemumips64 ?= "standard/mti-malta64"
>>>
>>> -SRCREV_machine_qemuarm ?= "4cc544ad09ad704322cb66fe4ba197a6a05dc71f"
>>> -SRCREV_machine_qemuarm64 ?= "1adf9d36338dc3c63cdbf6f98bcbdc7bba42a794"
>>> -SRCREV_machine_qemumips ?= "c285969d4f9376a671167ecf397578c8ad3e6a75"
>>> -SRCREV_machine_qemuppc ?= "1adf9d36338dc3c63cdbf6f98bcbdc7bba42a794"
>>> -SRCREV_machine_qemux86 ?= "1adf9d36338dc3c63cdbf6f98bcbdc7bba42a794"
>>> -SRCREV_machine_qemux86-64 ?= "1adf9d36338dc3c63cdbf6f98bcbdc7bba42a794"
>>> -SRCREV_machine_qemumips64 ?= "64f96ba530e58456070f26b0f3fcce3f64988b72"
>>> -SRCREV_machine ?= "1adf9d36338dc3c63cdbf6f98bcbdc7bba42a794"
>>> -SRCREV_meta ?= "83110d94edeb856a3667b62903ed4ae91c24117d"
>>> +SRCREV_machine_qemuarm ?= "94d3e8675e2fcb09f29814a33ccf79df06149104"
>>> +SRCREV_machine_qemuarm64 ?= "9d5f74f941c3ca234f58ff8e539f5ca64458c0a7"
>>> +SRCREV_machine_qemumips ?= "046ff6344eee25dcc0eea1214e0ad8771ddfabfb"
>>> +SRCREV_machine_qemuppc ?= "9d5f74f941c3ca234f58ff8e539f5ca64458c0a7"
>>> +SRCREV_machine_qemux86 ?= "9d5f74f941c3ca234f58ff8e539f5ca64458c0a7"
>>> +SRCREV_machine_qemux86-64 ?= "9d5f74f941c3ca234f58ff8e539f5ca64458c0a7"
>>> +SRCREV_machine_qemumips64 ?= "edcb167f91abc071cc98cbd762418ff7ab9d839b"
>>> +SRCREV_machine ?= "9d5f74f941c3ca234f58ff8e539f5ca64458c0a7"
>>> +SRCREV_meta ?= "87e5fc8b7cb387f197cdd098cdde4e96e9e8ed0d"
>>>
>>> SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.8.git;name=machine
>>> ;branch=${KBRANCH}
>>> <http://git.yoctoproject.org/linux-yocto-4.8.git;name=machine;branch=$%7BKBRANCH%7D>;
>>> \
>>> git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;nam
>>> e=meta;branch=yocto-4.8;destsuffix=${KMETA}
>>> <http://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.8;destsuffix=$%7BKMETA%7D>
>>> "
>>>
>>> -LINUX_VERSION ?= "4.8.3"
>>> +LINUX_VERSION ?= "4.8.6"
>>>
>>> PV = "${LINUX_VERSION}+git${SRCPV}"
>>>
>>>
>>> --
>>> To stop receiving notification emails like this one, please contact
>>> the administrator of this repository.
>>> --
>>> _______________________________________________
>>> Openembedded-commits mailing list
>>> Openembedded-commits@lists.openembedded.org
>>> http://lists.openembedded.org/mailman/listinfo/openembedded-commits
>>>
>>
>>
>
[-- Attachment #2: Type: text/html, Size: 11661 bytes --]
^ permalink raw reply
* Re: [oe-commits] [openembedded-core] 02/05: linux-yocto/4.8: update to 4.8.6
From: Bruce Ashfield @ 2016-11-23 18:12 UTC (permalink / raw)
To: Martin Jansa, openembedded-core; +Cc: openembedded-commits
In-Reply-To: <20161123171218.GE3265@jama>
On 2016-11-23 12:12 PM, Martin Jansa wrote:
> On Thu, Nov 03, 2016 at 01:33:47PM +0000, git@git.openembedded.org wrote:
>> rpurdie pushed a commit to branch master-next
>> in repository openembedded-core.
>>
>> commit 2a7d3173c7a05cd09bbcf5fe465403b2d4b2b589
>> Author: Bruce Ashfield <bruce.ashfield@windriver.com>
>> AuthorDate: Thu Nov 3 09:25:14 2016 -0400
>>
>> linux-yocto/4.8: update to 4.8.6
>>
>> Integrating the korg -stable release.
>
> Not sure if it's caused by this upgrade or one of kernel tooling
> improvements, but now it fails to build for me in default qemux86
> config:
Interesting. The latest set of commits that I pushed are building with
that same addon feature enabled.
I can rewind to that older commit and see if something is broken, but
the new tools and error checking shouldn't be coming into play with
a commit of that vintage.
Bruce
>
> ERROR: linux-yocto-4.8.6+gitAUTOINC+87e5fc8b7c_9d5f74f941-r0 do_kernel_metadata: Function failed: do_kernel_metadata (log file is located at /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/4.8.6+gitAUTOINC+87e5fc8b7c_9d5f74f941-r0/temp/log.do_kernel_metadata.441)
> ERROR: Logfile of failure stored in: /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/4.8.6+gitAUTOINC+87e5fc8b7c_9d5f74f941-r0/temp/log.do_kernel_metadata.441
> Log data follows:
> | DEBUG: Executing shell function do_kernel_metadata
> | ERROR. input file "features/nfsd/nfsd-enable.scc" does not exist
> | ERROR: could not process input files: features/nfsd/nfsd-enable.scc features/debug/printk.scc features/netfilter/netfilter.scc cfg/virtio.scc cfg/sound.scc cfg/paravirt_kvm.scc
> | See /tmp/tmp.tLkBgIybCS for details
> | ERROR. input file "features/nfsd/nfsd-enable.scc" does not exist
> | ERROR: could not process input files: features/nfsd/nfsd-enable.scc features/debug/printk.scc features/netfilter/netfilter.scc cfg/virtio.scc cfg/sound.scc cfg/paravirt_kvm.scc
> | See /tmp/tmp.T7cBZctbo1 for details
> | ERROR: Function failed: do_kernel_metadata (log file is located at /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/4.8.6+gitAUTOINC+87e5fc8b7c_9d5f74f941-r0/temp/log.do_kernel_metadata.441)
> ERROR: Task (/OE/build/oe-core/openembedded-core/meta/recipes-kernel/linux/linux-yocto_4.8.bb:do_kernel_metadata) failed with exit code '1'
>
>
>
>>
>> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
>> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>> ---
>> meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb | 6 +++---
>> meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb | 6 +++---
>> meta/recipes-kernel/linux/linux-yocto_4.8.bb | 20 ++++++++++----------
>> 3 files changed, 16 insertions(+), 16 deletions(-)
>>
>> diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb
>> index e51c9cd..26b309d 100644
>> --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb
>> +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb
>> @@ -11,13 +11,13 @@ python () {
>> raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
>> }
>>
>> -SRCREV_machine ?= "4057556c041f6aac0d29aa3425587d414c9a0090"
>> -SRCREV_meta ?= "83110d94edeb856a3667b62903ed4ae91c24117d"
>
>> +SRCREV_machine ?= "b99b6fac437104e206d30540a5cb12103049af1e"
>> +SRCREV_meta ?= "87e5fc8b7cb387f197cdd098cdde4e96e9e8ed0d"
>>
>> SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.8.git;branch=${KBRANCH};name=machine \
>> git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.8;destsuffix=${KMETA}"
>>
>> -LINUX_VERSION ?= "4.8.3"
>> +LINUX_VERSION ?= "4.8.6"
>>
>> PV = "${LINUX_VERSION}+git${SRCPV}"
>>
>> diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb
>> index c8ddbd9..63dd11b 100644
>> --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb
>> +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb
>> @@ -4,13 +4,13 @@ KCONFIG_MODE = "--allnoconfig"
>>
>> require recipes-kernel/linux/linux-yocto.inc
>>
>> -LINUX_VERSION ?= "4.8.3"
>> +LINUX_VERSION ?= "4.8.6"
>>
>> KMETA = "kernel-meta"
>> KCONF_BSP_AUDIT_LEVEL = "2"
>>
>> -SRCREV_machine ?= "1adf9d36338dc3c63cdbf6f98bcbdc7bba42a794"
>> -SRCREV_meta ?= "83110d94edeb856a3667b62903ed4ae91c24117d"
>> +SRCREV_machine ?= "9d5f74f941c3ca234f58ff8e539f5ca64458c0a7"
>> +SRCREV_meta ?= "87e5fc8b7cb387f197cdd098cdde4e96e9e8ed0d"
>>
>> PV = "${LINUX_VERSION}+git${SRCPV}"
>>
>> diff --git a/meta/recipes-kernel/linux/linux-yocto_4.8.bb b/meta/recipes-kernel/linux/linux-yocto_4.8.bb
>> index 13778b9..0369198 100644
>> --- a/meta/recipes-kernel/linux/linux-yocto_4.8.bb
>> +++ b/meta/recipes-kernel/linux/linux-yocto_4.8.bb
>> @@ -11,20 +11,20 @@ KBRANCH_qemux86 ?= "standard/base"
>> KBRANCH_qemux86-64 ?= "standard/base"
>> KBRANCH_qemumips64 ?= "standard/mti-malta64"
>>
>> -SRCREV_machine_qemuarm ?= "4cc544ad09ad704322cb66fe4ba197a6a05dc71f"
>> -SRCREV_machine_qemuarm64 ?= "1adf9d36338dc3c63cdbf6f98bcbdc7bba42a794"
>> -SRCREV_machine_qemumips ?= "c285969d4f9376a671167ecf397578c8ad3e6a75"
>> -SRCREV_machine_qemuppc ?= "1adf9d36338dc3c63cdbf6f98bcbdc7bba42a794"
>> -SRCREV_machine_qemux86 ?= "1adf9d36338dc3c63cdbf6f98bcbdc7bba42a794"
>> -SRCREV_machine_qemux86-64 ?= "1adf9d36338dc3c63cdbf6f98bcbdc7bba42a794"
>> -SRCREV_machine_qemumips64 ?= "64f96ba530e58456070f26b0f3fcce3f64988b72"
>> -SRCREV_machine ?= "1adf9d36338dc3c63cdbf6f98bcbdc7bba42a794"
>> -SRCREV_meta ?= "83110d94edeb856a3667b62903ed4ae91c24117d"
>> +SRCREV_machine_qemuarm ?= "94d3e8675e2fcb09f29814a33ccf79df06149104"
>> +SRCREV_machine_qemuarm64 ?= "9d5f74f941c3ca234f58ff8e539f5ca64458c0a7"
>> +SRCREV_machine_qemumips ?= "046ff6344eee25dcc0eea1214e0ad8771ddfabfb"
>> +SRCREV_machine_qemuppc ?= "9d5f74f941c3ca234f58ff8e539f5ca64458c0a7"
>> +SRCREV_machine_qemux86 ?= "9d5f74f941c3ca234f58ff8e539f5ca64458c0a7"
>> +SRCREV_machine_qemux86-64 ?= "9d5f74f941c3ca234f58ff8e539f5ca64458c0a7"
>> +SRCREV_machine_qemumips64 ?= "edcb167f91abc071cc98cbd762418ff7ab9d839b"
>> +SRCREV_machine ?= "9d5f74f941c3ca234f58ff8e539f5ca64458c0a7"
>> +SRCREV_meta ?= "87e5fc8b7cb387f197cdd098cdde4e96e9e8ed0d"
>>
>> SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.8.git;name=machine;branch=${KBRANCH}; \
>> git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.8;destsuffix=${KMETA}"
>>
>> -LINUX_VERSION ?= "4.8.3"
>> +LINUX_VERSION ?= "4.8.6"
>>
>> PV = "${LINUX_VERSION}+git${SRCPV}"
>>
>>
>> --
>> To stop receiving notification emails like this one, please contact
>> the administrator of this repository.
>> --
>> _______________________________________________
>> Openembedded-commits mailing list
>> Openembedded-commits@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-commits
>
^ permalink raw reply
* Re: [PATCH] meta/conf/layer.conf: Add recommended download layer
From: Martin Jansa @ 2016-11-23 18:10 UTC (permalink / raw)
To: Mark Hatle; +Cc: openembedded-core
In-Reply-To: <20161123174209.211349-2-mark.hatle@windriver.com>
[-- Attachment #1: Type: text/plain, Size: 1055 bytes --]
On Wed, Nov 23, 2016 at 11:42:09AM -0600, Mark Hatle wrote:
> This is a Wind River specific patch and not generally applicable.
Then why is it sent to oe-core ML?
>
> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
> ---
> meta/conf/layer.conf | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
> index 24b4df0..a94e524 100644
> --- a/meta/conf/layer.conf
> +++ b/meta/conf/layer.conf
> @@ -11,6 +11,8 @@ BBFILE_PRIORITY_core = "5"
> # cause compatibility issues with other layers
> LAYERVERSION_core = "9"
>
> +LAYERRECOMMENDS_core = "oe-core-dl-2-2"
> +
> BBLAYERS_LAYERINDEX_NAME_core = "openembedded-core"
>
> # Set a variable to get to the top of the metadata location
> --
> 2.9.3
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 201 bytes --]
^ permalink raw reply
* [PATCH] meta/conf/layer.conf: Add recommended download layer
From: Mark Hatle @ 2016-11-23 17:42 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <20161123174209.211349-1-mark.hatle@windriver.com>
This is a Wind River specific patch and not generally applicable.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/conf/layer.conf | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
index 24b4df0..a94e524 100644
--- a/meta/conf/layer.conf
+++ b/meta/conf/layer.conf
@@ -11,6 +11,8 @@ BBFILE_PRIORITY_core = "5"
# cause compatibility issues with other layers
LAYERVERSION_core = "9"
+LAYERRECOMMENDS_core = "oe-core-dl-2-2"
+
BBLAYERS_LAYERINDEX_NAME_core = "openembedded-core"
# Set a variable to get to the top of the metadata location
--
2.9.3
^ permalink raw reply related
* [PATCH] Add recommended layer to oe-core
From: Mark Hatle @ 2016-11-23 17:42 UTC (permalink / raw)
To: openembedded-core
This patch is being sent for Yocto Project compliance reasons. It is not
expected to be integrated.
The patch is unique to Wind River Linux's implementation. We have
special layers called 'download layers', where we aggregate all of the
download content needed by a given layer. The layer recommends allows us to
optionally depend on these special layers.
Mark Hatle (1):
meta/conf/layer.conf: Add recommended download layer
meta/conf/layer.conf | 2 ++
1 file changed, 2 insertions(+)
--
2.9.3
^ permalink raw reply
* Re: [oe-commits] [openembedded-core] 02/05: linux-yocto/4.8: update to 4.8.6
From: Martin Jansa @ 2016-11-23 17:12 UTC (permalink / raw)
To: openembedded-core, Bruce Ashfield; +Cc: openembedded-commits
In-Reply-To: <20161103133346.EC39750212@opal.openembedded.org>
[-- Attachment #1: Type: text/plain, Size: 6704 bytes --]
On Thu, Nov 03, 2016 at 01:33:47PM +0000, git@git.openembedded.org wrote:
> rpurdie pushed a commit to branch master-next
> in repository openembedded-core.
>
> commit 2a7d3173c7a05cd09bbcf5fe465403b2d4b2b589
> Author: Bruce Ashfield <bruce.ashfield@windriver.com>
> AuthorDate: Thu Nov 3 09:25:14 2016 -0400
>
> linux-yocto/4.8: update to 4.8.6
>
> Integrating the korg -stable release.
Not sure if it's caused by this upgrade or one of kernel tooling
improvements, but now it fails to build for me in default qemux86
config:
ERROR: linux-yocto-4.8.6+gitAUTOINC+87e5fc8b7c_9d5f74f941-r0 do_kernel_metadata: Function failed: do_kernel_metadata (log file is located at /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/4.8.6+gitAUTOINC+87e5fc8b7c_9d5f74f941-r0/temp/log.do_kernel_metadata.441)
ERROR: Logfile of failure stored in: /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/4.8.6+gitAUTOINC+87e5fc8b7c_9d5f74f941-r0/temp/log.do_kernel_metadata.441
Log data follows:
| DEBUG: Executing shell function do_kernel_metadata
| ERROR. input file "features/nfsd/nfsd-enable.scc" does not exist
| ERROR: could not process input files: features/nfsd/nfsd-enable.scc features/debug/printk.scc features/netfilter/netfilter.scc cfg/virtio.scc cfg/sound.scc cfg/paravirt_kvm.scc
| See /tmp/tmp.tLkBgIybCS for details
| ERROR. input file "features/nfsd/nfsd-enable.scc" does not exist
| ERROR: could not process input files: features/nfsd/nfsd-enable.scc features/debug/printk.scc features/netfilter/netfilter.scc cfg/virtio.scc cfg/sound.scc cfg/paravirt_kvm.scc
| See /tmp/tmp.T7cBZctbo1 for details
| ERROR: Function failed: do_kernel_metadata (log file is located at /OE/build/oe-core/tmp-glibc/work/qemux86-oe-linux/linux-yocto/4.8.6+gitAUTOINC+87e5fc8b7c_9d5f74f941-r0/temp/log.do_kernel_metadata.441)
ERROR: Task (/OE/build/oe-core/openembedded-core/meta/recipes-kernel/linux/linux-yocto_4.8.bb:do_kernel_metadata) failed with exit code '1'
>
> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
> meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb | 6 +++---
> meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb | 6 +++---
> meta/recipes-kernel/linux/linux-yocto_4.8.bb | 20 ++++++++++----------
> 3 files changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb
> index e51c9cd..26b309d 100644
> --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb
> +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb
> @@ -11,13 +11,13 @@ python () {
> raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
> }
>
> -SRCREV_machine ?= "4057556c041f6aac0d29aa3425587d414c9a0090"
> -SRCREV_meta ?= "83110d94edeb856a3667b62903ed4ae91c24117d"
> +SRCREV_machine ?= "b99b6fac437104e206d30540a5cb12103049af1e"
> +SRCREV_meta ?= "87e5fc8b7cb387f197cdd098cdde4e96e9e8ed0d"
>
> SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.8.git;branch=${KBRANCH};name=machine \
> git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.8;destsuffix=${KMETA}"
>
> -LINUX_VERSION ?= "4.8.3"
> +LINUX_VERSION ?= "4.8.6"
>
> PV = "${LINUX_VERSION}+git${SRCPV}"
>
> diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb
> index c8ddbd9..63dd11b 100644
> --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb
> +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb
> @@ -4,13 +4,13 @@ KCONFIG_MODE = "--allnoconfig"
>
> require recipes-kernel/linux/linux-yocto.inc
>
> -LINUX_VERSION ?= "4.8.3"
> +LINUX_VERSION ?= "4.8.6"
>
> KMETA = "kernel-meta"
> KCONF_BSP_AUDIT_LEVEL = "2"
>
> -SRCREV_machine ?= "1adf9d36338dc3c63cdbf6f98bcbdc7bba42a794"
> -SRCREV_meta ?= "83110d94edeb856a3667b62903ed4ae91c24117d"
> +SRCREV_machine ?= "9d5f74f941c3ca234f58ff8e539f5ca64458c0a7"
> +SRCREV_meta ?= "87e5fc8b7cb387f197cdd098cdde4e96e9e8ed0d"
>
> PV = "${LINUX_VERSION}+git${SRCPV}"
>
> diff --git a/meta/recipes-kernel/linux/linux-yocto_4.8.bb b/meta/recipes-kernel/linux/linux-yocto_4.8.bb
> index 13778b9..0369198 100644
> --- a/meta/recipes-kernel/linux/linux-yocto_4.8.bb
> +++ b/meta/recipes-kernel/linux/linux-yocto_4.8.bb
> @@ -11,20 +11,20 @@ KBRANCH_qemux86 ?= "standard/base"
> KBRANCH_qemux86-64 ?= "standard/base"
> KBRANCH_qemumips64 ?= "standard/mti-malta64"
>
> -SRCREV_machine_qemuarm ?= "4cc544ad09ad704322cb66fe4ba197a6a05dc71f"
> -SRCREV_machine_qemuarm64 ?= "1adf9d36338dc3c63cdbf6f98bcbdc7bba42a794"
> -SRCREV_machine_qemumips ?= "c285969d4f9376a671167ecf397578c8ad3e6a75"
> -SRCREV_machine_qemuppc ?= "1adf9d36338dc3c63cdbf6f98bcbdc7bba42a794"
> -SRCREV_machine_qemux86 ?= "1adf9d36338dc3c63cdbf6f98bcbdc7bba42a794"
> -SRCREV_machine_qemux86-64 ?= "1adf9d36338dc3c63cdbf6f98bcbdc7bba42a794"
> -SRCREV_machine_qemumips64 ?= "64f96ba530e58456070f26b0f3fcce3f64988b72"
> -SRCREV_machine ?= "1adf9d36338dc3c63cdbf6f98bcbdc7bba42a794"
> -SRCREV_meta ?= "83110d94edeb856a3667b62903ed4ae91c24117d"
> +SRCREV_machine_qemuarm ?= "94d3e8675e2fcb09f29814a33ccf79df06149104"
> +SRCREV_machine_qemuarm64 ?= "9d5f74f941c3ca234f58ff8e539f5ca64458c0a7"
> +SRCREV_machine_qemumips ?= "046ff6344eee25dcc0eea1214e0ad8771ddfabfb"
> +SRCREV_machine_qemuppc ?= "9d5f74f941c3ca234f58ff8e539f5ca64458c0a7"
> +SRCREV_machine_qemux86 ?= "9d5f74f941c3ca234f58ff8e539f5ca64458c0a7"
> +SRCREV_machine_qemux86-64 ?= "9d5f74f941c3ca234f58ff8e539f5ca64458c0a7"
> +SRCREV_machine_qemumips64 ?= "edcb167f91abc071cc98cbd762418ff7ab9d839b"
> +SRCREV_machine ?= "9d5f74f941c3ca234f58ff8e539f5ca64458c0a7"
> +SRCREV_meta ?= "87e5fc8b7cb387f197cdd098cdde4e96e9e8ed0d"
>
> SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.8.git;name=machine;branch=${KBRANCH}; \
> git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.8;destsuffix=${KMETA}"
>
> -LINUX_VERSION ?= "4.8.3"
> +LINUX_VERSION ?= "4.8.6"
>
> PV = "${LINUX_VERSION}+git${SRCPV}"
>
>
> --
> To stop receiving notification emails like this one, please contact
> the administrator of this repository.
> --
> _______________________________________________
> Openembedded-commits mailing list
> Openembedded-commits@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-commits
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 201 bytes --]
^ permalink raw reply
* Re: migrating simple tarballs over to OE recipes?
From: Robert P. J. Day @ 2016-11-23 16:52 UTC (permalink / raw)
To: Martin Jansa; +Cc: OE Core mailing list
In-Reply-To: <20161123150525.GA3265@jama>
On Wed, 23 Nov 2016, Martin Jansa wrote:
> On Wed, Nov 23, 2016 at 01:00:12PM +0100, Ulf Magnusson wrote:
> > On Wed, Nov 23, 2016 at 12:34 PM, Robert P. J. Day
> > <rpjday@crashcourse.ca> wrote:
> > > On Wed, 23 Nov 2016, Burton, Ross wrote:
> > >
> > >>
> > >> On 23 November 2016 at 10:42, Robert P. J. Day <rpjday@crashcourse.ca> wrote:
> > >> colleague has a pile of tarballs that were used to
> > >> customize an x86 centos system, wants to move all that to
> > >> OE with as little fuss as possible, i guess the simplest
> > >> way is to just create recipes that have the same tarball
> > >> in the files/ directory, and write a trivial do_install()
> > >> task that untars it into the root fs, yes?
> > >>
> > >>
> > >> Pretty much, yeah.
> > >>
> > >> If you've a large pile and they're all effectively the same
> > >> then a little class can automate it even more.
> > >
> > > already going down that road, just wanted to make sure i
> > > hadn't overlooked something obvious.
> > >
> > > rday
> >
> > bin_package.bbclass might be useful as well, especially if the
> > files are already arranged like in the rootfs inside the tarballs.
>
> If these files are overwriting files owned by some other packages,
> then you will loose that customization when the package is upgraded
> by package manager (unless those files are listed in CONFFILES). You
> need to use RREPLACES at least.
>
> > do_install() task that untars it into the root fs, yes?
>
> ? do_install installs them to $D not root fs which doesn't even exist yet.
>
> You might also need to skip strip if there are also some binaries
> which are already stripped, skip ldflash qa check if they don't have
> matching hash type etc
ok, let me clarify/simplify a few things to zero in on the optimal
solution.
first, there are several dozen tarballs, all containing content
relative to the very top of the root directory, and i've been assured
they're proprietary application-specific and hence won't clash with
any "regular" recipes/RPMs. rather than trying to verify that, i'm
just going to accept that. so something along the lines of
bin_package.bbclass would seem to be acceptable.
(SIDE NOTE: i was asked if recipes could be written so that the
accompanying "files/" directory contained, not a single tarball, but
the actual, *exploded* content in directory structure to be copied
as-is into the target rootfs. i've never seen that, is that ever done?
i'm not sure how i'd even assign to SRC_URI to handle that. so i'll
insist on tarballs.)
second, given content all in a single tarball, i'm assuming i'd use
simply:
SRC_URI = "file://rday.tar.gz"
finally, looking at bin_package.bbclass, i'm puzzled by this:
do_configure[noexec] = "1"
do_compile[noexec] = "1"
# Install the files to ${D}
bin_package_do_install () {
# Do it carefully
[ -d "${S}" ] || exit 1
cd ${S} || exit 1
tar --no-same-owner --exclude='./patches' --exclude='./.pc' -cpf - . \
| tar --no-same-owner -xpf - -C ${D}
}
FILES_${PN} = "/"
EXPORT_FUNCTIONS do_install
what is the relationship between bin_package_do_install() and the
EXPORTed do_install()? seems like an overriding/inheritance thing,
yes?
anyway, i think i can see the way to go.
rday
--
========================================================================
Robert P. J. Day Ottawa, Ontario, CANADA
http://crashcourse.ca
Twitter: http://twitter.com/rpjday
LinkedIn: http://ca.linkedin.com/in/rpjday
========================================================================
^ permalink raw reply
* Re: [Master][PATCH] libtiff: Update to 4.0.7
From: Burton, Ross @ 2016-11-23 16:04 UTC (permalink / raw)
To: akuster808, Leonardo Sandoval, Jose Perez Carranza; +Cc: OE-core
In-Reply-To: <61bcea65-f891-2914-27a4-e788fc517cde@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 58949 bytes --]
CCing Leo and Jose who have been working on this.
Ross
On 23 November 2016 at 15:32, akuster808 <akuster808@gmail.com> wrote:
> The never made into patchwork. is there a bug there ? is there an issue on
> how I submitted?
>
> - armin
>
>
> On 11/21/2016 09:28 PM, Armin Kuster wrote:
>
>> Major changes:
>> The libtiff tools bmp2tiff, gif2tiff, ras2tiff, sgi2tiff, sgisv, and
>> ycbcr are completely removed from the distribution, used for demos.
>>
>> CVEs fixed:
>> CVE-2016-9297
>> CVE-2016-9448
>> CVE-2016-9273
>> CVE-2014-8127
>> CVE-2016-3658
>> CVE-2016-5875
>> CVE-2016-5652
>> CVE-2016-3632
>>
>> plus more that are not identified in the changelog.
>>
>> removed patches integrated into update.
>> more info: http://libtiff.maptools.org/v4.0.7.html
>>
>> Signed-off-by: Armin Kuster <akuster@mvista.com>
>> ---
>> .../libtiff/files/CVE-2015-8665_8683.patch | 137
>> ---------------
>> .../libtiff/files/CVE-2015-8781.patch | 195
>> ---------------------
>> .../libtiff/files/CVE-2015-8784.patch | 73 --------
>> .../libtiff/files/CVE-2016-3186.patch | 24 ---
>> .../libtiff/files/CVE-2016-3622.patch | 129 --------------
>> .../libtiff/files/CVE-2016-3623.patch | 52 ------
>> .../libtiff/files/CVE-2016-3945.patch | 118 -------------
>> .../libtiff/files/CVE-2016-3990.patch | 66 -------
>> .../libtiff/files/CVE-2016-3991.patch | 147
>> ----------------
>> .../libtiff/files/CVE-2016-5321.patch | 49 ------
>> .../libtiff/files/CVE-2016-5323.patch | 107 -----------
>> .../libtiff/{tiff_4.0.6.bb => tiff_4.0.7.bb} | 15 +-
>> 12 files changed, 2 insertions(+), 1110 deletions(-)
>> delete mode 100644 meta/recipes-multimedia/libtif
>> f/files/CVE-2015-8665_8683.patch
>> delete mode 100644 meta/recipes-multimedia/libtif
>> f/files/CVE-2015-8781.patch
>> delete mode 100644 meta/recipes-multimedia/libtif
>> f/files/CVE-2015-8784.patch
>> delete mode 100644 meta/recipes-multimedia/libtif
>> f/files/CVE-2016-3186.patch
>> delete mode 100644 meta/recipes-multimedia/libtif
>> f/files/CVE-2016-3622.patch
>> delete mode 100644 meta/recipes-multimedia/libtif
>> f/files/CVE-2016-3623.patch
>> delete mode 100644 meta/recipes-multimedia/libtif
>> f/files/CVE-2016-3945.patch
>> delete mode 100644 meta/recipes-multimedia/libtif
>> f/files/CVE-2016-3990.patch
>> delete mode 100644 meta/recipes-multimedia/libtif
>> f/files/CVE-2016-3991.patch
>> delete mode 100644 meta/recipes-multimedia/libtif
>> f/files/CVE-2016-5321.patch
>> delete mode 100644 meta/recipes-multimedia/libtif
>> f/files/CVE-2016-5323.patch
>> rename meta/recipes-multimedia/libtiff/{tiff_4.0.6.bb => tiff_4.0.7.bb}
>> (74%)
>>
>> diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2015-8665_8683.patch
>> b/meta/recipes-multimedia/libtiff/files/CVE-2015-8665_8683.patch
>> deleted file mode 100644
>> index 39c5059..0000000
>> --- a/meta/recipes-multimedia/libtiff/files/CVE-2015-8665_8683.patch
>> +++ /dev/null
>> @@ -1,137 +0,0 @@
>> -From f94a29a822f5528d2334592760fbb7938f15eb55 Mon Sep 17 00:00:00 2001
>> -From: erouault <erouault>
>> -Date: Sat, 26 Dec 2015 17:32:03 +0000
>> -Subject: [PATCH] * libtiff/tif_getimage.c: fix out-of-bound reads in
>> - TIFFRGBAImage interface in case of unsupported values of
>> - SamplesPerPixel/ExtraSamples for LogLUV / CIELab. Add explicit call to
>> - TIFFRGBAImageOK() in TIFFRGBAImageBegin(). Fix CVE-2015-8665 reported by
>> - limingxing and CVE-2015-8683 reported by zzf of Alibaba.
>> -
>> -Upstream-Status: Backport
>> -CVE: CVE-2015-8665
>> -CVE: CVE-2015-8683
>> -https://github.com/vadz/libtiff/commit/f94a29a822f5528d2334
>> 592760fbb7938f15eb55
>> -
>> -Signed-off-by: Armin Kuster <akuster@mvista.com>
>> -
>> ----
>> - ChangeLog | 8 ++++++++
>> - libtiff/tif_getimage.c | 35 ++++++++++++++++++++++-------------
>> - 2 files changed, 30 insertions(+), 13 deletions(-)
>> -
>> -Index: tiff-4.0.6/libtiff/tif_getimage.c
>> -===================================================================
>> ---- tiff-4.0.6.orig/libtiff/tif_getimage.c
>> -+++ tiff-4.0.6/libtiff/tif_getimage.c
>> -@@ -182,20 +182,22 @@ TIFFRGBAImageOK(TIFF* tif, char emsg[102
>> - "Planarconfiguration",
>> td->td_planarconfig);
>> - return (0);
>> - }
>> -- if( td->td_samplesperpixel != 3 )
>> -+ if( td->td_samplesperpixel != 3 || colorchannels
>> != 3 )
>> - {
>> - sprintf(emsg,
>> -- "Sorry, can not handle image with %s=%d",
>> -- "Samples/pixel", td->td_samplesperpixel);
>> -+ "Sorry, can not handle image with %s=%d, %s=%d",
>> -+ "Samples/pixel", td->td_samplesperpixel,
>> -+ "colorchannels", colorchannels);
>> - return 0;
>> - }
>> - break;
>> - case PHOTOMETRIC_CIELAB:
>> -- if( td->td_samplesperpixel != 3 || td->td_bitspersample !=
>> 8 )
>> -+ if( td->td_samplesperpixel != 3 || colorchannels != 3 ||
>> td->td_bitspersample != 8 )
>> - {
>> - sprintf(emsg,
>> -- "Sorry, can not handle image with %s=%d and
>> %s=%d",
>> -+ "Sorry, can not handle image with %s=%d, %s=%d
>> and %s=%d",
>> - "Samples/pixel", td->td_samplesperpixel,
>> -+ "colorchannels", colorchannels,
>> - "Bits/sample", td->td_bitspersample);
>> - return 0;
>> - }
>> -@@ -255,6 +257,9 @@ TIFFRGBAImageBegin(TIFFRGBAImage* img, T
>> - int colorchannels;
>> - uint16 *red_orig, *green_orig, *blue_orig;
>> - int n_color;
>> -+
>> -+ if( !TIFFRGBAImageOK(tif, emsg) )
>> -+ return 0;
>> -
>> - /* Initialize to normal values */
>> - img->row_offset = 0;
>> -@@ -2508,29 +2513,33 @@ PickContigCase(TIFFRGBAImage* img)
>> - case PHOTOMETRIC_RGB:
>> - switch (img->bitspersample) {
>> - case 8:
>> -- if (img->alpha ==
>> EXTRASAMPLE_ASSOCALPHA)
>> -+ if (img->alpha ==
>> EXTRASAMPLE_ASSOCALPHA &&
>> -+ img->samplesperpixel >= 4)
>> - img->put.contig =
>> putRGBAAcontig8bittile;
>> -- else if (img->alpha ==
>> EXTRASAMPLE_UNASSALPHA)
>> -+ else if (img->alpha ==
>> EXTRASAMPLE_UNASSALPHA &&
>> -+
>> img->samplesperpixel >= 4)
>> - {
>> - if (BuildMapUaToAa(img))
>> - img->put.contig =
>> putRGBUAcontig8bittile;
>> - }
>> -- else
>> -+ else if( img->samplesperpixel >=
>> 3 )
>> - img->put.contig =
>> putRGBcontig8bittile;
>> - break;
>> - case 16:
>> -- if (img->alpha ==
>> EXTRASAMPLE_ASSOCALPHA)
>> -+ if (img->alpha ==
>> EXTRASAMPLE_ASSOCALPHA &&
>> -+ img->samplesperpixel >=4 )
>> - {
>> - if
>> (BuildMapBitdepth16To8(img))
>> - img->put.contig =
>> putRGBAAcontig16bittile;
>> - }
>> -- else if (img->alpha ==
>> EXTRASAMPLE_UNASSALPHA)
>> -+ else if (img->alpha ==
>> EXTRASAMPLE_UNASSALPHA &&
>> -+
>> img->samplesperpixel >=4 )
>> - {
>> - if
>> (BuildMapBitdepth16To8(img) &&
>> - BuildMapUaToAa(img))
>> - img->put.contig =
>> putRGBUAcontig16bittile;
>> - }
>> -- else
>> -+ else if( img->samplesperpixel >=3
>> )
>> - {
>> - if
>> (BuildMapBitdepth16To8(img))
>> - img->put.contig =
>> putRGBcontig16bittile;
>> -@@ -2539,7 +2548,7 @@ PickContigCase(TIFFRGBAImage* img)
>> - }
>> - break;
>> - case PHOTOMETRIC_SEPARATED:
>> -- if (buildMap(img)) {
>> -+ if (img->samplesperpixel >=4 && buildMap(img)) {
>> - if (img->bitspersample == 8) {
>> - if (!img->Map)
>> - img->put.contig =
>> putRGBcontig8bitCMYKtile;
>> -@@ -2635,7 +2644,7 @@ PickContigCase(TIFFRGBAImage* img)
>> - }
>> - break;
>> - case PHOTOMETRIC_CIELAB:
>> -- if (buildMap(img)) {
>> -+ if (img->samplesperpixel == 3 && buildMap(img)) {
>> - if (img->bitspersample == 8)
>> - img->put.contig =
>> initCIELabConversion(img);
>> - break;
>> -Index: tiff-4.0.6/ChangeLog
>> -===================================================================
>> ---- tiff-4.0.6.orig/ChangeLog
>> -+++ tiff-4.0.6/ChangeLog
>> -@@ -1,3 +1,11 @@
>> -+2015-12-26 Even Rouault <even.rouault at spatialys.com>
>> -+
>> -+ * libtiff/tif_getimage.c: fix out-of-bound reads in TIFFRGBAImage
>> -+ interface in case of unsupported values of
>> SamplesPerPixel/ExtraSamples
>> -+ for LogLUV / CIELab. Add explicit call to TIFFRGBAImageOK() in
>> -+ TIFFRGBAImageBegin(). Fix CVE-2015-8665 reported by limingxing and
>> -+ CVE-2015-8683 reported by zzf of Alibaba.
>> -+
>> - 2015-09-12 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
>> -
>> - * libtiff 4.0.6 released.
>> diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2015-8781.patch
>> b/meta/recipes-multimedia/libtiff/files/CVE-2015-8781.patch
>> deleted file mode 100644
>> index 0846f0f..0000000
>> --- a/meta/recipes-multimedia/libtiff/files/CVE-2015-8781.patch
>> +++ /dev/null
>> @@ -1,195 +0,0 @@
>> -From aaab5c3c9d2a2c6984f23ccbc79702610439bc65 Mon Sep 17 00:00:00 2001
>> -From: erouault <erouault>
>> -Date: Sun, 27 Dec 2015 16:25:11 +0000
>> -Subject: [PATCH] * libtiff/tif_luv.c: fix potential out-of-bound writes
>> in
>> - decode functions in non debug builds by replacing assert()s by regular
>> if
>> - checks (bugzilla #2522). Fix potential out-of-bound reads in case of
>> short
>> - input data.
>> -
>> -Upstream-Status: Backport
>> -
>> -https://github.com/vadz/libtiff/commit/aaab5c3c9d2a2c6984f2
>> 3ccbc79702610439bc65
>> -hand applied Changelog changes
>> -
>> -CVE: CVE-2015-8781
>> -
>> -Signed-off-by: Armin Kuster <akuster@mvista.com>
>> ----
>> - ChangeLog | 7 +++++++
>> - libtiff/tif_luv.c | 55 ++++++++++++++++++++++++++++++
>> ++++++++++++++-----------
>> - 2 files changed, 51 insertions(+), 11 deletions(-)
>> -
>> -Index: tiff-4.0.4/ChangeLog
>> -===================================================================
>> ---- tiff-4.0.4.orig/ChangeLog
>> -+++ tiff-4.0.4/ChangeLog
>> -@@ -1,3 +1,10 @@
>> -+2015-12-27 Even Rouault <even.rouault at spatialys.com>
>> -+
>> -+ * libtiff/tif_luv.c: fix potential out-of-bound writes in decode
>> -+ functions in non debug builds by replacing assert()s by regular if
>> -+ checks (bugzilla #2522).
>> -+ Fix potential out-of-bound reads in case of short input data.
>> -+
>> - 2015-12-26 Even Rouault <even.rouault at spatialys.com>
>> -
>> - * libtiff/tif_getimage.c: fix out-of-bound reads in TIFFRGBAImage
>> -Index: tiff-4.0.4/libtiff/tif_luv.c
>> -===================================================================
>> ---- tiff-4.0.4.orig/libtiff/tif_luv.c
>> -+++ tiff-4.0.4/libtiff/tif_luv.c
>> -@@ -202,7 +202,11 @@ LogL16Decode(TIFF* tif, uint8* op, tmsiz
>> - if (sp->user_datafmt == SGILOGDATAFMT_16BIT)
>> - tp = (int16*) op;
>> - else {
>> -- assert(sp->tbuflen >= npixels);
>> -+ if(sp->tbuflen < npixels) {
>> -+ TIFFErrorExt(tif->tif_clientdata, module,
>> -+ "Translation buffer too
>> short");
>> -+ return (0);
>> -+ }
>> - tp = (int16*) sp->tbuf;
>> - }
>> - _TIFFmemset((void*) tp, 0, npixels*sizeof (tp[0]));
>> -@@ -211,9 +215,11 @@ LogL16Decode(TIFF* tif, uint8* op, tmsiz
>> - cc = tif->tif_rawcc;
>> - /* get each byte string */
>> - for (shft = 2*8; (shft -= 8) >= 0; ) {
>> -- for (i = 0; i < npixels && cc > 0; )
>> -+ for (i = 0; i < npixels && cc > 0; ) {
>> - if (*bp >= 128) { /* run */
>> -- rc = *bp++ + (2-128); /* TODO:
>> potential input buffer overrun when decoding corrupt or truncated data */
>> -+ if( cc < 2 )
>> -+ break;
>> -+ rc = *bp++ + (2-128);
>> - b = (int16)(*bp++ << shft);
>> - cc -= 2;
>> - while (rc-- && i < npixels)
>> -@@ -223,6 +229,7 @@ LogL16Decode(TIFF* tif, uint8* op, tmsiz
>> - while (--cc && rc-- && i < npixels)
>> - tp[i++] |= (int16)*bp++ << shft;
>> - }
>> -+ }
>> - if (i != npixels) {
>> - #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__))
>> - TIFFErrorExt(tif->tif_clientdata, module,
>> -@@ -268,13 +275,17 @@ LogLuvDecode24(TIFF* tif, uint8* op, tms
>> - if (sp->user_datafmt == SGILOGDATAFMT_RAW)
>> - tp = (uint32 *)op;
>> - else {
>> -- assert(sp->tbuflen >= npixels);
>> -+ if(sp->tbuflen < npixels) {
>> -+ TIFFErrorExt(tif->tif_clientdata, module,
>> -+ "Translation buffer too
>> short");
>> -+ return (0);
>> -+ }
>> - tp = (uint32 *) sp->tbuf;
>> - }
>> - /* copy to array of uint32 */
>> - bp = (unsigned char*) tif->tif_rawcp;
>> - cc = tif->tif_rawcc;
>> -- for (i = 0; i < npixels && cc > 0; i++) {
>> -+ for (i = 0; i < npixels && cc >= 3; i++) {
>> - tp[i] = bp[0] << 16 | bp[1] << 8 | bp[2];
>> - bp += 3;
>> - cc -= 3;
>> -@@ -325,7 +336,11 @@ LogLuvDecode32(TIFF* tif, uint8* op, tms
>> - if (sp->user_datafmt == SGILOGDATAFMT_RAW)
>> - tp = (uint32*) op;
>> - else {
>> -- assert(sp->tbuflen >= npixels);
>> -+ if(sp->tbuflen < npixels) {
>> -+ TIFFErrorExt(tif->tif_clientdata, module,
>> -+ "Translation buffer too
>> short");
>> -+ return (0);
>> -+ }
>> - tp = (uint32*) sp->tbuf;
>> - }
>> - _TIFFmemset((void*) tp, 0, npixels*sizeof (tp[0]));
>> -@@ -334,11 +349,13 @@ LogLuvDecode32(TIFF* tif, uint8* op, tms
>> - cc = tif->tif_rawcc;
>> - /* get each byte string */
>> - for (shft = 4*8; (shft -= 8) >= 0; ) {
>> -- for (i = 0; i < npixels && cc > 0; )
>> -+ for (i = 0; i < npixels && cc > 0; ) {
>> - if (*bp >= 128) { /* run */
>> -+ if( cc < 2 )
>> -+ break;
>> - rc = *bp++ + (2-128);
>> - b = (uint32)*bp++ << shft;
>> -- cc -= 2; /* TODO:
>> potential input buffer overrun when decoding corrupt or truncated data */
>> -+ cc -= 2;
>> - while (rc-- && i < npixels)
>> - tp[i++] |= b;
>> - } else { /* non-run */
>> -@@ -346,6 +363,7 @@ LogLuvDecode32(TIFF* tif, uint8* op, tms
>> - while (--cc && rc-- && i < npixels)
>> - tp[i++] |= (uint32)*bp++ << shft;
>> - }
>> -+ }
>> - if (i != npixels) {
>> - #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__))
>> - TIFFErrorExt(tif->tif_clientdata, module,
>> -@@ -413,6 +431,7 @@ LogLuvDecodeTile(TIFF* tif, uint8* bp, t
>> - static int
>> - LogL16Encode(TIFF* tif, uint8* bp, tmsize_t cc, uint16 s)
>> - {
>> -+ static const char module[] = "LogL16Encode";
>> - LogLuvState* sp = EncoderState(tif);
>> - int shft;
>> - tmsize_t i;
>> -@@ -433,7 +452,11 @@ LogL16Encode(TIFF* tif, uint8* bp, tmsiz
>> - tp = (int16*) bp;
>> - else {
>> - tp = (int16*) sp->tbuf;
>> -- assert(sp->tbuflen >= npixels);
>> -+ if(sp->tbuflen < npixels) {
>> -+ TIFFErrorExt(tif->tif_clientdata, module,
>> -+ "Translation buffer too
>> short");
>> -+ return (0);
>> -+ }
>> - (*sp->tfunc)(sp, bp, npixels);
>> - }
>> - /* compress each byte string */
>> -@@ -506,6 +529,7 @@ LogL16Encode(TIFF* tif, uint8* bp, tmsiz
>> - static int
>> - LogLuvEncode24(TIFF* tif, uint8* bp, tmsize_t cc, uint16 s)
>> - {
>> -+ static const char module[] = "LogLuvEncode24";
>> - LogLuvState* sp = EncoderState(tif);
>> - tmsize_t i;
>> - tmsize_t npixels;
>> -@@ -521,7 +545,11 @@ LogLuvEncode24(TIFF* tif, uint8* bp, tms
>> - tp = (uint32*) bp;
>> - else {
>> - tp = (uint32*) sp->tbuf;
>> -- assert(sp->tbuflen >= npixels);
>> -+ if(sp->tbuflen < npixels) {
>> -+ TIFFErrorExt(tif->tif_clientdata, module,
>> -+ "Translation buffer too
>> short");
>> -+ return (0);
>> -+ }
>> - (*sp->tfunc)(sp, bp, npixels);
>> - }
>> - /* write out encoded pixels */
>> -@@ -553,6 +581,7 @@ LogLuvEncode24(TIFF* tif, uint8* bp, tms
>> - static int
>> - LogLuvEncode32(TIFF* tif, uint8* bp, tmsize_t cc, uint16 s)
>> - {
>> -+ static const char module[] = "LogLuvEncode32";
>> - LogLuvState* sp = EncoderState(tif);
>> - int shft;
>> - tmsize_t i;
>> -@@ -574,7 +603,11 @@ LogLuvEncode32(TIFF* tif, uint8* bp, tms
>> - tp = (uint32*) bp;
>> - else {
>> - tp = (uint32*) sp->tbuf;
>> -- assert(sp->tbuflen >= npixels);
>> -+ if(sp->tbuflen < npixels) {
>> -+ TIFFErrorExt(tif->tif_clientdata, module,
>> -+ "Translation buffer too
>> short");
>> -+ return (0);
>> -+ }
>> - (*sp->tfunc)(sp, bp, npixels);
>> - }
>> - /* compress each byte string */
>> diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2015-8784.patch
>> b/meta/recipes-multimedia/libtiff/files/CVE-2015-8784.patch
>> deleted file mode 100644
>> index 0caf800..0000000
>> --- a/meta/recipes-multimedia/libtiff/files/CVE-2015-8784.patch
>> +++ /dev/null
>> @@ -1,73 +0,0 @@
>> -From b18012dae552f85dcc5c57d3bf4e997a15b1cc1c Mon Sep 17 00:00:00 2001
>> -From: erouault <erouault>
>> -Date: Sun, 27 Dec 2015 16:55:20 +0000
>> -Subject: [PATCH] * libtiff/tif_next.c: fix potential out-of-bound write
>> in
>> - NeXTDecode() triggered by http://lcamtuf.coredump.cx/afl
>> /vulns/libtiff5.tif
>> - (bugzilla #2508)
>> -
>> -Upstream-Status: Backport
>> -https://github.com/vadz/libtiff/commit/b18012dae552f85dcc5c
>> 57d3bf4e997a15b1cc1c
>> -hand applied Changelog changes
>> -
>> -CVE: CVE-2015-8784
>> -Signed-off-by: Armin Kuster <akuster@mvista.com>
>> -
>> ----
>> - ChangeLog | 6 ++++++
>> - libtiff/tif_next.c | 10 ++++++++--
>> - 2 files changed, 14 insertions(+), 2 deletions(-)
>> -
>> -Index: tiff-4.0.4/ChangeLog
>> -===================================================================
>> ---- tiff-4.0.4.orig/ChangeLog
>> -+++ tiff-4.0.4/ChangeLog
>> -@@ -1,5 +1,11 @@
>> - 2015-12-27 Even Rouault <even.rouault at spatialys.com>
>> -
>> -+ * libtiff/tif_next.c: fix potential out-of-bound write in
>> NeXTDecode()
>> -+ triggered by http://lcamtuf.coredump.cx/afl/vulns/libtiff5.tif
>> -+ (bugzilla #2508)
>> -+
>> -+2015-12-27 Even Rouault <even.rouault at spatialys.com>
>> -+
>> - * libtiff/tif_luv.c: fix potential out-of-bound writes in decode
>> - functions in non debug builds by replacing assert()s by regular if
>> - checks (bugzilla #2522).
>> -Index: tiff-4.0.4/libtiff/tif_next.c
>> -===================================================================
>> ---- tiff-4.0.4.orig/libtiff/tif_next.c
>> -+++ tiff-4.0.4/libtiff/tif_next.c
>> -@@ -37,7 +37,7 @@
>> - case 0: op[0] = (unsigned char) ((v) << 6); break; \
>> - case 1: op[0] |= (v) << 4; break; \
>> - case 2: op[0] |= (v) << 2; break; \
>> -- case 3: *op++ |= (v); break; \
>> -+ case 3: *op++ |= (v); op_offset++; break; \
>> - } \
>> - }
>> -
>> -@@ -106,6 +106,7 @@ NeXTDecode(TIFF* tif, uint8* buf, tmsize
>> - uint32 imagewidth = tif->tif_dir.td_imagewidth;
>> - if( isTiled(tif) )
>> - imagewidth = tif->tif_dir.td_tilewidth;
>> -+ tmsize_t op_offset = 0;
>> -
>> - /*
>> - * The scanline is composed of a sequence of
>> constant
>> -@@ -122,10 +123,15 @@ NeXTDecode(TIFF* tif, uint8* buf, tmsize
>> - * bounds, potentially resulting in a
>> security
>> - * issue.
>> - */
>> -- while (n-- > 0 && npixels < imagewidth)
>> -+ while (n-- > 0 && npixels < imagewidth &&
>> op_offset < scanline)
>> - SETPIXEL(op, grey);
>> - if (npixels >= imagewidth)
>> - break;
>> -+ if (op_offset >= scanline ) {
>> -+ TIFFErrorExt(tif->tif_clientdata, module, "Invalid
>> data for scanline %ld",
>> -+ (long) tif->tif_row);
>> -+ return (0);
>> -+ }
>> - if (cc == 0)
>> - goto bad;
>> - n = *bp++, cc--;
>> diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2016-3186.patch
>> b/meta/recipes-multimedia/libtiff/files/CVE-2016-3186.patch
>> deleted file mode 100644
>> index 4a08aba..0000000
>> --- a/meta/recipes-multimedia/libtiff/files/CVE-2016-3186.patch
>> +++ /dev/null
>> @@ -1,24 +0,0 @@
>> -Buffer overflow in the readextension function in gif2tiff.c
>> -allows remote attackers to cause a denial of service via a crafted GIF
>> file.
>> -
>> -External References:
>> -https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-3186
>> -https://bugzilla.redhat.com/show_bug.cgi?id=1319503
>> -
>> -CVE: CVE-2016-3186
>> -Upstream-Status: Backport (RedHat)
>> -https://bugzilla.redhat.com/attachment.cgi?id=1144235&action=diff
>> -
>> -Signed-off-by: Yi Zhao <yi.zhao@windirver.com>
>> -
>> ---- tiff-4.0.6/tools/gif2tiff.c 2016-04-06 15:43:01.586048341
>> +0200
>> -+++ tiff-4.0.6/tools/gif2tiff.c 2016-04-06 15:48:05.523207710
>> +0200
>> -@@ -349,7 +349,7 @@
>> - int status = 1;
>> -
>> - (void) getc(infile);
>> -- while ((count = getc(infile)) && count <= 255)
>> -+ while ((count = getc(infile)) && count >= 0 && count <= 255)
>> - if (fread(buf, 1, count, infile) != (size_t) count) {
>> - fprintf(stderr, "short read from file %s (%s)\n",
>> - filename, strerror(errno));
>> diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2016-3622.patch
>> b/meta/recipes-multimedia/libtiff/files/CVE-2016-3622.patch
>> deleted file mode 100644
>> index 0c8b716..0000000
>> --- a/meta/recipes-multimedia/libtiff/files/CVE-2016-3622.patch
>> +++ /dev/null
>> @@ -1,129 +0,0 @@
>> -From 92d966a5fcfbdca67957c8c5c47b467aa650b286 Mon Sep 17 00:00:00 2001
>> -From: bfriesen <bfriesen>
>> -Date: Sat, 24 Sep 2016 23:11:55 +0000
>> -Subject: [PATCH] * libtiff/tif_getimage.c (TIFFRGBAImageOK): Reject
>> attempts
>> - to read floating point images.
>> -
>> -* libtiff/tif_predict.c (PredictorSetup): Enforce bits-per-sample
>> -requirements of floating point predictor (3). Fixes CVE-2016-3622
>> -"Divide By Zero in the tiff2rgba tool."
>> -
>> -CVE: CVE-2016-3622
>> -Upstream-Status: Backport
>> -https://github.com/vadz/libtiff/commit/92d966a5fcfbdca67957
>> c8c5c47b467aa650b286
>> -
>> -Signed-off-by: Yi Zhao <yi.zhao@windirver.com>
>> ----
>> - ChangeLog | 11 ++++++++++-
>> - libtiff/tif_getimage.c | 38 ++++++++++++++++++++------------------
>> - libtiff/tif_predict.c | 11 ++++++++++-
>> - 3 files changed, 40 insertions(+), 20 deletions(-)
>> -
>> -diff --git a/ChangeLog b/ChangeLog
>> -index 26d6f47..a628277 100644
>> ---- a/ChangeLog
>> -+++ b/ChangeLog
>> -@@ -1,3 +1,12 @@
>> -+2016-09-24 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
>> -+
>> -+ * libtiff/tif_getimage.c (TIFFRGBAImageOK): Reject attempts to
>> -+ read floating point images.
>> -+
>> -+ * libtiff/tif_predict.c (PredictorSetup): Enforce bits-per-sample
>> -+ requirements of floating point predictor (3). Fixes CVE-2016-3622
>> -+ "Divide By Zero in the tiff2rgba tool."
>> -+
>> - 2016-08-15 Even Rouault <even.rouault at spatialys.com>
>> -
>> - * tools/rgb2ycbcr.c: validate values of -v and -h parameters to
>> -diff --git a/libtiff/tif_getimage.c b/libtiff/tif_getimage.c
>> -index 386cee0..3e689ee 100644
>> ---- a/libtiff/tif_getimage.c
>> -+++ b/libtiff/tif_getimage.c
>> -@@ -95,6 +95,10 @@ TIFFRGBAImageOK(TIFF* tif, char emsg[1024])
>> - td->td_bitspersample);
>> - return (0);
>> - }
>> -+ if (td->td_sampleformat == SAMPLEFORMAT_IEEEFP) {
>> -+ sprintf(emsg, "Sorry, can not handle images with IEEE
>> floating-point samples");
>> -+ return (0);
>> -+ }
>> - colorchannels = td->td_samplesperpixel - td->td_extrasamples;
>> - if (!TIFFGetField(tif, TIFFTAG_PHOTOMETRIC, &photometric)) {
>> - switch (colorchannels) {
>> -@@ -182,27 +186,25 @@ TIFFRGBAImageOK(TIFF* tif, char emsg[1024])
>> - "Planarconfiguration",
>> td->td_planarconfig);
>> - return (0);
>> - }
>> -- if( td->td_samplesperpixel != 3 || colorchannels
>> != 3 )
>> -- {
>> -- sprintf(emsg,
>> -- "Sorry, can not handle image with %s=%d, %s=%d",
>> -- "Samples/pixel", td->td_samplesperpixel,
>> -- "colorchannels", colorchannels);
>> -- return 0;
>> -- }
>> -+ if ( td->td_samplesperpixel != 3 || colorchannels
>> != 3 ) {
>> -+ sprintf(emsg,
>> -+ "Sorry, can not handle image
>> with %s=%d, %s=%d",
>> -+ "Samples/pixel",
>> td->td_samplesperpixel,
>> -+ "colorchannels", colorchannels);
>> -+ return 0;
>> -+ }
>> - break;
>> - case PHOTOMETRIC_CIELAB:
>> -- if( td->td_samplesperpixel != 3 || colorchannels != 3 ||
>> td->td_bitspersample != 8 )
>> -- {
>> -- sprintf(emsg,
>> -- "Sorry, can not handle image with %s=%d, %s=%d
>> and %s=%d",
>> -- "Samples/pixel", td->td_samplesperpixel,
>> -- "colorchannels", colorchannels,
>> -- "Bits/sample", td->td_bitspersample);
>> -- return 0;
>> -- }
>> -+ if ( td->td_samplesperpixel != 3 ||
>> colorchannels != 3 || td->td_bitspersample != 8 ) {
>> -+ sprintf(emsg,
>> -+ "Sorry, can not handle image
>> with %s=%d, %s=%d and %s=%d",
>> -+ "Samples/pixel",
>> td->td_samplesperpixel,
>> -+ "colorchannels", colorchannels,
>> -+ "Bits/sample",
>> td->td_bitspersample);
>> -+ return 0;
>> -+ }
>> - break;
>> -- default:
>> -+ default:
>> - sprintf(emsg, "Sorry, can not handle image with
>> %s=%d",
>> - photoTag, photometric);
>> - return (0);
>> -diff --git a/libtiff/tif_predict.c b/libtiff/tif_predict.c
>> -index 081eb11..555f2f9 100644
>> ---- a/libtiff/tif_predict.c
>> -+++ b/libtiff/tif_predict.c
>> -@@ -80,6 +80,15 @@ PredictorSetup(TIFF* tif)
>> - td->td_sampleformat);
>> - return 0;
>> - }
>> -+ if (td->td_bitspersample != 16
>> -+ && td->td_bitspersample != 24
>> -+ && td->td_bitspersample != 32
>> -+ && td->td_bitspersample != 64) { /* Should
>> 64 be allowed? */
>> -+ TIFFErrorExt(tif->tif_clientdata,
>> module,
>> -+ "Floating point
>> \"Predictor\" not supported with %d-bit samples",
>> -+ td->td_bitspersample);
>> -+ return 0;
>> -+ }
>> - break;
>> - default:
>> - TIFFErrorExt(tif->tif_clientdata, module,
>> -@@ -174,7 +183,7 @@ PredictorSetupDecode(TIFF* tif)
>> - }
>> - /*
>> - * Allocate buffer to keep the decoded bytes before
>> -- * rearranging in the ight order
>> -+ * rearranging in the right order
>> - */
>> - }
>> -
>> ---
>> -2.7.4
>> -
>> diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2016-3623.patch
>> b/meta/recipes-multimedia/libtiff/files/CVE-2016-3623.patch
>> deleted file mode 100644
>> index f554ac5..0000000
>> --- a/meta/recipes-multimedia/libtiff/files/CVE-2016-3623.patch
>> +++ /dev/null
>> @@ -1,52 +0,0 @@
>> -From bd024f07019f5d9fea236675607a69f74a66bc7b Mon Sep 17 00:00:00 2001
>> -From: erouault <erouault>
>> -Date: Mon, 15 Aug 2016 21:26:56 +0000
>> -Subject: [PATCH] * tools/rgb2ycbcr.c: validate values of -v and -h
>> parameters
>> - to avoid potential divide by zero. Fixes CVE-2016-3623 (bugzilla #2569)
>> -
>> -CVE: CVE-2016-3623
>> -Upstream-Status: Backport
>> -https://github.com/vadz/libtiff/commit/bd024f07019f5d9fea23
>> 6675607a69f74a66bc7b
>> -
>> -Signed-off-by: Yi Zhao <yi.zhao@windirver.com>
>> ----
>> - ChangeLog | 5 +++++
>> - tools/rgb2ycbcr.c | 4 ++++
>> - 2 files changed, 9 insertions(+)
>> -
>> -diff --git a/ChangeLog b/ChangeLog
>> -index 5d60608..3e6642a 100644
>> ---- a/ChangeLog
>> -+++ b/ChangeLog
>> -@@ -1,5 +1,10 @@
>> - 2016-08-15 Even Rouault <even.rouault at spatialys.com>
>> -
>> -+ * tools/rgb2ycbcr.c: validate values of -v and -h parameters to
>> -+ avoid potential divide by zero. Fixes CVE-2016-3623 (bugzilla
>> #2569)
>> -+
>> -+2016-08-15 Even Rouault <even.rouault at spatialys.com>
>> -+
>> - * tools/tiffcrop.c: Fix out-of-bounds write in loadImage().
>> - From patch libtiff-CVE-2016-3991.patch from
>> - libtiff-4.0.3-25.el7_2.src.rpm by Nikola Forro (bugzilla #2543)
>> -diff --git a/tools/rgb2ycbcr.c b/tools/rgb2ycbcr.c
>> -index 3829d6b..51f4259 100644
>> ---- a/tools/rgb2ycbcr.c
>> -+++ b/tools/rgb2ycbcr.c
>> -@@ -95,9 +95,13 @@ main(int argc, char* argv[])
>> - break;
>> - case 'h':
>> - horizSubSampling = atoi(optarg);
>> -+ if( horizSubSampling != 1 && horizSubSampling != 2 &&
>> horizSubSampling != 4 )
>> -+ usage(-1);
>> - break;
>> - case 'v':
>> - vertSubSampling = atoi(optarg);
>> -+ if( vertSubSampling != 1 && vertSubSampling != 2 &&
>> vertSubSampling != 4 )
>> -+ usage(-1);
>> - break;
>> - case 'r':
>> - rowsperstrip = atoi(optarg);
>> ---
>> -2.7.4
>> -
>> diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2016-3945.patch
>> b/meta/recipes-multimedia/libtiff/files/CVE-2016-3945.patch
>> deleted file mode 100644
>> index 4d965be..0000000
>> --- a/meta/recipes-multimedia/libtiff/files/CVE-2016-3945.patch
>> +++ /dev/null
>> @@ -1,118 +0,0 @@
>> -From 7c39352ccd9060d311d3dc9a1f1bc00133a160e6 Mon Sep 17 00:00:00 2001
>> -From: erouault <erouault>
>> -Date: Mon, 15 Aug 2016 20:06:40 +0000
>> -Subject: [PATCH] * tools/tiff2rgba.c: Fix integer overflow in size of
>> - allocated buffer, when -b mode is enabled, that could result in
>> out-of-bounds
>> - write. Based initially on patch tiff-CVE-2016-3945.patch from
>> - libtiff-4.0.3-25.el7_2.src.rpm by Nikola Forro, with correction for
>> invalid
>> - tests that rejected valid files.
>> -
>> -CVE: CVE-2016-3945
>> -Upstream-Status: Backport
>> -https://github.com/vadz/libtiff/commit/7c39352ccd9060d311d3
>> dc9a1f1bc00133a160e6
>> -
>> -Signed-off-by: Yi Zhao <yi.zhao@windirver.com>
>> ----
>> - ChangeLog | 8 ++++++++
>> - tools/tiff2rgba.c | 34 ++++++++++++++++++++++++++++++----
>> - 2 files changed, 38 insertions(+), 4 deletions(-)
>> -
>> -diff --git a/ChangeLog b/ChangeLog
>> -index 62dc1b5..9c0ab29 100644
>> ---- a/ChangeLog
>> -+++ b/ChangeLog
>> -@@ -1,3 +1,11 @@
>> -+2016-08-15 Even Rouault <even.rouault at spatialys.com>
>> -+
>> -+ * tools/tiff2rgba.c: Fix integer overflow in size of allocated
>> -+ buffer, when -b mode is enabled, that could result in
>> out-of-bounds
>> -+ write. Based initially on patch tiff-CVE-2016-3945.patch from
>> -+ libtiff-4.0.3-25.el7_2.src.rpm by Nikola Forro, with correction
>> for
>> -+ invalid tests that rejected valid files.
>> -+
>> - 2016-07-11 Even Rouault <even.rouault at spatialys.com>
>> -
>> - * tools/tiffcrop.c: Avoid access outside of stack allocated array
>> -diff --git a/tools/tiff2rgba.c b/tools/tiff2rgba.c
>> -index b7a81eb..16e3dc4 100644
>> ---- a/tools/tiff2rgba.c
>> -+++ b/tools/tiff2rgba.c
>> -@@ -147,6 +147,7 @@ cvt_by_tile( TIFF *in, TIFF *out )
>> - uint32 row, col;
>> - uint32 *wrk_line;
>> - int ok = 1;
>> -+ uint32 rastersize, wrk_linesize;
>> -
>> - TIFFGetField(in, TIFFTAG_IMAGEWIDTH, &width);
>> - TIFFGetField(in, TIFFTAG_IMAGELENGTH, &height);
>> -@@ -163,7 +164,13 @@ cvt_by_tile( TIFF *in, TIFF *out )
>> - /*
>> - * Allocate tile buffer
>> - */
>> -- raster = (uint32*)_TIFFmalloc(tile_width * tile_height * sizeof
>> (uint32));
>> -+ rastersize = tile_width * tile_height * sizeof (uint32);
>> -+ if (tile_width != (rastersize / tile_height) / sizeof( uint32))
>> -+ {
>> -+ TIFFError(TIFFFileName(in), "Integer overflow when calculating
>> raster buffer");
>> -+ exit(-1);
>> -+ }
>> -+ raster = (uint32*)_TIFFmalloc(rastersize);
>> - if (raster == 0) {
>> - TIFFError(TIFFFileName(in), "No space for raster buffer");
>> - return (0);
>> -@@ -173,7 +180,13 @@ cvt_by_tile( TIFF *in, TIFF *out )
>> - * Allocate a scanline buffer for swapping during the vertical
>> - * mirroring pass.
>> - */
>> -- wrk_line = (uint32*)_TIFFmalloc(tile_width * sizeof (uint32));
>> -+ wrk_linesize = tile_width * sizeof (uint32);
>> -+ if (tile_width != wrk_linesize / sizeof (uint32))
>> -+ {
>> -+ TIFFError(TIFFFileName(in), "Integer overflow when calculating
>> wrk_line buffer");
>> -+ exit(-1);
>> -+ }
>> -+ wrk_line = (uint32*)_TIFFmalloc(wrk_linesize);
>> - if (!wrk_line) {
>> - TIFFError(TIFFFileName(in), "No space for raster scanline
>> buffer");
>> - ok = 0;
>> -@@ -249,6 +262,7 @@ cvt_by_strip( TIFF *in, TIFF *out )
>> - uint32 row;
>> - uint32 *wrk_line;
>> - int ok = 1;
>> -+ uint32 rastersize, wrk_linesize;
>> -
>> - TIFFGetField(in, TIFFTAG_IMAGEWIDTH, &width);
>> - TIFFGetField(in, TIFFTAG_IMAGELENGTH, &height);
>> -@@ -263,7 +277,13 @@ cvt_by_strip( TIFF *in, TIFF *out )
>> - /*
>> - * Allocate strip buffer
>> - */
>> -- raster = (uint32*)_TIFFmalloc(width * rowsperstrip * sizeof
>> (uint32));
>> -+ rastersize = width * rowsperstrip * sizeof (uint32);
>> -+ if (width != (rastersize / rowsperstrip) / sizeof( uint32))
>> -+ {
>> -+ TIFFError(TIFFFileName(in), "Integer overflow when calculating
>> raster buffer");
>> -+ exit(-1);
>> -+ }
>> -+ raster = (uint32*)_TIFFmalloc(rastersize);
>> - if (raster == 0) {
>> - TIFFError(TIFFFileName(in), "No space for raster buffer");
>> - return (0);
>> -@@ -273,7 +293,13 @@ cvt_by_strip( TIFF *in, TIFF *out )
>> - * Allocate a scanline buffer for swapping during the vertical
>> - * mirroring pass.
>> - */
>> -- wrk_line = (uint32*)_TIFFmalloc(width * sizeof (uint32));
>> -+ wrk_linesize = width * sizeof (uint32);
>> -+ if (width != wrk_linesize / sizeof (uint32))
>> -+ {
>> -+ TIFFError(TIFFFileName(in), "Integer overflow when calculating
>> wrk_line buffer");
>> -+ exit(-1);
>> -+ }
>> -+ wrk_line = (uint32*)_TIFFmalloc(wrk_linesize);
>> - if (!wrk_line) {
>> - TIFFError(TIFFFileName(in), "No space for raster scanline
>> buffer");
>> - ok = 0;
>> ---
>> -2.7.4
>> -
>> diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2016-3990.patch
>> b/meta/recipes-multimedia/libtiff/files/CVE-2016-3990.patch
>> deleted file mode 100644
>> index 7bf52ee..0000000
>> --- a/meta/recipes-multimedia/libtiff/files/CVE-2016-3990.patch
>> +++ /dev/null
>> @@ -1,66 +0,0 @@
>> -From 6a4dbb07ccf92836bb4adac7be4575672d0ac5f1 Mon Sep 17 00:00:00 2001
>> -From: erouault <erouault>
>> -Date: Mon, 15 Aug 2016 20:49:48 +0000
>> -Subject: [PATCH] * libtiff/tif_pixarlog.c: Fix write buffer overflow in
>> - PixarLogEncode if more input samples are provided than expected by
>> - PixarLogSetupEncode. Idea based on libtiff-CVE-2016-3990.patch from
>> - libtiff-4.0.3-25.el7_2.src.rpm by Nikola Forro, but with different and
>> - simpler check. (bugzilla #2544)
>> -
>> -invalid tests that rejected valid files. (bugzilla #2545)
>> -
>> -CVE: CVE-2016-3990
>> -Upstream-Status: Backport
>> -https://github.com/vadz/libtiff/commit/6a4dbb07ccf92836bb4a
>> dac7be4575672d0ac5f1
>> -
>> -Signed-off-by: Yi Zhao <yi.zhao@windirver.com>
>> ----
>> - ChangeLog | 10 +++++++++-
>> - libtiff/tif_pixarlog.c | 7 +++++++
>> - 2 files changed, 16 insertions(+), 1 deletion(-)
>> -
>> -diff --git a/ChangeLog b/ChangeLog
>> -index 9c0ab29..db4ea18 100644
>> ---- a/ChangeLog
>> -+++ b/ChangeLog
>> -@@ -1,10 +1,18 @@
>> - 2016-08-15 Even Rouault <even.rouault at spatialys.com>
>> -
>> -+ * libtiff/tif_pixarlog.c: Fix write buffer overflow in
>> PixarLogEncode
>> -+ if more input samples are provided than expected by
>> PixarLogSetupEncode.
>> -+ Idea based on libtiff-CVE-2016-3990.patch from
>> -+ libtiff-4.0.3-25.el7_2.src.rpm by Nikola Forro, but with
>> different and
>> -+ simpler check. (bugzilla #2544)
>> -+
>> -+2016-08-15 Even Rouault <even.rouault at spatialys.com>
>> -+
>> - * tools/tiff2rgba.c: Fix integer overflow in size of allocated
>> - buffer, when -b mode is enabled, that could result in
>> out-of-bounds
>> - write. Based initially on patch tiff-CVE-2016-3945.patch from
>> - libtiff-4.0.3-25.el7_2.src.rpm by Nikola Forro, with correction
>> for
>> -- invalid tests that rejected valid files.
>> -+ invalid tests that rejected valid files. (bugzilla #2545)
>> -
>> - 2016-07-11 Even Rouault <even.rouault at spatialys.com>
>> -
>> -diff --git a/libtiff/tif_pixarlog.c b/libtiff/tif_pixarlog.c
>> -index e78f788..28329d1 100644
>> ---- a/libtiff/tif_pixarlog.c
>> -+++ b/libtiff/tif_pixarlog.c
>> -@@ -1141,6 +1141,13 @@ PixarLogEncode(TIFF* tif, uint8* bp, tmsize_t cc,
>> uint16 s)
>> - }
>> -
>> - llen = sp->stride * td->td_imagewidth;
>> -+ /* Check against the number of elements (of size uint16) of
>> sp->tbuf */
>> -+ if( n > td->td_rowsperstrip * llen )
>> -+ {
>> -+ TIFFErrorExt(tif->tif_clientdata, module,
>> -+ "Too many input bytes provided");
>> -+ return 0;
>> -+ }
>> -
>> - for (i = 0, up = sp->tbuf; i < n; i += llen, up += llen) {
>> - switch (sp->user_datafmt) {
>> ---
>> -2.7.4
>> -
>> diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2016-3991.patch
>> b/meta/recipes-multimedia/libtiff/files/CVE-2016-3991.patch
>> deleted file mode 100644
>> index 27dfd37..0000000
>> --- a/meta/recipes-multimedia/libtiff/files/CVE-2016-3991.patch
>> +++ /dev/null
>> @@ -1,147 +0,0 @@
>> -From e596d4e27c5afb7960dc360fdd3afd90ba0fb8ba Mon Sep 17 00:00:00 2001
>> -From: erouault <erouault>
>> -Date: Mon, 15 Aug 2016 21:05:40 +0000
>> -Subject: [PATCH 2/2] * tools/tiffcrop.c: Fix out-of-bounds write in
>> - loadImage(). From patch libtiff-CVE-2016-3991.patch from
>> - libtiff-4.0.3-25.el7_2.src.rpm by Nikola Forro (bugzilla #2543)
>> -
>> -CVE: CVE-2016-3991
>> -Upstream-Status: Backport
>> -https://github.com/vadz/libtiff/commit/e596d4e27c5afb7960dc
>> 360fdd3afd90ba0fb8ba
>> -
>> -Signed-off-by: Yi Zhao <yi.zhao@windirver.com>
>> ----
>> - ChangeLog | 6 ++++++
>> - tools/tiffcrop.c | 59 ++++++++++++++++++++++++++++++
>> +++++++++++++++++++++++---
>> - 2 files changed, 62 insertions(+), 3 deletions(-)
>> -
>> -diff --git a/ChangeLog b/ChangeLog
>> -index db4ea18..5d60608 100644
>> ---- a/ChangeLog
>> -+++ b/ChangeLog
>> -@@ -1,5 +1,11 @@
>> - 2016-08-15 Even Rouault <even.rouault at spatialys.com>
>> -
>> -+ * tools/tiffcrop.c: Fix out-of-bounds write in loadImage().
>> -+ From patch libtiff-CVE-2016-3991.patch from
>> -+ libtiff-4.0.3-25.el7_2.src.rpm by Nikola Forro (bugzilla #2543)
>> -+
>> -+2016-08-15 Even Rouault <even.rouault at spatialys.com>
>> -+
>> - * libtiff/tif_pixarlog.c: Fix write buffer overflow in
>> PixarLogEncode
>> - if more input samples are provided than expected by
>> PixarLogSetupEncode.
>> - Idea based on libtiff-CVE-2016-3990.patch from
>> -diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c
>> -index 27abc0b..ddba7b9 100644
>> ---- a/tools/tiffcrop.c
>> -+++ b/tools/tiffcrop.c
>> -@@ -798,6 +798,11 @@ static int readContigTilesIntoBuffer (TIFF* in,
>> uint8* buf,
>> - }
>> -
>> - tile_buffsize = tilesize;
>> -+ if (tilesize == 0 || tile_rowsize == 0)
>> -+ {
>> -+ TIFFError("readContigTilesIntoBuffer", "Tile size or tile rowsize
>> is zero");
>> -+ exit(-1);
>> -+ }
>> -
>> - if (tilesize < (tsize_t)(tl * tile_rowsize))
>> - {
>> -@@ -807,7 +812,12 @@ static int readContigTilesIntoBuffer (TIFF* in,
>> uint8* buf,
>> - tilesize, tl * tile_rowsize);
>> - #endif
>> - tile_buffsize = tl * tile_rowsize;
>> -- }
>> -+ if (tl != (tile_buffsize / tile_rowsize))
>> -+ {
>> -+ TIFFError("readContigTilesIntoBuffer", "Integer overflow when
>> calculating buffer size.");
>> -+ exit(-1);
>> -+ }
>> -+ }
>> -
>> - tilebuf = _TIFFmalloc(tile_buffsize);
>> - if (tilebuf == 0)
>> -@@ -1210,6 +1220,12 @@ static int writeBufferToContigTiles (TIFF* out,
>> uint8* buf, uint32 imagelength,
>> - !TIFFGetField(out, TIFFTAG_BITSPERSAMPLE, &bps) )
>> - return 1;
>> -
>> -+ if (tilesize == 0 || tile_rowsize == 0 || tl == 0 || tw == 0)
>> -+ {
>> -+ TIFFError("writeBufferToContigTiles", "Tile size, tile row size,
>> tile width, or tile length is zero");
>> -+ exit(-1);
>> -+ }
>> -+
>> - tile_buffsize = tilesize;
>> - if (tilesize < (tsize_t)(tl * tile_rowsize))
>> - {
>> -@@ -1219,6 +1235,11 @@ static int writeBufferToContigTiles (TIFF* out,
>> uint8* buf, uint32 imagelength,
>> - tilesize, tl * tile_rowsize);
>> - #endif
>> - tile_buffsize = tl * tile_rowsize;
>> -+ if (tl != tile_buffsize / tile_rowsize)
>> -+ {
>> -+ TIFFError("writeBufferToContigTiles", "Integer overflow when
>> calculating buffer size");
>> -+ exit(-1);
>> -+ }
>> - }
>> -
>> - tilebuf = _TIFFmalloc(tile_buffsize);
>> -@@ -5945,12 +5966,27 @@ loadImage(TIFF* in, struct image_data *image,
>> struct dump_opts *dump, unsigned c
>> - TIFFGetField(in, TIFFTAG_TILELENGTH, &tl);
>> -
>> - tile_rowsize = TIFFTileRowSize(in);
>> -+ if (ntiles == 0 || tlsize == 0 || tile_rowsize == 0)
>> -+ {
>> -+ TIFFError("loadImage", "File appears to be tiled, but the number
>> of tiles, tile size, or tile rowsize is zero.");
>> -+ exit(-1);
>> -+ }
>> - buffsize = tlsize * ntiles;
>> -+ if (tlsize != (buffsize / ntiles))
>> -+ {
>> -+ TIFFError("loadImage", "Integer overflow when calculating buffer
>> size");
>> -+ exit(-1);
>> -+ }
>> -
>> --
>> - if (buffsize < (uint32)(ntiles * tl * tile_rowsize))
>> - {
>> - buffsize = ntiles * tl * tile_rowsize;
>> -+ if (ntiles != (buffsize / tl / tile_rowsize))
>> -+ {
>> -+ TIFFError("loadImage", "Integer overflow when calculating buffer
>> size");
>> -+ exit(-1);
>> -+ }
>> -+
>> - #ifdef DEBUG2
>> - TIFFError("loadImage",
>> - "Tilesize %u is too small, using ntiles * tilelength *
>> tilerowsize %lu",
>> -@@ -5969,8 +6005,25 @@ loadImage(TIFF* in, struct image_data *image,
>> struct dump_opts *dump, unsigned c
>> - TIFFGetFieldDefaulted(in, TIFFTAG_ROWSPERSTRIP, &rowsperstrip);
>> - stsize = TIFFStripSize(in);
>> - nstrips = TIFFNumberOfStrips(in);
>> -+ if (nstrips == 0 || stsize == 0)
>> -+ {
>> -+ TIFFError("loadImage", "File appears to be striped, but the
>> number of stipes or stripe size is zero.");
>> -+ exit(-1);
>> -+ }
>> -+
>> - buffsize = stsize * nstrips;
>> --
>> -+ if (stsize != (buffsize / nstrips))
>> -+ {
>> -+ TIFFError("loadImage", "Integer overflow when calculating buffer
>> size");
>> -+ exit(-1);
>> -+ }
>> -+ uint32 buffsize_check;
>> -+ buffsize_check = ((length * width * spp * bps) + 7);
>> -+ if (length != ((buffsize_check - 7) / width / spp / bps))
>> -+ {
>> -+ TIFFError("loadImage", "Integer overflow detected.");
>> -+ exit(-1);
>> -+ }
>> - if (buffsize < (uint32) (((length * width * spp * bps) + 7) / 8))
>> - {
>> - buffsize = ((length * width * spp * bps) + 7) / 8;
>> ---
>> -2.7.4
>> -
>> diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2016-5321.patch
>> b/meta/recipes-multimedia/libtiff/files/CVE-2016-5321.patch
>> deleted file mode 100644
>> index 63c6650..0000000
>> --- a/meta/recipes-multimedia/libtiff/files/CVE-2016-5321.patch
>> +++ /dev/null
>> @@ -1,49 +0,0 @@
>> -From d9783e4a1476b6787a51c5ae9e9b3156527589f0 Mon Sep 17 00:00:00 2001
>> -From: erouault <erouault>
>> -Date: Mon, 11 Jul 2016 21:26:03 +0000
>> -Subject: [PATCH 1/2] * tools/tiffcrop.c: Avoid access outside of stack
>> - allocated array on a tiled separate TIFF with more than 8 samples per
>> pixel.
>> - Reported by Kaixiang Zhang of the Cloud Security Team, Qihoo 360
>> - (CVE-2016-5321, bugzilla #2558)
>> -
>> -CVE: CVE-2016-5321
>> -Upstream-Status: Backport
>> -https://github.com/vadz/libtiff/commit/d9783e4a1476b6787a51
>> c5ae9e9b3156527589f0
>> -
>> -Signed-off-by: Yi Zhao <yi.zhao@windirver.com>
>> ----
>> - ChangeLog | 7 +++++++
>> - tools/tiffcrop.c | 2 +-
>> - 2 files changed, 8 insertions(+), 1 deletion(-)
>> -
>> -diff --git a/ChangeLog b/ChangeLog
>> -index e98d54d..4e0302f 100644
>> ---- a/ChangeLog
>> -+++ b/ChangeLog
>> -@@ -1,3 +1,10 @@
>> -+2016-07-11 Even Rouault <even.rouault at spatialys.com>
>> -+
>> -+ * tools/tiffcrop.c: Avoid access outside of stack allocated array
>> -+ on a tiled separate TIFF with more than 8 samples per pixel.
>> -+ Reported by Kaixiang Zhang of the Cloud Security Team, Qihoo 360
>> -+ (CVE-2016-5321, bugzilla #2558)
>> -+
>> - 2015-12-27 Even Rouault <even.rouault at spatialys.com>
>> -
>> - * libtiff/tif_next.c: fix potential out-of-bound write in
>> NeXTDecode()
>> -diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c
>> -index d959ae3..6fc8fc1 100644
>> ---- a/tools/tiffcrop.c
>> -+++ b/tools/tiffcrop.c
>> -@@ -989,7 +989,7 @@ static int readSeparateTilesIntoBuffer (TIFF* in,
>> uint8 *obuf,
>> - nrow = (row + tl > imagelength) ? imagelength - row : tl;
>> - for (col = 0; col < imagewidth; col += tw)
>> - {
>> -- for (s = 0; s < spp; s++)
>> -+ for (s = 0; s < spp && s < MAX_SAMPLES; s++)
>> - { /* Read each plane of a tile set into srcbuffs[s] */
>> - tbytes = TIFFReadTile(in, srcbuffs[s], col, row, 0, s);
>> - if (tbytes < 0 && !ignore)
>> ---
>> -2.7.4
>> -
>> diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2016-5323.patch
>> b/meta/recipes-multimedia/libtiff/files/CVE-2016-5323.patch
>> deleted file mode 100644
>> index 41eab91..0000000
>> --- a/meta/recipes-multimedia/libtiff/files/CVE-2016-5323.patch
>> +++ /dev/null
>> @@ -1,107 +0,0 @@
>> -From 2f79856097f423eb33796a15fcf700d2ea41bf31 Mon Sep 17 00:00:00 2001
>> -From: erouault <erouault>
>> -Date: Mon, 11 Jul 2016 21:38:31 +0000
>> -Subject: [PATCH 2/2] (CVE-2016-5321 / CVE-2016-5323 , bugzilla #2558 /
>> #2559)
>> -
>> -CVE: CVE-2016-5323
>> -Upstream-Status: Backport
>> -https://github.com/vadz/libtiff/commit/2f79856097f423eb3379
>> 6a15fcf700d2ea41bf31
>> -
>> -Signed-off-by: Yi Zhao <yi.zhao@windirver.com>
>> ----
>> - ChangeLog | 2 +-
>> - tools/tiffcrop.c | 16 ++++++++--------
>> - 2 files changed, 9 insertions(+), 9 deletions(-)
>> -
>> -diff --git a/ChangeLog b/ChangeLog
>> -index 4e0302f..62dc1b5 100644
>> ---- a/ChangeLog
>> -+++ b/ChangeLog
>> -@@ -3,7 +3,7 @@
>> - * tools/tiffcrop.c: Avoid access outside of stack allocated array
>> - on a tiled separate TIFF with more than 8 samples per pixel.
>> - Reported by Kaixiang Zhang of the Cloud Security Team, Qihoo 360
>> -- (CVE-2016-5321, bugzilla #2558)
>> -+ (CVE-2016-5321 / CVE-2016-5323 , bugzilla #2558 / #2559)
>> -
>> - 2016-07-10 Even Rouault <even.rouault at spatialys.com>
>> -
>> -diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c
>> -index 6fc8fc1..27abc0b 100644
>> ---- a/tools/tiffcrop.c
>> -+++ b/tools/tiffcrop.c
>> -@@ -3738,7 +3738,7 @@ combineSeparateSamples8bits (uint8 *in[], uint8
>> *out, uint32 cols,
>> -
>> - matchbits = maskbits << (8 - src_bit - bps);
>> - /* load up next sample from each plane */
>> -- for (s = 0; s < spp; s++)
>> -+ for (s = 0; (s < spp) && (s < MAX_SAMPLES); s++)
>> - {
>> - src = in[s] + src_offset + src_byte;
>> - buff1 = ((*src) & matchbits) << (src_bit);
>> -@@ -3837,7 +3837,7 @@ combineSeparateSamples16bits (uint8 *in[], uint8
>> *out, uint32 cols,
>> - src_bit = bit_offset % 8;
>> -
>> - matchbits = maskbits << (16 - src_bit - bps);
>> -- for (s = 0; s < spp; s++)
>> -+ for (s = 0; (s < spp) && (s < MAX_SAMPLES); s++)
>> - {
>> - src = in[s] + src_offset + src_byte;
>> - if (little_endian)
>> -@@ -3947,7 +3947,7 @@ combineSeparateSamples24bits (uint8 *in[], uint8
>> *out, uint32 cols,
>> - src_bit = bit_offset % 8;
>> -
>> - matchbits = maskbits << (32 - src_bit - bps);
>> -- for (s = 0; s < spp; s++)
>> -+ for (s = 0; (s < spp) && (s < MAX_SAMPLES); s++)
>> - {
>> - src = in[s] + src_offset + src_byte;
>> - if (little_endian)
>> -@@ -4073,7 +4073,7 @@ combineSeparateSamples32bits (uint8 *in[], uint8
>> *out, uint32 cols,
>> - src_bit = bit_offset % 8;
>> -
>> - matchbits = maskbits << (64 - src_bit - bps);
>> -- for (s = 0; s < spp; s++)
>> -+ for (s = 0; (s < spp) && (s < MAX_SAMPLES); s++)
>> - {
>> - src = in[s] + src_offset + src_byte;
>> - if (little_endian)
>> -@@ -4263,7 +4263,7 @@ combineSeparateTileSamples8bits (uint8 *in[],
>> uint8 *out, uint32 cols,
>> -
>> - matchbits = maskbits << (8 - src_bit - bps);
>> - /* load up next sample from each plane */
>> -- for (s = 0; s < spp; s++)
>> -+ for (s = 0; (s < spp) && (s < MAX_SAMPLES); s++)
>> - {
>> - src = in[s] + src_offset + src_byte;
>> - buff1 = ((*src) & matchbits) << (src_bit);
>> -@@ -4362,7 +4362,7 @@ combineSeparateTileSamples16bits (uint8 *in[],
>> uint8 *out, uint32 cols,
>> - src_bit = bit_offset % 8;
>> -
>> - matchbits = maskbits << (16 - src_bit - bps);
>> -- for (s = 0; s < spp; s++)
>> -+ for (s = 0; (s < spp) && (s < MAX_SAMPLES); s++)
>> - {
>> - src = in[s] + src_offset + src_byte;
>> - if (little_endian)
>> -@@ -4471,7 +4471,7 @@ combineSeparateTileSamples24bits (uint8 *in[],
>> uint8 *out, uint32 cols,
>> - src_bit = bit_offset % 8;
>> -
>> - matchbits = maskbits << (32 - src_bit - bps);
>> -- for (s = 0; s < spp; s++)
>> -+ for (s = 0; (s < spp) && (s < MAX_SAMPLES); s++)
>> - {
>> - src = in[s] + src_offset + src_byte;
>> - if (little_endian)
>> -@@ -4597,7 +4597,7 @@ combineSeparateTileSamples32bits (uint8 *in[],
>> uint8 *out, uint32 cols,
>> - src_bit = bit_offset % 8;
>> -
>> - matchbits = maskbits << (64 - src_bit - bps);
>> -- for (s = 0; s < spp; s++)
>> -+ for (s = 0; (s < spp) && (s < MAX_SAMPLES); s++)
>> - {
>> - src = in[s] + src_offset + src_byte;
>> - if (little_endian)
>> ---
>> -2.7.4
>> -
>> diff --git a/meta/recipes-multimedia/libtiff/tiff_4.0.6.bb
>> b/meta/recipes-multimedia/libtiff/tiff_4.0.7.bb
>> similarity index 74%
>> rename from meta/recipes-multimedia/libtiff/tiff_4.0.6.bb
>> rename to meta/recipes-multimedia/libtiff/tiff_4.0.7.bb
>> index 796d86e..52fc553 100644
>> --- a/meta/recipes-multimedia/libtiff/tiff_4.0.6.bb
>> +++ b/meta/recipes-multimedia/libtiff/tiff_4.0.7.bb
>> @@ -4,21 +4,10 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=34da3db4
>> 6fab7501992f9615d7e158cf"
>> SRC_URI = "http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz \
>> file://libtool2.patch \
>> - file://CVE-2015-8665_8683.patch \
>> - file://CVE-2015-8781.patch \
>> - file://CVE-2015-8784.patch \
>> - file://CVE-2016-3186.patch \
>> - file://CVE-2016-5321.patch \
>> - file://CVE-2016-5323.patch \
>> - file://CVE-2016-3945.patch \
>> - file://CVE-2016-3990.patch \
>> - file://CVE-2016-3991.patch \
>> - file://CVE-2016-3623.patch \
>> - file://CVE-2016-3622.patch \
>> "
>> -SRC_URI[md5sum] = "d1d2e940dea0b5ad435f21f03d96dd72"
>> -SRC_URI[sha256sum] = "4d57a50907b510e3049a4bba0d788
>> 8930fdfc16ce49f1bf693e5b6247370d68c"
>> +SRC_URI[md5sum] = "77ae928d2c6b7fb46a21c3a29325157b"
>> +SRC_URI[sha256sum] = "9f43a2cfb9589e5cecaa66e16bf87
>> f814c945f22df7ba600d63aac4632c4f019"
>> # exclude betas
>> UPSTREAM_CHECK_REGEX = "tiff-(?P<pver>\d+(\.\d+)+).tar"
>>
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
[-- Attachment #2: Type: text/html, Size: 73338 bytes --]
^ permalink raw reply
* Re: Contents of non-rootfs partitions
From: Patrick Ohly @ 2016-11-23 15:56 UTC (permalink / raw)
To: ed.bartosh; +Cc: Eduard Bartosh, openembedded-core
In-Reply-To: <20161123132229.GA13863@linux.intel.com>
On Wed, 2016-11-23 at 15:22 +0200, Ed Bartosh wrote:
> On Wed, Nov 23, 2016 at 02:08:28PM +0100, Kristian Amlie wrote:
> > On 23/11/16 13:08, Ed Bartosh wrote:
> > > On Tue, Nov 22, 2016 at 12:54:52PM +0100, Kristian Amlie wrote:
> > >> On 22/11/16 12:10, Patrick Ohly wrote:
> > >>>> ...
> > >>>
> > >>> All of these introduce some special mechanism. Let me propose something
> > >>> that might integrate better with the existing tooling:
> > >>>
> > >>> The "rootfs" directory gets redefined as representing the entire virtual
> > >>> file system. When creating a disk image, it gets split up into different
> > >>> partitions based on the image configuration.
> > >>>
> > >>> For example, the /home or /data directories in the rootfs could hold the
> > >>> content that in some image configurations goes into separate partitions.
> > >>>
> > >>> The advantage of this approach is that the tooling for staging content
> > >>> for image creation does not need to be changed. The same staged content
> > >>> then can be used to create different images, potentially even using
> > >>> different partition layouts.
> > >>
> > >> That's a very good idea. I think it beats all of my suggestions!
> > >>
> > >>> To implement this approach with wic, wic needs to be taught how to
> > >>> exclude directories from the main rootfs. Ideally, the mkfs.* tools
> > >>> should also support that without having to make an intermediate copy of
> > >>> the files for a certain partition, but initially wic could create
> > >>> temporary directory trees.
> > >>
> > >> Yes, some work would be needed here, but ultimately it would be contained within wic and related tools, which is a good thing.
> > >>
> > >
> > > I support the idea. Let's discuss the details of implementation and
> > > create a bug in bugzilla to track the development
> >
> > Do you want me to create the ticket? (it'll be my first, so apologies in
> > advance if I omit something important)
> >
> > > This can be done by extending existing rootfs plugin. It should be able
> > > to do 2 things:
> > >
> > > - populate content of one rootfs directory to the partition. We can
> > > extend syntax of --rootfs-dir parameter to specify optional directory path to use
> > >
> > > - exclude rootfs directories when populating partitions. I'd propose to
> > > introduce --exclude-dirs wks parser option to handle this.
> > >
> > > Example of wks file with proposed new options:
> > > part / --source rootfs --rootfs-dir=core-image-minimal --ondisk sda --fstype=ext4 --label root --align 1024 --exclude-dirs data --exclude-dirs home
> > > part /data --source rootfs --rootfs-dir=core-image-minimal:/home --ondisk sda --fstype=ext4 --label data --align 1024
> > > part /home --source rootfs --rootfs-dir=core-image-minimal:/data --ondisk sda --fstype=ext4 --label data --align 1024
> > >
> > > Does this make sense?
> >
> > Looks good. The only thing I would question is that, in the interest of
> > reducing redundancy, maybe we should omit --exclude-dirs and have wic
> > figure this out by combining all the entries, since "--exclude-dirs
> > <dir>" and the corresponding "part <dir>" will almost always come in
> > pairs. Possibly we could mark the "/" partition with one single
> > --no-overlapping-dirs to force wic to make this consideration. Or do you
> > think that's too magical?
> >
> Tt's quite implicit from my point of view. However, if people like it we
> can implement it this way.
I prefer the explicit --exclude-dirs. It's less surprising and perhaps
there are usages for having the same content in different partitions
(redundancy, factory reset, etc.).
Excluding only the directory content but not the actual directory is
indeed a good point. I'm a bit undecided. When excluding only the
directory content, there's no way of building a rootfs without that
mount point, if that's desired. OTOH, when excluding also the directory,
the data would have to be staged under a different path in the rootfs
and the mount point would have to be a separate, empty directory.
I'm leaning towards excluding the directory content and keeping the
directory.
--
Best Regards, Patrick Ohly
The content of this message is my personal opinion only and although
I am an employee of Intel, the statements I make here in no way
represent Intel's position on the issue, nor am I authorized to speak
on behalf of Intel on this matter.
^ permalink raw reply
* Re: [Master][PATCH] libtiff: Update to 4.0.7
From: akuster808 @ 2016-11-23 15:32 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1479792499-19369-1-git-send-email-akuster@mvista.com>
The never made into patchwork. is there a bug there ? is there an issue
on how I submitted?
- armin
On 11/21/2016 09:28 PM, Armin Kuster wrote:
> Major changes:
> The libtiff tools bmp2tiff, gif2tiff, ras2tiff, sgi2tiff, sgisv, and ycbcr are completely removed from the distribution, used for demos.
>
> CVEs fixed:
> CVE-2016-9297
> CVE-2016-9448
> CVE-2016-9273
> CVE-2014-8127
> CVE-2016-3658
> CVE-2016-5875
> CVE-2016-5652
> CVE-2016-3632
>
> plus more that are not identified in the changelog.
>
> removed patches integrated into update.
> more info: http://libtiff.maptools.org/v4.0.7.html
>
> Signed-off-by: Armin Kuster <akuster@mvista.com>
> ---
> .../libtiff/files/CVE-2015-8665_8683.patch | 137 ---------------
> .../libtiff/files/CVE-2015-8781.patch | 195 ---------------------
> .../libtiff/files/CVE-2015-8784.patch | 73 --------
> .../libtiff/files/CVE-2016-3186.patch | 24 ---
> .../libtiff/files/CVE-2016-3622.patch | 129 --------------
> .../libtiff/files/CVE-2016-3623.patch | 52 ------
> .../libtiff/files/CVE-2016-3945.patch | 118 -------------
> .../libtiff/files/CVE-2016-3990.patch | 66 -------
> .../libtiff/files/CVE-2016-3991.patch | 147 ----------------
> .../libtiff/files/CVE-2016-5321.patch | 49 ------
> .../libtiff/files/CVE-2016-5323.patch | 107 -----------
> .../libtiff/{tiff_4.0.6.bb => tiff_4.0.7.bb} | 15 +-
> 12 files changed, 2 insertions(+), 1110 deletions(-)
> delete mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2015-8665_8683.patch
> delete mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2015-8781.patch
> delete mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2015-8784.patch
> delete mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2016-3186.patch
> delete mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2016-3622.patch
> delete mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2016-3623.patch
> delete mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2016-3945.patch
> delete mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2016-3990.patch
> delete mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2016-3991.patch
> delete mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2016-5321.patch
> delete mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2016-5323.patch
> rename meta/recipes-multimedia/libtiff/{tiff_4.0.6.bb => tiff_4.0.7.bb} (74%)
>
> diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2015-8665_8683.patch b/meta/recipes-multimedia/libtiff/files/CVE-2015-8665_8683.patch
> deleted file mode 100644
> index 39c5059..0000000
> --- a/meta/recipes-multimedia/libtiff/files/CVE-2015-8665_8683.patch
> +++ /dev/null
> @@ -1,137 +0,0 @@
> -From f94a29a822f5528d2334592760fbb7938f15eb55 Mon Sep 17 00:00:00 2001
> -From: erouault <erouault>
> -Date: Sat, 26 Dec 2015 17:32:03 +0000
> -Subject: [PATCH] * libtiff/tif_getimage.c: fix out-of-bound reads in
> - TIFFRGBAImage interface in case of unsupported values of
> - SamplesPerPixel/ExtraSamples for LogLUV / CIELab. Add explicit call to
> - TIFFRGBAImageOK() in TIFFRGBAImageBegin(). Fix CVE-2015-8665 reported by
> - limingxing and CVE-2015-8683 reported by zzf of Alibaba.
> -
> -Upstream-Status: Backport
> -CVE: CVE-2015-8665
> -CVE: CVE-2015-8683
> -https://github.com/vadz/libtiff/commit/f94a29a822f5528d2334592760fbb7938f15eb55
> -
> -Signed-off-by: Armin Kuster <akuster@mvista.com>
> -
> ----
> - ChangeLog | 8 ++++++++
> - libtiff/tif_getimage.c | 35 ++++++++++++++++++++++-------------
> - 2 files changed, 30 insertions(+), 13 deletions(-)
> -
> -Index: tiff-4.0.6/libtiff/tif_getimage.c
> -===================================================================
> ---- tiff-4.0.6.orig/libtiff/tif_getimage.c
> -+++ tiff-4.0.6/libtiff/tif_getimage.c
> -@@ -182,20 +182,22 @@ TIFFRGBAImageOK(TIFF* tif, char emsg[102
> - "Planarconfiguration", td->td_planarconfig);
> - return (0);
> - }
> -- if( td->td_samplesperpixel != 3 )
> -+ if( td->td_samplesperpixel != 3 || colorchannels != 3 )
> - {
> - sprintf(emsg,
> -- "Sorry, can not handle image with %s=%d",
> -- "Samples/pixel", td->td_samplesperpixel);
> -+ "Sorry, can not handle image with %s=%d, %s=%d",
> -+ "Samples/pixel", td->td_samplesperpixel,
> -+ "colorchannels", colorchannels);
> - return 0;
> - }
> - break;
> - case PHOTOMETRIC_CIELAB:
> -- if( td->td_samplesperpixel != 3 || td->td_bitspersample != 8 )
> -+ if( td->td_samplesperpixel != 3 || colorchannels != 3 || td->td_bitspersample != 8 )
> - {
> - sprintf(emsg,
> -- "Sorry, can not handle image with %s=%d and %s=%d",
> -+ "Sorry, can not handle image with %s=%d, %s=%d and %s=%d",
> - "Samples/pixel", td->td_samplesperpixel,
> -+ "colorchannels", colorchannels,
> - "Bits/sample", td->td_bitspersample);
> - return 0;
> - }
> -@@ -255,6 +257,9 @@ TIFFRGBAImageBegin(TIFFRGBAImage* img, T
> - int colorchannels;
> - uint16 *red_orig, *green_orig, *blue_orig;
> - int n_color;
> -+
> -+ if( !TIFFRGBAImageOK(tif, emsg) )
> -+ return 0;
> -
> - /* Initialize to normal values */
> - img->row_offset = 0;
> -@@ -2508,29 +2513,33 @@ PickContigCase(TIFFRGBAImage* img)
> - case PHOTOMETRIC_RGB:
> - switch (img->bitspersample) {
> - case 8:
> -- if (img->alpha == EXTRASAMPLE_ASSOCALPHA)
> -+ if (img->alpha == EXTRASAMPLE_ASSOCALPHA &&
> -+ img->samplesperpixel >= 4)
> - img->put.contig = putRGBAAcontig8bittile;
> -- else if (img->alpha == EXTRASAMPLE_UNASSALPHA)
> -+ else if (img->alpha == EXTRASAMPLE_UNASSALPHA &&
> -+ img->samplesperpixel >= 4)
> - {
> - if (BuildMapUaToAa(img))
> - img->put.contig = putRGBUAcontig8bittile;
> - }
> -- else
> -+ else if( img->samplesperpixel >= 3 )
> - img->put.contig = putRGBcontig8bittile;
> - break;
> - case 16:
> -- if (img->alpha == EXTRASAMPLE_ASSOCALPHA)
> -+ if (img->alpha == EXTRASAMPLE_ASSOCALPHA &&
> -+ img->samplesperpixel >=4 )
> - {
> - if (BuildMapBitdepth16To8(img))
> - img->put.contig = putRGBAAcontig16bittile;
> - }
> -- else if (img->alpha == EXTRASAMPLE_UNASSALPHA)
> -+ else if (img->alpha == EXTRASAMPLE_UNASSALPHA &&
> -+ img->samplesperpixel >=4 )
> - {
> - if (BuildMapBitdepth16To8(img) &&
> - BuildMapUaToAa(img))
> - img->put.contig = putRGBUAcontig16bittile;
> - }
> -- else
> -+ else if( img->samplesperpixel >=3 )
> - {
> - if (BuildMapBitdepth16To8(img))
> - img->put.contig = putRGBcontig16bittile;
> -@@ -2539,7 +2548,7 @@ PickContigCase(TIFFRGBAImage* img)
> - }
> - break;
> - case PHOTOMETRIC_SEPARATED:
> -- if (buildMap(img)) {
> -+ if (img->samplesperpixel >=4 && buildMap(img)) {
> - if (img->bitspersample == 8) {
> - if (!img->Map)
> - img->put.contig = putRGBcontig8bitCMYKtile;
> -@@ -2635,7 +2644,7 @@ PickContigCase(TIFFRGBAImage* img)
> - }
> - break;
> - case PHOTOMETRIC_CIELAB:
> -- if (buildMap(img)) {
> -+ if (img->samplesperpixel == 3 && buildMap(img)) {
> - if (img->bitspersample == 8)
> - img->put.contig = initCIELabConversion(img);
> - break;
> -Index: tiff-4.0.6/ChangeLog
> -===================================================================
> ---- tiff-4.0.6.orig/ChangeLog
> -+++ tiff-4.0.6/ChangeLog
> -@@ -1,3 +1,11 @@
> -+2015-12-26 Even Rouault <even.rouault at spatialys.com>
> -+
> -+ * libtiff/tif_getimage.c: fix out-of-bound reads in TIFFRGBAImage
> -+ interface in case of unsupported values of SamplesPerPixel/ExtraSamples
> -+ for LogLUV / CIELab. Add explicit call to TIFFRGBAImageOK() in
> -+ TIFFRGBAImageBegin(). Fix CVE-2015-8665 reported by limingxing and
> -+ CVE-2015-8683 reported by zzf of Alibaba.
> -+
> - 2015-09-12 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
> -
> - * libtiff 4.0.6 released.
> diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2015-8781.patch b/meta/recipes-multimedia/libtiff/files/CVE-2015-8781.patch
> deleted file mode 100644
> index 0846f0f..0000000
> --- a/meta/recipes-multimedia/libtiff/files/CVE-2015-8781.patch
> +++ /dev/null
> @@ -1,195 +0,0 @@
> -From aaab5c3c9d2a2c6984f23ccbc79702610439bc65 Mon Sep 17 00:00:00 2001
> -From: erouault <erouault>
> -Date: Sun, 27 Dec 2015 16:25:11 +0000
> -Subject: [PATCH] * libtiff/tif_luv.c: fix potential out-of-bound writes in
> - decode functions in non debug builds by replacing assert()s by regular if
> - checks (bugzilla #2522). Fix potential out-of-bound reads in case of short
> - input data.
> -
> -Upstream-Status: Backport
> -
> -https://github.com/vadz/libtiff/commit/aaab5c3c9d2a2c6984f23ccbc79702610439bc65
> -hand applied Changelog changes
> -
> -CVE: CVE-2015-8781
> -
> -Signed-off-by: Armin Kuster <akuster@mvista.com>
> ----
> - ChangeLog | 7 +++++++
> - libtiff/tif_luv.c | 55 ++++++++++++++++++++++++++++++++++++++++++++-----------
> - 2 files changed, 51 insertions(+), 11 deletions(-)
> -
> -Index: tiff-4.0.4/ChangeLog
> -===================================================================
> ---- tiff-4.0.4.orig/ChangeLog
> -+++ tiff-4.0.4/ChangeLog
> -@@ -1,3 +1,10 @@
> -+2015-12-27 Even Rouault <even.rouault at spatialys.com>
> -+
> -+ * libtiff/tif_luv.c: fix potential out-of-bound writes in decode
> -+ functions in non debug builds by replacing assert()s by regular if
> -+ checks (bugzilla #2522).
> -+ Fix potential out-of-bound reads in case of short input data.
> -+
> - 2015-12-26 Even Rouault <even.rouault at spatialys.com>
> -
> - * libtiff/tif_getimage.c: fix out-of-bound reads in TIFFRGBAImage
> -Index: tiff-4.0.4/libtiff/tif_luv.c
> -===================================================================
> ---- tiff-4.0.4.orig/libtiff/tif_luv.c
> -+++ tiff-4.0.4/libtiff/tif_luv.c
> -@@ -202,7 +202,11 @@ LogL16Decode(TIFF* tif, uint8* op, tmsiz
> - if (sp->user_datafmt == SGILOGDATAFMT_16BIT)
> - tp = (int16*) op;
> - else {
> -- assert(sp->tbuflen >= npixels);
> -+ if(sp->tbuflen < npixels) {
> -+ TIFFErrorExt(tif->tif_clientdata, module,
> -+ "Translation buffer too short");
> -+ return (0);
> -+ }
> - tp = (int16*) sp->tbuf;
> - }
> - _TIFFmemset((void*) tp, 0, npixels*sizeof (tp[0]));
> -@@ -211,9 +215,11 @@ LogL16Decode(TIFF* tif, uint8* op, tmsiz
> - cc = tif->tif_rawcc;
> - /* get each byte string */
> - for (shft = 2*8; (shft -= 8) >= 0; ) {
> -- for (i = 0; i < npixels && cc > 0; )
> -+ for (i = 0; i < npixels && cc > 0; ) {
> - if (*bp >= 128) { /* run */
> -- rc = *bp++ + (2-128); /* TODO: potential input buffer overrun when decoding corrupt or truncated data */
> -+ if( cc < 2 )
> -+ break;
> -+ rc = *bp++ + (2-128);
> - b = (int16)(*bp++ << shft);
> - cc -= 2;
> - while (rc-- && i < npixels)
> -@@ -223,6 +229,7 @@ LogL16Decode(TIFF* tif, uint8* op, tmsiz
> - while (--cc && rc-- && i < npixels)
> - tp[i++] |= (int16)*bp++ << shft;
> - }
> -+ }
> - if (i != npixels) {
> - #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__))
> - TIFFErrorExt(tif->tif_clientdata, module,
> -@@ -268,13 +275,17 @@ LogLuvDecode24(TIFF* tif, uint8* op, tms
> - if (sp->user_datafmt == SGILOGDATAFMT_RAW)
> - tp = (uint32 *)op;
> - else {
> -- assert(sp->tbuflen >= npixels);
> -+ if(sp->tbuflen < npixels) {
> -+ TIFFErrorExt(tif->tif_clientdata, module,
> -+ "Translation buffer too short");
> -+ return (0);
> -+ }
> - tp = (uint32 *) sp->tbuf;
> - }
> - /* copy to array of uint32 */
> - bp = (unsigned char*) tif->tif_rawcp;
> - cc = tif->tif_rawcc;
> -- for (i = 0; i < npixels && cc > 0; i++) {
> -+ for (i = 0; i < npixels && cc >= 3; i++) {
> - tp[i] = bp[0] << 16 | bp[1] << 8 | bp[2];
> - bp += 3;
> - cc -= 3;
> -@@ -325,7 +336,11 @@ LogLuvDecode32(TIFF* tif, uint8* op, tms
> - if (sp->user_datafmt == SGILOGDATAFMT_RAW)
> - tp = (uint32*) op;
> - else {
> -- assert(sp->tbuflen >= npixels);
> -+ if(sp->tbuflen < npixels) {
> -+ TIFFErrorExt(tif->tif_clientdata, module,
> -+ "Translation buffer too short");
> -+ return (0);
> -+ }
> - tp = (uint32*) sp->tbuf;
> - }
> - _TIFFmemset((void*) tp, 0, npixels*sizeof (tp[0]));
> -@@ -334,11 +349,13 @@ LogLuvDecode32(TIFF* tif, uint8* op, tms
> - cc = tif->tif_rawcc;
> - /* get each byte string */
> - for (shft = 4*8; (shft -= 8) >= 0; ) {
> -- for (i = 0; i < npixels && cc > 0; )
> -+ for (i = 0; i < npixels && cc > 0; ) {
> - if (*bp >= 128) { /* run */
> -+ if( cc < 2 )
> -+ break;
> - rc = *bp++ + (2-128);
> - b = (uint32)*bp++ << shft;
> -- cc -= 2; /* TODO: potential input buffer overrun when decoding corrupt or truncated data */
> -+ cc -= 2;
> - while (rc-- && i < npixels)
> - tp[i++] |= b;
> - } else { /* non-run */
> -@@ -346,6 +363,7 @@ LogLuvDecode32(TIFF* tif, uint8* op, tms
> - while (--cc && rc-- && i < npixels)
> - tp[i++] |= (uint32)*bp++ << shft;
> - }
> -+ }
> - if (i != npixels) {
> - #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__))
> - TIFFErrorExt(tif->tif_clientdata, module,
> -@@ -413,6 +431,7 @@ LogLuvDecodeTile(TIFF* tif, uint8* bp, t
> - static int
> - LogL16Encode(TIFF* tif, uint8* bp, tmsize_t cc, uint16 s)
> - {
> -+ static const char module[] = "LogL16Encode";
> - LogLuvState* sp = EncoderState(tif);
> - int shft;
> - tmsize_t i;
> -@@ -433,7 +452,11 @@ LogL16Encode(TIFF* tif, uint8* bp, tmsiz
> - tp = (int16*) bp;
> - else {
> - tp = (int16*) sp->tbuf;
> -- assert(sp->tbuflen >= npixels);
> -+ if(sp->tbuflen < npixels) {
> -+ TIFFErrorExt(tif->tif_clientdata, module,
> -+ "Translation buffer too short");
> -+ return (0);
> -+ }
> - (*sp->tfunc)(sp, bp, npixels);
> - }
> - /* compress each byte string */
> -@@ -506,6 +529,7 @@ LogL16Encode(TIFF* tif, uint8* bp, tmsiz
> - static int
> - LogLuvEncode24(TIFF* tif, uint8* bp, tmsize_t cc, uint16 s)
> - {
> -+ static const char module[] = "LogLuvEncode24";
> - LogLuvState* sp = EncoderState(tif);
> - tmsize_t i;
> - tmsize_t npixels;
> -@@ -521,7 +545,11 @@ LogLuvEncode24(TIFF* tif, uint8* bp, tms
> - tp = (uint32*) bp;
> - else {
> - tp = (uint32*) sp->tbuf;
> -- assert(sp->tbuflen >= npixels);
> -+ if(sp->tbuflen < npixels) {
> -+ TIFFErrorExt(tif->tif_clientdata, module,
> -+ "Translation buffer too short");
> -+ return (0);
> -+ }
> - (*sp->tfunc)(sp, bp, npixels);
> - }
> - /* write out encoded pixels */
> -@@ -553,6 +581,7 @@ LogLuvEncode24(TIFF* tif, uint8* bp, tms
> - static int
> - LogLuvEncode32(TIFF* tif, uint8* bp, tmsize_t cc, uint16 s)
> - {
> -+ static const char module[] = "LogLuvEncode32";
> - LogLuvState* sp = EncoderState(tif);
> - int shft;
> - tmsize_t i;
> -@@ -574,7 +603,11 @@ LogLuvEncode32(TIFF* tif, uint8* bp, tms
> - tp = (uint32*) bp;
> - else {
> - tp = (uint32*) sp->tbuf;
> -- assert(sp->tbuflen >= npixels);
> -+ if(sp->tbuflen < npixels) {
> -+ TIFFErrorExt(tif->tif_clientdata, module,
> -+ "Translation buffer too short");
> -+ return (0);
> -+ }
> - (*sp->tfunc)(sp, bp, npixels);
> - }
> - /* compress each byte string */
> diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2015-8784.patch b/meta/recipes-multimedia/libtiff/files/CVE-2015-8784.patch
> deleted file mode 100644
> index 0caf800..0000000
> --- a/meta/recipes-multimedia/libtiff/files/CVE-2015-8784.patch
> +++ /dev/null
> @@ -1,73 +0,0 @@
> -From b18012dae552f85dcc5c57d3bf4e997a15b1cc1c Mon Sep 17 00:00:00 2001
> -From: erouault <erouault>
> -Date: Sun, 27 Dec 2015 16:55:20 +0000
> -Subject: [PATCH] * libtiff/tif_next.c: fix potential out-of-bound write in
> - NeXTDecode() triggered by http://lcamtuf.coredump.cx/afl/vulns/libtiff5.tif
> - (bugzilla #2508)
> -
> -Upstream-Status: Backport
> -https://github.com/vadz/libtiff/commit/b18012dae552f85dcc5c57d3bf4e997a15b1cc1c
> -hand applied Changelog changes
> -
> -CVE: CVE-2015-8784
> -Signed-off-by: Armin Kuster <akuster@mvista.com>
> -
> ----
> - ChangeLog | 6 ++++++
> - libtiff/tif_next.c | 10 ++++++++--
> - 2 files changed, 14 insertions(+), 2 deletions(-)
> -
> -Index: tiff-4.0.4/ChangeLog
> -===================================================================
> ---- tiff-4.0.4.orig/ChangeLog
> -+++ tiff-4.0.4/ChangeLog
> -@@ -1,5 +1,11 @@
> - 2015-12-27 Even Rouault <even.rouault at spatialys.com>
> -
> -+ * libtiff/tif_next.c: fix potential out-of-bound write in NeXTDecode()
> -+ triggered by http://lcamtuf.coredump.cx/afl/vulns/libtiff5.tif
> -+ (bugzilla #2508)
> -+
> -+2015-12-27 Even Rouault <even.rouault at spatialys.com>
> -+
> - * libtiff/tif_luv.c: fix potential out-of-bound writes in decode
> - functions in non debug builds by replacing assert()s by regular if
> - checks (bugzilla #2522).
> -Index: tiff-4.0.4/libtiff/tif_next.c
> -===================================================================
> ---- tiff-4.0.4.orig/libtiff/tif_next.c
> -+++ tiff-4.0.4/libtiff/tif_next.c
> -@@ -37,7 +37,7 @@
> - case 0: op[0] = (unsigned char) ((v) << 6); break; \
> - case 1: op[0] |= (v) << 4; break; \
> - case 2: op[0] |= (v) << 2; break; \
> -- case 3: *op++ |= (v); break; \
> -+ case 3: *op++ |= (v); op_offset++; break; \
> - } \
> - }
> -
> -@@ -106,6 +106,7 @@ NeXTDecode(TIFF* tif, uint8* buf, tmsize
> - uint32 imagewidth = tif->tif_dir.td_imagewidth;
> - if( isTiled(tif) )
> - imagewidth = tif->tif_dir.td_tilewidth;
> -+ tmsize_t op_offset = 0;
> -
> - /*
> - * The scanline is composed of a sequence of constant
> -@@ -122,10 +123,15 @@ NeXTDecode(TIFF* tif, uint8* buf, tmsize
> - * bounds, potentially resulting in a security
> - * issue.
> - */
> -- while (n-- > 0 && npixels < imagewidth)
> -+ while (n-- > 0 && npixels < imagewidth && op_offset < scanline)
> - SETPIXEL(op, grey);
> - if (npixels >= imagewidth)
> - break;
> -+ if (op_offset >= scanline ) {
> -+ TIFFErrorExt(tif->tif_clientdata, module, "Invalid data for scanline %ld",
> -+ (long) tif->tif_row);
> -+ return (0);
> -+ }
> - if (cc == 0)
> - goto bad;
> - n = *bp++, cc--;
> diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2016-3186.patch b/meta/recipes-multimedia/libtiff/files/CVE-2016-3186.patch
> deleted file mode 100644
> index 4a08aba..0000000
> --- a/meta/recipes-multimedia/libtiff/files/CVE-2016-3186.patch
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -Buffer overflow in the readextension function in gif2tiff.c
> -allows remote attackers to cause a denial of service via a crafted GIF file.
> -
> -External References:
> -https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-3186
> -https://bugzilla.redhat.com/show_bug.cgi?id=1319503
> -
> -CVE: CVE-2016-3186
> -Upstream-Status: Backport (RedHat)
> -https://bugzilla.redhat.com/attachment.cgi?id=1144235&action=diff
> -
> -Signed-off-by: Yi Zhao <yi.zhao@windirver.com>
> -
> ---- tiff-4.0.6/tools/gif2tiff.c 2016-04-06 15:43:01.586048341 +0200
> -+++ tiff-4.0.6/tools/gif2tiff.c 2016-04-06 15:48:05.523207710 +0200
> -@@ -349,7 +349,7 @@
> - int status = 1;
> -
> - (void) getc(infile);
> -- while ((count = getc(infile)) && count <= 255)
> -+ while ((count = getc(infile)) && count >= 0 && count <= 255)
> - if (fread(buf, 1, count, infile) != (size_t) count) {
> - fprintf(stderr, "short read from file %s (%s)\n",
> - filename, strerror(errno));
> diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2016-3622.patch b/meta/recipes-multimedia/libtiff/files/CVE-2016-3622.patch
> deleted file mode 100644
> index 0c8b716..0000000
> --- a/meta/recipes-multimedia/libtiff/files/CVE-2016-3622.patch
> +++ /dev/null
> @@ -1,129 +0,0 @@
> -From 92d966a5fcfbdca67957c8c5c47b467aa650b286 Mon Sep 17 00:00:00 2001
> -From: bfriesen <bfriesen>
> -Date: Sat, 24 Sep 2016 23:11:55 +0000
> -Subject: [PATCH] * libtiff/tif_getimage.c (TIFFRGBAImageOK): Reject attempts
> - to read floating point images.
> -
> -* libtiff/tif_predict.c (PredictorSetup): Enforce bits-per-sample
> -requirements of floating point predictor (3). Fixes CVE-2016-3622
> -"Divide By Zero in the tiff2rgba tool."
> -
> -CVE: CVE-2016-3622
> -Upstream-Status: Backport
> -https://github.com/vadz/libtiff/commit/92d966a5fcfbdca67957c8c5c47b467aa650b286
> -
> -Signed-off-by: Yi Zhao <yi.zhao@windirver.com>
> ----
> - ChangeLog | 11 ++++++++++-
> - libtiff/tif_getimage.c | 38 ++++++++++++++++++++------------------
> - libtiff/tif_predict.c | 11 ++++++++++-
> - 3 files changed, 40 insertions(+), 20 deletions(-)
> -
> -diff --git a/ChangeLog b/ChangeLog
> -index 26d6f47..a628277 100644
> ---- a/ChangeLog
> -+++ b/ChangeLog
> -@@ -1,3 +1,12 @@
> -+2016-09-24 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
> -+
> -+ * libtiff/tif_getimage.c (TIFFRGBAImageOK): Reject attempts to
> -+ read floating point images.
> -+
> -+ * libtiff/tif_predict.c (PredictorSetup): Enforce bits-per-sample
> -+ requirements of floating point predictor (3). Fixes CVE-2016-3622
> -+ "Divide By Zero in the tiff2rgba tool."
> -+
> - 2016-08-15 Even Rouault <even.rouault at spatialys.com>
> -
> - * tools/rgb2ycbcr.c: validate values of -v and -h parameters to
> -diff --git a/libtiff/tif_getimage.c b/libtiff/tif_getimage.c
> -index 386cee0..3e689ee 100644
> ---- a/libtiff/tif_getimage.c
> -+++ b/libtiff/tif_getimage.c
> -@@ -95,6 +95,10 @@ TIFFRGBAImageOK(TIFF* tif, char emsg[1024])
> - td->td_bitspersample);
> - return (0);
> - }
> -+ if (td->td_sampleformat == SAMPLEFORMAT_IEEEFP) {
> -+ sprintf(emsg, "Sorry, can not handle images with IEEE floating-point samples");
> -+ return (0);
> -+ }
> - colorchannels = td->td_samplesperpixel - td->td_extrasamples;
> - if (!TIFFGetField(tif, TIFFTAG_PHOTOMETRIC, &photometric)) {
> - switch (colorchannels) {
> -@@ -182,27 +186,25 @@ TIFFRGBAImageOK(TIFF* tif, char emsg[1024])
> - "Planarconfiguration", td->td_planarconfig);
> - return (0);
> - }
> -- if( td->td_samplesperpixel != 3 || colorchannels != 3 )
> -- {
> -- sprintf(emsg,
> -- "Sorry, can not handle image with %s=%d, %s=%d",
> -- "Samples/pixel", td->td_samplesperpixel,
> -- "colorchannels", colorchannels);
> -- return 0;
> -- }
> -+ if ( td->td_samplesperpixel != 3 || colorchannels != 3 ) {
> -+ sprintf(emsg,
> -+ "Sorry, can not handle image with %s=%d, %s=%d",
> -+ "Samples/pixel", td->td_samplesperpixel,
> -+ "colorchannels", colorchannels);
> -+ return 0;
> -+ }
> - break;
> - case PHOTOMETRIC_CIELAB:
> -- if( td->td_samplesperpixel != 3 || colorchannels != 3 || td->td_bitspersample != 8 )
> -- {
> -- sprintf(emsg,
> -- "Sorry, can not handle image with %s=%d, %s=%d and %s=%d",
> -- "Samples/pixel", td->td_samplesperpixel,
> -- "colorchannels", colorchannels,
> -- "Bits/sample", td->td_bitspersample);
> -- return 0;
> -- }
> -+ if ( td->td_samplesperpixel != 3 || colorchannels != 3 || td->td_bitspersample != 8 ) {
> -+ sprintf(emsg,
> -+ "Sorry, can not handle image with %s=%d, %s=%d and %s=%d",
> -+ "Samples/pixel", td->td_samplesperpixel,
> -+ "colorchannels", colorchannels,
> -+ "Bits/sample", td->td_bitspersample);
> -+ return 0;
> -+ }
> - break;
> -- default:
> -+ default:
> - sprintf(emsg, "Sorry, can not handle image with %s=%d",
> - photoTag, photometric);
> - return (0);
> -diff --git a/libtiff/tif_predict.c b/libtiff/tif_predict.c
> -index 081eb11..555f2f9 100644
> ---- a/libtiff/tif_predict.c
> -+++ b/libtiff/tif_predict.c
> -@@ -80,6 +80,15 @@ PredictorSetup(TIFF* tif)
> - td->td_sampleformat);
> - return 0;
> - }
> -+ if (td->td_bitspersample != 16
> -+ && td->td_bitspersample != 24
> -+ && td->td_bitspersample != 32
> -+ && td->td_bitspersample != 64) { /* Should 64 be allowed? */
> -+ TIFFErrorExt(tif->tif_clientdata, module,
> -+ "Floating point \"Predictor\" not supported with %d-bit samples",
> -+ td->td_bitspersample);
> -+ return 0;
> -+ }
> - break;
> - default:
> - TIFFErrorExt(tif->tif_clientdata, module,
> -@@ -174,7 +183,7 @@ PredictorSetupDecode(TIFF* tif)
> - }
> - /*
> - * Allocate buffer to keep the decoded bytes before
> -- * rearranging in the ight order
> -+ * rearranging in the right order
> - */
> - }
> -
> ---
> -2.7.4
> -
> diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2016-3623.patch b/meta/recipes-multimedia/libtiff/files/CVE-2016-3623.patch
> deleted file mode 100644
> index f554ac5..0000000
> --- a/meta/recipes-multimedia/libtiff/files/CVE-2016-3623.patch
> +++ /dev/null
> @@ -1,52 +0,0 @@
> -From bd024f07019f5d9fea236675607a69f74a66bc7b Mon Sep 17 00:00:00 2001
> -From: erouault <erouault>
> -Date: Mon, 15 Aug 2016 21:26:56 +0000
> -Subject: [PATCH] * tools/rgb2ycbcr.c: validate values of -v and -h parameters
> - to avoid potential divide by zero. Fixes CVE-2016-3623 (bugzilla #2569)
> -
> -CVE: CVE-2016-3623
> -Upstream-Status: Backport
> -https://github.com/vadz/libtiff/commit/bd024f07019f5d9fea236675607a69f74a66bc7b
> -
> -Signed-off-by: Yi Zhao <yi.zhao@windirver.com>
> ----
> - ChangeLog | 5 +++++
> - tools/rgb2ycbcr.c | 4 ++++
> - 2 files changed, 9 insertions(+)
> -
> -diff --git a/ChangeLog b/ChangeLog
> -index 5d60608..3e6642a 100644
> ---- a/ChangeLog
> -+++ b/ChangeLog
> -@@ -1,5 +1,10 @@
> - 2016-08-15 Even Rouault <even.rouault at spatialys.com>
> -
> -+ * tools/rgb2ycbcr.c: validate values of -v and -h parameters to
> -+ avoid potential divide by zero. Fixes CVE-2016-3623 (bugzilla #2569)
> -+
> -+2016-08-15 Even Rouault <even.rouault at spatialys.com>
> -+
> - * tools/tiffcrop.c: Fix out-of-bounds write in loadImage().
> - From patch libtiff-CVE-2016-3991.patch from
> - libtiff-4.0.3-25.el7_2.src.rpm by Nikola Forro (bugzilla #2543)
> -diff --git a/tools/rgb2ycbcr.c b/tools/rgb2ycbcr.c
> -index 3829d6b..51f4259 100644
> ---- a/tools/rgb2ycbcr.c
> -+++ b/tools/rgb2ycbcr.c
> -@@ -95,9 +95,13 @@ main(int argc, char* argv[])
> - break;
> - case 'h':
> - horizSubSampling = atoi(optarg);
> -+ if( horizSubSampling != 1 && horizSubSampling != 2 && horizSubSampling != 4 )
> -+ usage(-1);
> - break;
> - case 'v':
> - vertSubSampling = atoi(optarg);
> -+ if( vertSubSampling != 1 && vertSubSampling != 2 && vertSubSampling != 4 )
> -+ usage(-1);
> - break;
> - case 'r':
> - rowsperstrip = atoi(optarg);
> ---
> -2.7.4
> -
> diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2016-3945.patch b/meta/recipes-multimedia/libtiff/files/CVE-2016-3945.patch
> deleted file mode 100644
> index 4d965be..0000000
> --- a/meta/recipes-multimedia/libtiff/files/CVE-2016-3945.patch
> +++ /dev/null
> @@ -1,118 +0,0 @@
> -From 7c39352ccd9060d311d3dc9a1f1bc00133a160e6 Mon Sep 17 00:00:00 2001
> -From: erouault <erouault>
> -Date: Mon, 15 Aug 2016 20:06:40 +0000
> -Subject: [PATCH] * tools/tiff2rgba.c: Fix integer overflow in size of
> - allocated buffer, when -b mode is enabled, that could result in out-of-bounds
> - write. Based initially on patch tiff-CVE-2016-3945.patch from
> - libtiff-4.0.3-25.el7_2.src.rpm by Nikola Forro, with correction for invalid
> - tests that rejected valid files.
> -
> -CVE: CVE-2016-3945
> -Upstream-Status: Backport
> -https://github.com/vadz/libtiff/commit/7c39352ccd9060d311d3dc9a1f1bc00133a160e6
> -
> -Signed-off-by: Yi Zhao <yi.zhao@windirver.com>
> ----
> - ChangeLog | 8 ++++++++
> - tools/tiff2rgba.c | 34 ++++++++++++++++++++++++++++++----
> - 2 files changed, 38 insertions(+), 4 deletions(-)
> -
> -diff --git a/ChangeLog b/ChangeLog
> -index 62dc1b5..9c0ab29 100644
> ---- a/ChangeLog
> -+++ b/ChangeLog
> -@@ -1,3 +1,11 @@
> -+2016-08-15 Even Rouault <even.rouault at spatialys.com>
> -+
> -+ * tools/tiff2rgba.c: Fix integer overflow in size of allocated
> -+ buffer, when -b mode is enabled, that could result in out-of-bounds
> -+ write. Based initially on patch tiff-CVE-2016-3945.patch from
> -+ libtiff-4.0.3-25.el7_2.src.rpm by Nikola Forro, with correction for
> -+ invalid tests that rejected valid files.
> -+
> - 2016-07-11 Even Rouault <even.rouault at spatialys.com>
> -
> - * tools/tiffcrop.c: Avoid access outside of stack allocated array
> -diff --git a/tools/tiff2rgba.c b/tools/tiff2rgba.c
> -index b7a81eb..16e3dc4 100644
> ---- a/tools/tiff2rgba.c
> -+++ b/tools/tiff2rgba.c
> -@@ -147,6 +147,7 @@ cvt_by_tile( TIFF *in, TIFF *out )
> - uint32 row, col;
> - uint32 *wrk_line;
> - int ok = 1;
> -+ uint32 rastersize, wrk_linesize;
> -
> - TIFFGetField(in, TIFFTAG_IMAGEWIDTH, &width);
> - TIFFGetField(in, TIFFTAG_IMAGELENGTH, &height);
> -@@ -163,7 +164,13 @@ cvt_by_tile( TIFF *in, TIFF *out )
> - /*
> - * Allocate tile buffer
> - */
> -- raster = (uint32*)_TIFFmalloc(tile_width * tile_height * sizeof (uint32));
> -+ rastersize = tile_width * tile_height * sizeof (uint32);
> -+ if (tile_width != (rastersize / tile_height) / sizeof( uint32))
> -+ {
> -+ TIFFError(TIFFFileName(in), "Integer overflow when calculating raster buffer");
> -+ exit(-1);
> -+ }
> -+ raster = (uint32*)_TIFFmalloc(rastersize);
> - if (raster == 0) {
> - TIFFError(TIFFFileName(in), "No space for raster buffer");
> - return (0);
> -@@ -173,7 +180,13 @@ cvt_by_tile( TIFF *in, TIFF *out )
> - * Allocate a scanline buffer for swapping during the vertical
> - * mirroring pass.
> - */
> -- wrk_line = (uint32*)_TIFFmalloc(tile_width * sizeof (uint32));
> -+ wrk_linesize = tile_width * sizeof (uint32);
> -+ if (tile_width != wrk_linesize / sizeof (uint32))
> -+ {
> -+ TIFFError(TIFFFileName(in), "Integer overflow when calculating wrk_line buffer");
> -+ exit(-1);
> -+ }
> -+ wrk_line = (uint32*)_TIFFmalloc(wrk_linesize);
> - if (!wrk_line) {
> - TIFFError(TIFFFileName(in), "No space for raster scanline buffer");
> - ok = 0;
> -@@ -249,6 +262,7 @@ cvt_by_strip( TIFF *in, TIFF *out )
> - uint32 row;
> - uint32 *wrk_line;
> - int ok = 1;
> -+ uint32 rastersize, wrk_linesize;
> -
> - TIFFGetField(in, TIFFTAG_IMAGEWIDTH, &width);
> - TIFFGetField(in, TIFFTAG_IMAGELENGTH, &height);
> -@@ -263,7 +277,13 @@ cvt_by_strip( TIFF *in, TIFF *out )
> - /*
> - * Allocate strip buffer
> - */
> -- raster = (uint32*)_TIFFmalloc(width * rowsperstrip * sizeof (uint32));
> -+ rastersize = width * rowsperstrip * sizeof (uint32);
> -+ if (width != (rastersize / rowsperstrip) / sizeof( uint32))
> -+ {
> -+ TIFFError(TIFFFileName(in), "Integer overflow when calculating raster buffer");
> -+ exit(-1);
> -+ }
> -+ raster = (uint32*)_TIFFmalloc(rastersize);
> - if (raster == 0) {
> - TIFFError(TIFFFileName(in), "No space for raster buffer");
> - return (0);
> -@@ -273,7 +293,13 @@ cvt_by_strip( TIFF *in, TIFF *out )
> - * Allocate a scanline buffer for swapping during the vertical
> - * mirroring pass.
> - */
> -- wrk_line = (uint32*)_TIFFmalloc(width * sizeof (uint32));
> -+ wrk_linesize = width * sizeof (uint32);
> -+ if (width != wrk_linesize / sizeof (uint32))
> -+ {
> -+ TIFFError(TIFFFileName(in), "Integer overflow when calculating wrk_line buffer");
> -+ exit(-1);
> -+ }
> -+ wrk_line = (uint32*)_TIFFmalloc(wrk_linesize);
> - if (!wrk_line) {
> - TIFFError(TIFFFileName(in), "No space for raster scanline buffer");
> - ok = 0;
> ---
> -2.7.4
> -
> diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2016-3990.patch b/meta/recipes-multimedia/libtiff/files/CVE-2016-3990.patch
> deleted file mode 100644
> index 7bf52ee..0000000
> --- a/meta/recipes-multimedia/libtiff/files/CVE-2016-3990.patch
> +++ /dev/null
> @@ -1,66 +0,0 @@
> -From 6a4dbb07ccf92836bb4adac7be4575672d0ac5f1 Mon Sep 17 00:00:00 2001
> -From: erouault <erouault>
> -Date: Mon, 15 Aug 2016 20:49:48 +0000
> -Subject: [PATCH] * libtiff/tif_pixarlog.c: Fix write buffer overflow in
> - PixarLogEncode if more input samples are provided than expected by
> - PixarLogSetupEncode. Idea based on libtiff-CVE-2016-3990.patch from
> - libtiff-4.0.3-25.el7_2.src.rpm by Nikola Forro, but with different and
> - simpler check. (bugzilla #2544)
> -
> -invalid tests that rejected valid files. (bugzilla #2545)
> -
> -CVE: CVE-2016-3990
> -Upstream-Status: Backport
> -https://github.com/vadz/libtiff/commit/6a4dbb07ccf92836bb4adac7be4575672d0ac5f1
> -
> -Signed-off-by: Yi Zhao <yi.zhao@windirver.com>
> ----
> - ChangeLog | 10 +++++++++-
> - libtiff/tif_pixarlog.c | 7 +++++++
> - 2 files changed, 16 insertions(+), 1 deletion(-)
> -
> -diff --git a/ChangeLog b/ChangeLog
> -index 9c0ab29..db4ea18 100644
> ---- a/ChangeLog
> -+++ b/ChangeLog
> -@@ -1,10 +1,18 @@
> - 2016-08-15 Even Rouault <even.rouault at spatialys.com>
> -
> -+ * libtiff/tif_pixarlog.c: Fix write buffer overflow in PixarLogEncode
> -+ if more input samples are provided than expected by PixarLogSetupEncode.
> -+ Idea based on libtiff-CVE-2016-3990.patch from
> -+ libtiff-4.0.3-25.el7_2.src.rpm by Nikola Forro, but with different and
> -+ simpler check. (bugzilla #2544)
> -+
> -+2016-08-15 Even Rouault <even.rouault at spatialys.com>
> -+
> - * tools/tiff2rgba.c: Fix integer overflow in size of allocated
> - buffer, when -b mode is enabled, that could result in out-of-bounds
> - write. Based initially on patch tiff-CVE-2016-3945.patch from
> - libtiff-4.0.3-25.el7_2.src.rpm by Nikola Forro, with correction for
> -- invalid tests that rejected valid files.
> -+ invalid tests that rejected valid files. (bugzilla #2545)
> -
> - 2016-07-11 Even Rouault <even.rouault at spatialys.com>
> -
> -diff --git a/libtiff/tif_pixarlog.c b/libtiff/tif_pixarlog.c
> -index e78f788..28329d1 100644
> ---- a/libtiff/tif_pixarlog.c
> -+++ b/libtiff/tif_pixarlog.c
> -@@ -1141,6 +1141,13 @@ PixarLogEncode(TIFF* tif, uint8* bp, tmsize_t cc, uint16 s)
> - }
> -
> - llen = sp->stride * td->td_imagewidth;
> -+ /* Check against the number of elements (of size uint16) of sp->tbuf */
> -+ if( n > td->td_rowsperstrip * llen )
> -+ {
> -+ TIFFErrorExt(tif->tif_clientdata, module,
> -+ "Too many input bytes provided");
> -+ return 0;
> -+ }
> -
> - for (i = 0, up = sp->tbuf; i < n; i += llen, up += llen) {
> - switch (sp->user_datafmt) {
> ---
> -2.7.4
> -
> diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2016-3991.patch b/meta/recipes-multimedia/libtiff/files/CVE-2016-3991.patch
> deleted file mode 100644
> index 27dfd37..0000000
> --- a/meta/recipes-multimedia/libtiff/files/CVE-2016-3991.patch
> +++ /dev/null
> @@ -1,147 +0,0 @@
> -From e596d4e27c5afb7960dc360fdd3afd90ba0fb8ba Mon Sep 17 00:00:00 2001
> -From: erouault <erouault>
> -Date: Mon, 15 Aug 2016 21:05:40 +0000
> -Subject: [PATCH 2/2] * tools/tiffcrop.c: Fix out-of-bounds write in
> - loadImage(). From patch libtiff-CVE-2016-3991.patch from
> - libtiff-4.0.3-25.el7_2.src.rpm by Nikola Forro (bugzilla #2543)
> -
> -CVE: CVE-2016-3991
> -Upstream-Status: Backport
> -https://github.com/vadz/libtiff/commit/e596d4e27c5afb7960dc360fdd3afd90ba0fb8ba
> -
> -Signed-off-by: Yi Zhao <yi.zhao@windirver.com>
> ----
> - ChangeLog | 6 ++++++
> - tools/tiffcrop.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
> - 2 files changed, 62 insertions(+), 3 deletions(-)
> -
> -diff --git a/ChangeLog b/ChangeLog
> -index db4ea18..5d60608 100644
> ---- a/ChangeLog
> -+++ b/ChangeLog
> -@@ -1,5 +1,11 @@
> - 2016-08-15 Even Rouault <even.rouault at spatialys.com>
> -
> -+ * tools/tiffcrop.c: Fix out-of-bounds write in loadImage().
> -+ From patch libtiff-CVE-2016-3991.patch from
> -+ libtiff-4.0.3-25.el7_2.src.rpm by Nikola Forro (bugzilla #2543)
> -+
> -+2016-08-15 Even Rouault <even.rouault at spatialys.com>
> -+
> - * libtiff/tif_pixarlog.c: Fix write buffer overflow in PixarLogEncode
> - if more input samples are provided than expected by PixarLogSetupEncode.
> - Idea based on libtiff-CVE-2016-3990.patch from
> -diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c
> -index 27abc0b..ddba7b9 100644
> ---- a/tools/tiffcrop.c
> -+++ b/tools/tiffcrop.c
> -@@ -798,6 +798,11 @@ static int readContigTilesIntoBuffer (TIFF* in, uint8* buf,
> - }
> -
> - tile_buffsize = tilesize;
> -+ if (tilesize == 0 || tile_rowsize == 0)
> -+ {
> -+ TIFFError("readContigTilesIntoBuffer", "Tile size or tile rowsize is zero");
> -+ exit(-1);
> -+ }
> -
> - if (tilesize < (tsize_t)(tl * tile_rowsize))
> - {
> -@@ -807,7 +812,12 @@ static int readContigTilesIntoBuffer (TIFF* in, uint8* buf,
> - tilesize, tl * tile_rowsize);
> - #endif
> - tile_buffsize = tl * tile_rowsize;
> -- }
> -+ if (tl != (tile_buffsize / tile_rowsize))
> -+ {
> -+ TIFFError("readContigTilesIntoBuffer", "Integer overflow when calculating buffer size.");
> -+ exit(-1);
> -+ }
> -+ }
> -
> - tilebuf = _TIFFmalloc(tile_buffsize);
> - if (tilebuf == 0)
> -@@ -1210,6 +1220,12 @@ static int writeBufferToContigTiles (TIFF* out, uint8* buf, uint32 imagelength,
> - !TIFFGetField(out, TIFFTAG_BITSPERSAMPLE, &bps) )
> - return 1;
> -
> -+ if (tilesize == 0 || tile_rowsize == 0 || tl == 0 || tw == 0)
> -+ {
> -+ TIFFError("writeBufferToContigTiles", "Tile size, tile row size, tile width, or tile length is zero");
> -+ exit(-1);
> -+ }
> -+
> - tile_buffsize = tilesize;
> - if (tilesize < (tsize_t)(tl * tile_rowsize))
> - {
> -@@ -1219,6 +1235,11 @@ static int writeBufferToContigTiles (TIFF* out, uint8* buf, uint32 imagelength,
> - tilesize, tl * tile_rowsize);
> - #endif
> - tile_buffsize = tl * tile_rowsize;
> -+ if (tl != tile_buffsize / tile_rowsize)
> -+ {
> -+ TIFFError("writeBufferToContigTiles", "Integer overflow when calculating buffer size");
> -+ exit(-1);
> -+ }
> - }
> -
> - tilebuf = _TIFFmalloc(tile_buffsize);
> -@@ -5945,12 +5966,27 @@ loadImage(TIFF* in, struct image_data *image, struct dump_opts *dump, unsigned c
> - TIFFGetField(in, TIFFTAG_TILELENGTH, &tl);
> -
> - tile_rowsize = TIFFTileRowSize(in);
> -+ if (ntiles == 0 || tlsize == 0 || tile_rowsize == 0)
> -+ {
> -+ TIFFError("loadImage", "File appears to be tiled, but the number of tiles, tile size, or tile rowsize is zero.");
> -+ exit(-1);
> -+ }
> - buffsize = tlsize * ntiles;
> -+ if (tlsize != (buffsize / ntiles))
> -+ {
> -+ TIFFError("loadImage", "Integer overflow when calculating buffer size");
> -+ exit(-1);
> -+ }
> -
> --
> - if (buffsize < (uint32)(ntiles * tl * tile_rowsize))
> - {
> - buffsize = ntiles * tl * tile_rowsize;
> -+ if (ntiles != (buffsize / tl / tile_rowsize))
> -+ {
> -+ TIFFError("loadImage", "Integer overflow when calculating buffer size");
> -+ exit(-1);
> -+ }
> -+
> - #ifdef DEBUG2
> - TIFFError("loadImage",
> - "Tilesize %u is too small, using ntiles * tilelength * tilerowsize %lu",
> -@@ -5969,8 +6005,25 @@ loadImage(TIFF* in, struct image_data *image, struct dump_opts *dump, unsigned c
> - TIFFGetFieldDefaulted(in, TIFFTAG_ROWSPERSTRIP, &rowsperstrip);
> - stsize = TIFFStripSize(in);
> - nstrips = TIFFNumberOfStrips(in);
> -+ if (nstrips == 0 || stsize == 0)
> -+ {
> -+ TIFFError("loadImage", "File appears to be striped, but the number of stipes or stripe size is zero.");
> -+ exit(-1);
> -+ }
> -+
> - buffsize = stsize * nstrips;
> --
> -+ if (stsize != (buffsize / nstrips))
> -+ {
> -+ TIFFError("loadImage", "Integer overflow when calculating buffer size");
> -+ exit(-1);
> -+ }
> -+ uint32 buffsize_check;
> -+ buffsize_check = ((length * width * spp * bps) + 7);
> -+ if (length != ((buffsize_check - 7) / width / spp / bps))
> -+ {
> -+ TIFFError("loadImage", "Integer overflow detected.");
> -+ exit(-1);
> -+ }
> - if (buffsize < (uint32) (((length * width * spp * bps) + 7) / 8))
> - {
> - buffsize = ((length * width * spp * bps) + 7) / 8;
> ---
> -2.7.4
> -
> diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2016-5321.patch b/meta/recipes-multimedia/libtiff/files/CVE-2016-5321.patch
> deleted file mode 100644
> index 63c6650..0000000
> --- a/meta/recipes-multimedia/libtiff/files/CVE-2016-5321.patch
> +++ /dev/null
> @@ -1,49 +0,0 @@
> -From d9783e4a1476b6787a51c5ae9e9b3156527589f0 Mon Sep 17 00:00:00 2001
> -From: erouault <erouault>
> -Date: Mon, 11 Jul 2016 21:26:03 +0000
> -Subject: [PATCH 1/2] * tools/tiffcrop.c: Avoid access outside of stack
> - allocated array on a tiled separate TIFF with more than 8 samples per pixel.
> - Reported by Kaixiang Zhang of the Cloud Security Team, Qihoo 360
> - (CVE-2016-5321, bugzilla #2558)
> -
> -CVE: CVE-2016-5321
> -Upstream-Status: Backport
> -https://github.com/vadz/libtiff/commit/d9783e4a1476b6787a51c5ae9e9b3156527589f0
> -
> -Signed-off-by: Yi Zhao <yi.zhao@windirver.com>
> ----
> - ChangeLog | 7 +++++++
> - tools/tiffcrop.c | 2 +-
> - 2 files changed, 8 insertions(+), 1 deletion(-)
> -
> -diff --git a/ChangeLog b/ChangeLog
> -index e98d54d..4e0302f 100644
> ---- a/ChangeLog
> -+++ b/ChangeLog
> -@@ -1,3 +1,10 @@
> -+2016-07-11 Even Rouault <even.rouault at spatialys.com>
> -+
> -+ * tools/tiffcrop.c: Avoid access outside of stack allocated array
> -+ on a tiled separate TIFF with more than 8 samples per pixel.
> -+ Reported by Kaixiang Zhang of the Cloud Security Team, Qihoo 360
> -+ (CVE-2016-5321, bugzilla #2558)
> -+
> - 2015-12-27 Even Rouault <even.rouault at spatialys.com>
> -
> - * libtiff/tif_next.c: fix potential out-of-bound write in NeXTDecode()
> -diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c
> -index d959ae3..6fc8fc1 100644
> ---- a/tools/tiffcrop.c
> -+++ b/tools/tiffcrop.c
> -@@ -989,7 +989,7 @@ static int readSeparateTilesIntoBuffer (TIFF* in, uint8 *obuf,
> - nrow = (row + tl > imagelength) ? imagelength - row : tl;
> - for (col = 0; col < imagewidth; col += tw)
> - {
> -- for (s = 0; s < spp; s++)
> -+ for (s = 0; s < spp && s < MAX_SAMPLES; s++)
> - { /* Read each plane of a tile set into srcbuffs[s] */
> - tbytes = TIFFReadTile(in, srcbuffs[s], col, row, 0, s);
> - if (tbytes < 0 && !ignore)
> ---
> -2.7.4
> -
> diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2016-5323.patch b/meta/recipes-multimedia/libtiff/files/CVE-2016-5323.patch
> deleted file mode 100644
> index 41eab91..0000000
> --- a/meta/recipes-multimedia/libtiff/files/CVE-2016-5323.patch
> +++ /dev/null
> @@ -1,107 +0,0 @@
> -From 2f79856097f423eb33796a15fcf700d2ea41bf31 Mon Sep 17 00:00:00 2001
> -From: erouault <erouault>
> -Date: Mon, 11 Jul 2016 21:38:31 +0000
> -Subject: [PATCH 2/2] (CVE-2016-5321 / CVE-2016-5323 , bugzilla #2558 / #2559)
> -
> -CVE: CVE-2016-5323
> -Upstream-Status: Backport
> -https://github.com/vadz/libtiff/commit/2f79856097f423eb33796a15fcf700d2ea41bf31
> -
> -Signed-off-by: Yi Zhao <yi.zhao@windirver.com>
> ----
> - ChangeLog | 2 +-
> - tools/tiffcrop.c | 16 ++++++++--------
> - 2 files changed, 9 insertions(+), 9 deletions(-)
> -
> -diff --git a/ChangeLog b/ChangeLog
> -index 4e0302f..62dc1b5 100644
> ---- a/ChangeLog
> -+++ b/ChangeLog
> -@@ -3,7 +3,7 @@
> - * tools/tiffcrop.c: Avoid access outside of stack allocated array
> - on a tiled separate TIFF with more than 8 samples per pixel.
> - Reported by Kaixiang Zhang of the Cloud Security Team, Qihoo 360
> -- (CVE-2016-5321, bugzilla #2558)
> -+ (CVE-2016-5321 / CVE-2016-5323 , bugzilla #2558 / #2559)
> -
> - 2016-07-10 Even Rouault <even.rouault at spatialys.com>
> -
> -diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c
> -index 6fc8fc1..27abc0b 100644
> ---- a/tools/tiffcrop.c
> -+++ b/tools/tiffcrop.c
> -@@ -3738,7 +3738,7 @@ combineSeparateSamples8bits (uint8 *in[], uint8 *out, uint32 cols,
> -
> - matchbits = maskbits << (8 - src_bit - bps);
> - /* load up next sample from each plane */
> -- for (s = 0; s < spp; s++)
> -+ for (s = 0; (s < spp) && (s < MAX_SAMPLES); s++)
> - {
> - src = in[s] + src_offset + src_byte;
> - buff1 = ((*src) & matchbits) << (src_bit);
> -@@ -3837,7 +3837,7 @@ combineSeparateSamples16bits (uint8 *in[], uint8 *out, uint32 cols,
> - src_bit = bit_offset % 8;
> -
> - matchbits = maskbits << (16 - src_bit - bps);
> -- for (s = 0; s < spp; s++)
> -+ for (s = 0; (s < spp) && (s < MAX_SAMPLES); s++)
> - {
> - src = in[s] + src_offset + src_byte;
> - if (little_endian)
> -@@ -3947,7 +3947,7 @@ combineSeparateSamples24bits (uint8 *in[], uint8 *out, uint32 cols,
> - src_bit = bit_offset % 8;
> -
> - matchbits = maskbits << (32 - src_bit - bps);
> -- for (s = 0; s < spp; s++)
> -+ for (s = 0; (s < spp) && (s < MAX_SAMPLES); s++)
> - {
> - src = in[s] + src_offset + src_byte;
> - if (little_endian)
> -@@ -4073,7 +4073,7 @@ combineSeparateSamples32bits (uint8 *in[], uint8 *out, uint32 cols,
> - src_bit = bit_offset % 8;
> -
> - matchbits = maskbits << (64 - src_bit - bps);
> -- for (s = 0; s < spp; s++)
> -+ for (s = 0; (s < spp) && (s < MAX_SAMPLES); s++)
> - {
> - src = in[s] + src_offset + src_byte;
> - if (little_endian)
> -@@ -4263,7 +4263,7 @@ combineSeparateTileSamples8bits (uint8 *in[], uint8 *out, uint32 cols,
> -
> - matchbits = maskbits << (8 - src_bit - bps);
> - /* load up next sample from each plane */
> -- for (s = 0; s < spp; s++)
> -+ for (s = 0; (s < spp) && (s < MAX_SAMPLES); s++)
> - {
> - src = in[s] + src_offset + src_byte;
> - buff1 = ((*src) & matchbits) << (src_bit);
> -@@ -4362,7 +4362,7 @@ combineSeparateTileSamples16bits (uint8 *in[], uint8 *out, uint32 cols,
> - src_bit = bit_offset % 8;
> -
> - matchbits = maskbits << (16 - src_bit - bps);
> -- for (s = 0; s < spp; s++)
> -+ for (s = 0; (s < spp) && (s < MAX_SAMPLES); s++)
> - {
> - src = in[s] + src_offset + src_byte;
> - if (little_endian)
> -@@ -4471,7 +4471,7 @@ combineSeparateTileSamples24bits (uint8 *in[], uint8 *out, uint32 cols,
> - src_bit = bit_offset % 8;
> -
> - matchbits = maskbits << (32 - src_bit - bps);
> -- for (s = 0; s < spp; s++)
> -+ for (s = 0; (s < spp) && (s < MAX_SAMPLES); s++)
> - {
> - src = in[s] + src_offset + src_byte;
> - if (little_endian)
> -@@ -4597,7 +4597,7 @@ combineSeparateTileSamples32bits (uint8 *in[], uint8 *out, uint32 cols,
> - src_bit = bit_offset % 8;
> -
> - matchbits = maskbits << (64 - src_bit - bps);
> -- for (s = 0; s < spp; s++)
> -+ for (s = 0; (s < spp) && (s < MAX_SAMPLES); s++)
> - {
> - src = in[s] + src_offset + src_byte;
> - if (little_endian)
> ---
> -2.7.4
> -
> diff --git a/meta/recipes-multimedia/libtiff/tiff_4.0.6.bb b/meta/recipes-multimedia/libtiff/tiff_4.0.7.bb
> similarity index 74%
> rename from meta/recipes-multimedia/libtiff/tiff_4.0.6.bb
> rename to meta/recipes-multimedia/libtiff/tiff_4.0.7.bb
> index 796d86e..52fc553 100644
> --- a/meta/recipes-multimedia/libtiff/tiff_4.0.6.bb
> +++ b/meta/recipes-multimedia/libtiff/tiff_4.0.7.bb
> @@ -4,21 +4,10 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=34da3db46fab7501992f9615d7e158cf"
>
> SRC_URI = "http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz \
> file://libtool2.patch \
> - file://CVE-2015-8665_8683.patch \
> - file://CVE-2015-8781.patch \
> - file://CVE-2015-8784.patch \
> - file://CVE-2016-3186.patch \
> - file://CVE-2016-5321.patch \
> - file://CVE-2016-5323.patch \
> - file://CVE-2016-3945.patch \
> - file://CVE-2016-3990.patch \
> - file://CVE-2016-3991.patch \
> - file://CVE-2016-3623.patch \
> - file://CVE-2016-3622.patch \
> "
>
> -SRC_URI[md5sum] = "d1d2e940dea0b5ad435f21f03d96dd72"
> -SRC_URI[sha256sum] = "4d57a50907b510e3049a4bba0d7888930fdfc16ce49f1bf693e5b6247370d68c"
> +SRC_URI[md5sum] = "77ae928d2c6b7fb46a21c3a29325157b"
> +SRC_URI[sha256sum] = "9f43a2cfb9589e5cecaa66e16bf87f814c945f22df7ba600d63aac4632c4f019"
>
> # exclude betas
> UPSTREAM_CHECK_REGEX = "tiff-(?P<pver>\d+(\.\d+)+).tar"
^ permalink raw reply
* State of bitbake world 2016-11-22
From: Martin Jansa @ 2016-11-23 15:12 UTC (permalink / raw)
To: openembedded-core, openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 32587 bytes --]
= Number of issues - stats ==
{| class='wikitable'
!|Date !!colspan='3'|Failed tasks !!colspan='6'|Failed depencencies !!|Signatures !!colspan='12'|QA !!Comment
|-
|| ||qemuarm ||qemux86 ||qemux86_64 ||qemuarm||max||min ||qemux86||max||min ||all ||already-stripped ||libdir ||textrel ||build-deps ||file-rdeps ||version-going-backwards ||host-user-contaminated ||installed-vs-shipped ||unknown-configure-option ||symlink-to-sysroot ||invalid-pkgconfig ||pkgname ||
|-
||2016-11-22 ||7 ||8 ||7 ||15 ||7 ||7 ||17 ||8 ||8 ||0 ||0 ||0 ||0 ||0 ||0 ||0 ||0 ||0 ||0 ||0 ||0 ||0 ||
|}
http://www.openembedded.org/wiki/Bitbake_World_Status
== Failed tasks 2016-11-22 ==
INFO: jenkins-job.sh-1.8.12 Complete log available at http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.report.20161123_045755.log
=== common (6) ===
* meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_2.2.1.bb:do_compile
* meta-openembedded/meta-oe/recipes-connectivity/obexftp/obexftp_0.23.bb:do_compile
* meta-openembedded/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb:do_compile
* meta-openembedded/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb:do_configure
* meta-qt5/recipes-qt/qt5/qtenginio_git.bb:do_compile
* meta-qt5/recipes-qt/qt5/qtwayland_git.bb:do_compile
=== common-x86 (0) ===
=== qemuarm (1) ===
* openembedded-core/meta/recipes-sato/webkit/webkitgtk_2.14.1.bb:do_compile
=== qemux86 (2) ===
* meta-browser/recipes-browser/chromium/chromium_52.0.2743.76.bb:do_compile
* meta-qt5/recipes-qt/qt5/qtwebengine_git.bb:do_compile
=== qemux86_64 (1) ===
* openembedded-core/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb:do_compile
=== Number of failed tasks (22) ===
{| class=wikitable
|-
|| qemuarm || 7 || http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.world.qemuarm.20161122_192238.log/ || http://errors.yoctoproject.org/Errors/Build/24774/
|-
|| qemux86 || 8 || http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.world.qemux86.20161122_210950.log/ || http://errors.yoctoproject.org/Errors/Build/24775/
|-
|| qemux86_64 || 7 || http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.world.qemux86-64.20161122_225152.log/ || http://errors.yoctoproject.org/Errors/Build/24781/
|}
=== PNBLACKLISTs (117) ===
=== QA issues (0) ===
{| class=wikitable
!| Count ||Issue
|-
||0 ||already-stripped
|-
||0 ||build-deps
|-
||0 ||file-rdeps
|-
||0 ||host-user-contaminated
|-
||0 ||installed-vs-shipped
|-
||0 ||invalid-pkgconfig
|-
||0 ||libdir
|-
||0 ||pkgname
|-
||0 ||symlink-to-sysroot
|-
||0 ||textrel
|-
||0 ||unknown-configure-option
|-
||0 ||version-going-backwards
|}
=== Failed dependencies for qemuarm (15) ===
Complete log: http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.dependencies.qemuarm.20161122_214852.log/
Found differences:
Found errors:
* ERROR: 15 issues were found in these recipes: obex-data-server obexftp qtenginio qtwayland webkitgtk wireshark xfce4-vala
=== Recipes failing with maximal dependencies for qemuarm (7) ===
* obex-data-server -- http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.dependencies.qemuarm.20161122_214852.log//2_max/failed/obex-data-server.log
* obexftp -- http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.dependencies.qemuarm.20161122_214852.log//2_max/failed/obexftp.log
* qtenginio -- http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.dependencies.qemuarm.20161122_214852.log//2_max/failed/qtenginio.log
* qtwayland -- http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.dependencies.qemuarm.20161122_214852.log//2_max/failed/qtwayland.log
* webkitgtk -- http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.dependencies.qemuarm.20161122_214852.log//2_max/failed/webkitgtk.log
* wireshark -- http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.dependencies.qemuarm.20161122_214852.log//2_max/failed/wireshark.log
* xfce4-vala -- http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.dependencies.qemuarm.20161122_214852.log//2_max/failed/xfce4-vala.log
=== Recipes failing with minimal dependencies for qemuarm (7) ===
* obex-data-server -- http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.dependencies.qemuarm.20161122_214852.log//3_min/failed/obex-data-server.log
* obexftp -- http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.dependencies.qemuarm.20161122_214852.log//3_min/failed/obexftp.log
* qtenginio -- http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.dependencies.qemuarm.20161122_214852.log//3_min/failed/qtenginio.log
* qtwayland -- http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.dependencies.qemuarm.20161122_214852.log//3_min/failed/qtwayland.log
* webkitgtk -- http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.dependencies.qemuarm.20161122_214852.log//3_min/failed/webkitgtk.log
* wireshark -- http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.dependencies.qemuarm.20161122_214852.log//3_min/failed/wireshark.log
* xfce4-vala -- http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.dependencies.qemuarm.20161122_214852.log//3_min/failed/xfce4-vala.log
=== Failed dependencies for qemux86 (17) ===
Complete log: http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.dependencies.qemux86.20161123_003406.log/
Found differences:
Found errors:
* ERROR: 17 issues were found in these recipes: chromium obex-data-server obexftp qtenginio qtwayland qtwebengine wireshark xfce4-vala
=== Recipes failing with maximal dependencies for qemux86 (8) ===
* chromium -- http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.dependencies.qemux86.20161123_003406.log//2_max/failed/chromium.log
* obex-data-server -- http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.dependencies.qemux86.20161123_003406.log//2_max/failed/obex-data-server.log
* obexftp -- http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.dependencies.qemux86.20161123_003406.log//2_max/failed/obexftp.log
* qtenginio -- http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.dependencies.qemux86.20161123_003406.log//2_max/failed/qtenginio.log
* qtwayland -- http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.dependencies.qemux86.20161123_003406.log//2_max/failed/qtwayland.log
* qtwebengine -- http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.dependencies.qemux86.20161123_003406.log//2_max/failed/qtwebengine.log
* wireshark -- http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.dependencies.qemux86.20161123_003406.log//2_max/failed/wireshark.log
* xfce4-vala -- http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.dependencies.qemux86.20161123_003406.log//2_max/failed/xfce4-vala.log
=== Recipes failing with minimal dependencies for qemux86 (8) ===
* chromium -- http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.dependencies.qemux86.20161123_003406.log//3_min/failed/chromium.log
* obex-data-server -- http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.dependencies.qemux86.20161123_003406.log//3_min/failed/obex-data-server.log
* obexftp -- http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.dependencies.qemux86.20161123_003406.log//3_min/failed/obexftp.log
* qtenginio -- http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.dependencies.qemux86.20161123_003406.log//3_min/failed/qtenginio.log
* qtwayland -- http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.dependencies.qemux86.20161123_003406.log//3_min/failed/qtwayland.log
* qtwebengine -- http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.dependencies.qemux86.20161123_003406.log//3_min/failed/qtwebengine.log
* wireshark -- http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.dependencies.qemux86.20161123_003406.log//3_min/failed/wireshark.log
* xfce4-vala -- http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.dependencies.qemux86.20161123_003406.log//3_min/failed/xfce4-vala.log
=== Incorrect PACKAGE_ARCH or sstate signatures (0) ===
Complete log: http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.signatures.20161123_035024.log/
* ERROR: Nothing RPROVIDES 'python-subprocess-native' (but virtual:native:/home/jenkins/oe/world/shr-core/meta-openembedded/meta-python/recipes-devtools/python/python-pycparser_2.17.bb RDEPENDS on or otherwise requires it)
* ERROR: Required build target 'meta-world-pkgdata' has no buildable providers.
* ERROR: no sigdata files were generated for MACHINE qemux86copy in /home/jenkins/oe/world/shr-core/tmp-glibc/stamps
* ERROR: Nothing RPROVIDES 'python-subprocess-native' (but virtual:native:/home/jenkins/oe/world/shr-core/meta-openembedded/meta-python/recipes-devtools/python/python-pycparser_2.17.bb RDEPENDS on or otherwise requires it)
* ERROR: Required build target 'meta-world-pkgdata' has no buildable providers.
* ERROR: no sigdata files were generated for MACHINE qemux86 in /home/jenkins/oe/world/shr-core/tmp-glibc/stamps
* ERROR: Nothing RPROVIDES 'python-subprocess-native' (but virtual:native:/home/jenkins/oe/world/shr-core/meta-openembedded/meta-python/recipes-devtools/python/python-pycparser_2.17.bb RDEPENDS on or otherwise requires it)
* ERROR: Required build target 'meta-world-pkgdata' has no buildable providers.
* ERROR: no sigdata files were generated for MACHINE qemuarm in /home/jenkins/oe/world/shr-core/tmp-glibc/stamps
PNBLACKLISTs:
openembedded-core/:
meta-browser:
recipes-browser/chromium/cef3_280796.bb:PNBLACKLIST[cef3] ?= "BROKEN: fails to build with gcc-6"
meta-openembedded:
meta-efl/recipes-efl/e17/diskio_svn.bb:PNBLACKLIST[diskio] ?= "broken: switch to https://git.enlightenment.org/enlightenment/modules/diskio.git/ and fix 0.0.1+svnr82070-r0.0/E-MODULES-EXTRA/diskio/e-module-diskio.edc:58. invalid state name: 'off'. "default" state must always be first."
meta-efl/recipes-efl/e17/elbow_git.bb:PNBLACKLIST[elbow] ?= "Depends on blacklisted webkit-efl"
meta-efl/recipes-efl/e17/elmdentica_svn.bb:PNBLACKLIST[elmdentica] ?= "OLD and depends on broken azy"
meta-efl/recipes-efl/e17/emprint_svn.bb:PNBLACKLIST[emprint] ?= "if you want to use these modules with E18, then you need to update it to git recipe fetching newer sources from http://git.enlightenment.org/apps/emprint.git/"
meta-efl/recipes-efl/e17/news_svn.bb:PNBLACKLIST[news] ?= "if you want to use these modules with E18, then you need to update it to git recipe fetching newer sources from http://git.enlightenment.org/enlightenment/modules/news.git/"
meta-efl/recipes-efl/e17/rage_svn.bb:PNBLACKLIST[rage] ?= "if you want to use these modules with E18, then you need to update it to git recipe fetching newer sources from http://git.enlightenment.org/apps/rage.git/"
meta-efl/recipes-efl/e17/screenshot_svn.bb:PNBLACKLIST[screenshot] ?= "depends on blacklisted emprint"
meta-efl/recipes-efl/efl/azy_svn.bb:PNBLACKLIST[azy] ?= "OLD and doesn't build with gcc-5"
meta-efl/recipes-efl/efl/engrave_svn.bb:PNBLACKLIST[engrave] ?= "BROKEN: fails to build with latest oe-core"
meta-efl/recipes-efl/efl/entrance_svn.bb:PNBLACKLIST[entrance] ?= "broken: switch to https://git.enlightenment.org/misc/entrance.git and fix 0.0.4+svnr82070-r7/entrance/data/themes/old/default.edc:678. invalid state name: 'defaault'. "default" state must always be first."
meta-efl/recipes-efl/webkit/webkit-efl.inc:PNBLACKLIST[webkit-efl] ?= "Old and unmaintaned fork with many security issues"
meta-efl/recipes-navigation/mcnavi/mcnavi_0.3.4.bb:PNBLACKLIST[mcnavi] ?= "BROKEN: latest version 0.3.4 is 3 years old and now broken with more strict ejde_cc from efl-1.13"
meta-filesystems/recipes-utils/dmapi/dmapi_2.2.12.bb:PNBLACKLIST[dmapi] ?= "Depends on broken xfsprogs"
meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.4.bb:PNBLACKLIST[xfsdump] ?= "Depends on broken xfsprogs"
meta-filesystems/recipes-utils/xfsprogs/xfsprogs_3.2.3.bb:PNBLACKLIST[xfsprogs] ?= "BROKEN: Needs upgrade to 4.5.0 version to be compatible with Kernel uapi changes from 4.5"
meta-gnome/recipes-apps/epdfview/epdfview_0.1.8.bb:PNBLACKLIST[epdfview] ?= "BROKEN: images are not displayed anymore"
meta-gnome/recipes-apps/gnome-mplayer/gnome-mplayer_1.0.5.bb:PNBLACKLIST[gnome-mplayer] ?= "rdepends on blacklisted mplayer"
meta-gnome/recipes-extended/gtk-theme-torturer/gtk-theme-torturer_git.bb:PNBLACKLIST[gtk-theme-torturer] ?= "BROKEN: gmacros.h:182:53: error: size of array '_GStaticAssertCompileTimeAssertion_2' is negative"
meta-gnome/recipes-gnome/gcalctool/gcalctool_5.32.0.bb:PNBLACKLIST[gcalctool] ?= "broken at least since April 2013 http://permalink.gmane.org/gmane.comp.handhelds.openembedded/57920 and nobody complained, it's also replaced by gnome calculator"
meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb:PNBLACKLIST[gdm] ?= "Depends on broken gnome-panel"
meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb:PNBLACKLIST[gnome-control-center] ?= "Depends on broken gnome-menus"
meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb:PNBLACKLIST[gnome-keyring] ?= "This version conflicts with gcr from oe-core"
meta-gnome/recipes-gnome/gnome-menus/gnome-menus_2.30.5.bb:PNBLACKLIST[gnome-menus] ?= "BROKEN: fails to build because of python + conflicts with gnome-menu3"
meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb:PNBLACKLIST[gnome-panel3] ?= "CONFLICT: depends on libgweather3 which conflicts with libgweather"
meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb:PNBLACKLIST[gnome-panel3] ?= "Depends on broken gnome-menus"
meta-gnome/recipes-gnome/gnome-panel/gnome-panel_2.32.1.bb:PNBLACKLIST[gnome-panel] ?= "Depends on broken libgweather"
meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager_2.32.0.bb:PNBLACKLIST[gnome-power-manager] ?= "BROKEN: not compatible with current libnotify"
meta-gnome/recipes-gnome/gnome-session/gnome-session_2.32.1.bb:PNBLACKLIST[gnome-session] ?= "BROKEN: fails to build with gcc-6"
meta-gnome/recipes-gnome/gnome/gnome-terminal_2.30.2.bb:PNBLACKLIST[gnome-terminal] ?= "BROKEN: fails to build with gcc-6"
meta-gnome/recipes-gnome/gnome/libgnomecups_0.2.3.bb:PNBLACKLIST[libgnomecups] ?= "Depends on broken libgnomeui"
meta-gnome/recipes-gnome/gnome/libgnomeprint_2.18.8.bb:PNBLACKLIST[libgnomeprint] ?= "Depends on broken libgnomecups"
meta-gnome/recipes-gnome/gnumeric/gnumeric_1.12.0.bb:PNBLACKLIST[gnumeric] ?= "Depends on broken libgnomeprint"
meta-gnome/recipes-gnome/gweather/libgweather3_3.0.2.bb:PNBLACKLIST[libgweather3] ?= "CONFLICT: 876 files are conflicting with libgweather"
meta-gnome/recipes-gnome/gweather/libgweather_2.30.3.bb:PNBLACKLIST[libgweather] ?= "BROKEN: fails to build with gcc-6"
meta-gnome/recipes-gnome/nautilus/nautilus3_3.2.1.bb:PNBLACKLIST[nautilus3] ?= "BROKEN: fails to build, maybe missing dependency on gnome-desktop-utils.h provider"
meta-gnome/recipes-gnome/pimlico/tasks_0.19.bb:PNBLACKLIST[tasks] ?= "Fails to build with gcc-6"
meta-gnome/recipes-gnome/pimlico/tasks_git.bb:PNBLACKLIST[tasks] ?= "Fails to build with gcc-6"
meta-gnome/recipes-gnome/system-tools/system-tools-backends_2.10.2.bb:PNBLACKLIST[system-tools-backends] ?= "does not build with distroless qemuarm as reported in 'State of bitbake world' thread, nobody volunteered to fix them"
meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb:PNBLACKLIST[zenity] ?= "BROKEN: doesn't build with B!=S"
meta-gnome/recipes-support/goffice/goffice_0.10.1.bb:PNBLACKLIST[goffice] ?= "BROKEN: fails to build with gcc-6"
meta-gnome/recipes-support/tracker/tracker_0.14.2.bb:PNBLACKLIST[tracker] ?= "BROKEN: fails to build with new binutils-2.27"
meta-gpe/recipes-support/fbreader/fbreader_git.bb:PNBLACKLIST[fbreader] ?= "BROKEN: fails to build with gcc-6"
meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb:PNBLACKLIST[xbmc] ?= "/usr/include/c++/ctime:70:11: error: '::gmtime' has not been declared"
meta-multimedia/recipes-mkv/mkvtoolnix/mkvtoolnix_git.bb:PNBLACKLIST[mkvtoolnix] ?= "BROKEN: Failx to build with gcc-5"
meta-multimedia/recipes-multimedia/coriander/coriander_2.0.2.bb:PNBLACKLIST[coriander] ?= "BROKEN: fails to use SDL probably because libsdl-config was removed, error: unknown type name 'SDL_Overlay'"
meta-multimedia/recipes-multimedia/dleyna/renderer-service-upnp_0.3.0.bb:PNBLACKLIST[renderer-service-upnp] ?= "BROKEN: doesn't build with B!=S (trying to install rendererconsole.py from ${B} instead of ${S})"
meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg_0.10.13.bb:PNBLACKLIST[gst-ffmpeg] ?= "Not compatible with currently used ffmpeg 3"
meta-multimedia/recipes-multimedia/gstreamer/gst123_0.3.1.bb:PNBLACKLIST[gst123] ?= "gst123 is still "sometimes" using wrong sysroot"
meta-networking/recipes-daemons/dnrd/dnrd_2.20.3.bb:PNBLACKLIST[dnrd] ?= "BROKEN: dnrd-2.20.3-r0 do_package: QA Issue: dnrd: Files/directories were installed but not shipped in any package:"
meta-networking/recipes-kernel/netmap/netmap-modules_git.bb:PNBLACKLIST[netmap-modules] ?= "BROKEN: not compatible with default kernel version 4.8"
meta-networking/recipes-kernel/netmap/netmap_git.bb:PNBLACKLIST[netmap] ?= "BROKEN: Tries to build kernel module and fails, either it should be disabled or there should be dependency on kernel like in netmap-modules"
meta-networking/recipes-protocols/accel-ppp/accel-ppp_git.bb:PNBLACKLIST[accel-ppp] ?= "BROKEN: fails to build with new binutils-2.27"
meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.17.bb:PNBLACKLIST[lksctp-tools] ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', "BROKEN: fails to link against sctp_connectx symbol", '', d)}"
meta-networking/recipes-support/nis/ypbind-mt_2.2.bb:PNBLACKLIST[ypbind-mt] ?= "BROKEN: Depends on broken yp-tools"
meta-oe/recipes-connectivity/bluez/bluez-hcidump_2.5.bb:PNBLACKLIST[bluez-hcidump] ?= "${@bb.utils.contains('DISTRO_FEATURES', 'bluez5', 'bluez5 conflicts with bluez4 and bluez5 is selected in DISTRO_FEATURES', '', d)}"
meta-oe/recipes-connectivity/bluez/bluez4_4.101.bb:PNBLACKLIST[bluez4] ?= "${@bb.utils.contains('DISTRO_FEATURES', 'bluez5', 'bluez5 conflicts with bluez4 and bluez5 is selected in DISTRO_FEATURES', '', d)}"
meta-oe/recipes-connectivity/bluez/gst-plugin-bluetooth_4.101.bb:PNBLACKLIST[gst-plugin-bluetooth] ?= "${@bb.utils.contains('DISTRO_FEATURES', 'bluez5', 'bluez5 conflicts with bluez4 and bluez5 is selected in DISTRO_FEATURES', '', d)}"
meta-oe/recipes-connectivity/soft66/soft66_git.bb:PNBLACKLIST[soft66] ?= "BROKEN: depends on broken libftdi"
meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb:PNBLACKLIST[wvdial] ?= "Depends on broken wvstreams"
meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb:PNBLACKLIST[wvstreams] ?= "BROKEN: fails to build with gcc-6"
meta-oe/recipes-connectivity/zeroc-ice/zeroc-ice_3.5.1.bb:PNBLACKLIST[zeroc-ice] ?= "BROKEN: not compatible with default db version"
meta-oe/recipes-core/fakeroot/fakeroot_1.18.4.bb:PNBLACKLIST[fakeroot] ?= "BROKEN: QA Issue: -dev package contains non-symlink .so"
meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb:PNBLACKLIST[cloud9] ?= "Not comatible with current nodejs 0.12, but upstream is working on it for v3"
meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_1.0.0.bb:PNBLACKLIST[ltp-ddt] ?= "BROKEN: fails since last autotools.bbclass changes"
meta-oe/recipes-devtools/packagekit/packagekit_0.5.6.bb:PNBLACKLIST[packagekit] ?= "BROKEN: depends on old deprecated libopkg which is currently disabled and will be removed soon"
meta-oe/recipes-extended/subsurface/subsurface_git.bb:PNBLACKLIST[subsurface] ?= "Needs to be upgraded for compatibility with new libdivecomputer"
meta-oe/recipes-gnome/gtkextra/gtkextra_3.0.5.bb:PNBLACKLIST[gtkextra] ?= "BROKEN: Fails to build with gcc-5"
meta-oe/recipes-graphics/clutter/clutter-box2d_git.bb:PNBLACKLIST[clutter-box2d] ?= "BROKEN: doesn't build with B!=S"
meta-oe/recipes-graphics/fim/fim_0.4-rc1.bb:PNBLACKLIST[fim] ?= "BROKEN: doesn't build with B!=S (flex: can't open lex.lex)"
meta-oe/recipes-graphics/slim/slim_1.3.2.bb:PNBLACKLIST[slim] ?= "does not build with distroless qemuarm as reported in 'State of bitbake world' thread, nobody volunteered to fix them"
meta-oe/recipes-graphics/xorg-driver/xf86-input-mtev_git.bb:PNBLACKLIST[xf86-input-mtev] ?= "BROKEN: doesn't build with B!=S (Makefile without ${S} in sed call)"
meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.16.bb:PNBLACKLIST[xf86-video-geode] ?= "BROKEN, fails to build"
meta-oe/recipes-kernel/ktap/ktap-module_git.bb:PNBLACKLIST[ktap-module] ?= "Not compatible with 3.19 kernel"
meta-oe/recipes-kernel/ktap/ktap_git.bb:PNBLACKLIST[ktap] ?= "Depends on blacklisted kernel-module-ktapvm"
meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb:PNBLACKLIST[mplayer2] ?= "Not compatible with currently used ffmpeg 3"
meta-oe/recipes-navigation/foxtrotgps/foxtrotgps_1.1.1.bb:PNBLACKLIST[foxtrotgps] ?= "${@bb.utils.contains('DISTRO_FEATURES', 'bluez5', 'bluez5 conflicts with bluez4 and bluez5 is selected in DISTRO_FEATURES', '', d)}"
meta-oe/recipes-navigation/gdal/gdal_1.11.1.bb:PNBLACKLIST[gdal] ?= "BROKEN: fails to build with gcc-5"
meta-oe/recipes-navigation/gypsy/gypsy.inc:PNBLACKLIST[gypsy] ?= "${@bb.utils.contains('DISTRO_FEATURES', 'bluez5', 'bluez5 conflicts with bluez4 and bluez5 is selected in DISTRO_FEATURES', '', d)}"
meta-oe/recipes-navigation/navit/navit.inc:PNBLACKLIST[navit] ?= "${@bb.utils.contains('DISTRO_FEATURES', 'bluez5', 'bluez5 conflicts with bluez4 and bluez5 is selected in DISTRO_FEATURES', '', d)}"
meta-oe/recipes-sato/claws-mail/claws-mail_3.9.0.bb:PNBLACKLIST[claws-mail] ?= "depends on blacklisted libetpan"
meta-oe/recipes-sato/claws-mail/claws-plugin-gtkhtml2-viewer_0.31.bb:PNBLACKLIST[claws-plugin-gtkhtml2-viewer] ?= "depends on blacklisted claws-mail"
meta-oe/recipes-sato/claws-mail/claws-plugin-mailmbox_1.15.bb:PNBLACKLIST[claws-plugin-mailmbox] ?= "depends on blacklisted claws-mail"
meta-oe/recipes-sato/claws-mail/claws-plugin-rssyl_0.34.bb:PNBLACKLIST[claws-plugin-rssyl] ?= "depends on blacklisted claws-mail"
meta-oe/recipes-support/apcupsd/apcupsd_3.14.10.bb:PNBLACKLIST[apcupsd] ?= "BROKEN: doesn't build with B!=S"
meta-oe/recipes-support/emacs/emacs_23.4.bb:PNBLACKLIST[emacs] ?= "qemu: uncaught target signal 11 (Segmentation fault) - core dumped"
meta-oe/recipes-support/fftw/benchfft_3.1.bb:PNBLACKLIST[benchfft] ?= "does not build with distroless qemuarm as reported in 'State of bitbake world' thread, nobody volunteered to fix them"
meta-oe/recipes-support/iksemel/iksemel_1.4.bb:PNBLACKLIST[iksemel] ?= "Not compatible with gnutls version 3.4 currently in oe-core"
meta-oe/recipes-support/libdbi/libdbi-drivers_0.8.3-1.bb:PNBLACKLIST[libdbi-drivers] ?= "BROKEN: fails to build with gcc-5"
meta-oe/recipes-support/libetpan/libetpan_0.57.bb:PNBLACKLIST[libetpan] ?= "Not compatible with gnutls version 3.4 currently in oe-core"
meta-oe/recipes-support/open-vcdiff/open-vcdiff_0.8.4.bb:PNBLACKLIST[open-vcdiff] ?= "BROKEN: fails to build with gcc-6"
meta-oe/recipes-support/opencv/opencv-samples_2.4.bb:PNBLACKLIST[opencv-samples] ?= "Depends on blacklisted opencv"
meta-oe/recipes-support/opencv/opencv_2.4.bb:PNBLACKLIST[opencv] ?= "Not compatible with currently used ffmpeg 3"
meta-oe/recipes-support/openmotif/openmotif_2.3.3.bb:PNBLACKLIST[openmotif] ?= "BROKEN: doesn't build with B!=S"
meta-oe/recipes-support/opensync/libsyncml_0.5.4.bb:PNBLACKLIST[libsyncml] ?= "${@bb.utils.contains('DISTRO_FEATURES', 'bluez5', 'bluez5 conflicts with bluez4 and bluez5 is selected in DISTRO_FEATURES', '', d)}"
meta-oe/recipes-support/openwbem/openwbem_3.2.3.bb:PNBLACKLIST[openwbem] ?= "BROKEN: fails to build with gcc-6"
meta-oe/recipes-support/pidgin/pidgin-otr_4.0.0.bb:PNBLACKLIST[pidgin-otr] ?= "depends on blacklisted pidgin"
meta-oe/recipes-support/vala-terminal/vala-terminal_git.bb:PNBLACKLIST[vala-terminal] ?= "BROKEN: Doesn't work with B!=S, touch: cannot touch `src/.stamp': No such file or directory"
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_4.3.36.bb:PNBLACKLIST[vboxguestdrivers] ?= "BROKEN: not compatible with default kernel version 4.8"
meta-qt5:
meta-smartphone:
mns('DISTRO_FEATURES', 'bluez5', 'bluez5 conflicts with bluez4 and bluez5 is selected in DISTRO_FEATURES', '', d)}"
meta-shr/recipes-shr/3rdparty/ffalarms_git.bb:PNBLACKLIST[ffalarms] = "Doesn't build after vala upgrade from 0.24.0 to 0.26.1"
meta-shr/recipes-shr/3rdparty/gwaterpas_0.3.bb:PNBLACKLIST[gwaterpas] ?= "broken: depends on blacklisted fltk"
meta-shr/recipes-shr/3rdparty/iliwi_git.bb:PNBLACKLIST[iliwi] = "Doesn't build after vala upgrade from 0.24.0 to 0.26.1"
meta-shr/recipes-shr/3rdparty/intone_git.bb:PNBLACKLIST[intone] = "rdepends on blacklisted mplayer2"
meta-shr/recipes-shr/3rdparty/jefliks_git.bb:PNBLACKLIST[jefliks] ?= "depends on blacklisted iksemel"
meta-shr/recipes-shr/3rdparty/openmoko-gps_svn.bb:PNBLACKLIST[openmoko-gps] ?= "RDEPENDS on python-pygtk which was removed from oe-core"
meta-shr/recipes-shr/3rdparty/pisi_0.5.3.bb:PNBLACKLIST[pisi] ?= "RDEPENDS on python-pygtk which was removed from oe-core"
meta-shr/recipes-shr/3rdparty/podboy_svn.bb:PNBLACKLIST[podboy] ?= "${@bb.utils.contains('DISTRO_FEATURES', 'bluez5', 'bluez5 conflicts with bluez4 and bluez5 is selected in DISTRO_FEATURES', '', d)}"
meta-shr/recipes-shr/3rdparty/sensmon_git.bb:PNBLACKLIST[sensmon] = "Doesn't build after vala upgrade from 0.24.0 to 0.26.1"
meta-shr/recipes-shr/3rdparty/valacompass_git.bb:PNBLACKLIST[valacompass] = "Doesn't build after vala upgrade from 0.24.0 to 0.26.1"
meta-shr/recipes-shr/games/aceofpenguins_1.4.bb:PNBLACKLIST[aceofpenguins] ?= "BROKEN: fails to build with new binutils-2.27"
meta-shr/recipes-shr/shr/shr-installer_git.bb:PNBLACKLIST[shr-installer] ?= "Depends on blacklisted packagekit"
meta-webos-ports:
meta-luneos/recipes-luneos/luna-webappmanager/luna-webappmanager.bb:PNBLACKLIST[luna-webappmanager] ?= "BROKEN: needs to be adapted to new qt-5.7"
meta-luneui/recipes-luneui/luna-next/luna-next.bb:PNBLACKLIST[luna-next] ?= "BROKEN: needs to be adapted to new qtwayland-5.7"
PNBLACKLIST[android-system] = "depends on lxc from meta-virtualiazation which isn't included in my world builds"
PNBLACKLIST[bigbuckbunny-1080p] = "big and doesn't really need to be tested so much"
PNBLACKLIST[bigbuckbunny-480p] = "big and doesn't really need to be tested so much"
PNBLACKLIST[bigbuckbunny-720p] = "big and doesn't really need to be tested so much"
PNBLACKLIST[bigbuckbunny-720p] = "big and doesn't really need to be tested so much"
PNBLACKLIST[tearsofsteel-1080p] = "big and doesn't really need to be tested so much"
PNBLACKLIST[build-appliance-image] = "tries to include whole downloads directory in /home/builder/poky :/"
PNBLACKLIST[linux-yocto-tiny-kexecboot] = "does weird sh!t breaking other kernels and modules - broken for years"
PNBLACKLIST[linux-yocto-tiny] = "does weird sh!t breaking other kernels and modules - broken for years"
QA issues by type:
count: 0 issue: already-stripped
count: 0 issue: libdir
count: 0 issue: textrel
count: 0 issue: build-deps
count: 0 issue: file-rdeps
count: 0 issue: version-going-backwards
count: 0 issue: host-user-contaminated
count: 0 issue: installed-vs-shipped
count: 0 issue: unknown-configure-option
count: 0 issue: symlink-to-sysroot
count: 0 issue: invalid-pkgconfig
count: 0 issue: pkgname
== Tested changes (not included in master yet) - bitbake ==
latest upstream commit:
91c3b34 lib/bb/cooker.py: fix for BBFILE_PATTERN = ""
not included in master yet:
4f95c8d world-image: add extra target
== Tested changes (not included in master yet) - openembedded-core ==
latest upstream commit:
a675b2c sanity.bbclass: fix logging of an error
not included in ma download URL
84100ea edac-utils: fix systemd service
f9ddaa5 python-cassandra-driver: add recipe for version 3.7.1
1ffc684 python-spidev: add recipe for version 3.2
66776d5 augeas: fix QA warning
edcd9f8 fwknop: Initial add 2.6.9
155cf80 libplist: Remove rpaths surgically
27eb69c python-pyserial: remove serialjava.py
001be5f samba: Fix build with musl
e1b0fc1 lockdev: Pretend GNU libc on musl
7ebe5a9 gnuplot: upgrade to 5.0.5
67fc350 pyyaml: Enable nativesdk bake
7c949f8 iozone3: 434 -> 465
ff31cba libhugetlbfs: 1.19 -> 1.20
77e3b4a phoronix-test-suite: 6.0.1 -> 6.6.1
a0153d7 asio: DEPENDS on openssl
970460a asio: fix a musl compilation warning
600acf9 apache2: include .load files in modules.d
92d1d26 openjpeg: rename the download file
38da3c9 python-humanize, python3-humanize: Add recipe for version 0.5.1
a380b48 ifenslave: make option '-h' work
f2c73eb opencv: fix QA issue
1961f08 libeigen: set tarball name as ${BP}.tar.bz2
2761ac3 libowfat: add v0.31
cf6410b lvm2: 2.02.138 -> 2.02.166
dbaad94 opencv: checking existence of /usr/lib
7a943a5 gtkmm: add x11 to REQUIRED_DISTRO_FEATURES
b3c6c11 pavucontrol: add x11 to REQUIRED_DISTRO_FEATURES
b6df437 libunique: add x11 to REQUIRED_DISTRO_FEATURES
52f9235 dconf: add x11 to REQUIRED_DISTRO_FEATURES
5ea4fd3 evince: add x11 to REQUIRED_DISTRO_FEATURES
0fa89b7 gnome-disk-utility: add x11 to REQUIRED_DISTRO_FEATURES
9d80fa7 gtksourceview2: add x11 to REQUIRED_DISTRO_FEATURES
f933e39 libwnck: add x11 to REQUIRED_DISTRO_FEATURES
6f993b4 libxklavier: add x11 to REQUIRED_DISTRO_FEATURES
3536cbd packagegroup-xfce-base: add x11 to REQUIRED_DISTRO_FEATURES
62c5a23 xfce4-pulseaudio-plugin: add x11 to REQUIRED_DISTRO_FEATURES
3a62dbf thunar-plugin.bbclass: add x11 to REQUIRED_DISTRO_FEATURES
bad19d5 xfce-panel-plugin.bbclass: add x11 to REQUIRED_DISTRO_FEATURES
c896a90 xfce-app.bbclass: add x11 to REQUIRED_DISTRO_FEATURES
592d0ea exo: add x11 to REQUIRED_DISTRO_FEATURES
ad99e50 garcon: add x11 to REQUIRED_DISTRO_FEATURES
030de03 gtk-xfce-engine: add x11 to REQUIRED_DISTRO_FEATURES
778b2b0 libxfce4ui: add x11 to REQUIRED_DISTRO_FEATURES
2e315c6 thunar: add x11 to REQUIRED_DISTRO_FEATURES
41bc8ec thunar-volman: add x11 to REQUIRED_DISTRO_FEATURES
a0e3239 xfce4-appfinder: add x11 to REQUIRED_DISTRO_FEATURES
ba002fe xfce4-panel: add x11 to REQUIRED_DISTRO_FEATURES
30ee7f4 xfce4-power-manager: add x11 to REQUIRED_DISTRO_FEATURES
9005050 xfce4-session: add x11 to REQUIRED_DISTRO_FEATURES
12b302d xfce4-settings: add x11 to REQUIRED_DISTRO_FEATURES
e9c2a99 xfdesktop: add x11 to REQUIRED_DISTRO_FEATURES
f36e38d xfwm4: add x11 to REQUIRED_DISTRO_FEATURES
72270ae python-zopeinterface: update to version 4.3.2
5f0d3e7 python-yappi: update to version 0.98
86dd8a9 openobex: upgrade to 1.7.2
6a1383f rsnapshot: fix host path in rsnapshot.conf.default
3d4c986 python-vobject: update to version 0.9.3
8d3db26 python-urllib3: update to version 1.19
ee7e27f python-setuptools-scm: update to version 1.15.0
f2abbd0 opencv: remove DEFAULT_PREFERENCE = "-1" for 3.1
e881354 python-requests: update to version 2.12.0
bd49cd8 samba: Fix qa issue and update ctdb-tests
371f412 samba: correct sub-package name for multilib
1aaab25 curlpp: fix qa issue of do_configure
74e5171 mcelog: Add Kabylake client support
a7282c8 python-pyserial: update to version 3.2.1
e27050e python-pycparser: update to version 2.17
3991dff python-pytz: update to version 2016.7
7ecdb9c ncp: add v1.2.4
006b197 android-tools: fix do_install
09931a3 libdbus-c++: added recipe for it
4523b4 syslog-ng: don't use update-alternatives to manage init script
2cb2dec rsyslog: don't use update-alternatives to manage init script
80179c1 dnsmasq: read the conf files found in dnsmasq.d
d31796d dnsmasq: allow for dnsmasq instances to reuse default dnsmasq.conf
== Tested changes (not included in master yet) - meta-qt5 ==
latest upstream commit:
81fb771 Update Qt5's git repositories to match new locations
not included in master yet:
14d55dc Upgrade to Qt 5.8
== Tested changes (not included in master yet) - meta-browser ==
latest upstream commit:
1edcce7 chromium-wayland: skip when CHROMIUM_ENABLE_WAYLAND isn't enabled
not included in master yet:
== Tested changes (not included in master yet) - meta-webos-ports ==
latest upstream commit:
6d82a3f libqofono: use the recipe from meta-qt5
not included in master yet:
== Tested changes (not included in master yet) - meta-smartphone ==
latest upstream commit:
176f337 linux-hp-tenderloin: Update kernel
not included in master yet:
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 201 bytes --]
^ permalink raw reply
* [PATCH] mesa: make sure GLES3 headers are installed
From: Samuli Piippo @ 2016-11-23 14:36 UTC (permalink / raw)
To: openembedded-core
Since there is no libgles3-mesa package that would pull in the headers,
add dependency to libgles2-mesa-dev. Now there no need to manually add
GLES3 headers to image or toolchain.
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
---
meta/recipes-graphics/mesa/mesa.inc | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index e4880ff..525a2d5 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -79,6 +79,9 @@ EXCLUDE_FROM_WORLD = "1"
# Remove the mesa dependency on mesa-dev, as mesa is empty
RDEPENDS_${PN}-dev = ""
+# Add dependency so that GLES3 header don't need to be added manually
+RDEPENDS_libgles2-mesa-dev += "libgles3-mesa-dev"
+
PACKAGES =+ "libegl-mesa libegl-mesa-dev \
libosmesa libosmesa-dev \
libgl-mesa libgl-mesa-dev \
--
1.9.1
^ permalink raw reply related
* Re: migrating simple tarballs over to OE recipes?
From: Martin Jansa @ 2016-11-23 15:05 UTC (permalink / raw)
To: Ulf Magnusson; +Cc: OE Core mailing list
In-Reply-To: <CAFkk2KRQ+vv+X9paB+ZLCuFobAVpXyi7gaV7P5kwgX3hja9Rhg@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1714 bytes --]
On Wed, Nov 23, 2016 at 01:00:12PM +0100, Ulf Magnusson wrote:
> On Wed, Nov 23, 2016 at 12:34 PM, Robert P. J. Day
> <rpjday@crashcourse.ca> wrote:
> > On Wed, 23 Nov 2016, Burton, Ross wrote:
> >
> >>
> >> On 23 November 2016 at 10:42, Robert P. J. Day <rpjday@crashcourse.ca> wrote:
> >> colleague has a pile of tarballs that were used to customize an x86
> >> centos system, wants to move all that to OE with as little fuss as
> >> possible, i guess the simplest way is to just create recipes that have
> >> the same tarball in the files/ directory, and write a trivial
> >> do_install() task that untars it into the root fs, yes?
> >>
> >>
> >> Pretty much, yeah.
> >>
> >> If you've a large pile and they're all effectively the same then a
> >> little class can automate it even more.
> >
> > already going down that road, just wanted to make sure i hadn't
> > overlooked something obvious.
> >
> > rday
>
> bin_package.bbclass might be useful as well, especially if the files
> are already arranged like in the rootfs inside the tarballs.
If these files are overwriting files owned by some other packages, then
you will loose that customization when the package is upgraded by
package manager (unless those files are listed in CONFFILES). You need
to use RREPLACES at least.
> do_install() task that untars it into the root fs, yes?
? do_install installs them to $D not root fs which doesn't even exist yet.
You might also need to skip strip if there are also some binaries which are
already stripped, skip ldflash qa check if they don't have matching hash
type etc
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 201 bytes --]
^ permalink raw reply
* Re: [PATCH 1/1] nfs-utils: 1.3.3 -> 1.3.4
From: Burton, Ross @ 2016-11-23 15:01 UTC (permalink / raw)
To: Mariano Lopez; +Cc: OE-core
In-Reply-To: <672fdd07e6fc763ef96522fca4170240f515f1f6.1479804050.git.mariano.lopez@linux.intel.com>
[-- Attachment #1: Type: text/plain, Size: 1065 bytes --]
On 22 November 2016 at 08:46, <mariano.lopez@linux.intel.com> wrote:
> From: Mariano Lopez <mariano.lopez@linux.intel.com>
>
> Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com>
>
ERROR: nfs-utils-1.3.4-r0 do_patch: Command Error: 'quilt --quiltrc
/data/poky-master/tmp-glibc/sysroots/x86_64-linux/etc/quiltrc push' exited
with 0 Output:
Applying patch fix-protocol-minor-version-fall-back.patch
patching file utils/mount/stropts.c
Hunk #1 FAILED at 841.
1 out of 1 hunk FAILED -- rejects in file utils/mount/stropts.c
Patch fix-protocol-minor-version-fall-back.patch can be reverse-applied
ERROR: nfs-utils-1.3.4-r0 do_patch: Function failed: patch_do_patch
ERROR: Logfile of failure stored in:
/data/poky-master/tmp-glibc/work/corei7-64-poky-linux/nfs-utils/1.3.4-r0/temp/log.do_patch.18084
ERROR: Task
(/home/ross/Yocto/poky/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.4.bb:do_patch)
failed with exit code '1'
I really wish I knew why some people quilt silently handles this and for
others it throws an error.
Ross
[-- Attachment #2: Type: text/html, Size: 2028 bytes --]
^ permalink raw reply
* Re: Contents of non-rootfs partitions
From: Kristian Amlie @ 2016-11-23 14:20 UTC (permalink / raw)
To: ed.bartosh; +Cc: Eduard Bartosh, openembedded-core
In-Reply-To: <20161123134404.GC13863@linux.intel.com>
On 23/11/16 14:44, Ed Bartosh wrote:
> On Wed, Nov 23, 2016 at 02:08:28PM +0100, Kristian Amlie wrote:
>> On 23/11/16 13:08, Ed Bartosh wrote:
>>> I support the idea. Let's discuss the details of implementation and
>>> create a bug in bugzilla to track the development
>>
>> Do you want me to create the ticket? (it'll be my first, so apologies in
>> advance if I omit something important)
>>
> Yes, please create an issue in bugzilla and assign it to me. Don't
> worry. If you miss something other people will point to in in the
> comments :)
Done, I have added https://bugzilla.yoctoproject.org/show_bug.cgi?id=10712
--
Kristian
^ permalink raw reply
* Re: [PATCH 2/2] base-passwd: set root's default password to 'root'
From: Burton, Ross @ 2016-11-23 14:17 UTC (permalink / raw)
To: Patrick Ohly; +Cc: OE-core
In-Reply-To: <1479899811.31880.37.camel@intel.com>
[-- Attachment #1: Type: text/plain, Size: 480 bytes --]
On 23 November 2016 at 11:16, Patrick Ohly <patrick.ohly@intel.com> wrote:
> Wait a second, are you really suggesting that OE-core should have a
> default root password in its default configuration?
>
> That's very bad practice and I'm against doing it this way. Having a
> default password is one of the common vulnerabilities in actual devices
> on the market today. OE-core should make it hard to make that mistake,
> not actively introduce it.
>
Agreed.
Ross
[-- Attachment #2: Type: text/html, Size: 905 bytes --]
^ permalink raw reply
* Re: Contents of non-rootfs partitions
From: Ed Bartosh @ 2016-11-23 14:10 UTC (permalink / raw)
To: Maciej Borzęcki
Cc: Eduard Bartosh, Patches and discussions about the oe-core layer
In-Reply-To: <CAD4b0_JPQ9_9bBd0NnTcGn+JyvtsLU7GA-kt4sfW1rzfuPovgw@mail.gmail.com>
On Wed, Nov 23, 2016 at 02:51:20PM +0100, Maciej Borzęcki wrote:
> On Wed, Nov 23, 2016 at 2:22 PM, Ed Bartosh <ed.bartosh@linux.intel.com> wrote:
> > On Wed, Nov 23, 2016 at 02:08:28PM +0100, Kristian Amlie wrote:
> >> On 23/11/16 13:08, Ed Bartosh wrote:
> >> > On Tue, Nov 22, 2016 at 12:54:52PM +0100, Kristian Amlie wrote:
> >> >> On 22/11/16 12:10, Patrick Ohly wrote:
> >> >>>> ...
> >> >>>
> >> >>> All of these introduce some special mechanism. Let me propose something
> >> >>> that might integrate better with the existing tooling:
> >> >>>
> >> >>> The "rootfs" directory gets redefined as representing the entire virtual
> >> >>> file system. When creating a disk image, it gets split up into different
> >> >>> partitions based on the image configuration.
> >> >>>
> >> >>> For example, the /home or /data directories in the rootfs could hold the
> >> >>> content that in some image configurations goes into separate partitions.
> >> >>>
> >> >>> The advantage of this approach is that the tooling for staging content
> >> >>> for image creation does not need to be changed. The same staged content
> >> >>> then can be used to create different images, potentially even using
> >> >>> different partition layouts.
> >> >>
> >> >> That's a very good idea. I think it beats all of my suggestions!
> >> >>
> >> >>> To implement this approach with wic, wic needs to be taught how to
> >> >>> exclude directories from the main rootfs. Ideally, the mkfs.* tools
> >> >>> should also support that without having to make an intermediate copy of
> >> >>> the files for a certain partition, but initially wic could create
> >> >>> temporary directory trees.
> >> >>
> >> >> Yes, some work would be needed here, but ultimately it would be contained within wic and related tools, which is a good thing.
> >> >>
> >> >
> >> > I support the idea. Let's discuss the details of implementation and
> >> > create a bug in bugzilla to track the development
> >>
> >> Do you want me to create the ticket? (it'll be my first, so apologies in
> >> advance if I omit something important)
> >>
> >> > This can be done by extending existing rootfs plugin. It should be able
> >> > to do 2 things:
> >> >
> >> > - populate content of one rootfs directory to the partition. We can
> >> > extend syntax of --rootfs-dir parameter to specify optional directory path to use
> >> >
> >> > - exclude rootfs directories when populating partitions. I'd propose to
> >> > introduce --exclude-dirs wks parser option to handle this.
> >> >
> >> > Example of wks file with proposed new options:
> >> > part / --source rootfs --rootfs-dir=core-image-minimal --ondisk sda --fstype=ext4 --label root --align 1024 --exclude-dirs data --exclude-dirs home
> >> > part /data --source rootfs --rootfs-dir=core-image-minimal:/home --ondisk sda --fstype=ext4 --label data --align 1024
> >> > part /home --source rootfs --rootfs-dir=core-image-minimal:/data --ondisk sda --fstype=ext4 --label data --align 1024
> >> >
> >> > Does this make sense?
> >>
> >> Looks good. The only thing I would question is that, in the interest of
> >> reducing redundancy, maybe we should omit --exclude-dirs and have wic
> >> figure this out by combining all the entries, since "--exclude-dirs
> >> <dir>" and the corresponding "part <dir>" will almost always come in
> >> pairs. Possibly we could mark the "/" partition with one single
> >> --no-overlapping-dirs to force wic to make this consideration. Or do you
> >> think that's too magical?
> >>
> > Tt's quite implicit from my point of view. However, if people like it we
> > can implement it this way.
> >
> >> (I haven't checked how feasible this is in the code btw)
> >
> > I think it would be much easier to implement --exclude-dirs.
> >
> > BTW, it will also allow to exclude directories from any partition, not just from
> > root, e.g. to use --exclude dirs this way:
> > part /data --source rootfs --rootfs-dir=core-image-minimal:/home --ondisk sda --fstype=ext4 --label data --align 1024 --exclude-dirs cache --exclude-dirs tmp
>
> Just to be sure, --exclude-dirs means that the contents of the
> directory are skipped, not the directory itself?
>
Thanks for pointing out to this. I didn't think about it, but after you
pointed out to it I think it makes sense to keep the directory and only skip the
content.
Another way to do it is to skip directory and content and create mount points
mentioned in wks file when generating /etc/fstab. However, in this case
directory permissions and ownership will be lost.
--
Regards,
Ed
^ permalink raw reply
* Re: [PATCH] libpcap: Fix build when PACKAGECONFIG ipv6 is not enable
From: Otavio Salvador @ 2016-11-23 13:57 UTC (permalink / raw)
To: Christopher Larson; +Cc: Patches and discussions about the oe-core layer
In-Reply-To: <CABcZANmw1GUVVRiGJ-pv6PLgO247GR9Z9tPPaTerm9RKOkROYA@mail.gmail.com>
On Wed, Nov 23, 2016 at 11:41 AM, Christopher Larson
<clarson@kergoth.com> wrote:
>
> On Wed, Nov 23, 2016 at 3:00 AM, Otavio Salvador
> <otavio.salvador@ossystems.com.br> wrote:
>>
>> On Thu, Nov 17, 2016 at 2:24 PM, Christopher Larson <clarson@kergoth.com>
>> wrote:
>> >
>> > On Thu, Nov 17, 2016 at 9:21 AM, Fabio Berton
>> > <fabio.berton@ossystems.com.br> wrote:
>> >>
>> >> No, I created a patch, git format-patch and then edit generated files
>> >> with
>> >> Upstream-Status tag and added to recipe. Is this wrong?
>> >
>> >
>> > As I indicated in my first reply, it’s best to put the tag outside the
>> > generated patch (above it, or below the —-), as it isn’t part of the
>> > commit,
>> > only part of the patch file. It’s minor, and you don’t need to
>> > re-submit,
>> > but in general the tag is not part of the commit message. For example,
>> > if
>> > your patch was applied to a git repository with git-am, it’d be in the
>> > commit message, which should not be the case.
>>
>> To be honest, there a many files which does as Fabio did and I also
>> personally do as well. I don't like it outside of the commit log as it
>> looks out of context.
>>
>> If someone is getting the patch file, it is expected they will review
>> it and not blindly apply it on upstream repository.
>
>
> I don’t feel too strongly about it, if that’s the consensus, that’s fine, I
> just wanted to open up a dialogue on the subject. Thanks.
Me too; but if this need change we need:
- update the guidelines
- migrate current patches to use the new format
- ask Richard and other reviewers to start to enforce the new policy
In any case, I think this is not needed. The current way is good enough for me.
--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
^ permalink raw reply
* Re: Contents of non-rootfs partitions
From: Maciej Borzęcki @ 2016-11-23 13:51 UTC (permalink / raw)
To: Ed Bartosh
Cc: Eduard Bartosh, Patches and discussions about the oe-core layer
In-Reply-To: <20161123132229.GA13863@linux.intel.com>
On Wed, Nov 23, 2016 at 2:22 PM, Ed Bartosh <ed.bartosh@linux.intel.com> wrote:
> On Wed, Nov 23, 2016 at 02:08:28PM +0100, Kristian Amlie wrote:
>> On 23/11/16 13:08, Ed Bartosh wrote:
>> > On Tue, Nov 22, 2016 at 12:54:52PM +0100, Kristian Amlie wrote:
>> >> On 22/11/16 12:10, Patrick Ohly wrote:
>> >>>> ...
>> >>>
>> >>> All of these introduce some special mechanism. Let me propose something
>> >>> that might integrate better with the existing tooling:
>> >>>
>> >>> The "rootfs" directory gets redefined as representing the entire virtual
>> >>> file system. When creating a disk image, it gets split up into different
>> >>> partitions based on the image configuration.
>> >>>
>> >>> For example, the /home or /data directories in the rootfs could hold the
>> >>> content that in some image configurations goes into separate partitions.
>> >>>
>> >>> The advantage of this approach is that the tooling for staging content
>> >>> for image creation does not need to be changed. The same staged content
>> >>> then can be used to create different images, potentially even using
>> >>> different partition layouts.
>> >>
>> >> That's a very good idea. I think it beats all of my suggestions!
>> >>
>> >>> To implement this approach with wic, wic needs to be taught how to
>> >>> exclude directories from the main rootfs. Ideally, the mkfs.* tools
>> >>> should also support that without having to make an intermediate copy of
>> >>> the files for a certain partition, but initially wic could create
>> >>> temporary directory trees.
>> >>
>> >> Yes, some work would be needed here, but ultimately it would be contained within wic and related tools, which is a good thing.
>> >>
>> >
>> > I support the idea. Let's discuss the details of implementation and
>> > create a bug in bugzilla to track the development
>>
>> Do you want me to create the ticket? (it'll be my first, so apologies in
>> advance if I omit something important)
>>
>> > This can be done by extending existing rootfs plugin. It should be able
>> > to do 2 things:
>> >
>> > - populate content of one rootfs directory to the partition. We can
>> > extend syntax of --rootfs-dir parameter to specify optional directory path to use
>> >
>> > - exclude rootfs directories when populating partitions. I'd propose to
>> > introduce --exclude-dirs wks parser option to handle this.
>> >
>> > Example of wks file with proposed new options:
>> > part / --source rootfs --rootfs-dir=core-image-minimal --ondisk sda --fstype=ext4 --label root --align 1024 --exclude-dirs data --exclude-dirs home
>> > part /data --source rootfs --rootfs-dir=core-image-minimal:/home --ondisk sda --fstype=ext4 --label data --align 1024
>> > part /home --source rootfs --rootfs-dir=core-image-minimal:/data --ondisk sda --fstype=ext4 --label data --align 1024
>> >
>> > Does this make sense?
>>
>> Looks good. The only thing I would question is that, in the interest of
>> reducing redundancy, maybe we should omit --exclude-dirs and have wic
>> figure this out by combining all the entries, since "--exclude-dirs
>> <dir>" and the corresponding "part <dir>" will almost always come in
>> pairs. Possibly we could mark the "/" partition with one single
>> --no-overlapping-dirs to force wic to make this consideration. Or do you
>> think that's too magical?
>>
> Tt's quite implicit from my point of view. However, if people like it we
> can implement it this way.
>
>> (I haven't checked how feasible this is in the code btw)
>
> I think it would be much easier to implement --exclude-dirs.
>
> BTW, it will also allow to exclude directories from any partition, not just from
> root, e.g. to use --exclude dirs this way:
> part /data --source rootfs --rootfs-dir=core-image-minimal:/home --ondisk sda --fstype=ext4 --label data --align 1024 --exclude-dirs cache --exclude-dirs tmp
Just to be sure, --exclude-dirs means that the contents of the
directory are skipped, not the directory itself?
Given your example, /home/tmp, /home/cache will be included in /data,
but /home/{cache,tmp}/* not. Is this correct?
Regards,
--
Maciej Borzecki
RnDity
^ permalink raw reply
* [Patch 7/7] ghostscript: Use MIPS MACHINE_OVERRIDES for objarch.h
From: Zubair Lutfullah Kakakhel @ 2016-11-23 13:47 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <20161123134733.38276-1-Zubair.Kakakhel@imgtec.com>
MIPS MACHINE_OVERRIDES can be used to provide the same objarch.h
files for MIPS pre-R2 and R6 ISA versions.
Use them to reduce duplication in supporting MIPS R6 ISA
Signed-off-by: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
---
.../ghostscript/ghostscript/{mips64 => mipsarchn32eb}/objarch.h | 0
.../ghostscript/ghostscript/{mips64el => mipsarchn32el}/objarch.h | 0
.../ghostscript/ghostscript/{mips64n32 => mipsarchn64eb}/objarch.h | 0
.../ghostscript/ghostscript/{mips64eln32 => mipsarchn64el}/objarch.h | 0
.../ghostscript/ghostscript/{mips => mipsarcho32eb}/objarch.h | 0
.../ghostscript/ghostscript/{mipsel => mipsarcho32el}/objarch.h | 0
6 files changed, 0 insertions(+), 0 deletions(-)
rename meta/recipes-extended/ghostscript/ghostscript/{mips64 => mipsarchn32eb}/objarch.h (100%)
rename meta/recipes-extended/ghostscript/ghostscript/{mips64el => mipsarchn32el}/objarch.h (100%)
rename meta/recipes-extended/ghostscript/ghostscript/{mips64n32 => mipsarchn64eb}/objarch.h (100%)
rename meta/recipes-extended/ghostscript/ghostscript/{mips64eln32 => mipsarchn64el}/objarch.h (100%)
rename meta/recipes-extended/ghostscript/ghostscript/{mips => mipsarcho32eb}/objarch.h (100%)
rename meta/recipes-extended/ghostscript/ghostscript/{mipsel => mipsarcho32el}/objarch.h (100%)
diff --git a/meta/recipes-extended/ghostscript/ghostscript/mips64/objarch.h b/meta/recipes-extended/ghostscript/ghostscript/mipsarchn32eb/objarch.h
similarity index 100%
rename from meta/recipes-extended/ghostscript/ghostscript/mips64/objarch.h
rename to meta/recipes-extended/ghostscript/ghostscript/mipsarchn32eb/objarch.h
diff --git a/meta/recipes-extended/ghostscript/ghostscript/mips64el/objarch.h b/meta/recipes-extended/ghostscript/ghostscript/mipsarchn32el/objarch.h
similarity index 100%
rename from meta/recipes-extended/ghostscript/ghostscript/mips64el/objarch.h
rename to meta/recipes-extended/ghostscript/ghostscript/mipsarchn32el/objarch.h
diff --git a/meta/recipes-extended/ghostscript/ghostscript/mips64n32/objarch.h b/meta/recipes-extended/ghostscript/ghostscript/mipsarchn64eb/objarch.h
similarity index 100%
rename from meta/recipes-extended/ghostscript/ghostscript/mips64n32/objarch.h
rename to meta/recipes-extended/ghostscript/ghostscript/mipsarchn64eb/objarch.h
diff --git a/meta/recipes-extended/ghostscript/ghostscript/mips64eln32/objarch.h b/meta/recipes-extended/ghostscript/ghostscript/mipsarchn64el/objarch.h
similarity index 100%
rename from meta/recipes-extended/ghostscript/ghostscript/mips64eln32/objarch.h
rename to meta/recipes-extended/ghostscript/ghostscript/mipsarchn64el/objarch.h
diff --git a/meta/recipes-extended/ghostscript/ghostscript/mips/objarch.h b/meta/recipes-extended/ghostscript/ghostscript/mipsarcho32eb/objarch.h
similarity index 100%
rename from meta/recipes-extended/ghostscript/ghostscript/mips/objarch.h
rename to meta/recipes-extended/ghostscript/ghostscript/mipsarcho32eb/objarch.h
diff --git a/meta/recipes-extended/ghostscript/ghostscript/mipsel/objarch.h b/meta/recipes-extended/ghostscript/ghostscript/mipsarcho32el/objarch.h
similarity index 100%
rename from meta/recipes-extended/ghostscript/ghostscript/mipsel/objarch.h
rename to meta/recipes-extended/ghostscript/ghostscript/mipsarcho32el/objarch.h
--
2.10.2
^ permalink raw reply
* [Patch 6/7] perf: Add EXTRA_LDFLAGS for MIPS N32
From: Zubair Lutfullah Kakakhel @ 2016-11-23 13:47 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <20161123134733.38276-1-Zubair.Kakakhel@imgtec.com>
MIPS N32 requires EXTRA_LDFLAGS to link correctly.
Signed-off-by: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
---
meta/recipes-kernel/perf/perf.bb | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index 25ae83c..6cdaa68 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -80,6 +80,7 @@ EXTRA_OEMAKE = '\
AR="${AR}" \
LD="${LD}" \
EXTRA_CFLAGS="-ldw" \
+ EXTRA_LDFLAGS="${PERF_EXTRA_LDFLAGS}" \
perfexecdir=${libexecdir} \
NO_GTK2=1 ${TUI_DEFINES} NO_DWARF=1 ${LIBUNWIND_DEFINES} \
${SCRIPTING_DEFINES} ${LIBNUMA_DEFINES} \
@@ -98,6 +99,12 @@ EXTRA_OEMAKE += "\
'infodir=${@os.path.relpath(infodir, prefix)}' \
"
+PERF_EXTRA_LDFLAGS = ""
+
+# MIPS N32
+PERF_EXTRA_LDFLAGS_mipsarchn32eb = "-m elf32btsmipn32"
+PERF_EXTRA_LDFLAGS_mipsarchn32el = "-m elf32ltsmipn32"
+
do_compile() {
# Linux kernel build system is expected to do the right thing
unset CFLAGS
--
2.10.2
^ permalink raw reply related
* [Patch 4/7] python-numpy: Use MIPS MACHINE_OVERRIDES to reduce duplication
From: Zubair Lutfullah Kakakhel @ 2016-11-23 13:47 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <20161123134733.38276-1-Zubair.Kakakhel@imgtec.com>
The mipsarch* MACHINE_OVERRIDES can be used to pass the same
parameters to MIPS pre-R2 and R6 ISA variants.
Use them to reduce duplication in supporting MIPS R6 ISA.
Signed-off-by: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
---
.../{mips64n32 => mipsarchn32eb}/_numpyconfig.h | 0
.../files/{mips64 => mipsarchn32eb}/config.h | 0
.../files/mipsarchn32el/_numpyconfig.h | 31 +++++
.../python-numpy/files/mipsarchn32el/config.h | 138 +++++++++++++++++++++
.../files/{mips64 => mipsarchn64eb}/_numpyconfig.h | 0
.../files/{mips64n32 => mipsarchn64eb}/config.h | 0
.../files/mipsarchn64el/_numpyconfig.h | 32 +++++
.../python-numpy/files/mipsarchn64el/config.h | 138 +++++++++++++++++++++
.../files/{mips => mipsarcho32eb}/_numpyconfig.h | 0
.../files/{mips => mipsarcho32eb}/config.h | 0
.../files/{mipsel => mipsarcho32el}/config.h | 0
.../files/{mipsel => mipsarcho32el}/numpyconfig.h | 0
.../python-numpy/python-numpy_1.11.2.bb | 16 ++-
.../python-numpy/python3-numpy_1.11.2.bb | 16 ++-
14 files changed, 363 insertions(+), 8 deletions(-)
rename meta/recipes-devtools/python-numpy/files/{mips64n32 => mipsarchn32eb}/_numpyconfig.h (100%)
rename meta/recipes-devtools/python-numpy/files/{mips64 => mipsarchn32eb}/config.h (100%)
create mode 100644 meta/recipes-devtools/python-numpy/files/mipsarchn32el/_numpyconfig.h
create mode 100644 meta/recipes-devtools/python-numpy/files/mipsarchn32el/config.h
rename meta/recipes-devtools/python-numpy/files/{mips64 => mipsarchn64eb}/_numpyconfig.h (100%)
rename meta/recipes-devtools/python-numpy/files/{mips64n32 => mipsarchn64eb}/config.h (100%)
create mode 100644 meta/recipes-devtools/python-numpy/files/mipsarchn64el/_numpyconfig.h
create mode 100644 meta/recipes-devtools/python-numpy/files/mipsarchn64el/config.h
rename meta/recipes-devtools/python-numpy/files/{mips => mipsarcho32eb}/_numpyconfig.h (100%)
rename meta/recipes-devtools/python-numpy/files/{mips => mipsarcho32eb}/config.h (100%)
rename meta/recipes-devtools/python-numpy/files/{mipsel => mipsarcho32el}/config.h (100%)
rename meta/recipes-devtools/python-numpy/files/{mipsel => mipsarcho32el}/numpyconfig.h (100%)
diff --git a/meta/recipes-devtools/python-numpy/files/mips64n32/_numpyconfig.h b/meta/recipes-devtools/python-numpy/files/mipsarchn32eb/_numpyconfig.h
similarity index 100%
rename from meta/recipes-devtools/python-numpy/files/mips64n32/_numpyconfig.h
rename to meta/recipes-devtools/python-numpy/files/mipsarchn32eb/_numpyconfig.h
diff --git a/meta/recipes-devtools/python-numpy/files/mips64/config.h b/meta/recipes-devtools/python-numpy/files/mipsarchn32eb/config.h
similarity index 100%
rename from meta/recipes-devtools/python-numpy/files/mips64/config.h
rename to meta/recipes-devtools/python-numpy/files/mipsarchn32eb/config.h
diff --git a/meta/recipes-devtools/python-numpy/files/mipsarchn32el/_numpyconfig.h b/meta/recipes-devtools/python-numpy/files/mipsarchn32el/_numpyconfig.h
new file mode 100644
index 0000000..8e2b5d0
--- /dev/null
+++ b/meta/recipes-devtools/python-numpy/files/mipsarchn32el/_numpyconfig.h
@@ -0,0 +1,31 @@
+#define NPY_HAVE_ENDIAN_H 1
+#define NPY_SIZEOF_SHORT SIZEOF_SHORT
+#define NPY_SIZEOF_INT SIZEOF_INT
+#define NPY_SIZEOF_LONG SIZEOF_LONG
+#define NPY_SIZEOF_FLOAT 4
+#define NPY_SIZEOF_COMPLEX_FLOAT 8
+#define NPY_SIZEOF_DOUBLE 8
+#define NPY_SIZEOF_COMPLEX_DOUBLE 16
+#define NPY_SIZEOF_LONGDOUBLE 16
+#define NPY_SIZEOF_COMPLEX_LONGDOUBLE 32
+#define NPY_ENABLE_SEPARATE_COMPILATION 1
+#define NPY_SIZEOF_PY_INTPTR_T 8
+#define NPY_SIZEOF_PY_LONG_LONG 8
+#define NPY_SIZEOF_LONGLONG 8
+#define NPY_NO_SMP 0
+#define NPY_HAVE_DECL_ISNAN
+#define NPY_HAVE_DECL_ISINF
+#define NPY_HAVE_DECL_ISFINITE
+#define NPY_HAVE_DECL_SIGNBIT
+#define NPY_USE_C99_COMPLEX 1
+#define NPY_HAVE_COMPLEX_DOUBLE 1
+#define NPY_HAVE_COMPLEX_FLOAT 1
+#define NPY_HAVE_COMPLEX_LONG_DOUBLE 1
+#define NPY_USE_C99_FORMATS 1
+#define NPY_VISIBILITY_HIDDEN __attribute__((visibility("hidden")))
+#define NPY_ABI_VERSION 0x01000009
+#define NPY_API_VERSION 0x0000000A
+
+#ifndef __STDC_FORMAT_MACROS
+#define __STDC_FORMAT_MACROS 1
+#endif
diff --git a/meta/recipes-devtools/python-numpy/files/mipsarchn32el/config.h b/meta/recipes-devtools/python-numpy/files/mipsarchn32el/config.h
new file mode 100644
index 0000000..4872703
--- /dev/null
+++ b/meta/recipes-devtools/python-numpy/files/mipsarchn32el/config.h
@@ -0,0 +1,138 @@
+#define SIZEOF_PY_INTPTR_T 8
+#define SIZEOF_PY_LONG_LONG 8
+#define MATHLIB m
+#define HAVE_SIN 1
+#define HAVE_COS 1
+#define HAVE_TAN 1
+#define HAVE_SINH 1
+#define HAVE_COSH 1
+#define HAVE_TANH 1
+#define HAVE_FABS 1
+#define HAVE_FLOOR 1
+#define HAVE_CEIL 1
+#define HAVE_SQRT 1
+#define HAVE_LOG10 1
+#define HAVE_LOG 1
+#define HAVE_EXP 1
+#define HAVE_ASIN 1
+#define HAVE_ACOS 1
+#define HAVE_ATAN 1
+#define HAVE_FMOD 1
+#define HAVE_MODF 1
+#define HAVE_FREXP 1
+#define HAVE_LDEXP 1
+#define HAVE_RINT 1
+#define HAVE_TRUNC 1
+#define HAVE_EXP2 1
+#define HAVE_LOG2 1
+#define HAVE_ATAN2 1
+#define HAVE_POW 1
+#define HAVE_NEXTAFTER 1
+#define HAVE_SINF 1
+#define HAVE_COSF 1
+#define HAVE_TANF 1
+#define HAVE_SINHF 1
+#define HAVE_COSHF 1
+#define HAVE_TANHF 1
+#define HAVE_FABSF 1
+#define HAVE_FLOORF 1
+#define HAVE_CEILF 1
+#define HAVE_RINTF 1
+#define HAVE_TRUNCF 1
+#define HAVE_SQRTF 1
+#define HAVE_LOG10F 1
+#define HAVE_LOGF 1
+#define HAVE_LOG1PF 1
+#define HAVE_EXPF 1
+#define HAVE_EXPM1F 1
+#define HAVE_ASINF 1
+#define HAVE_ACOSF 1
+#define HAVE_ATANF 1
+#define HAVE_ASINHF 1
+#define HAVE_ACOSHF 1
+#define HAVE_ATANHF 1
+#define HAVE_HYPOTF 1
+#define HAVE_ATAN2F 1
+#define HAVE_POWF 1
+#define HAVE_FMODF 1
+#define HAVE_MODFF 1
+#define HAVE_FREXPF 1
+#define HAVE_LDEXPF 1
+#define HAVE_EXP2F 1
+#define HAVE_LOG2F 1
+#define HAVE_COPYSIGNF 1
+#define HAVE_NEXTAFTERF 1
+#define HAVE_SINL 1
+#define HAVE_COSL 1
+#define HAVE_TANL 1
+#define HAVE_SINHL 1
+#define HAVE_COSHL 1
+#define HAVE_TANHL 1
+#define HAVE_FABSL 1
+#define HAVE_FLOORL 1
+#define HAVE_CEILL 1
+#define HAVE_RINTL 1
+#define HAVE_TRUNCL 1
+#define HAVE_SQRTL 1
+#define HAVE_LOG10L 1
+#define HAVE_LOGL 1
+#define HAVE_LOG1PL 1
+#define HAVE_EXPL 1
+#define HAVE_EXPM1L 1
+#define HAVE_ASINL 1
+#define HAVE_ACOSL 1
+#define HAVE_ATANL 1
+#define HAVE_ASINHL 1
+#define HAVE_ACOSHL 1
+#define HAVE_ATANHL 1
+#define HAVE_HYPOTL 1
+#define HAVE_ATAN2L 1
+#define HAVE_POWL 1
+#define HAVE_FMODL 1
+#define HAVE_MODFL 1
+#define HAVE_FREXPL 1
+#define HAVE_LDEXPL 1
+#define HAVE_EXP2L 1
+#define HAVE_LOG2L 1
+#define HAVE_COPYSIGNL 1
+#define HAVE_NEXTAFTERL 1
+#define HAVE_DECL_SIGNBIT
+#define HAVE_COMPLEX_H 1
+#define HAVE_CREAL 1
+#define HAVE_CIMAG 1
+#define HAVE_CABS 1
+#define HAVE_CARG 1
+#define HAVE_CEXP 1
+#define HAVE_CSQRT 1
+#define HAVE_CLOG 1
+#define HAVE_CCOS 1
+#define HAVE_CSIN 1
+#define HAVE_CPOW 1
+#define HAVE_CREALF 1
+#define HAVE_CIMAGF 1
+#define HAVE_CABSF 1
+#define HAVE_CARGF 1
+#define HAVE_CEXPF 1
+#define HAVE_CSQRTF 1
+#define HAVE_CLOGF 1
+#define HAVE_CCOSF 1
+#define HAVE_CSINF 1
+#define HAVE_CPOWF 1
+#define HAVE_CREALL 1
+#define HAVE_CIMAGL 1
+#define HAVE_CABSL 1
+#define HAVE_CARGL 1
+#define HAVE_CEXPL 1
+#define HAVE_CSQRTL 1
+#define HAVE_CLOGL 1
+#define HAVE_CCOSL 1
+#define HAVE_CSINL 1
+#define HAVE_CPOWL 1
+#define HAVE_LDOUBLE_IEEE_QUAD_LE 1
+#ifndef __cplusplus
+/* #undef inline */
+#endif
+
+#ifndef _NPY_NPY_CONFIG_H_
+#error config.h should never be included directly, include npy_config.h instead
+#endif
diff --git a/meta/recipes-devtools/python-numpy/files/mips64/_numpyconfig.h b/meta/recipes-devtools/python-numpy/files/mipsarchn64eb/_numpyconfig.h
similarity index 100%
rename from meta/recipes-devtools/python-numpy/files/mips64/_numpyconfig.h
rename to meta/recipes-devtools/python-numpy/files/mipsarchn64eb/_numpyconfig.h
diff --git a/meta/recipes-devtools/python-numpy/files/mips64n32/config.h b/meta/recipes-devtools/python-numpy/files/mipsarchn64eb/config.h
similarity index 100%
rename from meta/recipes-devtools/python-numpy/files/mips64n32/config.h
rename to meta/recipes-devtools/python-numpy/files/mipsarchn64eb/config.h
diff --git a/meta/recipes-devtools/python-numpy/files/mipsarchn64el/_numpyconfig.h b/meta/recipes-devtools/python-numpy/files/mipsarchn64el/_numpyconfig.h
new file mode 100644
index 0000000..debb390
--- /dev/null
+++ b/meta/recipes-devtools/python-numpy/files/mipsarchn64el/_numpyconfig.h
@@ -0,0 +1,32 @@
+#define NPY_HAVE_ENDIAN_H 1
+#define NPY_SIZEOF_SHORT SIZEOF_SHORT
+#define NPY_SIZEOF_INT SIZEOF_INT
+#define NPY_SIZEOF_LONG SIZEOF_LONG
+#define NPY_SIZEOF_FLOAT 4
+#define NPY_SIZEOF_COMPLEX_FLOAT 8
+#define NPY_SIZEOF_DOUBLE 8
+#define NPY_SIZEOF_COMPLEX_DOUBLE 16
+#define NPY_SIZEOF_LONGDOUBLE 16
+#define NPY_SIZEOF_COMPLEX_LONGDOUBLE 32
+#define NPY_ENABLE_SEPARATE_COMPILATION 1
+#define NPY_SIZEOF_PY_INTPTR_T 8
+#define NPY_SIZEOF_PY_LONG_LONG 8
+#define NPY_SIZEOF_LONGLONG 8
+#define NPY_SIZEOF_OFF_T 8
+#define NPY_NO_SMP 0
+#define NPY_HAVE_DECL_ISNAN
+#define NPY_HAVE_DECL_ISINF
+#define NPY_HAVE_DECL_ISFINITE
+#define NPY_HAVE_DECL_SIGNBIT
+#define NPY_USE_C99_COMPLEX 1
+#define NPY_HAVE_COMPLEX_DOUBLE 1
+#define NPY_HAVE_COMPLEX_FLOAT 1
+#define NPY_HAVE_COMPLEX_LONG_DOUBLE 1
+#define NPY_USE_C99_FORMATS 1
+#define NPY_VISIBILITY_HIDDEN __attribute__((visibility("hidden")))
+#define NPY_ABI_VERSION 0x01000009
+#define NPY_API_VERSION 0x0000000A
+
+#ifndef __STDC_FORMAT_MACROS
+#define __STDC_FORMAT_MACROS 1
+#endif
diff --git a/meta/recipes-devtools/python-numpy/files/mipsarchn64el/config.h b/meta/recipes-devtools/python-numpy/files/mipsarchn64el/config.h
new file mode 100644
index 0000000..4872703
--- /dev/null
+++ b/meta/recipes-devtools/python-numpy/files/mipsarchn64el/config.h
@@ -0,0 +1,138 @@
+#define SIZEOF_PY_INTPTR_T 8
+#define SIZEOF_PY_LONG_LONG 8
+#define MATHLIB m
+#define HAVE_SIN 1
+#define HAVE_COS 1
+#define HAVE_TAN 1
+#define HAVE_SINH 1
+#define HAVE_COSH 1
+#define HAVE_TANH 1
+#define HAVE_FABS 1
+#define HAVE_FLOOR 1
+#define HAVE_CEIL 1
+#define HAVE_SQRT 1
+#define HAVE_LOG10 1
+#define HAVE_LOG 1
+#define HAVE_EXP 1
+#define HAVE_ASIN 1
+#define HAVE_ACOS 1
+#define HAVE_ATAN 1
+#define HAVE_FMOD 1
+#define HAVE_MODF 1
+#define HAVE_FREXP 1
+#define HAVE_LDEXP 1
+#define HAVE_RINT 1
+#define HAVE_TRUNC 1
+#define HAVE_EXP2 1
+#define HAVE_LOG2 1
+#define HAVE_ATAN2 1
+#define HAVE_POW 1
+#define HAVE_NEXTAFTER 1
+#define HAVE_SINF 1
+#define HAVE_COSF 1
+#define HAVE_TANF 1
+#define HAVE_SINHF 1
+#define HAVE_COSHF 1
+#define HAVE_TANHF 1
+#define HAVE_FABSF 1
+#define HAVE_FLOORF 1
+#define HAVE_CEILF 1
+#define HAVE_RINTF 1
+#define HAVE_TRUNCF 1
+#define HAVE_SQRTF 1
+#define HAVE_LOG10F 1
+#define HAVE_LOGF 1
+#define HAVE_LOG1PF 1
+#define HAVE_EXPF 1
+#define HAVE_EXPM1F 1
+#define HAVE_ASINF 1
+#define HAVE_ACOSF 1
+#define HAVE_ATANF 1
+#define HAVE_ASINHF 1
+#define HAVE_ACOSHF 1
+#define HAVE_ATANHF 1
+#define HAVE_HYPOTF 1
+#define HAVE_ATAN2F 1
+#define HAVE_POWF 1
+#define HAVE_FMODF 1
+#define HAVE_MODFF 1
+#define HAVE_FREXPF 1
+#define HAVE_LDEXPF 1
+#define HAVE_EXP2F 1
+#define HAVE_LOG2F 1
+#define HAVE_COPYSIGNF 1
+#define HAVE_NEXTAFTERF 1
+#define HAVE_SINL 1
+#define HAVE_COSL 1
+#define HAVE_TANL 1
+#define HAVE_SINHL 1
+#define HAVE_COSHL 1
+#define HAVE_TANHL 1
+#define HAVE_FABSL 1
+#define HAVE_FLOORL 1
+#define HAVE_CEILL 1
+#define HAVE_RINTL 1
+#define HAVE_TRUNCL 1
+#define HAVE_SQRTL 1
+#define HAVE_LOG10L 1
+#define HAVE_LOGL 1
+#define HAVE_LOG1PL 1
+#define HAVE_EXPL 1
+#define HAVE_EXPM1L 1
+#define HAVE_ASINL 1
+#define HAVE_ACOSL 1
+#define HAVE_ATANL 1
+#define HAVE_ASINHL 1
+#define HAVE_ACOSHL 1
+#define HAVE_ATANHL 1
+#define HAVE_HYPOTL 1
+#define HAVE_ATAN2L 1
+#define HAVE_POWL 1
+#define HAVE_FMODL 1
+#define HAVE_MODFL 1
+#define HAVE_FREXPL 1
+#define HAVE_LDEXPL 1
+#define HAVE_EXP2L 1
+#define HAVE_LOG2L 1
+#define HAVE_COPYSIGNL 1
+#define HAVE_NEXTAFTERL 1
+#define HAVE_DECL_SIGNBIT
+#define HAVE_COMPLEX_H 1
+#define HAVE_CREAL 1
+#define HAVE_CIMAG 1
+#define HAVE_CABS 1
+#define HAVE_CARG 1
+#define HAVE_CEXP 1
+#define HAVE_CSQRT 1
+#define HAVE_CLOG 1
+#define HAVE_CCOS 1
+#define HAVE_CSIN 1
+#define HAVE_CPOW 1
+#define HAVE_CREALF 1
+#define HAVE_CIMAGF 1
+#define HAVE_CABSF 1
+#define HAVE_CARGF 1
+#define HAVE_CEXPF 1
+#define HAVE_CSQRTF 1
+#define HAVE_CLOGF 1
+#define HAVE_CCOSF 1
+#define HAVE_CSINF 1
+#define HAVE_CPOWF 1
+#define HAVE_CREALL 1
+#define HAVE_CIMAGL 1
+#define HAVE_CABSL 1
+#define HAVE_CARGL 1
+#define HAVE_CEXPL 1
+#define HAVE_CSQRTL 1
+#define HAVE_CLOGL 1
+#define HAVE_CCOSL 1
+#define HAVE_CSINL 1
+#define HAVE_CPOWL 1
+#define HAVE_LDOUBLE_IEEE_QUAD_LE 1
+#ifndef __cplusplus
+/* #undef inline */
+#endif
+
+#ifndef _NPY_NPY_CONFIG_H_
+#error config.h should never be included directly, include npy_config.h instead
+#endif
diff --git a/meta/recipes-devtools/python-numpy/files/mips/_numpyconfig.h b/meta/recipes-devtools/python-numpy/files/mipsarcho32eb/_numpyconfig.h
similarity index 100%
rename from meta/recipes-devtools/python-numpy/files/mips/_numpyconfig.h
rename to meta/recipes-devtools/python-numpy/files/mipsarcho32eb/_numpyconfig.h
diff --git a/meta/recipes-devtools/python-numpy/files/mips/config.h b/meta/recipes-devtools/python-numpy/files/mipsarcho32eb/config.h
similarity index 100%
rename from meta/recipes-devtools/python-numpy/files/mips/config.h
rename to meta/recipes-devtools/python-numpy/files/mipsarcho32eb/config.h
diff --git a/meta/recipes-devtools/python-numpy/files/mipsel/config.h b/meta/recipes-devtools/python-numpy/files/mipsarcho32el/config.h
similarity index 100%
rename from meta/recipes-devtools/python-numpy/files/mipsel/config.h
rename to meta/recipes-devtools/python-numpy/files/mipsarcho32el/config.h
diff --git a/meta/recipes-devtools/python-numpy/files/mipsel/numpyconfig.h b/meta/recipes-devtools/python-numpy/files/mipsarcho32el/numpyconfig.h
similarity index 100%
rename from meta/recipes-devtools/python-numpy/files/mipsel/numpyconfig.h
rename to meta/recipes-devtools/python-numpy/files/mipsarcho32el/numpyconfig.h
diff --git a/meta/recipes-devtools/python-numpy/python-numpy_1.11.2.bb b/meta/recipes-devtools/python-numpy/python-numpy_1.11.2.bb
index dafd7e2..c4bc354 100644
--- a/meta/recipes-devtools/python-numpy/python-numpy_1.11.2.bb
+++ b/meta/recipes-devtools/python-numpy/python-numpy_1.11.2.bb
@@ -26,7 +26,7 @@ CONFIGFILESURI_armeb = " \
file://config.h \
file://numpyconfig.h \
"
-CONFIGFILESURI_mipsel = " \
+CONFIGFILESURI_mipsarcho32el = " \
file://config.h \
file://numpyconfig.h \
"
@@ -38,7 +38,7 @@ CONFIGFILESURI_x86-64 = " \
file://config.h \
file://_numpyconfig.h \
"
-CONFIGFILESURI_mips = " \
+CONFIGFILESURI_mipsarcho32eb = " \
file://config.h \
file://_numpyconfig.h \
"
@@ -50,11 +50,19 @@ CONFIGFILESURI_powerpc64 = " \
file://config.h \
file://_numpyconfig.h \
"
-CONFIGFILESURI_mips64 = " \
+CONFIGFILESURI_mipsarchn64eb = " \
file://config.h \
file://_numpyconfig.h \
"
-CONFIGFILESURI_mips64n32 = " \
+CONFIGFILESURI_mipsarchn64el = " \
+ file://config.h \
+ file://_numpyconfig.h \
+"
+CONFIGFILESURI_mipsarchn32eb = " \
+ file://config.h \
+ file://_numpyconfig.h \
+"
+CONFIGFILESURI_mipsarchn32el = " \
file://config.h \
file://_numpyconfig.h \
"
diff --git a/meta/recipes-devtools/python-numpy/python3-numpy_1.11.2.bb b/meta/recipes-devtools/python-numpy/python3-numpy_1.11.2.bb
index c34df6f..d5fe50c 100644
--- a/meta/recipes-devtools/python-numpy/python3-numpy_1.11.2.bb
+++ b/meta/recipes-devtools/python-numpy/python3-numpy_1.11.2.bb
@@ -26,7 +26,7 @@ CONFIGFILESURI_armeb = " \
file://config.h \
file://numpyconfig.h \
"
-CONFIGFILESURI_mipsel = " \
+CONFIGFILESURI_mipsarcho32el = " \
file://config.h \
file://numpyconfig.h \
"
@@ -38,7 +38,7 @@ CONFIGFILESURI_x86-64 = " \
file://config.h \
file://_numpyconfig.h \
"
-CONFIGFILESURI_mips = " \
+CONFIGFILESURI_mipsarcho32eb = " \
file://config.h \
file://_numpyconfig.h \
"
@@ -50,11 +50,19 @@ CONFIGFILESURI_powerpc64 = " \
file://config.h \
file://_numpyconfig.h \
"
-CONFIGFILESURI_mips64 = " \
+CONFIGFILESURI_mipsarchn64eb = " \
file://config.h \
file://_numpyconfig.h \
"
-CONFIGFILESURI_mips64n32 = " \
+CONFIGFILESURI_mipsarchn64el = " \
+ file://config.h \
+ file://_numpyconfig.h \
+"
+CONFIGFILESURI_mipsarchn32eb = " \
+ file://config.h \
+ file://_numpyconfig.h \
+"
+CONFIGFILESURI_mipsarchn32el = " \
file://config.h \
file://_numpyconfig.h \
"
--
2.10.2
^ permalink raw reply related
* [Patch 5/7] gmp: Disable assembly for MIPS R6
From: Zubair Lutfullah Kakakhel @ 2016-11-23 13:47 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <20161123134733.38276-1-Zubair.Kakakhel@imgtec.com>
gmplib has some assembly routines. These have not been optimized
for MIPS R6 yet. Add --disable-assembly so that the C implementation
is used.
Signed-off-by: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
---
meta/recipes-support/gmp/gmp_6.1.1.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-support/gmp/gmp_6.1.1.bb b/meta/recipes-support/gmp/gmp_6.1.1.bb
index 303c3ef..614d21a 100644
--- a/meta/recipes-support/gmp/gmp_6.1.1.bb
+++ b/meta/recipes-support/gmp/gmp_6.1.1.bb
@@ -21,6 +21,7 @@ SRC_URI[sha256sum] = "a8109865f2893f1373b0a8ed5ff7429de8db696fc451b1036bd7bdf95b
acpaths = ""
EXTRA_OECONF += " --enable-cxx=detect"
+EXTRA_OECONF_mipsarchr6_append = " --disable-assembly"
PACKAGES =+ "libgmpxx"
FILES_libgmpxx = "${libdir}/libgmpxx${SOLIBS}"
--
2.10.2
^ permalink raw reply related
* [Patch 3/7] valgrind: Use MIPS MACHINE_OVERRIDES
From: Zubair Lutfullah Kakakhel @ 2016-11-23 13:47 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <20161123134733.38276-1-Zubair.Kakakhel@imgtec.com>
The mipsarch* MACHINE_OVERRIDES can be used to pass the same
parameters to MIPS pre-R2 and R6 ISA variants.
Use them to reduce duplication in supporting MIPS R6 ISA.
Signed-off-by: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
---
meta/recipes-devtools/valgrind/valgrind_3.12.0.bb | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb
index 2474bbc..637b723 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb
@@ -36,8 +36,11 @@ COMPATIBLE_HOST_armv4 = 'null'
COMPATIBLE_HOST_armv5 = 'null'
COMPATIBLE_HOST_armv6 = 'null'
-# valgrind doesn't like mips soft float
-COMPATIBLE_HOST_mipsarch = "${@bb.utils.contains("TARGET_FPU", "soft", "null", ".*-linux", d)}"
+# Disable for some MIPS variants
+COMPATIBLE_HOST_mipsarcho32 = "${@bb.utils.contains("TARGET_FPU", "soft", "null", ".*-linux", d)}"
+COMPATIBLE_HOST_mipsarchn32 = 'null'
+COMPATIBLE_HOST_mipsarchn64 = "${@bb.utils.contains("TARGET_FPU", "soft", "null", ".*-linux", d)}"
+COMPATIBLE_HOST_mipsarchr6 = 'null'
inherit autotools ptest
--
2.10.2
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox