Changes - SailfishOS Open Build Service

Changes of Revision 4

[-] [+]	Changed	_service:tar_git:libncicore.changes
@@ -1,3 +1,13 @@ +* Mon Dec 12 2022 Slava Monich <slava@monich.com> - 1.1.20 +- [build] Fixed a problem with version parsing. JB#47922 +- [debian] Bumped debhelper compat level to 7. JB#47922 +- [debian] Updated dependencies. JB#47922 + +* Wed Dec 01 2021 Slava Monich <slava.monich@jolla.com> - 1.1.19 +- [debian] Freshened up license +- [rpm] Install license file. JB#55991 +- [unit] Housekeeping + * Wed Feb 24 2021 Slava Monich <slava.monich@jolla.com> - 1.1.18 - [ncicore] Configure ATR_RES and ATR_REQ for NFC-DEP. JB#53077 - [ncicore] Tweaked discovery modes. JB#53077
[-] [+]	Changed	_service:tar_git:libncicore.spec ^
@@ -1,12 +1,23 @@ Name: libncicore -Version: 1.1.18 + +Version: 1.1.20 Release: 0 Summary: NCI state machine License: BSD URL: https://github.com/mer-hybris/libncicore Source: %{name}-%{version}.tar.bz2 -BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(libglibutil) >= 1.0.29 + +%define libglibutil_version 1.0.29 + +BuildRequires: pkgconfig +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(libglibutil) >= %{libglibutil_version} + +# license macro requires rpm >= 4.11 +BuildRequires: pkgconfig(rpm) +%define license_support %(pkg-config --exists 'rpm >= 4.11'; echo $?) + +Requires: libglibutil >= %{libglibutil_version} Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig @@ -16,7 +27,6 @@ %package devel Summary: Development library for %{name} Requires: %{name} = %{version} -Requires: pkgconfig %description devel This package contains the development library for %{name}. @@ -25,10 +35,9 @@ %setup -q %build -make LIBDIR=%{_libdir} KEEP_SYMBOLS=1 release pkgconfig +make %{_smp_mflags} LIBDIR=%{_libdir} KEEP_SYMBOLS=1 release pkgconfig %install -rm -rf %{buildroot} make LIBDIR=%{_libdir} DESTDIR=%{buildroot} install-dev %check @@ -41,9 +50,13 @@ %files %defattr(-,root,root,-) %{_libdir}/%{name}.so.* +%if %{license_support} == 0 +%license LICENSE +%endif %files devel %defattr(-,root,root,-) +%dir %{_includedir}/ncicore %{_libdir}/pkgconfig/.pc %{_libdir}/%{name}.so %{_includedir}/ncicore/.h
[-] [+]	Changed	_service ^
@@ -2,7 +2,7 @@ <service name="tar_git"> <param name="url">https://github.com/mer-hybris/libncicore.git</param> <param name="branch">master</param> - <param name="revision">1.1.18</param> + <param name="revision">1.1.20</param> <param name="token"/> <param name="debian">N</param> <param name="dumb">N</param>
[-] [+]	Changed	_service:tar_git:libncicore-1.1.20.tar.bz2/LICENSE ^
@@ -1,5 +1,5 @@ +Copyright (C) 2018-2022 Slava Monich <slava@monich.com> Copyright (C) 2018-2021 Jolla Ltd. -Copyright (C) 2018-2021 Slava Monich <slava.monich@jolla.com> Copyright (C) 2019-2020 Open Mobile Platform LLC. You may use this file under the terms of BSD license as follows:
[-] [+]	Changed	_service:tar_git:libncicore-1.1.20.tar.bz2/Makefile ^
@@ -33,7 +33,7 @@ # VERSION_FILE = $(INCLUDE_DIR)/nci_version.h -get_version = $(shell grep -E "^ \\\#define +NCI_CORE_VERSION_$1 +[0-9]+$$" $(VERSION_FILE) \| sed "s/ / /g" \| cut -d " " -f 3) +get_version = $(shell grep -E '^ \#define +NCI_CORE_VERSION_$1 +[0-9]+$$' $(VERSION_FILE) \| sed 's/ / /g' \| cut -d ' ' -f 3) VERSION_MAJOR = $(call get_version,MAJOR) VERSION_MINOR = $(call get_version,MINOR)
[-] [+]	Changed	_service:tar_git:libncicore-1.1.20.tar.bz2/debian/changelog ^
@@ -1,3 +1,17 @@ +libncicore (1.1.20) unstable; urgency=low + + * Updated dependencies + * Fixed build with GNU Make 4.3 + * Bumped debhelper compat level to 7 + + -- Slava Monich <slava@monich.com> Tue, 13 Dec 2022 00:36:32 +0200 + +libncicore (1.1.19) unstable; urgency=low + + * Housekeeping + + -- Slava Monich <slava.monich@jolla.com> Thu, 02 Dec 2021 01:30:44 +0200 + libncicore (1.1.18) unstable; urgency=low * Configure ATR_RES and ATR_REQ for NFC-DEP
[-] [+]	Changed	_service:tar_git:libncicore-1.1.20.tar.bz2/debian/compat ^
@@ -1 +1 @@ -5 +7
[-] [+]	Changed	_service:tar_git:libncicore-1.1.20.tar.bz2/debian/control ^
@@ -1,18 +1,18 @@ Source: libncicore Section: libs Priority: optional -Maintainer: Slava Monich <slava.monich@jolla.com> -Build-Depends: debhelper (>= 8.1.3), libglib2.0-dev (>= 2.0), libglibutil-dev +Maintainer: Slava Monich <slava@monich.com> +Build-Depends: debhelper (>= 8.1.3), libglib2.0-dev (>= 2.0), libglibutil-dev (>= 1.0.29) Standards-Version: 3.8.4 Package: libncicore Section: libs Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, libglibutil (>= 1.0.29) Description: NFC NCI implementation Package: libncicore-dev Section: libdevel Architecture: any -Depends: libncicore (= ${binary:Version}), libglibutil-dev, ${misc:Depends} +Depends: libncicore (= ${binary:Version}), ${misc:Depends}, libglibutil-dev (>= 1.0.29) Description: Development files for libncicore
[-] [+]	Changed	_service:tar_git:libncicore-1.1.20.tar.bz2/debian/copyright ^
@@ -1,5 +1,5 @@ -Copyright (C) 2018-2020 Jolla Ltd. -Copyright (C) 2018-2020 Slava Monich <slava.monich@jolla.com> +Copyright (C) 2018-2022 Slava Monich <slava@monich.com> +Copyright (C) 2018-2021 Jolla Ltd. Copyright (C) 2019-2020 Open Mobile Platform LLC. You may use this file under the terms of BSD license as follows:
[-] [+]	Changed	_service:tar_git:libncicore-1.1.20.tar.bz2/include/nci_version.h ^
@@ -1,6 +1,6 @@ /* * Copyright (C) 2020-2021 Jolla Ltd. - * Copyright (C) 2020-2021 Slava Monich <slava.monich@jolla.com> + * Copyright (C) 2020-2022 Slava Monich <slava@monich.com> * * You may use this file under the terms of BSD license as follows: * @@ -38,7 +38,7 @@ /* libncicore version */ #define NCI_CORE_VERSION_MAJOR 1 #define NCI_CORE_VERSION_MINOR 1 -#define NCI_CORE_VERSION_NANO 18 +#define NCI_CORE_VERSION_NANO 20 #define NCI_CORE_VERSION_WORD(v1,v2,v3) \ ((((v1) & 0x7f) << 24) \| \
[-] [+]	Changed	_service:tar_git:libncicore-1.1.20.tar.bz2/unit/coverage/run ^
@@ -44,9 +44,13 @@ popd done +# Sometimes you need this, sometimes that :S +BASE_DIR="$TOP_DIR" +#BASE_DIR="$TOP_DIR/src" + FULL_COV="$COV_DIR/full.gcov" LIB_COV="$COV_DIR/lib.gcov" rm -f "$FULL_COV" "$LIB_COV" -lcov $LCOV_OPT -c -d "$LIB_DIR/build/coverage" -b "$LIB_DIR/src" -o "$FULL_COV" \|\| exit 1 -lcov $LCOV_OPT -e "$FULL_COV" "$LIB_DIR/src/" -o "$LIB_COV" \|\| exit 1 +lcov $LCOV_OPT -c -d "$LIB_DIR/build/coverage" -b "$BASE_DIR" -o "$FULL_COV" \|\| exit 1 +lcov $LCOV_OPT -e "$FULL_COV" "$BASE_DIR/" -o "$LIB_COV" \|\| exit 1 genhtml $GENHTML_OPT "$LIB_COV" -t "NCI core" --output-directory "$COV_DIR/report" \|\| exit 1
[-] [+]	Changed	_service:tar_git:libncicore-1.1.20.tar.bz2/unit/nci_core/test_nci_core.c ^
@@ -88,12 +88,6 @@ 0x84, 0x02, 0x5c, 0x03, 0xff, 0x02, 0x00, 0x04, 0x41, 0x11, 0x01, 0x18 }; -static const guint8 CORE_INIT_RSP_1[] = { - 0x40, 0x01, 0x19, 0x00, 0x03, 0x0e, 0x02, 0x00, - 0x08, 0x00, 0x01, 0x02, 0x03, 0x80, 0x82, 0x83, - 0x84, 0x02, 0x5c, 0x03, 0xff, 0x02, 0x00, 0x04, - 0x41, 0x11, 0x01, 0x1a -}; static const guint8 CORE_INIT_RSP_NO_ROUTING[] = { 0x40, 0x01, 0x19, 0x00, 0x03, 0x0e, 0x02, 0x00, 0x08, 0x00, 0x01, 0x02, 0x03, 0x80, 0x82, 0x83, @@ -210,11 +204,6 @@ 0x32, 0x01, 0x40, /* LA_SEL_INFO = 0x40 / 0x50, 0x01, 0x02 / LF_PROTOCOL_TYPE = 0x02 / }; -static const guint8 CORE_GET_CONFIG_RSP_DISCOVERY_CE[] = { - 0x40, 0x03, 0x08, 0x00, 0x02, - 0x32, 0x01, 0x20, / LA_SEL_INFO = 0x20 / - 0x50, 0x01, 0x00 / LF_PROTOCOL_TYPE = 0x00 / -}; static const guint8 CORE_GET_CONFIG_RSP_DISCOVERY_CE_PEER[] = { 0x40, 0x03, 0x08, 0x00, 0x02, 0x32, 0x01, 0x60, / LA_SEL_INFO = 0x60 / @@ -285,12 +274,6 @@ 0x00, 0x03, 0x00, 0x01, NCI_RF_TECHNOLOGY_B, 0x00, 0x03, 0x00, 0x01, NCI_RF_TECHNOLOGY_A }; -static const guint8 RF_SET_LISTEN_MODE_ROUTING_CMD_PROTOCOL_A_B[] = { - 0x21, 0x01, 0x16, 0x00, 0x04, 0x01, 0x03, 0x00, - 0x01, 0x01, 0x01, 0x03, 0x00, 0x01, 0x02, 0x01, - 0x03, 0x00, 0x01, 0x04, 0x01, 0x03, 0x00, 0x01, - 0x05 -}; static const guint8 RF_SET_LISTEN_MODE_ROUTING_CMD_PROTOCOL_RW_PEER[] = { 0x21, 0x01, 0x1b, 0x00, 0x05, 0x01, 0x03, 0x00, 0x01, 0x05, / NFC-DEP / @@ -299,12 +282,6 @@ 0x01, 0x03, 0x00, 0x01, 0x02, / T2T / 0x01, 0x03, 0x00, 0x01, 0x03 / T3T / }; -static const guint8 RF_SET_LISTEN_MODE_ROUTING_CMD_PROTOCOL_A_B_F[] = { - 0x21, 0x01, 0x1b, 0x00, 0x05, 0x01, 0x03, 0x00, - 0x01, 0x01, 0x01, 0x03, 0x00, 0x01, 0x02, 0x01, - 0x03, 0x00, 0x01, 0x04, 0x01, 0x03, 0x00, 0x01, - 0x03, 0x01, 0x03, 0x00, 0x01, 0x05 -}; static const guint8 RF_SET_LISTEN_MODE_ROUTING_CMD_PROTOCOL_ISODEP[] = { 0x21, 0x01, 0x07, 0x00, 0x01, 0x01, 0x03, 0x00, 0x01, 0x04 / ISO-DEP / @@ -322,15 +299,21 @@ 0x21, 0x00, 0x0d, 0x04, 0x01, 0x01, 0x01, / T1T/Poll/Frame / 0x02, 0x01, 0x01, / T2T/Poll/Frame / - 0x04, 0x01, 0x02, / T3T/Poll/Frame / - 0x03, 0x01, 0x01 / IsoDep/Poll/IsoDep / + 0x04, 0x01, 0x02, / IsoDep/Poll/IsoDep / + 0x03, 0x01, 0x01 / T3T/Poll/Frame / +}; +static const guint8 RF_DISCOVER_MAP_CMD_RW_A_B[] = { + 0x21, 0x00, 0x0a, 0x03, + 0x01, 0x01, 0x01, / T1T/Poll/Frame / + 0x02, 0x01, 0x01, / T2T/Poll/Frame / + 0x04, 0x01, 0x02 / IsoDep/Poll/IsoDep / }; static const guint8 RF_DISCOVER_MAP_CMD_RW_PEER[] = { 0x21, 0x00, 0x13, 0x06, 0x01, 0x01, 0x01, / T1T/Poll/Frame / 0x02, 0x01, 0x01, / T2T/Poll/Frame / - 0x04, 0x01, 0x02, / T3T/Poll/Frame / - 0x03, 0x01, 0x01, / IsoDep/Poll/IsoDep / + 0x04, 0x01, 0x02, / IsoDep/Poll/IsoDep / + 0x03, 0x01, 0x01, / T3T/Poll/Frame / 0x05, 0x01, 0x03, / NfcDep/Poll/NfcDep / 0x05, 0x02, 0x03 / NfcDep/Listen/NfcDep / }; @@ -338,30 +321,12 @@ 0x21, 0x00, 0x16, 0x07, 0x01, 0x01, 0x01, / T1T/Poll/Frame / 0x02, 0x01, 0x01, / T2T/Poll/Frame / - 0x04, 0x01, 0x02, / T3T/Poll/Frame / - 0x03, 0x01, 0x01, / IsoDep/Poll/IsoDep / + 0x04, 0x01, 0x02, / IsoDep/Poll/IsoDep / + 0x03, 0x01, 0x01, / T3T/Poll/Frame / 0x05, 0x01, 0x03, / NfcDep/Poll/NfcDep / 0x05, 0x02, 0x03, / NfcDep/Listen/NfcDep / 0x04, 0x02, 0x02 / IsoDep/Listen/IsoDep / }; -static const guint8 RF_DISCOVER_MAP_CMD_POLL_NFCDEP[] = { - 0x21, 0x00, 0x0d, 0x04, - 0x01, 0x01, 0x01, / T1T/Poll/Frame / - 0x02, 0x01, 0x01, / T2T/Poll/Frame / - 0x04, 0x01, 0x02, / T3T/Poll/Frame / - 0x05, 0x01, 0x03 / NfcDep/Poll/NfcDep / -}; -static const guint8 RF_DISCOVER_MAP_CMD_A_B_F[] = { - 0x21, 0x00, 0x10, 0x05, 0x01, 0x01, 0x01, 0x02, - 0x01, 0x01, 0x04, 0x01, 0x02, 0x03, 0x01, 0x01, - 0x05, 0x01, 0x03 -}; -static const guint8 RF_DISCOVER_MAP_CMD_A_B_F_NFCDEP[] = { - 0x21, 0x00, 0x16, 0x07, 0x01, 0x01, 0x01, 0x02, - 0x01, 0x01, 0x04, 0x01, 0x02, 0x03, 0x01, 0x01, - 0x05, 0x01, 0x03, 0x05, 0x02, 0x03, 0x04, 0x02, - 0x02 -}; static const guint8 RF_DISCOVER_MAP_CMD_NFCDEP[] = { 0x21, 0x00, 0x04, 0x01, 0x05, 0x02, 0x03 / NfcDep/Listen/NfcDep / @@ -433,15 +398,6 @@ 0x83, 0x01, / ActiveListenA / 0x81, 0x01 / PassiveListenB / }; -static const guint8 RF_DISCOVER_CMD_A_B_F[] = { - 0x21, 0x03, 0x0b, 0x05, 0x01, 0x01, 0x00, 0x01, - 0x03, 0x01, 0x02, 0x01, 0x05, 0x01 -}; -static const guint8 RF_DISCOVER_CMD_A_B_F_NFCDEP[] = { - 0x21, 0x03, 0x15, 0x0a, 0x01, 0x01, 0x00, 0x01, - 0x03, 0x01, 0x02, 0x01, 0x05, 0x01, 0x82, 0x01, - 0x85, 0x01, 0x80, 0x01, 0x83, 0x01, 0x81, 0x01 -}; static const guint8 RF_DISCOVER_CMD_NFCDEP_LISTEN[] = { 0x21, 0x03, 0x05, 0x02, 0x80, 0x01, / PassiveListenA / @@ -536,9 +492,6 @@ static const guint8 RF_DEACTIVATE_DISCOVERY_CMD[] = { 0x21, 0x06, 0x01, 0x03 }; -static const guint8 RF_DEACTIVATE_BAD_CMD[] = { - 0x21, 0x06, 0x01, 0x04 -}; static const guint8 RF_DEACTIVATE_RSP[] = { 0x41, 0x06, 0x01, 0x00 }; @@ -3906,7 +3859,32 @@ TEST_NCI_SM_END() }; -static const TestSmEntry test_nci_config_ab[] = { +static const TestSmEntry test_nci_config_ab_rw[] = { + TEST_NCI_SM_SET_OP_MODE(NFC_OP_MODE_RW\|NFC_OP_MODE_POLL), + TEST_NCI_SM_SET_STATE(NCI_RFST_DISCOVERY), + TEST_NCI_SM_ASSERT_STATES(NCI_STATE_INIT, NCI_RFST_DISCOVERY), + + TEST_NCI_SM_EXPECT_CMD(CORE_RESET_CMD), + TEST_NCI_SM_QUEUE_RSP(CORE_RESET_RSP), + TEST_NCI_SM_EXPECT_CMD(CORE_INIT_CMD_V1), + TEST_NCI_SM_QUEUE_RSP(CORE_INIT_RSP), + TEST_NCI_SM_EXPECT_CMD(CORE_SET_CONFIG_CMD_DEFAULT), + TEST_NCI_SM_QUEUE_RSP(CORE_SET_CONFIG_RSP), + TEST_NCI_SM_WAIT_STATE(NCI_RFST_IDLE), + + TEST_NCI_SM_EXPECT_CMD(CORE_GET_CONFIG_CMD_DISCOVERY), + TEST_NCI_SM_QUEUE_RSP(CORE_GET_CONFIG_RSP_DISCOVERY_RW), + TEST_NCI_SM_EXPECT_CMD(RF_SET_LISTEN_MODE_ROUTING_CMD_DEFAULT), + TEST_NCI_SM_QUEUE_RSP(RF_SET_LISTEN_MODE_ROUTING_RSP), + TEST_NCI_SM_EXPECT_CMD(RF_DISCOVER_MAP_CMD_RW_A_B), + TEST_NCI_SM_QUEUE_RSP(RF_DISCOVER_MAP_RSP), + TEST_NCI_SM_EXPECT_CMD(RF_DISCOVER_CMD_RW_A_B), + TEST_NCI_SM_QUEUE_RSP(RF_DISCOVER_RSP), + TEST_NCI_SM_WAIT_STATE(NCI_RFST_DISCOVERY), + TEST_NCI_SM_END() +}; + +static const TestSmEntry test_nci_config_ab_ce[] = { TEST_NCI_SM_SET_OP_MODE(NFC_OP_MODE_RW\|NFC_OP_MODE_PEER\|NFC_OP_MODE_CE\| NFC_OP_MODE_POLL\|NFC_OP_MODE_LISTEN), TEST_NCI_SM_SET_STATE(NCI_RFST_DISCOVERY), @@ -4013,8 +3991,9 @@ { "ce-poll_a_prot_routing", test_nci_sm_iso_dep_ce_prot_routing }, { "config_default", test_nci_config_abf, test_nci_config_ab_data_default }, { "config_junk", test_nci_config_abf, test_nci_config_ab_data_junk }, - { "config_ab", test_nci_config_ab, test_nci_config_ab_data }, - { "config_ab_x", test_nci_config_ab, test_nci_config_ab_data_x } + { "config_ab_rw", test_nci_config_ab_rw, test_nci_config_ab_data }, + { "config_ab_ce", test_nci_config_ab_ce, test_nci_config_ab_data }, + { "config_ab_x", test_nci_config_ab_ce, test_nci_config_ab_data_x } }; /==========================================================================*