[meta-selinux][PATCH] ustr: Change the SRC_URI to upstream and add a new patch

[meta-selinux][PATCH] ustr: Change the SRC_URI to upstream and add a new patch

[Qian Lei]

Official upstream is still Ok, using it first.
Add a new patch which is applied in Fedora20

Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com>
---
 recipes-extended/ustr/ustr/ustr-c99-inline.patch | 44 ++++++++++++++++++++++++
 recipes-extended/ustr/ustr_1.0.4.bb              |  8 ++---
 2 files changed, 47 insertions(+), 5 deletions(-)
 create mode 100644 recipes-extended/ustr/ustr/ustr-c99-inline.patch

diff --git a/recipes-extended/ustr/ustr/ustr-c99-inline.patch b/recipes-extended/ustr/ustr/ustr-c99-inline.patch
new file mode 100644
index 0000000..5f2d5da
--- /dev/null
+++ b/recipes-extended/ustr/ustr/ustr-c99-inline.patch
@@ -0,0 +1,44 @@
+From 1b1c36ec67b7976d0bca0b6c7b766540cb541c1e Mon Sep 17 00:00:00 2001
+From: Qian Lei <qianl.fnst@cn.fujitsu.com>
+Date: Wed, 19 Nov 2014 14:48:18 +0800
+Subject: [PATCH] c99-inline
+
+Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com>
+---
+ ustr-compiler.h | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/ustr-compiler.h b/ustr-compiler.h
+index 642e6e8..63735e0 100644
+--- a/ustr-compiler.h
++++ b/ustr-compiler.h
+@@ -113,17 +113,23 @@
+ #endif
+ 
+ #ifndef USTR_CONF_EI_PROTO /* external inline */
+-# if USTR_CONF_INCLUDE_CODEONLY_HEADERS
++# if USTR_CONF_INCLUDE_CODEONLY_HEADERS || ! defined(__GNUC__) || \
++     ! USTR_CONF_COMPILE_USE_INLINE
+ #  define USTR_CONF_EI_PROTO static USTR__INLINE
+ # else
+ #  define USTR_CONF_EI_PROTO extern
+ # endif
+ #endif
+ #ifndef USTR_CONF_II_PROTO /* implementation of inline */
+-# if USTR_CONF_INCLUDE_CODEONLY_HEADERS
++# if USTR_CONF_INCLUDE_CODEONLY_HEADERS || ! defined(__GNUC__) || \
++     ! USTR_CONF_COMPILE_USE_INLINE
+ #  define USTR_CONF_II_PROTO static USTR__INLINE
+ # else
+-#  define USTR_CONF_II_PROTO extern inline
++#  if defined(__GNUC_STDC_INLINE__) || defined(__GNUC_GNU_INLINE__)
++#   define USTR_CONF_II_PROTO extern inline __attribute__ ((__gnu_inline__))
++#  else
++#   define USTR_CONF_II_PROTO extern inline
++#  endif
+ # endif
+ #endif
+ 
+-- 
+1.8.3.1
+
diff --git a/recipes-extended/ustr/ustr_1.0.4.bb b/recipes-extended/ustr/ustr_1.0.4.bb
index 6651a73..485e80d 100644
--- a/recipes-extended/ustr/ustr_1.0.4.bb
+++ b/recipes-extended/ustr/ustr_1.0.4.bb
@@ -11,13 +11,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c79c6e2ae13418d16d7dc82df960a1e7 \
 		    file://LICENSE_LGPL;md5=d8045f3b8f929c1cb29a1e3fd737b499 \
 		    file://LICENSE_MIT;md5=c61e779b782608472bd87593c3c3916f"
 
-# Official upstream seems to be offline.. replace w/ a Fedora Project mirror.
-# http://www.and.org/ustr/1.0.4/ustr-1.0.4.tar.bz2 
-
 SRC_URI = "\
-    http://pkgs.fedoraproject.org/repo/pkgs/ustr/ustr-1.0.4.tar.bz2/93147d9f0c9765d4cd0f04f7e44bdfce/ustr-1.0.4.tar.bz2 \
+    http://www.and.org/ustr/${PV}/${PN}-${PV}.tar.bz2 \
     file://ustr-makefile-fix.patch;patch=1 \
-    file://ustr-fix__va_copy-not-defined.patch;patch=2"
+    file://ustr-fix__va_copy-not-defined.patch;patch=2 \
+    file://ustr-c99-inline.patch;patch=3"
 SRC_URI[md5sum] = "93147d9f0c9765d4cd0f04f7e44bdfce"
 SRC_URI[sha256sum] = "3daf6eae9f78de1e872c0b2b83cce35515b94d4bb8a074e48f331fd99e1fc2c4"
 
-- 
1.8.3.1

Re: [meta-selinux][PATCH] ustr: Change the SRC_URI to upstream and add a new patch

[Joe MacDonald]

[-- Attachment #1: Type: text/plain, Size: 4324 bytes --]

Thanks for the submission.  Just a couple of comments.

[[oe] [meta-selinux][PATCH] ustr: Change the SRC_URI to upstream and add a new patch] On 14.11.19 (Wed 15:34) Qian Lei wrote:

> Official upstream is still Ok, using it first.
> Add a new patch which is applied in Fedora20

As these are two unrelated issues, I think two patches would've been
appropriate with 1/2 being the one that updates the SRC_URI and 2/2
being the c99 patch.

You should also provide an upstream-status for the C99 patch.  As you
say it came from Fedora, odds are it is already submitted upstream, so
'pending' could be appropriate here, but I don't know.

Finally, meta-selinux patches should go to yocto@yoctoproject.org (cc'd
here), not the openembedded-dev@ list.

I'm fine with making the changes I described above or you can send out a
new version of the patch/patches if you like.  I won't do anything with
it before tomorrow, either way, to give everyone time to have a look.

-J.

> 
> Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com>
> ---
>  recipes-extended/ustr/ustr/ustr-c99-inline.patch | 44 ++++++++++++++++++++++++
>  recipes-extended/ustr/ustr_1.0.4.bb              |  8 ++---
>  2 files changed, 47 insertions(+), 5 deletions(-)
>  create mode 100644 recipes-extended/ustr/ustr/ustr-c99-inline.patch
> 
> diff --git a/recipes-extended/ustr/ustr/ustr-c99-inline.patch b/recipes-extended/ustr/ustr/ustr-c99-inline.patch
> new file mode 100644
> index 0000000..5f2d5da
> --- /dev/null
> +++ b/recipes-extended/ustr/ustr/ustr-c99-inline.patch
> @@ -0,0 +1,44 @@
> +From 1b1c36ec67b7976d0bca0b6c7b766540cb541c1e Mon Sep 17 00:00:00 2001
> +From: Qian Lei <qianl.fnst@cn.fujitsu.com>
> +Date: Wed, 19 Nov 2014 14:48:18 +0800
> +Subject: [PATCH] c99-inline
> +
> +Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com>
> +---
> + ustr-compiler.h | 12 +++++++++---
> + 1 file changed, 9 insertions(+), 3 deletions(-)
> +
> +diff --git a/ustr-compiler.h b/ustr-compiler.h
> +index 642e6e8..63735e0 100644
> +--- a/ustr-compiler.h
> ++++ b/ustr-compiler.h
> +@@ -113,17 +113,23 @@
> + #endif
> + 
> + #ifndef USTR_CONF_EI_PROTO /* external inline */
> +-# if USTR_CONF_INCLUDE_CODEONLY_HEADERS
> ++# if USTR_CONF_INCLUDE_CODEONLY_HEADERS || ! defined(__GNUC__) || \
> ++     ! USTR_CONF_COMPILE_USE_INLINE
> + #  define USTR_CONF_EI_PROTO static USTR__INLINE
> + # else
> + #  define USTR_CONF_EI_PROTO extern
> + # endif
> + #endif
> + #ifndef USTR_CONF_II_PROTO /* implementation of inline */
> +-# if USTR_CONF_INCLUDE_CODEONLY_HEADERS
> ++# if USTR_CONF_INCLUDE_CODEONLY_HEADERS || ! defined(__GNUC__) || \
> ++     ! USTR_CONF_COMPILE_USE_INLINE
> + #  define USTR_CONF_II_PROTO static USTR__INLINE
> + # else
> +-#  define USTR_CONF_II_PROTO extern inline
> ++#  if defined(__GNUC_STDC_INLINE__) || defined(__GNUC_GNU_INLINE__)
> ++#   define USTR_CONF_II_PROTO extern inline __attribute__ ((__gnu_inline__))
> ++#  else
> ++#   define USTR_CONF_II_PROTO extern inline
> ++#  endif
> + # endif
> + #endif
> + 
> +-- 
> +1.8.3.1
> +
> diff --git a/recipes-extended/ustr/ustr_1.0.4.bb b/recipes-extended/ustr/ustr_1.0.4.bb
> index 6651a73..485e80d 100644
> --- a/recipes-extended/ustr/ustr_1.0.4.bb
> +++ b/recipes-extended/ustr/ustr_1.0.4.bb
> @@ -11,13 +11,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c79c6e2ae13418d16d7dc82df960a1e7 \
>  		    file://LICENSE_LGPL;md5=d8045f3b8f929c1cb29a1e3fd737b499 \
>  		    file://LICENSE_MIT;md5=c61e779b782608472bd87593c3c3916f"
>  
> -# Official upstream seems to be offline.. replace w/ a Fedora Project mirror.
> -# http://www.and.org/ustr/1.0.4/ustr-1.0.4.tar.bz2 
> -
>  SRC_URI = "\
> -    http://pkgs.fedoraproject.org/repo/pkgs/ustr/ustr-1.0.4.tar.bz2/93147d9f0c9765d4cd0f04f7e44bdfce/ustr-1.0.4.tar.bz2 \
> +    http://www.and.org/ustr/${PV}/${PN}-${PV}.tar.bz2 \
>      file://ustr-makefile-fix.patch;patch=1 \
> -    file://ustr-fix__va_copy-not-defined.patch;patch=2"
> +    file://ustr-fix__va_copy-not-defined.patch;patch=2 \
> +    file://ustr-c99-inline.patch;patch=3"
>  SRC_URI[md5sum] = "93147d9f0c9765d4cd0f04f7e44bdfce"
>  SRC_URI[sha256sum] = "3daf6eae9f78de1e872c0b2b83cce35515b94d4bb8a074e48f331fd99e1fc2c4"
>  
> -- 
> 1.8.3.1
> 
-- 
-Joe MacDonald.
:wq

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 501 bytes --]

Re: [oe] [meta-selinux][PATCH] ustr: Change the SRC_URI to upstream and add a new patch

[Joe MacDonald]

[-- Attachment #1: Type: text/plain, Size: 4324 bytes --]

Thanks for the submission.  Just a couple of comments.

[[oe] [meta-selinux][PATCH] ustr: Change the SRC_URI to upstream and add a new patch] On 14.11.19 (Wed 15:34) Qian Lei wrote:

> Official upstream is still Ok, using it first.
> Add a new patch which is applied in Fedora20

As these are two unrelated issues, I think two patches would've been
appropriate with 1/2 being the one that updates the SRC_URI and 2/2
being the c99 patch.

You should also provide an upstream-status for the C99 patch.  As you
say it came from Fedora, odds are it is already submitted upstream, so
'pending' could be appropriate here, but I don't know.

Finally, meta-selinux patches should go to yocto@yoctoproject.org (cc'd
here), not the openembedded-dev@ list.

I'm fine with making the changes I described above or you can send out a
new version of the patch/patches if you like.  I won't do anything with
it before tomorrow, either way, to give everyone time to have a look.

-J.

> 
> Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com>
> ---
>  recipes-extended/ustr/ustr/ustr-c99-inline.patch | 44 ++++++++++++++++++++++++
>  recipes-extended/ustr/ustr_1.0.4.bb              |  8 ++---
>  2 files changed, 47 insertions(+), 5 deletions(-)
>  create mode 100644 recipes-extended/ustr/ustr/ustr-c99-inline.patch
> 
> diff --git a/recipes-extended/ustr/ustr/ustr-c99-inline.patch b/recipes-extended/ustr/ustr/ustr-c99-inline.patch
> new file mode 100644
> index 0000000..5f2d5da
> --- /dev/null
> +++ b/recipes-extended/ustr/ustr/ustr-c99-inline.patch
> @@ -0,0 +1,44 @@
> +From 1b1c36ec67b7976d0bca0b6c7b766540cb541c1e Mon Sep 17 00:00:00 2001
> +From: Qian Lei <qianl.fnst@cn.fujitsu.com>
> +Date: Wed, 19 Nov 2014 14:48:18 +0800
> +Subject: [PATCH] c99-inline
> +
> +Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com>
> +---
> + ustr-compiler.h | 12 +++++++++---
> + 1 file changed, 9 insertions(+), 3 deletions(-)
> +
> +diff --git a/ustr-compiler.h b/ustr-compiler.h
> +index 642e6e8..63735e0 100644
> +--- a/ustr-compiler.h
> ++++ b/ustr-compiler.h
> +@@ -113,17 +113,23 @@
> + #endif
> + 
> + #ifndef USTR_CONF_EI_PROTO /* external inline */
> +-# if USTR_CONF_INCLUDE_CODEONLY_HEADERS
> ++# if USTR_CONF_INCLUDE_CODEONLY_HEADERS || ! defined(__GNUC__) || \
> ++     ! USTR_CONF_COMPILE_USE_INLINE
> + #  define USTR_CONF_EI_PROTO static USTR__INLINE
> + # else
> + #  define USTR_CONF_EI_PROTO extern
> + # endif
> + #endif
> + #ifndef USTR_CONF_II_PROTO /* implementation of inline */
> +-# if USTR_CONF_INCLUDE_CODEONLY_HEADERS
> ++# if USTR_CONF_INCLUDE_CODEONLY_HEADERS || ! defined(__GNUC__) || \
> ++     ! USTR_CONF_COMPILE_USE_INLINE
> + #  define USTR_CONF_II_PROTO static USTR__INLINE
> + # else
> +-#  define USTR_CONF_II_PROTO extern inline
> ++#  if defined(__GNUC_STDC_INLINE__) || defined(__GNUC_GNU_INLINE__)
> ++#   define USTR_CONF_II_PROTO extern inline __attribute__ ((__gnu_inline__))
> ++#  else
> ++#   define USTR_CONF_II_PROTO extern inline
> ++#  endif
> + # endif
> + #endif
> + 
> +-- 
> +1.8.3.1
> +
> diff --git a/recipes-extended/ustr/ustr_1.0.4.bb b/recipes-extended/ustr/ustr_1.0.4.bb
> index 6651a73..485e80d 100644
> --- a/recipes-extended/ustr/ustr_1.0.4.bb
> +++ b/recipes-extended/ustr/ustr_1.0.4.bb
> @@ -11,13 +11,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c79c6e2ae13418d16d7dc82df960a1e7 \
>  		    file://LICENSE_LGPL;md5=d8045f3b8f929c1cb29a1e3fd737b499 \
>  		    file://LICENSE_MIT;md5=c61e779b782608472bd87593c3c3916f"
>  
> -# Official upstream seems to be offline.. replace w/ a Fedora Project mirror.
> -# http://www.and.org/ustr/1.0.4/ustr-1.0.4.tar.bz2 
> -
>  SRC_URI = "\
> -    http://pkgs.fedoraproject.org/repo/pkgs/ustr/ustr-1.0.4.tar.bz2/93147d9f0c9765d4cd0f04f7e44bdfce/ustr-1.0.4.tar.bz2 \
> +    http://www.and.org/ustr/${PV}/${PN}-${PV}.tar.bz2 \
>      file://ustr-makefile-fix.patch;patch=1 \
> -    file://ustr-fix__va_copy-not-defined.patch;patch=2"
> +    file://ustr-fix__va_copy-not-defined.patch;patch=2 \
> +    file://ustr-c99-inline.patch;patch=3"
>  SRC_URI[md5sum] = "93147d9f0c9765d4cd0f04f7e44bdfce"
>  SRC_URI[sha256sum] = "3daf6eae9f78de1e872c0b2b83cce35515b94d4bb8a074e48f331fd99e1fc2c4"
>  
> -- 
> 1.8.3.1
> 
-- 
-Joe MacDonald.
:wq

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 501 bytes --]

