laforge has submitted this change. (
https://gerrit.osmocom.org/c/docker-playground/+/38073?usp=email )
Change subject: osmo-*-master: don't install libosmo-sccp-dev
......................................................................
osmo-*-master: don't install libosmo-sccp-dev
The libosmo-sccp-dev package is no longer provided by libosmo-sccp.
Without this patch, an older version of the library from debian packages
gets installed, resulting in a conflict for sccp_types.h which is now in
libosmo-sccp-dev.
Fix for:
#6 8.585 dpkg: error processing archive
/tmp/apt-dpkg-install-llkDLH/25-libosmo-sigtran-dev_1.9.0.3.fc4c.202409092026_amd64.deb
(--unpack):
#6 8.585 trying to overwrite '/usr/include/osmocom/sccp/sccp_types.h', which
is also in package libosmo-sccp-dev:amd64 1.6.0+dfsg1-3
Related: libosmo-sccp I299a32a2f8f61477cf49c8126567fef2092d5407
Change-Id: I3e7c3c14649d8ebf71fa2968709816dae7bff20c
---
M osmo-bsc-master/Dockerfile
M osmo-bts-master/Dockerfile
M osmo-gsm-tester/Dockerfile
M osmo-mgw-master/Dockerfile
M osmo-msc-master/Dockerfile
M osmo-sgsn-master/Dockerfile
M osmo-smlc-master/Dockerfile
7 files changed, 1 insertion(+), 9 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/osmo-bsc-master/Dockerfile b/osmo-bsc-master/Dockerfile
index 65ec5d4..ff0b6fa 100644
--- a/osmo-bsc-master/Dockerfile
+++ b/osmo-bsc-master/Dockerfile
@@ -11,7 +11,6 @@
libosmocore-dev \
libosmo-abis-dev \
libosmo-netif-dev \
- libosmo-sccp-dev \
libosmo-sigtran-dev \
libosmo-mgcp-client-dev \
libgtp-dev && \
@@ -21,7 +20,6 @@
dnf install -y \
"pkgconfig(libosmo-mgcp-client)" \
"pkgconfig(libosmo-netif)" \
- "pkgconfig(libosmo-sccp)" \
"pkgconfig(libosmo-sigtran)" \
"pkgconfig(libosmoabis)" \
"pkgconfig(libosmocore)" \
diff --git a/osmo-bts-master/Dockerfile b/osmo-bts-master/Dockerfile
index 8c43973..2d0fb45 100644
--- a/osmo-bts-master/Dockerfile
+++ b/osmo-bts-master/Dockerfile
@@ -11,7 +11,6 @@
libosmocore-dev \
libosmo-abis-dev \
libosmo-netif-dev \
- libosmo-sccp-dev \
libsmpp34-dev \
libgtp-dev && \
apt-get clean \
diff --git a/osmo-gsm-tester/Dockerfile b/osmo-gsm-tester/Dockerfile
index bb6f521..0105e47 100644
--- a/osmo-gsm-tester/Dockerfile
+++ b/osmo-gsm-tester/Dockerfile
@@ -81,7 +81,6 @@
libosmo-gsup-client-dev \
libosmo-netif-dev \
libosmo-ranap-dev \
- libosmo-sccp-dev \
libosmo-sigtran-dev \
libsmpp34-dev \
libgtp-dev \
diff --git a/osmo-mgw-master/Dockerfile b/osmo-mgw-master/Dockerfile
index 20b5b1a..343c65a 100644
--- a/osmo-mgw-master/Dockerfile
+++ b/osmo-mgw-master/Dockerfile
@@ -11,7 +11,7 @@
libosmocore-dev \
libosmo-abis-dev \
libosmo-netif-dev \
- libosmo-sccp-dev && \
+ && \
apt-get clean \
;; \
centos*) \
diff --git a/osmo-msc-master/Dockerfile b/osmo-msc-master/Dockerfile
index 7a0362d..ef20f76 100644
--- a/osmo-msc-master/Dockerfile
+++ b/osmo-msc-master/Dockerfile
@@ -15,7 +15,6 @@
libosmo-gsup-client-dev \
libosmo-netif-dev \
libosmo-ranap-dev \
- libosmo-sccp-dev \
libosmo-sigtran-dev \
libosmocore-dev \
libsmpp34-dev && \
diff --git a/osmo-sgsn-master/Dockerfile b/osmo-sgsn-master/Dockerfile
index edd912f..6d97458 100644
--- a/osmo-sgsn-master/Dockerfile
+++ b/osmo-sgsn-master/Dockerfile
@@ -13,7 +13,6 @@
libosmo-gsup-client-dev \
libosmo-netif-dev \
libosmo-ranap-dev \
- libosmo-sccp-dev \
libosmo-sigtran-dev \
libsmpp34-dev \
libgtp-dev \
diff --git a/osmo-smlc-master/Dockerfile b/osmo-smlc-master/Dockerfile
index c602268..d991d29 100644
--- a/osmo-smlc-master/Dockerfile
+++ b/osmo-smlc-master/Dockerfile
@@ -10,14 +10,12 @@
apt-get install -y --no-install-recommends \
libosmocore-dev \
libosmo-netif-dev \
- libosmo-sccp-dev \
libosmo-sigtran-dev && \
apt-get clean \
;; \
centos*) \
dnf install -y \
"pkgconfig(libosmo-netif)" \
- "pkgconfig(libosmo-sccp)" \
"pkgconfig(libosmo-sigtran)" \
"pkgconfig(libosmocore)" \
"pkgconfig(libosmoctrl)" \
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/38073?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I3e7c3c14649d8ebf71fa2968709816dae7bff20c
Gerrit-Change-Number: 38073
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <[email protected]>
