osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/28537 )
Change subject: configure.ac: add -lboost_thread for uhd < 4.2.0
......................................................................
configure.ac: add -lboost_thread for uhd < 4.2.0
Fix for the following error we see since building master-osmo-trx on
debian 10 instead of 9:
/usr/bin/ld: ipc_driver_test-uhdwrap.o: undefined reference to symbol '_ZTIN5boost6detail16thread_data_baseE'
/usr/bin/ld: //usr/lib/x86_64-linux-gnu/libboost_thread.so.1.67.0: error adding symbols: DSO missing from command line
After spending a lot of time on researching this, my understanding is
now that uhd.pc should have had "-lboost_thread" in versions up to the
latest release 4.2.0 because before that it would include boost thread
headers in its logging code:
https://github.com/EttusResearch/uhd/commit/04a83b6e76beef970854da69ba882d7…
ld is able to figure out which library provides the missing symbol, and
apparently depending on the binutils version and linker flags, it may
just ignore this and not show an error. This is why apparently it worked
with debian 9 and still does work in OBS (different flags), and why it
was not fixed upstream in uhd.pc. By now fixing it is not needed in the
latest version anymore, and there are already versions of uhd.pc in
various linux distributions without -lboost_thread, so I think it's
appropriate to add the workaround here in configure.ac.
Fixes: OS#5608
Related: https://stackoverflow.com/q/19901934
Change-Id: I0367f1c2981bf56252e7514d5993cbbec960b21b
---
M configure.ac
1 file changed, 8 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/37/28537/1
diff --git a/configure.ac b/configure.ac
index 422ad65..37444a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -185,6 +185,14 @@
[PKG_CHECK_MODULES(UHD, uhd >= 003.005)]
)]
)
+ # OS#5608: libuhd < 4.2.0 includes boost/thread/thread.hpp in its logging
+ # code and therefore requires linking against boost_thread. It's missing in
+ # uhd.pc, so work around it here.
+ # https://github.com/EttusResearch/uhd/commit/04a83b6e76beef970854da69ba882d7…
+ PKG_CHECK_MODULES(UHD, uhd < 004.002,
+ [LIBS="$LIBS -lboost_thread"],
+ []
+ )
])
AS_IF([test "x$with_singledb" = "xyes"], [
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/28537
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I0367f1c2981bf56252e7514d5993cbbec960b21b
Gerrit-Change-Number: 28537
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: osmith.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/28536 )
Change subject: scripts/OBS latest: fix checkout with dir in path
......................................................................
Patch Set 1:
(2 comments)
Commit Message:
https://gerrit.osmocom.org/c/osmo-ci/+/28536/comment/dc668a6a_2ff8bc23
PS1, Line 18: "osmo-python-test" directory like in nightly. Make it behave the same by
you are either missing an s in "tests" here, or need to remove it above.
File scripts/osmocom-latest-packages.sh:
https://gerrit.osmocom.org/c/osmo-ci/+/28536/comment/158f622e_cc96e749
PS1, Line 55: project="$(basename $path)"
are you sure this applies to all projects?
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28536
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I97074ee953cadac476fe2e4b686689c26bac1ea1
Gerrit-Change-Number: 28536
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 08 Jul 2022 11:31:12 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/28536 )
Change subject: scripts/OBS latest: fix checkout with dir in path
......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
works as expected, did a test run with this patch here: https://jenkins.osmocom.org/jenkins/job/Osmocom_OBS_latest_build.opensuse.o…
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28536
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I97074ee953cadac476fe2e4b686689c26bac1ea1
Gerrit-Change-Number: 28536
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Comment-Date: Fri, 08 Jul 2022 08:48:12 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/28536 )
Change subject: scripts/OBS latest: fix checkout with dir in path
......................................................................
scripts/OBS latest: fix checkout with dir in path
osmo-python-tests was added to latest just like it was in nightly, by
adding the following two lines to build_osmocom():
checkout python/osmo-python-tests
...
build osmo-python-tests
But the build fails, because the "checkout" function clones into a
"python/osmo-python-tests" directory in latest, and not into a
"osmo-python-test" directory like in nightly. Make it behave the same by
adjusting the "checkout" function in nightly.
(This code has historically grown and should be refactored imho, but
let's fix this bug first.)
Fix for:
====> Building osmo-python-tests
+ cd /home/osmocom-build/jenkins/workspace/Osmocom_OBS_latest_obs.osmocom.org/osmo-python-tests
./scripts/osmocom-latest-packages.sh: 99: cd: can't cd to .../osmo-python-tests
Change-Id: I97074ee953cadac476fe2e4b686689c26bac1ea1
---
M scripts/osmocom-latest-packages.sh
1 file changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/36/28536/1
diff --git a/scripts/osmocom-latest-packages.sh b/scripts/osmocom-latest-packages.sh
index 3efc101..9055f5c 100755
--- a/scripts/osmocom-latest-packages.sh
+++ b/scripts/osmocom-latest-packages.sh
@@ -51,7 +51,8 @@
}
checkout() {
- project=$1
+ path=$1
+ project="$(basename $path)"
url=$2
gitbpargs=""
@@ -60,7 +61,7 @@
fi
if [ -z "$url" ]; then
- url="$(osmo_git_clone_url "$project")"
+ url="$(osmo_git_clone_url "$path")"
fi
echo
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28536
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I97074ee953cadac476fe2e4b686689c26bac1ea1
Gerrit-Change-Number: 28536
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange
keith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28341 )
Change subject: Turn off secure_delete in sqlite
......................................................................
Turn off secure_delete in sqlite
libsqlite3 that ships with some distributions may have secure_delete
activated by default. This means all database records are overwritten
with zeros on DELETE. We don't needs this extra overhead.
Change-Id: I9da6499a38096c8df2025bb9d35ec789864b7c5e
---
M src/libmsc/db.c
1 file changed, 7 insertions(+), 0 deletions(-)
Approvals:
keith: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/libmsc/db.c b/src/libmsc/db.c
index 0237716..d12f04c 100644
--- a/src/libmsc/db.c
+++ b/src/libmsc/db.c
@@ -569,6 +569,13 @@
/* non-fatal */
}
+ rc = sqlite3_exec(g_dbc->db, "PRAGMA secure_delete=0;", 0, 0, &err_msg);
+ if (rc != SQLITE_OK) {
+ LOGP(DDB, LOGL_ERROR, "Unable to disable SECURE_DELETE: %s\n", err_msg);
+ sqlite3_free(err_msg);
+ /* non-fatal */
+ }
+
return 0;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28341
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I9da6499a38096c8df2025bb9d35ec789864b7c5e
Gerrit-Change-Number: 28341
Gerrit-PatchSet: 5
Gerrit-Owner: keith <keith(a)rhizomatica.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: keith <keith(a)rhizomatica.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28341 )
Change subject: Turn off secure_delete in sqlite
......................................................................
Patch Set 5: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28341
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I9da6499a38096c8df2025bb9d35ec789864b7c5e
Gerrit-Change-Number: 28341
Gerrit-PatchSet: 5
Gerrit-Owner: keith <keith(a)rhizomatica.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: keith <keith(a)rhizomatica.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 08 Jul 2022 00:09:44 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: keith.
Hello Jenkins Builder, fixeria, pespin, dexter,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-msc/+/28341
to look at the new patch set (#5).
Change subject: Turn off secure_delete in sqlite
......................................................................
Turn off secure_delete in sqlite
libsqlite3 that ships with some distributions may have secure_delete
activated by default. This means all database records are overwritten
with zeros on DELETE. We don't needs this extra overhead.
Change-Id: I9da6499a38096c8df2025bb9d35ec789864b7c5e
---
M src/libmsc/db.c
1 file changed, 7 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/41/28341/5
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28341
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I9da6499a38096c8df2025bb9d35ec789864b7c5e
Gerrit-Change-Number: 28341
Gerrit-PatchSet: 5
Gerrit-Owner: keith <keith(a)rhizomatica.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: keith <keith(a)rhizomatica.org>
Gerrit-MessageType: newpatchset
Attention is currently required from: keith.
Hello Jenkins Builder, fixeria, pespin, dexter,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-msc/+/28341
to look at the new patch set (#4).
Change subject: Turn off secure_delete in sqlite
......................................................................
Turn off secure_delete in sqlite
libsqlite3 that ships with some distributions may have secure_delete
activated by default. This means all database records are overwritten with
zeros on DELETE. We don't needs this extra overhead.
Change-Id: I9da6499a38096c8df2025bb9d35ec789864b7c5e
---
M src/libmsc/db.c
1 file changed, 7 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/41/28341/4
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28341
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I9da6499a38096c8df2025bb9d35ec789864b7c5e
Gerrit-Change-Number: 28341
Gerrit-PatchSet: 4
Gerrit-Owner: keith <keith(a)rhizomatica.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: keith <keith(a)rhizomatica.org>
Gerrit-MessageType: newpatchset