Re: [meta-selinux][PATCH] ustr: Change the SRC_URI to upstream and add a new patch

[Qian Lei]

On Wed, 19 Nov 2014 15:56:47 -0500
Joe MacDonald <Joe_MacDonald@mentor.com> wrote:

> Thanks for the submission.  Just a couple of comments.
> 
> [[oe] [meta-selinux][PATCH] ustr: Change the SRC_URI to upstream and add a
> new patch] On 14.11.19 (Wed 15:34) Qian Lei wrote:
> 
> > Official upstream is still Ok, using it first.
> > Add a new patch which is applied in Fedora20
> 
> As these are two unrelated issues, I think two patches would've been
> appropriate with 1/2 being the one that updates the SRC_URI and 2/2
> being the c99 patch.
> 
> You should also provide an upstream-status for the C99 patch.  As you
> say it came from Fedora, odds are it is already submitted upstream, so
> 'pending' could be appropriate here, but I don't know.
> 
> Finally, meta-selinux patches should go to yocto@yoctoproject.org (cc'd
> here), not the openembedded-dev@ list.
> 
> I'm fine with making the changes I described above or you can send out a
> new version of the patch/patches if you like.  I won't do anything with
> it before tomorrow, either way, to give everyone time to have a look.
> 
> -J.

Thanks for your reply.It really help me a lot. I'll take your advice and send a
new version of patches to yocto soon.

