From 831475bbfb9c080afbf0d5b2d849558fba20f8d5 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 21 Aug 2014 13:23:09 +0200 Subject: [PATCH 1/2] openbsc: Fix the systemd files to allow easy "systemctl enable" --- ...Add-Install-section-to-service-files.patch | 61 +++++++++++++++++++ recipes-osmocom/openbsc/openbsc_git.bb | 5 +- 2 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 recipes-osmocom/openbsc/openbsc/0001-systemd-Add-Install-section-to-service-files.patch diff --git a/recipes-osmocom/openbsc/openbsc/0001-systemd-Add-Install-section-to-service-files.patch b/recipes-osmocom/openbsc/openbsc/0001-systemd-Add-Install-section-to-service-files.patch new file mode 100644 index 0000000000..b078b2832d --- /dev/null +++ b/recipes-osmocom/openbsc/openbsc/0001-systemd-Add-Install-section-to-service-files.patch @@ -0,0 +1,61 @@ +From 0e167fc9740793cf4a3c82747919146073255486 Mon Sep 17 00:00:00 2001 +From: Daniel Willmann +Date: Wed, 20 Aug 2014 15:13:56 +0200 +Subject: [PATCH] systemd: Add Install section to service files + +That way the services can be enabled with +> systemctl enable +--- + contrib/systemd/osmo-bsc-mgcp.service | 3 +++ + contrib/systemd/osmo-bsc.service | 3 +++ + contrib/systemd/osmo-nitb.service | 3 +++ + contrib/systemd/osmo-sgsn.service | 3 +++ + 4 files changed, 12 insertions(+) + +diff --git a/contrib/systemd/osmo-bsc-mgcp.service b/contrib/systemd/osmo-bsc-mgcp.service +index 7fa2ec0..c040e60 100644 +--- a/contrib/systemd/osmo-bsc-mgcp.service ++++ b/contrib/systemd/osmo-bsc-mgcp.service +@@ -6,3 +6,6 @@ Type=simple + Restart=always + ExecStart=/usr/bin/osmo-bsc_mgcp -s -c /etc/osmocom/osmo-bsc-mgcp.cfg + RestartSec=2 ++ ++[Install] ++WantedBy=multi-user.target +diff --git a/contrib/systemd/osmo-bsc.service b/contrib/systemd/osmo-bsc.service +index deaf123..eb6cacb 100644 +--- a/contrib/systemd/osmo-bsc.service ++++ b/contrib/systemd/osmo-bsc.service +@@ -7,3 +7,6 @@ Type=simple + Restart=always + ExecStart=/usr/bin/osmo-bsc -c /etc/osmocom/osmo-bsc.cfg -s + RestartSec=2 ++ ++[Install] ++WantedBy=multi-user.target +diff --git a/contrib/systemd/osmo-nitb.service b/contrib/systemd/osmo-nitb.service +index a9d5d8c..377497e 100644 +--- a/contrib/systemd/osmo-nitb.service ++++ b/contrib/systemd/osmo-nitb.service +@@ -6,3 +6,6 @@ Type=simple + Restart=always + ExecStart=/usr/bin/osmo-nitb -s -C -c /etc/osmocom/osmo-nitb.cfg -l /var/lib/osmocom/hlr.sqlite3 + RestartSec=2 ++ ++[Install] ++WantedBy=multi-user.target +diff --git a/contrib/systemd/osmo-sgsn.service b/contrib/systemd/osmo-sgsn.service +index afd0f40..674d786 100644 +--- a/contrib/systemd/osmo-sgsn.service ++++ b/contrib/systemd/osmo-sgsn.service +@@ -6,3 +6,6 @@ Type=simple + Restart=always + ExecStart=/usr/bin/osmo-sgsn -c /etc/osmocom/osmo-sgsn.cfg + RestartSec=2 ++ ++[Install] ++WantedBy=multi-user.target +-- +2.1.0.rc1 + diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb index d515bf8cb5..39f57137bc 100644 --- a/recipes-osmocom/openbsc/openbsc_git.bb +++ b/recipes-osmocom/openbsc/openbsc_git.bb @@ -1,10 +1,11 @@ require ${PN}.inc PV = "0.13.0+gitr${SRCPV}" -PR = "${INC_PR}.4" +PR = "${INC_PR}.5" SRCREV = "421365eeaa104a9781214f9e12c55023c1099bf8" SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git \ - file://upgrade-mncc-version.patch" + file://upgrade-mncc-version.patch \ + file://0001-systemd-Add-Install-section-to-service-files.patch" S = "${WORKDIR}/git/openbsc" From 1e059eb7d83878c78126be44a56d483c37eccb26 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 21 Aug 2014 13:29:06 +0200 Subject: [PATCH 2/2] openggsn: Build newer version with updated ggsn service file --- recipes-osmocom/openggsn/openggsn_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-osmocom/openggsn/openggsn_git.bb b/recipes-osmocom/openggsn/openggsn_git.bb index f87b24ce79..fedcb1730e 100644 --- a/recipes-osmocom/openggsn/openggsn_git.bb +++ b/recipes-osmocom/openggsn/openggsn_git.bb @@ -2,9 +2,9 @@ DESCRITOPN = "OpenGGSN a Free Software GGSN" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" PV = "0.91+gitr${SRCPV}" -PR = "r12" +PR = "r13" -SRCREV = "9c0ff4fafe4276396125a52c89d36967566fe08c" +SRCREV = "5816bcfaff8dce35345fa0955082d8c761618017" SRC_URI = "git://git.osmocom.org/openggsn \ file://openggsn.init \ file://libgtp-queue_depth_32.patch \