diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2016-08-17 14:31:25 -0500 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2016-08-22 16:43:26 +0000 |
| commit | 60f9d69e016b11c468c98ea75ba0a60c44afbbc4 (patch) | |
| tree | ecb49581a9e41a37943c22cd9ef3f63451b20ee7 /yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-mongodb-sasl.patch | |
| parent | e18c61205e0234b03697129c20cc69c9b3940efc (diff) | |
| download | blackbird-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.tar.gz blackbird-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.zip | |
yocto-poky: Move to import-layers subdir
We are going to import additional layers, so create a subdir to
hold all of the layers that we import with git-subtree.
Change-Id: I6f732153a22be8ca663035c518837e3cc5ec0799
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-mongodb-sasl.patch')
| -rw-r--r-- | yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-mongodb-sasl.patch | 69 |
1 files changed, 0 insertions, 69 deletions
diff --git a/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-mongodb-sasl.patch b/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-mongodb-sasl.patch deleted file mode 100644 index 6c3e4718b..000000000 --- a/yocto-poky/meta/recipes-devtools/rpm/rpm/rpm-mongodb-sasl.patch +++ /dev/null @@ -1,69 +0,0 @@ -Fix errors when building with sasl2 disabled - -Upstream-Status: Submitted [RPM5 maintainer] - -Signed-off-by: Mark Hatle <mark.hatle@windriver.com> - -Index: rpm/rpmio/mongoc.c -=================================================================== ---- rpm.orig/rpmio/mongoc.c -+++ rpm/rpmio/mongoc.c -@@ -39,8 +39,10 @@ - # include <winerror.h> - #endif - -+#ifdef HAVE_LIBSASL2 - #include <sasl/sasl.h> - #include <sasl/saslutil.h> -+#endif - - #include <openssl/bio.h> - #include <openssl/ssl.h> -@@ -14228,6 +14230,7 @@ mongoc_read_prefs_copy (const mongoc_rea - return ret; - } - -+#ifdef MONGOC_ENABLE_SASL - /*==============================================================*/ - /* --- mongoc-sasl.c */ - -@@ -14555,6 +14558,7 @@ _mongoc_sasl_step (mongoc_sasl_t *sasl, - - return true; - } -+#endif - - /*==============================================================*/ - /* --- mongoc-socket.c */ -Index: rpm/rpmio/mongoc.h -=================================================================== ---- rpm.orig/rpmio/mongoc.h -+++ rpm/rpmio/mongoc.h -@@ -38,8 +38,10 @@ - # include <sys/un.h> - #endif - -+#ifdef HAVE_LIBSASL2 - #include <sasl/sasl.h> - #include <sasl/saslutil.h> -+#endif - - #include <openssl/bio.h> - #include <openssl/ssl.h> -@@ -2455,6 +2457,8 @@ BSON_END_DECLS - /*==============================================================*/ - /* --- mongoc-sasl-private.h */ - -+#ifdef MONGOC_ENABLE_SASL -+ - BSON_BEGIN_DECLS - - -@@ -2498,6 +2502,7 @@ bool _mongoc_sasl_step (mong - - - BSON_END_DECLS -+#endif - - /*==============================================================*/ - /* --- mongoc-ssl-private.h */ |
