[PATCH 0/3] A few more updates

[PATCH 0/3] A few more updates

[Saul Wold]

Richard,

This address the missing checksums and patches from my
last set.  Also added here is libffi.

iconv will come later, there was a different problem that I need
to track down.

Sau!


The following changes since commit f4efaa0f472b4bf0ba0a0297cc9ecc8b5a671f72:

  squashfs-tools: fix PR, those should start with 'r' (2011-11-30 23:37:40 +0000)

are available in the git repository at:
  git://git.openembedded.org/openembedded-core-contrib sgw/updates
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/updates

Saul Wold (3):
  xserver-xorg*: Update to 1.11.2
  gnutls: Update to 2.12.14
  libffi: Update to 3.0.10

 .../libffi/{libffi_3.0.9.bb => libffi_3.0.10.bb}   |   16 +++++++++++-----
 ...ver-xorg-1.11.1.inc => xserver-xorg-1.11.2.inc} |    7 ++++---
 .../crosscompile.patch                             |    0
 .../fix_open_max_preprocessor_error.patch          |    0
 .../macro_tweak.patch                              |    0
 ...-lite_1.11.1.bb => xserver-xorg-lite_1.11.2.bb} |    0
 ...erver-xorg_1.11.1.bb => xserver-xorg_1.11.2.bb} |    0
 .../configure-fix.patch                            |    0
 .../gnutls-2.12.14/fix-gettext-version.patch       |   20 ++++++++++++++++++++
 .../gnutls-openssl.patch                           |    0
 .../gnutls-texinfo-euro.patch                      |    0
 meta/recipes-support/gnutls/gnutls_2.12.11.bb      |    9 ---------
 meta/recipes-support/gnutls/gnutls_2.12.14.bb      |   10 ++++++++++
 13 files changed, 45 insertions(+), 17 deletions(-)
 rename meta/recipes-gnome/libffi/{libffi_3.0.9.bb => libffi_3.0.10.bb} (77%)
 rename meta/recipes-graphics/xorg-xserver/{xserver-xorg-1.11.1.inc => xserver-xorg-1.11.2.inc} (47%)
 rename meta/recipes-graphics/xorg-xserver/{xserver-xorg-1.11.1 => xserver-xorg-1.11.2}/crosscompile.patch (100%)
 rename meta/recipes-graphics/xorg-xserver/{xserver-xorg-1.11.1 => xserver-xorg-1.11.2}/fix_open_max_preprocessor_error.patch (100%)
 rename meta/recipes-graphics/xorg-xserver/{xserver-xorg-1.11.1 => xserver-xorg-1.11.2}/macro_tweak.patch (100%)
 rename meta/recipes-graphics/xorg-xserver/{xserver-xorg-lite_1.11.1.bb => xserver-xorg-lite_1.11.2.bb} (100%)
 rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_1.11.1.bb => xserver-xorg_1.11.2.bb} (100%)
 rename meta/recipes-support/gnutls/{gnutls-2.12.11 => gnutls-2.12.14}/configure-fix.patch (100%)
 create mode 100644 meta/recipes-support/gnutls/gnutls-2.12.14/fix-gettext-version.patch
 rename meta/recipes-support/gnutls/{gnutls-2.12.11 => gnutls-2.12.14}/gnutls-openssl.patch (100%)
 rename meta/recipes-support/gnutls/{gnutls-2.12.11 => gnutls-2.12.14}/gnutls-texinfo-euro.patch (100%)
 delete mode 100644 meta/recipes-support/gnutls/gnutls_2.12.11.bb
 create mode 100644 meta/recipes-support/gnutls/gnutls_2.12.14.bb

-- 
1.7.6.4

[PATCH 1/3] xserver-xorg*: Update to 1.11.2

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 ...ver-xorg-1.11.1.inc => xserver-xorg-1.11.2.inc} |    7 ++++---
 .../crosscompile.patch                             |    0
 .../fix_open_max_preprocessor_error.patch          |    0
 .../macro_tweak.patch                              |    0
 ...-lite_1.11.1.bb => xserver-xorg-lite_1.11.2.bb} |    0
 ...erver-xorg_1.11.1.bb => xserver-xorg_1.11.2.bb} |    0
 6 files changed, 4 insertions(+), 3 deletions(-)
 rename meta/recipes-graphics/xorg-xserver/{xserver-xorg-1.11.1.inc => xserver-xorg-1.11.2.inc} (47%)
 rename meta/recipes-graphics/xorg-xserver/{xserver-xorg-1.11.1 => xserver-xorg-1.11.2}/crosscompile.patch (100%)
 rename meta/recipes-graphics/xorg-xserver/{xserver-xorg-1.11.1 => xserver-xorg-1.11.2}/fix_open_max_preprocessor_error.patch (100%)
 rename meta/recipes-graphics/xorg-xserver/{xserver-xorg-1.11.1 => xserver-xorg-1.11.2}/macro_tweak.patch (100%)
 rename meta/recipes-graphics/xorg-xserver/{xserver-xorg-lite_1.11.1.bb => xserver-xorg-lite_1.11.2.bb} (100%)
 rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_1.11.1.bb => xserver-xorg_1.11.2.bb} (100%)

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
similarity index 47%
rename from meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1.inc
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
index 8b0808d..be3c243 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
@@ -3,7 +3,8 @@ SRC_URI += "file://crosscompile.patch"
 # Misc build failure for master HEAD
 SRC_URI += "file://fix_open_max_preprocessor_error.patch"
 
-PR = "r2"
+SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24"
+SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2"
+
+PR = "r0"
 
-SRC_URI[md5sum] = "4cdf54dc569b6a5548257c93a45dcd3d"
-SRC_URI[sha256sum] = "c069c177d9a80bca2ee1d49aa1af6d9f996c83e4ff12393cab2ca3f8817276f6"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/crosscompile.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/crosscompile.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/crosscompile.patch
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/crosscompile.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/fix_open_max_preprocessor_error.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/fix_open_max_preprocessor_error.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/fix_open_max_preprocessor_error.patch
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/fix_open_max_preprocessor_error.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/macro_tweak.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/macro_tweak.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/macro_tweak.patch
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/macro_tweak.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.11.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.11.2.bb
similarity index 100%
rename from meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.11.1.bb
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.11.2.bb
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bb
similarity index 100%
rename from meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bb
-- 
1.7.6.4

[PATCH 2/3] gnutls: Update to 2.12.14

[Saul Wold]

* Add patch for fixing gettext version from 0.17 -> 0.18

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../configure-fix.patch                            |    0
 .../gnutls-2.12.14/fix-gettext-version.patch       |   20 ++++++++++++++++++++
 .../gnutls-openssl.patch                           |    0
 .../gnutls-texinfo-euro.patch                      |    0
 meta/recipes-support/gnutls/gnutls_2.12.11.bb      |    9 ---------
 meta/recipes-support/gnutls/gnutls_2.12.14.bb      |   10 ++++++++++
 6 files changed, 30 insertions(+), 9 deletions(-)
 rename meta/recipes-support/gnutls/{gnutls-2.12.11 => gnutls-2.12.14}/configure-fix.patch (100%)
 create mode 100644 meta/recipes-support/gnutls/gnutls-2.12.14/fix-gettext-version.patch
 rename meta/recipes-support/gnutls/{gnutls-2.12.11 => gnutls-2.12.14}/gnutls-openssl.patch (100%)
 rename meta/recipes-support/gnutls/{gnutls-2.12.11 => gnutls-2.12.14}/gnutls-texinfo-euro.patch (100%)
 delete mode 100644 meta/recipes-support/gnutls/gnutls_2.12.11.bb
 create mode 100644 meta/recipes-support/gnutls/gnutls_2.12.14.bb

