Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
spbro
OpenXG-RAN
Commits
336d92a0
Commit
336d92a0
authored
May 27, 2024
by
Fredrik Molander
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
change back to org database, removed patch nvip
parent
8e6b47c4
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
50 deletions
+2
-50
doc/tutorial_resources/oai-cn5g/database/oai_db.sql
doc/tutorial_resources/oai-cn5g/database/oai_db.sql
+0
-40
docker/Dockerfile.gNB.aerial.ubuntu20
docker/Dockerfile.gNB.aerial.ubuntu20
+1
-6
nfapi/oai_integration/aerial/fapi_vnf_p5.c
nfapi/oai_integration/aerial/fapi_vnf_p5.c
+1
-4
No files found.
doc/tutorial_resources/oai-cn5g/database/oai_db.sql
View file @
336d92a0
This diff is collapsed.
Click to expand it.
docker/Dockerfile.gNB.aerial.ubuntu20
View file @
336d92a0
...
...
@@ -47,11 +47,6 @@ COPY . .
RUN /bin/sh oaienv && \
tar -xvzf nvipc_src.*.tar.gz && \
cd nvipc_src.* && \
<<<<<<< Updated upstream
=======
# git init && \
# git apply ../cmake_targets/tools/install_libraries_to_system.patch --verbose && \
>>>>>>> Stashed changes
rm -rf build && mkdir build && cd build && \
cmake .. -DNVIPC_DPDK_ENABLE=OFF -DNVIPC_DOCA_ENABLE=OFF -DNVIPC_CUDA_ENABLE=OFF -DENABLE_SLT_RSP=ON && \
make -j && make install
...
...
@@ -104,4 +99,4 @@ COPY --from=ran-build \
WORKDIR /opt/oai-gnb
COPY --from=ran-build /tini /tini
ENTRYPOINT ["/tini", "-v", "--", "/opt/oai-gnb/bin/entrypoint.sh"]
#
CMD ["/opt/oai-gnb/bin/nr-softmodem", "-O", "/opt/oai-gnb/etc/gnb.conf"]
CMD ["/opt/oai-gnb/bin/nr-softmodem", "-O", "/opt/oai-gnb/etc/gnb.conf"]
nfapi/oai_integration/aerial/fapi_vnf_p5.c
View file @
336d92a0
...
...
@@ -55,10 +55,8 @@ void *aerial_vnf_nr_aerial_p7_start_thread(void *ptr)
void
*
aerial_vnf_nr_p7_thread_start
(
void
*
ptr
)
{
// set_thread_priority(79);
<<<<<<<
Updated
upstream
=======
int
s
;
// int s;
// cpu_set_t cpuset;
// CPU_SET(8, &cpuset);
...
...
@@ -66,7 +64,6 @@ void *aerial_vnf_nr_p7_thread_start(void *ptr)
// if (s != 0)
// printf("failed to set afinity\n");
>>>>>>>
Stashed
changes
set_priority
(
79
);
pthread_attr_t
ptAttr
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment