Re: [OE-core] [PATCH] kernel-fitimage.bbclass: Deploy fitImage without Initramfs

[Vineeth Karumanchi]

Hi Martin,


On 03/08/2018 01:25 PM, Manjukumar Harthikote Matha wrote:

Hi Martin,


-Original Message-
From: Martin Hundebøll [mailto:m...@prevas.dk]
Sent: Wednesday, March 07, 2018 11:26 PM
To: Vineeth Karumanchi ; openembedded-
c...@lists.openembedded.org; Manjukumar Harthikote Matha

Subject: Re: [OE-core] [PATCH] kernel-fitimage.bbclass: Deploy fitImage without
Initramfs

Hi Vineeth,

On 2018-03-07 15:41, Vineeth Chowdary Karumanchi wrote:

This patch deploys fitImage (linux.bin + dtb ).
The use case is to have 2 partioned sd card, with FAT partition having
bootloader + fitImage and
ext4 partion having rootfs.

Signen-off-by: Vineeth Chowdary Karumanchi

---
   meta/classes/kernel-fitimage.bbclass | 5 +
   1 file changed, 5 insertions(+)

diff --git a/meta/classes/kernel-fitimage.bbclass
b/meta/classes/kernel-fitimage.bbclass
index 50a91e1..25884d5 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -464,6 +464,10 @@ kernel_do_deploy_append() {
  
linux_bin_base_name="fitImage-linux.bin-${PV}-${PR}-${MACHINE}-

${DATETIME}"

  linux_bin_symlink_name=fitImage-linux.bin-${MACHINE}
  install -m 0644 linux.bin
${DEPLOYDIR}/${linux_bin_base_name}.bin
+   fitimage_base_name="fitImage-${PV}-${PR}-${MACHINE}-

${DATETIME}"

+   fitimage_symlink_name=fitImage-${MACHINE}
+   install -m 0644 arch/${ARCH}/boot/fitImage
+ ${DEPLOYDIR}/${fitimage_base_name}.bin
+


Isn't this already handled by the "linux_bin_base_name" variable just above 
(i.e.
fitImahe-linux.bin-${MACHINE}).


It is linux.bin which is generated at the time of fitImage creation.

- linux.bin and arch/${ARCH}/boot/fitImage differ,
- uboot fails to recognise linux.bin
- arch/${ARCH}/boot/fitImage is the fitimage.

Thanks
VIneeth


I have various fitimages, and as far as I recall, a
non-initramfs fitimage is already deployed.


This patch seems to do the right thing.

linux.bin is being copied as fitImage-linux.bin-${MACHINE} , and I think it is 
incorrect.
It should be fitImage, which is generated in do_assemble_fitimage

If you look at initramfs case:
install -m 0644 arch/${ARCH}/boot/fitImage-${INITRAMFS_IMAGE} 
${DEPLOYDIR}/${fit_initramfs_base_name}.bin which is correct

Thanks,
Manju



--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH v2] kernel-fitimage.bbclass: Deploy fitImage without Initramfs

[Vincent Prince]

Hi Vineeth,

I think it's because this class can be found in those two repos and error
log tells it should be based on first one:

http://git.openembedded.org/openembedded-core/tree/meta/classes/kernel-fitimage.bbclass
http://git.yoctoproject.org/cgit.cgi/poky/tree/meta/classes/kernel-fitimage.bbclass

Best regards,
Vincent

2018-03-08 5:39 GMT+01:00 Vineeth Karumanchi <
vineethchowz.chowd...@xilinx.com>:

> Hi,
>
> I am getting the patch failure error saying unable to apply.
> https://patchwork.openembedded.org/series/11297/
>
>
> I did these steps:
>
> - git clone git://git.yoctoproject.org/poky  ( master is at
> 83cd2b3e775235942dd4201622dc5cc2d4328994 )
>
> - Applied this patch, it went well.
>
>
> Can you please let me know what is the mistake .
> I was sending patch on master.
>
> Thanks
> Vineeth
>
>
>
> On 03/08/2018 09:00 AM, Vineeth Chowdary Karumanchi wrote:
>
>> This patch deploys fitImage (linux.bin + dtb ).
>> The use case is to have 2 partioned sd card, with
>> FAT partition having bootloader + fitImage and
>> ext4 partion having rootfs.
>>
>> Signed-off-by: Vineeth Chowdary Karumanchi > com>
>> ---
>> v2: Proper signed off
>> ---
>>   meta/classes/kernel-fitimage.bbclass | 5 +
>>   1 file changed, 5 insertions(+)
>>
>> diff --git a/meta/classes/kernel-fitimage.bbclass
>> b/meta/classes/kernel-fitimage.bbclass
>> index 50a91e1..25884d5 100644
>> --- a/meta/classes/kernel-fitimage.bbclass
>> +++ b/meta/classes/kernel-fitimage.bbclass
>> @@ -464,6 +464,10 @@ kernel_do_deploy_append() {
>> linux_bin_base_name="fitImage-
>> linux.bin-${PV}-${PR}-${MACHINE}-${DATETIME}"
>> linux_bin_symlink_name=fitImage-linux.bin-${MACHINE}
>> install -m 0644 linux.bin ${DEPLOYDIR}/${linux_bin_base_
>> name}.bin
>> +   fitimage_base_name="fitImage-
>> ${PV}-${PR}-${MACHINE}-${DATETIME}"
>> +   fitimage_symlink_name=fitImage-${MACHINE}
>> +   install -m 0644 arch/${ARCH}/boot/fitImage
>> ${DEPLOYDIR}/${fitimage_base_name}.bin
>> +
>> if [ -n "${INITRAMFS_IMAGE}" ]; then
>> echo "Copying fit-image-${INITRAMFS_IMAGE}.its
>> source file..."
>> @@ -478,6 +482,7 @@ kernel_do_deploy_append() {
>> cd ${DEPLOYDIR}
>> ln -sf ${its_base_name}.its ${its_symlink_name}.its
>> ln -sf ${linux_bin_base_name}.bin
>> ${linux_bin_symlink_name}.bin
>> +   ln -sf ${fitimage_base_name}.bin
>> ${fitimage_symlink_name}.bin
>> if [ -n "${INITRAMFS_IMAGE}" ]; then
>> ln -sf ${its_initramfs_base_name}.its
>> ${its_initramfs_symlink_name}.its
>>
>>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH v2] kernel-fitimage.bbclass: Deploy fitImage without Initramfs

[Vineeth Karumanchi]

Hi Vincent,

Thanks, I was using the second one.

The auto builder uses http://git.openembedded.org and the patches should 
be on top of it ?


Thanks
Vineeth

On 03/08/2018 02:09 PM, Vincent Prince wrote:

Hi Vineeth,

I think it's because this class can be found in those two repos and 
error log tells it should be based on first one:


http://git.openembedded.org/openembedded-core/tree/meta/classes/kernel-fitimage.bbclass
http://git.yoctoproject.org/cgit.cgi/poky/tree/meta/classes/kernel-fitimage.bbclass

Best regards,
Vincent

2018-03-08 5:39 GMT+01:00 Vineeth Karumanchi 
>:


Hi,

I am getting the patch failure error saying unable to apply.
https://patchwork.openembedded.org/series/11297/



I did these steps:

- git clone git://git.yoctoproject.org/poky
  ( master is at
83cd2b3e775235942dd4201622dc5cc2d4328994 )

- Applied this patch, it went well.


Can you please let me know what is the mistake .
I was sending patch on master.

Thanks
Vineeth



On 03/08/2018 09:00 AM, Vineeth Chowdary Karumanchi wrote:

This patch deploys fitImage (linux.bin + dtb ).
The use case is to have 2 partioned sd card, with
FAT partition having bootloader + fitImage and
ext4 partion having rootfs.

Signed-off-by: Vineeth Chowdary Karumanchi
mailto:vineethchowz.chowd...@xilinx.com>>
---
v2: Proper signed off
---
   meta/classes/kernel-fitimage.bbclass | 5 +
   1 file changed, 5 insertions(+)

diff --git a/meta/classes/kernel-fitimage.bbclass
b/meta/classes/kernel-fitimage.bbclass
index 50a91e1..25884d5 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -464,6 +464,10 @@ kernel_do_deploy_append() {

linux_bin_base_name="fitImage-linux.bin-${PV}-${PR}-${MACHINE}-${DATETIME}"

linux_bin_symlink_name=fitImage-linux.bin-${MACHINE}

                 install -m 0644 linux.bin
${DEPLOYDIR}/${linux_bin_base_name}.bin
+ 
  fitimage_base_name="fitImage-${PV}-${PR}-${MACHINE}-${DATETIME}"

+               fitimage_symlink_name=fitImage-${MACHINE}
+               install -m 0644 arch/${ARCH}/boot/fitImage
${DEPLOYDIR}/${fitimage_base_name}.bin
+
                 if [ -n "${INITRAMFS_IMAGE}" ]; then
                         echo "Copying
fit-image-${INITRAMFS_IMAGE}.its source file..."
@@ -478,6 +482,7 @@ kernel_do_deploy_append() {
                 cd ${DEPLOYDIR}
                 ln -sf ${its_base_name}.its ${its_symlink_name}.its
                 ln -sf ${linux_bin_base_name}.bin
${linux_bin_symlink_name}.bin
+               ln -sf ${fitimage_base_name}.bin
${fitimage_symlink_name}.bin
                 if [ -n "${INITRAMFS_IMAGE}" ]; then
                         ln -sf ${its_initramfs_base_name}.its
${its_initramfs_symlink_name}.its


-- 
___

Openembedded-core mailing list
Openembedded-core@lists.openembedded.org

http://lists.openembedded.org/mailman/listinfo/openembedded-core





--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [oe-core][PATCH 1/1] gnome-desktop: do not free() a static buffer

[Burton, Ross]

I'm not sure we need this patch anymore, it's been rebased on top of
upstream changes but one of those changes were to fix x32 builds:

https://git.gnome.org/browse/gnome-desktop/commit/libgnome-desktop/gnome-desktop-thumbnail.c?id=012cad653253ae5f5248988cda89159f22c1fb1d

I believe we can drop this patch to gnome-desktop.

Ross

On 8 March 2018 at 01:35, Joe Slater  wrote:

> Do not free() the buffer returned by localtime().  Also,
> switch to calling localtime_r() which is re-entrant.
>
> Signed-off-by: Joe Slater 
> ---
>  ...op-thumbnail-don-t-convert-time_t-to-long.patch | 27
> +-
>  1 file changed, 11 insertions(+), 16 deletions(-)
>
> diff --git a/meta/recipes-gnome/gnome-desktop/gnome-desktop/gnome-
> desktop-thumbnail-don-t-convert-time_t-to-long.patch
> b/meta/recipes-gnome/gnome-desktop/gnome-desktop/gnome-
> desktop-thumbnail-don-t-convert-time_t-to-long.patch
> index c1a7d4f..be657a8 100644
> --- a/meta/recipes-gnome/gnome-desktop/gnome-desktop/gnome-
> desktop-thumbnail-don-t-convert-time_t-to-long.patch
> +++ b/meta/recipes-gnome/gnome-desktop/gnome-desktop/gnome-
> desktop-thumbnail-don-t-convert-time_t-to-long.patch
> @@ -9,12 +9,11 @@ build for X32, where long's size doesn't match that of
> time_t.
>  Upstream-Status: Pending
>  Signed-off-by: Christopher Larson 
>
> 
> - libgnome-desktop/gnome-desktop-thumbnail.c | 16 ++--
> - 1 file changed, 14 insertions(+), 2 deletions(-)
> +Modified to use localtime_r() and not free() a static structure.
> +
> +Signed-off-by: Joe Slater 
> +
>
> -diff --git a/libgnome-desktop/gnome-desktop-thumbnail.c
> b/libgnome-desktop/gnome-desktop-thumbnail.c
> -index e56c3d7..5d96bf3 100644
>  --- a/libgnome-desktop/gnome-desktop-thumbnail.c
>  +++ b/libgnome-desktop/gnome-desktop-thumbnail.c
>  @@ -120,6 +120,8 @@
> @@ -30,24 +29,23 @@ index e56c3d7..5d96bf3 100644
> char *tmp_path = NULL;
> int tmp_fd;
> char mtime_str[21];
> -+  struct tm *tmp_mtime = NULL;
> ++  struct tm tmp_mtime;
> gboolean ret = FALSE;
> GError *error = NULL;
> const char *width, *height;
> -@@ -1124,7 +1127,11 @@ save_thumbnail (GdkPixbuf  *pixbuf,
> +@@ -1124,7 +1127,10 @@ save_thumbnail (GdkPixbuf  *pixbuf,
>   goto out;
> close (tmp_fd);
>
>  -  g_snprintf (mtime_str, 21, "%" G_GINT64_FORMAT, (gint64) mtime);
> -+  tmp_mtime = localtime (&mtime);
> -+  if (!tmp_mtime)
> ++  if (!localtime_r (&mtime,&tmp_mtime))
>  +goto out;
> -+  strftime (mtime_str, 21, "%s", tmp_mtime);
> -+  free (tmp_mtime);
> ++
> ++  strftime (mtime_str, 21, "%s", &tmp_mtime);
> width = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::Image::Width");
> height = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::Image::Height");
>
> -@@ -1319,6 +1326,7 @@ gnome_desktop_thumbnail_is_valid (GdkPixbuf
>   *pixbuf,
> +@@ -1319,6 +1325,7 @@ gnome_desktop_thumbnail_is_valid (GdkPix
>   {
> const char *thumb_uri, *thumb_mtime_str;
> time_t thumb_mtime;
> @@ -55,7 +53,7 @@ index e56c3d7..5d96bf3 100644
>
> thumb_uri = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::URI");
> if (g_strcmp0 (uri, thumb_uri) != 0)
> -@@ -1327,7 +1335,11 @@ gnome_desktop_thumbnail_is_valid (GdkPixbuf
> *pixbuf,
> +@@ -1327,7 +1334,11 @@ gnome_desktop_thumbnail_is_valid (GdkPix
> thumb_mtime_str = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::MTime");
> if (!thumb_mtime_str)
>   return FALSE;
> @@ -68,6 +66,3 @@ index e56c3d7..5d96bf3 100644
> if (mtime != thumb_mtime)
>   return FALSE;
>
> ---
> -2.14.1
> -
> --
> 2.7.4
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] kernel-fitimage.bbclass: Deploy fitImage without Initramfs

[Manjukumar Harthikote Matha]

Hi Martin,

> -Original Message-
> From: Martin Hundebøll [mailto:m...@prevas.dk]
> Sent: Wednesday, March 07, 2018 11:26 PM
> To: Vineeth Karumanchi ; openembedded-
> c...@lists.openembedded.org; Manjukumar Harthikote Matha
> 
> Subject: Re: [OE-core] [PATCH] kernel-fitimage.bbclass: Deploy fitImage 
> without
> Initramfs
> 
> Hi Vineeth,
> 
> On 2018-03-07 15:41, Vineeth Chowdary Karumanchi wrote:
> > This patch deploys fitImage (linux.bin + dtb ).
> > The use case is to have 2 partioned sd card, with FAT partition having
> > bootloader + fitImage and
> > ext4 partion having rootfs.
> >
> > Signen-off-by: Vineeth Chowdary Karumanchi
> > 
> > ---
> >   meta/classes/kernel-fitimage.bbclass | 5 +
> >   1 file changed, 5 insertions(+)
> >
> > diff --git a/meta/classes/kernel-fitimage.bbclass
> > b/meta/classes/kernel-fitimage.bbclass
> > index 50a91e1..25884d5 100644
> > --- a/meta/classes/kernel-fitimage.bbclass
> > +++ b/meta/classes/kernel-fitimage.bbclass
> > @@ -464,6 +464,10 @@ kernel_do_deploy_append() {
> >  
> > linux_bin_base_name="fitImage-linux.bin-${PV}-${PR}-${MACHINE}-
> ${DATETIME}"
> >  linux_bin_symlink_name=fitImage-linux.bin-${MACHINE}
> >  install -m 0644 linux.bin
> > ${DEPLOYDIR}/${linux_bin_base_name}.bin
> > +   fitimage_base_name="fitImage-${PV}-${PR}-${MACHINE}-
> ${DATETIME}"
> > +   fitimage_symlink_name=fitImage-${MACHINE}
> > +   install -m 0644 arch/${ARCH}/boot/fitImage
> > + ${DEPLOYDIR}/${fitimage_base_name}.bin
> > +
> 
> Isn't this already handled by the "linux_bin_base_name" variable just above 
> (i.e.
> fitImahe-linux.bin-${MACHINE}). I have various fitimages, and as far as I 
> recall, a
> non-initramfs fitimage is already deployed.
> 
This patch seems to do the right thing.

linux.bin is being copied as fitImage-linux.bin-${MACHINE} , and I think it is 
incorrect.
It should be fitImage, which is generated in do_assemble_fitimage

If you look at initramfs case:
install -m 0644 arch/${ARCH}/boot/fitImage-${INITRAMFS_IMAGE} 
${DEPLOYDIR}/${fit_initramfs_base_name}.bin which is correct

Thanks,
Manju

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH v2 2/2] diffutils: allow native & nativesdk builds

[Sai Pavan Boddu]

Hi,

This patch breaks nativesdk-qemu build with x86_64-oesdk-mingw32 toolchain. 
Below are the errors i see

| In file included from ./fcntl.h:67:0,
| from ../../diffutils-3.6/lib/careadlinkat.h:23,
| from ../../diffutils-3.6/lib/areadlink.c:27:
| ./unistd.h:592:11: fatal error: getopt-cdefs.h: No such file or directory
| # include 
| ^~~~
| compilation terminated.
| make[2]: *** [areadlink.o] Error 1
| make[2]: *** Waiting for unfinished jobs
| In file included from ../../diffutils-3.6/lib/c-stack.c:72:0:
| ./unistd.h:592:11: fatal error: getopt-cdefs.h: No such file or directory
| # include 
| ^~~~
| compilation terminated.
| make[2]: *** [c-stack.o] Error 1
| In file included from ./fcntl.h:67:0,
| from ../../diffutils-3.6/lib/binary-io.h:22,
| from ../../diffutils-3.6/lib/binary-io.c:20:
| ./unistd.h:592:11: fatal error: getopt-cdefs.h: No such file or directory
| # include 
| ^~~~
| compilation terminated.
| In file included from ./fcntl.h:67:0,
| from ../../diffutils-3.6/lib/careadlinkat.h:23,
| from ../../diffutils-3.6/lib/careadlinkat.c:23:
| ./unistd.h:592:11: fatal error: getopt-cdefs.h: No such file or directory
| # include 
| ^~~~
| compilation terminated.
| make[2]: *** [binary-io.o] Error 1
| make[2]: *** [careadlinkat.o] Error 1
| In file included from ./fcntl.h:67:0,
| from ../../diffutils-3.6/lib/localcharset.c:25:
| ./unistd.h:592:11: fatal error: getopt-cdefs.h: No such file or directory
| # include 
| ^~~~
| compilation terminated.
| make[2]: *** [localcharset.o] Error 1
| In file included from ./fcntl.h:67:0,
| from ../../diffutils-3.6/lib/freopen-safer.c:25:
| ./unistd.h:592:11: fatal error: getopt-cdefs.h: No such file or directory
| # include 
| ^~~~
| compilation terminated.

Thanks,
Sai Pavan

> -Original Message-
> From: openembedded-core-boun...@lists.openembedded.org
> [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf
> Of Ioan-Adrian Ratiu
> Sent: Monday, March 5, 2018 5:11 AM
> To: openembedded-core@lists.openembedded.org
> Subject: [OE-core] [PATCH v2 2/2] diffutils: allow native & nativesdk builds
> 
> Required by the new dtc rdepends to avoid errors like this:
> 
> ERROR: Required build target 'ionel-rpi-image' has no buildable providers.
> Missing or unbuildable dependency chain was: ['ionel-rpi-image', 'nativesdk-
> packagegroup-sdk-host', 'nativesdk-qemu', 'nativesdk-dtc', 'nativesdk-
> diffutils']
> 
> Signed-off-by: Ioan-Adrian Ratiu 
> ---
>  meta/recipes-extended/diffutils/diffutils.inc | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/meta/recipes-extended/diffutils/diffutils.inc b/meta/recipes-
> extended/diffutils/diffutils.inc
> index 7c5be50fb7..c9e3130587 100644
> --- a/meta/recipes-extended/diffutils/diffutils.inc
> +++ b/meta/recipes-extended/diffutils/diffutils.inc
> @@ -10,3 +10,4 @@ inherit autotools texinfo update-alternatives gettext
> ALTERNATIVE_${PN} = "diff cmp"
>  ALTERNATIVE_PRIORITY = "100"
> 
> +BBCLASSEXTEND = "native nativesdk"
> --
> 2.16.2
> 
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] kbd: avoid conflict with busybox

[Pascal Bach]

showkey can also be provided by busybox

Signed-off-by: Pascal Bach 
---
 meta/recipes-core/kbd/kbd_2.0.4.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-core/kbd/kbd_2.0.4.bb 
b/meta/recipes-core/kbd/kbd_2.0.4.bb
index 80808af135..4af3256fff 100644
--- a/meta/recipes-core/kbd/kbd_2.0.4.bb
+++ b/meta/recipes-core/kbd/kbd_2.0.4.bb
@@ -58,7 +58,7 @@ RDEPENDS_${PN}-ptest = "make"
 
 inherit update-alternatives
 
-ALTERNATIVE_${PN} = "chvt deallocvt fgconsole openvt"
+ALTERNATIVE_${PN} = "chvt deallocvt fgconsole openvt showkey"
 ALTERNATIVE_PRIORITY = "100"
 
 BBCLASSEXTEND = "native"
-- 
2.11.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] kernel-uimage.bbclass: Build uImage with Initramfs

[Vineeth Chowdary Karumanchi]

This patch adds support for building uImage with Initramfs.

Signed-off-by: Vineeth Chowdary Karumanchi 
---
 meta/classes/kernel-uimage.bbclass | 18 +-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/meta/classes/kernel-uimage.bbclass 
b/meta/classes/kernel-uimage.bbclass
index 1d8656e..9e776a1 100644
--- a/meta/classes/kernel-uimage.bbclass
+++ b/meta/classes/kernel-uimage.bbclass
@@ -18,10 +18,18 @@ python __anonymous () {

 # Enable building of uImage with mkimage
 bb.build.addtask('do_uboot_mkimage', 'do_install', 
'do_kernel_link_images', d)
+
+if d.getVar('INITRAMFS_IMAGE_BUNDLE') == '1' :
+bb.build.addtask('do_uboot_mkimage_initramfs', 'do_deploy', 
'do_bundle_initramfs', d)
+
 }

 do_uboot_mkimage[dirs] += "${B}"
 do_uboot_mkimage() {
+
+   local uimage_name="$1"
+   [ -z "$uimage_name" ] && uimage_name="uImage"
+
uboot_prep_kimage

ENTRYPOINT=${UBOOT_ENTRYPOINT}
@@ -30,6 +38,14 @@ do_uboot_mkimage() {
awk '$3=="${UBOOT_ENTRYSYMBOL}" {print "0x"$1;exit}'`
fi

-   uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C "${linux_comp}" -a 
${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d 
linux.bin ${B}/arch/${ARCH}/boot/uImage
+   uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C "${linux_comp}" -a 
${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d 
linux.bin ${B}/arch/${ARCH}/boot/$uimage_name
rm -f linux.bin
 }
+
+do_uboot_mkimage_initramfs() {
+   if echo ${KERNEL_IMAGETYPES} | grep -wq "uImage" && \
+   test -n "${INITRAMFS_IMAGE}" ; then
+   cd ${B}
+   do_uboot_mkimage uImage.initramfs
+   fi
+}
--
2.7.4

This email and any attachments are intended for the sole use of the named 
recipient(s) and contain(s) confidential information that may be proprietary, 
privileged or copyrighted under applicable law. If you are not the intended 
recipient, do not read, copy, or forward this email message or any attachments. 
Delete this email message and any attachments immediately.
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] ✗ patchtest: failure for kernel-uimage.bbclass: Build uImage with Initramfs

[Patchwork]

== Series Details ==

Series: kernel-uimage.bbclass: Build uImage with Initramfs
Revision: 1
URL   : https://patchwork.openembedded.org/series/11306/
State : failure

== Summary ==


Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:



* Issue Series does not apply on top of target branch 
[test_series_merge_on_head] 
  Suggested fixRebase your series on top of targeted branch
  Targeted branch  master (currently at b8ddb0c8d7)



If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Guidelines: 
https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 01/42] expat: refresh patches

[Alexander Kanavin]

From: Ross Burton 

The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.

Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450).  This is obviously bad.

We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.

Signed-off-by: Alexander Kanavin 
---
 meta/recipes-core/expat/expat/autotools.patch | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-core/expat/expat/autotools.patch 
b/meta/recipes-core/expat/expat/autotools.patch
index 3d3c5bad9d6..104717eabb7 100644
--- a/meta/recipes-core/expat/expat/autotools.patch
+++ b/meta/recipes-core/expat/expat/autotools.patch
@@ -10,11 +10,12 @@ Updated to apply over expat 2.1.0
 
 Signed-off-by: Marko Lindqvist 
 
-diff -Nurd expat-2.1.0/configure.in expat-2.1.0/configure.in
 expat-2.1.0/configure.ac   2012-03-04 01:45:53.0 +0200
-+++ expat-2.1.0/configure.ac   2012-05-10 21:04:44.0 +0300
-@@ -51,8 +51,6 @@
- 
+Index: expat-2.2.5/configure.ac
+===
+--- expat-2.2.5.orig/configure.ac
 expat-2.2.5/configure.ac
+@@ -53,8 +53,6 @@ LIBAGE=6   # CMakeLists.txt!
+ CPPFLAGS="${CPPFLAGS} -DHAVE_EXPAT_CONFIG_H"
  AC_CONFIG_HEADER(expat_config.h)
  
 -sinclude(conftools/ac_c_bigendian_cross.m4)
-- 
2.16.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 02/42] grub: refresh patches

[Alexander Kanavin]

From: Ross Burton 

The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.

Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450).  This is obviously bad.

We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.

Signed-off-by: Ross Burton 
Signed-off-by: Alexander Kanavin 
---
 ...odule-explicitly-keeps-symbole-.module_license.patch | 17 +++--
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git 
a/meta/recipes-bsp/grub/files/grub-module-explicitly-keeps-symbole-.module_license.patch
 
b/meta/recipes-bsp/grub/files/grub-module-explicitly-keeps-symbole-.module_license.patch
index 935c472cf8f..ffc2d40d893 100644
--- 
a/meta/recipes-bsp/grub/files/grub-module-explicitly-keeps-symbole-.module_license.patch
+++ 
b/meta/recipes-bsp/grub/files/grub-module-explicitly-keeps-symbole-.module_license.patch
@@ -43,19 +43,16 @@ Signed-off-by: Hongxu Jia 
  grub-core/genmod.sh.in | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/grub-core/genmod.sh.in b/grub-core/genmod.sh.in
-index 76df0bb..39a9cfc 100644
 a/grub-core/genmod.sh.in
-+++ b/grub-core/genmod.sh.in
-@@ -59,7 +59,7 @@ if test x@TARGET_APPLE_CC@ != x1; then
+Index: grub-2.02/grub-core/genmod.sh.in
+===
+--- grub-2.02.orig/grub-core/genmod.sh.in
 grub-2.02/grub-core/genmod.sh.in
+@@ -56,7 +56,7 @@ if test x@TARGET_APPLE_LINKER@ != x1; th
if test x@platform@ != xemu; then
-   @STRIP@ --strip-unneeded \
+   @TARGET_STRIP@ --strip-unneeded \
-K grub_mod_init -K grub_mod_fini \
 -  -K _grub_mod_init -K _grub_mod_fini \
 +  -K _grub_mod_init -K _grub_mod_fini -K .module_license \
-R .note.gnu.gold-version -R .note.GNU-stack \
-   -R .note -R .comment $tmpfile || exit 1
+   -R .note -R .comment -R .ARM.exidx $tmpfile || exit 1
fi
--- 
-2.8.1
-
-- 
2.16.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 03/42] shared-mime-info: refresh patches

[Alexander Kanavin]

From: Ross Burton 

The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.

Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450).  This is obviously bad.

We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.

Signed-off-by: Ross Burton 
Signed-off-by: Alexander Kanavin 
---
 .../shared-mime-info/install-data-hook.patch   | 14 --
 .../shared-mime-info/shared-mime-info/parallelmake.patch   | 12 ++--
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git 
a/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch
 
b/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch
index 3c9f1ea438c..262ff7562ce 100644
--- 
a/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch
+++ 
b/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch
@@ -8,16 +8,18 @@ Upstream-Status: Pending
 
 Signed-off-by: Joe Slater 
 
 a/Makefile.am
-+++ b/Makefile.am
-@@ -44,7 +44,9 @@ $(pkgconfig_DATA): config.status
- @INTLTOOL_XML_RULE@
- @INTLTOOL_DESKTOP_RULE@
+Index: shared-mime-info-1.9/Makefile.am
+===
+--- shared-mime-info-1.9.orig/Makefile.am
 shared-mime-info-1.9/Makefile.am
+@@ -50,7 +50,9 @@ else
+   update_mime_database="$(top_builddir)/update-mime-database$(EXEEXT)"
+ endif
  
 -install-data-hook: install-binPROGRAMS
 +# do NOT make this dependent on anything!
 +#
 +install-data-hook:
  if ENABLE_UPDATE_MIMEDB
-   $(DESTDIR)"$(bindir)/update-mime-database" -V 
"$(DESTDIR)$(datadir)/mime"
+   $(update_mime_database) -V "$(DESTDIR)$(datadir)/mime"
  endif
diff --git 
a/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch 
b/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch
index 84c4d03731b..fea34a55a25 100644
--- a/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch
+++ b/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch
@@ -11,17 +11,17 @@ RP 10/10/2011
 Upstream-Status: Pending
 Signed-off-by: Constantin Musca 
 
-Index: shared-mime-info-1.0/Makefile.am
+Index: shared-mime-info-1.9/Makefile.am
 ===
 shared-mime-info-1.0.orig/Makefile.am
-+++ shared-mime-info-1.0/Makefile.am
+--- shared-mime-info-1.9.orig/Makefile.am
 shared-mime-info-1.9/Makefile.am
 @@ -1,5 +1,3 @@
 -SUBDIRS=. po
 -
  AM_CPPFLAGS = $(ALL_CFLAGS)
  
  packagesdir = $(datadir)/mime/packages
-@@ -72,8 +70,7 @@ uninstall-hook:
+@@ -81,8 +79,7 @@ endif
  
  all: $(defaultmakedeps)
  
@@ -29,5 +29,5 @@ Index: shared-mime-info-1.0/Makefile.am
 -  $(AM_V_GEN) $(MAKE) -C po shared-mime-info.pot
 +create-pot: po
  
- check: create-pot freedesktop.org.xml update-mime-database check-translations
-   if test -e $(top_builddir)/freedesktop.org.xml; then \
+ local-test: create-pot freedesktop.org.xml update-mime-database$(EXEEXT)
+ if CROSS_COMPILING
-- 
2.16.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 04/42] serf: refresh patches

[Alexander Kanavin]

From: Ross Burton 

The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.

Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450).  This is obviously bad.

We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.

Signed-off-by: Ross Burton 
Signed-off-by: Alexander Kanavin 
---
 meta/recipes-support/serf/serf/norpath.patch | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/meta/recipes-support/serf/serf/norpath.patch 
b/meta/recipes-support/serf/serf/norpath.patch
index 380f5d00d2d..c392444f7b3 100644
--- a/meta/recipes-support/serf/serf/norpath.patch
+++ b/meta/recipes-support/serf/serf/norpath.patch
@@ -5,11 +5,11 @@ Upstream-Status: Inappropriate
 
 RP 2014/7/17
 
-Index: serf-1.3.6/SConstruct
+Index: serf-1.3.9/SConstruct
 ===
 serf-1.3.6.orig/SConstruct 2014-07-17 19:57:57.724389150 +
-+++ serf-1.3.6/SConstruct  2014-07-17 20:04:21.784399616 +
-@@ -218,8 +218,7 @@
+--- serf-1.3.9.orig/SConstruct
 serf-1.3.9/SConstruct
+@@ -224,8 +224,7 @@ if sys.platform != 'win32':
  else:
LIBNAMESTATIC = 'serf-${MAJOR}'
  
@@ -17,9 +17,9 @@ Index: serf-1.3.6/SConstruct
 -   PDB='${TARGET.filebase}.pdb')
 +env.Append(PDB='${TARGET.filebase}.pdb')
  
- #for i in env:
- #print(str(env[i]))
-@@ -371,12 +370,6 @@
+ if sys.platform == 'darwin':
+ #  linkflags.append('-Wl,-install_name,@executable_path/%s.dylib' % 
(LIBNAME,))
+@@ -385,12 +384,6 @@ if gssapi and CALLOUT_OKAY:
  if sys.platform == 'win32':
env.Append(CPPDEFINES=['SERF_HAVE_SSPI'])
  
@@ -32,8 +32,8 @@ Index: serf-1.3.6/SConstruct
  # Set up the construction of serf-*.pc
  pkgconfig = env.Textfile('serf-%d.pc' % (MAJOR,),
   env.File('build/serf.pc.in'),
-@@ -446,7 +439,6 @@
-   ENV={'PATH' : os.environ['PATH']}))
+@@ -461,7 +454,6 @@ else:
+   TEST_EXES = [ os.path.join('test', '%s' % (prog)) for prog in TEST_PROGRAMS 
]
  
  # Find the (dynamic) library in this directory
 -tenv.Replace(RPATH=thisdir)
-- 
2.16.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 05/42] nspr: refresh patches

[Alexander Kanavin]

From: Ross Burton 

The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.

Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450).  This is obviously bad.

We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.

Signed-off-by: Ross Burton 
Signed-off-by: Alexander Kanavin 
---
 meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch |  2 +-
 meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch | 10 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch 
b/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch
index c2b7258e50e..f12acc85480 100644
--- a/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch
+++ b/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch
@@ -49,4 +49,4 @@ Index: nspr/configure.in
 -PR_MD_ASFILES=os_Linux_ppc.s
  fi
  ;;
- m68k)
+ esac
diff --git a/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch 
b/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch
index a7e7853de1a..ecc6d31874a 100644
--- a/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch
+++ b/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch
@@ -11,12 +11,12 @@ in file 
{builddir}/tmp/work/armv5te-poky-linux-gnueabi/nspr-4.8.9-r1/packages-sp
 Signed-off-by: Andrei Gherzan 
 Upstream-Status: Pending
 
-Index: nspr-4.8.9/mozilla/nsprpub/pr/tests/Makefile.in
+Index: nspr/pr/tests/Makefile.in
 ===
 nsprpub.orig/pr/tests/Makefile.in  2012-02-11 00:01:10.476220505 +0200
-+++ nsprpub/pr/tests/Makefile.in   2012-02-10 23:57:40.0 +0200
-@@ -379,7 +379,7 @@
- endif
+--- nspr.orig/pr/tests/Makefile.in
 nspr/pr/tests/Makefile.in
+@@ -315,7 +315,7 @@ ifeq ($(OS_ARCH), SunOS)
+ endif # SunOS
  
  ifeq (,$(filter-out Linux GNU GNU_%,$(OS_ARCH)))
 -LDOPTS += -Xlinker -rpath $(ABSOLUTE_LIB_DIR)
-- 
2.16.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 06/42] libical: refresh patches

[Alexander Kanavin]

From: Ross Burton 

The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.

Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450).  This is obviously bad.

We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.

Signed-off-by: Ross Burton 
Signed-off-by: Alexander Kanavin 
---
 .../libical/libical/Remove-cmake-check-for-Perl.patch   | 17 +++--
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git 
a/meta/recipes-support/libical/libical/Remove-cmake-check-for-Perl.patch 
b/meta/recipes-support/libical/libical/Remove-cmake-check-for-Perl.patch
index c5c0cb076e6..b50f50e7017 100644
--- a/meta/recipes-support/libical/libical/Remove-cmake-check-for-Perl.patch
+++ b/meta/recipes-support/libical/libical/Remove-cmake-check-for-Perl.patch
@@ -14,11 +14,11 @@ Signed-off-by: Jussi Kukkonen 
  CMakeLists.txt | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d5aad80..5cc9863 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -91,8 +91,7 @@ if(SHARED_ONLY)
+Index: libical-2.0.0/CMakeLists.txt
+===
+--- libical-2.0.0.orig/CMakeLists.txt
 libical-2.0.0/CMakeLists.txt
+@@ -116,8 +116,7 @@ if(SHARED_ONLY)
set(LIBRARY_TYPE SHARED)
  endif()
  
@@ -26,8 +26,5 @@ index d5aad80..5cc9863 100644
 -find_package(Perl REQUIRED)
 +set(PERL_EXECUTABLE perl)
  
- # MSVC specific definitions
- if(WIN32)
--- 
-2.1.4
-
+ # Ensure finding 64bit libs when using 64-bit compilers
+ if(CMAKE_CL_64)
-- 
2.16.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 07/42] gmp: refresh patches

[Alexander Kanavin]

From: Ross Burton 

The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.

Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450).  This is obviously bad.

We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.

Signed-off-by: Ross Burton 
Signed-off-by: Alexander Kanavin 
---
 ...fiure.ac-Believe-the-cflags-from-environment.patch | 19 ---
 meta/recipes-support/gmp/gmp-6.1.2/amd64.patch| 10 +-
 .../gmp/gmp-6.1.2/use-includedir.patch| 14 +++---
 3 files changed, 20 insertions(+), 23 deletions(-)

diff --git 
a/meta/recipes-support/gmp/gmp-6.1.2/0001-confiure.ac-Believe-the-cflags-from-environment.patch
 
b/meta/recipes-support/gmp/gmp-6.1.2/0001-confiure.ac-Believe-the-cflags-from-environment.patch
index 665367658bc..1e47924ccc7 100644
--- 
a/meta/recipes-support/gmp/gmp-6.1.2/0001-confiure.ac-Believe-the-cflags-from-environment.patch
+++ 
b/meta/recipes-support/gmp/gmp-6.1.2/0001-confiure.ac-Believe-the-cflags-from-environment.patch
@@ -18,13 +18,13 @@ Upstream-Status: Inappropriate[OE-Specific]
  configure.ac | 11 ---
  1 file changed, 11 deletions(-)
 
-diff --git a/configure.ac b/configure.ac
-index 857ea3b..359e919 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -607,15 +607,6 @@ case $host in
- GMP_INCLUDE_MPN(arm/arm-defs.m4)
- CALLING_CONVENTIONS_OBJS='arm32call.lo arm32check.lo'
+Index: gmp-6.1.2/configure.ac
+===
+--- gmp-6.1.2.orig/configure.ac
 gmp-6.1.2/configure.ac
+@@ -604,15 +604,6 @@ case $host in
+ any_32_testlist="sizeof-long-4"
+ any_64_testlist="sizeof-long-8"
  
 -# This is needed for clang, which is not content with flags like 
-mfpu=neon
 -# alone.
@@ -38,7 +38,7 @@ index 857ea3b..359e919 100644
  # FIXME: We make mandatory compiler options optional here.  We should
  # either enforce them, or organise to strip paths as the corresponding
  # options fail.
-@@ -686,8 +677,6 @@ case $host in
+@@ -746,8 +737,6 @@ case $host in
;;
*)
path="arm"
@@ -47,6 +47,3 @@ index 857ea3b..359e919 100644
;;
  esac
  ;;
--- 
-1.9.1
-
diff --git a/meta/recipes-support/gmp/gmp-6.1.2/amd64.patch 
b/meta/recipes-support/gmp/gmp-6.1.2/amd64.patch
index 564d12d42b9..3935589f8b2 100644
--- a/meta/recipes-support/gmp/gmp-6.1.2/amd64.patch
+++ b/meta/recipes-support/gmp/gmp-6.1.2/amd64.patch
@@ -1,10 +1,10 @@
 Upstream-Status: Pending
 
-Index: gmp-5.0.3/longlong.h
+Index: gmp-6.1.2/longlong.h
 ===
 gmp-5.0.3.orig/longlong.h
-+++ gmp-5.0.3/longlong.h
-@@ -994,8 +994,10 @@ extern UWtype __MPN(udiv_qrnnd) _PROTO (
+--- gmp-6.1.2.orig/longlong.h
 gmp-6.1.2/longlong.h
+@@ -1036,8 +1036,10 @@ extern UWtype __MPN(udiv_qrnnd) (UWtype
 count is only an int. */
  #define count_trailing_zeros(count, x)
\
do {
\
@@ -14,5 +14,5 @@ Index: gmp-5.0.3/longlong.h
 +__asm__ ("bsfq %1,%0" : "=r" (__cbtmp) : "rm" ((UDItype)(x)));\
 +(count) = __cbtmp;
\
} while (0)
- #endif /* x86_64 */
+ #endif /* __amd64__ */
  
diff --git a/meta/recipes-support/gmp/gmp-6.1.2/use-includedir.patch 
b/meta/recipes-support/gmp/gmp-6.1.2/use-includedir.patch
index 74904a25302..6b089cf39c2 100644
--- a/meta/recipes-support/gmp/gmp-6.1.2/use-includedir.patch
+++ b/meta/recipes-support/gmp/gmp-6.1.2/use-includedir.patch
@@ -1,15 +1,15 @@
 Upstream-Status: Pending
 
-Index: gmp-4.2.4/Makefile.am
+Index: gmp-6.1.2/Makefile.am
 ===
 gmp-4.2.4.orig/Makefile.am 2008-09-10 19:31:27.0 +
-+++ gmp-4.2.4/Makefile.am  2009-07-06 20:19:19.0 +
-@@ -106,7 +106,7 @@
- # but anyone knowledgable enough to be playing with exec_prefix will be able
+--- gmp-6.1.2.orig/Makefile.am
 gmp-6.1.2/Makefile.am
+@@ -130,7 +130,7 @@ EXTRA_DIST += gmpxx.h
+ # but anyone knowledgeable enough to be playing with exec_prefix will be able
  # to address that.
  #
 -includeexecdir = $(exec_prefix)/include
 +includeexecdir = $(includedir)
  include_HEADERS = $(GMPXX_HEADERS_OPTION)
- nodist_includeexec_HEADERS = gmp.h $(MPBSD_HEADERS_OPTION)
- lib_LTLIBRARIES = libgmp.la $(GMPXX_LTLIBRARIES_OPTION) 
$(MPBSD_LTLIBRARIES_OPTION)
+ nodist_includeexec_HEADERS = gmp.h
+ lib_LTLIBRARIES = libgmp.la $(GMPXX_LTLIBRARIES_OPTION)
-- 
2.16.1

-- 
___

[OE-core] [PATCH 09/42] libffi: refresh patches

[Alexander Kanavin]

From: Ross Burton 

The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.

Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450).  This is obviously bad.

We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.

Signed-off-by: Ross Burton 
Signed-off-by: Alexander Kanavin 
---
 meta/recipes-support/libffi/libffi/not-win32.patch | 12 
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-support/libffi/libffi/not-win32.patch 
b/meta/recipes-support/libffi/libffi/not-win32.patch
index 1e90125edd7..80c40a4742d 100644
--- a/meta/recipes-support/libffi/libffi/not-win32.patch
+++ b/meta/recipes-support/libffi/libffi/not-win32.patch
@@ -11,12 +11,16 @@ As this block is generally pointless, disable it.
 Upstream-Status: Inappropriate
 Signed-off-by: Ross Burton 
 
 a/configure.ac~2014-11-12 11:56:51.0 +
-+++ b/configure.ac 2016-02-04 14:02:53.765710532 +
-@@ -593,5 +593,5 @@
+Index: libffi-3.2.1/configure.ac
+===
+--- libffi-3.2.1.orig/configure.ac
 libffi-3.2.1/configure.ac
+@@ -592,7 +592,7 @@ AC_ARG_ENABLE(purify-safety,
+ 
  # These variables are only ever used when we cross-build to X86_WIN32.
  # And we only support this with GCC, so...
 -if test "x$GCC" = "xyes"; then
 +if false; then
if test -n "$with_cross_host" &&
-  test x"$with_cross_host" != x"no"; then
\ No newline at end of file
+  test x"$with_cross_host" != x"no"; then
+ toolexecdir="${exec_prefix}"/'$(target_alias)'
-- 
2.16.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 08/42] gnutls: refresh patches

[Alexander Kanavin]

From: Ross Burton 

The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.

Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450).  This is obviously bad.

We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.

Signed-off-by: Ross Burton 
Signed-off-by: Alexander Kanavin 
---
 .../gnutls/gnutls/0001-configure.ac-fix-sed-command.patch | 15 ++-
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git 
a/meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch 
b/meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch
index f0b7ca2ec84..b6e7bc96504 100644
--- a/meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch
+++ b/meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch
@@ -14,19 +14,16 @@ Signed-off-by: Alexander Kanavin 
  configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/configure.ac b/configure.ac
-index 6907b21..7c70d9e 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -948,7 +948,7 @@ YEAR=`date +%Y`
+Index: gnutls-3.5.16/configure.ac
+===
+--- gnutls-3.5.16.orig/configure.ac
 gnutls-3.5.16/configure.ac
+@@ -955,7 +955,7 @@ YEAR=`date +%Y`
  AC_SUBST([YEAR], $YEAR)
  
  for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak; do
 -  nam=$(basename $i|sed 's/.bak//g')
 +  nam=$(basename $i|sed 's/\.bak$//')
if test "$create_libopts_links" = "yes";then
+   rm -f "src/$nam.stamp"
rm -f "src/$nam"
-   AC_CONFIG_LINKS([src/$nam:$i])
--- 
-2.11.0
-
-- 
2.16.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 12/42] gstreamer: refresh patches

[Alexander Kanavin]

From: Ross Burton 

The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.

Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450).  This is obviously bad.

We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.

Signed-off-by: Ross Burton 
Signed-off-by: Alexander Kanavin 
---
 .../configure-allow-to-disable-libssh2.patch   |  17 ++-
 ...-prefix-calls-to-pkg-config-with-PKG_CONF.patch | 135 ++---
 2 files changed, 73 insertions(+), 79 deletions(-)

diff --git 
a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/configure-allow-to-disable-libssh2.patch
 
b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/configure-allow-to-disable-libssh2.patch
index d52afd5d57b..ad863298938 100644
--- 
a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/configure-allow-to-disable-libssh2.patch
+++ 
b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/configure-allow-to-disable-libssh2.patch
@@ -18,11 +18,11 @@ Signed-off-by: Wenzong Fan 
  configure.ac |   23 +--
  1 file changed, 17 insertions(+), 6 deletions(-)
 
-diff --git a/configure.ac b/configure.ac
-index 0e95c5c..12153b4 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -1901,6 +1901,15 @@ AG_GST_CHECK_FEATURE(CHROMAPRINT, [chromaprint], 
chromaprint, [
+Index: gst-plugins-bad-1.12.3/configure.ac
+===
+--- gst-plugins-bad-1.12.3.orig/configure.ac
 gst-plugins-bad-1.12.3/configure.ac
+@@ -2139,6 +2139,15 @@ AG_GST_CHECK_FEATURE(CHROMAPRINT, [chrom
  ])
  
  dnl *** Curl ***
@@ -37,8 +37,8 @@ index 0e95c5c..12153b4 100644
 +
  translit(dnm, m, l) AM_CONDITIONAL(USE_CURL, true)
  AG_GST_CHECK_FEATURE(CURL, [Curl plugin], curl, [
-   PKG_CHECK_MODULES(CURL, libcurl >= 7.21.0, [
-@@ -1915,12 +1924,14 @@ AG_GST_CHECK_FEATURE(CURL, [Curl plugin], curl, [
+   PKG_CHECK_MODULES(CURL, libcurl >= 7.35.0, [
+@@ -2161,12 +2170,14 @@ AG_GST_CHECK_FEATURE(CURL, [Curl plugin]
])
AC_SUBST(CURL_CFLAGS)
AC_SUBST(CURL_LIBS)
@@ -59,6 +59,3 @@ index 0e95c5c..12153b4 100644
AM_CONDITIONAL(USE_SSH2, test "x$HAVE_SSH2" = "xyes")
AC_SUBST(SSH2_CFLAGS)
AC_SUBST(SSH2_LIBS)
--- 
-1.7.9.5
-
diff --git 
a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch
 
b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch
index 0a8bc9b076d..6616e2cf0d7 100644
--- 
a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch
+++ 
b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch
@@ -20,11 +20,11 @@ Signed-off-by: Alexander Kanavin 
  gst-libs/gst/video/Makefile.am  |  8 
  11 files changed, 38 insertions(+), 38 deletions(-)
 
-diff --git a/gst-libs/gst/allocators/Makefile.am 
b/gst-libs/gst/allocators/Makefile.am
-index bc7f53a..0ef5f86 100644
 a/gst-libs/gst/allocators/Makefile.am
-+++ b/gst-libs/gst/allocators/Makefile.am
-@@ -35,7 +35,7 @@ GstAllocators-@GST_API_VERSION@.gir: 
$(INTROSPECTION_SCANNER) libgstallocators-@
+Index: gst-plugins-base-1.12.3/gst-libs/gst/allocators/Makefile.am
+===
+--- gst-plugins-base-1.12.3.orig/gst-libs/gst/allocators/Makefile.am
 gst-plugins-base-1.12.3/gst-libs/gst/allocators/Makefile.am
+@@ -36,7 +36,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(I
--c-include "gst/allocators/allocators.h" \
-I$(top_srcdir)/gst-libs \
-I$(top_builddir)/gst-libs \
@@ -33,7 +33,7 @@ index bc7f53a..0ef5f86 100644
--library=libgstallocators-@GST_API_VERSION@.la \
--include=Gst-@GST_API_VERSION@ \
--libtool="$(LIBTOOL)" \
-@@ -59,7 +59,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
+@@ -60,7 +60,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=
$(INTROSPECTION_COMPILER) \
--includedir=$(srcdir) \
--includedir=$(builddir) \
@@ -42,11 +42,11 @@ index bc7f53a..0ef5f86 100644
$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
  
  CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
-diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am
-index dcc2fe0..dc076cb 100644
 a/gst-libs/gst/app/Makefile.am
-+++ b/gst-libs/gst/app/Makefile.am
-@@ -48,8 +48,8 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) 
libgstapp-@GST_API_VERSIO
+Index: gst-plu

[OE-core] [PATCH 10/42] libksba: refresh patches

[Alexander Kanavin]

From: Ross Burton 

The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.

Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450).  This is obviously bad.

We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.

Signed-off-by: Ross Burton 
Signed-off-by: Alexander Kanavin 
---
 .../libksba/ksba-add-pkgconfig-support.patch   | 38 +++---
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git 
a/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch 
b/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch
index d28dfd9ebeb..5afe6de923f 100644
--- a/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch
+++ b/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch
@@ -6,13 +6,13 @@ They think pkgconfig adds no portability and maintaining them 
is not worthwhile.
 
 Signed-off-by: Chen Qi 
 
-Index: libksba-1.3.0/Makefile.am
+Index: libksba-1.3.5/Makefile.am
 ===
 libksba-1.3.0.orig/Makefile.am 2014-05-13 21:39:22.390385646 +
-+++ libksba-1.3.0/Makefile.am  2014-05-13 21:39:22.462385646 +
-@@ -21,6 +21,9 @@
+--- libksba-1.3.5.orig/Makefile.am
 libksba-1.3.5/Makefile.am
+@@ -20,6 +20,9 @@
+ 
  ACLOCAL_AMFLAGS = -I m4 -I gl/m4
- AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip
  
 +pkgconfigdir = ${libdir}/pkgconfig
 +pkgconfig_DATA = ksba.pc
@@ -20,11 +20,11 @@ Index: libksba-1.3.0/Makefile.am
  # (A suitable gitlog-to-changelog script can be found in GnuPG master.)
  GITLOG_TO_CHANGELOG=gitlog-to-changelog
  
-Index: libksba-1.3.0/configure.ac
+Index: libksba-1.3.5/configure.ac
 ===
 libksba-1.3.0.orig/configure.ac2014-05-13 21:39:22.390385646 +
-+++ libksba-1.3.0/configure.ac 2014-05-13 21:39:22.462385646 +
-@@ -400,6 +400,7 @@
+--- libksba-1.3.5.orig/configure.ac
 libksba-1.3.5/configure.ac
+@@ -414,6 +414,7 @@ gl/Makefile
  src/Makefile
  src/ksba-config
  src/versioninfo.rc
@@ -32,10 +32,10 @@ Index: libksba-1.3.0/configure.ac
  tests/Makefile
  doc/Makefile
  ])
-Index: libksba-1.3.0/ksba.pc.in
+Index: libksba-1.3.5/ksba.pc.in
 ===
 /dev/null  1970-01-01 00:00:00.0 +
-+++ libksba-1.3.0/ksba.pc.in   2014-05-13 21:39:22.462385646 +
+--- /dev/null
 libksba-1.3.5/ksba.pc.in
 @@ -0,0 +1,17 @@
 +prefix=@prefix@
 +exec_prefix=@exec_prefix@
@@ -54,11 +54,11 @@ Index: libksba-1.3.0/ksba.pc.in
 +Libs.private: -L${libdir} -lgpg-error
 +Cflags: -I${includedir}
 +
-Index: libksba-1.3.0/src/ksba.m4
+Index: libksba-1.3.5/src/ksba.m4
 ===
 libksba-1.3.0.orig/src/ksba.m4 2014-05-13 21:39:22.390385646 +
-+++ libksba-1.3.0/src/ksba.m4  2014-05-13 21:49:03.650382696 +
-@@ -22,18 +22,7 @@
+--- libksba-1.3.5.orig/src/ksba.m4
 libksba-1.3.5/src/ksba.m4
+@@ -22,18 +22,7 @@ dnl with a changed API.
  dnl
  AC_DEFUN([AM_PATH_KSBA],
  [AC_REQUIRE([AC_CANONICAL_HOST])
@@ -77,7 +77,7 @@ Index: libksba-1.3.0/src/ksba.m4
tmp=ifelse([$1], ,1:1.0.0,$1)
if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
   req_ksba_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
-@@ -43,48 +32,13 @@
+@@ -43,48 +32,13 @@ AC_DEFUN([AM_PATH_KSBA],
   min_ksba_version="$tmp"
fi
  
@@ -129,7 +129,7 @@ Index: libksba-1.3.0/src/ksba.m4
  if test "$tmp" -gt 0 ; then
 AC_MSG_CHECKING([KSBA API version])
 if test "$req_ksba_api" -eq "$tmp" ; then
-@@ -97,10 +51,8 @@
+@@ -97,10 +51,8 @@ AC_DEFUN([AM_PATH_KSBA],
   fi
fi
if test $ok = yes; then
@@ -141,7 +141,7 @@ Index: libksba-1.3.0/src/ksba.m4
  if test x"$libksba_config_host" != xnone ; then
if test x"$libksba_config_host" != x"$host" ; then
AC_MSG_WARN([[
-@@ -114,8 +66,6 @@
+@@ -114,8 +66,6 @@ AC_DEFUN([AM_PATH_KSBA],
fi
  fi
else
-- 
2.16.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 11/42] libtiff: refresh patches

[Alexander Kanavin]

From: Ross Burton 

The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.

Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450).  This is obviously bad.

We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.

Signed-off-by: Ross Burton 
Signed-off-by: Alexander Kanavin 
---
 meta/recipes-multimedia/libtiff/files/libtool2.patch | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-multimedia/libtiff/files/libtool2.patch 
b/meta/recipes-multimedia/libtiff/files/libtool2.patch
index 457202eae50..4798e470719 100644
--- a/meta/recipes-multimedia/libtiff/files/libtool2.patch
+++ b/meta/recipes-multimedia/libtiff/files/libtool2.patch
@@ -4,13 +4,13 @@ Upstream-Status: Inappropriate [configuration]
  configure.ac |2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: tiff-3.9.5/configure.ac
+Index: tiff-4.0.8/configure.ac
 ===
 tiff-3.9.5.orig/configure.ac
-+++ tiff-3.9.5/configure.ac
+--- tiff-4.0.8.orig/configure.ac
 tiff-4.0.8/configure.ac
 @@ -27,7 +27,7 @@ dnl Process this file with autoconf to p
  AC_PREREQ(2.64)
- AC_INIT([LibTIFF Software],[3.9.5],[t...@lists.maptools.org],[tiff])
+ AC_INIT([LibTIFF Software],[4.0.8],[t...@lists.maptools.org],[tiff])
  AC_CONFIG_AUX_DIR(config)
 -AC_CONFIG_MACRO_DIR(m4)
 +dnl AC_CONFIG_MACRO_DIR(m4)
-- 
2.16.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 13/42] kmod: refresh patches

[Alexander Kanavin]

From: Ross Burton 

The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.

Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450).  This is obviously bad.

We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.

Signed-off-by: Ross Burton 
Signed-off-by: Alexander Kanavin 
---
 meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch | 13 +
 meta/recipes-kernel/kmod/kmod/fix-O_CLOEXEC.patch| 15 ++-
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch 
b/meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch
index feafcb9b7c6..5f45fce932e 100644
--- a/meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch
+++ b/meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch
@@ -11,10 +11,10 @@ Upstream-Status: Inappropriate (disable feature 
incompatible with ptest)
  configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/configure.ac b/configure.ac
-index eb0f9d1..a539968 100644
 a/configure.ac
-+++ b/configure.ac
+Index: git/configure.ac
+===
+--- git.orig/configure.ac
 git/configure.ac
 @@ -14,7 +14,7 @@ AC_USE_SYSTEM_EXTENSIONS
  AC_SYS_LARGEFILE
  AC_PREFIX_DEFAULT([/usr])
@@ -23,7 +23,4 @@ index eb0f9d1..a539968 100644
 +AM_INIT_AUTOMAKE([check-news foreign 1.11 silent-rules tar-pax no-dist-gzip 
dist-xz subdir-objects color-tests serial-tests])
  AM_SILENT_RULES([yes])
  LT_INIT([disable-static pic-only])
- 
--- 
-1.9.1
-
+ DOLT
diff --git a/meta/recipes-kernel/kmod/kmod/fix-O_CLOEXEC.patch 
b/meta/recipes-kernel/kmod/kmod/fix-O_CLOEXEC.patch
index 8161d6128d3..5d9d40c387f 100644
--- a/meta/recipes-kernel/kmod/kmod/fix-O_CLOEXEC.patch
+++ b/meta/recipes-kernel/kmod/kmod/fix-O_CLOEXEC.patch
@@ -18,12 +18,12 @@ Upstream-Status: Pending
  libkmod/libkmod-internal.h |4 
  1 file changed, 4 insertions(+)
 
-diff --git a/libkmod/libkmod-internal.h b/libkmod/libkmod-internal.h
-index 0180124..100b40f 100644
 a/libkmod/libkmod-internal.h
-+++ b/libkmod/libkmod-internal.h
-@@ -9,6 +9,10 @@
- #include "macro.h"
+Index: git/libkmod/libkmod-internal.h
+===
+--- git.orig/libkmod/libkmod-internal.h
 git/libkmod/libkmod-internal.h
+@@ -10,6 +10,10 @@
+ 
  #include "libkmod.h"
  
 +#ifndef O_CLOEXEC
@@ -33,6 +33,3 @@ index 0180124..100b40f 100644
  static _always_inline_ _printf_format_(2, 3) void
kmod_log_null(struct kmod_ctx *ctx, const char *format, ...) {}
  
--- 
-1.7.10.4
-
-- 
2.16.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 15/42] lttng: refresh patches

[Alexander Kanavin]

From: Ross Burton 

The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.

Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450).  This is obviously bad.

We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.

Signed-off-by: Ross Burton 
Signed-off-by: Alexander Kanavin 
---
 .../lttng/lttng-ust/lttng-ust-doc-examples-disable.patch  | 11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git 
a/meta/recipes-kernel/lttng/lttng-ust/lttng-ust-doc-examples-disable.patch 
b/meta/recipes-kernel/lttng/lttng-ust/lttng-ust-doc-examples-disable.patch
index 0f18c5d9f1b..bff852799d0 100644
--- a/meta/recipes-kernel/lttng/lttng-ust/lttng-ust-doc-examples-disable.patch
+++ b/meta/recipes-kernel/lttng/lttng-ust/lttng-ust-doc-examples-disable.patch
@@ -6,13 +6,12 @@ recipe anyway.
 
 Signed-off-by: Tom Zanussi 
 
-Index: doc/Makefile.am
+Index: lttng-ust-2.9.1/doc/Makefile.am
 ===
 a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -1,4 +1,4 @@
+--- lttng-ust-2.9.1.orig/doc/Makefile.am
 lttng-ust-2.9.1/doc/Makefile.am
+@@ -1,3 +1,3 @@
 -SUBDIRS = . man examples
 +SUBDIRS = . man
  
- dist_man_MANS = man/lttng-gen-tp.1 \
-   man/lttng-ust.3 \
+ dist_doc_DATA = java-agent.txt
-- 
2.16.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 14/42] dtc: refresh patches

[Alexander Kanavin]

From: Ross Burton 

The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.

Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450).  This is obviously bad.

We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.

Signed-off-by: Ross Burton 
Signed-off-by: Alexander Kanavin 
---
 meta/recipes-kernel/dtc/dtc/make_install.patch | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-kernel/dtc/dtc/make_install.patch 
b/meta/recipes-kernel/dtc/dtc/make_install.patch
index 1120617e7be..ccf17b38fdb 100644
--- a/meta/recipes-kernel/dtc/dtc/make_install.patch
+++ b/meta/recipes-kernel/dtc/dtc/make_install.patch
@@ -2,11 +2,11 @@ Upstream-Status: Inappropriate [configuration]
 
 Index: git/Makefile
 ===
 git.orig/Makefile  2011-11-02 14:52:17.243104779 -0700
-+++ git/Makefile   2011-11-02 15:06:01.555104982 -0700
-@@ -161,8 +161,8 @@
-   $(INSTALL) -d $(DESTDIR)$(BINDIR)
-   $(INSTALL) $(BIN) $(SCRIPTS) $(DESTDIR)$(BINDIR)
+--- git.orig/Makefile
 git/Makefile
+@@ -168,8 +168,8 @@ install-bin: all $(SCRIPTS)
+ install-lib: all
+   @$(VECHO) INSTALL-LIB
$(INSTALL) -d $(DESTDIR)$(LIBDIR)
 -  $(INSTALL) $(LIBFDT_lib) $(DESTDIR)$(LIBDIR)
 -  ln -sf $(notdir $(LIBFDT_lib)) $(DESTDIR)$(LIBDIR)/$(LIBFDT_soname)
@@ -14,4 +14,4 @@ Index: git/Makefile
 +  ln -sf $(LIBFDT_soname) $(DESTDIR)$(LIBDIR)/$(notdir $(LIBFDT_lib))
ln -sf $(LIBFDT_soname) $(DESTDIR)$(LIBDIR)/libfdt.$(SHAREDLIB_EXT)
$(INSTALL) -m 644 $(LIBFDT_archive) $(DESTDIR)$(LIBDIR)
-   $(INSTALL) -d $(DESTDIR)$(INCLUDEDIR)
+ 
-- 
2.16.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 16/42] wayland: refresh patches

[Alexander Kanavin]

From: Ross Burton 

The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.

Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450).  This is obviously bad.

We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.

Signed-off-by: Ross Burton 
Signed-off-by: Alexander Kanavin 
---
 .../wayland/wayland/fixpathinpcfiles.patch |  3 +--
 .../wayland/weston/0001-make-error-portable.patch  | 22 ++
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch 
b/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch
index 9fb12522843..ad3526d9845 100644
--- a/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch
+++ b/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch
@@ -21,8 +21,7 @@ Index: wayland-1.14.0/src/wayland-scanner.pc.in
 ===
 --- wayland-1.14.0.orig/src/wayland-scanner.pc.in
 +++ wayland-1.14.0/src/wayland-scanner.pc.in
-@@ -1,8 +1,8 @@
- prefix=@prefix@
+@@ -2,7 +2,7 @@ prefix=@prefix@
  exec_prefix=@exec_prefix@
  datarootdir=@datarootdir@
  pkgdatadir=@datadir@/@PACKAGE@
diff --git 
a/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch 
b/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
index e2213aca60c..0671a450442 100644
--- a/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
+++ b/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
@@ -16,9 +16,11 @@ Upstream-Status: Submitted
  3 files changed, 23 insertions(+), 1 deletion(-)
  create mode 100644 src/weston-error.h
 
 a/configure.ac
-+++ b/configure.ac
-@@ -60,6 +60,8 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[],
+Index: weston-3.0.0/configure.ac
+===
+--- weston-3.0.0.orig/configure.ac
 weston-3.0.0/configure.ac
+@@ -103,6 +103,8 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[],
  [[#include ]])
  AC_CHECK_HEADERS([execinfo.h])
  
@@ -26,9 +28,11 @@ Upstream-Status: Submitted
 +
  AC_CHECK_FUNCS([mkostemp strchrnul initgroups posix_fallocate])
  
- COMPOSITOR_MODULES="wayland-server >= $WAYLAND_PREREQ_VERSION pixman-1 >= 
0.25.2"
+ # check for libdrm as a build-time dependency only
+Index: weston-3.0.0/libweston/weston-error.h
+===
 --- /dev/null
-+++ b/libweston/weston-error.h
 weston-3.0.0/libweston/weston-error.h
 @@ -0,0 +1,20 @@
 +#ifndef _WESTON_ERROR_H
 +#define _WESTON_ERROR_H
@@ -50,8 +54,10 @@ Upstream-Status: Submitted
 +
 +#endif
 +
 a/libweston/weston-launch.c
-+++ b/libweston/weston-launch.c
+Index: weston-3.0.0/libweston/weston-launch.c
+===
+--- weston-3.0.0.orig/libweston/weston-launch.c
 weston-3.0.0/libweston/weston-launch.c
 @@ -33,7 +33,6 @@
  #include 
  #include 
@@ -60,7 +66,7 @@ Upstream-Status: Submitted
  #include 
  
  #include 
-@@ -59,6 +58,7 @@
+@@ -60,6 +59,7 @@
  #endif
  
  #include "weston-launch.h"
-- 
2.16.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 17/42] clutter: refresh patches

[Alexander Kanavin]

From: Ross Burton 

The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.

Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450).  This is obviously bad.

We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.

Signed-off-by: Ross Burton 
Signed-off-by: Alexander Kanavin 
---
 .../clutter/clutter-1.0/install-examples.patch| 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch 
b/meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch
index 3b6a70ef0a7..ce9ab3a2489 100644
--- a/meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch
+++ b/meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch
@@ -3,11 +3,11 @@ Install the examples to $libdir/clutter/.
 Signed-off-by: Ross Burton 
 Upstream-Status: Inappropriate
 
-diff --git a/examples/Makefile.am b/examples/Makefile.am
-index 4b9b449..232cd19 100644
 a/examples/Makefile.am
-+++ b/examples/Makefile.am
-@@ -38,6 +38,7 @@ AM_CPPFLAGS = \
+Index: clutter-1.26.2/examples/Makefile.am
+===
+--- clutter-1.26.2.orig/examples/Makefile.am
 clutter-1.26.2/examples/Makefile.am
+@@ -33,7 +33,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/clutter \
-I$(top_builddir)/clutter
  
@@ -16,3 +16,4 @@ index 4b9b449..232cd19 100644
 +example_PROGRAMS = $(all_examples)
  
  EXTRA_DIST = redhand.png
+ 
-- 
2.16.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 18/42] xset: refresh patches

[Alexander Kanavin]

From: Ross Burton 

The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.

Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450).  This is obviously bad.

We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.

Signed-off-by: Alexander Kanavin 
---
 meta/recipes-graphics/xorg-app/xset/disable-xkb.patch | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch 
b/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch
index 97d13a30df8..a97c7b72fac 100644
--- a/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch
+++ b/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch
@@ -4,11 +4,11 @@ Upstream-Status: Pending
 
 Rebase for 1.2.1 by: Yu Ke 
 
-diff --git a/configure.ac b/configure.ac
-index 81c3ae4..26601bf 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -52,11 +52,15 @@ PKG_CHECK_MODULES(SET_XEXT, xext,
+Index: xset-1.2.3/configure.ac
+===
+--- xset-1.2.3.orig/configure.ac
 xset-1.2.3/configure.ac
+@@ -53,11 +53,15 @@ PKG_CHECK_MODULES(SET_XEXT, xext,
AC_CHECK_HEADERS([X11/extensions/dpms.h 
X11/extensions/MITMisc.h],,,[#include ])
CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
  
@@ -22,5 +22,5 @@ index 81c3ae4..26601bf 100644
CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
 +fi
  
- AC_ARG_WITH(xf86misc, AC_HELP_STRING([--without-xf86misc],[Disable xf86misc 
support.]),
+ AC_ARG_WITH(xf86misc, AS_HELP_STRING([--without-xf86misc],[Disable xf86misc 
support.]),
  [USE_XF86MISC="$withval"], [USE_XF86MISC="yes"])
-- 
2.16.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 19/42] at: refresh patches

[Alexander Kanavin]

From: Ross Burton 

The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.

Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450).  This is obviously bad.

We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.

Signed-off-by: Ross Burton 
Signed-off-by: Alexander Kanavin 
---
 meta/recipes-extended/at/at/makefile-fix-parallel.patch | 15 ++-
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/meta/recipes-extended/at/at/makefile-fix-parallel.patch 
b/meta/recipes-extended/at/at/makefile-fix-parallel.patch
index 932a4c0bfe6..d6056dceffa 100644
--- a/meta/recipes-extended/at/at/makefile-fix-parallel.patch
+++ b/meta/recipes-extended/at/at/makefile-fix-parallel.patch
@@ -15,13 +15,13 @@ Signed-off-by: Robert Yang 
  Makefile |4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
-diff --git a/Makefile.in b/Makefile.in
-index 2a9b918..aa7c04a 100644
 a/Makefile.in
-+++ b/Makefile.in
-@@ -75,7 +75,9 @@ at: $(ATOBJECTS)
+Index: at-3.1.20/Makefile.in
+===
+--- at-3.1.20.orig/Makefile.in
 at-3.1.20/Makefile.in
+@@ -76,7 +76,9 @@ at: $(ATOBJECTS)
  atd: $(RUNOBJECTS)
-   $(CC) $(LDFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB)
+   $(CC) $(LDFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB) $(SELINUXLIB)
  
 -y.tab.c y.tab.h: parsetime.y
 +y.tab.h: y.tab.c
@@ -30,6 +30,3 @@ index 2a9b918..aa7c04a 100644
$(YACC) -d parsetime.y
  
  lex.yy.c: parsetime.l
--- 
-1.7.9.5
-
-- 
2.16.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 21/42] ethtool: refresh patches

[Alexander Kanavin]

From: Ross Burton 

The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.

Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450).  This is obviously bad.

We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.

Signed-off-by: Ross Burton 
Signed-off-by: Alexander Kanavin 
---
 .../ethtool/ethtool/avoid_parallel_tests.patch| 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch 
b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch
index bf66267e81b..dbf7142f18a 100644
--- a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch
+++ b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch
@@ -5,11 +5,12 @@ Signed-off-by: Tudor Florea 
 Upstream-Status: Inappropriate
 (default automake behavior incompatible with ptest)
 
-diff -ruN a/configure.ac b/configure.ac
 a/configure.ac 2014-05-28 18:19:13.513980977 +0200
-+++ b/configure.ac 2014-05-28 18:19:21.129660215 +0200
-@@ -2,7 +2,7 @@
- AC_INIT(ethtool, 3.14, net...@vger.kernel.org)
+Index: ethtool-4.11/configure.ac
+===
+--- ethtool-4.11.orig/configure.ac
 ethtool-4.11/configure.ac
+@@ -2,7 +2,7 @@ dnl Process this file with autoconf to p
+ AC_INIT(ethtool, 4.11, net...@vger.kernel.org)
  AC_PREREQ(2.52)
  AC_CONFIG_SRCDIR([ethtool.c])
 -AM_INIT_AUTOMAKE([gnu])
-- 
2.16.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 22/42] ghostscript: refresh patches

[Alexander Kanavin]

From: Ross Burton 

The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.

Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450).  This is obviously bad.

We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.

Signed-off-by: Ross Burton 
Signed-off-by: Alexander Kanavin 
---
 .../ghostscript/ghostscript/ghostscript-9.02-genarch.patch| 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git 
a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patch 
b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patch
index e28a949bf71..b4c14ea231e 100644
--- 
a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patch
+++ 
b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patch
@@ -12,11 +12,12 @@ Signed-off-by: Wenzong Fan 
 # Summary: Generate arch.h for ppc32
 #
 
-diff -Nru ghostscript-8.64.orig/base/lib.mak ghostscript-8.64/base/lib.mak
 ghostscript-8.64.orig/base/lib.mak 2010-02-10 10:30:02.0 +0800
-+++ ghostscript-8.64/base/lib.mak  2010-02-10 10:56:21.0 +0800
-@@ -67,8 +67,8 @@
- stdpre_h=$(GLSRC)stdpre.h $(stdpn_h)
+Index: ghostscript-9.21/base/lib.mak
+===
+--- ghostscript-9.21.orig/base/lib.mak
 ghostscript-9.21/base/lib.mak
+@@ -73,8 +73,8 @@ arch_h=$(GLGEN)arch.h
+ stdpre_h=$(GLSRC)stdpre.h
  stdint__h=$(GLSRC)stdint_.h $(std_h)
  
 -$(GLGEN)arch.h : $(GENARCH_XE)
-- 
2.16.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 20/42] bash: refresh patches

[Alexander Kanavin]

From: Ross Burton 

The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.

Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450).  This is obviously bad.

We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.

Signed-off-by: Ross Burton 
Signed-off-by: Alexander Kanavin 
---
 meta/recipes-extended/bash/bash/execute_cmd.patch | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-extended/bash/bash/execute_cmd.patch 
b/meta/recipes-extended/bash/bash/execute_cmd.patch
index 81f8f0a9cd5..9970b4d8f93 100644
--- a/meta/recipes-extended/bash/bash/execute_cmd.patch
+++ b/meta/recipes-extended/bash/bash/execute_cmd.patch
@@ -1,8 +1,10 @@
 Upstream-Status: Inappropriate [embedded specific]
 
 execute_cmd.c.orig Fri Jun  3 13:34:42 2011
-+++ execute_cmd.c  Fri Jun  3 13:36:41 2011
-@@ -2202,7 +2202,11 @@
+Index: execute_cmd.c
+===
+--- execute_cmd.c.orig
 execute_cmd.c
+@@ -2459,7 +2459,11 @@ execute_pipeline (command, asynchronous,
/* If the `lastpipe' option is set with shopt, and job control is not
   enabled, execute the last element of non-async pipelines in the
   current shell environment. */
@@ -13,5 +15,5 @@ Upstream-Status: Inappropriate [embedded specific]
 +#endif
 +  asynchronous == 0 && pipe_out == NO_PIPE && prev > 0)
  {
-   lstdin = move_to_high_fd (0, 0, 255);
+   lstdin = move_to_high_fd (0, 1, -1);
if (lstdin > 0)
-- 
2.16.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 25/42] mdadm: refresh patches

[Alexander Kanavin]

From: Ross Burton 

The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.

Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450).  This is obviously bad.

We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.

Signed-off-by: Ross Burton 
Signed-off-by: Alexander Kanavin 
---
 meta/recipes-extended/mdadm/files/gcc-4.9.patch  | 12 ++--
 .../mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch | 12 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/meta/recipes-extended/mdadm/files/gcc-4.9.patch 
b/meta/recipes-extended/mdadm/files/gcc-4.9.patch
index 54bf1d79ab7..df21399deb2 100644
--- a/meta/recipes-extended/mdadm/files/gcc-4.9.patch
+++ b/meta/recipes-extended/mdadm/files/gcc-4.9.patch
@@ -7,13 +7,13 @@ make: *** [super-intel.o] Error 1
 Signed-off-by: Khem Raj 
 Upstream-Status: Pending
 
-Index: mdadm-3.3/super-intel.c
+Index: mdadm-4.0/super-intel.c
 ===
 mdadm-3.3.orig/super-intel.c   2014-05-02 15:08:21.154319651 -0700
-+++ mdadm-3.3/super-intel.c2014-05-02 15:09:31.470985794 -0700
-@@ -5060,7 +5060,7 @@
-   spare->cache_size = mpb->cache_size,
-   spare->pwr_cycle_count = __cpu_to_le32(1),
+--- mdadm-4.0.orig/super-intel.c
 mdadm-4.0/super-intel.c
+@@ -5725,7 +5725,7 @@ static int write_super_imsm_spares(struc
+   spare->cache_size = mpb->cache_size;
+   spare->pwr_cycle_count = __cpu_to_le32(1);
  
 -  snprintf((char *) spare->sig, MAX_SIGNATURE_LENGTH,
 +  (void)snprintf((char *) spare->sig, MAX_SIGNATURE_LENGTH,
diff --git a/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch 
b/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch
index c656d073e37..00e6657e091 100644
--- a/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch
+++ b/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch
@@ -5,13 +5,13 @@ Upstream-Status: Pending
 
 Signed-off-by: Aníbal Limón 
 
-Index: mdadm-3.3.4/monitor.c
+Index: mdadm-4.0/monitor.c
 ===
 mdadm-3.3.4.orig/monitor.c
-+++ mdadm-3.3.4/monitor.c
-@@ -257,9 +257,12 @@ static int read_and_act(struct active_ar
-   mdi->curr_state = read_dev_state(mdi->state_fd);
-   }
+--- mdadm-4.0.orig/monitor.c
 mdadm-4.0/monitor.c
+@@ -445,9 +445,12 @@ static int read_and_act(struct active_ar
+   if (FD_ISSET(mdi->bb_fd, fds))
+   check_for_cleared_bb(a, mdi);
}
 -
gettimeofday(&tv, NULL);
-- 
2.16.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 26/42] pam: refresh patches

[Alexander Kanavin]

From: Ross Burton 

The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.

Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450).  This is obviously bad.

We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.

Signed-off-by: Ross Burton 
Signed-off-by: Alexander Kanavin 
---
 .../pam/libpam/libpam-xtests.patch | 14 +++--
 .../pam-security-abstract-securetty-handling.patch | 23 --
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/meta/recipes-extended/pam/libpam/libpam-xtests.patch 
b/meta/recipes-extended/pam/libpam/libpam-xtests.patch
index be687457f82..7edf66f9153 100644
--- a/meta/recipes-extended/pam/libpam/libpam-xtests.patch
+++ b/meta/recipes-extended/pam/libpam/libpam-xtests.patch
@@ -3,18 +3,20 @@ This patch is used to create a new sub package libpam-xtests 
to do more checks.
 Upstream-Status: Pending
 
 Signed-off-by: Kang Kai 
 Linux-PAM-1.1.4/xtests/Makefile.am.orig2011-07-19 17:00:09.619980001 
+0800
-+++ Linux-PAM-1.1.4/xtests/Makefile.am 2011-07-19 16:54:00.229979998 +0800
-@@ -7,7 +7,7 @@
- AM_LDFLAGS = -L$(top_builddir)/libpam -lpam \
-   -L$(top_builddir)/libpam_misc -lpam_misc
+Index: Linux-PAM-1.3.0/xtests/Makefile.am
+===
+--- Linux-PAM-1.3.0.orig/xtests/Makefile.am
 Linux-PAM-1.3.0/xtests/Makefile.am
+@@ -7,7 +7,7 @@ AM_CFLAGS = -DLIBPAM_COMPILE -I$(top_src
+ LDADD = $(top_builddir)/libpam/libpam.la \
+   $(top_builddir)/libpam_misc/libpam_misc.la
  
 -CLEANFILES = *~ $(XTESTS)
 +CLEANFILES = *~
  
  EXTRA_DIST = run-xtests.sh tst-pam_dispatch1.pamd tst-pam_dispatch2.pamd \
tst-pam_dispatch3.pamd tst-pam_dispatch4.pamd \
-@@ -51,3 +51,18 @@
+@@ -51,3 +51,18 @@ EXTRA_PROGRAMS = $(XTESTS)
  
  xtests: $(XTESTS) run-xtests.sh
"$(srcdir)"/run-xtests.sh "$(srcdir)" ${XTESTS} ${NOSRCTESTS}
diff --git 
a/meta/recipes-extended/pam/libpam/pam-security-abstract-securetty-handling.patch
 
b/meta/recipes-extended/pam/libpam/pam-security-abstract-securetty-handling.patch
index f1834f6ce34..9b8d4c29751 100644
--- 
a/meta/recipes-extended/pam/libpam/pam-security-abstract-securetty-handling.patch
+++ 
b/meta/recipes-extended/pam/libpam/pam-security-abstract-securetty-handling.patch
@@ -5,12 +5,13 @@ Upstream-Status: Pending
 
 Signed-off-by: Ming Liu 
 ===
-diff -urpN a/modules/pam_securetty/Makefile.am 
b/modules/pam_securetty/Makefile.am
 a/modules/pam_securetty/Makefile.am2013-07-05 11:08:23.224483237 
+0800
-+++ b/modules/pam_securetty/Makefile.am2013-07-05 11:15:21.304486456 
+0800
+Index: Linux-PAM-1.3.0/modules/pam_securetty/Makefile.am
+===
+--- Linux-PAM-1.3.0.orig/modules/pam_securetty/Makefile.am
 Linux-PAM-1.3.0/modules/pam_securetty/Makefile.am
 @@ -24,6 +24,10 @@ endif
  securelib_LTLIBRARIES = pam_securetty.la
- pam_securetty_la_LIBADD = -L$(top_builddir)/libpam -lpam
+ pam_securetty_la_LIBADD = $(top_builddir)/libpam/libpam.la
  
 +pam_securetty_la_SOURCES =\
 +  pam_securetty.c \
@@ -19,9 +20,10 @@ diff -urpN a/modules/pam_securetty/Makefile.am 
b/modules/pam_securetty/Makefile.
  if ENABLE_REGENERATE_MAN
  noinst_DATA = README
  README: pam_securetty.8.xml
-diff -urpN a/modules/pam_securetty/pam_securetty.c 
b/modules/pam_securetty/pam_securetty.c
 a/modules/pam_securetty/pam_securetty.c2013-07-05 11:07:50.064483568 
+0800
-+++ b/modules/pam_securetty/pam_securetty.c2013-07-05 11:12:23.994483344 
+0800
+Index: Linux-PAM-1.3.0/modules/pam_securetty/pam_securetty.c
+===
+--- Linux-PAM-1.3.0.orig/modules/pam_securetty/pam_securetty.c
 Linux-PAM-1.3.0/modules/pam_securetty/pam_securetty.c
 @@ -1,7 +1,5 @@
  /* pam_securetty module */
  
@@ -104,9 +106,10 @@ diff -urpN a/modules/pam_securetty/pam_securetty.c 
b/modules/pam_securetty/pam_s
  
  if (retval && !(ctrl & PAM_NOCONSOLE_ARG)) {
  FILE *cmdlinefile;
-diff -urpN a/modules/pam_securetty/tty_secure.c 
b/modules/pam_securetty/tty_secure.c
 a/modules/pam_securetty/tty_secure.c   1970-01-01 08:30:00.0 
+0830
-+++ b/modules/pam_securetty/tty_secure.c   2013-07-05 11:14:21.534482900 
+0800
+Index: Linux-PAM-1.3.0/modules/pam_securetty/tty_secure.c
+===
+--- /dev/null
 Linux-PAM-1.3.0/modules/pam_securetty/tty_secure.c
 @@ -0,0 +1,90 @@
 +/*
 + * A function to determine if a particular 

[OE-core] [PATCH 23/42] ghostscript: drop incorrectly applied patch

[Alexander Kanavin]

The patch was adding a change to the source file that was already there,
so the lines of code were repeated twice. This didn't create a bug or a
security issue, but it may well have.

Long story:
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450

Signed-off-by: Alexander Kanavin 
---
 .../ghostscript/ghostscript/CVE-2016-7977.patch| 33 --
 .../ghostscript/ghostscript_9.21.bb|  1 -
 2 files changed, 34 deletions(-)
 delete mode 100644 
meta/recipes-extended/ghostscript/ghostscript/CVE-2016-7977.patch

diff --git a/meta/recipes-extended/ghostscript/ghostscript/CVE-2016-7977.patch 
b/meta/recipes-extended/ghostscript/ghostscript/CVE-2016-7977.patch
deleted file mode 100644
index b7eed1241e7..000
--- a/meta/recipes-extended/ghostscript/ghostscript/CVE-2016-7977.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 8abd22010eb4db0fb1b10e430d5f5d83e015ef70 Mon Sep 17 00:00:00 2001
-From: Chris Liddell 
-Date: Mon, 3 Oct 2016 01:46:28 +0100
-Subject: [PATCH] Bug 697169: Be rigorous with SAFER permissions
-
-Once we've opened our input file from the command line, enforce the SAFER
-rules.
-
-Upstream-Status: Backport
-CVE: CVE-2016-7977
-
-Signed-off-by: Catalin Enache 

- psi/zfile.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/psi/zfile.c b/psi/zfile.c
-index b6caea2..2c6c958 100644
 a/psi/zfile.c
-+++ b/psi/zfile.c
-@@ -1081,6 +1081,9 @@ lib_file_open(gs_file_path_ptr  lib_path, const 
gs_memory_t *mem, i_ctx_t *i_ctx
- gs_main_instance *minst = get_minst_from_memory(mem);
- int code;
- 
-+if (i_ctx_p && starting_arg_file)
-+i_ctx_p->starting_arg_file = false;
-+
- /* when starting arg files (@ files) iodev_default is not yet set */
- if (iodev == 0)
- iodev = (gx_io_device *)gx_io_device_table[0];
--- 
-2.10.2
-
diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.21.bb 
b/meta/recipes-extended/ghostscript/ghostscript_9.21.bb
index bf985c44a3e..50ec7e20c5a 100644
--- a/meta/recipes-extended/ghostscript/ghostscript_9.21.bb
+++ b/meta/recipes-extended/ghostscript/ghostscript_9.21.bb
@@ -32,7 +32,6 @@ SRC_URI = "${SRC_URI_BASE} \
file://ghostscript-9.02-genarch.patch \
file://objarch.h \
file://cups-no-gcrypt.patch \
-   file://CVE-2016-7977.patch \
file://CVE-2017-7207.patch \
file://CVE-2017-5951.patch \
file://CVE-2017-7975.patch \
-- 
2.16.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 27/42] parted: refresh patches

[Alexander Kanavin]

From: Ross Burton 

The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.

Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450).  This is obviously bad.

We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.

Signed-off-by: Ross Burton 
Signed-off-by: Alexander Kanavin 
---
 meta/recipes-extended/parted/files/no_check.patch | 10 +-
 meta/recipes-extended/parted/files/syscalls.patch | 12 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/meta/recipes-extended/parted/files/no_check.patch 
b/meta/recipes-extended/parted/files/no_check.patch
index 58d8db44264..e6a26d11a5c 100644
--- a/meta/recipes-extended/parted/files/no_check.patch
+++ b/meta/recipes-extended/parted/files/no_check.patch
@@ -5,12 +5,12 @@ it to be disabled.
 
 RP - 4/11/08
 
-Index: parted-1.9.0/configure.ac
+Index: parted-3.2/configure.ac
 ===
 parted-1.9.0.orig/configure.ac 2009-07-23 18:52:08.0 +0100
-+++ parted-1.9.0/configure.ac  2010-02-02 14:13:56.013905093 +
-@@ -477,7 +477,7 @@
- AM_CONDITIONAL([BUILD_LINUX], [test "$OS" = linux])
+--- parted-3.2.orig/configure.ac
 parted-3.2/configure.ac
+@@ -555,7 +555,7 @@ AC_CHECK_HEADER([execinfo.h], [
+ AM_CONDITIONAL([COMPILE_FOR_S390], [test "$host_cpu" = s390 || test 
"$host_cpu" = s390x])
  
  dnl check for "check", unit testing library/header
 -PKG_CHECK_MODULES([CHECK], [check >= 0.9.3], have_check=yes, have_check=no)
diff --git a/meta/recipes-extended/parted/files/syscalls.patch 
b/meta/recipes-extended/parted/files/syscalls.patch
index e9bbe9a956d..93205a0a804 100644
--- a/meta/recipes-extended/parted/files/syscalls.patch
+++ b/meta/recipes-extended/parted/files/syscalls.patch
@@ -4,10 +4,10 @@ Upstream-Status: Pending
  libparted/arch/linux.c |   13 +
  1 file changed, 13 insertions(+)
 
-Index: parted-1.9.0/libparted/arch/linux.c
+Index: parted-3.2/libparted/arch/linux.c
 ===
 parted-1.9.0.orig/libparted/arch/linux.c   2009-07-23 18:52:08.0 
+0100
-+++ parted-1.9.0/libparted/arch/linux.c2010-02-02 14:14:16.523904768 
+
+--- parted-3.2.orig/libparted/arch/linux.c
 parted-3.2/libparted/arch/linux.c
 @@ -17,6 +17,8 @@
  
  #define PROC_DEVICES_BUFSIZ 16384
@@ -16,8 +16,8 @@ Index: parted-1.9.0/libparted/arch/linux.c
 +
  #include 
  #include 
- 
-@@ -1477,12 +1479,14 @@
+ #include 
+@@ -1696,12 +1698,14 @@ linux_refresh_close (PedDevice* dev)
  
  #if SIZEOF_OFF_T < 8
  
@@ -32,7 +32,7 @@ Index: parted-1.9.0/libparted/arch/linux.c
  
  loff_t
  llseek (unsigned int fd, loff_t offset, unsigned int whence)
-@@ -1490,11 +1494,20 @@
+@@ -1709,11 +1713,20 @@ llseek (unsigned int fd, loff_t offset,
  loff_t result;
  int retval;
  
-- 
2.16.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 24/42] libidn: refresh patches

[Alexander Kanavin]

From: Ross Burton 

The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.

Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450).  This is obviously bad.

We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.

Signed-off-by: Ross Burton 
Signed-off-by: Alexander Kanavin 
---
 .../libidn/libidn/libidn_fix_for_automake-1.12.patch   | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch 
b/meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch
index 5683d3c98d7..db91317ca5b 100644
--- a/meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch
+++ b/meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch
@@ -9,12 +9,12 @@ This patch fixes following issue with automake 1.12
 Signed-off-by: Nitin A Kamble 
 2012/05/03
 
-Index: libidn-1.24/configure.ac
+Index: libidn-1.33/configure.ac
 ===
 libidn-1.24.orig/configure.ac
-+++ libidn-1.24/configure.ac
-@@ -34,6 +34,10 @@ AC_SUBST(LT_CURRENT, 17)
- AC_SUBST(LT_REVISION, 7)
+--- libidn-1.33.orig/configure.ac
 libidn-1.33/configure.ac
+@@ -33,6 +33,10 @@ AC_SUBST(LT_CURRENT, 17)
+ AC_SUBST(LT_REVISION, 16)
  AC_SUBST(LT_AGE, 6)
  
 +# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it
-- 
2.16.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 30/42] apt: refresh patches

[Alexander Kanavin]

From: Ross Burton 

The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.

Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450).  This is obviously bad.

We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.

Signed-off-by: Ross Burton 
Signed-off-by: Alexander Kanavin 
---
 meta/recipes-devtools/apt/apt/disable-test.patch   | 23 ++
 .../apt/apt/fix-gcc-4.6-null-not-defined.patch | 10 ++
 meta/recipes-devtools/apt/apt/makerace.patch   | 10 +-
 meta/recipes-devtools/apt/apt/no-nls-dpkg.patch| 12 ++-
 meta/recipes-devtools/apt/apt/nodoc.patch  | 12 +--
 5 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/meta/recipes-devtools/apt/apt/disable-test.patch 
b/meta/recipes-devtools/apt/apt/disable-test.patch
index 0532671747e..d16b5c771b6 100644
--- a/meta/recipes-devtools/apt/apt/disable-test.patch
+++ b/meta/recipes-devtools/apt/apt/disable-test.patch
@@ -17,10 +17,10 @@ Signed-off-by: Aníbal Limón 
  configure.ac | 7 ---
  2 files changed, 3 insertions(+), 13 deletions(-)
 
-diff --git a/Makefile b/Makefile
-index 7680f08..69527a5 100644
 a/Makefile
-+++ b/Makefile
+Index: apt-1.2.24/Makefile
+===
+--- apt-1.2.24.orig/Makefile
 apt-1.2.24/Makefile
 @@ -9,8 +9,8 @@ endif
  .PHONY: default
  default: startup all
@@ -32,9 +32,9 @@ index 7680f08..69527a5 100644
$(MAKE) -C vendor $@
$(MAKE) -C apt-pkg $@
$(MAKE) -C apt-inst $@
-@@ -21,8 +21,6 @@ all headers library clean veryclean binary program doc 
manpages docbook test upd
+@@ -21,8 +21,6 @@ all headers library clean veryclean bina
$(MAKE) -C dselect $@
-   $(MAKE) -C doc $@
+ # $(MAKE) -C doc $@
$(MAKE) -C po $@
 -  # FIXME: -C test has issue swith parallel builds, investigate!
 -  -$(MAKE) -C test $@
@@ -52,10 +52,10 @@ index 7680f08..69527a5 100644
  
  dirs: startup
  
-diff --git a/configure.ac b/configure.ac
-index 1f05da5..e47f459 100644
 a/configure.ac
-+++ b/configure.ac
+Index: apt-1.2.24/configure.ac
+===
+--- apt-1.2.24.orig/configure.ac
 apt-1.2.24/configure.ac
 @@ -90,13 +90,6 @@ AC_CHECK_LIB(curl, curl_easy_init,
   AC_MSG_ERROR([failed: I need CURL due https support]),
  )
@@ -70,6 +70,3 @@ index 1f05da5..e47f459 100644
  AC_SUBST(BDBLIB)
  
  HAVE_ZLIB=no
--- 
-2.1.4
-
diff --git a/meta/recipes-devtools/apt/apt/fix-gcc-4.6-null-not-defined.patch 
b/meta/recipes-devtools/apt/apt/fix-gcc-4.6-null-not-defined.patch
index 801ae6dddb4..899c6ef2fcf 100644
--- a/meta/recipes-devtools/apt/apt/fix-gcc-4.6-null-not-defined.patch
+++ b/meta/recipes-devtools/apt/apt/fix-gcc-4.6-null-not-defined.patch
@@ -1,12 +1,14 @@
 Upstream-Status: Pending
 
 a/apt-pkg/contrib/weakptr.h
-+++ b/apt-pkg/contrib/weakptr.h
+Index: apt-1.2.24/apt-pkg/contrib/weakptr.h
+===
+--- apt-1.2.24.orig/apt-pkg/contrib/weakptr.h
 apt-1.2.24/apt-pkg/contrib/weakptr.h
 @@ -21,6 +21,7 @@
  #ifndef WEAK_POINTER_H
  #define WEAK_POINTER_H
  
 +#include 
  #include 
- /**
-  * Class for objects providing support for weak pointers.
+ #include 
+ 
diff --git a/meta/recipes-devtools/apt/apt/makerace.patch 
b/meta/recipes-devtools/apt/apt/makerace.patch
index 46e3161b673..0c686d6e276 100644
--- a/meta/recipes-devtools/apt/apt/makerace.patch
+++ b/meta/recipes-devtools/apt/apt/makerace.patch
@@ -8,16 +8,16 @@ RP 2012/3/19
 
 Upstream-Status: Pending
 
-Index: apt-0.9.9.4/buildlib/library.mak
+Index: apt-1.2.24/buildlib/library.mak
 ===
 apt-0.9.9.4.orig/buildlib/library.mak  2013-07-31 15:45:07.320440575 
+0300
-+++ apt-0.9.9.4/buildlib/library.mak   2013-07-31 15:46:49.440440561 +0300
-@@ -61,7 +61,7 @@
+--- apt-1.2.24.orig/buildlib/library.mak
 apt-1.2.24/buildlib/library.mak
+@@ -65,7 +65,7 @@ $(LIB)/lib$(LIBRARY).so.$(MAJOR).$(MINOR
  
  # Compilation rules
  vpath %.cc $(SUBDIRS)
 -$(OBJ)/%.opic: %.cc $(LIBRARYDEPENDS)
 +$(OBJ)/%.opic: %.cc $(LIBRARYDEPENDS) $($(LOCAL)-HEADERS)
echo Compiling $< to $@
-   $(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXFLAGS) $(PICFLAGS) -o $@ $<
+   $(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXSTD) $(CXXFLAGS) 
$(PICFLAGS) -o $@ '$(abspath $<)'
$(DoDep)
diff --git a/meta/recipes-devtools/apt/apt/no-nls-dpkg.patch 
b/meta/recipes-devtools/apt/apt/no-nls-dpkg.patch
index a0996d4d440..98b6c96caac 100644
--- a/meta/recipes-devtools/apt/apt/no-nls-dpkg.patc

[OE-core] [PATCH 28/42] tcp-wrappers: refresh patches

[Alexander Kanavin]

From: Ross Burton 

The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.

Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450).  This is obviously bad.

We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.

Signed-off-by: Ross Burton 
Signed-off-by: Alexander Kanavin 
---
 .../tcp-wrappers-7.6/12_makefile_config.patch  | 24 --
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git 
a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch 
b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch
index e8289e44d93..d473fb63429 100644
--- 
a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch
+++ 
b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch
@@ -1,9 +1,10 @@
 Upstream-Status: Backport
 
-diff -ruN tcp_wrappers_7.6.orig/Makefile tcp_wrappers_7.6/Makefile
 tcp_wrappers_7.6.orig/Makefile 2003-08-21 01:43:39.0 +0200
-+++ tcp_wrappers_7.6/Makefile  2003-08-21 01:43:35.0 +0200
-@@ -45,7 +45,7 @@
+Index: tcp_wrappers_7.6/Makefile
+===
+--- tcp_wrappers_7.6.orig/Makefile
 tcp_wrappers_7.6/Makefile
+@@ -45,7 +45,7 @@ what:
  #
  # SysV.4 Solaris 2.x OSF AIX
  #REAL_DAEMON_DIR=/usr/sbin
@@ -12,7 +13,7 @@ diff -ruN tcp_wrappers_7.6.orig/Makefile 
tcp_wrappers_7.6/Makefile
  # BSD 4.4
  #REAL_DAEMON_DIR=/usr/libexec
  #
-@@ -512,6 +519,7 @@
+@@ -513,6 +513,7 @@ VSYSLOG= -Dvsyslog=myvsyslog
  # (examples: allow, deny, banners, twist and spawn).
  # 
  #STYLE= -DPROCESS_OPTIONS # Enable language extensions.
@@ -20,7 +21,7 @@ diff -ruN tcp_wrappers_7.6.orig/Makefile 
tcp_wrappers_7.6/Makefile
  
  
  # Optional: Changing the default disposition of logfile records
-@@ -535,6 +543,7 @@
+@@ -536,6 +537,7 @@ VSYSLOG= -Dvsyslog=myvsyslog
  # The LOG_XXX names below are taken from the /usr/include/syslog.h file.
  
  FACILITY= LOG_MAIL# LOG_MAIL is what most sendmail daemons use
@@ -28,7 +29,7 @@ diff -ruN tcp_wrappers_7.6.orig/Makefile 
tcp_wrappers_7.6/Makefile
  
  # The syslog priority at which successful connections are logged.
  
-@@ -631,6 +640,7 @@
+@@ -632,6 +634,7 @@ TABLES = -DHOSTS_DENY=\"/etc/hosts.deny\
  # lookups altogether, see the next section.
  
  PARANOID= -DPARANOID
@@ -36,7 +37,7 @@ diff -ruN tcp_wrappers_7.6.orig/Makefile 
tcp_wrappers_7.6/Makefile
  
  
  # Optional: turning off hostname lookups
-@@ -644,6 +654,7 @@
+@@ -645,6 +648,7 @@ PARANOID= -DPARANOID
  # mode (see previous section) and comment out the following definition.
  
  HOSTNAME= -DALWAYS_HOSTNAME
@@ -44,7 +45,7 @@ diff -ruN tcp_wrappers_7.6.orig/Makefile 
tcp_wrappers_7.6/Makefile
  
  #
  # Optional: Turning on host ADDRESS checking
-@@ -670,6 +681,7 @@
+@@ -671,6 +675,7 @@ HOSTNAME= -DALWAYS_HOSTNAME
  # Solaris 2.x, and Linux. See your system documentation for details.
  #
  # KILL_OPT= -DKILL_IP_OPTIONS
@@ -52,7 +53,7 @@ diff -ruN tcp_wrappers_7.6.orig/Makefile 
tcp_wrappers_7.6/Makefile
  
  ## End configuration options
  
-@@ -677,9 +689,10 @@
+@@ -678,9 +683,10 @@ HOSTNAME= -DALWAYS_HOSTNAME
  # Protection against weird shells or weird make programs.
  
  SHELL = /bin/sh
@@ -65,7 +66,7 @@ diff -ruN tcp_wrappers_7.6.orig/Makefile 
tcp_wrappers_7.6/Makefile
$(BUGS) $(SYSTYPE) $(AUTH) $(UMASK) \
-DREAL_DAEMON_DIR=\"$(REAL_DAEMON_DIR)\" $(STYLE) $(KILL_OPT) \
-DSEVERITY=$(SEVERITY) -DRFC931_TIMEOUT=$(RFC931_TIMEOUT) \
-@@ -712,10 +725,11 @@
+@@ -713,11 +719,12 @@ all other: config-check tcpd tcpdmatch t
  
  config-check:
@set +e; test -n "$(REAL_DAEMON_DIR)" || { make; exit 1; }
@@ -81,3 +82,4 @@ diff -ruN tcp_wrappers_7.6.orig/Makefile 
tcp_wrappers_7.6/Makefile
 +  @if [ ! -d shared ]; then mkdir shared; fi
  
  $(LIB):   $(LIB_OBJ)
+   rm -f $(LIB)
-- 
2.16.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 29/42] iptables: drop unnecessary patches

[Alexander Kanavin]

These were adding definitions for the second time
(see bug #10450 for why) or adding an include that isn't anymore
necessary for musl builds.

Signed-off-by: Alexander Kanavin 
---
 .../iptables/0001-fix-build-with-musl.patch| 46 
 ...d-defines-that-are-required-for-if_packet.patch | 49 --
 meta/recipes-extended/iptables/iptables_1.6.1.bb   |  2 -
 3 files changed, 97 deletions(-)
 delete mode 100644 
meta/recipes-extended/iptables/iptables/0001-fix-build-with-musl.patch
 delete mode 100644 
meta/recipes-extended/iptables/iptables/types.h-add-defines-that-are-required-for-if_packet.patch

diff --git 
a/meta/recipes-extended/iptables/iptables/0001-fix-build-with-musl.patch 
b/meta/recipes-extended/iptables/iptables/0001-fix-build-with-musl.patch
deleted file mode 100644
index f1f85a6fa0e..000
--- a/meta/recipes-extended/iptables/iptables/0001-fix-build-with-musl.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-[PATCH] fix build with musl
-
-Define additional TCOPTS if not there
-u_initX types are in sys/types.h be explicit about it
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj 
-Signed-off-by: Maxin B. John 

-diff -Naur iptables-1.6.0-origin/extensions/libxt_TCPOPTSTRIP.c 
iptables-1.6.0/extensions/libxt_TCPOPTSTRIP.c
 iptables-1.6.0-origin/extensions/libxt_TCPOPTSTRIP.c   2015-12-09 
14:55:06.0 +0200
-+++ iptables-1.6.0/extensions/libxt_TCPOPTSTRIP.c  2015-12-29 
14:44:32.585327077 +0200
-@@ -12,6 +12,21 @@
- #ifndef TCPOPT_MD5SIG
- # define TCPOPT_MD5SIG 19
- #endif
-+#ifndef TCPOPT_MAXSEG
-+#define TCPOPT_MAXSEG 2
-+#endif
-+#ifndef TCPOPT_WINDOW
-+#define TCPOPT_WINDOW 3
-+#endif
-+#ifndef TCPOPT_SACK_PERMITTED
-+#define TCPOPT_SACK_PERMITTED 4
-+#endif
-+#ifndef TCPOPT_SACK
-+#define TCPOPT_SACK 5
-+#endif
-+#ifndef TCPOPT_TIMESTAMP
-+#define TCPOPT_TIMESTAMP 8
-+#endif
- 
- enum {
-   O_STRIP_OPTION = 0,
-diff -Naur iptables-1.6.0-origin/include/linux/netfilter_ipv4/ip_tables.h 
iptables-1.6.0/include/linux/netfilter_ipv4/ip_tables.h
 iptables-1.6.0-origin/include/linux/netfilter_ipv4/ip_tables.h 
2015-12-09 14:55:06.0 +0200
-+++ iptables-1.6.0/include/linux/netfilter_ipv4/ip_tables.h2015-12-29 
14:40:21.250469195 +0200
-@@ -15,6 +15,7 @@
- #ifndef _IPTABLES_H
- #define _IPTABLES_H
- 
-+#include 
- #include 
- 
- #include 
diff --git 
a/meta/recipes-extended/iptables/iptables/types.h-add-defines-that-are-required-for-if_packet.patch
 
b/meta/recipes-extended/iptables/iptables/types.h-add-defines-that-are-required-for-if_packet.patch
deleted file mode 100644
index 24ee29e2d10..000
--- 
a/meta/recipes-extended/iptables/iptables/types.h-add-defines-that-are-required-for-if_packet.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 19593491f43b70c1a71c3b9b8f4ff4fd14500014 Mon Sep 17 00:00:00 2001
-From: Bruce Ashfield 
-Date: Fri, 23 Mar 2012 14:27:20 -0400
-Subject: [PATCH] types.h: add defines that are required for if_packet.h
-
-The iptables local linux/types.h overrides the kernel/sysroot
-types.h. As such, we need to provide some defines that are required
-to build against 3.2+ kernel headers.
-
-ifndef protection is provided for the defines to ensure that
-configuration that already have these defines are still buildable.
-
-This commit is temporary until a new version of iptables can be
-used that contains the defines.
-
-This is similar to the commit in the iptables git repository:
-
-  
https://git.netfilter.org/cgi-bin/gitweb.cgi?p=iptables.git;a=commit;h=dbe77cc974cee656eae37e75039dd1a410a4535b
-
-Upstream-Status: Backport
-
-Signed-off-by: Bruce Ashfield 

- include/linux/types.h |   10 ++
- 1 files changed, 10 insertions(+), 0 deletions(-)
-
-diff --git a/include/linux/types.h b/include/linux/types.h
-index 8b483c8..ebf6432 100644
 a/include/linux/types.h
-+++ b/include/linux/types.h
-@@ -34,5 +34,15 @@ typedef __u64 __bitwise __be64;
- typedef __u16 __bitwise __sum16;
- typedef __u32 __bitwise __wsum;
- 
-+#ifndef __aligned_u64
-+#define __aligned_u64 __u64 __attribute__((aligned(8)))
-+#endif
-+#ifndef __aligned_be64
-+#define __aligned_be64 __be64 __attribute__((aligned(8)))
-+#endif
-+#ifndef __aligned_le64
-+#define __aligned_le64 __le64 __attribute__((aligned(8)))
-+#endif
-+
- #endif /*  __ASSEMBLY__ */
- #endif /* _LINUX_TYPES_H */
--- 
-1.7.0.4
-
diff --git a/meta/recipes-extended/iptables/iptables_1.6.1.bb 
b/meta/recipes-extended/iptables/iptables_1.6.1.bb
index b37c55a64ea..d6e36fbee9a 100644
--- a/meta/recipes-extended/iptables/iptables_1.6.1.bb
+++ b/meta/recipes-extended/iptables/iptables_1.6.1.bb
@@ -19,10 +19,8 @@ RRECOMMENDS_${PN} = "kernel-module-x-tables \
 FILES_${PN} =+ "${libdir}/xtables/ ${datadir}/xtables"
 
 SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 
\
-   file://types.h-add-defines-that-are-required-for-if_packet.patch \

file://0001-configure-Add-option-to-enable-disable-libnfnetlink.patch

[OE-core] [PATCH 31/42] automake: refresh patches

[Alexander Kanavin]

From: Ross Burton 

The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.

Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450).  This is obviously bad.

We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.

Signed-off-by: Ross Burton 
Signed-off-by: Alexander Kanavin 
---
 ...tion-in-shebangs-with-modern-use-warnings.patch | 41 ++
 .../automake/automake/buildtest.patch  | 32 +
 2 files changed, 36 insertions(+), 37 deletions(-)

diff --git 
a/meta/recipes-devtools/automake/automake/automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch
 
b/meta/recipes-devtools/automake/automake/automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch
index 64eb253a6ea..96b5a3d6b2a 100644
--- 
a/meta/recipes-devtools/automake/automake/automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch
+++ 
b/meta/recipes-devtools/automake/automake/automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch
@@ -22,10 +22,10 @@ Signed-off-by: Serhii Popovych 
  t/wrap/automake.in | 3 ++-
  4 files changed, 8 insertions(+), 4 deletions(-)
 
-diff --git a/bin/aclocal.in b/bin/aclocal.in
-index 349f24a..50cb8d3 100644
 a/bin/aclocal.in
-+++ b/bin/aclocal.in
+Index: automake-1.15.1/bin/aclocal.in
+===
+--- automake-1.15.1.orig/bin/aclocal.in
 automake-1.15.1/bin/aclocal.in
 @@ -1,4 +1,4 @@
 -#!@PERL@ -w
 +#!@PERL@
@@ -40,17 +40,17 @@ index 349f24a..50cb8d3 100644
  
  use Automake::Config;
  use Automake::General;
-diff --git a/bin/automake.in b/bin/automake.in
-index eedc8bc..e0a01cf 100644
 a/bin/automake.in
-+++ b/bin/automake.in
+Index: automake-1.15.1/bin/automake.in
+===
+--- automake-1.15.1.orig/bin/automake.in
 automake-1.15.1/bin/automake.in
 @@ -1,4 +1,4 @@
 -#!@PERL@ -w
 +#!@PERL@
  # -*- perl -*-
  # @configure_input@
  
-@@ -28,6 +28,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S 
"$0" "$@";; esac'
+@@ -28,6 +28,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0";
  package Automake;
  
  use strict;
@@ -58,16 +58,16 @@ index eedc8bc..e0a01cf 100644
  
  BEGIN
  {
-diff --git a/t/wrap/aclocal.in b/t/wrap/aclocal.in
-index e64b546..9996899 100644
 a/t/wrap/aclocal.in
-+++ b/t/wrap/aclocal.in
+Index: automake-1.15.1/t/wrap/aclocal.in
+===
+--- automake-1.15.1.orig/t/wrap/aclocal.in
 automake-1.15.1/t/wrap/aclocal.in
 @@ -1,4 +1,4 @@
 -#!@PERL@ -w
 +#!@PERL@
  # @configure_input@
  
- # Copyright (C) 2012-2014 Free Software Foundation, Inc.
+ # Copyright (C) 2012-2017 Free Software Foundation, Inc.
 @@ -19,6 +19,7 @@
  BEGIN
  {
@@ -76,16 +76,16 @@ index e64b546..9996899 100644
@Aclocal::perl_libdirs = ('@abs_top_srcdir@/lib');
unshift @Aclocal::perl_libdirs, '@abs_top_builddir@/lib'
  if '@srcdir@' ne '.';
-diff --git a/t/wrap/automake.in b/t/wrap/automake.in
-index 8b943b1..be61226 100644
 a/t/wrap/automake.in
-+++ b/t/wrap/automake.in
+Index: automake-1.15.1/t/wrap/automake.in
+===
+--- automake-1.15.1.orig/t/wrap/automake.in
 automake-1.15.1/t/wrap/automake.in
 @@ -1,4 +1,4 @@
 -#!@PERL@ -w
 +#!@PERL@
  # @configure_input@
  
- # Copyright (C) 2012-2014 Free Software Foundation, Inc.
+ # Copyright (C) 2012-2017 Free Software Foundation, Inc.
 @@ -19,6 +19,7 @@
  BEGIN
  {
@@ -94,6 +94,3 @@ index 8b943b1..be61226 100644
@Automake::perl_libdirs = ('@abs_top_srcdir@/lib');
unshift @Automake::perl_libdirs, '@abs_top_builddir@/lib'
  if '@srcdir@' ne '.';
--- 
-2.3.0
-
diff --git a/meta/recipes-devtools/automake/automake/buildtest.patch 
b/meta/recipes-devtools/automake/automake/buildtest.patch
index 1dd5337849f..c32cd1fb11e 100644
--- a/meta/recipes-devtools/automake/automake/buildtest.patch
+++ b/meta/recipes-devtools/automake/automake/buildtest.patch
@@ -4,21 +4,23 @@ be run separately.
 Signed-off-by: Björn Stenberg 
 Upstream-Status: Pending
 
 a/lib/am/check.am  2012-11-14 13:46:16.335475995 +0100
-+++ b/lib/am/check.am  2012-08-13 18:40:12.0 +0200
-@@ -44,7 +44,7 @@
- am__tty_colors = $(am__tty_colors_dummy)
- endif !%?COLOR%
-
+Index: automake-1.15.1/lib/am/check.am
+===
+--- automake-1.15.1.orig/lib/am/check.am
 automake-1.15.1/lib/am/check.am
+@@ -41,7 +41,7 @@ am__tty_colors = { \
+   fi; \
+ }
+ 
 -.PHONY: check-TESTS
 +.PHONY: check-TESTS buildtest-TESTS runtest-TESTS
-
- if

[OE-core] [PATCH 32/42] intltool: refresh patches

[Alexander Kanavin]

From: Ross Burton 

The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.

Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450).  This is obviously bad.

We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.

Signed-off-by: Ross Burton 
Signed-off-by: Alexander Kanavin 
---
 .../intltool/intltool/perl-522-deprecations.patch  | 14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git 
a/meta/recipes-devtools/intltool/intltool/perl-522-deprecations.patch 
b/meta/recipes-devtools/intltool/intltool/perl-522-deprecations.patch
index eb52172e10b..f1049e433e2 100644
--- a/meta/recipes-devtools/intltool/intltool/perl-522-deprecations.patch
+++ b/meta/recipes-devtools/intltool/intltool/perl-522-deprecations.patch
@@ -10,9 +10,11 @@ Take a patch from Debian to solve this.
 Upstream-Status: Submitted (https://bugs.launchpad.net/intltool/+bug/1465010)
 Signed-off-by: Ross Burton 
 
 intltool-0.51.0-ORIG/intltool-update.in2015-05-27 00:20:43.038379963 
+0200
-+++ intltool-0.51.0/intltool-update.in 2015-05-27 00:23:53.309078052 +0200
-@@ -1062,7 +1062,7 @@
+Index: intltool-0.51.0/intltool-update.in
+===
+--- intltool-0.51.0.orig/intltool-update.in
 intltool-0.51.0/intltool-update.in
+@@ -1062,7 +1062,7 @@ sub SubstituteVariable
}
  }
  
@@ -21,7 +23,7 @@ Signed-off-by: Ross Burton 
  {
my $rest = $3;
my $untouched = $1;
-@@ -1190,10 +1190,10 @@
+@@ -1190,10 +1190,10 @@ sub FindPackageName
$name=~ s/\(+$//g;
$version =~ s/\(+$//g;
  
@@ -36,7 +38,7 @@ Signed-off-by: Ross Burton 
  }
  
  if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m)
-@@ -1219,11 +1219,11 @@
+@@ -1219,11 +1219,11 @@ sub FindPackageName
$version =~ s/\(+$//g;
  $bugurl  =~ s/\(+$//g if (defined $bugurl);
  
@@ -52,4 +54,4 @@ Signed-off-by: Ross Burton 
 +$varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not 
$bugurl =~ /\$\{?\w+\}?/);
  }
  
- # \s makes this not work, why?
\ No newline at end of file
+ # \s makes this not work, why?
-- 
2.16.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 35/42] ppp: refresh patches

[Alexander Kanavin]

From: Ross Burton 

The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.

Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450).  This is obviously bad.

We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.

Signed-off-by: Ross Burton 
Signed-off-by: Alexander Kanavin 
---
 .../recipes-connectivity/ppp/ppp/cifdefroute.patch | 71 --
 .../ppp/makefile-remove-hard-usr-reference.patch   | 15 ++---
 2 files changed, 46 insertions(+), 40 deletions(-)

diff --git a/meta/recipes-connectivity/ppp/ppp/cifdefroute.patch 
b/meta/recipes-connectivity/ppp/ppp/cifdefroute.patch
index db4dbc27a97..7dd69d8f4d8 100644
--- a/meta/recipes-connectivity/ppp/ppp/cifdefroute.patch
+++ b/meta/recipes-connectivity/ppp/ppp/cifdefroute.patch
@@ -4,10 +4,11 @@ Rebased it to fit ppp-2.4.5. Dongxiao Xu 

 
 Upstream-Status: Inappropriate [debian/suse patches]
 
-diff -urN ppp-2.4.5-orig/pppd/ipcp.c ppp-2.4.5/pppd/ipcp.c
 ppp-2.4.5-orig/pppd/ipcp.c 2010-06-30 15:51:12.050166398 +0800
-+++ ppp-2.4.5/pppd/ipcp.c  2010-06-30 16:40:00.478716855 +0800
-@@ -198,6 +198,16 @@
+Index: ppp-2.4.7/pppd/ipcp.c
+===
+--- ppp-2.4.7.orig/pppd/ipcp.c
 ppp-2.4.7/pppd/ipcp.c
+@@ -198,6 +198,16 @@ static option_t ipcp_option_list[] = {
"disable defaultroute option", OPT_ALIAS | OPT_A2CLR,
&ipcp_wantoptions[0].default_route },
  
@@ -24,7 +25,7 @@ diff -urN ppp-2.4.5-orig/pppd/ipcp.c ppp-2.4.5/pppd/ipcp.c
  { "proxyarp", o_bool, &ipcp_wantoptions[0].proxy_arp,
"Add proxy ARP entry", OPT_ENABLE|1, &ipcp_allowoptions[0].proxy_arp },
  { "noproxyarp", o_bool, &ipcp_allowoptions[0].proxy_arp,
-@@ -271,7 +281,7 @@
+@@ -271,7 +281,7 @@ struct protent ipcp_protent = {
  ip_active_pkt
  };
  
@@ -33,7 +34,7 @@ diff -urN ppp-2.4.5-orig/pppd/ipcp.c ppp-2.4.5/pppd/ipcp.c
  static void ipcp_script __P((char *, int));   /* Run an up/down script */
  static void ipcp_script_done __P((void *));
  
-@@ -1742,7 +1752,12 @@
+@@ -1761,7 +1771,12 @@ ip_demand_conf(u)
  if (!sifnpmode(u, PPP_IP, NPMODE_QUEUE))
return 0;
  if (wo->default_route)
@@ -46,7 +47,7 @@ diff -urN ppp-2.4.5-orig/pppd/ipcp.c ppp-2.4.5/pppd/ipcp.c
default_route_set[u] = 1;
  if (wo->proxy_arp)
if (sifproxyarp(u, wo->hisaddr))
-@@ -1830,7 +1845,8 @@
+@@ -1849,7 +1864,8 @@ ipcp_up(f)
   */
  if (demand) {
if (go->ouraddr != wo->ouraddr || ho->hisaddr != wo->hisaddr) {
@@ -56,7 +57,7 @@ diff -urN ppp-2.4.5-orig/pppd/ipcp.c ppp-2.4.5/pppd/ipcp.c
if (go->ouraddr != wo->ouraddr) {
warn("Local IP address changed to %I", go->ouraddr);
script_setenv("OLDIPLOCAL", ip_ntoa(wo->ouraddr), 0);
-@@ -1855,7 +1871,12 @@
+@@ -1874,7 +1890,12 @@ ipcp_up(f)
  
/* assign a default route through the interface if required */
if (ipcp_wantoptions[f->unit].default_route) 
@@ -69,7 +70,7 @@ diff -urN ppp-2.4.5-orig/pppd/ipcp.c ppp-2.4.5/pppd/ipcp.c
default_route_set[f->unit] = 1;
  
/* Make a proxy ARP entry if requested. */
-@@ -1905,7 +1926,12 @@
+@@ -1924,7 +1945,12 @@ ipcp_up(f)
  
/* assign a default route through the interface if required */
if (ipcp_wantoptions[f->unit].default_route) 
@@ -82,7 +83,7 @@ diff -urN ppp-2.4.5-orig/pppd/ipcp.c ppp-2.4.5/pppd/ipcp.c
default_route_set[f->unit] = 1;
  
/* Make a proxy ARP entry if requested. */
-@@ -1983,7 +2009,7 @@
+@@ -2002,7 +2028,7 @@ ipcp_down(f)
sifnpmode(f->unit, PPP_IP, NPMODE_DROP);
sifdown(f->unit);
ipcp_clear_addrs(f->unit, ipcp_gotoptions[f->unit].ouraddr,
@@ -91,7 +92,7 @@ diff -urN ppp-2.4.5-orig/pppd/ipcp.c ppp-2.4.5/pppd/ipcp.c
  }
  
  /* Execute the ip-down script */
-@@ -1999,12 +2025,21 @@
+@@ -2018,12 +2044,21 @@ ipcp_down(f)
   * proxy arp entries, etc.
   */
  static void
@@ -115,10 +116,11 @@ diff -urN ppp-2.4.5-orig/pppd/ipcp.c ppp-2.4.5/pppd/ipcp.c
cifproxyarp(unit, hisaddr);
proxy_arp_set[unit] = 0;
  }
-diff -urN ppp-2.4.5-orig/pppd/ipcp.h ppp-2.4.5/pppd/ipcp.h
 ppp-2.4.5-orig/pppd/ipcp.h 2010-06-30 15:51:12.043682063 +0800
-+++ ppp-2.4.5/pppd/ipcp.h  2010-06-30 16:40:49.586203129 +0800
-@@ -70,6 +70,7 @@
+Index: ppp-2.4.7/pppd/ipcp.h
+===
+--- ppp-2.4.7.orig/pppd/ipcp.h
 ppp-2.4.7/pppd/ipcp.h
+@@ -70,6 +70,7 @@ typedef struct ipcp_options {
  bool old_addrs;   /* Use old (IP-Addresses) option? */
  bool req_addr;/* Ask peer

[OE-core] [PATCH 36/42] util-linux: refresh patches

[Alexander Kanavin]

From: Ross Burton 

The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.

Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450).  This is obviously bad.

We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.

Signed-off-by: Ross Burton 
Signed-off-by: Alexander Kanavin 
---
 .../recipes-core/util-linux/util-linux/configure-sbindir.patch | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch 
b/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch
index a5b1ff12e53..e475289f65f 100644
--- a/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch
+++ b/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch
@@ -5,11 +5,11 @@ Signed-off-by: Phil Blundell 
 Signed-off-by: Saul Wold http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 34/42] syslinux: refresh patches

[Alexander Kanavin]

From: Ross Burton 

The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.

Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450).  This is obviously bad.

We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.

Signed-off-by: Ross Burton 
Signed-off-by: Alexander Kanavin 
---
 .../syslinux/syslinux-libupload-depend-lib.patch| 17 +++--
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git 
a/meta/recipes-devtools/syslinux/syslinux/syslinux-libupload-depend-lib.patch 
b/meta/recipes-devtools/syslinux/syslinux/syslinux-libupload-depend-lib.patch
index c0714b51757..6ba96aeb568 100644
--- 
a/meta/recipes-devtools/syslinux/syslinux/syslinux-libupload-depend-lib.patch
+++ 
b/meta/recipes-devtools/syslinux/syslinux/syslinux-libupload-depend-lib.patch
@@ -20,15 +20,12 @@ Signed-off-by: Robert Yang 
  com32/Makefile |1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/com32/Makefile b/com32/Makefile
-index 9a1721b..f172db2 100644
 a/com32/Makefile
-+++ b/com32/Makefile
-@@ -21,3 +21,4 @@ rosh: lib libutil
- samples: libutil elflink/ldlinux
- sysdump: libupload gpllib
+Index: syslinux-6.03/com32/Makefile
+===
+--- syslinux-6.03.orig/com32/Makefile
 syslinux-6.03/com32/Makefile
+@@ -22,3 +22,4 @@ samples: libutil elflink/ldlinux
+ sysdump: lib libutil libupload gpllib
+ lua/src: cmenu modules
  gpllib: lib
 +libupload: lib
--- 
-1.7.9.5
-
-- 
2.16.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 33/42] mtd: refresh patches

[Alexander Kanavin]

From: Ross Burton 

The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.

Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450).  This is obviously bad.

We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.

Signed-off-by: Ross Burton 
Signed-off-by: Alexander Kanavin 
---
 .../add-exclusion-to-mkfs-jffs2-git-2.patch| 30 --
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git 
a/meta/recipes-devtools/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git-2.patch 
b/meta/recipes-devtools/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git-2.patch
index 0e3776af048..5d874d9810b 100644
--- 
a/meta/recipes-devtools/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git-2.patch
+++ 
b/meta/recipes-devtools/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git-2.patch
@@ -1,8 +1,10 @@
 Upstream-Status: Pending
 
 /tmp/mkfs.jffs2.c  2009-01-11 15:28:41.0 +0100
-+++ git/jffsX-utils/mkfs.jffs2.c   2009-01-11 15:59:29.0 +0100
-@@ -100,6 +100,11 @@
+Index: git/jffsX-utils/mkfs.jffs2.c
+===
+--- git.orig/jffsX-utils/mkfs.jffs2.c
 git/jffsX-utils/mkfs.jffs2.c
+@@ -100,6 +100,11 @@ struct filesystem_entry {
struct rb_node hardlink_rb;
  };
  
@@ -14,7 +16,7 @@ Upstream-Status: Pending
  struct rb_root hardlinks;
  static int out_fd = -1;
  static int in_fd = -1;
-@@ -408,7 +413,7 @@
+@@ -309,7 +314,7 @@ static struct filesystem_entry *recursiv
char *hpath, *tpath;
struct dirent *dp, **namelist;
struct filesystem_entry *entry;
@@ -22,8 +24,8 @@ Upstream-Status: Pending
 +  struct ignorepath_entry* element = ignorepath;
  
if (lstat(hostpath, &sb)) {
-   perror_msg_and_die("%s", hostpath);
-@@ -417,6 +422,15 @@
+   sys_errmsg_die("%s", hostpath);
+@@ -318,6 +323,15 @@ static struct filesystem_entry *recursiv
entry = add_host_filesystem_entry(targetpath, hostpath,
sb.st_uid, sb.st_gid, sb.st_mode, 0, parent);
  
@@ -38,8 +40,8 @@ Upstream-Status: Pending
 +
n = scandir(hostpath, &namelist, 0, alphasort);
if (n < 0) {
-   perror_msg_and_die("opening directory %s", hostpath);
-@@ -1453,6 +1467,7 @@
+   sys_errmsg_die("opening directory %s", hostpath);
+@@ -1359,6 +1373,7 @@ static struct option long_options[] = {
{"root", 1, NULL, 'r'},
{"pagesize", 1, NULL, 's'},
{"eraseblock", 1, NULL, 'e'},
@@ -47,15 +49,15 @@ Upstream-Status: Pending
{"output", 1, NULL, 'o'},
{"help", 0, NULL, 'h'},
{"verbose", 0, NULL, 'v'},
-@@ -1500,6 +1515,7 @@
- "  -L, --list-compressors  Show the list of the avaiable compressors\n"
+@@ -1409,6 +1424,7 @@ static const char helptext[] =
+ "  -L, --list-compressors  Show the list of the available compressors\n"
  "  -t, --test-compression  Call decompress and compare with the original (for 
test)\n"
  "  -n, --no-cleanmarkers   Don't add a cleanmarker to every eraseblock\n"
 +"  -I, --ignore=PATH   Ignore sub directory and file tree below PATH when 
recursing over the file system\n"
  "  -o, --output=FILE   Output to FILE (default: stdout)\n"
  "  -l, --little-endian Create a little-endian filesystem\n"
  "  -b, --big-endianCreate a big-endian filesystem\n"
-@@ -1666,6 +1682,7 @@
+@@ -1566,6 +1582,7 @@ int main(int argc, char **argv)
char *compr_name = NULL;
int compr_prior  = -1;
int warn_page_size = 0;
@@ -63,7 +65,7 @@ Upstream-Status: Pending
  
page_size = sysconf(_SC_PAGESIZE);
if (page_size < 0) /* System doesn't know so ... */
-@@ -1676,7 +1693,7 @@
+@@ -1576,7 +1593,7 @@ int main(int argc, char **argv)
jffs2_compressors_init();
  
while ((opt = getopt_long(argc, argv,
@@ -72,7 +74,7 @@ Upstream-Status: Pending
{
switch (opt) {
case 'D':
-@@ -1700,6 +1717,28 @@
+@@ -1600,6 +1617,28 @@ int main(int argc, char **argv)
warn_page_size = 0; /* set by user, so don't 
need to warn */
break;
  
@@ -100,4 +102,4 @@ Upstream-Status: Pending
 +
case 'o':
if (out_fd != -1) {
-   error_msg_and_die("output filename 
specified more than once");
+   errmsg_die("output filename specified 
more than once");
-- 
2.16.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.

[OE-core] [PATCH 40/42] python: refresh patches

[Alexander Kanavin]

From: Ross Burton 

The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.

Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450).  This is obviously bad.

We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.

Signed-off-by: Ross Burton 
Signed-off-by: Alexander Kanavin 
---
 .../add-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch | 10 
 .../python/avoid_warning_about_tkinter.patch   | 30 --
 .../avoid_warning_for_sunos_specific_module.patch  | 12 -
 .../python3/070-dont-clean-ipkg-install.patch  | 14 +-
 .../python3/avoid_warning_about_tkinter.patch  | 30 --
 ...-use-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch | 17 +---
 .../sysconfig.py-add-_PYTHON_PROJECT_SRC.patch | 25 --
 7 files changed, 57 insertions(+), 81 deletions(-)

diff --git 
a/meta/recipes-devtools/python/python/add-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch
 
b/meta/recipes-devtools/python/python/add-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch
index a97ff6b2506..506debaf761 100644
--- 
a/meta/recipes-devtools/python/python/add-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch
+++ 
b/meta/recipes-devtools/python/python/add-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch
@@ -13,10 +13,10 @@ Signed-off-by: Jackie Huang 
  configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: Python-2.7.11/configure.ac
+Index: Python-2.7.13/configure.ac
 ===
 Python-2.7.11.orig/configure.ac
-+++ Python-2.7.11/configure.ac
+--- Python-2.7.13.orig/configure.ac
 Python-2.7.13/configure.ac
 @@ -33,7 +33,7 @@ if test "$cross_compiling" = yes; then
AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found])
fi
@@ -24,5 +24,5 @@ Index: Python-2.7.11/configure.ac
 -  PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) 
_PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f 
pybuilddir.txt && echo $(abs_builddir)/`cat 
pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR) '$interp
 +  PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) 
_PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) 
PYTHONPATH=$(CROSSPYTHONPATH):$(shell test -f pybuilddir.txt && echo 
$(abs_builddir)/`cat 
pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/plat-$(MACHDEP) '$interp
  fi
- elif test "$cross_compiling" = maybe; then
- AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and 
--build=ARCH])
+ # Used to comment out stuff for rebuilding generated files
+ GENERATED_COMMENT='#'
diff --git 
a/meta/recipes-devtools/python/python/avoid_warning_about_tkinter.patch 
b/meta/recipes-devtools/python/python/avoid_warning_about_tkinter.patch
index 3347321fde6..287095f615c 100644
--- a/meta/recipes-devtools/python/python/avoid_warning_about_tkinter.patch
+++ b/meta/recipes-devtools/python/python/avoid_warning_about_tkinter.patch
@@ -7,13 +7,16 @@ Upstream-Status: Inappropriate [distribution]
 Also simply disable the tk module since its not in DEPENDS.
 Signed-off-by: Andrei Gherzan 
 
-Index: Python-2.7.2/setup.py
+Index: Python-2.7.13/setup.py
 ===
 Python-2.7.2.orig/setup.py 2012-04-05 23:18:38.500136647 +0300
-+++ Python-2.7.2/setup.py  2012-04-05 23:19:35.888134969 +0300
-@@ -1634,8 +1634,10 @@
+--- Python-2.7.13.orig/setup.py
 Python-2.7.13/setup.py
+@@ -1783,10 +1783,12 @@ class PyBuildExt(build_ext):
+ self.extensions.extend(exts)
+ 
  # Call the method for detecting whether _tkinter can be compiled
- self.detect_tkinter(inc_dirs, lib_dirs)
+-self.detect_tkinter(inc_dirs, lib_dirs)
++# self.detect_tkinter(inc_dirs, lib_dirs)
  
 -if '_tkinter' not in [e.name for e in self.extensions]:
 -missing.append('_tkinter')
@@ -22,18 +25,5 @@ Index: Python-2.7.2/setup.py
 +#if '_tkinter' not in [e.name for e in self.extensions]:
 +#missing.append('_tkinter')
  
- return missing
- 
-diff --git Python-3.5.1.orig/setup.py Python-3.5.1/setup.py
-index b4633b9..d7588c0 100644
 Python-3.5.1.orig/setup.py
-+++ Python-3.5.1/setup.py
-@@ -1536,7 +1536,7 @@ class PyBuildExt(build_ext):
- self.extensions.extend(exts)
- 
- # Call the method for detecting whether _tkinter can be compiled
--self.detect_tkinter(inc_dirs, lib_dirs)
-+# self.detect_tkinter(inc_dirs, lib_dirs)
- 
- # tkinter module will not be avalaible as yocto
- # doesn't have tk integrated (yet)
+ ## # Uncomment these lines if you want to

[OE-core] [PATCH 38/42] irda-utils: refresh patches

[Alexander Kanavin]

From: Ross Burton 

The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.

Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450).  This is obviously bad.

We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.

Signed-off-by: Ross Burton 
Signed-off-by: Alexander Kanavin 
---
 .../irda-utils/irda-utils-0.9.18/ldflags.patch | 64 +-
 1 file changed, 38 insertions(+), 26 deletions(-)

diff --git 
a/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/ldflags.patch 
b/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/ldflags.patch
index e95fe35f8f8..b246de8f5fd 100644
--- a/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/ldflags.patch
+++ b/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/ldflags.patch
@@ -3,72 +3,84 @@ Obey LDFLAGS
 Signed-off-by: Christopher Larson 
 Upstream-Status: Pending
 
+Index: irda-utils-0.9.18/findchip/Makefile
+===
 --- irda-utils-0.9.18.orig/findchip/Makefile
 +++ irda-utils-0.9.18/findchip/Makefile
 @@ -65,5 +65,5 @@ install: findchip
-
- gfindchip: gfindchip.c
-   $(prn_cc)
+ 
+ gfindchip: gfindchip.c 
+   $(prn_cc)
 -  $(ECMD))$(CC) $(CFLAGS) `gtk-config --cflags`  $< -o $@ `gtk-config 
--libs`
 +  $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) `gtk-config --cflags`  $< -o $@ 
`gtk-config --libs`
-
+ 
+Index: irda-utils-0.9.18/irattach/Makefile
+===
 --- irda-utils-0.9.18.orig/irattach/Makefile
 +++ irda-utils-0.9.18/irattach/Makefile
 @@ -49,13 +49,13 @@ all: $(TARGETS)
-
+ 
  irattach: irattach.o util.o
-   $(prn_cc_o)
+   $(prn_cc_o)
 -  $(ECMD)$(CC) $(CFLAGS) irattach.o util.o -o $@
 +  $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) irattach.o util.o -o $@
-
-
-
+ 
+ 
+ 
  dongle_attach: dongle_attach.o
-   $(prn_cc_o)
+   $(prn_cc_o)
 -  $(ECMD)$(CC) $(CFLAGS) dongle_attach.o -o $@
 +  $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) dongle_attach.o -o $@
-
-
+ 
+ 
  install: $(TARGETS)
+Index: irda-utils-0.9.18/irdadump/Makefile
+===
 --- irda-utils-0.9.18.orig/irdadump/Makefile
 +++ irda-utils-0.9.18/irdadump/Makefile
 @@ -40,7 +40,7 @@ lib_irdadump.a: $(LIBIRDADUMP_OBJS)
-
+ 
  irdadump: $(IRDADUMP_OBJS) $(LIBIRDADUMP_TARGET)
-   $(prn_cc_o)
+   $(prn_cc_o)
 -  $(ECMD)$(CC) $(CFLAGS) `pkg-config --libs glib-2.0` -o  
$(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET)
 +  $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) `pkg-config --libs glib-2.0` -o  
$(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET)
-
-
+ 
+ 
  .c.o:
+Index: irda-utils-0.9.18/irdaping/Makefile
+===
 --- irda-utils-0.9.18.orig/irdaping/Makefile
 +++ irda-utils-0.9.18/irdaping/Makefile
 @@ -56,7 +56,7 @@ all: $(TARGETS)
-
+ 
  irdaping: $(OBJS)
-   $(prn_cc_o)
+   $(prn_cc_o)
 -  $(ECMD)$(CC) $(CFLAGS) $(OBJS) -o $@
 +  $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@
-
-
+ 
+ 
  .c.o:
+Index: irda-utils-0.9.18/irnetd/Makefile
+===
 --- irda-utils-0.9.18.orig/irnetd/Makefile
 +++ irda-utils-0.9.18/irnetd/Makefile
 @@ -50,7 +50,7 @@ all: $(TARGETS)
-
+ 
  irnetd: $(OBJS)
-   $(prn_cc_o)
+   $(prn_cc_o)
 -  $(ECMD)$(CC) $(CFLAGS) $(OBJS) -o $@
 +  $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@
-
-
+ 
+ 
  install: irnetd
+Index: irda-utils-0.9.18/psion/Makefile
+===
 --- irda-utils-0.9.18.orig/psion/Makefile
 +++ irda-utils-0.9.18/psion/Makefile
 @@ -25,4 +25,4 @@ install: $(PSION_TARGETS)
  CFLAGS += -g -I../include -Wall -Wstrict-prototypes $(RPM_OPT_FLAGS)
- irpsion5:
-   $(prn_cc_o)
+ irpsion5: 
+   $(prn_cc_o)
 -  $(ECMD)$(CC) $(CFLAGS) $(PSION_SRC) -o $@
 \ No newline at end of file
 +  $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) $(PSION_SRC) -o $@
-- 
2.16.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 39/42] python-numpy: update to 1.14.1

[Alexander Kanavin]

Drop backported 0001-BUG-fix-infinite-loop-when-creating-np.pad-on-an-emp.patch.

Drop 0001-BUG-fix-infinite-loop-when-creating-np.pad-on-an-emp.patch as
upstream is using os.path.basename() instead now.

License-Update: License.txt file was update to list licenses of individual 
components;
not all of them are 3-clause BSD.

Signed-off-by: Alexander Kanavin 
---
 ...inite-loop-when-creating-np.pad-on-an-emp.patch | 45 --
 ...h-usr-and-so-on-for-libraries-by-default-.patch | 33 +---
 .../files/remove-build-path-in-comments.patch  | 30 ---
 ...thon-numpy_1.13.1.bb => python-numpy_1.14.1.bb} | 10 ++---
 ...on3-numpy_1.13.3.bb => python3-numpy_1.14.1.bb} | 13 +++
 5 files changed, 29 insertions(+), 102 deletions(-)
 delete mode 100644 
meta/recipes-devtools/python-numpy/files/0001-BUG-fix-infinite-loop-when-creating-np.pad-on-an-emp.patch
 delete mode 100644 
meta/recipes-devtools/python-numpy/files/remove-build-path-in-comments.patch
 rename meta/recipes-devtools/python-numpy/{python-numpy_1.13.1.bb => 
python-numpy_1.14.1.bb} (88%)
 rename meta/recipes-devtools/python-numpy/{python3-numpy_1.13.3.bb => 
python3-numpy_1.14.1.bb} (87%)

diff --git 
a/meta/recipes-devtools/python-numpy/files/0001-BUG-fix-infinite-loop-when-creating-np.pad-on-an-emp.patch
 
b/meta/recipes-devtools/python-numpy/files/0001-BUG-fix-infinite-loop-when-creating-np.pad-on-an-emp.patch
deleted file mode 100644
index b9e585610f4..000
--- 
a/meta/recipes-devtools/python-numpy/files/0001-BUG-fix-infinite-loop-when-creating-np.pad-on-an-emp.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 4170b98e0d5864ef4db1c5704a6e9428c3be9fb8 Mon Sep 17 00:00:00 2001
-From: Iryna Shcherbina 
-Date: Thu, 24 Aug 2017 18:01:43 +0200
-Subject: [PATCH] BUG: fix infinite loop when creating np.pad on an empty array
-
-Upstream-Status: Backport 
[https://github.com/numpy/numpy/pull/9599/commits/6f9ea0abbd305d53f9017debab3a3a591fe0e249]
-CVE: CVE-2017-12852
-Signed-off-by: Dengke Du 

- numpy/lib/arraypad.py| 3 +++
- numpy/lib/tests/test_arraypad.py | 4 
- 2 files changed, 7 insertions(+)
-
-diff --git a/numpy/lib/arraypad.py b/numpy/lib/arraypad.py
-index 2dad99c..294a689 100644
 a/numpy/lib/arraypad.py
-+++ b/numpy/lib/arraypad.py
-@@ -1406,6 +1406,9 @@ def pad(array, pad_width, mode, **kwargs):
- newmat = _append_min(newmat, pad_after, chunk_after, axis)
- 
- elif mode == 'reflect':
-+if narray.size == 0:
-+raise ValueError("There aren't any elements to reflect in 
`array`")
-+
- for axis, (pad_before, pad_after) in enumerate(pad_width):
- # Recursive padding along any axis where `pad_amt` is too large
- # for indexing tricks. We can only safely pad the original axis
-diff --git a/numpy/lib/tests/test_arraypad.py 
b/numpy/lib/tests/test_arraypad.py
-index 056aa45..0f71d32 100644
 a/numpy/lib/tests/test_arraypad.py
-+++ b/numpy/lib/tests/test_arraypad.py
-@@ -1014,6 +1014,10 @@ class ValueError1(TestCase):
- assert_raises(ValueError, pad, arr, ((-2, 3), (3, 2)),
-   **kwargs)
- 
-+def test_check_empty_array(self):
-+assert_raises(ValueError, pad, [], 4, mode='reflect')
-+assert_raises(ValueError, pad, np.ndarray(0), 4, mode='reflect')
-+
- 
- class ValueError2(TestCase):
- def test_check_negative_pad_amount(self):
--- 
-2.8.1
-
diff --git 
a/meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch
 
b/meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch
index ffd6ced1361..516ccd7b9bd 100644
--- 
a/meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch
+++ 
b/meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch
@@ -1,23 +1,24 @@
-From cc2ce6d8b6a3e6e2c8874896c10897034a80cd4f Mon Sep 17 00:00:00 2001
+From c8c6649b29a08f82e1d6761a6d62ce5f632313c5 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin 
 Date: Thu, 10 Dec 2015 13:20:30 +0200
-Subject: [PATCH] Don't search /usr and so on for libraries by default to avoid
- host contamination.
+Subject: [PATCH 1/3] Don't search /usr and so on for libraries by default to
+ avoid host contamination.
 
 Upstream-Status: Inappropriate (As the code stands, this is a hack)
 Signed-off-by: Ross Burton 
 Signed-off-by: Alexander Kanavin 
+
 ---
  numpy/distutils/system_info.py | 50 +-
  1 file changed, 6 insertions(+), 44 deletions(-)
 
-Index: numpy-1.13.1/numpy/distutils/system_info.py
-===
 numpy-1.13.1.orig/numpy/distutils/system_info.py
-+++ numpy-1.13.1/numpy/distutils/system_info.py
-@@ -211,51 +211,13 @@ if sys.platform == 'win32':
- default_x11_lib_dirs = []
- default_x11_include_dirs = []
+diff --git a/numpy/

[OE-core] [PATCH 37/42] zlib: refresh patches

[Alexander Kanavin]

From: Ross Burton 

The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.

Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450).  This is obviously bad.

We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.

Signed-off-by: Ross Burton 
Signed-off-by: Alexander Kanavin 
---
 .../zlib/zlib-1.2.11/remove.ldconfig.call.patch | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-core/zlib/zlib-1.2.11/remove.ldconfig.call.patch 
b/meta/recipes-core/zlib/zlib-1.2.11/remove.ldconfig.call.patch
index 403b4825c9b..7ccbe1f44c6 100644
--- a/meta/recipes-core/zlib/zlib-1.2.11/remove.ldconfig.call.patch
+++ b/meta/recipes-core/zlib/zlib-1.2.11/remove.ldconfig.call.patch
@@ -7,14 +7,15 @@ So remove ldconfig call from make install-libs
 
 Upstream-Status: Inappropriate [disable feature]
 
-diff -uNr zlib-1.2.6.orig/Makefile.in zlib-1.2.6/Makefile.in
 zlib-1.2.6.orig/Makefile.in2012-01-28 23:48:50.0 +0100
-+++ zlib-1.2.6/Makefile.in 2012-02-13 15:38:20.577700723 +0100
-@@ -199,7 +199,6 @@
+Index: zlib-1.2.11/Makefile.in
+===
+--- zlib-1.2.11.orig/Makefile.in
 zlib-1.2.11/Makefile.in
+@@ -322,7 +322,6 @@ install-libs: $(LIBS)
  rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB) 
$(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
  ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB); \
  ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
 -($(LDCONFIG) || true)  >/dev/null 2>&1; \
fi
-   cp zlib.3 $(DESTDIR)$(man3dir)
-   chmod 644 $(DESTDIR)$(man3dir)/zlib.3
+   rm -f $(DESTDIR)$(man3dir)/zlib.3
+   cp $(SRCDIR)zlib.3 $(DESTDIR)$(man3dir)
-- 
2.16.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 41/42] perl: refresh patches

[Alexander Kanavin]

From: Ross Burton 

The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.

Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450).  This is obviously bad.

We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.

Signed-off-by: Ross Burton 
Signed-off-by: Alexander Kanavin 
---
 meta/recipes-devtools/perl/perl/Makefile.SH.patch  | 44 +++---
 .../perl/perl/cross-generate_uudmap.patch  | 14 +++
 .../recipes-devtools/perl/perl/fix_bad_rpath.patch | 12 +++---
 meta/recipes-devtools/perl/perl/installperl.patch  | 12 +++---
 ...-fix-regenerate-makefile-failed-while-cc-.patch | 13 +++
 .../perl/perl/perl-archlib-exp.patch   | 12 +++---
 .../perl/perl/perl-dynloader.patch | 14 +++
 .../perl/perl/perl-enable-gdbm.patch   | 10 ++---
 8 files changed, 63 insertions(+), 68 deletions(-)

diff --git a/meta/recipes-devtools/perl/perl/Makefile.SH.patch 
b/meta/recipes-devtools/perl/perl/Makefile.SH.patch
index fd8237fe796..c1db335e0d6 100644
--- a/meta/recipes-devtools/perl/perl/Makefile.SH.patch
+++ b/meta/recipes-devtools/perl/perl/Makefile.SH.patch
@@ -12,10 +12,10 @@ Signed-off-by: Hongxu Jia 
  Makefile.SH | 147 
  1 file changed, 68 insertions(+), 79 deletions(-)
 
-diff --git a/Makefile.SH b/Makefile.SH
-index 916b332..b143d46 100755
 a/Makefile.SH
-+++ b/Makefile.SH
+Index: perl-5.24.1/Makefile.SH
+===
+--- perl-5.24.1.orig/Makefile.SH
 perl-5.24.1/Makefile.SH
 @@ -48,10 +48,10 @@ case "$useshrplib" in
  true)
# Prefix all runs of 'miniperl' and 'perl' with
@@ -74,6 +74,10 @@ index 916b332..b143d46 100755
 -all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $(generated_pods) $(private) 
$(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make 
$(MANIFEST_SRT)
 -  @echo " ";
 -  @echo " Everything is up to date. Type '$(MAKE) test' to run test 
suite."
+-
+-$(MANIFEST_SRT):  MANIFEST $(PERL_EXE)
+-  @$(RUN_PERL) Porting/manisort -q || (echo "WARNING: re-sorting 
MANIFEST"; \
+-  $(RUN_PERL) Porting/manisort -q -o MANIFEST; sh -c true)
 +#all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $(generated_pods) $(private) 
$(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make 
$(MANIFEST_SRT)
 +# @echo " ";
 +# @echo " Everything is up to date. Type '$(MAKE) test' to run test 
suite."
@@ -83,10 +87,7 @@ index 916b332..b143d46 100755
 +more: $(generated_pods) $(private) $(public)
 +
 +more2: $(dynamic_ext)
- 
--$(MANIFEST_SRT):  MANIFEST $(PERL_EXE)
--  @$(RUN_PERL) Porting/manisort -q || (echo "WARNING: re-sorting 
MANIFEST"; \
--  $(RUN_PERL) Porting/manisort -q -o MANIFEST; sh -c true)
++
 +more3: $(nonxs_ext)
 +
 +more4: extras.make $(MANIFEST_SRT)
@@ -151,7 +152,7 @@ index 916b332..b143d46 100755
./$(MINIPERLEXP) makedef.pl PLATFORM=os2 -DPERL_DLL=$(PERL_DLL) 
CC_FLAGS="$(OPTIMIZE)" > perl5.def
  
  !NO!SUBS!
-@@ -878,7 +878,7 @@ $(LIBPERL): $& $(perllib_objs) $(DYNALOADER) 
$(LIBPERLEXPORT)
+@@ -878,7 +878,7 @@ $(LIBPERL): $& $(perllib_objs) $(DYNALOA
true)
$spitshell >>$Makefile <<'!NO!SUBS!'
rm -f $@
@@ -160,7 +161,7 @@ index 916b332..b143d46 100755
  !NO!SUBS!
case "$osname" in
aix)
-@@ -936,15 +936,19 @@ lib/buildcustomize.pl: $& $(miniperl_objs) 
write_buildcustomize.pl
+@@ -936,15 +936,19 @@ lib/buildcustomize.pl: $& $(miniperl_obj
$spitshell >>$Makefile <<'!NO!SUBS!'
  lib/buildcustomize.pl: $& $(miniperl_objs)
$(CC) -o $(MINIPERL_EXE) $(CLDFLAGS) $(miniperl_objs) $(libs)
@@ -183,7 +184,7 @@ index 916b332..b143d46 100755
$(MINIPERL) -f write_buildcustomize.pl
  !NO!SUBS!
;;
-@@ -966,7 +970,9 @@ lib/buildcustomize.pl: $& $(miniperl_objs) 
write_buildcustomize.pl
+@@ -966,7 +970,9 @@ lib/buildcustomize.pl: $& $(miniperl_obj
-@rm -f miniperl.xok
$(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o $(MINIPERL_EXE) \
$(miniperl_objs) $(libs)
@@ -194,7 +195,7 @@ index 916b332..b143d46 100755
$(MINIPERL) -f write_buildcustomize.pl
  !NO!SUBS!
;;
-@@ -977,7 +983,9 @@ lib/buildcustomize.pl: \$& \$(miniperl_objs) 
write_buildcustomize.pl
+@@ -977,7 +983,9 @@ lib/buildcustomize.pl: \$& \$(miniperl_o
-@rm -f miniperl.xok
-@rm \$(MINIPERL_EXE)
\$(LNS) \$(HOST_PERL) \$(MINIPERL_EXE)
@@ -205,7 +206,7 @@ index 916b332..b143d46 100755
\$(MINIPERL) -f write_buildcustomize.pl 'osname' "$osname"
  !GROK!THIS!
else
-@@ -

[OE-core] [PATCH 42/42] perl: remove perl-enable-gdbm.patch

[Alexander Kanavin]

The change was already present in upstream, so we just applied it
again (see bug 10450 for why).

Signed-off-by: Alexander Kanavin 
---
 .../recipes-devtools/perl/perl/perl-enable-gdbm.patch | 19 ---
 meta/recipes-devtools/perl/perl_5.24.1.bb |  1 -
 2 files changed, 20 deletions(-)
 delete mode 100644 meta/recipes-devtools/perl/perl/perl-enable-gdbm.patch

diff --git a/meta/recipes-devtools/perl/perl/perl-enable-gdbm.patch 
b/meta/recipes-devtools/perl/perl/perl-enable-gdbm.patch
deleted file mode 100644
index bad3373fd40..000
--- a/meta/recipes-devtools/perl/perl/perl-enable-gdbm.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Upstream-Status:Inappropriate [embedded specific]
-
-Index: perl-5.24.1/config_h.SH
-===
 perl-5.24.1.orig/config_h.SH
-+++ perl-5.24.1/config_h.SH
-@@ -726,6 +726,12 @@ sed <$CONFIG_H -e 's!^#und
-  */
- #$i_gdbm I_GDBM   /**/
- 
-+/* I_GDBM:
-+ *  This symbol, if defined, indicates that  exists and should
-+ *  be included.
-+ */
-+#$i_gdbm I_GDBM /**/
-+
- /* I_LIMITS:
-  *This symbol, if defined, indicates to the C program that it should
-  *include  to get definition of symbols like WORD_BIT or
diff --git a/meta/recipes-devtools/perl/perl_5.24.1.bb 
b/meta/recipes-devtools/perl/perl_5.24.1.bb
index f13a63a80a3..e5b4886a95d 100644
--- a/meta/recipes-devtools/perl/perl_5.24.1.bb
+++ b/meta/recipes-devtools/perl/perl_5.24.1.bb
@@ -45,7 +45,6 @@ SRC_URI += " \
 file://letgcc-find-errno.patch \
 file://generate-sh.patch \
 file://native-perlinc.patch \
-file://perl-enable-gdbm.patch \
 file://cross-generate_uudmap.patch \
 file://fix_bad_rpath.patch \
 file://dynaloaderhack.patch \
-- 
2.16.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 1/9 v3] kernel-devsrc: restructure for out of tree (and on target) module builds

[Richard Purdie]

On Wed, 2018-03-07 at 08:35 -0500, Bruce Ashfield wrote:
> On Wed, Mar 7, 2018 at 3:40 AM, Burton, Ross 
> wrote:
> > 
> > On 6 March 2018 at 18:11, Bruce Ashfield  > com>
> > wrote:
> > > 
> > > 
> > > +RDEPENDS_${PN} = "bc python ${TCLIBC}-utils"
> > > +# 4.15+ needs these next two RDEPENDS
> > > +RDEPENDS_${PN} += "openssl-dev util-linux"
> > > +# and x86 needs a bit more for 4.15+
> > > +RDEPENDS_${PN} += "${@bb.utils.contains('ARCH', 'x86',
> > > 'elfutils', '',
> > > d)}"
> > 
> > Annoyingly this is breaking our multilib test case:
> > 
> > https://autobuilder.yocto.io/builders/nightly-multilib/builds/852/s
> > teps/BuildImages_4/logs/stdio
> > 
> > It's entirely possible that the test is broken in some way but it's
> > far too
> > early for me right now to comprehend the multilib matrix...
> And at this point, I'm basically out of cycles for hacking on devsrc
> :(
> 
> I'll see about it again at the start of next week, and failing that,
> bump it to the next release cycle.

Just as a quick brain dump from a glance at this, I think the issue is
the openssl-dev dependency. It sounds like the image tries to install
two sets of -dev packages and those files conflict. Quite why its doing
that and how/why they conflict I don't know but the -dev dependency is
where I'd start looking at this.

I will also mention that -dev packages are not so well looked at with
multilib, we probably don't test that area much :(.

Cheers,

Richard 
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [oe-core][PATCH 1/1] gnome-desktop: do not free() a static buffer

[Slater, Joseph]

I think you are correct.  I took out the patch and built sato for qemux86.  
Epiphany does not abort after loading a url, which was the problem my patch 
alterations fixed.  I’ll try x86-64 with no patch now.

Joe


From: Burton, Ross [mailto:ross.bur...@intel.com]
Sent: Thursday, March 08, 2018 2:10 AM
To: Slater, Joseph
Cc: OE-core
Subject: Re: [OE-core] [oe-core][PATCH 1/1] gnome-desktop: do not free() a 
static buffer

I'm not sure we need this patch anymore, it's been rebased on top of upstream 
changes but one of those changes were to fix x32 builds:

https://git.gnome.org/browse/gnome-desktop/commit/libgnome-desktop/gnome-desktop-thumbnail.c?id=012cad653253ae5f5248988cda89159f22c1fb1d

I believe we can drop this patch to gnome-desktop.

Ross

On 8 March 2018 at 01:35, Joe Slater 
mailto:joe.sla...@windriver.com>> wrote:
Do not free() the buffer returned by localtime().  Also,
switch to calling localtime_r() which is re-entrant.

Signed-off-by: Joe Slater 
mailto:joe.sla...@windriver.com>>
---
 ...op-thumbnail-don-t-convert-time_t-to-long.patch | 27 +-
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git 
a/meta/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-convert-time_t-to-long.patch
 
b/meta/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-convert-time_t-to-long.patch
index c1a7d4f..be657a8 100644
--- 
a/meta/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-convert-time_t-to-long.patch
+++ 
b/meta/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-convert-time_t-to-long.patch
@@ -9,12 +9,11 @@ build for X32, where long's size doesn't match that of time_t.
 Upstream-Status: Pending
 Signed-off-by: Christopher Larson 
mailto:chris_lar...@mentor.com>>


- libgnome-desktop/gnome-desktop-thumbnail.c | 16 ++--
- 1 file changed, 14 insertions(+), 2 deletions(-)
+Modified to use localtime_r() and not free() a static structure.
+
+Signed-off-by: Joe Slater mailto:jsla...@windriver.com>>
+

-diff --git a/libgnome-desktop/gnome-desktop-thumbnail.c 
b/libgnome-desktop/gnome-desktop-thumbnail.c
-index e56c3d7..5d96bf3 100644
 --- a/libgnome-desktop/gnome-desktop-thumbnail.c
 +++ b/libgnome-desktop/gnome-desktop-thumbnail.c
 @@ -120,6 +120,8 @@
@@ -30,24 +29,23 @@ index e56c3d7..5d96bf3 100644
char *tmp_path = NULL;
int tmp_fd;
char mtime_str[21];
-+  struct tm *tmp_mtime = NULL;
++  struct tm tmp_mtime;
gboolean ret = FALSE;
GError *error = NULL;
const char *width, *height;
-@@ -1124,7 +1127,11 @@ save_thumbnail (GdkPixbuf  *pixbuf,
+@@ -1124,7 +1127,10 @@ save_thumbnail (GdkPixbuf  *pixbuf,
  goto out;
close (tmp_fd);

 -  g_snprintf (mtime_str, 21, "%" G_GINT64_FORMAT, (gint64) mtime);
-+  tmp_mtime = localtime (&mtime);
-+  if (!tmp_mtime)
++  if (!localtime_r (&mtime,&tmp_mtime))
 +goto out;
-+  strftime (mtime_str, 21, "%s", tmp_mtime);
-+  free (tmp_mtime);
++
++  strftime (mtime_str, 21, "%s", &tmp_mtime);
width = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::Image::Width");
height = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::Image::Height");

-@@ -1319,6 +1326,7 @@ gnome_desktop_thumbnail_is_valid (GdkPixbuf  
*pixbuf,
+@@ -1319,6 +1325,7 @@ gnome_desktop_thumbnail_is_valid (GdkPix
  {
const char *thumb_uri, *thumb_mtime_str;
time_t thumb_mtime;
@@ -55,7 +53,7 @@ index e56c3d7..5d96bf3 100644

thumb_uri = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::URI");
if (g_strcmp0 (uri, thumb_uri) != 0)
-@@ -1327,7 +1335,11 @@ gnome_desktop_thumbnail_is_valid (GdkPixbuf  
*pixbuf,
+@@ -1327,7 +1334,11 @@ gnome_desktop_thumbnail_is_valid (GdkPix
thumb_mtime_str = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::MTime");
if (!thumb_mtime_str)
  return FALSE;
@@ -68,6 +66,3 @@ index e56c3d7..5d96bf3 100644
if (mtime != thumb_mtime)
  return FALSE;

---
-2.14.1
-
--
2.7.4

--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] own-mirrors.bbclass: Change prepend to append

[Bhargava Sreekantappa Gayathri]

If BB_NO_NETWORK is set to 1, and local download directory is added as
PREMIRRORS_prepend in conf file, PREMIRRORS variable will have
SOURCE_MIRROR_URL as the first url. This causes build to fail as network
access is diabled. PREMIRRORS should be appended here so that a prepend
in other layers/conf files takes precedence.

Signed-off-by: Bhargava Sreekantappa Gayathri 

Signed-off-by: Manjukumar Matha 
---
 meta/classes/own-mirrors.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/own-mirrors.bbclass b/meta/classes/own-mirrors.bbclass
index a777835..4cfd894 100644
--- a/meta/classes/own-mirrors.bbclass
+++ b/meta/classes/own-mirrors.bbclass
@@ -1,4 +1,4 @@
-PREMIRRORS_prepend = " \
+PREMIRRORS_append = " \
 cvs://.*/.* ${SOURCE_MIRROR_URL} \n \
 svn://.*/.* ${SOURCE_MIRROR_URL} \n \
 git://.*/.* ${SOURCE_MIRROR_URL} \n \
--
2.7.4

This email and any attachments are intended for the sole use of the named 
recipient(s) and contain(s) confidential information that may be proprietary, 
privileged or copyrighted under applicable law. If you are not the intended 
recipient, do not read, copy, or forward this email message or any attachments. 
Delete this email message and any attachments immediately.
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] own-mirrors.bbclass: Change prepend to append

[Bhargava Sreekantappa Gayathri]

If BB_NO_NETWORK is set to 1, and local download directory is added as
PREMIRRORS_prepend in conf file, PREMIRRORS variable will have
SOURCE_MIRROR_URL as the first url. This causes build to fail as network
access is diabled. PREMIRRORS should be appended here so that a prepend
in other layers/conf files takes precedence.

Signed-off-by: Bhargava Sreekantappa Gayathri 

Signed-off-by: Manjukumar Matha 
---
 meta/classes/own-mirrors.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/own-mirrors.bbclass b/meta/classes/own-mirrors.bbclass
index a777835..4cfd894 100644
--- a/meta/classes/own-mirrors.bbclass
+++ b/meta/classes/own-mirrors.bbclass
@@ -1,4 +1,4 @@
-PREMIRRORS_prepend = " \
+PREMIRRORS_append = " \
 cvs://.*/.* ${SOURCE_MIRROR_URL} \n \
 svn://.*/.* ${SOURCE_MIRROR_URL} \n \
 git://.*/.* ${SOURCE_MIRROR_URL} \n \
--
2.7.4

This email and any attachments are intended for the sole use of the named 
recipient(s) and contain(s) confidential information that may be proprietary, 
privileged or copyrighted under applicable law. If you are not the intended 
recipient, do not read, copy, or forward this email message or any attachments. 
Delete this email message and any attachments immediately.
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [OE-CORE][PATCH] own-mirrors.bbclass: Change prepend to append

[Bhargava Sreekantappa Gayathri]

If BB_NO_NETWORK is set to 1, and local download directory is added as
PREMIRRORS_prepend in conf file, PREMIRRORS variable will have
SOURCE_MIRROR_URL as the first url. This causes build to fail as network
access is diabled. PREMIRRORS should be appended here so that a prepend
in other layers/conf files takes precedence.

Signed-off-by: Bhargava Sreekantappa Gayathri 

Signed-off-by: Manjukumar Matha 
---
 meta/classes/own-mirrors.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/own-mirrors.bbclass b/meta/classes/own-mirrors.bbclass
index a777835..4cfd894 100644
--- a/meta/classes/own-mirrors.bbclass
+++ b/meta/classes/own-mirrors.bbclass
@@ -1,4 +1,4 @@
-PREMIRRORS_prepend = " \
+PREMIRRORS_append = " \
 cvs://.*/.* ${SOURCE_MIRROR_URL} \n \
 svn://.*/.* ${SOURCE_MIRROR_URL} \n \
 git://.*/.* ${SOURCE_MIRROR_URL} \n \
--
2.7.4

This email and any attachments are intended for the sole use of the named 
recipient(s) and contain(s) confidential information that may be proprietary, 
privileged or copyrighted under applicable law. If you are not the intended 
recipient, do not read, copy, or forward this email message or any attachments. 
Delete this email message and any attachments immediately.
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core