| Message ID | 20170603045833.8120-4-raj.khem@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [oe,meta-multimedia,1/4] caps: Fix buld with -pie | expand |
On 06/02/2017 09:58 PM, Khem Raj wrote: > Signed-off-by: Khem Raj <raj.khem@gmail.com> > --- > .../recipes-connectivity/samba/samba/glibc_only.patch | 15 +++++++++++++++ > .../samba/samba/netdb_defines.patch | 19 +++++++++++++++++++ > .../recipes-connectivity/samba/samba_4.6.2.bb | 2 ++ > 3 files changed, 36 insertions(+) > create mode 100644 meta-networking/recipes-connectivity/samba/samba/glibc_only.patch > create mode 100644 meta-networking/recipes-connectivity/samba/samba/netdb_defines.patch > > diff --git a/meta-networking/recipes-connectivity/samba/samba/glibc_only.patch b/meta-networking/recipes-connectivity/samba/samba/glibc_only.patch > new file mode 100644 > index 000000000..894bc8bb2 Isn't this missing Upstream-Status and Signed-off-by ? - armin > --- /dev/null > +++ b/meta-networking/recipes-connectivity/samba/samba/glibc_only.patch > @@ -0,0 +1,15 @@ > +Index: samba-4.6.2/ctdb/tests/src/test_mutex_raw.c > +=================================================================== > +--- samba-4.6.2.orig/ctdb/tests/src/test_mutex_raw.c > ++++ samba-4.6.2/ctdb/tests/src/test_mutex_raw.c > +@@ -166,8 +166,10 @@ int main(int argc, const char **argv) > + if (ret == 0) { > + pthread_mutex_unlock(mutex); > + } > ++#ifdef __GLIBC__ > + } else if (ret == EBUSY) { > + printf("pid=%u\n", mutex->__data.__owner); > ++#endif > + } else if (ret == 0) { > + pthread_mutex_unlock(mutex); > + } > diff --git a/meta-networking/recipes-connectivity/samba/samba/netdb_defines.patch b/meta-networking/recipes-connectivity/samba/samba/netdb_defines.patch > new file mode 100644 > index 000000000..eb06866f4 > --- /dev/null > +++ b/meta-networking/recipes-connectivity/samba/samba/netdb_defines.patch > @@ -0,0 +1,19 @@ > +Index: samba-4.6.2/nsswitch/wins.c > +=================================================================== > +--- samba-4.6.2.orig/nsswitch/wins.c > ++++ samba-4.6.2/nsswitch/wins.c > +@@ -39,6 +39,14 @@ static pthread_mutex_t wins_nss_mutex = > + #define INADDRSZ 4 > + #endif > + > ++#ifndef NETDB_INTERNAL > ++#define NETDB_INTERNAL (-1) > ++#endif > ++ > ++#ifndef NETDB_SUCCESS > ++#define NETDB_SUCCESS 0 > ++#endif > ++ > + NSS_STATUS _nss_wins_gethostbyname_r(const char *hostname, > + struct hostent *he, > + char *buffer, > diff --git a/meta-networking/recipes-connectivity/samba/samba_4.6.2.bb b/meta-networking/recipes-connectivity/samba/samba_4.6.2.bb > index 38876c2c3..7574aefb4 100644 > --- a/meta-networking/recipes-connectivity/samba/samba_4.6.2.bb > +++ b/meta-networking/recipes-connectivity/samba/samba_4.6.2.bb > @@ -18,6 +18,8 @@ SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ > file://21-add-config-option-without-valgrind.patch \ > file://0001-packaging-Avoid-timeout-for-nmbd-if-started-offline-.patch \ > file://0006-avoid-using-colon-in-the-checking-msg.patch \ > + file://netdb_defines.patch \ > + file://glibc_only.patch \ > file://volatiles.03_samba \ > " > SRC_URI_append_libc-musl = " \ -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
diff --git a/meta-networking/recipes-connectivity/samba/samba/glibc_only.patch b/meta-networking/recipes-connectivity/samba/samba/glibc_only.patch new file mode 100644 index 000000000..894bc8bb2 --- /dev/null +++ b/meta-networking/recipes-connectivity/samba/samba/glibc_only.patch @@ -0,0 +1,15 @@ +Index: samba-4.6.2/ctdb/tests/src/test_mutex_raw.c +=================================================================== +--- samba-4.6.2.orig/ctdb/tests/src/test_mutex_raw.c ++++ samba-4.6.2/ctdb/tests/src/test_mutex_raw.c +@@ -166,8 +166,10 @@ int main(int argc, const char **argv) + if (ret == 0) { + pthread_mutex_unlock(mutex); + } ++#ifdef __GLIBC__ + } else if (ret == EBUSY) { + printf("pid=%u\n", mutex->__data.__owner); ++#endif + } else if (ret == 0) { + pthread_mutex_unlock(mutex); + } diff --git a/meta-networking/recipes-connectivity/samba/samba/netdb_defines.patch b/meta-networking/recipes-connectivity/samba/samba/netdb_defines.patch new file mode 100644 index 000000000..eb06866f4 --- /dev/null +++ b/meta-networking/recipes-connectivity/samba/samba/netdb_defines.patch @@ -0,0 +1,19 @@ +Index: samba-4.6.2/nsswitch/wins.c +=================================================================== +--- samba-4.6.2.orig/nsswitch/wins.c ++++ samba-4.6.2/nsswitch/wins.c +@@ -39,6 +39,14 @@ static pthread_mutex_t wins_nss_mutex = + #define INADDRSZ 4 + #endif + ++#ifndef NETDB_INTERNAL ++#define NETDB_INTERNAL (-1) ++#endif ++ ++#ifndef NETDB_SUCCESS ++#define NETDB_SUCCESS 0 ++#endif ++ + NSS_STATUS _nss_wins_gethostbyname_r(const char *hostname, + struct hostent *he, + char *buffer, diff --git a/meta-networking/recipes-connectivity/samba/samba_4.6.2.bb b/meta-networking/recipes-connectivity/samba/samba_4.6.2.bb index 38876c2c3..7574aefb4 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.6.2.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.6.2.bb @@ -18,6 +18,8 @@ SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ file://21-add-config-option-without-valgrind.patch \ file://0001-packaging-Avoid-timeout-for-nmbd-if-started-offline-.patch \ file://0006-avoid-using-colon-in-the-checking-msg.patch \ + file://netdb_defines.patch \ + file://glibc_only.patch \ file://volatiles.03_samba \ " SRC_URI_append_libc-musl = " \
Signed-off-by: Khem Raj <raj.khem@gmail.com> --- .../recipes-connectivity/samba/samba/glibc_only.patch | 15 +++++++++++++++ .../samba/samba/netdb_defines.patch | 19 +++++++++++++++++++ .../recipes-connectivity/samba/samba_4.6.2.bb | 2 ++ 3 files changed, 36 insertions(+) create mode 100644 meta-networking/recipes-connectivity/samba/samba/glibc_only.patch create mode 100644 meta-networking/recipes-connectivity/samba/samba/netdb_defines.patch -- 2.13.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel