<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ci/+/18393">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">scripts/common-obs.sh: move osmo_obs_checkout_copy<br><br>Refactor checkout_copy_debian8_jessie from osmocom-latest-packages.sh<br>and osmocom-nightly-packages.sh to take the distribution name as<br>argument and merge both to osmo_obs_checkout_copy in common-obs.sh.<br><br>Use debian8 as distribution name instead of debian8-jessie, so the<br>distribution name matches the suffix of the patch file<br>(build-for-debian8.patch).<br><br>A follow-up commit will apply a debian10 specific patch with this new<br>function.<br><br>Related: OS#4562<br>Change-Id: I2b69571ebc08a920c9147ce544fa8a2e6d950e65<br>---<br>M scripts/common-obs.sh<br>M scripts/osmocom-latest-packages.sh<br>M scripts/osmocom-nightly-packages.sh<br>3 files changed, 49 insertions(+), 34 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/93/18393/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/scripts/common-obs.sh b/scripts/common-obs.sh</span><br><span>index c07fbaa..df8ea75 100644</span><br><span>--- a/scripts/common-obs.sh</span><br><span>+++ b/scripts/common-obs.sh</span><br><span>@@ -120,3 +120,44 @@</span><br><span> </span><br><span> osc add "$name.spec"</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# Copy an already checked out repository dir and apply a distribution specific patch.</span><br><span style="color: hsl(120, 100%, 40%);">+# $PWD must be where all repositories are checked out in subdirs.</span><br><span style="color: hsl(120, 100%, 40%);">+# $1: distribution name (e.g. "debian8")</span><br><span style="color: hsl(120, 100%, 40%);">+# $2: Osmocom repository (e.g. "osmo-trx")</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_obs_checkout_copy() {</span><br><span style="color: hsl(120, 100%, 40%);">+ local distro="$1"</span><br><span style="color: hsl(120, 100%, 40%);">+ local repo="$2"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ echo</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "====> Checking out $repo-$distro"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # Verify distro name for consistency</span><br><span style="color: hsl(120, 100%, 40%);">+ local distros="</span><br><span style="color: hsl(120, 100%, 40%);">+ debian8</span><br><span style="color: hsl(120, 100%, 40%);">+ "</span><br><span style="color: hsl(120, 100%, 40%);">+ local found=0</span><br><span style="color: hsl(120, 100%, 40%);">+ local distro_i</span><br><span style="color: hsl(120, 100%, 40%);">+ for distro_i in $distros; do</span><br><span style="color: hsl(120, 100%, 40%);">+ if [ "$distro_i" = "$distro" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+ found=1</span><br><span style="color: hsl(120, 100%, 40%);">+ break</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+ done</span><br><span style="color: hsl(120, 100%, 40%);">+ if [ "$found" = 0 ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "ERROR: invalid distro name: $distro, should be one of: $distros"</span><br><span style="color: hsl(120, 100%, 40%);">+ exit 1</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # Copy</span><br><span style="color: hsl(120, 100%, 40%);">+ if [ -d "$repo-$distro" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+ rm -rf "$repo-$distro"</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+ cp -a "$repo" "$repo-$distro"</span><br><span style="color: hsl(120, 100%, 40%);">+ cd "$repo-$distro"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # Commit patch</span><br><span style="color: hsl(120, 100%, 40%);">+ patch -p1 < "debian/patches/build-for-$distro.patch"</span><br><span style="color: hsl(120, 100%, 40%);">+ git commit --amend --no-edit debian/</span><br><span style="color: hsl(120, 100%, 40%);">+ cd ..</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/scripts/osmocom-latest-packages.sh b/scripts/osmocom-latest-packages.sh</span><br><span>index 5e35659..8bf4fb2 100755</span><br><span>--- a/scripts/osmocom-latest-packages.sh</span><br><span>+++ b/scripts/osmocom-latest-packages.sh</span><br><span>@@ -63,22 +63,6 @@</span><br><span> fi</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-# Copy an already checked out repository dir and apply its debian 8 patch.</span><br><span style="color: hsl(0, 100%, 40%);">-# $1: Osmocom repository</span><br><span style="color: hsl(0, 100%, 40%);">-checkout_copy_debian8_jessie() {</span><br><span style="color: hsl(0, 100%, 40%);">- echo</span><br><span style="color: hsl(0, 100%, 40%);">- echo "====> Checking out $1-debian8-jessie"</span><br><span style="color: hsl(0, 100%, 40%);">- cd "$TOP"</span><br><span style="color: hsl(0, 100%, 40%);">- if [ -d "$1-debian8-jessie" ]; then</span><br><span style="color: hsl(0, 100%, 40%);">- rm -rf "$1-debian8-jessie"</span><br><span style="color: hsl(0, 100%, 40%);">- fi</span><br><span style="color: hsl(0, 100%, 40%);">- cp -a "$1" "$1-debian8-jessie"</span><br><span style="color: hsl(0, 100%, 40%);">- cd "$1-debian8-jessie"</span><br><span style="color: hsl(0, 100%, 40%);">- patch -p1 < debian/patches/build-for-debian8.patch</span><br><span style="color: hsl(0, 100%, 40%);">- git commit --amend --no-edit debian/</span><br><span style="color: hsl(0, 100%, 40%);">- cd ..</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> build() {</span><br><span> project=$1</span><br><span> gitbpargs="$2"</span><br><span>@@ -170,12 +154,13 @@</span><br><span> checkout neocon https://github.com/laf0rge/neocon</span><br><span> checkout osmo-uecups</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- checkout_copy_debian8_jessie "osmo-gsm-manuals"</span><br><span style="color: hsl(120, 100%, 40%);">+ cd "$TOP"</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_obs_checkout_copy debian8 osmo-gsm-manuals</span><br><span> </span><br><span> build osmocom-latest</span><br><span> build limesuite --git-upstream-tree="$(get_last_tag limesuite)"</span><br><span> build osmo-gsm-manuals</span><br><span style="color: hsl(0, 100%, 40%);">- build osmo-gsm-manuals-debian8-jessie</span><br><span style="color: hsl(120, 100%, 40%);">+ build osmo-gsm-manuals-debian8</span><br><span> build libosmocore</span><br><span> build libosmo-sccp</span><br><span> build libosmo-abis</span><br><span>diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh</span><br><span>index a79a754..ca4b253 100755</span><br><span>--- a/scripts/osmocom-nightly-packages.sh</span><br><span>+++ b/scripts/osmocom-nightly-packages.sh</span><br><span>@@ -164,18 +164,6 @@</span><br><span> meson subprojects download freeDiameter</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-# Copy an already checked out repository dir and apply its debian 8 patch.</span><br><span style="color: hsl(0, 100%, 40%);">-# $1: Osmocom repository</span><br><span style="color: hsl(0, 100%, 40%);">-checkout_copy_debian8_jessie() {</span><br><span style="color: hsl(0, 100%, 40%);">- cd "$REPO"</span><br><span style="color: hsl(0, 100%, 40%);">- cp -a "$1" "$1-debian8-jessie"</span><br><span style="color: hsl(0, 100%, 40%);">- cd "$1-debian8-jessie"</span><br><span style="color: hsl(0, 100%, 40%);">- patch -p1 < debian/patches/build-for-debian8.patch</span><br><span style="color: hsl(0, 100%, 40%);">- git commit -m 'auto-commit: allow debian8 to build' debian/</span><br><span style="color: hsl(0, 100%, 40%);">- cd ..</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> build_osmocom() {</span><br><span> DATA=$TOP/data</span><br><span> REPO=$TOP/repo</span><br><span>@@ -223,13 +211,14 @@</span><br><span> checkout neocon https://github.com/laf0rge/neocon</span><br><span> checkout osmo-uecups</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- checkout_copy_debian8_jessie "osmo-gsm-manuals"</span><br><span style="color: hsl(0, 100%, 40%);">- checkout_copy_debian8_jessie "osmo-trx"</span><br><span style="color: hsl(120, 100%, 40%);">+ cd "$REPO"</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_obs_checkout_copy debian8 osmo-gsm-manuals</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_obs_checkout_copy debian8 osmo-trx</span><br><span> </span><br><span> build osmocom-nightly</span><br><span> build limesuite no_commit --git-upstream-tree="$(get_last_tag limesuite)"</span><br><span> build osmo-gsm-manuals</span><br><span style="color: hsl(0, 100%, 40%);">- build osmo-gsm-manuals-debian8-jessie</span><br><span style="color: hsl(120, 100%, 40%);">+ build osmo-gsm-manuals-debian8</span><br><span> build libosmocore</span><br><span> build libosmo-sccp</span><br><span> build libosmo-abis</span><br><span>@@ -244,7 +233,7 @@</span><br><span> build openbsc</span><br><span> build osmo-pcap</span><br><span> build osmo-trx</span><br><span style="color: hsl(0, 100%, 40%);">- build osmo-trx-debian8-jessie</span><br><span style="color: hsl(120, 100%, 40%);">+ build osmo-trx-debian8</span><br><span> build osmo-sip-connector</span><br><span> build osmo-bts</span><br><span> build osmo-pcu</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ci/+/18393">change 18393</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-ci/+/18393"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ci </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I2b69571ebc08a920c9147ce544fa8a2e6d950e65 </div>
<div style="display:none"> Gerrit-Change-Number: 18393 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>