Qian Lei

Re: [oe] [meta-selinux][PATCH] ustr: Change the SRC_URI to upstream and add a new patch

[Qian Lei]

On Wed, 19 Nov 2014 15:56:47 -0500
Joe MacDonald <Joe_MacDonald@mentor.com> wrote:

> Thanks for the submission.  Just a couple of comments.
> 
> [[oe] [meta-selinux][PATCH] ustr: Change the SRC_URI to upstream and add a
> new patch] On 14.11.19 (Wed 15:34) Qian Lei wrote:
> 
> > Official upstream is still Ok, using it first.
> > Add a new patch which is applied in Fedora20
> 
> As these are two unrelated issues, I think two patches would've been
> appropriate with 1/2 being the one that updates the SRC_URI and 2/2
> being the c99 patch.
> 
> You should also provide an upstream-status for the C99 patch.  As you
> say it came from Fedora, odds are it is already submitted upstream, so
> 'pending' could be appropriate here, but I don't know.
> 
> Finally, meta-selinux patches should go to yocto@yoctoproject.org (cc'd
> here), not the openembedded-dev@ list.
> 
> I'm fine with making the changes I described above or you can send out a
> new version of the patch/patches if you like.  I won't do anything with
> it before tomorrow, either way, to give everyone time to have a look.
> 
> -J.

Thanks for your reply.It really help me a lot. I'll take your advice and send a
new version of patches to yocto soon.

Qian Lei