Merge remote-tracking branch 'origin/arm-build-pipeline' into integration_2025_w12 (!3286)

Add support for ARM build pipeline

Modify the existing python code to be able to build images where the
image tag can be prepended with a prefix, here arm_. This is preparatory
work to create the ARM build image pipeline, and reuse the existing
internal registry on porcepix to have x86 and ARM images coexist.

Fix various bugs in the build system to allow to build on a system with
as many cores as gracehopper.

Also, fix two programs (usim, nvram) to work correctly under ARM.

ci-scripts/Jenkinsfile-GitLab-Container

@@ -153,6 +153,28 @@ pipeline {
             }
           }
         }
+        stage ("Ubuntu-ARM-Image-Builder") {
+          steps {
+            script {
+              triggerSlaveJob ('RAN-Ubuntu-ARM-Image-Builder', 'Ubuntu-ARM-Image-Builder')
+            }
+          }
+          post {
+            always {
+              script {
+                // Using a unique variable name for each test stage to avoid overwriting on a global variable
+                // due to parallel-time concurrency
+                ubuntuArmBuildStatus = finalizeSlaveJob('RAN-Ubuntu-ARM-Image-Builder')
+              }
+            }
+            failure {
+              script {
+                currentBuild.result = 'FAILURE'
+                failingStages += ubuntuArmBuildStatus
+              }
+            }
+          }
+        }
         stage ("RHEL-Cluster-Image-Builder") {
           steps {
             script {

ci-scripts/cls_cluster.py

@@ -226,7 +226,7 @@ class Cluster:
 	def _undeploy_pod(self, filename):
 		self.cmd.run(f'oc delete -f {filename}')
 
-	def PullClusterImage(self, HTML, node, images):
+	def PullClusterImage(self, HTML, node, images, tag_prefix):
 		logging.debug(f'Pull OC image {images} to server {node}')
 		self.testCase_id = HTML.testCase_id
 		with cls_cmd.getConnection(node) as cmd:
@@ -242,7 +242,7 @@ class Cluster:
 				return False
 			tag = cls_containerize.CreateTag(self.ranCommitID, self.ranBranch, self.ranAllowMerge)
 			registry = f'{self.OCRegistry}/{CI_OC_RAN_NAMESPACE}'
-			success, msg = cls_containerize.Containerize.Pull_Image(cmd, images, tag, registry, None, None)
+			success, msg = cls_containerize.Containerize.Pull_Image(cmd, images, tag, tag_prefix, registry, None, None)
 			OC_logout(cmd)
 		param = f"on node {node}"
 		if success:

ci-scripts/cls_containerize.py

@@ -93,7 +93,7 @@ def CopyLogsToExecutor(cmd, sourcePath, log_name):
 		os.remove(f'./{log_name}.zip')
 	if (os.path.isdir(f'./{log_name}')):
 		shutil.rmtree(f'./{log_name}')
-	cmd.copyin(f'{sourcePath}/cmake_targets/{log_name}.zip', f'./{log_name}.zip')
+	cmd.copyin(src=f'{sourcePath}/cmake_targets/{log_name}.zip', tgt=f'{os.getcwd()}/{log_name}.zip')
 	cmd.run(f'rm -f {log_name}.zip')
 	ZipFile(f'{log_name}.zip').extractall('.')
 
@@ -359,7 +359,7 @@ class Containerize():
 		svr = self.eNB_serverId[self.eNB_instance]
 		lIpAddr, lSourcePath = self.GetCredentials(svr)
 		logging.debug('Building on server: ' + lIpAddr)
-		cmd = cls_cmd.RemoteCmd(lIpAddr)
+		cmd = cls_cmd.getConnection(lIpAddr)
 	
 		# Checking the hostname to get adapted on cli and dockerfileprefixes
 		cmd.run('hostnamectl')
@@ -407,6 +407,12 @@ class Containerize():
 		result = re.search('build_cross_arm64', self.imageKind)
 		if result is not None:
 			self.dockerfileprefix = '.ubuntu22.cross-arm64'
+		result = re.search('native_arm', self.imageKind)
+		if result is not None:
+			imageNames.append(('oai-gnb', 'gNB', 'oai-gnb', ''))
+			imageNames.append(('oai-nr-cuup', 'nr-cuup', 'oai-nr-cuup', ''))
+			imageNames.append(('oai-nr-ue', 'nrUE', 'oai-nr-ue', ''))
+			imageNames.append(('oai-gnb-aerial', 'gNB.aerial', 'oai-gnb-aerial', ''))
 		
 		self.testCase_id = HTML.testCase_id
 		cmd.cd(lSourcePath)
@@ -491,10 +497,10 @@ class Containerize():
 			elif image != 'ran-build':
 				cmd.run(f'sed -i -e "s#ran-build:latest#ran-build:{imageTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}')
 			if image == 'oai-gnb-aerial':
-				cmd.run('cp -f /opt/nvidia-ipc/nvipc_src.2024.05.23.tar.gz .')
+				cmd.run('cp -f /opt/nvidia-ipc/nvipc_src.*.tar.gz .')
 			ret = cmd.run(f'{self.cli} build {self.cliBuildOptions} --target {image} --tag {name}:{imageTag} --file docker/Dockerfile.{pattern}{self.dockerfileprefix} {option} . > cmake_targets/log/{name}.log 2>&1', timeout=1200)
 			if image == 'oai-gnb-aerial':
-				cmd.run('rm -f nvipc_src.2024.05.23.tar.gz')
+				cmd.run('rm -f nvipc_src.*.tar.gz')
 			if image == 'ran-build' and ret.returncode == 0:
 				cmd.run(f"docker run --name test-log -d {name}:{imageTag} /bin/true")
 				cmd.run(f"docker cp test-log:/oai-ran/cmake_targets/log/ cmake_targets/log/{name}/")
@@ -720,9 +726,9 @@ class Containerize():
 			HTML.CreateHtmlTabFooter(False)
 			return False
 
-	def Push_Image_to_Local_Registry(self, HTML, svr_id):
+	def Push_Image_to_Local_Registry(self, HTML, svr_id, tag_prefix=""):
 		lIpAddr, lSourcePath = self.GetCredentials(svr_id)
-		logging.debug('Pushing images from server: ' + lIpAddr)
+		logging.debug('Pushing images to server: ' + lIpAddr)
 		ssh = cls_cmd.getConnection(lIpAddr)
 		imagePrefix = 'porcepix.sboai.cs.eurecom.fr'
 		ret = ssh.run(f'docker login -u oaicicd -p oaicicd {imagePrefix}')
@@ -737,7 +743,7 @@ class Containerize():
 		if self.ranAllowMerge:
 			orgTag = 'ci-temp'
 		for image in IMAGES:
-			tagToUse = CreateTag(self.ranCommitID, self.ranBranch, self.ranAllowMerge)
+			tagToUse = tag_prefix + CreateTag(self.ranCommitID, self.ranBranch, self.ranAllowMerge)
 			imageTag = f"{image}:{tagToUse}"
 			ret = ssh.run(f'docker image tag {image}:{orgTag} {imagePrefix}/{imageTag}')
 			if ret.returncode != 0:
@@ -751,9 +757,10 @@ class Containerize():
 				return False
 			# Creating a develop tag on the local private registry
 			if not self.ranAllowMerge:
-				ssh.run(f'docker image tag {image}:{orgTag} {imagePrefix}/{image}:develop')
+				devTag = f"{tag_prefix}develop"
-				ssh.run(f'docker push {imagePrefix}/{image}:develop')
+				ssh.run(f'docker image tag {image}:{orgTag} {imagePrefix}/{image}:{devTag}')
-				ssh.run(f'docker rmi {imagePrefix}/{image}:develop')
+				ssh.run(f'docker push {imagePrefix}/{image}:{devTag}')
+				ssh.run(f'docker rmi {imagePrefix}/{image}:{devTag}')
 			ssh.run(f'docker rmi {imagePrefix}/{imageTag} {image}:{orgTag}')
 
 		ret = ssh.run(f'docker logout {imagePrefix}')
@@ -768,7 +775,7 @@ class Containerize():
 		HTML.CreateHtmlTestRow('N/A', 'OK', CONST.ALL_PROCESSES_OK)
 		return True
 
-	def Pull_Image(cmd, images, tag, registry, username, password):
+	def Pull_Image(cmd, images, tag, tag_prefix, registry, username, password):
 		if username is not None and password is not None:
 			logging.info(f"logging into registry {username}@{registry}")
 			response = cmd.run(f'docker login -u {username} -p {password} {registry}', silent=True, reportNonZero=False)
@@ -778,14 +785,15 @@ class Containerize():
 				return False, msg
 		pulled_images = []
 		for image in images:
+			imagePrefTag = f"{image}:{tag_prefix}{tag}"
 			imageTag = f"{image}:{tag}"
-			response = cmd.run(f'docker pull {registry}/{imageTag}')
+			response = cmd.run(f'docker pull {registry}/{imagePrefTag}')
 			if response.returncode != 0:
-				msg = f'Could not pull {image} from local registry: {imageTag}'
+				msg = f'Could not pull {image} from local registry: {imagePrefTag}'
 				logging.error(msg)
 				return False, msg
-			cmd.run(f'docker tag {registry}/{imageTag} oai-ci/{imageTag}')
+			cmd.run(f'docker tag {registry}/{imagePrefTag} oai-ci/{imageTag}')
-			cmd.run(f'docker rmi {registry}/{imageTag}')
+			cmd.run(f'docker rmi {registry}/{imagePrefTag}')
 			pulled_images += [f"oai-ci/{imageTag}"]
 		if username is not None and password is not None:
 			response = cmd.run(f'docker logout {registry}')
@@ -793,13 +801,13 @@ class Containerize():
 		msg = "Pulled Images:\n" + '\n'.join(pulled_images)
 		return True, msg
 
-	def Pull_Image_from_Registry(self, HTML, svr_id, images, tag=None, registry="porcepix.sboai.cs.eurecom.fr", username="oaicicd", password="oaicicd"):
+	def Pull_Image_from_Registry(self, HTML, svr_id, images, tag=None, tag_prefix="", registry="porcepix.sboai.cs.eurecom.fr", username="oaicicd", password="oaicicd"):
 		lIpAddr, lSourcePath = self.GetCredentials(svr_id)
 		logging.debug('\u001B[1m Pulling image(s) on server: ' + lIpAddr + '\u001B[0m')
 		if not tag:
 			tag = CreateTag(self.ranCommitID, self.ranBranch, self.ranAllowMerge)
 		with cls_cmd.getConnection(lIpAddr) as cmd:
-			success, msg = Containerize.Pull_Image(cmd, images, tag, registry, username, password)
+			success, msg = Containerize.Pull_Image(cmd, images, tag, tag_prefix, registry, username, password)
 		param = f"on node {lIpAddr}"
 		if success:
 			HTML.CreateHtmlTestRowQueue(param, 'OK', [msg])

ci-scripts/main.py

@@ -387,20 +387,22 @@ def ExecuteActionWithParam(action):
 
 	elif action == 'Push_Local_Registry':
 		svr_id = test.findtext('svr_id')
-		success = CONTAINERS.Push_Image_to_Local_Registry(HTML, svr_id)
+		tag_prefix = test.findtext('tag_prefix') or ""
+		success = CONTAINERS.Push_Image_to_Local_Registry(HTML, svr_id, tag_prefix)
 
 	elif action == 'Pull_Local_Registry' or action == 'Clean_Test_Server_Images':
 		if force_local:
 			# Do not pull or remove images when running locally. User is supposed to handle image creation & cleanup
 			return True
 		svr_id = test.findtext('svr_id')
+		tag_prefix = test.findtext('tag_prefix') or ""
 		images = test.findtext('images').split()
 		# hack: for FlexRIC, we need to overwrite the tag to use
 		tag = None
 		if len(images) == 1 and images[0] == "oai-flexric":
 			tag = CONTAINERS.flexricTag
 		if action == "Pull_Local_Registry":
-			success = CONTAINERS.Pull_Image_from_Registry(HTML, svr_id, images, tag=tag)
+			success = CONTAINERS.Pull_Image_from_Registry(HTML, svr_id, images, tag=tag, tag_prefix=tag_prefix)
 		if action == "Clean_Test_Server_Images":
 			success = CONTAINERS.Clean_Test_Server_Images(HTML, svr_id, images, tag=tag)
 
@@ -420,9 +422,10 @@ def ExecuteActionWithParam(action):
 		success = cls_oaicitest.Custom_Script(HTML, node, script, command_fail)
 
 	elif action == 'Pull_Cluster_Image':
+		tag_prefix = test.findtext('tag_prefix') or ""
 		images = test.findtext('images').split()
 		node = test.findtext('node')
-		success = CLUSTER.PullClusterImage(HTML, node, images)
+		success = CLUSTER.PullClusterImage(HTML, node, images, tag_prefix=tag_prefix)
 
 	else:
 		logging.warning(f"unknown action {action}, skip step")

ci-scripts/xml_files/container_image_build_arm.xml

@@ -0,0 +1,55 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+	<htmlTabRef>build-tab</htmlTabRef>
+	<htmlTabName>Build Container Images for ARM</htmlTabName>
+	<htmlTabIcon>wrench</htmlTabIcon>
+	<TestCaseRequestedList>
+ 800813
+ 000001
+ 000010
+	</TestCaseRequestedList>
+	<TestCaseExclusionList></TestCaseExclusionList>
+
+	<testCase id="800813">
+		<class>Create_Workspace</class>
+		<desc>Create new Workspace for server 0</desc>
+		<eNB_instance>0</eNB_instance>
+		<eNB_serverId>0</eNB_serverId>
+	</testCase>
+	<testCase id="000001">
+		<class>Build_Image</class>
+		<desc>Build all Images</desc>
+		<kind>native_arm</kind>
+		<eNB_instance>0</eNB_instance>
+		<eNB_serverId>0</eNB_serverId>
+	</testCase>
+
+        <testCase id="000010">
+                <class>Push_Local_Registry</class>
+                <desc>Push Images to Local Registry</desc>
+                <svr_id>0</svr_id>
+                <tag_prefix>arm_</tag_prefix>
+        </testCase>
+
+</testCaseList>

ci-scripts/xml_files/container_sa_gh_aerial_quectel.xml

@@ -0,0 +1,49 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+        <htmlTabRef>TEST-GH-AERIAL-SA</htmlTabRef>
+        <htmlTabName>Gracehopper AERIAL 100 MHz TDD SA</htmlTabName>
+        <htmlTabIcon>tasks</htmlTabIcon>
+        <TestCaseRequestedList>
+                111111
+                333333
+        </TestCaseRequestedList>
+        <TestCaseExclusionList></TestCaseExclusionList>
+
+        <testCase id="111111">
+                <class>Pull_Local_Registry</class>
+                <desc>Pull Images from Local Registry</desc>
+                <svr_id>0</svr_id>
+                <images>oai-gnb-aerial</images>
+		<tag_prefix>arm_</tag_prefix>
+        </testCase>
+
+        <testCase id="333333">
+                <class>Clean_Test_Server_Images</class>
+                <always_exec>true</always_exec>
+                <desc>Clean Test Images on Test Server</desc>
+                <svr_id>0</svr_id>
+                <images>oai-gnb-aerial</images>
+        </testCase>
+</testCaseList>
+

common/utils/LOG/CMakeLists.txt

@@ -1,10 +1,15 @@
+add_library(log_headers INTERFACE)
+target_include_directories(log_headers INTERFACE .)
+target_link_libraries(log_headers INTERFACE T_headers)
+
 set(log_sources log.c)
 if (ENABLE_LTTNG)
   set(log_sources ${log_sources} lttng-tp.c)
 endif()
 add_library(LOG ${log_sources})
 target_include_directories(LOG PUBLIC .)
-target_link_libraries(LOG PRIVATE ${T_LIB})
+target_link_libraries(LOG PRIVATE CONFIG_LIB)
+target_link_libraries(LOG PUBLIC log_headers)
 if (ENABLE_LTTNG)
   target_link_libraries(LOG PUBLIC lttng-ust)
 endif()

common/utils/T/CMakeLists.txt

@@ -49,7 +49,7 @@ add_custom_target(generate_T DEPENDS T_IDs.h check_vcd)
 # headers have really been created, we make this headers library explicitly
 # depend on the generated headers.
 add_library(T_headers INTERFACE)
-add_dependencies(T_headers T_IDs.h T_messages.txt.h)
+add_dependencies(T_headers T_IDs.h generate_T)
 target_include_directories(T_headers INTERFACE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
 
 if(T_TRACER)

doc/TESTBenches.md

@@ -25,6 +25,7 @@
 | aerial2       | 172.21.16.131   | CI-Aerial2-Usage      | gNB (PNF/Nvidia CUBB + VNF) | Foxconn RU, _Nvidia Aerial SDK integrated_   |
 | cacofonix     | 172.21.16.150   | CI-Cacofonix-Usage    | gNB (n78, FHI7.2)  |                                                       |
 | matix         | 172.21.19.58    | CI-Matix-Usage        | gNB (n77)          | N310                                                  |
+| gracehopper1-oai | --           | Gracehopper1          | build, gNB/Aerial  | _Nvidia Aerial SDK integrated_                        |
 
 Note: The available resources, and their current usage, is indicated here:
 - [Lockable resources of jenkins-oai](https://jenkins-oai.eurecom.fr/lockable-resources/):
@@ -122,6 +123,15 @@ information on how the images are built.
     - target image from `Dockerfile.lteUE.ubuntu22`
     - target image from `Dockerfile.lteRU.ubuntu22`
   - build unit tests from `ci-scripts/docker/Dockerfile.unittest.ubuntu22`, and run them
+- [RAN-Ubuntu-ARM-Image-Builder](https://jenkins-oai.eurecom.fr/job/RAN-Ubuntu-ARM-Image-Builder/)
+  ~BUILD-ONLY ~4G-LTE ~5G-NR
+  - gracehopper1-oai: ARM Ubuntu 22 image build using docker
+  - base image from `Dockerfile.base.ubuntu22`
+  - build image from `Dockerfile.build.ubuntu22`, followed by
+    - target image from `Dockerfile.gNB.ubuntu22`
+    - target image from `Dockerfile.nr-cuup.ubuntu22`
+    - target image from `Dockerfile.nrUE.ubuntu22`
+    - target image from `Dockerfile.gNB.aerial.ubuntu22`
 
 #### Image Test pipelines
 

docker/Dockerfile.gNB.ubuntu22

@@ -77,7 +77,18 @@ RUN apt-get update && \
 # library version. Installing it above would install the wrong version. Hence,
 # copy the right version from ran-build. When upgrading to Ubuntu24, install
 # the correct one above!
-COPY --from=gnb-build /usr/lib/x86_64-linux-gnu/libasan.so.8.0.0 /usr/lib/x86_64-linux-gnu/
+# note: this dockerfile should work for both x86 and arm, hence the glob below
+# which should either match "x86_64" (x86) or "aarch64" (ARM); since the target
+# directory needs to be also one of those two, but globs don't work in target
+# directories, work around this with mv
+COPY --from=gnb-build /usr/lib/*-linux-gnu/libasan.so.8.0.0 /usr/lib/
+ARG TARGETPLATFORM
+RUN case "${TARGETPLATFORM}" in \
+         "linux/amd64")  TARGET_DIR=x86_64-linux-gnu  ;; \
+         "linux/arm64")  TARGET_DIR=aarch64-linux-gnu  ;; \
+         *) exit 1 ;; \
+    esac; \
+    mv /usr/lib/libasan.so.8.0.0 /usr/lib/$TARGET_DIR/libasan.so.8.0.0
 
 WORKDIR /opt/oai-gnb/bin
 COPY --from=gnb-build \

docker/Dockerfile.nr-cuup.ubuntu22

@@ -54,7 +54,18 @@ RUN apt-get update && \
 # library version. Installing it above would install the wrong version. Hence,
 # copy the right version from ran-build. When upgrading to Ubuntu24, install
 # the correct one above!
-COPY --from=gnb-build /usr/lib/x86_64-linux-gnu/libasan.so.8.0.0 /usr/lib/x86_64-linux-gnu/
+# note: this dockerfile should work for both x86 and arm, hence the glob below
+# which should either match "x86_64" (x86) or "aarch64" (ARM); since the target
+# directory needs to be also one of those two, but globs don't work in target
+# directories, work around this with mv
+COPY --from=gnb-build /usr/lib/*-linux-gnu/libasan.so.8.0.0 /usr/lib/
+ARG TARGETPLATFORM
+RUN case "${TARGETPLATFORM}" in \
+         "linux/amd64")  TARGET_DIR=x86_64-linux-gnu  ;; \
+         "linux/arm64")  TARGET_DIR=aarch64-linux-gnu  ;; \
+         *) exit 1 ;; \
+    esac; \
+    mv /usr/lib/libasan.so.8.0.0 /usr/lib/$TARGET_DIR/libasan.so.8.0.0
 ## Copy E2 SM models
 COPY --from=gnb-build /usr/local/lib/flexric /usr/local/lib/flexric
 

docker/Dockerfile.nrUE.ubuntu22

@@ -77,7 +77,18 @@ RUN apt-get update && \
 # library version. Installing it above would install the wrong version. Hence,
 # copy the right version from ran-build. When upgrading to Ubuntu24, install
 # the correct one above!
-COPY --from=nr-ue-build /usr/lib/x86_64-linux-gnu/libasan.so.8.0.0 /usr/lib/x86_64-linux-gnu/
+# note: this dockerfile should work for both x86 and arm, hence the glob below
+# which should either match "x86_64" (x86) or "aarch64" (ARM); since the target
+# directory needs to be also one of those two, but globs don't work in target
+# directories, work around this with mv
+COPY --from=nr-ue-build /usr/lib/*-linux-gnu/libasan.so.8.0.0 /usr/lib/
+ARG TARGETPLATFORM
+RUN case "${TARGETPLATFORM}" in \
+         "linux/amd64")  TARGET_DIR=x86_64-linux-gnu  ;; \
+         "linux/arm64")  TARGET_DIR=aarch64-linux-gnu  ;; \
+         *) exit 1 ;; \
+    esac; \
+    mv /usr/lib/libasan.so.8.0.0 /usr/lib/$TARGET_DIR/libasan.so.8.0.0
 
 WORKDIR /opt/oai-nr-ue/bin
 COPY --from=nr-ue-build \

openair1/PHY/CODING/CMakeLists.txt

@@ -7,6 +7,8 @@ add_library(coding MODULE
             3gpplte_turbo_decoder.c
 )
 set_target_properties(coding PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+#ensure that the T header files are generated before targets depending on them
+target_link_libraries(coding PRIVATE log_headers)
 
 add_library(ldpc_orig MODULE
             nrLDPC_decoder/nrLDPC_decoder.c

openair3/NAS/COMMON/IES/CMakeLists.txt

@@ -4,3 +4,4 @@ add_library(nas_common_ies_lib OBJECT
 )
 
 target_include_directories(nas_common_ies_lib PUBLIC .)
+target_link_libraries(nas_common_ies_lib PUBLIC log_headers)

openair3/NAS/COMMON/UTIL/CMakeLists.txt

@@ -2,5 +2,6 @@ add_library(nas_utils OBJECT
     TLVDecoder.c
     OctetString.c
 )
+target_link_libraries(nas_utils PUBLIC log_headers)
 
 target_include_directories(nas_utils PRIVATE .)

openair3/NAS/NR_UE/5GS/5GMM/IES/CMakeLists.txt

@@ -8,6 +8,7 @@ add_library(fgs_5gmm_ies_lib OBJECT
   SORTransparentContainer.c
 )
 
-target_link_libraries(fgs_5gmm_ies_lib PUBLIC
+target_link_libraries(fgs_5gmm_ies_lib
-    nas_common_ies_lib
+	                PUBLIC nas_common_ies_lib
+			PRIVATE log_headers
 )

openair3/NAS/NR_UE/5GS/5GSM/MSG/CMakeLists.txt

@@ -1,6 +1,6 @@
 add_library(fgs_5gsm_lib OBJECT PduSessionEstablishRequest.c
                             PduSessionEstablishmentAccept.c)
 
-target_link_libraries(fgs_5gsm_lib PUBLIC nas_common_ies_lib)
+target_link_libraries(fgs_5gsm_lib PUBLIC nas_common_ies_lib log_headers)
 
 target_include_directories(fgs_5gsm_lib PUBLIC . ../../)

openair3/NAS/TOOLS/nvram.c

@@ -69,7 +69,7 @@ int main (int argc, char * const argv[])
     {NULL,     0,           NULL, 0}
   };
   int option_index;
-  char option_short;
+  int option_short;
 
   /*
    * Read command line parameters
@@ -94,6 +94,8 @@ int main (int argc, char * const argv[])
         output_dir = optarg;
         break;
       default:
+        fprintf(stderr, "unknown option %d, exit\n", option_short);
+        exit(1);
         break;
     }
   }

openair3/NAS/TOOLS/usim.c

@@ -69,7 +69,7 @@ int main (int argc, char * const argv[])
     {NULL,     0,           NULL, 0}
   };
   int option_index;
-  char option_short;
+  int option_short;
 
   /*
    * Read command line parameters
@@ -94,6 +94,8 @@ int main (int argc, char * const argv[])
         output_dir = optarg;
         break;
       default:
+        fprintf(stderr, "unknown option %d, exit\n", option_short);
+        exit(1);
         break;
     }
   }

openair3/NAS/UE/API/USIM/CMakeLists.txt

@@ -3,6 +3,7 @@ add_library(usim_lib OBJECT
     aka_functions.c
     usim_api.c
 )
+target_link_libraries(usim_lib PRIVATE log_headers)
 
 target_include_directories(usim_lib PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}

openair3/UICC/CMakeLists.txt

@@ -1,2 +1,3 @@
 add_library(lib_uicc OBJECT usim_interface.c)
 target_include_directories(lib_uicc PRIVATE .)
+target_link_libraries(lib_uicc PRIVATE log_headers)