osmocom-nightly/latest: Build open5gs

This is unfortunately harder than expected.  The problem is the use
of meson external dependencies using 'wrap', specifically for
freeDiameter.

As a debian source package needs to include the entire source, the
dpkg helpers are calling 'meson --wrap-mode=nodownload' at build time.

This in turn requires us to download the freeDiameter after the git
clone of open5gs.  Unfortunately this creates a git checkout in a
sub directory of the open5gs repo, which is not part of the git history.

git-buildpackage hence generates a source tarball *without*
freeDiameter.  I tried very hard in several methods like
* git commit subprojects/freeDiameter
* adding subprojects/freeDiameter as git submodule
unfortuantely none of them helped.

In the end, I resorted to using 'dpkg-buildpackage' instead of
'git-buildpackage' (gbp), which then has other disadvantages,
such as not being able to determine the output directory to which
the .tar.* and .dsc files are written to.

In the end, the solution implemented here is the only one I could
make work.

Change-Id: I6752288868e5ee1378c0776b1be9f06750017c41
This commit is contained in:
Harald Welte 2020-02-23 16:01:56 +01:00
parent 21d464f836
commit 30ca06a8d4
2 changed files with 31 additions and 4 deletions

View File

@ -37,7 +37,7 @@ prepare() {
get_last_tag() {
project="$1"
if [ "$project" = "limesuite" ]; then
if [ "$project" = "limesuite" ] || [ "$project" = "open5gs" ]; then
ver_regexp="^v[0-9]*.[0-9]*.[0-9]*$"
else
ver_regexp="^[0-9]*.[0-9]*.[0-9]*$"
@ -54,6 +54,10 @@ checkout() {
cd "$TOP"
if [ "$project" = "limesuite" ]; then
[ -d "$project" ] || git clone "https://github.com/myriadrf/LimeSuite" "$project"
elif [ "$project" = "open5gs" ]; then
if [ ! -d "$project" ]; then
git clone "https://github.com/open5gs/open5gs" "$project"
fi
else
[ -d "$project" ] || osmo_git_clone_date "$(osmo_git_clone_url "$project")"
fi
@ -61,6 +65,9 @@ checkout() {
git fetch
VER=$(get_last_tag "$project")
git checkout -f -B "$VER" "refs/tags/$VER"
if [ "$project" = "open5gs" ]; then
meson subprojects download freeDiameter
fi
}
# Copy an already checked out repository dir and apply its debian 8 patch.
@ -93,7 +100,12 @@ build() {
osmo_obs_add_debian_dependency "./debian/control" "osmocom-latest"
if [ -x ./git-version-gen ]; then
if [ "$project" = "open5gs" ]; then
# we cannot control the output directory of the generated source :(
dpkg-buildpackage -S -uc -us -d
mkdir -p "$output"
mv "../$name"*.tar* "../$name"*.dsc "$output"
elif [ -x ./git-version-gen ]; then
gbp buildpackage -S -uc -us -d --git-ignore-branch "--git-export-dir=$output" \
"--git-debian-branch=$VER" --git-ignore-new $gitbpargs \
--git-postexport='cp $GBP_GIT_DIR/../.tarball-version $GBP_TMP_DIR/'
@ -159,6 +171,7 @@ build_osmocom() {
checkout libosmo-dsp
checkout osmo-sysmon
checkout osmo-remsim
checkout open5gs
checkout_copy_debian8_jessie "osmo-gsm-manuals"
@ -191,6 +204,7 @@ build_osmocom() {
build libosmo-dsp
build osmo-sysmon
build osmo-remsim
build open5gs
cd "$TOP/$PROJ"
osc ci -m "Latest Tagged versions of $DT"

View File

@ -108,8 +108,11 @@ build() {
fi
mkdir -p "$DATA/$name"
# source code build without dependency checks and unsigned source and unsigned change log
if [ -f .tarball-version ]; then
if [ "$name" = "open5gs" ]; then
# we cannot control the output directory of the generated source :(
dpkg-buildpackage -S -uc -us -d
mv "../$name"*.tar* "../$name"*.dsc "$DATA/$name/"
elif [ -f .tarball-version ]; then
gbp buildpackage -S -uc -us -d --git-ignore-branch "--git-export-dir=$DATA/$name" \
--git-ignore-new $gitbpargs \
--git-postexport='cp $GBP_GIT_DIR/../.tarball-version $GBP_TMP_DIR/'
@ -153,6 +156,14 @@ checkout_limesuite() {
git checkout "$TAG"
}
checkout_open5gs() {
cd "$REPO"
git clone https://github.com/open5gs/open5gs
cd open5gs
meson subprojects download freeDiameter
}
# Copy an already checked out repository dir and apply its debian 8 patch.
# $1: Osmocom repository
checkout_copy_debian8_jessie() {
@ -207,6 +218,7 @@ build_osmocom() {
checkout libosmo-dsp
checkout osmo-sysmon
checkout osmo-remsim
checkout_open5gs
checkout_copy_debian8_jessie "osmo-gsm-manuals"
checkout_copy_debian8_jessie "osmo-trx"
@ -244,6 +256,7 @@ build_osmocom() {
build libosmo-dsp
build osmo-sysmon
build osmo-remsim
build open5gs
download_bumpversion