See
<https://jenkins.osmocom.org/jenkins/job/Osmocom_OBS_wireshark/12/display/redirect?page=changes>
Changes:
[Oliver Smith] scripts/docker-rebuild: add debian-bullseye-jenkins-arm
[Oliver Smith] jobs/master-builds: use debian-bullseye-jenkins
[laforge] obs: build_binpkg: add ubuntu 22.04
------------------------------------------
Started by timer
Running as SYSTEM
Building remotely on build2-deb10build-ansible (obs osmo-gsm-tester-build
osmocom-master-debian10 ttcn3-ggsn-test-kernel-git osmocom-gerrit-debian10 osmocom-gerrit
repo-install-test osmocom-master) in workspace
<https://jenkins.osmocom.org/jenkins/job/Osmocom_OBS_wireshark/ws/>
The recommended git tool is: NONE
No credentials specified
Wiping out workspace first.
Cloning the remote Git repository
Cloning repository
https://gerrit.osmocom.org/osmo-ci
git init
<https://jenkins.osmocom.org/jenkins/job/Osmocom_OBS_wireshark/ws/> # timeout=10
Fetching upstream changes from
https://gerrit.osmocom.org/osmo-ci
git --version # timeout=10
git --version # 'git version 2.20.1'
git fetch --tags --force --progress --
https://gerrit.osmocom.org/osmo-ci
+refs/heads/*:refs/remotes/origin/* # timeout=10
git config remote.origin.url
https://gerrit.osmocom.org/osmo-ci # timeout=10
git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10
Avoid second fetch
git rev-parse origin/master^{commit} # timeout=10
Checking out Revision b55b11d6716c73d59ef80fc786dd92aaee510eca (origin/master)
git config core.sparsecheckout # timeout=10
git checkout -f b55b11d6716c73d59ef80fc786dd92aaee510eca # timeout=10
Commit
message: "obs: build_binpkg: add ubuntu 22.04"
git rev-list --no-walk
22f3e07636a5d20668e866d971c35a2b13d787ce # timeout=10
[Osmocom_OBS_wireshark] $
/bin/sh -xe /tmp/jenkins2407134350866611493.sh
+ export PYTHONUNBUFFERED=1
+ ./scripts/obs/update_obs_wireshark.sh osmocom:wireshark
+ prepare_git_repo
+ cd <https://jenkins.osmocom.org/jenkins/job/Osmocom_OBS_wireshark/ws/scripts/obs>
+ [ -d _cache/wireshark ]
+ mkdir -p _cache
+ git -C _cache clone
https://gitlab.com/wireshark/wireshark.git
Cloning into 'wireshark'...
+ git -C _cache/wireshark remote add osmocom
https://gitea.osmocom.org/osmocom/wireshark
+ cd _cache/wireshark
+ git fetch --all
Fetching origin
Fetching osmocom
From
https://gitea.osmocom.org/osmocom/wireshark
* [new branch] daniel/osmux -> osmocom/daniel/osmux
* [new branch] laforge/amr-2023 -> osmocom/laforge/amr-2023
* [new branch] laforge/doc-fixes -> osmocom/laforge/doc-fixes
* [new branch] laforge/pending -> osmocom/laforge/pending
* [new branch] laforge/qcdiag -> osmocom/laforge/qcdiag
* [new branch] laforge/rspro -> osmocom/laforge/rspro
* [new branch] master -> osmocom/master
* [new branch] mobis -> osmocom/mobis
* [new branch] mobis_new -> osmocom/mobis_new
* [new branch] more-patches -> osmocom/more-patches
* [new branch] osmith/deb-packaging -> osmocom/osmith/deb-packaging
* [new branch] osmith/wip -> osmocom/osmith/wip
* [new branch] osmocom/master -> osmocom/osmocom/master
* [new branch] osmocom/qcdiag -> osmocom/osmocom/qcdiag
* [new branch] pespin/amr -> osmocom/pespin/amr
* [new branch] pespin/csn1 -> osmocom/pespin/csn1
* [new branch] pespin/osmux-stats -> osmocom/pespin/osmux-stats
* [new branch] pespin/osmux-wip -> osmocom/pespin/osmux-wip
* [new branch] pespin/racap -> osmocom/pespin/racap
* [new branch] pespin/racap-tmp -> osmocom/pespin/racap-tmp
* [new branch] pespin/rlcmac -> osmocom/pespin/rlcmac
* [new branch] sylvain/gmr -> osmocom/sylvain/gmr
* [new branch] sylvain/gmr1 -> osmocom/sylvain/gmr1
* [new branch] thomas/dect -> osmocom/thomas/dect
+ git clean -fdx
+ git checkout -f -B osmocom/all-in-one origin/master
Switched to a new branch 'osmocom/all-in-one'
Branch 'osmocom/all-in-one' set up to track remote branch 'master' from
'origin'.
+ git merge --no-edit osmocom/osmith/deb-packaging
Merge made by the 'recursive' strategy.
.gitignore | 2 +-
debian/README.Debian | 94 +
debian/README.Debian.security | 13 +
debian/changelog | 4215 ++++++++++++++++++++
debian/compat | 1 +
debian/control | 295 ++
debian/copyright | 273 ++
debian/dirs | 5 +
debian/ethereal-common.NEWS | 13 +
debian/gbp.conf | 5 +
debian/gitlab-ci.yml | 3 +
debian/headers-check.c | 16 +
debian/libwireshark-data.install | 3 +
debian/libwireshark-dev.install | 3 +
debian/libwireshark16.install | 3 +
debian/libwireshark16.lintian-overrides | 8 +
debian/libwireshark16.symbols | 2128 ++++++++++
debian/libwiretap-dev.install | 2 +
debian/libwiretap13.docs | 1 +
debian/libwiretap13.install | 2 +
debian/libwiretap13.symbols | 183 +
debian/libwsutil-dev.install | 3 +
debian/libwsutil14.install | 1 +
debian/libwsutil14.symbols | 458 +++
debian/license-text-about-dialog | 16 +
debian/maxmind_db_paths | 2 +
debian/not-installed | 2 +
...ests-working-with-Python-3.11-except-with.patch | 45 +
...d-JS-and-CSS-resources-instead-of-pulling.patch | 48 +
debian/patches/09_idl2wrs.patch | 55 +
debian/patches/series | 2 +
debian/po/POTFILES.in | 1 +
debian/po/cs.po | 148 +
debian/po/da.po | 161 +
debian/po/de.po | 167 +
debian/po/es.po | 174 +
debian/po/eu.po | 148 +
debian/po/fi.po | 155 +
debian/po/fr.po | 171 +
debian/po/hu.po | 149 +
debian/po/id.po | 147 +
debian/po/it.po | 145 +
debian/po/ja.po | 145 +
debian/po/ko.po | 145 +
debian/po/nl.po | 174 +
debian/po/pt.po | 166 +
debian/po/pt_BR.po | 152 +
debian/po/ru.po | 170 +
debian/po/sk.po | 147 +
debian/po/sv.po | 146 +
debian/po/templates.pot | 138 +
debian/po/tr.po | 146 +
debian/po/vi.po | 145 +
debian/postinst | 6 +
debian/rules | 92 +
debian/source/format | 1 +
debian/source/lintian-overrides | 2 +
debian/templates | 62 +
debian/tests/control | 5 +
debian/tests/frame-count.lua | 17 +
debian/tests/gui | 9 +
debian/tests/tshark | 8 +
debian/tshark.docs | 1 +
debian/tshark.install | 1 +
debian/tshark.lintian-overrides | 2 +
debian/tshark.manpages | 1 +
debian/watch | 2 +
debian/wireshark-common.config | 10 +
debian/wireshark-common.install | 14 +
debian/wireshark-common.lintian-overrides | 2 +
debian/wireshark-common.manpages | 20 +
debian/wireshark-common.postinst | 43 +
debian/wireshark-common.postrm | 18 +
debian/wireshark-dev.docs | 5 +
debian/wireshark-dev.install | 8 +
debian/wireshark-dev.lintian-overrides | 2 +
debian/wireshark-dev.manpages | 3 +
debian/wireshark-dev.prerm | 17 +
debian/wireshark-doc.docs | 2 +
debian/wireshark-qt.docs | 1 +
debian/wireshark-qt.install | 2 +
debian/wireshark-qt.lintian-overrides | 2 +
debian/wireshark-qt.manpages | 1 +
debian/wireshark.docs | 1 +
debian/wireshark.manpages | 0
85 files changed, 11499 insertions(+), 1 deletion(-)
create mode 100644 debian/README.Debian
create mode 100644 debian/README.Debian.security
create mode 100644 debian/changelog
create mode 100644 debian/compat
create mode 100644 debian/control
create mode 100644 debian/copyright
create mode 100644 debian/dirs
create mode 100644 debian/ethereal-common.NEWS
create mode 100644 debian/gbp.conf
create mode 100644 debian/gitlab-ci.yml
create mode 100644 debian/headers-check.c
create mode 100644 debian/libwireshark-data.install
create mode 100644 debian/libwireshark-dev.install
create mode 100644 debian/libwireshark16.install
create mode 100644 debian/libwireshark16.lintian-overrides
create mode 100644 debian/libwireshark16.symbols
create mode 100644 debian/libwiretap-dev.install
create mode 100644 debian/libwiretap13.docs
create mode 100644 debian/libwiretap13.install
create mode 100644 debian/libwiretap13.symbols
create mode 100644 debian/libwsutil-dev.install
create mode 100644 debian/libwsutil14.install
create mode 100644 debian/libwsutil14.symbols
create mode 100644 debian/license-text-about-dialog
create mode 100644 debian/maxmind_db_paths
create mode 100644 debian/not-installed
create mode 100644
debian/patches/0001-tests-Get-tests-working-with-Python-3.11-except-with.patch
create mode 100644
debian/patches/0004-Use-packaged-JS-and-CSS-resources-instead-of-pulling.patch
create mode 100644 debian/patches/09_idl2wrs.patch
create mode 100644 debian/patches/series
create mode 100644 debian/po/POTFILES.in
create mode 100644 debian/po/cs.po
create mode 100644 debian/po/da.po
create mode 100644 debian/po/de.po
create mode 100644 debian/po/es.po
create mode 100644 debian/po/eu.po
create mode 100644 debian/po/fi.po
create mode 100644 debian/po/fr.po
create mode 100644 debian/po/hu.po
create mode 100644 debian/po/id.po
create mode 100644 debian/po/it.po
create mode 100644 debian/po/ja.po
create mode 100644 debian/po/ko.po
create mode 100644 debian/po/nl.po
create mode 100644 debian/po/pt.po
create mode 100644 debian/po/pt_BR.po
create mode 100644 debian/po/ru.po
create mode 100644 debian/po/sk.po
create mode 100644 debian/po/sv.po
create mode 100644 debian/po/templates.pot
create mode 100644 debian/po/tr.po
create mode 100644 debian/po/vi.po
create mode 100644 debian/postinst
create mode 100755 debian/rules
create mode 100644 debian/source/format
create mode 100644 debian/source/lintian-overrides
create mode 100644 debian/templates
create mode 100644 debian/tests/control
create mode 100644 debian/tests/frame-count.lua
create mode 100755 debian/tests/gui
create mode 100755 debian/tests/tshark
create mode 100644 debian/tshark.docs
create mode 100644 debian/tshark.install
create mode 100644 debian/tshark.lintian-overrides
create mode 100644 debian/tshark.manpages
create mode 100644 debian/watch
create mode 100644 debian/wireshark-common.config
create mode 100644 debian/wireshark-common.install
create mode 100644 debian/wireshark-common.lintian-overrides
create mode 100644 debian/wireshark-common.manpages
create mode 100644 debian/wireshark-common.postinst
create mode 100644 debian/wireshark-common.postrm
create mode 100644 debian/wireshark-dev.docs
create mode 100644 debian/wireshark-dev.install
create mode 100644 debian/wireshark-dev.lintian-overrides
create mode 100644 debian/wireshark-dev.manpages
create mode 100644 debian/wireshark-dev.prerm
create mode 100644 debian/wireshark-doc.docs
create mode 100644 debian/wireshark-qt.docs
create mode 100644 debian/wireshark-qt.install
create mode 100644 debian/wireshark-qt.lintian-overrides
create mode 100644 debian/wireshark-qt.manpages
create mode 100644 debian/wireshark.docs
create mode 100644 debian/wireshark.manpages
+ git merge --no-edit osmocom/laforge/amr-2023
Auto-merging plugins/codecs/amrnb/amrdecode.c
CONFLICT (add/add): Merge conflict in plugins/codecs/amrnb/amrdecode.c
Auto-merging cmake/modules/FindAMRNB.cmake
CONFLICT (add/add): Merge conflict in cmake/modules/FindAMRNB.cmake
Auto-merging CMakeLists.txt
Automatic merge failed; fix conflicts and then commit the result.
Build step 'Execute shell' marked build as failure