Change in osmo-ci[master]: OBS: build osmo-gsm-manuals-dev in latest

osmith gerrit-no-reply at lists.osmocom.org
Wed May 29 09:58:12 UTC 2019


osmith has uploaded this change for review. ( https://gerrit.osmocom.org/14244


Change subject: OBS: build osmo-gsm-manuals-dev in latest
......................................................................

OBS: build osmo-gsm-manuals-dev in latest

Enable in osmocom-latest-packages.sh. Check it out and create the source
package for the latest release as usually, but also create a second
version for debian 8 with adjusted dependencies (like in nightly [1]).

[1] Change-Id: I3570599ede51b974d350064f44f77e360fafd8b0

Related: OS#3899
Change-Id: Ib7251cca9116151e473798879375cd5eb48ff3ad
---
M scripts/osmocom-latest-packages.sh
1 file changed, 30 insertions(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/44/14244/1

diff --git a/scripts/osmocom-latest-packages.sh b/scripts/osmocom-latest-packages.sh
index 020efaa..bc94e24 100755
--- a/scripts/osmocom-latest-packages.sh
+++ b/scripts/osmocom-latest-packages.sh
@@ -58,6 +58,30 @@
   git checkout -f -B "$VER" "refs/tags/$VER"
 }
 
+# Copy an already checked out repository dir. The debian8 patch will be applied
+# later, since build() does a "git checkout" to the latest version (unlike in
+# osmocom-nightly-packages.sh).
+# $1: Osmocom repository
+checkout_copy_debian8_jessie() {
+  echo
+  echo "====> Checking out $1-debian8-jessie"
+  cd "$TOP"
+  if [ -d "$1-debian8-jessie" ]; then
+    rm -rf "$1-debian8-jessie"
+  fi
+  cp -a "$1" "$1-debian8-jessie"
+}
+
+# $1: checkout directory name
+apply_distro_specific_patch() {
+  case "$1" in
+    *"-debian8-jessie")
+      patch -p1 < debian/patches/build-for-debian8.patch
+      git commit --amend --no-edit debian/
+    ;;
+  esac
+}
+
 build() {
   project=$1
   gitbpargs="$2"
@@ -67,6 +91,7 @@
   cd "$TOP/$project"
   VER=$(get_last_tag "$project")
   git checkout -f -B "$VER" "refs/tags/$VER"
+  apply_distro_specific_patch "$project"
   if [ -x ./git-version-gen ]; then
     ./git-version-gen . > .tarball-version 2>/dev/null
     gbp buildpackage -S -uc -us -d --git-ignore-branch "--git-export-dir=$output" \
@@ -102,12 +127,12 @@
 # add those once they have tagged any versions that include the 'debian' sub-dir:
 #rtl-sdr
 #osmo-fl2k
-#osmo-gsm-manuals
 
 build_osmocom() {
   prepare
 
   checkout limesuite
+  checkout osmo-gsm-manuals
   checkout libosmocore
   checkout libosmo-sccp
   checkout libosmo-abis
@@ -135,7 +160,11 @@
   # TODO: enable once libosmo-abis > 0.6.0 is available (IPA keepalive FSM)
   # checkout osmo-remsim
 
+  checkout_copy_debian8_jessie "osmo-gsm-manuals"
+
   build limesuite --git-upstream-tree="$(get_last_tag limesuite)"
+  build osmo-gsm-manuals
+  build osmo-gsm-manuals-debian8-jessie
   build libosmocore
   build libosmo-sccp
   build libosmo-abis

-- 
To view, visit https://gerrit.osmocom.org/14244
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib7251cca9116151e473798879375cd5eb48ff3ad
Gerrit-Change-Number: 14244
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190529/78ed93cc/attachment.html>


More information about the gerrit-log mailing list