Message ID | 20210525122750.5022-7-patrickdepinguin@gmail.com |
---|---|
State | Changes Requested |
Headers | show |
Series | Introduce BR2_ENABLE_RUNTIME_DEBUG | expand |
On 25/05/2021 14:27, Thomas De Schampheleire wrote: > From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com> > > sysrepo explicitly sets CMAKE_BUILD_TYPE=Release, ignoring any possible > value of BR2_ENABLE_DEBUG (previously) or BR2_ENABLE_RUNTIME_DEBUG (now). > > With the introduction of BR2_ENABLE_RUNTIME_DEBUG, this change should no > longer be necessary. Users that do not wish to have additional runtime > debugging just keep BR2_ENABLE_RUNTIME_DEBUG disabled (default value). > > As the 'Debug' build type enables tests, disable them explicitly. > As the 'Debug' build type uses a custom REPO_PATH which does not exist on > target, force /etc/sysrepo like in the 'Release' build type. > > Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Although I think this could have been squashed with the previous patch. Regards, Arnout > --- > package/sysrepo/sysrepo.mk | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/package/sysrepo/sysrepo.mk b/package/sysrepo/sysrepo.mk > index f5be29d2c9..c0db05e52c 100644 > --- a/package/sysrepo/sysrepo.mk > +++ b/package/sysrepo/sysrepo.mk > @@ -13,8 +13,10 @@ SYSREPO_DEPENDENCIES = libyang pcre host-sysrepo > HOST_SYSREPO_DEPENDENCIES = host-libyang host-pcre > > SYSREPO_CONF_OPTS = \ > - -DCMAKE_BUILD_TYPE=Release \ > - -DBUILD_EXAMPLES=$(if $(BR2_PACKAGE_SYSREPO_EXAMPLES),ON,OFF) > + -DBUILD_EXAMPLES=$(if $(BR2_PACKAGE_SYSREPO_EXAMPLES),ON,OFF) \ > + -DENABLE_TESTS=OFF \ > + -DENABLE_VALGRIND_TESTS=OFF \ > + -DREPO_PATH=/etc/sysrepo > > ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) > SYSREPO_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic >
Hi Thomas, Am Di., 25. Mai 2021 um 22:56 Uhr schrieb Arnout Vandecappelle <arnout@mind.be>: > > > > On 25/05/2021 14:27, Thomas De Schampheleire wrote: > > From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com> > > > > sysrepo explicitly sets CMAKE_BUILD_TYPE=Release, ignoring any possible > > value of BR2_ENABLE_DEBUG (previously) or BR2_ENABLE_RUNTIME_DEBUG (now). > > > > With the introduction of BR2_ENABLE_RUNTIME_DEBUG, this change should no > > longer be necessary. Users that do not wish to have additional runtime > > debugging just keep BR2_ENABLE_RUNTIME_DEBUG disabled (default value). > > > > As the 'Debug' build type enables tests, disable them explicitly. > > As the 'Debug' build type uses a custom REPO_PATH which does not exist on > > target, force /etc/sysrepo like in the 'Release' build type. > > > > Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com> > > Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Acked-by: Heiko Thiery <heiko.thiery@gmail.com> > > Although I think this could have been squashed with the previous patch. > > Regards, > Arnout > > > --- > > package/sysrepo/sysrepo.mk | 6 ++++-- > > 1 file changed, 4 insertions(+), 2 deletions(-) > > > > diff --git a/package/sysrepo/sysrepo.mk b/package/sysrepo/sysrepo.mk > > index f5be29d2c9..c0db05e52c 100644 > > --- a/package/sysrepo/sysrepo.mk > > +++ b/package/sysrepo/sysrepo.mk > > @@ -13,8 +13,10 @@ SYSREPO_DEPENDENCIES = libyang pcre host-sysrepo > > HOST_SYSREPO_DEPENDENCIES = host-libyang host-pcre > > > > SYSREPO_CONF_OPTS = \ > > - -DCMAKE_BUILD_TYPE=Release \ > > - -DBUILD_EXAMPLES=$(if $(BR2_PACKAGE_SYSREPO_EXAMPLES),ON,OFF) > > + -DBUILD_EXAMPLES=$(if $(BR2_PACKAGE_SYSREPO_EXAMPLES),ON,OFF) \ > > + -DENABLE_TESTS=OFF \ > > + -DENABLE_VALGRIND_TESTS=OFF \ > > + -DREPO_PATH=/etc/sysrepo > > > > ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) > > SYSREPO_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic > >
El mar, 25 may 2021 a las 22:56, Arnout Vandecappelle (<arnout@mind.be>) escribió: > > > > On 25/05/2021 14:27, Thomas De Schampheleire wrote: > > From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com> > > > > sysrepo explicitly sets CMAKE_BUILD_TYPE=Release, ignoring any possible > > value of BR2_ENABLE_DEBUG (previously) or BR2_ENABLE_RUNTIME_DEBUG (now). > > > > With the introduction of BR2_ENABLE_RUNTIME_DEBUG, this change should no > > longer be necessary. Users that do not wish to have additional runtime > > debugging just keep BR2_ENABLE_RUNTIME_DEBUG disabled (default value). > > > > As the 'Debug' build type enables tests, disable them explicitly. > > As the 'Debug' build type uses a custom REPO_PATH which does not exist on > > target, force /etc/sysrepo like in the 'Release' build type. > > > > Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com> > > Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> > > Although I think this could have been squashed with the previous patch. I thought a separate patch was intended based on your comment: http://patchwork.ozlabs.org/comment/2633317/ In v4 I'm sending the patch still separated but feel free to squash it. Thanks, Thomas
On 01/06/2021 16:24, Thomas De Schampheleire wrote: > El mar, 25 may 2021 a las 22:56, Arnout Vandecappelle > (<arnout@mind.be>) escribió: >> >> >> >> On 25/05/2021 14:27, Thomas De Schampheleire wrote: >>> From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com> >>> >>> sysrepo explicitly sets CMAKE_BUILD_TYPE=Release, ignoring any possible >>> value of BR2_ENABLE_DEBUG (previously) or BR2_ENABLE_RUNTIME_DEBUG (now). >>> >>> With the introduction of BR2_ENABLE_RUNTIME_DEBUG, this change should no >>> longer be necessary. Users that do not wish to have additional runtime >>> debugging just keep BR2_ENABLE_RUNTIME_DEBUG disabled (default value). >>> >>> As the 'Debug' build type enables tests, disable them explicitly. >>> As the 'Debug' build type uses a custom REPO_PATH which does not exist on >>> target, force /etc/sysrepo like in the 'Release' build type. >>> >>> Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com> >> >> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> >> >> Although I think this could have been squashed with the previous patch. > > I thought a separate patch was intended based on your comment: > http://patchwork.ozlabs.org/comment/2633317/ Good point! I should have already applied patch 5. Regards, Arnout > > In v4 I'm sending the patch still separated but feel free to squash it. > > Thanks, > Thomas >
diff --git a/package/sysrepo/sysrepo.mk b/package/sysrepo/sysrepo.mk index f5be29d2c9..c0db05e52c 100644 --- a/package/sysrepo/sysrepo.mk +++ b/package/sysrepo/sysrepo.mk @@ -13,8 +13,10 @@ SYSREPO_DEPENDENCIES = libyang pcre host-sysrepo HOST_SYSREPO_DEPENDENCIES = host-libyang host-pcre SYSREPO_CONF_OPTS = \ - -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_EXAMPLES=$(if $(BR2_PACKAGE_SYSREPO_EXAMPLES),ON,OFF) + -DBUILD_EXAMPLES=$(if $(BR2_PACKAGE_SYSREPO_EXAMPLES),ON,OFF) \ + -DENABLE_TESTS=OFF \ + -DENABLE_VALGRIND_TESTS=OFF \ + -DREPO_PATH=/etc/sysrepo ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) SYSREPO_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic