From: Richard Purdie <richard.purdie@linuxfoundation.org>
To: Ross Burton <ross.burton@intel.com>
Cc: openembedded-core@lists.openembedded.org
Subject: Re: [PATCH 2/3] gnome-desktop-testing: upgrade to current git master
Date: Sun, 02 Feb 2014 11:46:50 +0000 [thread overview]
Message-ID: <1391341610.28575.150.camel@ted> (raw)
In-Reply-To: <1391082719-14432-2-git-send-email-ross.burton@intel.com>
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
next prev parent reply other threads:[~2014-02-02 11:47 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-30 11:51 [PATCH 1/3] glib-2.0: fix handling of skipped tests Ross Burton
2014-01-30 11:51 ` [PATCH 2/3] gnome-desktop-testing: upgrade to current git master Ross Burton
2014-02-02 11:46 ` Richard Purdie [this message]
2014-02-02 13:14 ` Burton, Ross
2014-01-30 11:51 ` [PATCH 3/3] gdk-pixbuf: enable ptest Ross Burton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1391341610.28575.150.camel@ted \
--to=richard.purdie@linuxfoundation.org \
--cc=openembedded-core@lists.openembedded.org \
--cc=ross.burton@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.