August 2024 - gerrit-log - lists.osmocom.org

[S] Change in pysim[master]: pySim.esim.saip.templates: Add expand_default_value() method

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/37741?usp=email ) Change subject: pySim.esim.saip.templates: Add expand_default_value() method ...................................................................... pySim.esim.saip.templates: Add expand_default_value() method This method can be used to expand the default value pattern of the file system template for the file to the specified (record, file) length. Change-Id: Id3eb16910c0bdfa572294e14ca1cd44ca95ca69f --- M pySim/esim/saip/templates.py 1 file changed, 45 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/41/37741/1 diff --git a/pySim/esim/saip/templates.py b/pySim/esim/saip/templates.py index f1fd975..eff28c2 100644 --- a/pySim/esim/saip/templates.py +++ b/pySim/esim/saip/templates.py @@ -17,7 +17,7 @@ from typing import * from copy import deepcopy -from pySim.utils import all_subclasses +from pySim.utils import all_subclasses, h2b from pySim.filesystem import Path import pySim.esim.saip.oid as OID @@ -51,6 +51,10 @@ # initialize empty self.parent = None self.children = [] + if self.default_val: + length = self._default_value_len() or 100 + # run the method once to verify the pattern can be processed + self.expand_default_value_pattern(length) def __str__(self) -> str: return "FileTemplate(%s)" % (self.name) @@ -85,6 +89,34 @@ if path[1].lower() == c.name.lower(): return c.get_file_by_path(path[1:]) + def _default_value_len(self): + if self.file_type in ['TR']: + return self.file_size + elif self.file_type in ['LF', 'CY']: + return self.rec_len + + def expand_default_value_pattern(self, length: Optional[int] = None) -> Optional[bytes]: + """Expand the default value pattern to the specified length.""" + if not length: + length = self._default_value_len() + if not length: + raise ValueError("%s does not have a default length" % self) + if not self.default_val: + return None + if not '...' in self.default_val: + return h2b(self.default_val) + l = self.default_val.split('...') + if len(l) != 2: + raise ValueError("Pattern '%s' contains more than one ..." % self.default_val) + prefix = h2b(l[0]) + suffix = h2b(l[1]) + pad_len = length - len(prefix) - len(suffix) + if pad_len <= 0: + ret = prefix + suffix + return ret[:length] + return prefix + prefix[-1:] * pad_len + suffix + + class ProfileTemplate: """Representation of a SimAlliance/TCA Profile Template. Each Template is identified by its OID and consists of a number of file definitions. We implement each profile template as a class derived from this -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37741?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id3eb16910c0bdfa572294e14ca1cd44ca95ca69f Gerrit-Change-Number: 37741 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

11 months

1
0
0 0

[S] Change in pysim[master]: pySim.esim.saip.template: Permit file-size for BER-TLV files

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/37733?usp=email ) Change subject: pySim.esim.saip.template: Permit file-size for BER-TLV files ...................................................................... pySim.esim.saip.template: Permit file-size for BER-TLV files We previously only permitted this for transparent files (TR), but file size can of course also be specified for BER-TLV files. Change-Id: Ie007cf2ccde0a17d0fb853a96b833f064ae52c59 --- M pySim/esim/saip/templates.py 1 file changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/33/37733/1 diff --git a/pySim/esim/saip/templates.py b/pySim/esim/saip/templates.py index 8a19d34..0901e39 100644 --- a/pySim/esim/saip/templates.py +++ b/pySim/esim/saip/templates.py @@ -36,7 +36,7 @@ if ftype in ['LF', 'CY']: self.nb_rec = nb_rec self.rec_len = size - elif ftype in ['TR']: + elif ftype in ['TR', 'BT']: self.file_size = size self.arr = arr self.sfi = sfi -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37733?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie007cf2ccde0a17d0fb853a96b833f064ae52c59 Gerrit-Change-Number: 37733 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

11 months

1
0
0 0

[S] Change in pysim[master]: pySim.esim.saip.templates: Add a notion of the path of a file

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/37734?usp=email ) Change subject: pySim.esim.saip.templates: Add a notion of the path of a file ...................................................................... pySim.esim.saip.templates: Add a notion of the path of a file The SAIP data format is inherently flat and doesn't intrinsically have an idea of the tree-like structure of a filesystem. However, if we want to (for example) convert a physical USIM into an eSIM profile, we need to find the template for a given file, where the file is identified by its path. Let's expose a path property of the FileTemplate object, and populate that when creating the FileTemplate as part of a ProfileTemplate. Change-Id: Ie145ba159081daf8fbfa544f6d4248f05b7eea96 --- M pySim/esim/saip/templates.py 1 file changed, 42 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/34/37734/1 diff --git a/pySim/esim/saip/templates.py b/pySim/esim/saip/templates.py index 0901e39..c4a4783 100644 --- a/pySim/esim/saip/templates.py +++ b/pySim/esim/saip/templates.py @@ -17,6 +17,7 @@ from typing import * from copy import deepcopy +from pySim.filesystem import Path import pySim.esim.saip.oid as OID class FileTemplate: @@ -61,11 +62,19 @@ def print_tree(self, indent:str = ""): """recursive printing of FileTemplate tree structure.""" - print("%s%s" % (indent, repr(self))) + print("%s%s (%s)" % (indent, repr(self), self.path)) indent += " " for c in self.children: c.print_tree(indent) + @property + def path(self): + """Return the path of the given File within the hierarchy.""" + if self.parent: + return self.parent.path + self.name + else: + return Path(self.name) + def get_file_by_path(self, path: List[str]) -> Optional['FileTemplate']: """Return a FileTemplate matching the given path within this ProfileTemplate.""" if path[0].lower() != self.name.lower(): @@ -98,14 +107,14 @@ if f.file_type in ['MF', 'DF', 'ADF']: if cur_df == None: cls.tree.append(f) - cur_df = f f.parent = None + cur_df = f else: # "cd .." if cur_df.parent: cur_df = cur_df.parent - cur_df.children.append(f) f.parent = cur_df + cur_df.children.append(f) cur_df = f else: if cur_df == None: @@ -213,6 +222,7 @@ class FilesTelecom(ProfileTemplate): created_by_default = False oid = OID.DF_TELECOM + base_path = Path('MF') files = [ FileTemplate(0x7f11, 'DF.TELECOM', 'DF', None, None, 14, None, None, False, params=['pinStatusTemplateDO']), FileTemplate(0x6f06, 'EF.ARR', 'LF', None, None, 10, None, None, True, ['nb_rec', 'size']), @@ -252,6 +262,7 @@ class FilesTelecomV2(ProfileTemplate): created_by_default = False oid = OID.DF_TELECOM_v2 + base_path = Path('MF') files = [ FileTemplate(0x7f11, 'DF.TELECOM', 'DF', None, None, 14, None, None, False, params=['pinStatusTemplateDO']), FileTemplate(0x6f06, 'EF.ARR', 'LF', None, None, 10, None, None, True, ['nb_rec', 'size']), @@ -366,6 +377,7 @@ created_by_default = False optional = True oid = OID.ADF_USIMopt_not_by_default + base_path = Path('ADF.USIM') files = [ FileTemplate(0x6f05, 'EF.LI', 'TR', None, 6, 1, 0x02, 'FF...FF', False), FileTemplate(0x6f37, 'EF.ACMmax', 'TR', None, 3, 5, None, '000000', False, ass_serv=[13], pe_name='ef-acmax'), @@ -449,6 +461,7 @@ created_by_default = False optional = True oid = OID.ADF_USIMopt_not_by_default_v2 + base_path = Path('ADF.USIM') files = [ FileTemplate(0x6f05, 'EF.LI', 'TR', None, 6, 1, 0x02, 'FF...FF', False), FileTemplate(0x6f37, 'EF.ACMmax', 'TR', None, 3, 5, None, '000000', False, ass_serv=[13]), @@ -542,6 +555,7 @@ class FilesUsimDfPhonebook(ProfileTemplate): created_by_default = False oid = OID.DF_PHONEBOOK_ADF_USIM + base_path = Path('ADF.USIM') files = df_pb_files @@ -549,6 +563,7 @@ class FilesUsimDfGsmAccess(ProfileTemplate): created_by_default = False oid = OID.DF_GSM_ACCESS_ADF_USIM + base_path = Path('ADF.USIM') files = [ FileTemplate(0x5f3b, 'DF.GSM-ACCESS','DF', None, None, 14, None, None, False, ['pinStatusTemplateDO'], ass_serv=[27]), FileTemplate(0x4f20, 'EF.Kc', 'TR', None, 9, 5, 0x01, 'FF...FF07', False, ass_serv=[27], high_update=True), @@ -562,6 +577,7 @@ class FilesUsimDf5GS(ProfileTemplate): created_by_default = False oid = OID.DF_5GS + base_path = Path('ADF.USIM') files = [ FileTemplate(0x6fc0, 'DF.5GS', 'DF', None, None, 14, None, None, False, ['pinStatusTemplateDO'], ass_serv=[122,126,127,128,129,130], pe_name='df-df-5gs'), FileTemplate(0x4f01, 'EF.5GS3GPPLOCI', 'TR', None, 20, 5, 0x01, 'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000001', False, ass_serv=[122], high_update=True), @@ -581,6 +597,7 @@ class FilesUsimDf5GSv2(ProfileTemplate): created_by_default = False oid = OID.DF_5GS_v2 + base_path = Path('ADF.USIM') files = [ FileTemplate(0x6fc0, 'DF.5GS', 'DF', None, None, 14, None, None, False, ['pinStatusTemplateDO'], ass_serv=[122,126,127,128,129,130], pe_name='df-df-5gs'), FileTemplate(0x4f01, 'EF.5GS3GPPLOCI', 'TR', None, 20, 5, 0x01, 'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000001', False, ass_serv=[122], high_update=True), @@ -602,6 +619,7 @@ class FilesUsimDf5GSv3(ProfileTemplate): created_by_default = False oid = OID.DF_5GS_v3 + base_path = Path('ADF.USIM') files = [ FileTemplate(0x6fc0, 'DF.5GS', 'DF', None, None, 14, None, None, False, ['pinStatusTemplateDO'], ass_serv=[122,126,127,128,129,130], pe_name='df-df-5gs'), FileTemplate(0x4f01, 'EF.5GS3GPPLOCI', 'TR', None, 20, 5, 0x01, 'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000001', False, ass_serv=[122], high_update=True), @@ -625,6 +643,7 @@ class FilesUsimDfSaip(ProfileTemplate): created_by_default = False oid = OID.DF_SAIP + base_path = Path('ADF.USIM') files = [ FileTemplate(0x6fd0, 'DF.SAIP', 'DF', None, None, 14, None, None, False, ['pinStatusTemplateDO'], ass_serv=[(124, 125)], pe_name='df-df-saip'), FileTemplate(0x4f01, 'EF.SUCICalcInfo','TR', None, None, 3, None, 'FF..FF', False, ['size'], ass_serv=[125], pe_name='ef-suci-calc-info-usim'), @@ -651,6 +670,7 @@ created_by_default = False optional = True oid = OID.ADF_ISIMopt_not_by_default + base_path = Path('ADF.ISIM') files = [ FileTemplate(0x6f09, 'EF.P-CSCF', 'LF', 1, None, 2, None, None, True, ['size'], ass_serv=[1,5]), FileTemplate(0x6f3c, 'EF.SMS', 'LF', 10, 176, 5, None, '00FF...FF', False, ass_serv=[6,8]), @@ -669,6 +689,7 @@ created_by_default = False optional = True oid = OID.ADF_ISIMopt_not_by_default_v2 + base_path = Path('ADF.ISIM') files = [ FileTemplate(0x6f09, 'EF.PCSCF', 'LF', 1, None, 2, None, None, True, ['size'], ass_serv=[1,5]), FileTemplate(0x6f3c, 'EF.SMS', 'LF', 10, 176, 5, None, '00FF...FF', False, ass_serv=[6,8]), -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37734?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie145ba159081daf8fbfa544f6d4248f05b7eea96 Gerrit-Change-Number: 37734 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

11 months

1
0
0 0

[S] Change in pysim[master]: pySim.esim.saip: Add subcasses for EAP, DF.SNPN and DF.5G_ProSe

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/37732?usp=email ) Change subject: pySim.esim.saip: Add subcasses for EAP, DF.SNPN and DF.5G_ProSe ...................................................................... pySim.esim.saip: Add subcasses for EAP, DF.SNPN and DF.5G_ProSe Change-Id: I8f29e72d387c66c99ceccffc9de23a68fd15dc46 --- M pySim/esim/saip/__init__.py 1 file changed, 48 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/32/37732/1 diff --git a/pySim/esim/saip/__init__.py b/pySim/esim/saip/__init__.py index 81fef84..b63b95a 100644 --- a/pySim/esim/saip/__init__.py +++ b/pySim/esim/saip/__init__.py @@ -300,9 +300,11 @@ 'gsm-access': ProfileElementGsmAccess, # TODO: csim # TODO: opt-csim - # TODO: eap + 'eap': ProfileElementEAP, 'df-5gs': ProfileElementDf5GS, 'df-saip': ProfileElementDfSAIP, + 'df-snpn': ProfileElementDfSNPN, + 'df-5gprose': ProfileElementDf5GProSe, } if pe_type in class4petype: return class4petype[pe_type] @@ -553,6 +555,18 @@ for fname in ['df-5gs']: self.decoded[fname] = [] +class ProfileElementEAP(FsProfileElement): + type = 'eap' + + def __init__(self, decoded: Optional[dict] = None): + super().__init__(decoded) + if decoded: + return + # provide some reasonable defaults + self.decoded['templateID'] = str(oid.DF_EAP) + for fname in ['df-eap', 'ef-eapstatus']: + self.decoded[fname] = [] + class ProfileElementDfSAIP(FsProfileElement): type = 'df-saip' @@ -565,6 +579,30 @@ for fname in ['df-saip']: self.decoded[fname] = [] +class ProfileElementDfSNPN(FsProfileElement): + type = 'df-snpn' + + def __init__(self, decoded: Optional[dict] = None): + super().__init__(decoded) + if decoded: + return + # provide some reasonable defaults + self.decoded['templateID'] = str(oid.DF_SNPN) + for fname in ['df-snpn']: + self.decoded[fname] = [] + +class ProfileElementDf5GProSe(FsProfileElement): + type = 'df-5gprose' + + def __init__(self, decoded: Optional[dict] = None): + super().__init__(decoded) + if decoded: + return + # provide some reasonable defaults + self.decoded['templateID'] = str(oid.DF_5GProSe) + for fname in ['df-df-5g-prose']: + self.decoded[fname] = [] + class SecurityDomainKeyComponent: """Representation of a key-component of a key for a security domain.""" -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37732?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I8f29e72d387c66c99ceccffc9de23a68fd15dc46 Gerrit-Change-Number: 37732 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

11 months

1
0
0 0

[S] Change in libosmo-gprs[master]: gmm: Rename gmm_prim_test -> gmm_prim_ms_test

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/37725?usp=email ) Change subject: gmm: Rename gmm_prim_test -> gmm_prim_ms_test ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/37725?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I9c7bccbf229aa2e136869baf98c5401c0dbae954 Gerrit-Change-Number: 37725 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 03 Aug 2024 12:11:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

11 months

1
0
0 0

[L] Change in libosmo-gprs[master]: gmm: Introduce interface GMMBSSGP

by fixeria

Attention is currently required from: lynxis lazus, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/37724?usp=email ) Change subject: gmm: Introduce interface GMMBSSGP ...................................................................... Patch Set 1: (1 comment) File include/osmocom/gprs/gmm/gmm_prim.h: https://gerrit.osmocom.org/c/libosmo-gprs/+/37724/comment/f4c46b05_fdd8dfc9 PS1, Line 369: /* Alloc primitive for GMMBSSGP SAP: */ As was discussed, let's just expose a generic alloc API and let the user fill prim specific fields using designated initializers (or whatever they like). Long function names with dozens of params are not nice, and it gets even worse when you add new fields to prims. AFAIR, we wanted to rework the existing API, so let's not add even more APIs which are to be removed. -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/37724?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I39045833fd43cfe98cb1a3812fbce3fdcaae6dc6 Gerrit-Change-Number: 37724 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Sat, 03 Aug 2024 11:56:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

11 months

1
0
0 0

[S] Change in ...osmo-s1gw[master]: contrib/jenkins.sh: increase EUnit verbosity

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37731?usp=email ) Change subject: contrib/jenkins.sh: increase EUnit verbosity ...................................................................... contrib/jenkins.sh: increase EUnit verbosity Change-Id: I3d2dfab52ad41b693d89ef9e8b99df5014b999cf --- M Makefile M contrib/jenkins.sh 2 files changed, 12 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/31/37731/1 diff --git a/Makefile b/Makefile index 4482b2c..fdf454f 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ CONFIG ?= config/sys.config +EUNIT_ARGS ?= all: build @@ -18,7 +19,7 @@ rebar3 shell --config $(CONFIG) check: $(GEN_FILES) - rebar3 eunit + rebar3 eunit $(EUNIT_ARGS) analyze: $(GEN_FILES) rebar3 dialyzer diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index c738791..89c8b91 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -2,5 +2,5 @@ make clean make -make check +make check EUNIT_ARGS="-v" make analyze -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37731?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I3d2dfab52ad41b693d89ef9e8b99df5014b999cf Gerrit-Change-Number: 37731 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

