[PATCH 0/3]upgrade recipes

[PATCH 0/3]upgrade recipes

[Mei Lei]

Upgrade recipe gupnp and gawk, also update the distro_tracking_fields.inc.

The following changes since commit c6dac094ac79f6eae6998527e025417e16b46eed:
  Yu Ke (1):
        xauth: upgrade from 1.05 to 1.06

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib lmei3/upgrade-0704
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=lmei3/upgrade-0704

Mei Lei (3):
  gupnp: Upgrade from 0.16.0 to 0.16.1
  gawk: Upgrade from 3.1.8 to 4.0.0
  distro_tracking_fields.inc: Update recipes upgrade and manual check
    information

 .../conf/distro/include/distro_tracking_fields.inc |   17 ++--
 .../gupnp/gupnp-0.16.1/introspection.patch         |  104 ++++++++++++++++++++
 .../gupnp/{gupnp_0.16.0.bb => gupnp_0.16.1.bb}     |    7 +-
 .../gawk/{gawk_3.1.8.bb => gawk_4.0.0.bb}          |    4 +-
 4 files changed, 119 insertions(+), 13 deletions(-)
 create mode 100644 meta/recipes-connectivity/gupnp/gupnp-0.16.1/introspection.patch
 rename meta/recipes-connectivity/gupnp/{gupnp_0.16.0.bb => gupnp_0.16.1.bb} (85%)
 rename meta/recipes-extended/gawk/{gawk_3.1.8.bb => gawk_4.0.0.bb} (85%)

[PATCH 1/3] gupnp: Upgrade from 0.16.0 to 0.16.1

[Mei Lei]

Add introspection.patch from gssdp due to more strict compiler checks in new version

Signed-off-by: Mei Lei <lei.mei@intel.com>
---
 .../gupnp/gupnp-0.16.1/introspection.patch         |  104 ++++++++++++++++++++
 .../gupnp/{gupnp_0.16.0.bb => gupnp_0.16.1.bb}     |    7 +-
 2 files changed, 108 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-connectivity/gupnp/gupnp-0.16.1/introspection.patch
 rename meta/recipes-connectivity/gupnp/{gupnp_0.16.0.bb => gupnp_0.16.1.bb} (85%)

