Patchwork [6/8] xcb-util: upgrade from 0.3.6 to 0.3.8

login
register
mail settings
Submitter Dexuan Cui
Date Nov. 30, 2011, 2:12 p.m.
Message ID <05e28e6a8cd5c930a0c538121ced79d008f0fdf3.1322662245.git.dexuan.cui@intel.com>
Download mbox | patch
Permalink /patch/15849/
State Accepted
Commit 6171e0f9c67a7085c62658eedf318107f3eee878
Headers show

Comments

Dexuan Cui - Nov. 30, 2011, 2:12 p.m.
updated LIC_FILES_CHKSUM since the code was re-organized, but the license
remains the same.

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
---
 meta/recipes-graphics/xcb/xcb-util_0.3.6.bb |   18 ------------------
 meta/recipes-graphics/xcb/xcb-util_0.3.8.bb |    9 +++++++++
 2 files changed, 9 insertions(+), 18 deletions(-)
 delete mode 100644 meta/recipes-graphics/xcb/xcb-util_0.3.6.bb
 create mode 100644 meta/recipes-graphics/xcb/xcb-util_0.3.8.bb
Khem Raj - Nov. 30, 2011, 10:16 p.m.
On Wed, Nov 30, 2011 at 6:12 AM, Dexuan Cui <dexuan.cui@intel.com> wrote:
> updated LIC_FILES_CHKSUM since the code was re-organized, but the license
> remains the same.
>
> Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
> ---
>  meta/recipes-graphics/xcb/xcb-util_0.3.6.bb |   18 ------------------
>  meta/recipes-graphics/xcb/xcb-util_0.3.8.bb |    9 +++++++++
>  2 files changed, 9 insertions(+), 18 deletions(-)
>  delete mode 100644 meta/recipes-graphics/xcb/xcb-util_0.3.6.bb
>  create mode 100644 meta/recipes-graphics/xcb/xcb-util_0.3.8.bb
>
> diff --git a/meta/recipes-graphics/xcb/xcb-util_0.3.6.bb b/meta/recipes-graphics/xcb/xcb-util_0.3.6.bb
> deleted file mode 100644
> index 1057b34..0000000
> --- a/meta/recipes-graphics/xcb/xcb-util_0.3.6.bb
> +++ /dev/null
> @@ -1,18 +0,0 @@
> -require xcb-util.inc
> -
> -LICENSE = "MIT"
> -LIC_FILES_CHKSUM = "file://xcb-util-common.h;endline=30;md5=6c74595925fd773cc8cf387ff7bc53c7 \
> -                    file://reply/reply.c;endline=27;md5=f9a1d6b55bba632d349949cbf33cd635 \
> -                    file://aux/xcb_aux.c;endline=30;md5=ae305b9c2a38f9ba27060191046a6460 \
> -                    file://renderutil/xcb_renderutil.h;endline=24;md5=d0ddab3052dd4949c93cfcb0891c96df \
> -                    file://event/xcb_event.h;endline=27;md5=627be355aee59e1b8ade80d5bd90fad9 \
> -                    file://property/xcb_property.h;endline=27;md5=f5890866ee0c655c36ef1c6c738fee6b \
> -                    file://keysyms/keysyms.c;endline=30;md5=2f8de023ed823bb92f0b47900574ea9e \
> -                    file://image/xcb_pixel.h;beginline=4;endline=27;md5=48cd25ae55e7de525fe1e1a3a7672e1c"
> -
> -
> -PR = "r0"
> -
> -
> -SRC_URI[md5sum] = "dd8968b8ee613cb027a8ef1fcbdc8fc9"
> -SRC_URI[sha256sum] = "ffb8ee11ab015858a970ab7edd56bd2436b281657596561d8429d4a90df60e57"
> diff --git a/meta/recipes-graphics/xcb/xcb-util_0.3.8.bb b/meta/recipes-graphics/xcb/xcb-util_0.3.8.bb
> new file mode 100644
> index 0000000..b7eff29
> --- /dev/null
> +++ b/meta/recipes-graphics/xcb/xcb-util_0.3.8.bb
> @@ -0,0 +1,9 @@
> +require xcb-util.inc
> +
> +LICENSE = "MIT"
> +LIC_FILES_CHKSUM = "file://src/xcb_aux.c;endline=30;md5=ae305b9c2a38f9ba27060191046a6460 \
> +                    file://src/xcb_event.h;endline=27;md5=627be355aee59e1b8ade80d5bd90fad9"

if license remains same then why do we not check for the remaining
files from there new location wherever they moved to
after code reorg ?

> +PR = "r0"
> +
> +SRC_URI[md5sum] = "8ce019c4bbf20dce246b98f177cfccff"
> +SRC_URI[sha256sum] = "c1eed9284750bc09352e60654df77bb585dbbe7673fdcc675e58b7f3a0b447b9"
> --
> 1.7.6
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Martin Jansa - Dec. 1, 2011, 8:02 a.m.
On Wed, Nov 30, 2011 at 10:12:32PM +0800, Dexuan Cui wrote:
> updated LIC_FILES_CHKSUM since the code was re-organized, but the license
> remains the same.
> 
> Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
> ---
>  meta/recipes-graphics/xcb/xcb-util_0.3.6.bb |   18 ------------------
>  meta/recipes-graphics/xcb/xcb-util_0.3.8.bb |    9 +++++++++
>  2 files changed, 9 insertions(+), 18 deletions(-)
>  delete mode 100644 meta/recipes-graphics/xcb/xcb-util_0.3.6.bb
>  create mode 100644 meta/recipes-graphics/xcb/xcb-util_0.3.8.bb

Because there is only one .so lib now after:
http://cgit.freedesktop.org/xcb/util/commit/?id=118a3c86b3d3b2fab20f365e4a5703e40ad2e1b1

the resulting package is renamed from
Package xcb-util (0.3.6-r0) is installed on root and has the following
files:
/usr/lib/libxcb-aux.so.0
/usr/lib/libxcb-keysyms.so.1
/usr/lib/libxcb-icccm.so.1
/usr/lib/libxcb-image.so.0.0.0
/usr/lib/libxcb-atom.so.1.0.0
/usr/lib/libxcb-icccm.so.1.0.0
/usr/lib/libxcb-event.so.1
/usr/lib/libxcb-reply.so.1.0.0
/usr/lib/libxcb-property.so.1.0.0
/usr/lib/libxcb-render-util.so.0.0.0
/usr/lib/libxcb-property.so.1
/usr/lib/libxcb-reply.so.1
/usr/lib/libxcb-image.so.0
/usr/lib/libxcb-atom.so.1
/usr/lib/libxcb-event.so.1.0.0
/usr/lib/libxcb-render-util.so.0
/usr/lib/libxcb-aux.so.0.0.0
/usr/lib/libxcb-keysyms.so.1.0.0

Now it's libxcb-util0, because of only one .so
packages-split/xcb-util
packages-split/xcb-util/usr
packages-split/xcb-util/usr/lib
packages-split/xcb-util/usr/lib/libxcb-util.so.0.0.0
packages-split/xcb-util/usr/lib/libxcb-util.so.0

So we need at least PR bumps for recipes which were RDEPENDing on
xcb-util (ie because of shlibs). I'll send patches later for recipes
which are failing for me now..

Cheers,