11 months

1
0
0 0

[S] Change in ...osmo-s1gw[master]: Makefile: add 'install' target

by fixeria

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37728?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: Makefile: add 'install' target ...................................................................... Makefile: add 'install' target Change-Id: If4901adb648c98d52dbc0abd97413c20503fb278 --- M Makefile 1 file changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/28/37728/2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37728?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: If4901adb648c98d52dbc0abd97413c20503fb278 Gerrit-Change-Number: 37728 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

11 months

1
0
0 0

[S] Change in ...osmo-s1gw[master]: contrib: add systemd unit file

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37729?usp=email ) Change subject: contrib: add systemd unit file ...................................................................... contrib: add systemd unit file Change-Id: I8417821d2d8ead0ab1bcea87ee40a16c1b98ce69 --- M Makefile A contrib/systemd/osmo-s1gw.service 2 files changed, 31 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/29/37729/1 diff --git a/Makefile b/Makefile index 004e189..7fed821 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,7 @@ # directory paths for 'install' BINDIR ?= /usr/bin CONFDIR ?= /etc/osmocom +SYSTEMDUNITDIR ?= /lib/systemd/system/ all: build @@ -30,8 +31,10 @@ install: build install -d $(DESTDIR)$(BINDIR) install -d $(DESTDIR)$(CONFDIR) + install -d $(DESTDIR)$(SYSTEMDUNITDIR) install -m 0755 _build/default/bin/osmo-s1gw $(DESTDIR)$(BINDIR) install -m 0644 -T config/sys.config $(DESTDIR)$(CONFDIR)/osmo-s1gw.config + install -m 0644 contrib/systemd/osmo-s1gw.service $(DESTDIR)$(SYSTEMDUNITDIR) clean: # Avoid running rebar3 clean if _build doesn't exist, since it would try diff --git a/contrib/systemd/osmo-s1gw.service b/contrib/systemd/osmo-s1gw.service new file mode 100644 index 0000000..f19354a --- /dev/null +++ b/contrib/systemd/osmo-s1gw.service @@ -0,0 +1,19 @@ +[Unit] +Description=Osmocom S1 Gateway +After=network-online.target +Wants=network-online.target + +[Service] +Type=simple +Restart=always +StateDirectory=osmo-s1gw +WorkingDirectory=%S/osmo-s1gw +User=osmocom +Group=osmocom +Environment="HOME=/var/lib/osmo-s1gw" +Environment="ERL_FLAGS=-config /etc/osmocom/osmo-s1gw.config" +ExecStart=/usr/bin/osmo-s1gw foreground +RestartSec=2 + +[Install] +WantedBy=multi-user.target -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37729?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I8417821d2d8ead0ab1bcea87ee40a16c1b98ce69 Gerrit-Change-Number: 37729 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

11 months

1
0
0 0

[S] Change in ...osmo-s1gw[master]: Makefile: add 'install' target

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37728?usp=email ) Change subject: Makefile: add 'install' target ...................................................................... Makefile: add 'install' target Change-Id: If4901adb648c98d52dbc0abd97413c20503fb278 --- M Makefile 1 file changed, 19 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/28/37728/1 diff --git a/Makefile b/Makefile index 4482b2c..004e189 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,8 @@ +# config file used by 'run' and 'shell' CONFIG ?= config/sys.config +# directory paths for 'install' +BINDIR ?= /usr/bin +CONFDIR ?= /etc/osmocom all: build @@ -23,6 +27,12 @@ analyze: $(GEN_FILES) rebar3 dialyzer +install: build + install -d $(DESTDIR)$(BINDIR) + install -d $(DESTDIR)$(CONFDIR) + install -m 0755 _build/default/bin/osmo-s1gw $(DESTDIR)$(BINDIR) + install -m 0644 -T config/sys.config $(DESTDIR)$(CONFDIR)/osmo-s1gw.config + clean: # Avoid running rebar3 clean if _build doesn't exist, since it would try # to fetch deps from the Internet and that may not be avaialble when in -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37728?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: If4901adb648c98d52dbc0abd97413c20503fb278 Gerrit-Change-Number: 37728 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2024