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

[S] Change in docker-playground[master]: s1gw: add osmo-s1gw-master

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/37229?usp=email ) Change subject: s1gw: add osmo-s1gw-master ...................................................................... s1gw: add osmo-s1gw-master Change-Id: Ic732f57940fa41fe21a26af663fea559551b1811 Related: SYS#6772 --- M jenkins-common.sh A osmo-s1gw-master/Dockerfile A osmo-s1gw-master/Makefile A osmo-s1gw-master/osmo-s1gw.config 4 files changed, 38 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/jenkins-common.sh b/jenkins-common.sh index 5703675..8ec6b29 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -24,6 +24,7 @@ osmo-*-asan) echo "debian-$DEBIAN_DEFAULT-obs-asan" ;; osmo_dia2gsup-*) echo "debian-$DEBIAN_DEFAULT-erlang" ;; osmo-epdg-*) echo "debian-$DEBIAN_DEFAULT-erlang" ;; + osmo-s1gw-*) echo "debian-$DEBIAN_DEFAULT-erlang" ;; osmo-*) echo "debian-$DEBIAN_DEFAULT-build" ;; open5gs-master) echo "debian-$DEBIAN_DEFAULT-build" ;; ttcn3-*) echo "debian-bookworm-titan" ;; diff --git a/osmo-s1gw-master/Dockerfile b/osmo-s1gw-master/Dockerfile new file mode 100644 index 0000000..34028f8 --- /dev/null +++ b/osmo-s1gw-master/Dockerfile @@ -0,0 +1,24 @@ +ARG USER +ARG DISTRO +FROM $USER/$DISTRO-erlang +# Arguments used after FROM must be specified again +ARG DISTRO + +WORKDIR /tmp + +ARG OSMO_S1GW_BRANCH="master" + +RUN git clone https://gerrit.osmocom.org/erlang/osmo-s1gw.git +ADD https://gerrit.osmocom.org/plugins/gitiles/erlang/osmo-s1gw/+/$OSMO_S1GW_BR… /tmp/commit-osmo-s1gw + +RUN cd osmo-s1gw && \ + git fetch && git checkout $OSMO_S1GW_BRANCH && \ + (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_S1GW_BRANCH || exit 1); \ + git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ + make build + +VOLUME /data + +COPY osmo-s1gw.config /data/osmo-s1gw.config + +CMD ["/bin/sh", "-c", "ERL_FLAGS='-config /data/osmo-s1gw.config' /tmp/osmo-s1gw/_build/default/bin/osmo-s1gw > /data/osmo-s1gw.log 2>&1"] diff --git a/osmo-s1gw-master/Makefile b/osmo-s1gw-master/Makefile new file mode 100644 index 0000000..8d0e10b --- /dev/null +++ b/osmo-s1gw-master/Makefile @@ -0,0 +1 @@ +include ../make/Makefile diff --git a/osmo-s1gw-master/osmo-s1gw.config b/osmo-s1gw-master/osmo-s1gw.config new file mode 100644 index 0000000..ef48a29 --- /dev/null +++ b/osmo-s1gw-master/osmo-s1gw.config @@ -0,0 +1,2 @@ +[{osmo_s1gw, [ +]}]. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/37229?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ic732f57940fa41fe21a26af663fea559551b1811 Gerrit-Change-Number: 37229 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[M] Change in docker-playground[master]: s1gw: add ttcn3-s1gw-test

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/37230?usp=email ) Change subject: s1gw: add ttcn3-s1gw-test ...................................................................... s1gw: add ttcn3-s1gw-test Change-Id: I95000d7a9d778df1da830cd5059e5b6899391fbe Related: SYS#6772 --- A ttcn3-s1gw-test/Dockerfile A ttcn3-s1gw-test/Makefile A ttcn3-s1gw-test/S1GW_Tests.cfg A ttcn3-s1gw-test/jenkins.sh A ttcn3-s1gw-test/osmo-s1gw.config 5 files changed, 117 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/ttcn3-s1gw-test/Dockerfile b/ttcn3-s1gw-test/Dockerfile new file mode 100644 index 0000000..296cd02 --- /dev/null +++ b/ttcn3-s1gw-test/Dockerfile @@ -0,0 +1,14 @@ +ARG REGISTRY +ARG USER +FROM $REGISTRY/$USER/debian-bookworm-titan + +ARG OSMO_TTCN3_BRANCH="master" + +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_B… /tmp/commit +RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" s1gw + +VOLUME /data + +COPY S1GW_Tests.cfg /data/S1GW_Tests.cfg + +CMD ttcn3-docker-run s1gw S1GW_Tests diff --git a/ttcn3-s1gw-test/Makefile b/ttcn3-s1gw-test/Makefile new file mode 100644 index 0000000..8d0e10b --- /dev/null +++ b/ttcn3-s1gw-test/Makefile @@ -0,0 +1 @@ +include ../make/Makefile diff --git a/ttcn3-s1gw-test/S1GW_Tests.cfg b/ttcn3-s1gw-test/S1GW_Tests.cfg new file mode 100644 index 0000000..a831fa8 --- /dev/null +++ b/ttcn3-s1gw-test/S1GW_Tests.cfg @@ -0,0 +1,16 @@ +[ORDERED_INCLUDE] +"/osmo-ttcn3-hacks/Common.cfg" +"/osmo-ttcn3-hacks/s1gw/S1GW_Tests.default" + +[LOGGING] + +[TESTPORT_PARAMETERS] + +[MODULE_PARAMETERS] +S1GW_Tests.mp_s1gw_ip := "172.18.10.100"; +S1GW_Tests.mp_mme_bind_ip := "172.18.10.101"; + +[MAIN_CONTROLLER] + +[EXECUTE] +S1GW_Tests.control diff --git a/ttcn3-s1gw-test/jenkins.sh b/ttcn3-s1gw-test/jenkins.sh new file mode 100755 index 0000000..9fcf5f1 --- /dev/null +++ b/ttcn3-s1gw-test/jenkins.sh @@ -0,0 +1,42 @@ +#!/bin/sh + +. ../jenkins-common.sh +IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" +docker_images_require \ + "osmo-s1gw-$IMAGE_SUFFIX" \ + "ttcn3-s1gw-test" + +set_clean_up_trap +set -e + +mkdir $VOL_BASE_DIR/s1gw-tester +cp S1GW_Tests.cfg $VOL_BASE_DIR/s1gw-tester/ +write_mp_osmo_repo "$VOL_BASE_DIR/s1gw-tester/S1GW_Tests.cfg" + +mkdir $VOL_BASE_DIR/s1gw +cp osmo-s1gw.config $VOL_BASE_DIR/s1gw/ + +network_create +network_replace_subnet_in_configs + +echo "Starting container with osmo-s1gw" +docker run --rm \ + $(docker_network_params $SUBNET 100) \ + --ulimit core=-1 \ + -v $VOL_BASE_DIR/s1gw:/data \ + --name ${BUILD_TAG}-s1gw -d \ + $DOCKER_ARGS \ + $REPO_USER/osmo-s1gw-$IMAGE_SUFFIX + +# Give some time to osmo-s1gw to be fully started; it's a bit slow... +sleep 2 + +echo "Starting container with the S1GW testsuite" +docker run --rm \ + $(docker_network_params $SUBNET 101) \ + --ulimit core=-1 \ + -e "TTCN3_PCAP_PATH=/data" \ + -v $VOL_BASE_DIR/s1gw-tester:/data \ + --name ${BUILD_TAG}-ttcn3-s1gw-test \ + $DOCKER_ARGS \ + $REPO_USER/ttcn3-s1gw-test diff --git a/ttcn3-s1gw-test/osmo-s1gw.config b/ttcn3-s1gw-test/osmo-s1gw.config new file mode 100644 index 0000000..4dabb8f --- /dev/null +++ b/ttcn3-s1gw-test/osmo-s1gw.config @@ -0,0 +1,34 @@ +%% -*- erlang -*- + +[%% ================================================================================ + %% application config + %% + %% eNB S1GW + %% +-----+ +----------------+ + %% | ... | --> | s1gw_bind_addr | MME + %% +-----+ +----------------+ +-----------------+ + %% | mme_loc_addr | --> | mme_rem_addr | + %% +----------------+ +-----------------+ + %% ================================================================================ + {osmo_s1gw, + [{s1gw_bind_addr, "172.18.10.100"}, %% S1GW bind address for incoming eNB connections + {mme_loc_addr, "172.18.10.100"}, %% local address for outgoing connections to the MME + {mme_rem_addr, "172.18.10.101"} %% remote address for outgoing connections to the MME + ]}, + %% ================================================================================ + %% kernel config + %% ================================================================================ + {kernel, + [{logger_level, debug}, + {logger, + [{handler, default, logger_std_h, + #{level => debug, + formatter => {logger_formatter, + #{template => [time, " ", + "[", level, "] ", + {pid, ["", pid, " "], ""}, + msg, + {mfa, [" (", mfa, ":", line, ")"], ""}, + "\n"]}}}}]}]}]. + +%% vim:set ts=2 sw=2 et: -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/37230?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I95000d7a9d778df1da830cd5059e5b6899391fbe Gerrit-Change-Number: 37230 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[M] Change in docker-playground[master]: s1gw: add ttcn3-s1gw-test