diff --git a/meta/recipes-support/gnutls/gnutls-2.12.11/configure-fix.patch b/meta/recipes-support/gnutls/gnutls-2.12.14/configure-fix.patch
similarity index 100%
rename from meta/recipes-support/gnutls/gnutls-2.12.11/configure-fix.patch
rename to meta/recipes-support/gnutls/gnutls-2.12.14/configure-fix.patch
diff --git a/meta/recipes-support/gnutls/gnutls-2.12.14/fix-gettext-version.patch b/meta/recipes-support/gnutls/gnutls-2.12.14/fix-gettext-version.patch
new file mode 100644
index 0000000..7a41120
--- /dev/null
+++ b/meta/recipes-support/gnutls/gnutls-2.12.14/fix-gettext-version.patch
@@ -0,0 +1,20 @@
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Saul Wold <sgw@linux.intel.com>
+
+Index: gnutls-2.12.14/lib/po/Makefile.in.in
+===================================================================
+--- gnutls-2.12.14.orig/lib/po/Makefile.in.in	2011-11-28 20:15:56.000000000 -0800
++++ gnutls-2.12.14/lib/po/Makefile.in.in	2011-11-28 20:17:21.386078977 -0800
+@@ -8,8 +8,8 @@
+ # Please note that the actual code of GNU gettext is covered by the GNU
+ # General Public License and is *not* in the public domain.
+ #
+-# Origin: gettext-0.17
+-GETTEXT_MACRO_VERSION = 0.17
++# Origin: gettext-0.18
++GETTEXT_MACRO_VERSION = 0.18
+ 
+ PACKAGE = @PACKAGE@
+ VERSION = @VERSION@
diff --git a/meta/recipes-support/gnutls/gnutls-2.12.11/gnutls-openssl.patch b/meta/recipes-support/gnutls/gnutls-2.12.14/gnutls-openssl.patch
similarity index 100%
rename from meta/recipes-support/gnutls/gnutls-2.12.11/gnutls-openssl.patch
rename to meta/recipes-support/gnutls/gnutls-2.12.14/gnutls-openssl.patch
diff --git a/meta/recipes-support/gnutls/gnutls-2.12.11/gnutls-texinfo-euro.patch b/meta/recipes-support/gnutls/gnutls-2.12.14/gnutls-texinfo-euro.patch
similarity index 100%
rename from meta/recipes-support/gnutls/gnutls-2.12.11/gnutls-texinfo-euro.patch
rename to meta/recipes-support/gnutls/gnutls-2.12.14/gnutls-texinfo-euro.patch
diff --git a/meta/recipes-support/gnutls/gnutls_2.12.11.bb b/meta/recipes-support/gnutls/gnutls_2.12.11.bb
deleted file mode 100644
index bd5ebb3..0000000
--- a/meta/recipes-support/gnutls/gnutls_2.12.11.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require gnutls.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://gnutls-openssl.patch \
-            file://configure-fix.patch"
-
-SRC_URI[md5sum] = "f08234b64a8025d6d5aa1307868b02ed"
-SRC_URI[sha256sum] = "00b58e1aafe99bbd0cb371e7f1df9cc58bf807301cf70a7eebedeee093991360"
diff --git a/meta/recipes-support/gnutls/gnutls_2.12.14.bb b/meta/recipes-support/gnutls/gnutls_2.12.14.bb
new file mode 100644
index 0000000..385bb2c
--- /dev/null
+++ b/meta/recipes-support/gnutls/gnutls_2.12.14.bb
@@ -0,0 +1,10 @@
+require gnutls.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://gnutls-openssl.patch \
+            file://configure-fix.patch \
+            file://fix-gettext-version.patch"
+
+SRC_URI[md5sum] = "555687a7ffefba0bd9de1e71cb61402c"
+SRC_URI[sha256sum] = "5ee72ba6de7a23cf315792561954451e022dac8730149ca95f93c61e95be2ce3"
-- 
1.7.6.4

[PATCH 3/3] libffi: Update to 3.0.10

