[PATCH] osmo-msc[master]: Add missing CFLAGS
Review at https://gerrit.osmocom.org/5138 Add missing CFLAGS Change-Id: I67b5d797a80b55e01dcdbb8c782748b049cf9199 --- M src/libcommon-cs/Makefile.am M src/libcommon/Makefile.am M src/libmsc/Makefile.am M src/libvlr/Makefile.am M src/utils/Makefile.am 5 files changed, 18 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/38/5138/1 diff --git a/src/libcommon-cs/Makefile.am b/src/libcommon-cs/Makefile.am index 21c2745..eada698 100644 --- a/src/libcommon-cs/Makefile.am +++ b/src/libcommon-cs/Makefile.am @@ -10,6 +10,8 @@ $(LIBOSMOGSM_CFLAGS) \ $(LIBOSMOVTY_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ + $(LIBOSMOSCCP_CFLAGS) \ + $(LIBOSMOMGCPCLIENT_CFLAGS) \ $(COVERAGE_CFLAGS) \ $(NULL) diff --git a/src/libcommon/Makefile.am b/src/libcommon/Makefile.am index 0b258c0..18272c5 100644 --- a/src/libcommon/Makefile.am +++ b/src/libcommon/Makefile.am @@ -10,6 +10,8 @@ $(LIBOSMOGSM_CFLAGS) \ $(LIBOSMOVTY_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ + $(LIBOSMOSCCP_CFLAGS) \ + $(LIBOSMOMGCPCLIENT_CFLAGS) \ $(COVERAGE_CFLAGS) \ $(NULL) diff --git a/src/libmsc/Makefile.am b/src/libmsc/Makefile.am index fee9f44..998df26 100644 --- a/src/libmsc/Makefile.am +++ b/src/libmsc/Makefile.am @@ -15,6 +15,7 @@ $(LIBASN1C_CFLAGS) \ $(LIBOSMOSIGTRAN_CFLAGS) \ $(LIBOSMOSCCP_CFLAGS) \ + $(LIBOSMOMGCPCLIENT_CFLAGS) \ $(NULL) noinst_HEADERS = \ diff --git a/src/libvlr/Makefile.am b/src/libvlr/Makefile.am index 17ad411..511dfc0 100644 --- a/src/libvlr/Makefile.am +++ b/src/libvlr/Makefile.am @@ -1,6 +1,14 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) -AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) \ - $(COVERAGE_CFLAGS) $(LIBCRYPTO_CFLAGS) +AM_CFLAGS= \ + -Wall \ + $(LIBOSMOCORE_CFLAGS) \ + $(LIBOSMOVTY_CFLAGS) \ + $(LIBOSMOSCCP_CFLAGS) \ + $(LIBOSMOMGCPCLIENT_CFLAGS) \ + $(LIBOSMOABIS_CFLAGS) \ + $(COVERAGE_CFLAGS) \ + $(LIBCRYPTO_CFLAGS) \ + $(NULL) noinst_HEADERS = \ vlr_access_req_fsm.h \ diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am index 07b30d9..56b9356 100644 --- a/src/utils/Makefile.am +++ b/src/utils/Makefile.am @@ -9,6 +9,7 @@ $(LIBOSMOCORE_CFLAGS) \ $(LIBOSMOGSM_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ + $(LIBOSMOSCCP_CFLAGS) \ $(COVERAGE_CFLAGS) \ $(SQLITE3_CFLAGS) \ $(LIBSMPP34_CFLAGS) \ @@ -123,5 +124,7 @@ $(LIBOSMOCORE_CFLAGS) \ $(LIBOSMOGSM_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ + $(LIBOSMOSCCP_CFLAGS) \ + $(LIBOSMOMGCPCLIENT_CFLAGS) \ $(NULL) -- To view, visit https://gerrit.osmocom.org/5138 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I67b5d797a80b55e01dcdbb8c782748b049cf9199 Gerrit-PatchSet: 1 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Alexander Huemer
[PATCH] osmo-msc[master]: Remove utils imported from openbsc, fix building remaining u...
;
-}
-
-
-static void destroy_dir(struct ms_state_uni *uni)
-{
- if (uni->cdk) {
- destroyCDKSlider(uni->cdk);
- uni->cdk = NULL;
- }
- if (uni->cdk_label) {
- destroyCDKLabel(uni->cdk_label);
- uni->cdk_label = NULL;
- }
-}
-
-#define DIR_UL 0
-#define DIR_DL 1
-static const char *dir_str[2] = {
- [DIR_UL]= "UL",
- [DIR_DL]= "DL",
-};
-
-static int colpair_by_qual(uint8_t rx_qual)
-{
- if (rx_qual == 0)
- return 24;
- else if (rx_qual <= 4)
- return 32;
- else
- return 16;
-}
-
-static int colpair_by_lev(int rx_lev)
-{
- if (rx_lev < -95)
- return 16;
- else if (rx_lev < -80)
- return 32;
- else
- return 24;
-}
-
-
-void write_uni(struct ms_state *ms, struct ms_state_uni *msu,
- struct gsm_rx_lev_qual *lq, int dir, int row)
-{
-
- char label[128];
- time_t now = time(NULL);
- int qual_col = colpair_by_qual(lq->rx_qual);
- int lev_col = colpair_by_lev(rxlev2dbm(lq->rx_lev));
- int color, pwr;
-
- if (dir == DIR_UL) {
- pwr = ms->mr.ms_l1.pwr;
- } else {
- pwr = ms->mr.bs_power;
- }
-
- color = A_REVERSE | COLOR_PAIR(lev_col) | ' ';
- snprintf(label, sizeof(label), "%s %s ", ms->imsi, dir_str[dir]);
- msu->cdk = newCDKSlider(g_st.cdkscreen, 0, row, NULL, label, color,
- COLS-40, rxlev2dbm(lq->rx_lev), -110, -47,
- 1, 2, FALSE, FALSE);
- //IsVisibleObj(ms->ul.cdk) = FALSE;
- snprintf(msu->label, sizeof(msu->label), "%1d %3d %2u %2d
%4u",
-qual_col, lq->rx_qual, qual_col, pwr,
-ms->mr.ms_l1.ta, ms->mr.ms_timing_offset,
-now - msu->last_update);
- msu->cdk_label = newCDKLabel(g_st.cdkscreen, RIGHT, row,
- msu->_lbl, 1, FALSE, FALSE);
-}
-
-static void update_sliders(void)
-{
- int num_vis_sliders = 0;
- struct ms_state *ms;
-#define HEADER_LINES 2
-
- /* remove all sliders */
- llist_for_each_entry(ms, &g_st.ms_list, list) {
- destroy_dir(&ms->ul);
- destroy_dir(&ms->dl);
-
- }
-
- llist_for_each_entry(ms, &g_st.ms_list, list) {
- struct gsm_rx_lev_qual *lq;
- unsigned int row = HEADER_LINES + num_vis_sliders*3;
-
- if (ms->mr.flags & MEAS_REP_F_UL_DTX)
- lq = &ms->mr.ul.sub;
- else
- lq = &ms->mr.ul.full;
- write_uni(ms, &ms->ul, lq, DIR_UL, row);
-
- if (ms->mr.flags & MEAS_REP_F_DL_DTX)
- lq = &ms->mr.dl.sub;
- else
- lq = &ms->mr.dl.full;
- write_uni(ms, &ms->dl, lq, DIR_DL, row+1);
-
- num_vis_sliders++;
- if (num_vis_sliders >= LINES/3)
- break;
- }
-
- refreshCDKScreen(g_st.cdkscreen);
-
-}
-
-const struct value_string col_strs[] = {
- { COLOR_WHITE, "white" },
- { COLOR_RED,"red" },
- { COLOR_GREEN, "green" },
- { COLOR_YELLOW, "yellow" },
- { COLOR_BLUE, "blue" },
- { COLOR_MAGENTA,"magenta" },
- { COLOR_CYAN, "cyan" },
- { COLOR_BLACK, "black" },
- { 0, NULL }
-};
-
-int main(int argc, char **argv)
-{
- int rc;
- char *header[1];
- char *title[1];
-
- msgb_talloc_ctx_init(NULL, 0);
-
- printf("sizeof(gsm_meas_rep)=%u\n", sizeof(struct gsm_meas_rep));
- printf("sizeof(meas_feed_meas)=%u\n", sizeof(struct meas_feed_meas));
-
- INIT_LLIST_HEAD(&g_st.ms_list);
- g_st.curses_win = initscr();
- g_st.cdkscreen = initCDKScreen(g_st.curses_win);
- initCDKColor();
-
- g_st.title = "OpenBSC link quality monitor";
- title[0] = g_st.title;
- g_st.cdk_title = newCDKLabel(g_st.cdkscreen, CENTER, 0, title, 1,
FALSE, FALSE);
-
- snprintf(g_st.header, sizeof(g_st.header), "Q Pwr TA TO Time");
- header[0] = g_st.header;
- g_st.cdk_header = newCDKLabel(g_st.cdkscreen, RIGHT, 1, header, 1,
FALSE, FALSE);
-
-#if 0
- int i;
- for (i = 0; i < 64; i++) {
- short f, b;
- pair_content(i, &f, &b);
- attron(COLOR_PAIR(i));
- printw("%u: %u (%s) ", i, f, get_value_string(col_strs, f));
- printw("%u (%s)\n\r", b, get_value_string(col_strs, b));
- }
- refresh();
- getch();
- exit(0);
-#endif
-
- g_st.udp_ofd.cb = udp_fd_cb;
- rc = osmo_sock_init_ofd(&g_st.udp_ofd, AF_INET, SOCK_DGRAM,
IPPROTO_UDP, NULL, , OSMO_SOCK_F_BIND);
- if (rc < 0)
- exit(1);
-
- while (1) {
- osmo_select_main(0);
- update_sliders();
- };
-
- exit(0);
-}
--
To view, visit https://gerrit.osmocom.org/5139
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If7e1af11cdac8587bb4d66fb4eacee4b79945359
Gerrit-PatchSet: 1
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Owner: Alexander Huemer
osmo-ci[master]: Use stow for dependency management
Patch Set 3: > stow is now installed on all build slaves, wiki also lists stow > now. Is there anything I can do to move forward with change? -- To view, visit https://gerrit.osmocom.org/2691 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8f5012419495a656912b7b71e4f76ce102c6b63a Gerrit-PatchSet: 3 Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Owner: Alexander Huemer Gerrit-Reviewer: Alexander Huemer Gerrit-Reviewer: André Boddenberg Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: blobb Gerrit-Reviewer: neels Gerrit-HasComments: No
osmo-msc[master]: Add missing CFLAGS
Patch Set 1: > are we sure that the individual programs each actually use all of > the libraries you have listed in their CFLAGS now? We typically > don't list all libraries' CFLAGS for each of the programs/libraries. > We only do so, if they actually use definitions/symbols from that > library. Yes, all additions are based on actual build failures in my environment in which libraries are installed in distinct directories and then symlinked to a common one with GNU stow. Please see also https://gerrit.osmocom.org/#/c/2691 which would help in detecting such missing entries. -- To view, visit https://gerrit.osmocom.org/5138 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I67b5d797a80b55e01dcdbb8c782748b049cf9199 Gerrit-PatchSet: 1 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Alexander Huemer Gerrit-Reviewer: Alexander Huemer Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
osmo-msc[master]: Add missing CFLAGS
Patch Set 1: (2 comments) > (2 comments) https://gerrit.osmocom.org/#/c/5138/1/src/utils/Makefile.am File src/utils/Makefile.am: Line 12:$(LIBOSMOSCCP_CFLAGS) \ > which of the utilities needs SCCP? Correct, this is unneeded, I'll fix and resubmit. Line 127: $(LIBOSMOSCCP_CFLAGS) \ > for sure, meas_json doesn't need SCCP or MGCP, this is wrong. That's an indirect dependency via osmocom/msc/gsm_data.h. Without those CFLAGS the build (with previously described setup) fails with: CC meas_json-meas_json.o In file included from meas_json.c:40:0: ../../include/osmocom/msc/gsm_data.h:15:10: fatal error: osmocom/sigtran/sccp_sap.h: No such file or directory #include ^~~~ compilation terminated. or: CC meas_json-meas_json.o In file included from meas_json.c:40:0: ../../include/osmocom/msc/gsm_data.h:19:10: fatal error: osmocom/mgcp_client/mgcp_client.h: No such file or directory #include ^~~ compilation terminated. -- To view, visit https://gerrit.osmocom.org/5138 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I67b5d797a80b55e01dcdbb8c782748b049cf9199 Gerrit-PatchSet: 1 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Alexander Huemer Gerrit-Reviewer: Alexander Huemer Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: Yes
[PATCH] osmo-msc[master]: Remove utils imported from openbsc, fix building remaining u...
eturn rc;
- msgb_put(msg, rc);
- handle_msg(msg);
- msgb_free(msg);
- }
-
- return 0;
-}
-
-
-static void destroy_dir(struct ms_state_uni *uni)
-{
- if (uni->cdk) {
- destroyCDKSlider(uni->cdk);
- uni->cdk = NULL;
- }
- if (uni->cdk_label) {
- destroyCDKLabel(uni->cdk_label);
- uni->cdk_label = NULL;
- }
-}
-
-#define DIR_UL 0
-#define DIR_DL 1
-static const char *dir_str[2] = {
- [DIR_UL]= "UL",
- [DIR_DL]= "DL",
-};
-
-static int colpair_by_qual(uint8_t rx_qual)
-{
- if (rx_qual == 0)
- return 24;
- else if (rx_qual <= 4)
- return 32;
- else
- return 16;
-}
-
-static int colpair_by_lev(int rx_lev)
-{
- if (rx_lev < -95)
- return 16;
- else if (rx_lev < -80)
- return 32;
- else
- return 24;
-}
-
-
-void write_uni(struct ms_state *ms, struct ms_state_uni *msu,
- struct gsm_rx_lev_qual *lq, int dir, int row)
-{
-
- char label[128];
- time_t now = time(NULL);
- int qual_col = colpair_by_qual(lq->rx_qual);
- int lev_col = colpair_by_lev(rxlev2dbm(lq->rx_lev));
- int color, pwr;
-
- if (dir == DIR_UL) {
- pwr = ms->mr.ms_l1.pwr;
- } else {
- pwr = ms->mr.bs_power;
- }
-
- color = A_REVERSE | COLOR_PAIR(lev_col) | ' ';
- snprintf(label, sizeof(label), "%s %s ", ms->imsi, dir_str[dir]);
- msu->cdk = newCDKSlider(g_st.cdkscreen, 0, row, NULL, label, color,
- COLS-40, rxlev2dbm(lq->rx_lev), -110, -47,
- 1, 2, FALSE, FALSE);
- //IsVisibleObj(ms->ul.cdk) = FALSE;
- snprintf(msu->label, sizeof(msu->label), "%1d %3d %2u %2d
%4u",
-qual_col, lq->rx_qual, qual_col, pwr,
-ms->mr.ms_l1.ta, ms->mr.ms_timing_offset,
-now - msu->last_update);
- msu->cdk_label = newCDKLabel(g_st.cdkscreen, RIGHT, row,
- msu->_lbl, 1, FALSE, FALSE);
-}
-
-static void update_sliders(void)
-{
- int num_vis_sliders = 0;
- struct ms_state *ms;
-#define HEADER_LINES 2
-
- /* remove all sliders */
- llist_for_each_entry(ms, &g_st.ms_list, list) {
- destroy_dir(&ms->ul);
- destroy_dir(&ms->dl);
-
- }
-
- llist_for_each_entry(ms, &g_st.ms_list, list) {
- struct gsm_rx_lev_qual *lq;
- unsigned int row = HEADER_LINES + num_vis_sliders*3;
-
- if (ms->mr.flags & MEAS_REP_F_UL_DTX)
- lq = &ms->mr.ul.sub;
- else
- lq = &ms->mr.ul.full;
- write_uni(ms, &ms->ul, lq, DIR_UL, row);
-
- if (ms->mr.flags & MEAS_REP_F_DL_DTX)
- lq = &ms->mr.dl.sub;
- else
- lq = &ms->mr.dl.full;
- write_uni(ms, &ms->dl, lq, DIR_DL, row+1);
-
- num_vis_sliders++;
- if (num_vis_sliders >= LINES/3)
- break;
- }
-
- refreshCDKScreen(g_st.cdkscreen);
-
-}
-
-const struct value_string col_strs[] = {
- { COLOR_WHITE, "white" },
- { COLOR_RED,"red" },
- { COLOR_GREEN, "green" },
- { COLOR_YELLOW, "yellow" },
- { COLOR_BLUE, "blue" },
- { COLOR_MAGENTA,"magenta" },
- { COLOR_CYAN, "cyan" },
- { COLOR_BLACK, "black" },
- { 0, NULL }
-};
-
-int main(int argc, char **argv)
-{
- int rc;
- char *header[1];
- char *title[1];
-
- msgb_talloc_ctx_init(NULL, 0);
-
- printf("sizeof(gsm_meas_rep)=%u\n", sizeof(struct gsm_meas_rep));
- printf("sizeof(meas_feed_meas)=%u\n", sizeof(struct meas_feed_meas));
-
- INIT_LLIST_HEAD(&g_st.ms_list);
- g_st.curses_win = initscr();
- g_st.cdkscreen = initCDKScreen(g_st.curses_win);
- initCDKColor();
-
- g_st.title = "OpenBSC link quality monitor";
- title[0] = g_st.title;
- g_st.cdk_title = newCDKLabel(g_st.cdkscreen, CENTER, 0, title, 1,
FALSE, FALSE);
-
- snprintf(g_st.header, sizeof(g_st.header), "Q Pwr TA TO Time");
- header[0] = g_st.header;
- g_st.cdk_header = newCDKLabel(g_st.cdkscreen, RIGHT, 1, header, 1,
FALSE, FALSE);
-
-#if 0
- int i;
- for (i = 0; i < 64; i++) {
- short f, b;
- pair_content(i, &f, &b);
- attron(COLOR_PAIR(i));
- printw("%u: %u (%s) ", i, f, get_value_string(col_strs, f));
- printw("%u (%s)\n\r", b, get_value_string(col_strs, b));
- }
- refresh();
- getch();
- exit(0);
-#endif
-
- g_st.udp_ofd.cb = udp_fd_cb;
- rc = osmo_sock_init_ofd(&g_st.udp_ofd, AF_INET, SOCK_DGRAM,
IPPROTO_UDP, NULL, , OSMO_SOCK_F_BIND);
- if (rc < 0)
- exit(1);
-
- while (1) {
- osmo_select_main(0);
- update_sliders();
- };
-
- exit(0);
-}
--
To view, visit https://gerrit.osmocom.org/5139
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: If7e1af11cdac8587bb4d66fb4eacee4b79945359
Gerrit-PatchSet: 3
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Owner: Alexander Huemer
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Pau Espin Pedrol
[PATCH] osmo-msc[master]: Add missing CFLAGS
Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/5138 to look at the new patch set (#2). Add missing CFLAGS Change-Id: I67b5d797a80b55e01dcdbb8c782748b049cf9199 --- M src/libcommon-cs/Makefile.am M src/libcommon/Makefile.am M src/libmsc/Makefile.am M src/libvlr/Makefile.am M src/utils/Makefile.am 5 files changed, 17 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/38/5138/2 diff --git a/src/libcommon-cs/Makefile.am b/src/libcommon-cs/Makefile.am index 21c2745..eada698 100644 --- a/src/libcommon-cs/Makefile.am +++ b/src/libcommon-cs/Makefile.am @@ -10,6 +10,8 @@ $(LIBOSMOGSM_CFLAGS) \ $(LIBOSMOVTY_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ + $(LIBOSMOSCCP_CFLAGS) \ + $(LIBOSMOMGCPCLIENT_CFLAGS) \ $(COVERAGE_CFLAGS) \ $(NULL) diff --git a/src/libcommon/Makefile.am b/src/libcommon/Makefile.am index 0b258c0..18272c5 100644 --- a/src/libcommon/Makefile.am +++ b/src/libcommon/Makefile.am @@ -10,6 +10,8 @@ $(LIBOSMOGSM_CFLAGS) \ $(LIBOSMOVTY_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ + $(LIBOSMOSCCP_CFLAGS) \ + $(LIBOSMOMGCPCLIENT_CFLAGS) \ $(COVERAGE_CFLAGS) \ $(NULL) diff --git a/src/libmsc/Makefile.am b/src/libmsc/Makefile.am index fee9f44..998df26 100644 --- a/src/libmsc/Makefile.am +++ b/src/libmsc/Makefile.am @@ -15,6 +15,7 @@ $(LIBASN1C_CFLAGS) \ $(LIBOSMOSIGTRAN_CFLAGS) \ $(LIBOSMOSCCP_CFLAGS) \ + $(LIBOSMOMGCPCLIENT_CFLAGS) \ $(NULL) noinst_HEADERS = \ diff --git a/src/libvlr/Makefile.am b/src/libvlr/Makefile.am index 17ad411..511dfc0 100644 --- a/src/libvlr/Makefile.am +++ b/src/libvlr/Makefile.am @@ -1,6 +1,14 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) -AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) \ - $(COVERAGE_CFLAGS) $(LIBCRYPTO_CFLAGS) +AM_CFLAGS= \ + -Wall \ + $(LIBOSMOCORE_CFLAGS) \ + $(LIBOSMOVTY_CFLAGS) \ + $(LIBOSMOSCCP_CFLAGS) \ + $(LIBOSMOMGCPCLIENT_CFLAGS) \ + $(LIBOSMOABIS_CFLAGS) \ + $(COVERAGE_CFLAGS) \ + $(LIBCRYPTO_CFLAGS) \ + $(NULL) noinst_HEADERS = \ vlr_access_req_fsm.h \ diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am index 07b30d9..f1130db 100644 --- a/src/utils/Makefile.am +++ b/src/utils/Makefile.am @@ -123,5 +123,7 @@ $(LIBOSMOCORE_CFLAGS) \ $(LIBOSMOGSM_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ + $(LIBOSMOSCCP_CFLAGS) \ + $(LIBOSMOMGCPCLIENT_CFLAGS) \ $(NULL) -- To view, visit https://gerrit.osmocom.org/5138 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I67b5d797a80b55e01dcdbb8c782748b049cf9199 Gerrit-PatchSet: 2 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Alexander Huemer Gerrit-Reviewer: Alexander Huemer Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
[PATCH] osmo-msc[master]: Remove utils imported from openbsc, fix building remaining u...
eturn rc;
- msgb_put(msg, rc);
- handle_msg(msg);
- msgb_free(msg);
- }
-
- return 0;
-}
-
-
-static void destroy_dir(struct ms_state_uni *uni)
-{
- if (uni->cdk) {
- destroyCDKSlider(uni->cdk);
- uni->cdk = NULL;
- }
- if (uni->cdk_label) {
- destroyCDKLabel(uni->cdk_label);
- uni->cdk_label = NULL;
- }
-}
-
-#define DIR_UL 0
-#define DIR_DL 1
-static const char *dir_str[2] = {
- [DIR_UL]= "UL",
- [DIR_DL]= "DL",
-};
-
-static int colpair_by_qual(uint8_t rx_qual)
-{
- if (rx_qual == 0)
- return 24;
- else if (rx_qual <= 4)
- return 32;
- else
- return 16;
-}
-
-static int colpair_by_lev(int rx_lev)
-{
- if (rx_lev < -95)
- return 16;
- else if (rx_lev < -80)
- return 32;
- else
- return 24;
-}
-
-
-void write_uni(struct ms_state *ms, struct ms_state_uni *msu,
- struct gsm_rx_lev_qual *lq, int dir, int row)
-{
-
- char label[128];
- time_t now = time(NULL);
- int qual_col = colpair_by_qual(lq->rx_qual);
- int lev_col = colpair_by_lev(rxlev2dbm(lq->rx_lev));
- int color, pwr;
-
- if (dir == DIR_UL) {
- pwr = ms->mr.ms_l1.pwr;
- } else {
- pwr = ms->mr.bs_power;
- }
-
- color = A_REVERSE | COLOR_PAIR(lev_col) | ' ';
- snprintf(label, sizeof(label), "%s %s ", ms->imsi, dir_str[dir]);
- msu->cdk = newCDKSlider(g_st.cdkscreen, 0, row, NULL, label, color,
- COLS-40, rxlev2dbm(lq->rx_lev), -110, -47,
- 1, 2, FALSE, FALSE);
- //IsVisibleObj(ms->ul.cdk) = FALSE;
- snprintf(msu->label, sizeof(msu->label), "%1d %3d %2u %2d
%4u",
-qual_col, lq->rx_qual, qual_col, pwr,
-ms->mr.ms_l1.ta, ms->mr.ms_timing_offset,
-now - msu->last_update);
- msu->cdk_label = newCDKLabel(g_st.cdkscreen, RIGHT, row,
- msu->_lbl, 1, FALSE, FALSE);
-}
-
-static void update_sliders(void)
-{
- int num_vis_sliders = 0;
- struct ms_state *ms;
-#define HEADER_LINES 2
-
- /* remove all sliders */
- llist_for_each_entry(ms, &g_st.ms_list, list) {
- destroy_dir(&ms->ul);
- destroy_dir(&ms->dl);
-
- }
-
- llist_for_each_entry(ms, &g_st.ms_list, list) {
- struct gsm_rx_lev_qual *lq;
- unsigned int row = HEADER_LINES + num_vis_sliders*3;
-
- if (ms->mr.flags & MEAS_REP_F_UL_DTX)
- lq = &ms->mr.ul.sub;
- else
- lq = &ms->mr.ul.full;
- write_uni(ms, &ms->ul, lq, DIR_UL, row);
-
- if (ms->mr.flags & MEAS_REP_F_DL_DTX)
- lq = &ms->mr.dl.sub;
- else
- lq = &ms->mr.dl.full;
- write_uni(ms, &ms->dl, lq, DIR_DL, row+1);
-
- num_vis_sliders++;
- if (num_vis_sliders >= LINES/3)
- break;
- }
-
- refreshCDKScreen(g_st.cdkscreen);
-
-}
-
-const struct value_string col_strs[] = {
- { COLOR_WHITE, "white" },
- { COLOR_RED,"red" },
- { COLOR_GREEN, "green" },
- { COLOR_YELLOW, "yellow" },
- { COLOR_BLUE, "blue" },
- { COLOR_MAGENTA,"magenta" },
- { COLOR_CYAN, "cyan" },
- { COLOR_BLACK, "black" },
- { 0, NULL }
-};
-
-int main(int argc, char **argv)
-{
- int rc;
- char *header[1];
- char *title[1];
-
- msgb_talloc_ctx_init(NULL, 0);
-
- printf("sizeof(gsm_meas_rep)=%u\n", sizeof(struct gsm_meas_rep));
- printf("sizeof(meas_feed_meas)=%u\n", sizeof(struct meas_feed_meas));
-
- INIT_LLIST_HEAD(&g_st.ms_list);
- g_st.curses_win = initscr();
- g_st.cdkscreen = initCDKScreen(g_st.curses_win);
- initCDKColor();
-
- g_st.title = "OpenBSC link quality monitor";
- title[0] = g_st.title;
- g_st.cdk_title = newCDKLabel(g_st.cdkscreen, CENTER, 0, title, 1,
FALSE, FALSE);
-
- snprintf(g_st.header, sizeof(g_st.header), "Q Pwr TA TO Time");
- header[0] = g_st.header;
- g_st.cdk_header = newCDKLabel(g_st.cdkscreen, RIGHT, 1, header, 1,
FALSE, FALSE);
-
-#if 0
- int i;
- for (i = 0; i < 64; i++) {
- short f, b;
- pair_content(i, &f, &b);
- attron(COLOR_PAIR(i));
- printw("%u: %u (%s) ", i, f, get_value_string(col_strs, f));
- printw("%u (%s)\n\r", b, get_value_string(col_strs, b));
- }
- refresh();
- getch();
- exit(0);
-#endif
-
- g_st.udp_ofd.cb = udp_fd_cb;
- rc = osmo_sock_init_ofd(&g_st.udp_ofd, AF_INET, SOCK_DGRAM,
IPPROTO_UDP, NULL, , OSMO_SOCK_F_BIND);
- if (rc < 0)
- exit(1);
-
- while (1) {
- osmo_select_main(0);
- update_sliders();
- };
-
- exit(0);
-}
--
To view, visit https://gerrit.osmocom.org/5139
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: If7e1af11cdac8587bb4d66fb4eacee4b79945359
Gerrit-PatchSet: 4
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Owner: Alexander Huemer
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Pau Espin Pedrol
osmo-ci[master]: Use stow for dependency management
Patch Set 4: Verified+1 -- To view, visit https://gerrit.osmocom.org/2691 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8f5012419495a656912b7b71e4f76ce102c6b63a Gerrit-PatchSet: 4 Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Owner: Alexander Huemer Gerrit-Reviewer: Alexander Huemer Gerrit-Reviewer: André Boddenberg Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: blobb Gerrit-Reviewer: neels Gerrit-HasComments: No
[MERGED] osmo-ci[master]: Use stow for dependency management
Alexander Huemer has submitted this change and it was merged. Change subject: Use stow for dependency management .. Use stow for dependency management This commit introduces the usage of GNU stow[1] for dependency management. Stow uses symlinks to make dependencies available in a single directory althoguh they were installed in distinct directories. Keeping installation directories seperate has the advantage of letting the build fail if AM_CFLAGS and LDADD do not contain all dependencies which are actually used. Installing multiple dependencies into a single directory causes x_CFLAGS and x_LIBS variables to magically point where other dependencies are found as well, therefore missing entries can be overlooked. Stow acts as a convenience layer here, making it unnecessary to supply a list of locations in LD_LIBRARY_PATH, PKG_CONFIG_PATH and so forth for building when dependencies are installed in distinct directories manually. Stow has to be present on the jenkins build nodes for successful executing of osmo-build-dep.sh. [1] https://www.gnu.org/software/stow/ Change-Id: I8f5012419495a656912b7b71e4f76ce102c6b63a --- M scripts/osmo-build-dep.sh 1 file changed, 9 insertions(+), 1 deletion(-) Approvals: Alexander Huemer: Verified Neels Hofmeyr: Looks good to me, approved Harald Welte: Looks good to me, approved diff --git a/scripts/osmo-build-dep.sh b/scripts/osmo-build-dep.sh index 6e9ef86..35cb373 100755 --- a/scripts/osmo-build-dep.sh +++ b/scripts/osmo-build-dep.sh @@ -43,6 +43,14 @@ osmo-deps.sh "$project" "$branch" cd "$project" +# Keep the installation targets of the dependencies in a seperate directory +# hierarchy before stowing them to avoid wrongly suggesting that they are part +# of the -I and -L search paths +mkdir -p "$inst/stow" + autoreconf --install --force -./configure --prefix="$inst" $cfg +./configure --prefix="$inst/stow/$project" $cfg $MAKE $PARALLEL_MAKE install + +# Make the dependencies available through symlinks in $deps ($PWD/..). +STOW_DIR="$inst/stow" stow --restow $project -- To view, visit https://gerrit.osmocom.org/2691 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8f5012419495a656912b7b71e4f76ce102c6b63a Gerrit-PatchSet: 5 Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Owner: Alexander Huemer Gerrit-Reviewer: Alexander Huemer Gerrit-Reviewer: André Boddenberg Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: blobb Gerrit-Reviewer: neels
[PATCH] osmo-bts[master]: Remove 11-bit RACH support from 'Known Limitations'
Review at https://gerrit.osmocom.org/5833 Remove 11-bit RACH support from 'Known Limitations' Support for 11-bit RACH support was added to libosmocore with https://gerrit.osmocom.org/#/c/5062 Change-Id: I091f4fbd52c29c7d56ca392b8a1b872609829d81 --- M README.md 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/33/5833/1 diff --git a/README.md b/README.md index 43c27b2..5e6355d 100644 --- a/README.md +++ b/README.md @@ -123,5 +123,4 @@ * TCH/F_PDCH cannel not working as voice (https://osmocom.org/issues/1865) * No BER value delivered to OsmoPCU (https://osmocom.org/issues/1855) - * No 11bit RACH support (https://osmocom.org/issues/1854) * No CBCH support (https://osmocom.org/issues/1617) -- To view, visit https://gerrit.osmocom.org/5833 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I091f4fbd52c29c7d56ca392b8a1b872609829d81 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Alexander Huemer
osmo-bts[master]: Remove 11-bit RACH support from 'Known Limitations'
Patch Set 1: > Curious, have you tested that it actually works? The reason why the build is failing at the moment is that https://gerrit.osmocom.org/#/c/5818/ is not yet merged. -- To view, visit https://gerrit.osmocom.org/5833 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I091f4fbd52c29c7d56ca392b8a1b872609829d81 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Alexander Huemer Gerrit-Reviewer: Alexander Huemer Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-HasComments: No
osmo-bts[master]: Remove 11-bit RACH support from 'Known Limitations'
Patch Set 1: > I wasn't referring to compilation. Have you tried to run it with > actual phone and verified that 11-bit RACH was used? The ticket > referred to in README is still open. I'd be surprised if adding > support to libosmocore would mean that it'll be automatically used > in osmo-bts. > > So if you indeed tested, please share your configs and test setup > details in OS#1854. We should first close the ticket and than > remove it from readme. Yes you are right. I drew the wrong conclusion. -- To view, visit https://gerrit.osmocom.org/5833 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I091f4fbd52c29c7d56ca392b8a1b872609829d81 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Alexander Huemer Gerrit-Reviewer: Alexander Huemer Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-HasComments: No
[PATCH] osmo-trx[master]: Unbreak `./configure --with-usrp1` build
Review at https://gerrit.osmocom.org/5938
Unbreak `./configure --with-usrp1` build
Change-Id: I49b385594271ae64a48d4d39ee9fe26d7c95bd30
---
M Transceiver52M/Makefile.am
M Transceiver52M/USRPDevice.cpp
M configure.ac
3 files changed, 6 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/38/5938/1
diff --git a/Transceiver52M/Makefile.am b/Transceiver52M/Makefile.am
index 8df2d34..5b5fafa 100644
--- a/Transceiver52M/Makefile.am
+++ b/Transceiver52M/Makefile.am
@@ -91,12 +91,13 @@
libtransceiver.la \
$(ARCH_LA) \
$(GSM_LA) \
- $(COMMON_LA)
+ $(COMMON_LA) \
+ $(FFTWF_LIBS)
if USRP1
libtransceiver_la_SOURCES += USRPDevice.cpp
osmo_trx_LDADD += $(USRP_LIBS)
else
libtransceiver_la_SOURCES += UHDDevice.cpp
-osmo_trx_LDADD += $(UHD_LIBS) $(FFTWF_LIBS)
+osmo_trx_LDADD += $(UHD_LIBS)
endif
diff --git a/Transceiver52M/USRPDevice.cpp b/Transceiver52M/USRPDevice.cpp
index 034ccd8..e5be58d 100644
--- a/Transceiver52M/USRPDevice.cpp
+++ b/Transceiver52M/USRPDevice.cpp
@@ -33,6 +33,7 @@
#include
#include
#include
+#include "Logger.h"
#include "Threads.h"
#include "USRPDevice.h"
@@ -599,7 +600,7 @@
#endif
RadioDevice *RadioDevice::make(size_t tx_sps, size_t rx_sps,
- size_t chans, double)
+ RadioDevice::InterfaceType, size_t chans, double)
{
return new USRPDevice(tx_sps);
}
diff --git a/configure.ac b/configure.ac
index 5cee4a6..7d26ced 100644
--- a/configure.ac
+++ b/configure.ac
@@ -113,7 +113,6 @@
)]
)
AC_DEFINE(USE_UHD, 1, All UHD versions)
-PKG_CHECK_MODULES(FFTWF, fftw3f)
])
AS_IF([test "x$with_singledb" = "xyes"], [
@@ -160,6 +159,7 @@
AM_CONDITIONAL(ARCH_ARM_A15, [test "x$with_neon_vfpv4" = "xyes"])
PKG_CHECK_MODULES(LIBUSB, libusb-1.0)
+PKG_CHECK_MODULES(FFTWF, fftw3f)
AC_CHECK_HEADER([boost/config.hpp],[],
[AC_MSG_ERROR([boost/config.hpp not found, install e.g. libboost-dev])])
--
To view, visit https://gerrit.osmocom.org/5938
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I49b385594271ae64a48d4d39ee9fe26d7c95bd30
Gerrit-PatchSet: 1
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Owner: Alexander Huemer
[PATCH] osmo-bts[master]: various Makefile.am: add missing CFLAGS
Review at https://gerrit.osmocom.org/6061 various Makefile.am: add missing CFLAGS Change-Id: I0717aaaf062a7c3c8b35520fa837b51fd6aed47f --- M tests/handover/Makefile.am M tests/meas/Makefile.am M tests/tx_power/Makefile.am 3 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/61/6061/1 diff --git a/tests/handover/Makefile.am b/tests/handover/Makefile.am index 5757699..966ea46 100644 --- a/tests/handover/Makefile.am +++ b/tests/handover/Makefile.am @@ -1,5 +1,5 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(LIBOSMOTRAU_CFLAGS) +AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOABIS_CFLAGS) LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS) noinst_PROGRAMS = handover_test EXTRA_DIST = handover_test.ok diff --git a/tests/meas/Makefile.am b/tests/meas/Makefile.am index 266f5e7..3c83e52 100644 --- a/tests/meas/Makefile.am +++ b/tests/meas/Makefile.am @@ -1,5 +1,5 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(LIBOSMOTRAU_CFLAGS) +AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOABIS_CFLAGS) LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS) noinst_PROGRAMS = meas_test noinst_HEADERS = sysmobts_fr_samples.h diff --git a/tests/tx_power/Makefile.am b/tests/tx_power/Makefile.am index 5848c71..cd7ccc2 100644 --- a/tests/tx_power/Makefile.am +++ b/tests/tx_power/Makefile.am @@ -1,5 +1,5 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(LIBOSMOTRAU_CFLAGS) +AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOABIS_CFLAGS) LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS) noinst_PROGRAMS = tx_power_test EXTRA_DIST = tx_power_test.ok tx_power_test.err -- To view, visit https://gerrit.osmocom.org/6061 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0717aaaf062a7c3c8b35520fa837b51fd6aed47f Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Alexander Huemer
[PATCH] osmo-bts[master]: cosmetic: Makefile.am whitespace
Review at https://gerrit.osmocom.org/6060 cosmetic: Makefile.am whitespace Change-Id: I480fbf85912de2ea3518a906b9edf23b1485e936 --- M tests/handover/Makefile.am M tests/meas/Makefile.am M tests/tx_power/Makefile.am 3 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/60/6060/1 diff --git a/tests/handover/Makefile.am b/tests/handover/Makefile.am index 8bff297..5757699 100644 --- a/tests/handover/Makefile.am +++ b/tests/handover/Makefile.am @@ -1,5 +1,5 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOCODEC_CFLAGS)$(LIBOSMOTRAU_CFLAGS) +AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(LIBOSMOTRAU_CFLAGS) LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS) noinst_PROGRAMS = handover_test EXTRA_DIST = handover_test.ok diff --git a/tests/meas/Makefile.am b/tests/meas/Makefile.am index 895d474..266f5e7 100644 --- a/tests/meas/Makefile.am +++ b/tests/meas/Makefile.am @@ -1,5 +1,5 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOCODEC_CFLAGS)$(LIBOSMOTRAU_CFLAGS) +AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(LIBOSMOTRAU_CFLAGS) LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS) noinst_PROGRAMS = meas_test noinst_HEADERS = sysmobts_fr_samples.h diff --git a/tests/tx_power/Makefile.am b/tests/tx_power/Makefile.am index 349958c..5848c71 100644 --- a/tests/tx_power/Makefile.am +++ b/tests/tx_power/Makefile.am @@ -1,5 +1,5 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOCODEC_CFLAGS)$(LIBOSMOTRAU_CFLAGS) +AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(LIBOSMOTRAU_CFLAGS) LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS) noinst_PROGRAMS = tx_power_test EXTRA_DIST = tx_power_test.ok tx_power_test.err -- To view, visit https://gerrit.osmocom.org/6060 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I480fbf85912de2ea3518a906b9edf23b1485e936 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Alexander Huemer
[PATCH] osmo-bts[master]: gitignore: add missing entries
Review at https://gerrit.osmocom.org/6062 gitignore: add missing entries Change-Id: I509e564a82b6632c0cdf052526e9f7f3397155ce --- M .gitignore 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/62/6062/1 diff --git a/.gitignore b/.gitignore index 1780e1c..69e2c36 100644 --- a/.gitignore +++ b/.gitignore @@ -19,8 +19,14 @@ install-sh missing stamp-h1 +libtool +ltmain.sh core core.* + +# git-version-gen magic +.tarball-version +.version src/osmo-bts-sysmo/sysmobts-calib src/osmo-bts-sysmo/l1fwd-proxy @@ -46,6 +52,7 @@ tests/paging/paging_test tests/cipher/cipher_test tests/sysmobts/sysmobts_test +tests/meas/meas_test tests/misc/misc_test tests/handover/handover_test tests/tx_power/tx_power_test -- To view, visit https://gerrit.osmocom.org/6062 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I509e564a82b6632c0cdf052526e9f7f3397155ce Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Alexander Huemer
[PATCH] osmo-hlr[master]: cover all build artifacts in .gitignore
Review at https://gerrit.osmocom.org/6149 cover all build artifacts in .gitignore Change-Id: I48b93adc280c1b0521e7f5acc1f66ce5db462915 --- M .gitignore 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/49/6149/1 diff --git a/.gitignore b/.gitignore index 72f11a1..d65cb68 100644 --- a/.gitignore +++ b/.gitignore @@ -22,10 +22,15 @@ missing .deps -src/osmo-hlr src/db_test +src/db_bootstrap.h +src/osmo-hlr +src/osmo-hlr-db-tool +tests/atconfig tests/testsuite tests/auc/auc_3g_test tests/auc/auc_ts_55_205_test_sets.c tests/auc/auc_ts_55_205_test_sets +tests/auc/auc_test +tests/gsup_server/gsup_server_test -- To view, visit https://gerrit.osmocom.org/6149 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I48b93adc280c1b0521e7f5acc1f66ce5db462915 Gerrit-PatchSet: 1 Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Owner: Alexander Huemer
[PATCH] osmo-hlr[master]: Add missing build products in .gitignore
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/6149 to look at the new patch set (#2). Add missing build products in .gitignore Change-Id: I48b93adc280c1b0521e7f5acc1f66ce5db462915 --- M .gitignore 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/49/6149/2 diff --git a/.gitignore b/.gitignore index 72f11a1..d65cb68 100644 --- a/.gitignore +++ b/.gitignore @@ -22,10 +22,15 @@ missing .deps -src/osmo-hlr src/db_test +src/db_bootstrap.h +src/osmo-hlr +src/osmo-hlr-db-tool +tests/atconfig tests/testsuite tests/auc/auc_3g_test tests/auc/auc_ts_55_205_test_sets.c tests/auc/auc_ts_55_205_test_sets +tests/auc/auc_test +tests/gsup_server/gsup_server_test -- To view, visit https://gerrit.osmocom.org/6149 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I48b93adc280c1b0521e7f5acc1f66ce5db462915 Gerrit-PatchSet: 2 Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Owner: Alexander Huemer Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy
[PATCH] osmo-trx[master]: Fix USRP1 build with support for setting Rx/TxAntenna
Review at https://gerrit.osmocom.org/6975
Fix USRP1 build with support for setting Rx/TxAntenna
The USRP1 build was broken by commit 77ce99ac6720896f504a0581a5c57b2929a13cef.
Commit 77ce99ac6720896f504a0581a5c57b2929a13cef broke the USRP1 build
Change-Id: I28585947d5662cdd580a814cce54a5d9aa30eeb8
---
M Transceiver52M/USRPDevice.h
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/75/6975/1
diff --git a/Transceiver52M/USRPDevice.h b/Transceiver52M/USRPDevice.h
index f5fbe85..f981643 100644
--- a/Transceiver52M/USRPDevice.h
+++ b/Transceiver52M/USRPDevice.h
@@ -198,6 +198,7 @@
inline double numberRead() { return samplesRead; }
inline double numberWritten() { return samplesWritten; }
+ std::vector tx_paths, rx_paths;
};
#endif // _USRP_DEVICE_H_
--
To view, visit https://gerrit.osmocom.org/6975
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I28585947d5662cdd580a814cce54a5d9aa30eeb8
Gerrit-PatchSet: 1
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Owner: Alexander Huemer
[PATCH] openbsc[master]: Add missing _CFLAGS and _LIBS
Review at https://gerrit.osmocom.org/2652 Add missing _CFLAGS and _LIBS These missing pieces go unnoticed if dependencies are not installed in distinct directories. Change-Id: If8d57b72f63d79cc0d8efba7466c6ec177207cbb --- M openbsc/src/utils/Makefile.am M openbsc/tests/sndcp_xid/Makefile.am 2 files changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/52/2652/1 diff --git a/openbsc/src/utils/Makefile.am b/openbsc/src/utils/Makefile.am index 9c3837a..26494e1 100644 --- a/openbsc/src/utils/Makefile.am +++ b/openbsc/src/utils/Makefile.am @@ -109,6 +109,7 @@ osmo_meas_pcap2db_CFLAGS = \ $(LIBOSMOCORE_CFLAGS) \ $(LIBOSMOGSM_CFLAGS) \ + $(LIBOSMOABIS_CFLAGS) \ $(NULL) osmo_meas_udp2db_SOURCES = \ @@ -125,6 +126,7 @@ osmo_meas_udp2db_CFLAGS = \ $(LIBOSMOCORE_CFLAGS) \ $(LIBOSMOGSM_CFLAGS) \ + $(LIBOSMOABIS_CFLAGS) \ $(NULL) meas_json_SOURCES = \ @@ -140,5 +142,6 @@ meas_json_CFLAGS = \ $(LIBOSMOCORE_CFLAGS) \ $(LIBOSMOGSM_CFLAGS) \ + $(LIBOSMOABIS_CFLAGS) \ $(NULL) diff --git a/openbsc/tests/sndcp_xid/Makefile.am b/openbsc/tests/sndcp_xid/Makefile.am index 99b9d1a..d09c41b 100644 --- a/openbsc/tests/sndcp_xid/Makefile.am +++ b/openbsc/tests/sndcp_xid/Makefile.am @@ -15,6 +15,7 @@ $(LIBOSMOGB_LIBS) \ $(LIBCARES_LIBS) \ $(LIBCRYPTO_LIBS) \ - -lgtp -lrt -lm + $(LIBGTP_LIBS) \ + -lrt -lm -- To view, visit https://gerrit.osmocom.org/2652 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If8d57b72f63d79cc0d8efba7466c6ec177207cbb Gerrit-PatchSet: 1 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: Alexander Huemer
[PATCH] openbsc[master]: Add missing _CFLAGS and _LIBS
Hello Max, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/2652 to look at the new patch set (#2). Add missing _CFLAGS and _LIBS These missing pieces go unnoticed if dependencies are not installed in distinct directories. Change-Id: If8d57b72f63d79cc0d8efba7466c6ec177207cbb --- M openbsc/src/gprs/Makefile.am M openbsc/src/utils/Makefile.am M openbsc/tests/sndcp_xid/Makefile.am 3 files changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/52/2652/2 diff --git a/openbsc/src/gprs/Makefile.am b/openbsc/src/gprs/Makefile.am index cff17dd..cb09979 100644 --- a/openbsc/src/gprs/Makefile.am +++ b/openbsc/src/gprs/Makefile.am @@ -99,8 +99,8 @@ $(LIBOSMOABIS_LIBS) \ $(LIBCARES_LIBS) \ $(LIBCRYPTO_LIBS) \ + $(LIBGTP_LIBS) \ -lrt \ - -lgtp \ -lm \ $(NULL) if BUILD_IU diff --git a/openbsc/src/utils/Makefile.am b/openbsc/src/utils/Makefile.am index 9c3837a..26494e1 100644 --- a/openbsc/src/utils/Makefile.am +++ b/openbsc/src/utils/Makefile.am @@ -109,6 +109,7 @@ osmo_meas_pcap2db_CFLAGS = \ $(LIBOSMOCORE_CFLAGS) \ $(LIBOSMOGSM_CFLAGS) \ + $(LIBOSMOABIS_CFLAGS) \ $(NULL) osmo_meas_udp2db_SOURCES = \ @@ -125,6 +126,7 @@ osmo_meas_udp2db_CFLAGS = \ $(LIBOSMOCORE_CFLAGS) \ $(LIBOSMOGSM_CFLAGS) \ + $(LIBOSMOABIS_CFLAGS) \ $(NULL) meas_json_SOURCES = \ @@ -140,5 +142,6 @@ meas_json_CFLAGS = \ $(LIBOSMOCORE_CFLAGS) \ $(LIBOSMOGSM_CFLAGS) \ + $(LIBOSMOABIS_CFLAGS) \ $(NULL) diff --git a/openbsc/tests/sndcp_xid/Makefile.am b/openbsc/tests/sndcp_xid/Makefile.am index 99b9d1a..d09c41b 100644 --- a/openbsc/tests/sndcp_xid/Makefile.am +++ b/openbsc/tests/sndcp_xid/Makefile.am @@ -15,6 +15,7 @@ $(LIBOSMOGB_LIBS) \ $(LIBCARES_LIBS) \ $(LIBCRYPTO_LIBS) \ - -lgtp -lrt -lm + $(LIBGTP_LIBS) \ + -lrt -lm -- To view, visit https://gerrit.osmocom.org/2652 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: If8d57b72f63d79cc0d8efba7466c6ec177207cbb Gerrit-PatchSet: 2 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: Alexander Huemer Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max
[PATCH] osmo-ci[master]: Use stow for dependency management
Review at https://gerrit.osmocom.org/2691 Use stow for dependency management Change-Id: I8f5012419495a656912b7b71e4f76ce102c6b63a --- M scripts/osmo-build-dep.sh 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/91/2691/1 diff --git a/scripts/osmo-build-dep.sh b/scripts/osmo-build-dep.sh index 2a107ed..cdfbc45 100755 --- a/scripts/osmo-build-dep.sh +++ b/scripts/osmo-build-dep.sh @@ -48,6 +48,9 @@ fi git rev-parse HEAD # log current HEAD +mkdir -p "$inst/stow" + autoreconf --install --force -./configure --prefix="$inst" $cfg +./configure --prefix="$inst/stow/$project" $cfg $MAKE $PARALLEL_MAKE install +STOW_DIR="$inst/stow" stow --restow $project -- To view, visit https://gerrit.osmocom.org/2691 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8f5012419495a656912b7b71e4f76ce102c6b63a Gerrit-PatchSet: 1 Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Owner: Alexander Huemer
[PATCH] osmo-ci[master]: Use stow for dependency management
Hello Harald Welte, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/2691 to look at the new patch set (#2). Use stow for dependency management This commit introduces the usage of GNU stow[1] for dependency management. Having libraries a build depends on installed in distinct directories has the advantage of letting the build fail if not all location listings in AM_CFLAGS and LDADD listings contain all correcponding entries to used dependencies since then those dependencies (header files and libraries) won't be found by coincidence. Stow acts as a convenience layer here, making it unnecessary to supply a list of locations in LD_LIBRARY_PATH, PKG_CONFIG_PATH and so forth for building when dependencies are installed in distinct directories manually. Stow has to be present on the jenkins build nodes for successful executing of osmo-build-dep.sh. [1] https://www.gnu.org/software/stow/ Change-Id: I8f5012419495a656912b7b71e4f76ce102c6b63a --- M scripts/osmo-build-dep.sh 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/91/2691/2 diff --git a/scripts/osmo-build-dep.sh b/scripts/osmo-build-dep.sh index 2a107ed..cdfbc45 100755 --- a/scripts/osmo-build-dep.sh +++ b/scripts/osmo-build-dep.sh @@ -48,6 +48,9 @@ fi git rev-parse HEAD # log current HEAD +mkdir -p "$inst/stow" + autoreconf --install --force -./configure --prefix="$inst" $cfg +./configure --prefix="$inst/stow/$project" $cfg $MAKE $PARALLEL_MAKE install +STOW_DIR="$inst/stow" stow --restow $project -- To view, visit https://gerrit.osmocom.org/2691 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I8f5012419495a656912b7b71e4f76ce102c6b63a Gerrit-PatchSet: 2 Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Owner: Alexander Huemer Gerrit-Reviewer: Harald Welte
osmo-ci[master]: Use stow for dependency management
Patch Set 2: > What I'm missing here is some more background. Call me old, but I > didn't even know what stow was prior to doing a search after seeing > this commit. Unless I'm the only one on the planet not knowing > stow, it deserves some description in the commitlog, with a pointer > to more information. Most importantly, it should explain what the > benefit is, and also what kind of implications it has (e.g. people > have to unconditionally install it, ...?) The commit message was indeed quite sparse, I amended it. Please also see [1] and the following short thread for additional reasoning behind the change. [1] http://lists.osmocom.org/pipermail/openbsc/2017-May/010690.html -- To view, visit https://gerrit.osmocom.org/2691 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8f5012419495a656912b7b71e4f76ce102c6b63a Gerrit-PatchSet: 2 Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Owner: Alexander Huemer Gerrit-Reviewer: Alexander Huemer Gerrit-Reviewer: Harald Welte Gerrit-HasComments: No
osmo-ci[master]: Use stow for dependency management
Patch Set 2: (4 comments) https://gerrit.osmocom.org/#/c/2691/2//COMMIT_MSG Commit Message: Line 12: has the advantage of letting the build fail if not all location listings > I find this really hard to read. "Installing dependent libraries in..."? Ra Done Line 18: building when dependencies are installed in distinct directories > what so forth? AFAIK those two are all that is needed? Does it also manage Correct, those two are all that is needed. Commit message corrected. AM_CFLAGS is handled via pkg-config. https://gerrit.osmocom.org/#/c/2691/2/scripts/osmo-build-dep.sh File scripts/osmo-build-dep.sh: Line 51: mkdir -p "$inst/stow" > $inst is already an empty folder intended as prefix target. Do you really n I added a comment in the script as justification. Line 56: STOW_DIR="$inst/stow" stow --restow $project > I'm curious what this does. Could it get a single line comment? Done -- To view, visit https://gerrit.osmocom.org/2691 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8f5012419495a656912b7b71e4f76ce102c6b63a Gerrit-PatchSet: 2 Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Owner: Alexander Huemer Gerrit-Reviewer: Alexander Huemer Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: neels Gerrit-HasComments: Yes
[PATCH] osmo-ci[master]: Use stow for dependency management
Hello Neels Hofmeyr, Harald Welte, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/2691 to look at the new patch set (#3). Use stow for dependency management This commit introduces the usage of GNU stow[1] for dependency management. Stow uses symlinks to make dependencies available in a single directory althoguh they were installed in distinct directories. Keeping installation directories seperate has the advantage of letting the build fail if AM_CFLAGS and LDADD do not contain all dependencies which are actually used. Installing multiple dependencies into a single directory causes x_CFLAGS and x_LIBS variables to magically point where other dependencies are found as well, therefore missing entries can be overlooked. Stow acts as a convenience layer here, making it unnecessary to supply a list of locations in LD_LIBRARY_PATH, PKG_CONFIG_PATH and so forth for building when dependencies are installed in distinct directories manually. Stow has to be present on the jenkins build nodes for successful executing of osmo-build-dep.sh. [1] https://www.gnu.org/software/stow/ Change-Id: I8f5012419495a656912b7b71e4f76ce102c6b63a --- M scripts/osmo-build-dep.sh 1 file changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/91/2691/3 diff --git a/scripts/osmo-build-dep.sh b/scripts/osmo-build-dep.sh index 2a107ed..9c55498 100755 --- a/scripts/osmo-build-dep.sh +++ b/scripts/osmo-build-dep.sh @@ -48,6 +48,14 @@ fi git rev-parse HEAD # log current HEAD +# Keep the installation targets of the dependencies in a seperate directory +# hierarchy before stowing them to avoid wrongly suggesting that they are part +# of the -I and -L search paths +mkdir -p "$inst/stow" + autoreconf --install --force -./configure --prefix="$inst" $cfg +./configure --prefix="$inst/stow/$project" $cfg $MAKE $PARALLEL_MAKE install + +# Make the dependencies available through symlinks in $deps ($PWD/..). +STOW_DIR="$inst/stow" stow --restow $project -- To view, visit https://gerrit.osmocom.org/2691 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I8f5012419495a656912b7b71e4f76ce102c6b63a Gerrit-PatchSet: 3 Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Owner: Alexander Huemer Gerrit-Reviewer: Alexander Huemer Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: neels
osmo-ci[master]: Use stow for dependency management
Patch Set 3: (1 comment) > (1 comment) > > When I read this, I still have a question. So we install to > separate dirs, then stow creates symlinks to combine the installed > files in one dir again? But then we need to pass only one > LD_LIBRARY_PATH and one PKG_CONFIG_PATH with the symlinks? So how > then does it make us find errors like forgotten dep dirs? Or > otherwise, why the symlinks? The reason is that the .pc files point to the original install locations, not to the one where stow aggregates the installations. That makes the difference during the build. Just give it a try with the openbsc repository. Revert commit 5265bea76c90427d70257b7fac0f0b7d40a015cb and run contrib/jenkins.sh without this changeset applied to osmo-ci. https://gerrit.osmocom.org/#/c/2691/3/scripts/osmo-build-dep.sh File scripts/osmo-build-dep.sh: Line 54: mkdir -p "$inst/stow" > I still don't understand why a separate 'stow' subdir is needed. $inst is a Yes, it does. >From the manpage: > the target directory is assumed to be the parent of the current directory -- To view, visit https://gerrit.osmocom.org/2691 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8f5012419495a656912b7b71e4f76ce102c6b63a Gerrit-PatchSet: 3 Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Owner: Alexander Huemer Gerrit-Reviewer: Alexander Huemer Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: neels Gerrit-HasComments: Yes
osmo-ci[master]: Use stow for dependency management
Patch Set 3: > (1 comment) Abstract the fact away whether the dependency was provided by compilation from source or by extraction of an artifact tar-ball. One artifact tar-ball should contain the result of a make install run of a single library to an empty directory. >From a dependency consummation perspective the rest does not change. You extract the content of an artifact tar file (or make install) to a distinct directory and do that for all artifacts. Those directories are then stowed to a final destination directory which is then the sole directory where the package to be built searches for its dependencies. -- To view, visit https://gerrit.osmocom.org/2691 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8f5012419495a656912b7b71e4f76ce102c6b63a Gerrit-PatchSet: 3 Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Owner: Alexander Huemer Gerrit-Reviewer: Alexander Huemer Gerrit-Reviewer: André Boddenberg Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: blobb Gerrit-Reviewer: neels Gerrit-HasComments: No
Change in libusrp[master]: usrp2: firmware: ignore .lk build artifacts
Alexander Huemer has uploaded this change for review. ( https://gerrit.osmocom.org/12849 Change subject: usrp2: firmware: ignore .lk build artifacts .. usrp2: firmware: ignore .lk build artifacts Change-Id: I79cbb834f02dc3f804e5a1476724245407f0eade --- M firmware/src/usrp2/.gitignore 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libusrp refs/changes/49/12849/1 diff --git a/firmware/src/usrp2/.gitignore b/firmware/src/usrp2/.gitignore index 54a9e94..d1557f9 100644 --- a/firmware/src/usrp2/.gitignore +++ b/firmware/src/usrp2/.gitignore @@ -6,6 +6,7 @@ /*.rel /*.rst /*.sym +/*.lk /blink_leds.asm /usrp_common.asm /command_loop.asm -- To view, visit https://gerrit.osmocom.org/12849 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I79cbb834f02dc3f804e5a1476724245407f0eade Gerrit-Change-Number: 12849 Gerrit-PatchSet: 1 Gerrit-Owner: Alexander Huemer
Change in libusrp[master]: Avoid compiler warning 'dynamic exception specifications are deprecat...
Alexander Huemer has uploaded this change for review. (
https://gerrit.osmocom.org/12853
Change subject: Avoid compiler warning 'dynamic exception specifications are
deprecated in C++11 [-Wdeprecated]'
..
Avoid compiler warning 'dynamic exception specifications are deprecated in
C++11 [-Wdeprecated]'
Change-Id: Ie472e6f92944cfe1af7d63cd644879573d080ca2
---
M host/include/usrp/usrp_local_sighandler.h
M host/lib/usrp_local_sighandler.cc
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libusrp refs/changes/53/12853/1
diff --git a/host/include/usrp/usrp_local_sighandler.h
b/host/include/usrp/usrp_local_sighandler.h
index ee33675..5553680 100644
--- a/host/include/usrp/usrp_local_sighandler.h
+++ b/host/include/usrp/usrp_local_sighandler.h
@@ -55,7 +55,7 @@
~usrp_local_sighandler ();
/* throw usrp_signal (signum) */
- static void throw_signal (int signum) throw (usrp_signal);
+ static void throw_signal (int signum);
};
#endif /* INCLUDED_USRP_LOCAL_SIGHANDLER_H */
diff --git a/host/lib/usrp_local_sighandler.cc
b/host/lib/usrp_local_sighandler.cc
index 5901397..81bc3d1 100644
--- a/host/lib/usrp_local_sighandler.cc
+++ b/host/lib/usrp_local_sighandler.cc
@@ -64,7 +64,7 @@
}
void
-usrp_local_sighandler::throw_signal(int signum) throw(usrp_signal)
+usrp_local_sighandler::throw_signal(int signum)
{
throw usrp_signal (signum);
}
--
To view, visit https://gerrit.osmocom.org/12853
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libusrp
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie472e6f92944cfe1af7d63cd644879573d080ca2
Gerrit-Change-Number: 12853
Gerrit-PatchSet: 1
Gerrit-Owner: Alexander Huemer
