Patchwork [2/3] gnome-desktop-testing: upgrade to current git master

login
register
mail settings
Submitter Ross Burton
Date Jan. 30, 2014, 11:51 a.m.
Message ID <1391082719-14432-2-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/66097/
State New
Headers show

Comments

Ross Burton - Jan. 30, 2014, 11:51 a.m.
no-introspection.patch has been merged upstream.

Update license checksum as copyright dates have been updated.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 .../files/no-introspection.patch                    |   19 -------------------
 ...sting_2013.1.bb => gnome-desktop-testing_git.bb} |   12 +++++++-----
 2 files changed, 7 insertions(+), 24 deletions(-)
 delete mode 100644 meta/recipes-support/gnome-desktop-testing/files/no-introspection.patch
 rename meta/recipes-support/gnome-desktop-testing/{gnome-desktop-testing_2013.1.bb => gnome-desktop-testing_git.bb} (60%)
Richard Purdie - Feb. 2, 2014, 11:46 a.m.
On Thu, 2014-01-30 at 11:51 +0000, Ross Burton wrote:
> no-introspection.patch has been merged upstream.
> 
> Update license checksum as copyright dates have been updated.
> 
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>  .../files/no-introspection.patch                    |   19 -------------------
>  ...sting_2013.1.bb => gnome-desktop-testing_git.bb} |   12 +++++++-----
>  2 files changed, 7 insertions(+), 24 deletions(-)
>  delete mode 100644 meta/recipes-support/gnome-desktop-testing/files/no-introspection.patch
>  rename meta/recipes-support/gnome-desktop-testing/{gnome-desktop-testing_2013.1.bb => gnome-desktop-testing_git.bb} (60%)
> 
> diff --git a/meta/recipes-support/gnome-desktop-testing/files/no-introspection.patch b/meta/recipes-support/gnome-desktop-testing/files/no-introspection.patch
> deleted file mode 100644
> index 67b64f2..0000000
> --- a/meta/recipes-support/gnome-desktop-testing/files/no-introspection.patch
> +++ /dev/null
> @@ -1,19 +0,0 @@
> -Introspection is a hard requirement to build gnome-desktop-testing upstream, but
> -it isn't needed anymore.
> -
> -Upstream-Status: Submitted
> -Signed-off-by: Ross Burton <ross.burton@intel.com>
> -
> -diff --git a/configure.ac b/configure.ac
> -index 7460c69..6249caf 100644
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -27,8 +27,6 @@ AC_SUBST(WARN_CFLAGS)
> - LT_PREREQ([2.2.4])
> - LT_INIT([disable-static])
> - 
> --GOBJECT_INTROSPECTION_REQUIRE([1.34.0])
> --
> - PKG_CHECK_MODULES(GIO_UNIX, [gio-unix-2.0 >= 2.34.0])
> - GIO_UNIX_CFLAGS="$GIO_UNIX_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_36 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_36"
> - 
> diff --git a/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2013.1.bb b/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_git.bb
> similarity index 60%
> rename from meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2013.1.bb
> rename to meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_git.bb
> index 36e13b1..be43d98 100644
> --- a/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2013.1.bb
> +++ b/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_git.bb
> @@ -2,13 +2,15 @@ SUMMARY = "Test runner for GNOME-style installed tests"
>  HOMEPAGE = "https://wiki.gnome.org/GnomeGoals/InstalledTests"
>  LICENSE = "LGPLv2+"
>  
> -SRC_URI = "${GNOME_MIRROR}/${BPN}/${PV}/${BPN}-${PV}.tar.xz \
> -           file://no-introspection.patch"
> -SRC_URI[md5sum] = "c6824f7bfac95bf0fcf6ed0c255979c1"
> -SRC_URI[sha256sum] = "632e7224de8614a8e4b7cdf87fc32551531efa9290fba0da4dae56234c584b7b"
> +SRCREV = "fbec635575013b22ed5aa853e725448057ac54bc"
> +PV = "2013.1+git${SRCPV}"
> +
> +SRC_URI = "gitsm://git.gnome.org/${PN}"
> +
> +S = "${WORKDIR}/git"

Its rather sad to need the gitsm fetcher. That fetcher isn't mirror safe
so I'm not sure we can use it.

Regardless, this blows up on multilib builds due to PN instead of BPN.

Cheers,

Richard
Ross Burton - Feb. 2, 2014, 1:14 p.m.
On Sunday, 2 February 2014, Richard Purdie <
richard.purdie@linuxfoundation.org> wrote:

> Its rather sad to need the gitsm fetcher. That fetcher isn't mirror safe
> so I'm not sure we can use it.


I've been meaning to ask Colin about tar all releases, so I'll do that now.

Ross

Patch

diff --git a/meta/recipes-support/gnome-desktop-testing/files/no-introspection.patch b/meta/recipes-support/gnome-desktop-testing/files/no-introspection.patch
deleted file mode 100644
index 67b64f2..0000000
--- a/meta/recipes-support/gnome-desktop-testing/files/no-introspection.patch
+++ /dev/null
@@ -1,19 +0,0 @@ 
-Introspection is a hard requirement to build gnome-desktop-testing upstream, but
-it isn't needed anymore.
-
-Upstream-Status: Submitted
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-diff --git a/configure.ac b/configure.ac
-index 7460c69..6249caf 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -27,8 +27,6 @@ AC_SUBST(WARN_CFLAGS)
- LT_PREREQ([2.2.4])
- LT_INIT([disable-static])
- 
--GOBJECT_INTROSPECTION_REQUIRE([1.34.0])
--
- PKG_CHECK_MODULES(GIO_UNIX, [gio-unix-2.0 >= 2.34.0])
- GIO_UNIX_CFLAGS="$GIO_UNIX_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_36 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_36"
- 
diff --git a/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2013.1.bb b/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_git.bb
similarity index 60%
rename from meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2013.1.bb
rename to meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_git.bb
index 36e13b1..be43d98 100644
--- a/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2013.1.bb
+++ b/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_git.bb
@@ -2,13 +2,15 @@  SUMMARY = "Test runner for GNOME-style installed tests"
 HOMEPAGE = "https://wiki.gnome.org/GnomeGoals/InstalledTests"
 LICENSE = "LGPLv2+"
 
-SRC_URI = "${GNOME_MIRROR}/${BPN}/${PV}/${BPN}-${PV}.tar.xz \
-           file://no-introspection.patch"
-SRC_URI[md5sum] = "c6824f7bfac95bf0fcf6ed0c255979c1"
-SRC_URI[sha256sum] = "632e7224de8614a8e4b7cdf87fc32551531efa9290fba0da4dae56234c584b7b"
+SRCREV = "fbec635575013b22ed5aa853e725448057ac54bc"
+PV = "2013.1+git${SRCPV}"
+
+SRC_URI = "gitsm://git.gnome.org/${PN}"
+
+S = "${WORKDIR}/git"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
-                    file://src/gnome-desktop-testing-runner.c;endline=19;md5=ab86a2e00ab9cbb94f008d785004b181"
+                    file://src/gnome-desktop-testing-runner.c;endline=19;md5=67311a600b83fd0068dfc7e5b84ffb3f"
 
 DEPENDS = "glib-2.0"