> 
> diff --git a/meta/recipes-graphics/xcb/xcb-util_0.3.6.bb b/meta/recipes-graphics/xcb/xcb-util_0.3.6.bb
> deleted file mode 100644
> index 1057b34..0000000
> --- a/meta/recipes-graphics/xcb/xcb-util_0.3.6.bb
> +++ /dev/null
> @@ -1,18 +0,0 @@
> -require xcb-util.inc
> -
> -LICENSE = "MIT"
> -LIC_FILES_CHKSUM = "file://xcb-util-common.h;endline=30;md5=6c74595925fd773cc8cf387ff7bc53c7 \
> -                    file://reply/reply.c;endline=27;md5=f9a1d6b55bba632d349949cbf33cd635 \
> -                    file://aux/xcb_aux.c;endline=30;md5=ae305b9c2a38f9ba27060191046a6460 \
> -                    file://renderutil/xcb_renderutil.h;endline=24;md5=d0ddab3052dd4949c93cfcb0891c96df \
> -                    file://event/xcb_event.h;endline=27;md5=627be355aee59e1b8ade80d5bd90fad9 \
> -                    file://property/xcb_property.h;endline=27;md5=f5890866ee0c655c36ef1c6c738fee6b \
> -                    file://keysyms/keysyms.c;endline=30;md5=2f8de023ed823bb92f0b47900574ea9e \
> -                    file://image/xcb_pixel.h;beginline=4;endline=27;md5=48cd25ae55e7de525fe1e1a3a7672e1c"
> -
> -
> -PR = "r0"
> -
> -
> -SRC_URI[md5sum] = "dd8968b8ee613cb027a8ef1fcbdc8fc9"
> -SRC_URI[sha256sum] = "ffb8ee11ab015858a970ab7edd56bd2436b281657596561d8429d4a90df60e57"
> diff --git a/meta/recipes-graphics/xcb/xcb-util_0.3.8.bb b/meta/recipes-graphics/xcb/xcb-util_0.3.8.bb
> new file mode 100644
> index 0000000..b7eff29
> --- /dev/null
> +++ b/meta/recipes-graphics/xcb/xcb-util_0.3.8.bb
> @@ -0,0 +1,9 @@
> +require xcb-util.inc
> +
> +LICENSE = "MIT"
> +LIC_FILES_CHKSUM = "file://src/xcb_aux.c;endline=30;md5=ae305b9c2a38f9ba27060191046a6460 \
> +                    file://src/xcb_event.h;endline=27;md5=627be355aee59e1b8ade80d5bd90fad9"
> +PR = "r0"
> +
> +SRC_URI[md5sum] = "8ce019c4bbf20dce246b98f177cfccff"
> +SRC_URI[sha256sum] = "c1eed9284750bc09352e60654df77bb585dbbe7673fdcc675e58b7f3a0b447b9"
> -- 
> 1.7.6
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Dexuan Cui - Dec. 2, 2011, 1:59 a.m.
Khem Raj wrote on 2011-12-01:
> On Wed, Nov 30, 2011 at 6:12 AM, Dexuan Cui <dexuan.cui@intel.com>

> wrote:

>> updated LIC_FILES_CHKSUM since the code was re-organized, but the

>> license remains the same.

>> --- /dev/null

>> +++ b/meta/recipes-graphics/xcb/xcb-util_0.3.8.bb

>> @@ -0,0 +1,9 @@

>> 

> +"file://src/xcb_aux.c;endline=30;md5=ae305b9c2a38f9ba27060191046a64

> 60

>> +\

>> + file://src/xcb_event.h;endline=27;md5=627be35

> 5aee59e1b8ade80d5bd90fad9"

> 

> if license remains same then why do we not check for the remaining

> files from there new location wherever they moved to after code reorg ?

Some files in 0.3.6 doesn't exist in 0.3.8. According the Changelog, they seem to be demo code, or obsolete code.
I reserved the 2 files of LIC_FILES_CHKSUM since they're still in 0.3.8, but with a different directory. The other files don't exist now.

