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

Holger Freyther gerrit-no-reply at lists.osmocom.org
Tue Jan 24 13:16:21 UTC 2017


Holger Freyther has submitted this change and it was merged.

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


Revert "deb: use gsm_data_shared.* from openbsc-dev"

As the Osmocom project is providing packages and we build them
directly from git we should have native packages. openbsc-dev
should provide files in the same directory structure as the git
repository and then --with-openbsc=/usr/src/osmocom/openbsc/openbsc/include/openbsc
can be used. Follow up patches are coming.

This reverts commit 70b71507c27f8967b0aa31cad0b3070c6780f3b4.

Change-Id: I8bc3a5c2b9446d9e94e362ed5d85a61e3a727f8b
---
D debian/patches/01_location_of_gsm_data_shared.patch
D debian/patches/series
M debian/source/format
3 files changed, 1 insertion(+), 21 deletions(-)

Approvals:
  Max: Looks good to me, but someone else must approve
  Jenkins Builder: Verified
  Holger Freyther: Looks good to me, approved



diff --git a/debian/patches/01_location_of_gsm_data_shared.patch b/debian/patches/01_location_of_gsm_data_shared.patch
deleted file mode 100644
index b0a1499..0000000
--- a/debian/patches/01_location_of_gsm_data_shared.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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
deleted file mode 100644
index e753172..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-01_location_of_gsm_data_shared.patch
-
diff --git a/debian/source/format b/debian/source/format
index 163aaf8..89ae9db 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-3.0 (quilt)
+3.0 (native)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8bc3a5c2b9446d9e94e362ed5d85a61e3a727f8b
Gerrit-PatchSet: 2
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Owner: Holger Freyther <holger at freyther.de>
Gerrit-Reviewer: Holger Freyther <holger at freyther.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Max <msuraev at sysmocom.de>


More information about the gerrit-log mailing list