by osmith

Attention is currently required from: fixeria, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/37230?usp=email ) Change subject: s1gw: add ttcn3-s1gw-test ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/37230?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I95000d7a9d778df1da830cd5059e5b6899391fbe Gerrit-Change-Number: 37230 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 17 Jun 2024 07:44:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

[S] Change in docker-playground[master]: s1gw: add osmo-s1gw-master

by osmith

Attention is currently required from: fixeria, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/37229?usp=email ) Change subject: s1gw: add osmo-s1gw-master ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/37229?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ic732f57940fa41fe21a26af663fea559551b1811 Gerrit-Change-Number: 37229 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 17 Jun 2024 07:44:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

[S] Change in osmo-msc[master]: debian/copyright: remove include/openbsc/slhc.h (no such file)

by fixeria

Attention is currently required from: neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/37236?usp=email ) Change subject: debian/copyright: remove include/openbsc/slhc.h (no such file) ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > (FTR, slhc.h lives in osmo-sgsn. […] Good to know, thank you! -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/37236?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ib1f2395798010381d67d79c46778bb0caef17046 Gerrit-Change-Number: 37236 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Mon, 17 Jun 2024 05:43:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: comment

1 year

1
0
0 0

[S] Change in osmo-msc[master]: utils/smpp_mirror: use OSMO_STRLCPY_ARRAY, fix -Wstringop-overflow

by fixeria

Attention is currently required from: neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/37239?usp=email ) Change subject: utils/smpp_mirror: use OSMO_STRLCPY_ARRAY, fix -Wstringop-overflow ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > is the warning introduced by the previous patch? No, the warning is seen when building current master (with specific gcc CFLAGs and LTO). Previous patch is fixing another thing, which I noticed while fixing this. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/37239?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: If1df370fbfbca0953abf83ea1840d8bf8a0118be Gerrit-Change-Number: 37239 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Mon, 17 Jun 2024 05:42:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: comment

