Re: [oe] [meta-oe][v2][PATCH 2/2] mongodb: refresh patches and remove un-needed patch
On 04/08/2018 06:57 PM, Armin Kuster wrote: [V2] remove patch, changes upstream Signed-off-by: Armin Kuster --- ...to-use-build-settings-from-environment-va.patch | 37 +-- .../0001-Use-long-long-instead-of-int64_t.patch| 21 +-- .../mongodb/0001-mongo-Add-using-std-string.patch | 43 ++ ...-Add-missing-dependenncy-on-local_shardin.patch | 11 ++ meta-oe/recipes-dbs/mongodb/mongodb_git.bb | 1 - 5 files changed, 50 insertions(+), 63 deletions(-) Which patch is being removed? Alex -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][v2][PATCH 2/2] mongodb: refresh patches and remove un-needed patch
On 04/08/2018 03:42 PM, Anuj Mittal wrote:
> On 04/08/2018 11:57 PM, Armin Kuster wrote:
>> [V2]
>> remove patch, changes upstream
>>
>> Signed-off-by: Armin Kuster
>> ---
>> ...to-use-build-settings-from-environment-va.patch | 37 +--
>> .../0001-Use-long-long-instead-of-int64_t.patch| 21 +--
>> .../mongodb/0001-mongo-Add-using-std-string.patch | 43
>> ++
> You forgot to remove the actual patch?
thanks.
- armin
>
> Thanks,
> Anuj
>
>> ...-Add-missing-dependenncy-on-local_shardin.patch | 11 ++
>> meta-oe/recipes-dbs/mongodb/mongodb_git.bb | 1 -
>> 5 files changed, 50 insertions(+), 63 deletions(-)
>>
>> diff --git
>> a/meta-oe/recipes-dbs/mongodb/mongodb/0001-Tell-scons-to-use-build-settings-from-environment-va.patch
>>
>> b/meta-oe/recipes-dbs/mongodb/mongodb/0001-Tell-scons-to-use-build-settings-from-environment-va.patch
>> index 09d49d2..aa01e95 100644
>> ---
>> a/meta-oe/recipes-dbs/mongodb/mongodb/0001-Tell-scons-to-use-build-settings-from-environment-va.patch
>> +++
>> b/meta-oe/recipes-dbs/mongodb/mongodb/0001-Tell-scons-to-use-build-settings-from-environment-va.patch
>> @@ -9,11 +9,11 @@ Signed-off-by: Sven Ebenfeld
>> src/mongo/util/SConscript | 2 ++
>> 2 files changed, 8 insertions(+), 2 deletions(-)
>>
>> -diff --git a/SConstruct b/SConstruct
>> -index 5082a4b..3370f70 100644
>> a/SConstruct
>> -+++ b/SConstruct
>> -@@ -507,6 +507,7 @@ def variable_arch_converter(val):
>> +Index: git/SConstruct
>> +===
>> +--- git.orig/SConstruct
>> git/SConstruct
>> +@@ -548,6 +548,7 @@ def variable_arch_converter(val):
>> 'amd64': 'x86_64',
>> 'emt64': 'x86_64',
>> 'x86':'i386',
>> @@ -21,8 +21,8 @@ index 5082a4b..3370f70 100644
>> }
>> val = val.lower()
>>
>> -@@ -568,7 +569,8 @@ env_vars.Add('ARFLAGS',
>> - converter=variable_shlex_converter)
>> +@@ -627,7 +628,8 @@ env_vars.Add(
>> + )
>>
>> env_vars.Add('CC',
>> -help='Select the C compiler to use')
>> @@ -31,7 +31,7 @@ index 5082a4b..3370f70 100644
>>
>> env_vars.Add('CCFLAGS',
>> help='Sets flags for the C and C++ compiler',
>> -@@ -588,7 +590,8 @@ env_vars.Add('CPPPATH',
>> +@@ -647,7 +649,8 @@ env_vars.Add('CPPPATH',
>> converter=variable_shlex_converter)
>>
>> env_vars.Add('CXX',
>> @@ -41,7 +41,7 @@ index 5082a4b..3370f70 100644
>>
>> env_vars.Add('CXXFLAGS',
>> help='Sets flags for the C++ compiler',
>> -@@ -818,6 +821,7 @@ envDict = dict(BUILD_ROOT=buildDir,
>> +@@ -895,6 +898,7 @@ envDict = dict(BUILD_ROOT=buildDir,
>> )
>>
>> env = Environment(variables=env_vars, **envDict)
>> @@ -49,19 +49,16 @@ index 5082a4b..3370f70 100644
>> del envDict
>>
>> env.AddMethod(env_os_is_wrapper, 'TargetOSIs')
>> -diff --git a/src/mongo/util/SConscript b/src/mongo/util/SConscript
>> -index 6add602..8d05a62 100644
>> a/src/mongo/util/SConscript
>> -+++ b/src/mongo/util/SConscript
>> -@@ -251,6 +251,8 @@ if get_option('allocator') == 'tcmalloc':
>> - 'MONGO_HAVE_GPERFTOOLS_GET_THREAD_CACHE_SIZE'
>> +Index: git/src/mongo/util/SConscript
>> +===
>> +--- git.orig/src/mongo/util/SConscript
>> git/src/mongo/util/SConscript
>> +@@ -274,6 +274,8 @@ if env['MONGO_ALLOCATOR'] == 'tcmalloc':
>> + 'MONGO_HAVE_GPERFTOOLS_SIZE_CLASS_STATS'
>> ]
>> )
>> +if not use_system_version_of_library('valgrind'):
>> +tcmspEnv.InjectThirdPartyIncludePaths('valgrind')
>>
>> - tcmspEnv.Library(
>> - target='tcmalloc_set_parameter',
>> ---
>> -1.9.1
>> -
>> + if not use_system_version_of_library('valgrind'):
>> + # Include valgrind since tcmalloc disables itself while running
>> under valgrind
>> diff --git
>> a/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-long-long-instead-of-int64_t.patch
>>
>> b/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-long-long-instead-of-int64_t.patch
>> index c43beb4..389b302 100644
>> ---
>> a/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-long-long-instead-of-int64_t.patch
>> +++
>> b/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-long-long-instead-of-int64_t.patch
>> @@ -13,11 +13,11 @@ Upstream-Status: Pending
>> src/mongo/util/procparser.cpp | 10 +-
>> 1 file changed, 5 insertions(+), 5 deletions(-)
>>
>> -diff --git a/src/mongo/util/procparser.cpp b/src/mongo/util/procparser.cpp
>> -index 36f2ae0254..2c164bcbf3 100644
>> a/src/mongo/util/procparser.cpp
>> -+++ b/src/mongo/util/procparser.cpp
>> -@@ -260,7 +260,7 @@ Status parseProcStat(const std::vector&
>> keys,
>> +Index: git/src/mongo/util/procparser.cpp
>> +===
>> +--- git.orig/src/mongo/util/procparser.cpp
>> git/src/mongo/util/procparser.cpp
>> +@@ -260,7 +260,7 @@ St
Re: [oe] [meta-oe][v2][PATCH 2/2] mongodb: refresh patches and remove un-needed patch
On 04/08/2018 11:57 PM, Armin Kuster wrote:
> [V2]
> remove patch, changes upstream
>
> Signed-off-by: Armin Kuster
> ---
> ...to-use-build-settings-from-environment-va.patch | 37 +--
> .../0001-Use-long-long-instead-of-int64_t.patch| 21 +--
> .../mongodb/0001-mongo-Add-using-std-string.patch | 43
> ++
You forgot to remove the actual patch?
Thanks,
Anuj
> ...-Add-missing-dependenncy-on-local_shardin.patch | 11 ++
> meta-oe/recipes-dbs/mongodb/mongodb_git.bb | 1 -
> 5 files changed, 50 insertions(+), 63 deletions(-)
>
> diff --git
> a/meta-oe/recipes-dbs/mongodb/mongodb/0001-Tell-scons-to-use-build-settings-from-environment-va.patch
>
> b/meta-oe/recipes-dbs/mongodb/mongodb/0001-Tell-scons-to-use-build-settings-from-environment-va.patch
> index 09d49d2..aa01e95 100644
> ---
> a/meta-oe/recipes-dbs/mongodb/mongodb/0001-Tell-scons-to-use-build-settings-from-environment-va.patch
> +++
> b/meta-oe/recipes-dbs/mongodb/mongodb/0001-Tell-scons-to-use-build-settings-from-environment-va.patch
> @@ -9,11 +9,11 @@ Signed-off-by: Sven Ebenfeld
> src/mongo/util/SConscript | 2 ++
> 2 files changed, 8 insertions(+), 2 deletions(-)
>
> -diff --git a/SConstruct b/SConstruct
> -index 5082a4b..3370f70 100644
> a/SConstruct
> -+++ b/SConstruct
> -@@ -507,6 +507,7 @@ def variable_arch_converter(val):
> +Index: git/SConstruct
> +===
> +--- git.orig/SConstruct
> git/SConstruct
> +@@ -548,6 +548,7 @@ def variable_arch_converter(val):
> 'amd64': 'x86_64',
> 'emt64': 'x86_64',
> 'x86':'i386',
> @@ -21,8 +21,8 @@ index 5082a4b..3370f70 100644
> }
> val = val.lower()
>
> -@@ -568,7 +569,8 @@ env_vars.Add('ARFLAGS',
> - converter=variable_shlex_converter)
> +@@ -627,7 +628,8 @@ env_vars.Add(
> + )
>
> env_vars.Add('CC',
> -help='Select the C compiler to use')
> @@ -31,7 +31,7 @@ index 5082a4b..3370f70 100644
>
> env_vars.Add('CCFLAGS',
> help='Sets flags for the C and C++ compiler',
> -@@ -588,7 +590,8 @@ env_vars.Add('CPPPATH',
> +@@ -647,7 +649,8 @@ env_vars.Add('CPPPATH',
> converter=variable_shlex_converter)
>
> env_vars.Add('CXX',
> @@ -41,7 +41,7 @@ index 5082a4b..3370f70 100644
>
> env_vars.Add('CXXFLAGS',
> help='Sets flags for the C++ compiler',
> -@@ -818,6 +821,7 @@ envDict = dict(BUILD_ROOT=buildDir,
> +@@ -895,6 +898,7 @@ envDict = dict(BUILD_ROOT=buildDir,
> )
>
> env = Environment(variables=env_vars, **envDict)
> @@ -49,19 +49,16 @@ index 5082a4b..3370f70 100644
> del envDict
>
> env.AddMethod(env_os_is_wrapper, 'TargetOSIs')
> -diff --git a/src/mongo/util/SConscript b/src/mongo/util/SConscript
> -index 6add602..8d05a62 100644
> a/src/mongo/util/SConscript
> -+++ b/src/mongo/util/SConscript
> -@@ -251,6 +251,8 @@ if get_option('allocator') == 'tcmalloc':
> - 'MONGO_HAVE_GPERFTOOLS_GET_THREAD_CACHE_SIZE'
> +Index: git/src/mongo/util/SConscript
> +===
> +--- git.orig/src/mongo/util/SConscript
> git/src/mongo/util/SConscript
> +@@ -274,6 +274,8 @@ if env['MONGO_ALLOCATOR'] == 'tcmalloc':
> + 'MONGO_HAVE_GPERFTOOLS_SIZE_CLASS_STATS'
> ]
> )
> +if not use_system_version_of_library('valgrind'):
> +tcmspEnv.InjectThirdPartyIncludePaths('valgrind')
>
> - tcmspEnv.Library(
> - target='tcmalloc_set_parameter',
> ---
> -1.9.1
> -
> + if not use_system_version_of_library('valgrind'):
> + # Include valgrind since tcmalloc disables itself while running
> under valgrind
> diff --git
> a/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-long-long-instead-of-int64_t.patch
>
> b/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-long-long-instead-of-int64_t.patch
> index c43beb4..389b302 100644
> ---
> a/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-long-long-instead-of-int64_t.patch
> +++
> b/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-long-long-instead-of-int64_t.patch
> @@ -13,11 +13,11 @@ Upstream-Status: Pending
> src/mongo/util/procparser.cpp | 10 +-
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> -diff --git a/src/mongo/util/procparser.cpp b/src/mongo/util/procparser.cpp
> -index 36f2ae0254..2c164bcbf3 100644
> a/src/mongo/util/procparser.cpp
> -+++ b/src/mongo/util/procparser.cpp
> -@@ -260,7 +260,7 @@ Status parseProcStat(const std::vector& keys,
> +Index: git/src/mongo/util/procparser.cpp
> +===
> +--- git.orig/src/mongo/util/procparser.cpp
> git/src/mongo/util/procparser.cpp
> +@@ -260,7 +260,7 @@ Status parseProcStat(const std::vector
> StringData stringValue((*partIt).begin(),
> (*partIt).end() - (*partIt).begin());
>
> @@ -26,7 +26,7 @@ index 36f2ae0254..2c
