Skip to content

Commit

Permalink
feat: Bump version to official release v2.2.0 (#12)
Browse files Browse the repository at this point in the history
  • Loading branch information
ghislainbourgeois authored Jan 20, 2025
1 parent 1a49c96 commit 35b45f9
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 104 deletions.
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@

```bash
rockcraft pack -v
sudo rockcraft.skopeo --insecure-policy copy oci-archive:oai-ran-ue_2.1.1_amd64.rock docker-daemon:oai-ran-ue:2.1.1
docker run -d oai-ran-ue:2.1.1
sudo rockcraft.skopeo --insecure-policy copy oci-archive:oai-ran-ue_2.2.0_amd64.rock docker-daemon:oai-ran-ue:2.2.0
docker run -d oai-ran-ue:2.2.0
```
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ Container image for the OAI RAN User Equipment (UE).
## Usage

```console
docker pull ghcr.io/canonical/oai-ran-ue:2.1.1
docker run -it ghcr.io/canonical/oai-ran-ue:2.1.1
docker pull ghcr.io/canonical/oai-ran-ue:2.2.0
docker run -it ghcr.io/canonical/oai-ran-ue:2.2.0
```
86 changes: 0 additions & 86 deletions patches/getaddrinfo.patch

This file was deleted.

25 changes: 11 additions & 14 deletions rockcraft.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: oai-ran-ue
base: ubuntu@22.04
version: '2.1.1'
base: ubuntu@24.04
version: '2.2.0'
summary: OAI RAN UE ROCK
license: Apache-2.0
description: Container image for the OAI RAN User Equipment (UE).
Expand All @@ -18,10 +18,10 @@ parts:
plugin: nil
source: https://gitlab.eurecom.fr/oai/openairinterface5g.git
source-type: git
source-commit: 469d58f989c47eaba42dcfad731e11355329d691
source-tag: v${CRAFT_PROJECT_VERSION}
build-environment:
- BUILD_UHD_FROM_SOURCE: "True"
- UHD_VERSION: "4.4.0.0"
- UHD_VERSION: "4.7.0.0"
overlay-packages:
- gdb
- libconfig9
Expand All @@ -32,9 +32,6 @@ parts:
- g++-12
- gcc-12
- openssl
override-pull: |
craftctl default
git apply ${CRAFT_PROJECT_DIR}/patches/getaddrinfo.patch
override-build: |
update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 100 --slave /usr/bin/g++ g++ /usr/bin/g++-12
/bin/sh oaienv
Expand All @@ -54,7 +51,7 @@ parts:
cp -r ran_build/build $CRAFT_PART_INSTALL
cp /usr/local/bin/uhd_find_devices $CRAFT_PART_INSTALL
cp /usr/local/lib/libuhd.so.4.4.0 $CRAFT_PART_INSTALL
cp /usr/local/lib/libuhd.so.4.7.0 $CRAFT_PART_INSTALL
cp -r /usr/local/share/uhd $CRAFT_PART_INSTALL
organize:
build/liboai_device.so: usr/local/lib/liboai_device.so
Expand All @@ -71,7 +68,7 @@ parts:
build/libtelnetsrv.so: usr/local/lib/libtelnetsrv.so
build/libtelnetsrv_ci.so: usr/local/lib/libtelnetsrv_ci.so
uhd/*: usr/local/share/uhd/
libuhd.so.4.4.0: usr/local/lib/libuhd.so.4.4.0
libuhd.so.4.7.0: usr/local/lib/libuhd.so.4.7.0
uhd_find_devices: usr/local/bin/uhd_find_devices
build/nr-uesoftmodem: opt/oai-gnb/bin/nr-uesoftmodem
stage:
Expand All @@ -90,8 +87,8 @@ parts:
- iproute2
- iputils-ping
- net-tools
- libboost-program-options1.74.0
- libboost-chrono1.74.0
- libboost-filesystem1.74.0
- libboost-serialization1.74.0
- libboost-thread1.74.0
- libboost-program-options1.83.0
- libboost-chrono1.83.0
- libboost-filesystem1.83.0
- libboost-serialization1.83.0
- libboost-thread1.83.0

0 comments on commit 35b45f9

Please sign in to comment.