Patchwork libx11: reinstate PE=1 that got lost in the big meta-oe Xorg merge

login
register
mail settings
Submitter Koen Kooi
Date March 4, 2012, 2:50 p.m.
Message ID <1330872643-2185-1-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/22679/
State New
Headers show

Comments

Koen Kooi - March 4, 2012, 2:50 p.m.
This prevents package managers 'upgrading' 1.4.4 to 1:1.4.3

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta/recipes-graphics/xorg-lib/libx11.inc      |    2 ++
 meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)
Koen Kooi - March 5, 2012, 7:20 a.m.
Op 4 mrt. 2012, om 15:50 heeft Koen Kooi het volgende geschreven:

> This prevents package managers 'upgrading' 1.4.4 to 1:1.4.3
> 
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
> meta/recipes-graphics/xorg-lib/libx11.inc      |    2 ++
> meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb |    2 +-
> 2 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc
> index 9057edc..a1e4386 100644
> --- a/meta/recipes-graphics/xorg-lib/libx11.inc
> +++ b/meta/recipes-graphics/xorg-lib/libx11.inc
> @@ -8,6 +8,8 @@ require xorg-lib-common.inc
> 
> inherit siteinfo
> 
> +PE = "1"
> +
> PROVIDES = "virtual/libx11"
> 
> XORG_PN = "libX11"

I sent it against an older version of the tree (shame on me) and git merged the below change away, do you want me to do an r3 and resubmit?

regards,

Koen

> diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb b/meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb
> index ee1d919..152bd79 100644
> --- a/meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb
> +++ b/meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb
> @@ -1,7 +1,7 @@
> require libx11.inc
> inherit gettext
> 
> -PR = "r1"
> +PR = "r2"
> 
> BBCLASSEXTEND = "native nativesdk"
> 
> -- 
> 1.7.2.5
>

Patch

diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc
index 9057edc..a1e4386 100644
--- a/meta/recipes-graphics/xorg-lib/libx11.inc
+++ b/meta/recipes-graphics/xorg-lib/libx11.inc
@@ -8,6 +8,8 @@  require xorg-lib-common.inc
 
 inherit siteinfo
 
+PE = "1"
+
 PROVIDES = "virtual/libx11"
 
 XORG_PN = "libX11"
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb b/meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb
index ee1d919..152bd79 100644
--- a/meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb
@@ -1,7 +1,7 @@ 
 require libx11.inc
 inherit gettext
 
-PR = "r1"
+PR = "r2"
 
 BBCLASSEXTEND = "native nativesdk"