From f28a622111aab21a91d5b8122bb7e52568dd576c Mon Sep 17 00:00:00 2001 From: John Klug Date: Mon, 17 Aug 2020 17:18:44 -0500 Subject: Fix modem package dependencies and radio-query --netreg --- .../ruby-serialport/ruby-serialport_1.3.1.bb | 35 ---------------------- recipes-ruby/ruby-sqlite3/ruby-sqlite3_1.3.13.bb | 28 ----------------- recipes-ruby/ruby/ruby_%.bbappend | 4 --- recipes-support/multitech/libmts-io_1.0.19.bb | 30 ------------------- recipes-support/multitech/libmts-io_1.0.21.bb | 30 +++++++++++++++++++ recipes-support/multitech/libmts_0.5.bb | 30 ------------------- recipes-support/multitech/libmts_0.6.bb | 30 +++++++++++++++++++ recipes-support/multitech/radio-cmd_0.6.bb | 2 +- recipes-support/multitech/radio-query_0.8.bb | 22 -------------- recipes-support/multitech/radio-query_0.9.bb | 22 ++++++++++++++ 10 files changed, 83 insertions(+), 150 deletions(-) delete mode 100644 recipes-ruby/ruby-serialport/ruby-serialport_1.3.1.bb delete mode 100644 recipes-ruby/ruby-sqlite3/ruby-sqlite3_1.3.13.bb delete mode 100644 recipes-ruby/ruby/ruby_%.bbappend delete mode 100644 recipes-support/multitech/libmts-io_1.0.19.bb create mode 100644 recipes-support/multitech/libmts-io_1.0.21.bb delete mode 100644 recipes-support/multitech/libmts_0.5.bb create mode 100644 recipes-support/multitech/libmts_0.6.bb delete mode 100644 recipes-support/multitech/radio-query_0.8.bb create mode 100644 recipes-support/multitech/radio-query_0.9.bb diff --git a/recipes-ruby/ruby-serialport/ruby-serialport_1.3.1.bb b/recipes-ruby/ruby-serialport/ruby-serialport_1.3.1.bb deleted file mode 100644 index 8f524e3..0000000 --- a/recipes-ruby/ruby-serialport/ruby-serialport_1.3.1.bb +++ /dev/null @@ -1,35 +0,0 @@ -DESCRIPTION = "A Ruby library that provides a class for using RS-232 serial ports" -HOMEPAGE = "https://github.com/hparra/ruby-serialport" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" -SECTION = "console/utils" -PRIORITY = "optional" - -DEPENDS = "ruby" - -PR = "r2" - -# tag v1.3.0 -SRCREV = "2781dbb1ffbf33d7c65478aa25dad5f954d0d3bf" - -SRC_URI = "git://github.com/hparra/ruby-serialport.git;protocol=git" - -S = "${WORKDIR}/git" -B = "${S}" - -CFLAGS_append +="-fPIC" - -do_compile() { - rp=$(ls -d ${STAGING_INCDIR}/ruby-* | head -1) - ${CC} -v ${CFLAGS} ${LDFLAGS} -Iext/native -I${rp} -I${rp}/arm-linux-gnueabi -c ext/native/*.c - ${CC} -v ${CFLAGS} ${LDFLAGS} --shared -o ext/native/serialport.so serialport.o posix_serialport_impl.o -} - -do_install() { - install -d ${D}${libdir}/ruby/serialport - install lib/serialport.rb ${D}${libdir}/ruby/serialport.rb - install ext/native/serialport.so -t ${D}${libdir}/ruby -} - -FILES_${PN} = "${libdir}/ruby/serialport*" -FILES_${PN}-dbg += "${libdir}/ruby/.debug" diff --git a/recipes-ruby/ruby-sqlite3/ruby-sqlite3_1.3.13.bb b/recipes-ruby/ruby-sqlite3/ruby-sqlite3_1.3.13.bb deleted file mode 100644 index 82998bc..0000000 --- a/recipes-ruby/ruby-sqlite3/ruby-sqlite3_1.3.13.bb +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION = "Ruby bindings for the SQLite3 embedded database" -HOMEPAGE = "https://github.com/sparklemotion/sqlite3-ruby" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=f24ce0d57c8f8576a36e2803d35bcfec" -SECTION = "console/utils" -PRIORITY = "optional" - -DEPENDS = "ruby sqlite3" - -SRC_URI = "git://github.com/sparklemotion/sqlite3-ruby.git;branch=1-3-stable;tag=v${PV}" -S = "${WORKDIR}/git" - -# Position independent code for shared lib -CFLAGS += "-fPIC" - -do_compile() { - ${CC} ${CFLAGS} ${LDFLAGS} -Iext/sqlite3 -Iext/native -I${STAGING_INCDIR}/ruby-2.2.0 -I${STAGING_INCDIR}/ruby-2.2.0/arm-linux-gnueabi -c ext/sqlite3/*.c -DHAVE_RB_INTEGER_PACK - ${CC} ${CFLAGS} ${LDFLAGS} --shared -o ext/sqlite3/sqlite3_native.so *.o -lsqlite3 -} - -do_install() { - install -d ${D}${libdir}/ruby ${D}${libdir}/ruby/sqlite3 - install lib/sqlite3.rb ${D}${libdir}/ruby/sqlite3.rb - install lib/sqlite3/* ext/sqlite3/sqlite3_native.so -t ${D}${libdir}/ruby/sqlite3 -} - -FILES_${PN} = "${libdir}/ruby/sqlite3*" -FILES_${PN}-dbg += "${libdir}/ruby/sqlite3/.debug*" diff --git a/recipes-ruby/ruby/ruby_%.bbappend b/recipes-ruby/ruby/ruby_%.bbappend deleted file mode 100644 index b31d44c..0000000 --- a/recipes-ruby/ruby/ruby_%.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -# remove /usr/share/ri from main ruby package -# using FILES_${PN}_remove doesn't work... -FILES_ruby_remove = "${datadir}/ri" -FILES_${PN}-doc += "${datadir}/ri" diff --git a/recipes-support/multitech/libmts-io_1.0.19.bb b/recipes-support/multitech/libmts-io_1.0.19.bb deleted file mode 100644 index 34115be..0000000 --- a/recipes-support/multitech/libmts-io_1.0.19.bb +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION = "MultiTech IO C++ Library" -HOMEPAGE = "http://www.multitech.net/" -LICENSE = "LGPL-2.1" -LIC_FILES_CHKSUM = "file://LICENSE;md5=4fbd65380cdd255951079008b364516c" - -DEPENDS = "libmts jsoncpp cmake-native cppunit" -BBCLASSEXTEND = "native" - -PR = "r0" -SRCREV = "${PV}" -SRC_URI = "git://git.multitech.net/libmts-io;branch=master" - -S = "${WORKDIR}/git" - -do_compile() { - oe_runmake -} - -# build and run tests for native recipe -do_compile_append_virtclass-native() { - cd test - cmake . - oe_runmake - ./TestRunnerClient -} - -do_install() { - oe_runmake install DESTDIR=${D} -} - diff --git a/recipes-support/multitech/libmts-io_1.0.21.bb b/recipes-support/multitech/libmts-io_1.0.21.bb new file mode 100644 index 0000000..34115be --- /dev/null +++ b/recipes-support/multitech/libmts-io_1.0.21.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "MultiTech IO C++ Library" +HOMEPAGE = "http://www.multitech.net/" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = "libmts jsoncpp cmake-native cppunit" +BBCLASSEXTEND = "native" + +PR = "r0" +SRCREV = "${PV}" +SRC_URI = "git://git.multitech.net/libmts-io;branch=master" + +S = "${WORKDIR}/git" + +do_compile() { + oe_runmake +} + +# build and run tests for native recipe +do_compile_append_virtclass-native() { + cd test + cmake . + oe_runmake + ./TestRunnerClient +} + +do_install() { + oe_runmake install DESTDIR=${D} +} + diff --git a/recipes-support/multitech/libmts_0.5.bb b/recipes-support/multitech/libmts_0.5.bb deleted file mode 100644 index a5deb4b..0000000 --- a/recipes-support/multitech/libmts_0.5.bb +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION = "MultiTech Core C++ Library" -HOMEPAGE = "http://www.multitech.net/" -LICENSE = "LGPL-2.1" -LIC_FILES_CHKSUM = "file://LICENSE;md5=4fbd65380cdd255951079008b364516c" - -DEPENDS = "cmake-native cppunit" -BBCLASSEXTEND = "native nativesdk" - -PR = "r1" -SRCREV = "${PV}" -SRC_URI = "git://git.multitech.net/libmts;branch=master" - -S = "${WORKDIR}/git" - -do_compile() { - oe_runmake -} - -# build and run tests for native recipe -do_compile_append_virtclass-native() { - cd test - cmake . - oe_runmake - ./TestRunnerClient -} - -do_install() { - oe_runmake install DESTDIR=${D} -} - diff --git a/recipes-support/multitech/libmts_0.6.bb b/recipes-support/multitech/libmts_0.6.bb new file mode 100644 index 0000000..a5deb4b --- /dev/null +++ b/recipes-support/multitech/libmts_0.6.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "MultiTech Core C++ Library" +HOMEPAGE = "http://www.multitech.net/" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = "cmake-native cppunit" +BBCLASSEXTEND = "native nativesdk" + +PR = "r1" +SRCREV = "${PV}" +SRC_URI = "git://git.multitech.net/libmts;branch=master" + +S = "${WORKDIR}/git" + +do_compile() { + oe_runmake +} + +# build and run tests for native recipe +do_compile_append_virtclass-native() { + cd test + cmake . + oe_runmake + ./TestRunnerClient +} + +do_install() { + oe_runmake install DESTDIR=${D} +} + diff --git a/recipes-support/multitech/radio-cmd_0.6.bb b/recipes-support/multitech/radio-cmd_0.6.bb index 77fe5dc..d81fe83 100644 --- a/recipes-support/multitech/radio-cmd_0.6.bb +++ b/recipes-support/multitech/radio-cmd_0.6.bb @@ -4,7 +4,7 @@ LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "jsoncpp libmts libmts-io" -RDEPENDS_radio-cmd = "jsoncpp" +RDEPENDS_${PN} = "jsoncpp libmts libmts-io" PR = "r1" SRCREV = "${PV}" diff --git a/recipes-support/multitech/radio-query_0.8.bb b/recipes-support/multitech/radio-query_0.8.bb deleted file mode 100644 index 7ce0976..0000000 --- a/recipes-support/multitech/radio-query_0.8.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "MultiTech cellular radio query tool" -HOMEPAGE = "http://www.multitech.net/" -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f" -RDEPENDS_${PN} += "jsoncpp" -DEPENDS = "jsoncpp libmts libmts-io" - -PR = "r0" -SRCREV = "${PV}" - -SRC_URI = "git://git.multitech.net/radio-query;branch=master" - -S = "${WORKDIR}/git" - -do_compile() { - oe_runmake -} - -do_install() { - oe_runmake install DESTDIR=${D} -} - diff --git a/recipes-support/multitech/radio-query_0.9.bb b/recipes-support/multitech/radio-query_0.9.bb new file mode 100644 index 0000000..7ce0976 --- /dev/null +++ b/recipes-support/multitech/radio-query_0.9.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "MultiTech cellular radio query tool" +HOMEPAGE = "http://www.multitech.net/" +LICENSE = "GPL-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f" +RDEPENDS_${PN} += "jsoncpp" +DEPENDS = "jsoncpp libmts libmts-io" + +PR = "r0" +SRCREV = "${PV}" + +SRC_URI = "git://git.multitech.net/radio-query;branch=master" + +S = "${WORKDIR}/git" + +do_compile() { + oe_runmake +} + +do_install() { + oe_runmake install DESTDIR=${D} +} + -- cgit v1.2.3