1 year

1
0
0 0

[S] Change in osmo-qcdiag[master]: Makefile: gprs_l1.{c -> o} (must be an object)

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-qcdiag/+/37221?usp=email ) Change subject: Makefile: gprs_l1.{c -> o} (must be an object) ...................................................................... Makefile: gprs_l1.{c -> o} (must be an object) Change-Id: I0ca8145c5ebb801c50cd26f64c5922e2022cfad0 --- M src/Makefile 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: neels: Looks good to me, approved laforge: Looks good to me, but someone else must approve fixeria: Verified diff --git a/src/Makefile b/src/Makefile index ef1c7ed..f14f418 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2,7 +2,7 @@ LIBS ?= $(shell pkg-config --libs libosmocore qmi-glib) all: osmo-qcdiag-log -MODS_LOG = gprs_l1.c gprs_rlc.o gprs_mac.o diag_gsm.o diag_log.o diag_log_gsm.o diag_log_gprs.o diag_log_wcdma.o diag_log_umts.o diag_log_qmi.o diag_dpl.o diag_log_simcard.o diag_event.o +MODS_LOG = gprs_l1.o gprs_rlc.o gprs_mac.o diag_gsm.o diag_log.o diag_log_gsm.o diag_log_gprs.o diag_log_wcdma.o diag_log_umts.o diag_log_qmi.o diag_dpl.o diag_log_simcard.o diag_event.o osmo-qcdiag-log: diagchar_hdlc.o diag_io.o osmo-qcdiag-log.o diag_msg.o protocol.o diag_cmd.o $(MODS_LOG) $(CC) $(CPPFLAGS) -o $@ $^ $(LIBS) -- To view, visit https://gerrit.osmocom.org/c/osmo-qcdiag/+/37221?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-qcdiag Gerrit-Branch: master Gerrit-Change-Id: I0ca8145c5ebb801c50cd26f64c5922e2022cfad0 Gerrit-Change-Number: 37221 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[S] Change in osmo-qcdiag[master]: Makefile: use $(shell ...) to invoke pkg-config

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-qcdiag/+/37220?usp=email ) Change subject: Makefile: use $(shell ...) to invoke pkg-config ...................................................................... Makefile: use $(shell ...) to invoke pkg-config This way the values are evaluated by make itself (not by the shell), and can be seen in the output when running make. Change-Id: I44db058c92377b741e24c7cdf4891ae020f37ff1 --- M src/Makefile 1 file changed, 14 insertions(+), 2 deletions(-) Approvals: neels: Looks good to me, approved laforge: Looks good to me, but someone else must approve fixeria: Verified diff --git a/src/Makefile b/src/Makefile index 3591ece..ef1c7ed 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,5 +1,5 @@ -CPPFLAGS ?= -g -O0 -Wall `pkg-config --cflags libosmocore` `pkg-config --cflags qmi-glib` -LIBS ?= `pkg-config --libs libosmocore` `pkg-config --libs qmi-glib` +CPPFLAGS ?= -g -O0 -Wall $(shell pkg-config --cflags libosmocore qmi-glib) +LIBS ?= $(shell pkg-config --libs libosmocore qmi-glib) all: osmo-qcdiag-log MODS_LOG = gprs_l1.c gprs_rlc.o gprs_mac.o diag_gsm.o diag_log.o diag_log_gsm.o diag_log_gprs.o diag_log_wcdma.o diag_log_umts.o diag_log_qmi.o diag_dpl.o diag_log_simcard.o diag_event.o -- To view, visit https://gerrit.osmocom.org/c/osmo-qcdiag/+/37220?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-qcdiag Gerrit-Branch: master Gerrit-Change-Id: I44db058c92377b741e24c7cdf4891ae020f37ff1 Gerrit-Change-Number: 37220 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[S] Change in osmo-qcdiag[master]: Makefile: add explicit rule for building *.o files

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-qcdiag/+/37222?usp=email ) Change subject: Makefile: add explicit rule for building *.o files ...................................................................... Makefile: add explicit rule for building *.o files Change-Id: Ib886c0ef5fa5b1c62cb22eef017e9bf822b914b1 --- M src/Makefile 1 file changed, 13 insertions(+), 1 deletion(-) Approvals: neels: Looks good to me, approved laforge: Looks good to me, but someone else must approve fixeria: Verified diff --git a/src/Makefile b/src/Makefile index f14f418..199b712 100644 --- a/src/Makefile +++ b/src/Makefile @@ -4,8 +4,11 @@ MODS_LOG = gprs_l1.o gprs_rlc.o gprs_mac.o diag_gsm.o diag_log.o diag_log_gsm.o diag_log_gprs.o diag_log_wcdma.o diag_log_umts.o diag_log_qmi.o diag_dpl.o diag_log_simcard.o diag_event.o +%.o: %.c + $(CC) $(CPPFLAGS) -c -o $@ $^ + osmo-qcdiag-log: diagchar_hdlc.o diag_io.o osmo-qcdiag-log.o diag_msg.o protocol.o diag_cmd.o $(MODS_LOG) - $(CC) $(CPPFLAGS) -o $@ $^ $(LIBS) + $(CC) $(LIBS) -o $@ $^ clean: @rm -f osmo-qcdiag-log *.o -- To view, visit https://gerrit.osmocom.org/c/osmo-qcdiag/+/37222?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-qcdiag Gerrit-Branch: master Gerrit-Change-Id: Ib886c0ef5fa5b1c62cb22eef017e9bf822b914b1 Gerrit-Change-Number: 37222 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[S] Change in osmo-qcdiag[master]: Makefile: fix CFLAGS != CPPFLAGS, allow overriding them

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-qcdiag/+/37223?usp=email ) Change subject: Makefile: fix CFLAGS != CPPFLAGS, allow overriding them ...................................................................... Makefile: fix CFLAGS != CPPFLAGS, allow overriding them Change-Id: Id31923856915a3d2c3a03201ef8922c2129bc635 --- M src/Makefile 1 file changed, 14 insertions(+), 4 deletions(-) Approvals: fixeria: Verified neels: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/src/Makefile b/src/Makefile index 199b712..795a1ac 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,14 +1,15 @@ -CPPFLAGS ?= -g -O0 -Wall $(shell pkg-config --cflags libosmocore qmi-glib) -LIBS ?= $(shell pkg-config --libs libosmocore qmi-glib) +CFLAGS ?= -g -O0 -Wall +LIBS = libosmocore qmi-glib + all: osmo-qcdiag-log MODS_LOG = gprs_l1.o gprs_rlc.o gprs_mac.o diag_gsm.o diag_log.o diag_log_gsm.o diag_log_gprs.o diag_log_wcdma.o diag_log_umts.o diag_log_qmi.o diag_dpl.o diag_log_simcard.o diag_event.o %.o: %.c - $(CC) $(CPPFLAGS) -c -o $@ $^ + $(CC) $(shell pkg-config --cflags $(LIBS)) $(CFLAGS) -c -o $@ $^ osmo-qcdiag-log: diagchar_hdlc.o diag_io.o osmo-qcdiag-log.o diag_msg.o protocol.o diag_cmd.o $(MODS_LOG) - $(CC) $(LIBS) -o $@ $^ + $(CC) $(shell pkg-config --libs $(LIBS)) -o $@ $^ clean: @rm -f osmo-qcdiag-log *.o -- To view, visit https://gerrit.osmocom.org/c/osmo-qcdiag/+/37223?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-qcdiag Gerrit-Branch: master Gerrit-Change-Id: Id31923856915a3d2c3a03201ef8922c2129bc635 Gerrit-Change-Number: 37223 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

2025

2024

2023

2022

gerrit-log June 2024