[libosmocore PATCH 01/12] build: simplify test handling and speed up build.
Instead of using a ./configure parameter to decide whehter to build tests or not, use the check_PROGRAMS variable so that the tests are only built when running `make check`. To avoid slowing down the test phase itself, collapse the declaration of the test targets in the tests/Makefile.am file, this way they can be built and linked in parallel before the testsuite is executed. Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu> --- .gitignore | 1 + configure.ac | 20 -------------- tests/Makefile.am | 61 ++++++++++++++++++++++++++++++++++++-------- tests/a5/Makefile.am | 6 ---- tests/auth/Makefile.am | 8 ------ tests/bits/Makefile.am | 7 ----- tests/conv/Makefile.am | 6 ---- tests/gsm0808/Makefile.am | 6 ---- tests/lapd/Makefile.am | 9 ------ tests/msgfile/Makefile.am | 6 ---- tests/sms/Makefile.am | 6 ---- tests/smscb/Makefile.am | 6 ---- tests/timer/Makefile.am | 7 ----- tests/ussd/Makefile.am | 6 ---- 14 files changed, 51 insertions(+), 104 deletions(-) delete mode 100644 tests/a5/Makefile.am delete mode 100644 tests/auth/Makefile.am delete mode 100644 tests/bits/Makefile.am delete mode 100644 tests/conv/Makefile.am delete mode 100644 tests/gsm0808/Makefile.am delete mode 100644 tests/lapd/Makefile.am delete mode 100644 tests/msgfile/Makefile.am delete mode 100644 tests/sms/Makefile.am delete mode 100644 tests/smscb/Makefile.am delete mode 100644 tests/timer/Makefile.am delete mode 100644 tests/ussd/Makefile.am diff --git a/.gitignore b/.gitignore index 82e43e3..3c8afd9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ Makefile Makefile.in .deps +.dirstamp .libs *.o *.lo diff --git a/configure.ac b/configure.ac index 484a7dd..7c62f8f 100644 --- a/configure.ac +++ b/configure.ac @@ -59,14 +59,6 @@ AC_ARG_ENABLE(plugin, [enable_plugin=$enableval], [enable_plugin="yes"]) AM_CONDITIONAL(ENABLE_PLUGIN, test x"$enable_plugin" = x"yes") -AC_ARG_ENABLE(tests, - [AS_HELP_STRING( - [--disable-tests], - [Disable building test programs] - )], - [enable_tests=$enableval], [enable_tests="yes"]) -AM_CONDITIONAL(ENABLE_TESTS, test x"$enable_tests" = x"yes") - AC_ARG_ENABLE(vty, [AS_HELP_STRING( [--disable-vty], @@ -130,7 +122,6 @@ AC_ARG_ENABLE(embedded, if test x"$embedded" = x"yes" then AC_DEFINE([EMBEDDED],[1],[Select building for embedded use]) - AM_CONDITIONAL(ENABLE_TESTS, false) AM_CONDITIONAL(ENABLE_PLUGIN, false) AM_CONDITIONAL(ENABLE_MSGFILE, false) AM_CONDITIONAL(ENABLE_SERIAL, false) @@ -163,17 +154,6 @@ AC_OUTPUT( src/gsm/Makefile src/gb/Makefile tests/Makefile - tests/timer/Makefile - tests/sms/Makefile - tests/msgfile/Makefile - tests/ussd/Makefile - tests/smscb/Makefile - tests/bits/Makefile - tests/a5/Makefile - tests/auth/Makefile - tests/conv/Makefile - tests/lapd/Makefile - tests/gsm0808/Makefile utils/Makefile Doxyfile.core Doxyfile.gsm diff --git a/tests/Makefile.am b/tests/Makefile.am index eff1ac4..308c691 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,9 +1,45 @@ -if ENABLE_TESTS -SUBDIRS = timer sms ussd smscb bits a5 conv auth lapd gsm0808 +INCLUDES = $(all_includes) -I$(top_srcdir)/include + +check_PROGRAMS = timer/timer_test sms/sms_test ussd/ussd_test \ + smscb/smscb_test bits/bitrev_test a5/a5_test \ + conv/conv_test auth/milenage_test lapd/lapd_test \ + gsm0808/gsm0808_test if ENABLE_MSGFILE -SUBDIRS += msgfile +check_PROGRAMS += msgfile/msgfile_test endif +a5_a5_test_SOURCES = a5/a5_test.c +a5_a5_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la + +auth_milenage_test_SOURCES = auth/milenage_test.c +auth_milenage_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la + +bits_bitrev_test_SOURCES = bits/bitrev_test.c +bits_bitrev_test_LDADD = $(top_builddir)/src/libosmocore.la + +conv_conv_test_SOURCES = conv/conv_test.c +conv_conv_test_LDADD = $(top_builddir)/src/libosmocore.la + +gsm0808_gsm0808_test_SOURCES = gsm0808/gsm0808_test.c +gsm0808_gsm0808_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la + +lapd_lapd_test_SOURCES = lapd/lapd_test.c +lapd_lapd_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la + +msgfile_msgfile_test_SOURCES = msgfile/msgfile_test.c +msgfile_msgfile_test_LDADD = $(top_builddir)/src/libosmocore.la + +smscb_smscb_test_SOURCES = smscb/smscb_test.c +smscb_smscb_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la + +sms_sms_test_SOURCES = sms/sms_test.c +sms_sms_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la + +timer_timer_test_SOURCES = timer/timer_test.c +timer_timer_test_LDADD = $(top_builddir)/src/libosmocore.la + +ussd_ussd_test_SOURCES = ussd/ussd_test.c +ussd_ussd_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la # The `:;' works around a Bash 3.2 bug when the output is not writeable. $(srcdir)/package.m4: $(top_srcdir)/configure.ac @@ -22,26 +58,29 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac echo 'm4_define([AT_PACKAGE_URL],' && \ echo ' [$(PACKAGE_URL)])'; \ } >'$(srcdir)/package.m4' - -EXTRA_DIST = testsuite.at $(srcdir)/package.m4 $(TESTSUITE) + +EXTRA_DIST = testsuite.at $(srcdir)/package.m4 $(TESTSUITE) \ + timer/timer_test.ok sms/sms_test.ok ussd/ussd_test.ok \ + smscb/smscb_test.ok bits/bitrev_test.ok a5/a5_test.ok \ + conv/conv_test.ok auth/milenage_test.ok \ + lapd/lapd_test.ok gsm0808/gsm0808_test.ok \ + msgfile/msgfile_test.ok msgfile/msgconfig.cfg TESTSUITE = $(srcdir)/testsuite - + check-local: atconfig $(TESTSUITE) $(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS) - + installcheck-local: atconfig $(TESTSUITE) $(SHELL) '$(TESTSUITE)' AUTOTEST_PATH='$(bindir)' \ $(TESTSUITEFLAGS) - + clean-local: test ! -f '$(TESTSUITE)' || \ $(SHELL) '$(TESTSUITE)' --clean $(RM) -f atconfig - + AUTOM4TE = $(SHELL) $(top_srcdir)/missing --run autom4te AUTOTEST = $(AUTOM4TE) --language=autotest $(TESTSUITE): $(srcdir)/testsuite.at $(srcdir)/package.m4 $(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at mv $@.tmp $@ - -endif diff --git a/tests/a5/Makefile.am b/tests/a5/Makefile.am deleted file mode 100644 index 3c6e6ba..0000000 --- a/tests/a5/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -INCLUDES = $(all_includes) -I$(top_srcdir)/include -noinst_PROGRAMS = a5_test -EXTRA_DIST = a5_test.ok - -a5_test_SOURCES = a5_test.c -a5_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la diff --git a/tests/auth/Makefile.am b/tests/auth/Makefile.am deleted file mode 100644 index 52976d0..0000000 --- a/tests/auth/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDES = $(all_includes) -I$(top_srcdir)/include -noinst_PROGRAMS = milenage_test -EXTRA_DIST = milenage_test.ok - -milenage_test_SOURCES = milenage_test.c -milenage_test_LDADD = $(top_builddir)/src/libosmocore.la \ - $(top_builddir)/src/gsm/libosmogsm.la - diff --git a/tests/bits/Makefile.am b/tests/bits/Makefile.am deleted file mode 100644 index d6fb2f2..0000000 --- a/tests/bits/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -INCLUDES = $(all_includes) -I$(top_srcdir)/include -noinst_PROGRAMS = bitrev_test -EXTRA_DIST = bitrev_test.ok - -bitrev_test_SOURCES = bitrev_test.c -bitrev_test_LDADD = $(top_builddir)/src/libosmocore.la - diff --git a/tests/conv/Makefile.am b/tests/conv/Makefile.am deleted file mode 100644 index 75cfec8..0000000 --- a/tests/conv/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -INCLUDES = $(all_includes) -I$(top_srcdir)/include -noinst_PROGRAMS = conv_test -EXTRA_DIST = conv_test.ok - -conv_test_SOURCES = conv_test.c -conv_test_LDADD = $(top_builddir)/src/libosmocore.la diff --git a/tests/gsm0808/Makefile.am b/tests/gsm0808/Makefile.am deleted file mode 100644 index a238e7f..0000000 --- a/tests/gsm0808/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -INCLUDES = $(all_includes) -I$(top_srcdir)/include -noinst_PROGRAMS = gsm0808_test -EXTRA_DIST = gsm0808_test.ok - -gsm0808_test_SOURCES = gsm0808_test.c -gsm0808_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la diff --git a/tests/lapd/Makefile.am b/tests/lapd/Makefile.am deleted file mode 100644 index f7e2ab0..0000000 --- a/tests/lapd/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -INCLUDES = $(all_includes) -I$(top_srcdir)/include -AM_FLAGS = -Wall -O0 -noinst_PROGRAMS = lapd_test -EXTRA_DIST = lapd_test.ok - -lapd_test_SOURCES = lapd_test.c -lapd_test_LDADD = \ - $(top_builddir)/src/libosmocore.la \ - $(top_builddir)/src/gsm/libosmogsm.la diff --git a/tests/msgfile/Makefile.am b/tests/msgfile/Makefile.am deleted file mode 100644 index 88c355d..0000000 --- a/tests/msgfile/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -INCLUDES = $(all_includes) -I$(top_srcdir)/include -noinst_PROGRAMS = msgfile_test -EXTRA_DIST = msgfile_test.ok msgconfig.cfg - -msgfile_test_SOURCES = msgfile_test.c -msgfile_test_LDADD = $(top_builddir)/src/libosmocore.la diff --git a/tests/sms/Makefile.am b/tests/sms/Makefile.am deleted file mode 100644 index 02860af..0000000 --- a/tests/sms/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -INCLUDES = $(all_includes) -I$(top_srcdir)/include -noinst_PROGRAMS = sms_test -EXTRA_DIST = sms_test.ok - -sms_test_SOURCES = sms_test.c -sms_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la diff --git a/tests/smscb/Makefile.am b/tests/smscb/Makefile.am deleted file mode 100644 index 7045ea7..0000000 --- a/tests/smscb/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -INCLUDES = $(all_includes) -I$(top_srcdir)/include -noinst_PROGRAMS = smscb_test -EXTRA_DIST = smscb_test.ok - -smscb_test_SOURCES = smscb_test.c -smscb_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la diff --git a/tests/timer/Makefile.am b/tests/timer/Makefile.am deleted file mode 100644 index 062d81b..0000000 --- a/tests/timer/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -INCLUDES = $(all_includes) -I$(top_srcdir)/include -noinst_PROGRAMS = timer_test -EXTRA_DIST = timer_test.ok - -timer_test_SOURCES = timer_test.c -timer_test_LDADD = $(top_builddir)/src/libosmocore.la - diff --git a/tests/ussd/Makefile.am b/tests/ussd/Makefile.am deleted file mode 100644 index de9ff89..0000000 --- a/tests/ussd/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -INCLUDES = $(all_includes) -I$(top_srcdir)/include -noinst_PROGRAMS = ussd_test -EXTRA_DIST = ussd_test.ok - -ussd_test_SOURCES = ussd_test.c -ussd_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la -- 1.7.8.6
There is no real reason to keep the include directory a multi-level recursion, so instead declare everything within include (so that we can use proper nobase_ declarations) and be it. Please note that since we removed the sub-Makefile.am, ./configure will not create the directory structure for us on out-of-tree builds, so we have to make sure the directory we're generating to exists first. Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu> --- configure.ac | 10 +--- include/Makefile.am | 105 ++++++++++++++++++++++++++++- include/osmocom/Makefile.am | 5 -- include/osmocom/codec/Makefile.am | 3 - include/osmocom/core/Makefile.am | 31 --------- include/osmocom/crypt/Makefile.am | 3 - include/osmocom/gprs/Makefile.am | 5 -- include/osmocom/gprs/protocol/Makefile.am | 3 - include/osmocom/gsm/Makefile.am | 8 -- include/osmocom/gsm/protocol/Makefile.am | 6 -- include/osmocom/vty/Makefile.am | 4 - 11 files changed, 105 insertions(+), 78 deletions(-) delete mode 100644 include/osmocom/Makefile.am delete mode 100644 include/osmocom/codec/Makefile.am delete mode 100644 include/osmocom/core/Makefile.am delete mode 100644 include/osmocom/crypt/Makefile.am delete mode 100644 include/osmocom/gprs/Makefile.am delete mode 100644 include/osmocom/gprs/protocol/Makefile.am delete mode 100644 include/osmocom/gsm/Makefile.am delete mode 100644 include/osmocom/gsm/protocol/Makefile.am delete mode 100644 include/osmocom/vty/Makefile.am diff --git a/configure.ac b/configure.ac index 7c62f8f..728173e 100644 --- a/configure.ac +++ b/configure.ac @@ -10,6 +10,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) dnl checks for programs AC_PROG_MAKE_SET +AC_PROG_MKDIR_P AC_PROG_CC AC_PROG_INSTALL LT_INIT @@ -138,15 +139,6 @@ AC_OUTPUT( libosmovty.pc libosmogsm.pc libosmogb.pc - include/osmocom/Makefile - include/osmocom/vty/Makefile - include/osmocom/codec/Makefile - include/osmocom/crypt/Makefile - include/osmocom/gsm/Makefile - include/osmocom/gsm/protocol/Makefile - include/osmocom/gprs/Makefile - include/osmocom/gprs/protocol/Makefile - include/osmocom/core/Makefile include/Makefile src/Makefile src/vty/Makefile diff --git a/include/Makefile.am b/include/Makefile.am index 3578a80..1eae2dd 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1 +1,104 @@ -SUBDIRS = osmocom +nobase_include_HEADERS = \ + osmocom/codec/codec.h \ + osmocom/core/application.h \ + osmocom/core/backtrace.h \ + osmocom/core/bits.h \ + osmocom/core/bitvec.h \ + osmocom/core/conv.h \ + osmocom/core/crc16.h \ + osmocom/core/crc16gen.h \ + osmocom/core/crc32gen.h \ + osmocom/core/crc64gen.h \ + osmocom/core/crc8gen.h \ + osmocom/core/crcgen.h \ + osmocom/core/gsmtap.h \ + osmocom/core/gsmtap_util.h \ + osmocom/core/linuxlist.h \ + osmocom/core/linuxrbtree.h \ + osmocom/core/logging.h \ + osmocom/core/msgb.h \ + osmocom/core/panic.h \ + osmocom/core/prim.h \ + osmocom/core/process.h \ + osmocom/core/rate_ctr.h \ + osmocom/core/select.h \ + osmocom/core/signal.h \ + osmocom/core/socket.h \ + osmocom/core/statistics.h \ + osmocom/core/timer.h \ + osmocom/core/utils.h \ + osmocom/core/write_queue.h \ + osmocom/crypt/auth.h \ + osmocom/crypt/gprs_cipher.h \ + osmocom/gprs/gprs_bssgp.h \ + osmocom/gprs/gprs_msgb.h \ + osmocom/gprs/gprs_ns.h \ + osmocom/gprs/gprs_ns_frgre.h \ + osmocom/gprs/protocol/gsm_08_16.h \ + osmocom/gprs/protocol/gsm_08_18.h \ + osmocom/gsm/a5.h \ + osmocom/gsm/abis_nm.h \ + osmocom/gsm/comp128.h \ + osmocom/gsm/gan.h \ + osmocom/gsm/gsm0411_smc.h \ + osmocom/gsm/gsm0411_smr.h \ + osmocom/gsm/gsm0411_utils.h \ + osmocom/gsm/gsm0480.h \ + osmocom/gsm/gsm0502.h \ + osmocom/gsm/gsm0808.h \ + osmocom/gsm/gsm48.h \ + osmocom/gsm/gsm48_ie.h \ + osmocom/gsm/gsm_utils.h \ + osmocom/gsm/lapd_core.h \ + osmocom/gsm/lapdm.h \ + osmocom/gsm/mncc.h \ + osmocom/gsm/prim.h \ + osmocom/gsm/protocol/gsm_03_41.h \ + osmocom/gsm/protocol/gsm_04_08.h \ + osmocom/gsm/protocol/gsm_04_11.h \ + osmocom/gsm/protocol/gsm_04_12.h \ + osmocom/gsm/protocol/gsm_04_80.h \ + osmocom/gsm/protocol/gsm_08_08.h \ + osmocom/gsm/protocol/gsm_08_58.h \ + osmocom/gsm/protocol/gsm_12_21.h \ + osmocom/gsm/protocol/gsm_44_318.h \ + osmocom/gsm/protocol/ipaccess.h \ + osmocom/gsm/rsl.h \ + osmocom/gsm/rxlev_stat.h \ + osmocom/gsm/sysinfo.h \ + osmocom/gsm/tlv.h + +if ENABLE_PLUGIN +nobase_include_HEADERS += osmocom/core/plugin.h +endif + +if ENABLE_TALLOC +nobase_include_HEADERS += osmocom/core/talloc.h +endif + +if ENABLE_MSGFILE +nobase_include_HEADERS += osmocom/core/msgfile.h +endif + +if ENABLE_SERIAL +nobase_include_HEADERS += osmocom/core/serial.h +endif + + +if ENABLE_VTY +nobase_include_HEADERS += \ + osmocom/vty/buffer.h \ + osmocom/vty/command.h \ + osmocom/vty/logging.h \ + osmocom/vty/misc.h \ + osmocom/vty/telnet_interface.h \ + osmocom/vty/vector.h \ + osmocom/vty/vty.h +endif + +noinst_HEADERS = osmocom/core/timer_compat.h + +osmocom/core/crc%gen.h: osmocom/core/crcXXgen.h.tpl + $(AM_V_GEN)$(MKDIR_P) $(notdir $@) + @echo " SED $< -> $@" + @sed -e's/XX/$*/g' $< > $@ diff --git a/include/osmocom/Makefile.am b/include/osmocom/Makefile.am deleted file mode 100644 index bd3b89b..0000000 --- a/include/osmocom/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -if ENABLE_VTY -SUBDIRS = vty codec crypt gsm gprs core -else -SUBDIRS = codec crypt gsm gprs core -endif diff --git a/include/osmocom/codec/Makefile.am b/include/osmocom/codec/Makefile.am deleted file mode 100644 index c213602..0000000 --- a/include/osmocom/codec/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -osmocodec_HEADERS = codec.h - -osmocodecdir = $(includedir)/osmocom/codec diff --git a/include/osmocom/core/Makefile.am b/include/osmocom/core/Makefile.am deleted file mode 100644 index 1df111a..0000000 --- a/include/osmocom/core/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -osmocore_HEADERS = signal.h linuxlist.h timer.h select.h msgb.h bits.h \ - bitvec.h statistics.h utils.h socket.h \ - gsmtap.h write_queue.h prim.h \ - logging.h rate_ctr.h gsmtap_util.h \ - crc16.h panic.h process.h linuxrbtree.h \ - backtrace.h conv.h application.h \ - crcgen.h crc8gen.h crc16gen.h crc32gen.h crc64gen.h - -noinst_HEADERS = timer_compat.h - -if ENABLE_PLUGIN -osmocore_HEADERS += plugin.h -endif - -if ENABLE_TALLOC -osmocore_HEADERS += talloc.h -endif - -if ENABLE_MSGFILE -osmocore_HEADERS += msgfile.h -endif - -if ENABLE_SERIAL -osmocore_HEADERS += serial.h -endif - -osmocoredir = $(includedir)/osmocom/core - -crc%gen.h: crcXXgen.h.tpl - @echo " SED $< -> $@" - @sed -e's/XX/$*/g' $< > $@ diff --git a/include/osmocom/crypt/Makefile.am b/include/osmocom/crypt/Makefile.am deleted file mode 100644 index e4a6e53..0000000 --- a/include/osmocom/crypt/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -osmocrypt_HEADERS = gprs_cipher.h auth.h - -osmocryptdir = $(includedir)/osmocom/crypt diff --git a/include/osmocom/gprs/Makefile.am b/include/osmocom/gprs/Makefile.am deleted file mode 100644 index d39592c..0000000 --- a/include/osmocom/gprs/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -libgb_HEADERS = gprs_bssgp.h gprs_ns.h gprs_ns_frgre.h gprs_msgb.h - -libgbdir = $(includedir)/osmocom/gprs - -SUBDIRS = protocol diff --git a/include/osmocom/gprs/protocol/Makefile.am b/include/osmocom/gprs/protocol/Makefile.am deleted file mode 100644 index 8255a95..0000000 --- a/include/osmocom/gprs/protocol/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -libgbp_HEADERS = gsm_08_16.h gsm_08_18.h - -libgbpdir = $(includedir)/osmocom/gprs/protocol diff --git a/include/osmocom/gsm/Makefile.am b/include/osmocom/gsm/Makefile.am deleted file mode 100644 index 60ba48b..0000000 --- a/include/osmocom/gsm/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -osmogsm_HEADERS = a5.h comp128.h gsm0808.h gsm48_ie.h mncc.h rxlev_stat.h \ - gsm0480.h gsm48.h gsm_utils.h rsl.h tlv.h abis_nm.h \ - sysinfo.h prim.h gsm0502.h lapd_core.h lapdm.h \ - gsm0411_utils.h gsm0411_smc.h gsm0411_smr.h gan.h - -SUBDIRS = protocol - -osmogsmdir = $(includedir)/osmocom/gsm diff --git a/include/osmocom/gsm/protocol/Makefile.am b/include/osmocom/gsm/protocol/Makefile.am deleted file mode 100644 index 6ed55e4..0000000 --- a/include/osmocom/gsm/protocol/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -osmogsm_proto_HEADERS = gsm_03_41.h \ - gsm_04_08.h gsm_04_11.h gsm_04_12.h gsm_04_80.h \ - gsm_08_08.h gsm_08_58.h gsm_44_318.h \ - gsm_12_21.h ipaccess.h - -osmogsm_protodir = $(includedir)/osmocom/gsm/protocol diff --git a/include/osmocom/vty/Makefile.am b/include/osmocom/vty/Makefile.am deleted file mode 100644 index 83d0010..0000000 --- a/include/osmocom/vty/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -osmovty_HEADERS = buffer.h command.h vector.h vty.h \ - telnet_interface.h logging.h misc.h - -osmovtydir = $(includedir)/osmocom/vty -- 1.7.8.6
This actually allows for the command to be printed if using `make V=1` Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu> --- include/Makefile.am | 3 +-- src/Makefile.am | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/Makefile.am b/include/Makefile.am index 1eae2dd..dec8eac 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -100,5 +100,4 @@ noinst_HEADERS = osmocom/core/timer_compat.h osmocom/core/crc%gen.h: osmocom/core/crcXXgen.h.tpl $(AM_V_GEN)$(MKDIR_P) $(notdir $@) - @echo " SED $< -> $@" - @sed -e's/XX/$*/g' $< > $@ + $(AM_V_GEN)sed -e's/XX/$*/g' $< > $@ diff --git a/src/Makefile.am b/src/Makefile.am index b79c8b7..36f95ee 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -39,5 +39,4 @@ libosmocore_la_SOURCES += serial.c endif crc%gen.c: crcXXgen.c.tpl - @echo " SED $< -> $@" - @sed -e's/XX/$*/g' $< > $@ + $(AM_V_GEN)sed -e's/XX/$*/g' $< > $@ -- 1.7.8.6
This avoids possible race conditions on heavily multi-core systems. Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu> --- src/Makefile.am | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 36f95ee..6540098 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -17,6 +17,8 @@ libosmocore_la_SOURCES = timer.c select.c signal.c msgb.c bits.c \ conv.c application.c rbtree.c \ crc8gen.c crc16gen.c crc32gen.c crc64gen.c +BUILT_SOURCES = crc8gen.c crc16gen.c crc32gen.c crc64gen.c + if ENABLE_PLUGIN libosmocore_la_SOURCES += plugin.c libosmocore_la_LDFLAGS = -version-info $(LIBVERSION) $(LIBRARY_DL) -- 1.7.8.6
There's little to no point to build the gzip version of the tarball when we're building the bzip2 version. Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu> --- Makefile.am | 1 - configure.ac | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 9fdb4ab..794d1a2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,3 @@ -AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6 ACLOCAL_AMFLAGS = -I m4 INCLUDES = $(all_includes) -I$(top_srcdir)/include diff --git a/configure.ac b/configure.ac index 728173e..42d7b57 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ AC_INIT([libosmocore], m4_esyscmd([./git-version-gen .tarball-version]), [openbsc@lists.osmocom.org]) -AM_INIT_AUTOMAKE([dist-bzip2]) +AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip 1.6]) AC_CONFIG_TESTDIR(tests) dnl kernel style compile messages -- 1.7.8.6
This line was reporting "command not found" and should not be a problem, as there's a check for the same thing later on. Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu> --- configure.ac | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index 42d7b57..deb5fd4 100644 --- a/configure.ac +++ b/configure.ac @@ -15,7 +15,6 @@ AC_PROG_CC AC_PROG_INSTALL LT_INIT AC_PROG_LIBTOOL -CHECK_GCC_FVISIBILITY AC_CONFIG_MACRO_DIR([m4]) -- 1.7.8.6
Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu> --- configure.ac | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index deb5fd4..b0c0fb7 100644 --- a/configure.ac +++ b/configure.ac @@ -14,7 +14,6 @@ AC_PROG_MKDIR_P AC_PROG_CC AC_PROG_INSTALL LT_INIT -AC_PROG_LIBTOOL AC_CONFIG_MACRO_DIR([m4]) -- 1.7.8.6
Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu> --- Makefile.am | 2 +- src/Makefile.am | 2 -- 2 files changed, 1 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 794d1a2..d135e7f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ ACLOCAL_AMFLAGS = -I m4 INCLUDES = $(all_includes) -I$(top_srcdir)/include -SUBDIRS = include src tests utils +SUBDIRS = include src src/vty src/codec src/gsm src/gb tests utils pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libosmocore.pc libosmocodec.pc libosmovty.pc libosmogsm.pc \ diff --git a/src/Makefile.am b/src/Makefile.am index 6540098..d38082b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,3 @@ -SUBDIRS=. vty codec gsm gb - # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification LIBVERSION=4:0:0 -- 1.7.8.6
Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu> --- Makefile.am | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am index d135e7f..d0fb027 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,12 +17,9 @@ EXTRA_DIST = git-version-gen if HAVE_DOXYGEN -pkgdocdir=$(docdir)/$(PACKAGE)-$(VERSION) -doc_htmldir=$(pkgdocdir)/html +html_DATA = $(top_builddir)/doc/html.tar -doc_html_DATA = $(top_builddir)/doc/html.tar - -$(doc_html_DATA): $(top_builddir)/doc/core/html/index.html \ +$(html_DATA): $(top_builddir)/doc/core/html/index.html \ $(top_builddir)/doc/gsm/html/index.html \ $(top_builddir)/doc/vty/html/index.html \ $(top_builddir)/doc/codec/html/index.html @@ -49,10 +46,10 @@ $(top_builddir)/doc/codec/html/index.html: $(SOURCES) Doxyfile.codec $(DOXYGEN) Doxyfile.codec install-data-hook: - cd $(DESTDIR)$(doc_htmldir) && tar xf html.tar && rm -f html.tar + cd $(DESTDIR)$(htmldir) && tar xf html.tar && rm -f html.tar uninstall-hook: - cd $(DESTDIR)$(doc_htmldir) && rm -rf {core,gsm,vty,codec} + cd $(DESTDIR)$(htmldir) && rm -rf {core,gsm,vty,codec} DX_CLEAN = doc/{core,gsm,vty,codec}/{html,latex}/* doc/html.tar endif -- 1.7.8.6
When declaring them constant, they are written on the .rodata section instead of .data, which means that they can be mapped directly from disk to memory. Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu> --- include/osmocom/codec/codec.h | 24 ++++++++++++------------ src/codec/gsm610.c | 2 +- src/codec/gsm620.c | 4 ++-- src/codec/gsm660.c | 2 +- src/codec/gsm690.c | 16 ++++++++-------- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/include/osmocom/codec/codec.h b/include/osmocom/codec/codec.h index 6f9ffea..81f5d4b 100644 --- a/include/osmocom/codec/codec.h +++ b/include/osmocom/codec/codec.h @@ -3,18 +3,18 @@ #include <stdint.h> -extern uint16_t gsm610_bitorder[]; /* FR */ -extern uint16_t gsm620_unvoiced_bitorder[]; /* HR unvoiced */ -extern uint16_t gsm620_voiced_bitorder[]; /* HR voiced */ -extern uint16_t gsm660_bitorder[]; /* EFR */ +extern const uint16_t gsm610_bitorder[]; /* FR */ +extern const uint16_t gsm620_unvoiced_bitorder[]; /* HR unvoiced */ +extern const uint16_t gsm620_voiced_bitorder[]; /* HR voiced */ +extern const uint16_t gsm660_bitorder[]; /* EFR */ -extern uint16_t gsm690_12_2_bitorder[]; /* AMR 12.2 kbits */ -extern uint16_t gsm690_10_2_bitorder[]; /* AMR 10.2 kbits */ -extern uint16_t gsm690_7_95_bitorder[]; /* AMR 7.95 kbits */ -extern uint16_t gsm690_7_4_bitorder[]; /* AMR 7.4 kbits */ -extern uint16_t gsm690_6_7_bitorder[]; /* AMR 6.7 kbits */ -extern uint16_t gsm690_5_9_bitorder[]; /* AMR 5.9 kbits */ -extern uint16_t gsm690_5_15_bitorder[]; /* AMR 5.15 kbits */ -extern uint16_t gsm690_4_75_bitorder[]; /* AMR 4.75 kbits */ +extern const uint16_t gsm690_12_2_bitorder[]; /* AMR 12.2 kbits */ +extern const uint16_t gsm690_10_2_bitorder[]; /* AMR 10.2 kbits */ +extern const uint16_t gsm690_7_95_bitorder[]; /* AMR 7.95 kbits */ +extern const uint16_t gsm690_7_4_bitorder[]; /* AMR 7.4 kbits */ +extern const uint16_t gsm690_6_7_bitorder[]; /* AMR 6.7 kbits */ +extern const uint16_t gsm690_5_9_bitorder[]; /* AMR 5.9 kbits */ +extern const uint16_t gsm690_5_15_bitorder[]; /* AMR 5.15 kbits */ +extern const uint16_t gsm690_4_75_bitorder[]; /* AMR 4.75 kbits */ #endif /* _OSMOCOM_CODEC_H */ diff --git a/src/codec/gsm610.c b/src/codec/gsm610.c index 09fbeb5..35f6011 100644 --- a/src/codec/gsm610.c +++ b/src/codec/gsm610.c @@ -30,7 +30,7 @@ * It converts between serial parameter output by the encoder and the * order needed before channel encoding. */ -uint16_t gsm610_bitorder[260] = { +const uint16_t gsm610_bitorder[260] = { 0, /* LARc0:5 */ 47, /* Xmaxc0:5 */ 103, /* Xmaxc1:5 */ diff --git a/src/codec/gsm620.c b/src/codec/gsm620.c index 09aca50..fa570e4 100644 --- a/src/codec/gsm620.c +++ b/src/codec/gsm620.c @@ -27,7 +27,7 @@ /* This array encode mapping between GSM 05.03 Table 3a (bits * ordering before channel coding on TCH) and GSM 06.20 Table B.1 * (bit ordering on A-bis */ -uint16_t gsm620_unvoiced_bitorder[112] = { +const uint16_t gsm620_unvoiced_bitorder[112] = { 3, /* R0:1 */ 25, /* LPC 3:7 */ 52, /* GSP 0-1:2 */ @@ -146,7 +146,7 @@ uint16_t gsm620_unvoiced_bitorder[112] = { /* This array encode mapping between GSM 05.03 Table 3b (bits * ordering before channel coding on TCH) and GSM 06.20 Table B.2 * (bit ordering on A-bis */ -uint16_t gsm620_voiced_bitorder[112] = { +const uint16_t gsm620_voiced_bitorder[112] = { 13, /* LPC 1:2 */ 14, /* LPC 1:1 */ 20, /* LPC 2:4 */ diff --git a/src/codec/gsm660.c b/src/codec/gsm660.c index 4fff5ff..c044a2a 100644 --- a/src/codec/gsm660.c +++ b/src/codec/gsm660.c @@ -32,7 +32,7 @@ * applied prior to this table, as in GSM 05.03 3.1.1, to get 260 * bits from a 244 bits raw EFR frame. */ -uint16_t gsm660_bitorder[260] = { +const uint16_t gsm660_bitorder[260] = { 38, 39, 40, 41, 42, 43, /* 0 -> LTP-LAG 1: b8..b3 */ 145, 146, 147, 148, 149, 150, /* 6 -> LTP-LAG 3: b8..b3 */ 93, 94, /* 12 -> LTP-LAG 2: b5..b4 */ diff --git a/src/codec/gsm690.c b/src/codec/gsm690.c index e5b9bd4..fdf3302 100644 --- a/src/codec/gsm690.c +++ b/src/codec/gsm690.c @@ -33,7 +33,7 @@ /* This array encodes GSM 05.03 Table 7 * It's also TS 26.101 Table B.8 */ -uint16_t gsm690_12_2_bitorder[244] = { +const uint16_t gsm690_12_2_bitorder[244] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 23, 15, 16, 17, 18, 19, 20, 21, 22, 24, 25, 26, 27, 28, 38, @@ -65,7 +65,7 @@ uint16_t gsm690_12_2_bitorder[244] = { /* This array encodes GSM 05.03 Table 8 * It's also TS 26.101 Table B.7 */ -uint16_t gsm690_10_2_bitorder[204] = { +const uint16_t gsm690_10_2_bitorder[204] = { 7, 6, 5, 4, 3, 2, 1, 0, 16, 15, 14, 13, 12, 11, 10, 9, 8, 26, 27, 28, 29, 30, 31, 115, 116, 117, 118, 119, 120, 72, @@ -93,7 +93,7 @@ uint16_t gsm690_10_2_bitorder[204] = { /* This array encodes GSM 05.03 Table 9 * It's also TS 26.101 Table B.6 */ -uint16_t gsm690_7_95_bitorder[159] = { +const uint16_t gsm690_7_95_bitorder[159] = { 8, 7, 6, 5, 4, 3, 2, 14, 16, 9, 10, 12, 13, 15, 11, 17, 20, 22, 24, 23, 19, 18, 21, 56, 88, 122, 154, 57, 89, 123, @@ -116,7 +116,7 @@ uint16_t gsm690_7_95_bitorder[159] = { /* This array encodes GSM 05.03 Table 10 * It's also TS 26.101 Table B.5 */ -uint16_t gsm690_7_4_bitorder[148] = { +const uint16_t gsm690_7_4_bitorder[148] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 26, 87, 27, 88, 28, 89, 29, 90, 30, 91, 51, 80, 112, @@ -138,7 +138,7 @@ uint16_t gsm690_7_4_bitorder[148] = { /* This array encodes GSM 05.03 Table 11 * It's also TS 26.101 Table B.4 */ -uint16_t gsm690_6_7_bitorder[134] = { +const uint16_t gsm690_6_7_bitorder[134] = { 0, 1, 4, 3, 5, 6, 13, 7, 2, 8, 9, 11, 15, 12, 14, 10, 28, 82, 29, 83, 27, 81, 26, 80, 30, 84, 16, 55, 109, 56, @@ -159,7 +159,7 @@ uint16_t gsm690_6_7_bitorder[134] = { /* This array encodes GSM 05.03 Table 12 * It's also TS 26.101 Table B.3 */ -uint16_t gsm690_5_9_bitorder[118] = { +const uint16_t gsm690_5_9_bitorder[118] = { 0, 1, 4, 5, 3, 6, 7, 2, 13, 15, 8, 9, 11, 12, 14, 10, 16, 28, 74, 29, 75, 27, 73, 26, 72, 30, 76, 51, 97, 50, @@ -178,7 +178,7 @@ uint16_t gsm690_5_9_bitorder[118] = { /* This array encodes GSM 05.03 Table 13 * It's also TS 26.101 Table B.2 */ -uint16_t gsm690_5_15_bitorder[103] = { +const uint16_t gsm690_5_15_bitorder[103] = { 7, 6, 5, 4, 3, 2, 1, 0, 15, 14, 13, 12, 11, 10, 9, 8, 23, 24, 25, 26, 27, 46, 65, 84, 45, 44, 43, 64, 63, 62, @@ -196,7 +196,7 @@ uint16_t gsm690_5_15_bitorder[103] = { /* This array encodes GSM 05.03 Table 14 * It's also TS 26.101 Table B.1 */ -uint16_t gsm690_4_75_bitorder[95] = { +const uint16_t gsm690_4_75_bitorder[95] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 23, 24, 25, 26, 27, 28, 48, 49, 61, 62, 82, 83, 47, 46, -- 1.7.8.6
no_password_check was the only initialized, non-relocated data in the set of libraries, inverting its logic let us keep it in .bss (non-initialized data, which is mapped to the zero page). Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu> --- src/vty/vty.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/vty/vty.c b/src/vty/vty.c index 28c2266..67ee100 100644 --- a/src/vty/vty.c +++ b/src/vty/vty.c @@ -78,7 +78,7 @@ char *vty_cwd = NULL; /* Configure lock. */ static int vty_config; -static int no_password_check = 1; +static int password_check; void *tall_vty_ctx; @@ -1492,7 +1492,7 @@ vty_create (int vty_sock, void *priv) vty->fd = vty_sock; vty->priv = priv; vty->type = VTY_TERM; - if (no_password_check) + if (!password_check) { if (host.advanced) vty->node = ENABLE_NODE; @@ -1515,7 +1515,7 @@ vty_create (int vty_sock, void *priv) else vty->lines = -1; - if (! no_password_check) + if (password_check) { /* Vty is not available if password isn't set. */ if (host.password == NULL && host.password_encrypt == NULL) @@ -1529,7 +1529,7 @@ vty_create (int vty_sock, void *priv) /* Say hello to the world. */ vty_hello (vty); - if (! no_password_check) + if (password_check) vty_out (vty, "%sUser Access Verification%s%s", VTY_NEWLINE, VTY_NEWLINE, VTY_NEWLINE); /* Setting up terminal. */ @@ -1573,14 +1573,14 @@ DEFUN(line_vty, /* vty login. */ DEFUN(vty_login, vty_login_cmd, "login", "Enable password checking\n") { - no_password_check = 0; + password_check = 1; return CMD_SUCCESS; } DEFUN(no_vty_login, no_vty_login_cmd, "no login", NO_STR "Enable password checking\n") { - no_password_check = 1; + password_check = 0; return CMD_SUCCESS; } @@ -1650,7 +1650,7 @@ static int vty_config_write(struct vty *vty) vty_out(vty, "line vty%s", VTY_NEWLINE); /* login */ - if (no_password_check) + if (password_check) vty_out(vty, " no login%s", VTY_NEWLINE); vty_out(vty, "!%s", VTY_NEWLINE); -- 1.7.8.6
This actually allows for the user to override the decision and at the same time supports compilers that might not be able to use -fPIC at all. Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu> --- configure.ac | 2 +- src/Makefile.am | 2 +- src/codec/Makefile.am | 2 +- src/gb/Makefile.am | 2 +- src/gsm/Makefile.am | 2 +- src/vty/Makefile.am | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index b0c0fb7..3e88a1b 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ AC_PROG_MAKE_SET AC_PROG_MKDIR_P AC_PROG_CC AC_PROG_INSTALL -LT_INIT +LT_INIT([pic-only]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/src/Makefile.am b/src/Makefile.am index d38082b..d719df7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,7 +3,7 @@ LIBVERSION=4:0:0 INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include -AM_CFLAGS = -fPIC -Wall +AM_CFLAGS = -Wall lib_LTLIBRARIES = libosmocore.la diff --git a/src/codec/Makefile.am b/src/codec/Makefile.am index d36e23f..665768c 100644 --- a/src/codec/Makefile.am +++ b/src/codec/Makefile.am @@ -3,7 +3,7 @@ LIBVERSION=0:0:0 INCLUDES = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS = -fPIC -Wall +AM_CFLAGS = -Wall lib_LTLIBRARIES = libosmocodec.la diff --git a/src/gb/Makefile.am b/src/gb/Makefile.am index 2b60464..7381ed4 100644 --- a/src/gb/Makefile.am +++ b/src/gb/Makefile.am @@ -3,7 +3,7 @@ LIBVERSION=1:0:0 INCLUDES = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS = -fPIC -Wall ${GCC_FVISIBILITY_HIDDEN} +AM_CFLAGS = -Wall ${GCC_FVISIBILITY_HIDDEN} # FIXME: this should eventually go into a milenage/Makefile.am noinst_HEADERS = common_vty.h diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am index 167aeb7..81a318b 100644 --- a/src/gsm/Makefile.am +++ b/src/gsm/Makefile.am @@ -3,7 +3,7 @@ LIBVERSION=2:0:1 INCLUDES = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS = -fPIC -Wall ${GCC_FVISIBILITY_HIDDEN} +AM_CFLAGS = -Wall ${GCC_FVISIBILITY_HIDDEN} # FIXME: this should eventually go into a milenage/Makefile.am noinst_HEADERS = milenage/aes.h milenage/aes_i.h milenage/aes_wrap.h \ diff --git a/src/vty/Makefile.am b/src/vty/Makefile.am index b7be6f8..6111123 100644 --- a/src/vty/Makefile.am +++ b/src/vty/Makefile.am @@ -3,7 +3,7 @@ LIBVERSION=0:0:0 INCLUDES = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS = -fPIC -Wall +AM_CFLAGS = -Wall if ENABLE_VTY lib_LTLIBRARIES = libosmovty.la -- 1.7.8.6
This actually allows for the user to override the decision and at the same time supports compilers that might not be able to use -fPIC at all.
Your patch doesn't apply cleanly over the libosmocore master Cheers, Sylvain
On Fri, Jun 29, 2012 at 10:15 PM, Sylvain Munaut <246tnt@gmail.com> wrote:
This actually allows for the user to override the decision and at the same time supports compilers that might not be able to use -fPIC at all.
Your patch doesn't apply cleanly over the libosmocore master
Err, nevermind, I didn't see the 12/12 in the title and had only 1 patch in my mailbox when I tried it :p
Sylvain Munaut wrote:
Your patch doesn't apply cleanly over the libosmocore master
Err, nevermind, I didn't see the 12/12 in the title and had only 1 patch in my mailbox when I tried it :p
All patches look fine to me, except possibly for the typo in the 1/12 commit message. //Peter
Il 29/06/2012 22:15, Sylvain Munaut ha scritto:
Your patch doesn't apply cleanly over the libosmocore master
The series is interwinded enough that it has to be applied one after the other. Unfortunately some of the patches got stuck into the moderator's queue because I didn't wait long enough between the "confirm subscription" and the `git send-email` execution. -- Diego Elio Pettenò — Flameeyes flameeyes@flameeyes.eu — http://blog.flameeyes.eu/
Hi Diego, thanks a lot for your patches. It seems like you have a lot of auto-foo experience to share. I'm merging them right now. In case you find some more time, I would appreciate if you could also look at some of the other osmocom.org repositories, including openbsc, libosmo-sccp, libosmo-abis, and even the non-firmware parts of osmocom-bb, ... Regards, Harald -- - Harald Welte <laforge@gnumonks.org> http://laforge.gnumonks.org/ ============================================================================ "Privacy in residential applications is a desirable marketing option." (ETSI EN 300 175-7 Ch. A6)
Hi Harald, Il 30/06/2012 22:07, Harald Welte ha scritto:
thanks a lot for your patches. It seems like you have a lot of auto-foo experience to share. I'm merging them right now.
Thank you! I have been working with autotools (and other build system) for a while — and I've been spending some extra free time trying to improve what's on most people's eyes so that they don't learn on outdated or broken examples. For what it's worth, I also started writing a guide of my own: http://www.flameeyes.eu/autotools-mythbuster/ You can use it as a reference — and feel free to send me any question that's neither covered by the patch or the guide if you have doubts.
In case you find some more time, I would appreciate if you could also look at some of the other osmocom.org repositories, including openbsc, libosmo-sccp, libosmo-abis, and even the non-firmware parts of osmocom-bb, ...
I'll do that this week — I wanted to make sure the style was acceptable before spending a couple of days on patches that could have been rejected just for the way they were written, so I started with libosmocore alone — incidentally, this is the only one for which a release is in Gentoo, thus why I noticed this (yes the serial-building of tests was noticeable on a system with 32 cores.) Thanks again, and will send soon more patches, -- Diego Elio Pettenò — Flameeyes flameeyes@flameeyes.eu — http://blog.flameeyes.eu/
Diego Elio Pettenò wrote:
I started with libosmocore alone — incidentally, this is the only one for which a release is in Gentoo
I'll see if I can add a release ebuild for OpenBSC to my 'stuge' overlay either during the night or during tomorrow. //Peter
--- src/vty/vty.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/vty/vty.c b/src/vty/vty.c index 67ee100..e529ee7 100644 --- a/src/vty/vty.c +++ b/src/vty/vty.c @@ -1650,7 +1650,7 @@ static int vty_config_write(struct vty *vty) vty_out(vty, "line vty%s", VTY_NEWLINE); /* login */ - if (password_check) + if (!password_check) vty_out(vty, " no login%s", VTY_NEWLINE); vty_out(vty, "!%s", VTY_NEWLINE); -- 1.7.2.5
On Wed, Jul 04, 2012 at 11:31:54AM +0200, Alexander Huemer wrote:
--- src/vty/vty.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/vty/vty.c b/src/vty/vty.c index 67ee100..e529ee7 100644 --- a/src/vty/vty.c +++ b/src/vty/vty.c @@ -1650,7 +1650,7 @@ static int vty_config_write(struct vty *vty) vty_out(vty, "line vty%s", VTY_NEWLINE);
/* login */ - if (password_check) + if (!password_check) vty_out(vty, " no login%s", VTY_NEWLINE);
vty_out(vty, "!%s", VTY_NEWLINE); -- 1.7.2.5
Since a week has past since I submitted this patch and it was not yet merged, here a short reminder. The problem was btw discussed with Diego Elio Pettenò, the author of the pristine commit. Kind regards, -Alexander Huemer
Since a week has past since I submitted this patch and it was not yet merged, here a short reminder. The problem was btw discussed with Diego Elio Pettenò, the author of the pristine commit.
Sorry for the delays, patch has been merged! Thanks for the catch. Luckily we never really used the password feature anywhere, as far as I can think. -- - Harald Welte <laforge@gnumonks.org> http://laforge.gnumonks.org/ ============================================================================ "Privacy in residential applications is a desirable marketing option." (ETSI EN 300 175-7 Ch. A6)
participants (5)
-
Alexander Huemer -
Diego Elio Pettenò -
Harald Welte -
Peter Stuge -
Sylvain Munaut