[Saul Wold]

 * Update License Checksum due to Date change
 * Added --disable-builddir because of configure using
   $0 with full path and a ../$0

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../libffi/{libffi_3.0.9.bb => libffi_3.0.10.bb}   |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)
 rename meta/recipes-gnome/libffi/{libffi_3.0.9.bb => libffi_3.0.10.bb} (77%)

diff --git a/meta/recipes-gnome/libffi/libffi_3.0.9.bb b/meta/recipes-gnome/libffi/libffi_3.0.10.bb
similarity index 77%
rename from meta/recipes-gnome/libffi/libffi_3.0.9.bb
rename to meta/recipes-gnome/libffi/libffi_3.0.10.bb
index fae1adb..c06b80c 100644
--- a/meta/recipes-gnome/libffi/libffi_3.0.9.bb
+++ b/meta/recipes-gnome/libffi/libffi_3.0.10.bb
@@ -5,15 +5,21 @@ time. FFI stands for Foreign Function Interface.  A foreign function interface i
 interface that allows code written in one language to call code written in another language.  The `libffi' \
 library really only provides the lowest, machine dependent layer of a fully featured foreign function interface.  \
 A layer must exist above `libffi' that handles type conversions for values passed between the two languages."
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=0caa055e49a3fb6c57780595e995e2ab"
+
+PR = "r0"
+
 SRC_URI = "ftp://sourceware.org/pub/libffi/${BPN}-${PV}.tar.gz"
 
-PR = "r2"
+SRC_URI[md5sum] = "79390673f5d07a8fb342bc09b5055b6f"
+SRC_URI[sha256sum] = "f01eb9027e9eb56aeaeef636649877756d475d714ef8b47f627f65bc5f3b492f"
+
+EXTRA_OECONF += "--disable-builddir"
 
-SRC_URI[md5sum] = "1f300a7a7f975d4046f51c3022fa5ff1"
-SRC_URI[sha256sum] = "589d25152318bc780cd8919b14670793f4971d9838dab46ed38c32b3ee92c452"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=fa09cb778aaba64dc9eac37ab7e4e5d8"
 inherit autotools
 
 FILES_${PN}-dev += "${libdir}/libffi-${PV}"
+
 BBCLASSEXTEND = "native nativesdk"
-- 
1.7.6.4

Re: [PATCH 0/3] A few more updates

[Richard Purdie]

On Wed, 2011-11-30 at 21:12 -0800, Saul Wold wrote:
> Richard,
> 
> This address the missing checksums and patches from my
> last set.  Also added here is libffi.
> 
> iconv will come later, there was a different problem that I need
> to track down.
> 
> Sau!
> 
> 
> The following changes since commit f4efaa0f472b4bf0ba0a0297cc9ecc8b5a671f72:
> 
>   squashfs-tools: fix PR, those should start with 'r' (2011-11-30 23:37:40 +0000)
> 
> are available in the git repository at:
>   git://git.openembedded.org/openembedded-core-contrib sgw/updates
>   http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/updates
> 
> Saul Wold (3):
>   xserver-xorg*: Update to 1.11.2
>   gnutls: Update to 2.12.14
>   libffi: Update to 3.0.10

Merged to master, thanks.

Richard

Re: [PATCH 0/3] A few more updates

[Koen Kooi]

[-- Attachment #1: Type: text/plain, Size: 277 bytes --]


Op 1 dec. 2011, om 06:12 heeft Saul Wold het volgende geschreven:

> Richard,
> 
> This address the missing checksums and patches from my
> last set.  Also added here is libffi.

Are there any objections to making missing checksums a fatal error?

regards,

Koen

[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 169 bytes --]

Re: [PATCH 0/3] A few more updates

[Richard Purdie]

On Thu, 2011-12-01 at 11:40 +0100, Koen Kooi wrote:
> Op 1 dec. 2011, om 06:12 heeft Saul Wold het volgende geschreven:
> 
> > Richard,
> > 
> > This address the missing checksums and patches from my
> > last set.  Also added here is libffi.
> 
> Are there any objections to making missing checksums a fatal error?

Not from me, I thought we'd done this a long time ago...

Cheers,

Richard