[MERGED] osmo-bts[master]: deb: use gsm_data_shared.* from openbsc-dev

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Neels Hofmeyr gerrit-no-reply at lists.osmocom.org
Sat Jan 21 00:28:36 UTC 2017


Neels Hofmeyr has submitted this change and it was merged.

Change subject: deb: use gsm_data_shared.* from openbsc-dev
......................................................................


deb: use gsm_data_shared.* from openbsc-dev

Use gsm_data-shared.* from absolute path where it's installed by
openbsc-dev package instead of relative path to fix OBS package
building.

Change-Id: Iec6b0f0eb0b7fffaa814c9769c0ee777d641a07f
Related: OS#1860
---
A debian/patches/01_location_of_gsm_data_shared.patch
A debian/patches/series
M debian/source/format
3 files changed, 21 insertions(+), 1 deletion(-)

Approvals:
  Neels Hofmeyr: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/debian/patches/01_location_of_gsm_data_shared.patch b/debian/patches/01_location_of_gsm_data_shared.patch
new file mode 100644
index 0000000..b0a1499
--- /dev/null
+++ b/debian/patches/01_location_of_gsm_data_shared.patch
@@ -0,0 +1,18 @@
+From: Ruben Undheim <ruben.undheim at gmail.com>
+Date: Sat, 28 May 2016 09:38:56 +0200
+Subject: In order to build osmo-bts,
+ some files shared with openbsc needs to be available. This replaces
+ the search path for these files so that they are picked from the openbsc-dev
+ package.
+
+---
+ src/common/gsm_data_shared.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/common/gsm_data_shared.c b/src/common/gsm_data_shared.c
+index 706892d..932d71f 100644
+--- a/src/common/gsm_data_shared.c
++++ b/src/common/gsm_data_shared.c
+@@ -1 +1 @@
+-#include "../../../openbsc/openbsc/src/libcommon/gsm_data_shared.c"
++#include "/usr/src/osmocom/openbsc/libcommon/gsm_data_shared.c"
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e753172
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+01_location_of_gsm_data_shared.patch
+
diff --git a/debian/source/format b/debian/source/format
index 89ae9db..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-3.0 (native)
+3.0 (quilt)

-- 
To view, visit https://gerrit.osmocom.org/1636
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iec6b0f0eb0b7fffaa814c9769c0ee777d641a07f
Gerrit-PatchSet: 1
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Owner: Max <msuraev at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>



More information about the gerrit-log mailing list