<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-iuh/+/25959">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  pespin: Looks good to me, approved; Verified
  laforge: Looks good to me, but someone else must approve
  fixeria: Looks good to me, but someone else must approve

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">src/*/Makefile.am: Use asn1c -R to avoid generating runtime code<br><br>Change-Id: I5666a6dc1ec9e56fe133642fb0054e913265c081<br>---<br>M src/hnbap/Makefile.am<br>M src/ranap/Makefile.am<br>M src/rua/Makefile.am<br>M src/sabp/Makefile.am<br>4 files changed, 5 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/hnbap/Makefile.am b/src/hnbap/Makefile.am</span><br><span>index 7835bcd..79c0ac4 100644</span><br><span>--- a/src/hnbap/Makefile.am</span><br><span>+++ b/src/hnbap/Makefile.am</span><br><span>@@ -243,9 +243,7 @@</span><br><span> regen: regenerate-from-asn1-source</span><br><span> </span><br><span> regenerate-from-asn1-source:</span><br><span style="color: hsl(0, 100%, 40%);">-     asn1c -gen-PER -fnative-types $(HNBAP_ASN1)/HNBAP-CommonDataTypes.asn $(HNBAP_ASN1)/HNBAP-Constants.asn $(HNBAP_ASN1)/HNBAP-IEs.asn $(HNBAP_ASN1)/HNBAP-PDU.asn</span><br><span style="color: hsl(0, 100%, 40%);">-#        remove the local copy of the runtime code</span><br><span style="color: hsl(0, 100%, 40%);">-       -rm ANY.* BOOLEAN.* INTEGER.* NativeEnumerated.* NativeInteger.* OBJECT_IDENTIFIER.* asn_* OCTET_STRING.* converter-sample.c per_* xer_* constr* der_* ber_* BIT_STRING.*</span><br><span style="color: hsl(120, 100%, 40%);">+     asn1c -R -gen-PER -fnative-types $(HNBAP_ASN1)/HNBAP-CommonDataTypes.asn $(HNBAP_ASN1)/HNBAP-Constants.asn $(HNBAP_ASN1)/HNBAP-IEs.asn $(HNBAP_ASN1)/HNBAP-PDU.asn</span><br><span> # change include style to `#include <dir/foo.h>'</span><br><span>     $(top_srcdir)/move-asn1-header-files.sh osmocom/hnbap $(ASN_MODULE_INC)</span><br><span> #    Finally copy *.c from buildir to srcdir:</span><br><span>diff --git a/src/ranap/Makefile.am b/src/ranap/Makefile.am</span><br><span>index 4ba3a79..d5dc4fc 100644</span><br><span>--- a/src/ranap/Makefile.am</span><br><span>+++ b/src/ranap/Makefile.am</span><br><span>@@ -1169,10 +1169,8 @@</span><br><span> regen: regenerate-from-asn1-source</span><br><span> </span><br><span> regenerate-from-asn1-source:</span><br><span style="color: hsl(0, 100%, 40%);">-    ASN1C_PREFIX="RANAP_" asn1c -gen-PER $(top_srcdir)/asn1/ranap/RANAP-CommonDataTypes.asn $(top_srcdir)/asn1/ranap/RANAP-Constants.asn $(top_srcdir)/asn1/ranap/RANAP-IEs.asn $(top_srcdir)/asn1/ranap/RANAP-PDU.asn</span><br><span style="color: hsl(0, 100%, 40%);">-    @rm ANY.* BOOLEAN.* INTEGER.* NativeEnumerated.* NativeInteger.* NULL.* OBJECT_IDENTIFIER.* asn_* OCTET_STRING.* converter-sample.c per_* xer_* constr* der_* ber_* BIT_STRING.*</span><br><span style="color: hsl(0, 100%, 40%);">-#       some fixups in erroneous code that asn1c generates</span><br><span style="color: hsl(0, 100%, 40%);">-      sed -i '6i#include <constr_CHOICE.h>' RANAP_ChosenEncryptionAlgorithm.h RANAP_ChosenIntegrityProtectionAlgorithm.h RANAP_IMSI.h RANAP_PLMNidentity.h RANAP_RAB-ReleaseFailedList.c RANAP_RAB-ReleaseList.c RANAP_RAB-SetupOrModifyList.c RANAP_ResetResourceList.c RANAP_ResetResourceAckList.c</span><br><span style="color: hsl(120, 100%, 40%);">+ ASN1C_PREFIX="RANAP_" asn1c -R -gen-PER $(top_srcdir)/asn1/ranap/RANAP-CommonDataTypes.asn $(top_srcdir)/asn1/ranap/RANAP-Constants.asn $(top_srcdir)/asn1/ranap/RANAP-IEs.asn $(top_srcdir)/asn1/ranap/RANAP-PDU.asn</span><br><span style="color: hsl(120, 100%, 40%);">+       sed -i '7i#include <constr_CHOICE.h>' RANAP_ChosenEncryptionAlgorithm.h RANAP_ChosenIntegrityProtectionAlgorithm.h RANAP_IMSI.h RANAP_PLMNidentity.h RANAP_RAB-ReleaseFailedList.c RANAP_RAB-ReleaseList.c RANAP_RAB-SetupOrModifyList.c RANAP_ResetResourceList.c RANAP_ResetResourceAckList.c</span><br><span>        sed -i 's/Member/MemberA/' RANAP_LA-LIST.[ch]</span><br><span>        sed -i 's/Member/MemberB/' RANAP_RABParametersList.[ch]</span><br><span>      sed -i 's/Member/MemberC/' RANAP_AuthorisedPLMNs.[ch]</span><br><span>diff --git a/src/rua/Makefile.am b/src/rua/Makefile.am</span><br><span>index c848639..493a466 100644</span><br><span>--- a/src/rua/Makefile.am</span><br><span>+++ b/src/rua/Makefile.am</span><br><span>@@ -81,9 +81,7 @@</span><br><span> regen: regenerate-from-asn1-source</span><br><span> </span><br><span> regenerate-from-asn1-source:</span><br><span style="color: hsl(0, 100%, 40%);">-    ASN1C_PREFIX="RUA_" asn1c -gen-PER $(top_srcdir)/asn1/rua/RUA-CommonDataTypes.asn $(top_srcdir)/asn1/rua/RUA-Constants.asn $(top_srcdir)/asn1/rua/RUA-IEs.asn $(top_srcdir)/asn1/rua/RUA-PDU.asn</span><br><span style="color: hsl(0, 100%, 40%);">-#     remove the local copy of the runtime code</span><br><span style="color: hsl(0, 100%, 40%);">-       @rm ANY.* BOOLEAN.* INTEGER.* NativeEnumerated.* NativeInteger.* OBJECT_IDENTIFIER.* asn_* OCTET_STRING.* converter-sample.c per_* xer_* constr* der_* ber_* BIT_STRING.*</span><br><span style="color: hsl(120, 100%, 40%);">+     ASN1C_PREFIX="RUA_" asn1c -R -gen-PER $(top_srcdir)/asn1/rua/RUA-CommonDataTypes.asn $(top_srcdir)/asn1/rua/RUA-Constants.asn $(top_srcdir)/asn1/rua/RUA-IEs.asn $(top_srcdir)/asn1/rua/RUA-PDU.asn</span><br><span> #      change include style to `#include <dir/foo.h>'</span><br><span>     $(top_srcdir)/move-asn1-header-files.sh osmocom/rua $(ASN_MODULE_INC)</span><br><span> #      Finally copy *.c from buildir to srcdir:</span><br><span>diff --git a/src/sabp/Makefile.am b/src/sabp/Makefile.am</span><br><span>index 5e1b557..faace13 100644</span><br><span>--- a/src/sabp/Makefile.am</span><br><span>+++ b/src/sabp/Makefile.am</span><br><span>@@ -135,9 +135,7 @@</span><br><span> regen: regenerate-from-asn1-source</span><br><span> </span><br><span> regenerate-from-asn1-source:</span><br><span style="color: hsl(0, 100%, 40%);">-   ASN1C_PREFIX="SABP_" asn1c -gen-PER $(top_srcdir)/asn1/sabp/SABP-CommonDataTypes.asn $(top_srcdir)/asn1/sabp/SABP-Constants.asn $(top_srcdir)/asn1/sabp/SABP-IEs.asn $(top_srcdir)/asn1/sabp/SABP-PDU.asn</span><br><span style="color: hsl(0, 100%, 40%);">-#    remove the local copy of the runtime code</span><br><span style="color: hsl(0, 100%, 40%);">-       @rm ANY.* INTEGER.* NativeEnumerated.* NativeInteger.* asn_* OCTET_STRING.* converter-sample.c per_* xer_* constr* der_* ber_* BIT_STRING.*</span><br><span style="color: hsl(120, 100%, 40%);">+   ASN1C_PREFIX="SABP_" asn1c -R -gen-PER $(top_srcdir)/asn1/sabp/SABP-CommonDataTypes.asn $(top_srcdir)/asn1/sabp/SABP-Constants.asn $(top_srcdir)/asn1/sabp/SABP-IEs.asn $(top_srcdir)/asn1/sabp/SABP-PDU.asn</span><br><span> #     change include style to `#include <dir/foo.h>'</span><br><span>     sed -i 's/Member/MemberA/' SABP_MessageStructure.[ch]</span><br><span>        sed -i 's/Member/MemberB/' SABP_Criticality-Diagnostics.[ch]</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-iuh/+/25959">change 25959</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-iuh/+/25959"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-iuh </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I5666a6dc1ec9e56fe133642fb0054e913265c081 </div>
<div style="display:none"> Gerrit-Change-Number: 25959 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>