diff --git a/meta/recipes-connectivity/gupnp/gupnp-0.16.1/introspection.patch b/meta/recipes-connectivity/gupnp/gupnp-0.16.1/introspection.patch
new file mode 100644
index 0000000..86d57a7
--- /dev/null
+++ b/meta/recipes-connectivity/gupnp/gupnp-0.16.1/introspection.patch
@@ -0,0 +1,104 @@
+Copied from gobject-introspection/m4/introspection.m4
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-By: Dongxiao Xu <dongxiao.xu@intel.com>
+
+diff -ruN gupnp-0.16.1-orig/m4/introspection.m4 gupnp-0.16.1/m4/introspection.m4
+--- gupnp-0.16.1-orig/m4/introspection.m4	1970-01-01 08:00:00.000000000 +0800
++++ gupnp-0.16.1/m4/introspection.m4	2010-12-06 11:08:16.000000000 +0800
+@@ -0,0 +1,94 @@
++dnl -*- mode: autoconf -*-
++dnl Copyright 2009 Johan Dahlin
++dnl
++dnl This file is free software; the author(s) gives unlimited
++dnl permission to copy and/or distribute it, with or without
++dnl modifications, as long as this notice is preserved.
++dnl
++
++# serial 1
++
++m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
++[
++    AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
++    AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
++    AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
++
++    dnl enable/disable introspection
++    m4_if([$2], [require],
++    [dnl
++        enable_introspection=yes
++    ],[dnl
++        AC_ARG_ENABLE(introspection,
++                  AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
++                                 [Enable introspection for this build]),, 
++                                 [enable_introspection=auto])
++    ])dnl
++
++    AC_MSG_CHECKING([for gobject-introspection])
++
++    dnl presence/version checking
++    AS_CASE([$enable_introspection],
++    [no], [dnl
++        found_introspection="no (disabled, use --enable-introspection to enable)"
++    ],dnl
++    [yes],[dnl
++        PKG_CHECK_EXISTS([gobject-introspection-1.0],,
++                         AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
++        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
++                         found_introspection=yes,
++                         AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
++    ],dnl
++    [auto],[dnl
++        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
++    ],dnl
++    [dnl	
++        AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
++    ])dnl
++
++    AC_MSG_RESULT([$found_introspection])
++
++    INTROSPECTION_SCANNER=
++    INTROSPECTION_COMPILER=
++    INTROSPECTION_GENERATE=
++    INTROSPECTION_GIRDIR=
++    INTROSPECTION_TYPELIBDIR=
++    if test "x$found_introspection" = "xyes"; then
++       INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
++       INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
++       INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
++       INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
++       INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
++       INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
++       INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
++       INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
++    fi
++    AC_SUBST(INTROSPECTION_SCANNER)
++    AC_SUBST(INTROSPECTION_COMPILER)
++    AC_SUBST(INTROSPECTION_GENERATE)
++    AC_SUBST(INTROSPECTION_GIRDIR)
++    AC_SUBST(INTROSPECTION_TYPELIBDIR)
++    AC_SUBST(INTROSPECTION_CFLAGS)
++    AC_SUBST(INTROSPECTION_LIBS)
++    AC_SUBST(INTROSPECTION_MAKEFILE)
++
++    AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
++])
++
++
++dnl Usage:
++dnl   GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version])
++
++AC_DEFUN([GOBJECT_INTROSPECTION_CHECK],
++[
++  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1])
++])
++
++dnl Usage:
++dnl   GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version])
++
++
++AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
++[
++  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
++])
diff --git a/meta/recipes-connectivity/gupnp/gupnp_0.16.0.bb b/meta/recipes-connectivity/gupnp/gupnp_0.16.1.bb
similarity index 85%
rename from meta/recipes-connectivity/gupnp/gupnp_0.16.0.bb
rename to meta/recipes-connectivity/gupnp/gupnp_0.16.1.bb
index 07b6b90..fd2eb38 100644
--- a/meta/recipes-connectivity/gupnp/gupnp_0.16.0.bb
+++ b/meta/recipes-connectivity/gupnp/gupnp_0.16.1.bb
@@ -5,10 +5,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
                     file://libgupnp/gupnp.h;beginline=1;endline=20;md5=28c49b17d623afc3335efc2e511879e1"
 DEPENDS = "e2fsprogs gssdp libsoup-2.4 libxml2 gnome-icon-theme"
 
-SRC_URI = "http://gupnp.org/sites/all/files/sources/${BPN}-${PV}.tar.gz"
+SRC_URI = "http://gupnp.org/sites/all/files/sources/${BPN}-${PV}.tar.gz \
+           file://introspection.patch"
 
-SRC_URI[md5sum] = "61b240c1a9fdf8ca82c5c3adde0d6757"
-SRC_URI[sha256sum] = "1b77201866b7632fb68bc2a3bdea22ef8ead34ba850b3ee367797432cfc0f04a"
+SRC_URI[md5sum] = "021bb237741532af4bca50157ff326e4"
+SRC_URI[sha256sum] = "f01a1f4fd36ce161a3df29fa83e1a0a2fb40d3c9f30f6b403e7791688ad24cfe"
 
 PR = "r0"
 
-- 
1.6.3.3

[PATCH 2/3] gawk: Upgrade from 3.1.8 to 4.0.0

[Mei Lei]

Signed-off-by: Mei Lei <lei.mei@intel.com>
---
 .../gawk/{gawk_3.1.8.bb => gawk_4.0.0.bb}          |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/gawk/{gawk_3.1.8.bb => gawk_4.0.0.bb} (85%)

diff --git a/meta/recipes-extended/gawk/gawk_3.1.8.bb b/meta/recipes-extended/gawk/gawk_4.0.0.bb
similarity index 85%
rename from meta/recipes-extended/gawk/gawk_3.1.8.bb
rename to meta/recipes-extended/gawk/gawk_4.0.0.bb
index 7c83ed5..1a2f361 100644
--- a/meta/recipes-extended/gawk/gawk_3.1.8.bb
+++ b/meta/recipes-extended/gawk/gawk_4.0.0.bb
@@ -15,8 +15,8 @@ PR = "r0"
 
 SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "35937a0f83f0efe7a8c2dee635624784"
-SRC_URI[sha256sum] = "2146b3cc7a2d2b16a9457e73f14a3cb51a4292575425ed8f16f7e0a5e4f1a50d"
+SRC_URI[md5sum] = "51e417b71287629940051e6f652c6492"
+SRC_URI[sha256sum] = "c3a7cf7d976e05c6a1d8a9b3f14fa55d4304707408ddafb1396212653ea00be5"
 
 inherit autotools gettext update-alternatives
 
-- 
1.6.3.3

[PATCH 3/3] distro_tracking_fields.inc: Update recipes upgrade and manual check information

[Mei Lei]

upgrade: gawk, gupnp
manual check: diffutils

Signed-off-by: Mei Lei <lei.mei@intel.com>
---
 .../conf/distro/include/distro_tracking_fields.inc |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index 1808603..1c251b9 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -1,7 +1,8 @@
 RECIPE_STATUS_pn-diffutils = "green"
 RECIPE_LATEST_VERSION_pn-diffutils = "3.0"
-
 RECIPE_LAST_UPDATE_pn-diffutils = "Dec 10, 2010"
+RECIPE_NO_UPDATE_REASON_pn-diffutils = "3.0 is the latest version"
+RECIPE_MANUAL_CHECK_DATE_pn-diffutils = "Jul 4, 2011"
 RECIPE_MAINTAINER_pn-diffutils = "Mei Lei <lei.mei@intel.com>"
 
 RECIPE_STATUS_pn-epdfview = "red"
@@ -1792,9 +1793,9 @@ RECIPE_MAINTAINER_pn-sysklogd = "Saul Wold <sgw@linux.intel.com>"
 RECIPE_LATEST_VERSION_pn-sysklogd = "1.5"
 
 RECIPE_STATUS_pn-gawk = "red"    # need upgrade
-RECIPE_LAST_UPDATE_pn-gawk = "Aug 27, 2010"
+RECIPE_LAST_UPDATE_pn-gawk = "Jul 5, 2011"
 RECIPE_MAINTAINER_pn-gawk = "Mei Lei <lei.mei@intel.com>"
-RECIPE_LATEST_VERSION_pn-gawk = "3.1.7"
+RECIPE_LATEST_VERSION_pn-gawk = "4.0.0"
 
 RECIPE_STATUS_pn-mktemp="red"
 RECIPE_LAST_UPDATE_pn-mktemp = "Jul 29, 2010"
@@ -2112,12 +2113,12 @@ RECIPE_LAST_UPDATE_pn-empathy = "Aug 19, 2009"
 RECIPE_MAINTAINER_pn-empathy = "Dongxiao Xu <dongxiao.xu@intel.com>"
 
 RECIPE_STATUS_pn-gupnp = "green"
-RECIPE_LATEST_VERSION_pn-gupnp = "0.16.0"
+RECIPE_LATEST_VERSION_pn-gupnp = "0.16.1"
 RECIPE_NO_OF_PATCHES_pn-gupnp= "1"
-RECIPE_LATEST_RELEASE_DATE_pn-gupnp= "2011/04/08"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-gupnp= "3 month"
-RECIPE_LAST_UPDATE_pn-gupnp = "Apr 15, 2011"
-RECIPE_MAINTAINER_pn-gupnp= "Dongxiao Xu <dongxiao.xu@intel.com>"
+RECIPE_LATEST_RELEASE_DATE_pn-gupnp= "2011/04/30"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-gupnp= "1 month"
+RECIPE_LAST_UPDATE_pn-gupnp = "Jul 4, 2011"
+RECIPE_MAINTAINER_pn-gupnp= "Mei Lei <lei.mei@intel.com>"
 
 RECIPE_STATUS_pn-gupnp-av = "green"
 RECIPE_LATEST_VERSION_pn-gupnp-av = "0.8.0"
-- 
1.6.3.3

Re: [PATCH 0/3]upgrade recipes

[Richard Purdie]

On Wed, 2011-07-06 at 13:20 +0800, Mei Lei wrote:
> Upgrade recipe gupnp and gawk, also update the distro_tracking_fields.inc.
> 
> The following changes since commit c6dac094ac79f6eae6998527e025417e16b46eed:
>   Yu Ke (1):
>         xauth: upgrade from 1.05 to 1.06
> 
> are available in the git repository at:
> 
>   git://git.pokylinux.org/poky-contrib lmei3/upgrade-0704
>   http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=lmei3/upgrade-0704
> 
> Mei Lei (3):
>   gupnp: Upgrade from 0.16.0 to 0.16.1
>   gawk: Upgrade from 3.1.8 to 4.0.0
>   distro_tracking_fields.inc: Update recipes upgrade and manual check
>     information

Merged to master, thanks.

Richard