Thanks,
-- Dexuan
Dexuan Cui - Dec. 2, 2011, 2:18 a.m.
Martin Jansa wrote on 2011-12-01:
> On Wed, Nov 30, 2011 at 10:12:32PM +0800, Dexuan Cui wrote:
>> updated LIC_FILES_CHKSUM since the code was re-organized, but the 
>> license remains the same.
>> 
>>  meta/recipes-graphics/xcb/xcb-util_0.3.6.bb |   18 ------------------
>>  meta/recipes-graphics/xcb/xcb-util_0.3.8.bb |    9 +++++++++ 2 files
>>  changed, 9 insertions(+), 18 deletions(-)  delete mode 100644  
>> meta/recipes-graphics/xcb/xcb-util_0.3.6.bb create mode 100644  
>> meta/recipes-graphics/xcb/xcb-util_0.3.8.bb
> 
> Because there is only one .so lib now after:
> http://cgit.freedesktop.org/xcb/util/commit/?id=118a3c86b3d3b2fab20f36
> 5e4a5703e40ad2e1b1
> 
> the resulting package is renamed from Package xcb-util (0.3.6-r0) is 
> installed on root and has the following files: 
> /usr/lib/libxcb-aux.so.0
> /usr/lib/libxcb-keysyms.so.1 /usr/lib/libxcb-icccm.so.1 
> /usr/lib/libxcb-image.so.0.0.0 /usr/lib/libxcb-atom.so.1.0.0 
> /usr/lib/libxcb-icccm.so.1.0.0 /usr/lib/libxcb-event.so.1 
> /usr/lib/libxcb-reply.so.1.0.0 /usr/lib/libxcb-property.so.1.0.0 
> /usr/lib/libxcb-render-util.so.0.0.0 /usr/lib/libxcb-property.so.1
> /usr/lib/libxcb-reply.so.1 /usr/lib/libxcb-image.so.0
> /usr/lib/libxcb-atom.so.1 /usr/lib/libxcb-event.so.1.0.0 
> /usr/lib/libxcb-render-util.so.0 /usr/lib/libxcb-aux.so.0.0.0 
> /usr/lib/libxcb-keysyms.so.1.0.0
> 
> Now it's libxcb-util0, because of only one .so packages-split/xcb-util 
> packages-split/xcb-util/usr packages-split/xcb-util/usr/lib 
> packages-split/xcb-util/usr/lib/libxcb-util.so.0.0.0
> packages-split/xcb-util/usr/lib/libxcb-util.so.0
> 
> So we need at least PR bumps for recipes which were RDEPENDing on 
> xcb-util (ie because of shlibs). I'll send patches later for recipes 
> which are failing for me now..
Hi Martin, thanks very much for helping on this! :-)

Thanks,
-- Dexuan

Patch

diff --git a/meta/recipes-graphics/xcb/xcb-util_0.3.6.bb b/meta/recipes-graphics/xcb/xcb-util_0.3.6.bb
deleted file mode 100644
index 1057b34..0000000
--- a/meta/recipes-graphics/xcb/xcb-util_0.3.6.bb
+++ /dev/null
@@ -1,18 +0,0 @@ 
-require xcb-util.inc
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://xcb-util-common.h;endline=30;md5=6c74595925fd773cc8cf387ff7bc53c7 \
-                    file://reply/reply.c;endline=27;md5=f9a1d6b55bba632d349949cbf33cd635 \
-                    file://aux/xcb_aux.c;endline=30;md5=ae305b9c2a38f9ba27060191046a6460 \
-                    file://renderutil/xcb_renderutil.h;endline=24;md5=d0ddab3052dd4949c93cfcb0891c96df \
-                    file://event/xcb_event.h;endline=27;md5=627be355aee59e1b8ade80d5bd90fad9 \
-                    file://property/xcb_property.h;endline=27;md5=f5890866ee0c655c36ef1c6c738fee6b \
-                    file://keysyms/keysyms.c;endline=30;md5=2f8de023ed823bb92f0b47900574ea9e \
-                    file://image/xcb_pixel.h;beginline=4;endline=27;md5=48cd25ae55e7de525fe1e1a3a7672e1c"
-
-
-PR = "r0"
-
-
-SRC_URI[md5sum] = "dd8968b8ee613cb027a8ef1fcbdc8fc9"
-SRC_URI[sha256sum] = "ffb8ee11ab015858a970ab7edd56bd2436b281657596561d8429d4a90df60e57"
diff --git a/meta/recipes-graphics/xcb/xcb-util_0.3.8.bb b/meta/recipes-graphics/xcb/xcb-util_0.3.8.bb
new file mode 100644
index 0000000..b7eff29
--- /dev/null
+++ b/meta/recipes-graphics/xcb/xcb-util_0.3.8.bb
@@ -0,0 +1,9 @@ 
+require xcb-util.inc
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://src/xcb_aux.c;endline=30;md5=ae305b9c2a38f9ba27060191046a6460 \
+                    file://src/xcb_event.h;endline=27;md5=627be355aee59e1b8ade80d5bd90fad9"
+PR = "r0"
+
+SRC_URI[md5sum] = "8ce019c4bbf20dce246b98f177cfccff"
+SRC_URI[sha256sum] = "c1eed9284750bc09352e60654df77bb585dbbe7673fdcc675e58b7f3a0b447b9"