From 89770b09490d616883ab728cc628a844ca0e1150 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Sat, 13 Jun 2020 10:40:47 -0500 Subject: meta-openembedded: subtree update:5caca0f7bd..fe77eaab8f MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adam Miartus (3): meta-oe toybox-inittab: toybox inittab implementation meta-oe toybox-inittab: allow getty as a packageconfig feature meta-oe toybox: enable toybox init when selected as init manager Alex Kiernan (1): libgusb: Upgrade 0.3.0+ -> 0.3.4 Andreas Müller (48): gfbgraph: initial add 0.2.4 libgdata: Change PACKAGECONFIG defaults gnome-photos: initial add 3.34.2 dconf: upgrade 0.34.0 -> 0.36.0 dconf-editor: upgrade 3.34.2 -> 3.36.2 nautilus: upgrade 3.34.3 -> 3.36.3 evince: upgrade 3.34.2 -> 3.36.3 evolution-data-server: upgrade 3.34.4 -> 3.36.3 file-roller: upgrade 3.32.5 -> 3.36.2 amtk: initial add 5.1.1 uchardet: initial add 0.0.7 tepl: initial add 4.4.0 gedit: upgradde 3.34.1 -> 3.36.2 gdm: upgrade 3.34.1 -> 3.36.2 gnome-backgrounds: upgrade 3.34.0 -> 3.36.0 gnome-calculator: upgrade 3.34.1 -> 3.36.0 gnome-system-monitor: upgrade 3.32.1 -> 3.36.1 gvfs: upgrade 1.42.2 -> 1.44.1 gtksourceview4: upgrade 4.4.0 -> 4.6.0 gnome-desktop3; upgrade 3.34.5 -> 3.36.2 gnome-panel: upgrade 3.34.1 -> 3.36.1 gnome-flashback: upgrade 3.34.2 -> 3.36.3 gnome-keyring: upgrade 3.34.0 -> 3.36.0 gnome-menus3: upgrade 3.32.0 -> 3.36.0 gnome-online-accounts: upgrade 3.34.1 -> 3.36.0 gnome-session: upgrade 3.34.2 -> 3.36.0 gnome-settings-daemon: upgrade 3.34.2 -> 3.36.1 gnome-terminal: upgrade 3.34.2 -> 3.36.2 grilo: upgrade 0.3.10 -> 0.3.12 libgnomekbd: remove libgweather: upgrade 3.34.0 -> 3.36.0 libwnck3: upgrade 3.32.0 -> 3.36.0 metacity: upgrade 3.34.1 -> 3.36.1 graphene: initial add 1.10.0 yelp-xsl: upgrade 3.34.2 -> 3.36.0 yelp: upgrade 3.34.0 -> 3.36.0 sysprof: upgrade 3.34.1 -> 3.36.0 gnome-control-center: upgrade 3.34.5 -> 3.36.2 libblockdev: upgrade 2.23 -> 2.24 poppler: upgrade 0.88.0 -> 0.89.0 gtksourceview: remove forgotten files vlc: Fix build with qt5 in PACKAGECONFIG and Qt >= 5.15 / renumber patches vlc: upgrade 3.0.9.2 -> 3.0.10 babl: upgrade 0.1.74 -> 0.1.78 gegl: upgrade 0.4.22 -> 0.4.24 libmypaint: upgrade 1.4.0 -> 1.6.1 mypaint-brushes-1.0: upgrade 1.3.0 -> 1.3.1 gimp: upgrade 2.10.18 -> 2.10.20 Andrej Valek (1): thrift: drop unsupported features Bog999 (1): python3: Add python3-cryptography to RDEPENDS for python3-redis Changqing Li (3): packagegroup-xfce-base: add RDEPEND packagegroup-core-x11 python-django: add RDEPENDS python-m2crypto: Add RDEPENDS Chenxi Mao (1): geoclue: select avahi-daemon if nmea enabled Christian Eggers (4): graphviz: Extend for nativesdk ttf-dejavu: Extend for native and nativesdk gd: Extend for native and nativesdk mscgen: Extend for native and nativesdk Denys Dmytriyenko (1): serialcheck: switch to a fork and update to the latest Jacob Kroon (1): meta-oe: Don't inherit 'features_check' in recipes that don't utilize it Joris Offouga (1): c-periphery: add recipe Kai Kang (1): lvm2: remove service template from SYSTEMD_SERVICE Khem Raj (5): python3-zopeinterface: Upgrade to 5.1.0 multipath-tools: Fix build with json-c 0.14 and newer toybox-inittab: Get rid of bashism mpv: Drop unused features_check inherit evince: Drop unused features_check inherit Konrad Weihmann (3): mpd: fix PACKAGECONFIG assignment netkit-rsh: properly append PACKAGECONFIG zile: properly append PACKAGECONFIG Lei YU (1): httpfs2: mount a http url as a file based on FUSE Leon Anavi (57): python3-unidiff: Upgrade 0.5.5 -> 0.6.0 python3-tzlocal: Upgrade 2.0.0 -> 2.1 python3-serpent: Upgrade 1.28 -> 1.30.2 python3-python-vlc: Upgrade 3.0.7110 -> 3.0.9113 python3-gast: Upgrade 0.2.2 -> 0.3.3 python3-langtable: Upgrade 0.0.38 -> 0.0.51 python3-automat: Upgrade 0.8.0 -> 20.2.0 python3-humanize: Upgrade 0.5.1 -> 2.4.0 python-pyaudio: Consolidate in a single file python3-isort: Consolidate in a single file python3-editor: Consolidate in a single file python3-engineio: Upgrade 3.12.1 -> 3.13.0 python3-feedformatter: Consolidate in a single file python3-decorator: Consolidate in a single file python3-dateutil: Consolidate in a single file python3-dnspython: Consolidate in a single file python3-future: Consolidate in a single file python3-requests-futures: Upgrade 0.9.5 -> 1.0.0 python3-greenlet: Consolidate in a single file python3-html2text: Upgrade 2019.8.11 -> 2020.1.16 python3-jsonpatch: Consolidate in a single file python3-jsonschema: Consolidate in a single file python3-evdev: Consolidate in a single file python3-oauthlib: Consolidate in a single file python3-oauthlib: Upgrade 2.0.6 -> 3.1.0 python3-tornado: Consolidate in a single file python3-tornado: Upgrade 6.0.3 -> 6.0.4 python3-waitress: Upgrade 1.4.3 -> 1.4.4 python3-urllib3: Upgrade 1.25.7 -> 1.25.9 python3-ujson: Upgrade 2.0.3 -> 3.0.0 python3-wheel: Upgrade 0.33.6 -> 0.34.2 python3-wcwidth: Upgrade 0.1.8 -> 0.2.4 python3-twine: Upgrade 1.13.0 -> 3.1.1 python3-beautifulsoup4: Upgrade 4.8.2 -> 4.9.1 python3-bitarray: Upgrade 1.2.1 -> 1.2.2 python3-soupsieve: Upgrade 1.9.4 -> 2.0.1 python3-meld3: Consolidate in a single file python3-meld3: Upgrade 1.0.2 -> 2.0.1 python3-markupsafe: Consolidate in a single file python3-more-itertools: Consolidate in a single file python3-more-itertools: Upgrade 8.2.0 -> 8.3.0 python3-nmap: Upgrade 1.4.1 -> 1.4.7 python3-multidict: Upgrade 4.7.5 -> 4.7.6 python3-lxml: Consolidate in a single file python3-hyperlink: Consolidate in a single file python3-humanfriendly: Upgrade 4.18 -> 8.2 python3-html5lib: Consolidate in a single file python3-progress: Consolidate in a single file python3-prettytable: Consolidate in a single file python3-lxml: Upgrade 4.5.0 -> 4.5.1 python3-pika: Consolidate in a single file python3-pluggy: Consolidate in a single file python3-ply: Consolidate in a single file python3-pocketsphinx: Consolidate in a single file python3-pocketsphinx: 0.1.0 -> 0.1.15 python3-pint: Consolidate in a single file python3-pint: Upgrade 0.11 -> 0.12 Martin Jansa (1): meta-python: depend on core version 12 or higher Martin Kelly (4): mosquitto: add native, nativesdk support msgpack-c: add native, nativesdk support mosquitto: typo fix python3-paho-mqtt: add native,nativesdk support Mingli Yu (2): python3-webcolors: add the missing rdepends python3-m2crypto: add the missing rdepends Naveen Saini (2): ace: add new recipe ocl-icd_git.bb: Add recipe for OpenCL ICD loaders Peace Lee (1): guider: Upgrade to 3.9.7 Pierre-Jean Texier (14): zchunk: upgrade 1.1.5 -> 1.1.6 uriparser: upgrade 0.9.3 -> 0.9.4 dbus-brocker: upgrade 22 -> 23 jsoncpp: upgrade 1.9.2 -> 1.9.3 hwdata: upgrade 0.333 -> 0.336 libiio: upgrade 0.19 -> 0.20 libnfc: upgrade 1.7.1 -> 1.8.0 tcpreplay: fix upstream check URL tinyproxy: fix upstream check URL jpnevulator: upgrade 2.3.4 -> 2.3.5 libnftnl: upgrade 1.1.6 -> 1.1.7 nftables: upgrade 0.9.4 -> 0.9.5 libzip: upgrade 1.6.1 -> 1.7.0 haveged: upgrade 1.9.8 -> 1.9.9 Qi.Chen@windriver.com (1): python-django: set CVE_PRODUCT to be django Wang Mingyu (5): opensaf: upgrade 5.19.10 -> 5.20.05 dash: upgrade 0.5.10.2 -> 0.5.11 postgresql: 12.2 -> 12.3 python3-pycodestyle: upgrade 2.5.0 -> 2.6.0 python3-scapy: upgrade 0.25 -> 0.26 Yi Zhao (1): gpsd: add new init script Yongxin Liu (1): intel-speed-select: Add new recipe for the tool to validate Intel SST Zang Ruochen (7): proj: upgrade 7.0.0 -> 7.0.1 mksh: upgrade 58 -> 59 libvpx: upgrade 1.8.1 -> 1.8.2 mercurial: upgrade 5.2 -> 5.4 libcgi-perl: upgrade 4.47 -> 4.48 mm-common: upgrade 1.0..0 -> 1.0.1 cryptsetup: upgrade 2.3.2 -> 2.3.3 Zheng Ruoqin (2): nghttp2: upgrade 1.40.0 -> 1.41.0 python3-inflection: upgrade 0.3.1 -> 0.5.0 Signed-off-by: Andrew Geissler Change-Id: I15cb7860a288b903ef186f1979ee028e6f54ea50 --- .../recipes-devtools/guider/guider_3.9.6.bb | 39 ----------- .../recipes-devtools/guider/guider_3.9.7.bb | 19 +++++ .../recipes-devtools/jsoncpp/jsoncpp_1.9.2.bb | 23 ------ .../recipes-devtools/jsoncpp/jsoncpp_1.9.3.bb | 23 ++++++ .../recipes-devtools/mercurial/mercurial_5.2.bb | 38 ---------- .../recipes-devtools/mercurial/mercurial_5.4.bb | 38 ++++++++++ .../recipes-devtools/msgpack/msgpack-c_3.2.1.bb | 2 + ...01-Add-option-to-enable-internal-loopback.patch | 81 ---------------------- .../0001-Makefile-Change-order-of-link-flags.patch | 34 --------- .../0002-Restore-original-loopback-config.patch | 49 ------------- .../serialcheck/serialcheck_1.0.0.bb | 27 ++++---- 11 files changed, 96 insertions(+), 277 deletions(-) delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/guider/guider_3.9.6.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/guider/guider_3.9.7.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.2.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.3.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/mercurial/mercurial_5.2.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/mercurial/mercurial_5.4.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Add-option-to-enable-internal-loopback.patch delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Makefile-Change-order-of-link-flags.patch delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/serialcheck/serialcheck/0002-Restore-original-loopback-config.patch (limited to 'meta-openembedded/meta-oe/recipes-devtools') diff --git a/meta-openembedded/meta-oe/recipes-devtools/guider/guider_3.9.6.bb b/meta-openembedded/meta-oe/recipes-devtools/guider/guider_3.9.6.bb deleted file mode 100644 index f05900216..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/guider/guider_3.9.6.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "runtime performance analyzer" -HOMEPAGE = "https://github.com/iipeace/guider" -BUGTRACKER = "https://github.com/iipeace/guider/issues" -AUTHOR = "Peace Lee " - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://LICENSE;md5=2c1c00f9d3ed9e24fa69b932b7e7aff2" - -PV = "3.9.6+git${SRCPV}" -PR = "r0" - -SRC_URI = "git://github.com/iipeace/${BPN}" -#SRCREV = "${AUTOREV}" -SRCREV = "fef25c41efb9bde0614ea477d0b90bd9565ae0b4" - -S = "${WORKDIR}/git" -R = "${RECIPE_SYSROOT}" - -inherit ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "distutils", "", d)} - -GUIDER_OBJ = "guider.pyc" -GUIDER_SCRIPT = "guider" - -do_install() { - python ${S}/setup.py install - - install -d ${D}${bindir} - install -v -m 0755 ${STAGING_BINDIR_NATIVE}/${GUIDER_SCRIPT} ${D}${bindir}/${GUIDER_SCRIPT} - - install -d ${D}${datadir}/${BPN} - install -v -m 0755 ${STAGING_LIBDIR_NATIVE}/python${PYTHON_BASEVERSION}/site-packages/${BPN}/${GUIDER_OBJ} ${D}${datadir}/${BPN}/${GUIDER_OBJ} -} - -RDEPENDS_${PN} = "python-ctypes python-shell \ - python-json python-subprocess" -python() { - if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split(): - raise bb.parse.SkipRecipe('Requires meta-python2 to be present.') -} diff --git a/meta-openembedded/meta-oe/recipes-devtools/guider/guider_3.9.7.bb b/meta-openembedded/meta-oe/recipes-devtools/guider/guider_3.9.7.bb new file mode 100644 index 000000000..2b799fd5e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/guider/guider_3.9.7.bb @@ -0,0 +1,19 @@ +SUMMARY = "runtime performance analyzer" +HOMEPAGE = "https://github.com/iipeace/guider" +BUGTRACKER = "https://github.com/iipeace/guider/issues" +AUTHOR = "Peace Lee " + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2c1c00f9d3ed9e24fa69b932b7e7aff2" + +PV = "3.9.7+git${SRCPV}" + +SRC_URI = "git://github.com/iipeace/${BPN}" +SRCREV = "c87269d6d4669d12c99a2a7b9b07c39a5dd24ac6" + +S = "${WORKDIR}/git" + +inherit setuptools3 + +RDEPENDS_${PN} = "python3 python3-core \ + python3-ctypes python3-shell python3-json" diff --git a/meta-openembedded/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.2.bb b/meta-openembedded/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.2.bb deleted file mode 100644 index a88410f2f..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.2.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "JSON C++ lib used to read and write json file." -DESCRIPTION = "Jsoncpp is an implementation of a JSON (http://json.org) reader \ - and writer in C++. JSON (JavaScript Object Notation) is a \ - lightweight data-interchange format. It is easy for humans to \ - read and write. It is easy for machines to parse and generate." - -HOMEPAGE = "https://github.com/open-source-parsers/jsoncpp" - -SECTION = "libs" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=fa2a23dd1dc6c139f35105379d76df2b" - -SRCREV = "d2e6a971f4544c55b8e3b25cf96db266971b778f" -SRC_URI = "git://github.com/open-source-parsers/jsoncpp" - -S = "${WORKDIR}/git" - -inherit cmake - -EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON -DJSONCPP_WITH_TESTS=OFF" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.3.bb b/meta-openembedded/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.3.bb new file mode 100644 index 000000000..97c6361ad --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.3.bb @@ -0,0 +1,23 @@ +SUMMARY = "JSON C++ lib used to read and write json file." +DESCRIPTION = "Jsoncpp is an implementation of a JSON (http://json.org) reader \ + and writer in C++. JSON (JavaScript Object Notation) is a \ + lightweight data-interchange format. It is easy for humans to \ + read and write. It is easy for machines to parse and generate." + +HOMEPAGE = "https://github.com/open-source-parsers/jsoncpp" + +SECTION = "libs" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=fa2a23dd1dc6c139f35105379d76df2b" + +SRCREV = "6aba23f4a8628d599a9ef7fa4811c4ff6e4070e2" +SRC_URI = "git://github.com/open-source-parsers/jsoncpp" + +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON -DJSONCPP_WITH_TESTS=OFF" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-devtools/mercurial/mercurial_5.2.bb b/meta-openembedded/meta-oe/recipes-devtools/mercurial/mercurial_5.2.bb deleted file mode 100644 index 6dedb02aa..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/mercurial/mercurial_5.2.bb +++ /dev/null @@ -1,38 +0,0 @@ -SUMMARY = "The Mercurial distributed SCM" -HOMEPAGE = "http://mercurial.selenic.com/" -SECTION = "console/utils" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -DEPENDS = "python3 python3-native" -RDEPENDS_${PN} = "python3 python3-modules" - -inherit python3native - -SRC_URI = "https://www.mercurial-scm.org/release/${BP}.tar.gz" -SRC_URI[md5sum] = "9ba9d59157c002db8d8cab680de08eb5" -SRC_URI[sha256sum] = "ff030e923f03ee15c91191996fcb099bfcfa60c7df263be227f67b6a65d36194" - -S = "${WORKDIR}/mercurial-${PV}" - -BBCLASSEXTEND = "native" - -export LDSHARED="${CCLD} -shared" - -EXTRA_OEMAKE = "STAGING_LIBDIR=${STAGING_LIBDIR} STAGING_INCDIR=${STAGING_INCDIR} \ - PREFIX=${prefix}" - -do_configure_append () { - sed -i -e 's:PYTHON?=python:PYTHON=python3:g' ${S}/Makefile -} - -do_install () { - oe_runmake -e install-bin DESTDIR=${D} PREFIX=${prefix} - sed -i -e 's:${STAGING_BINDIR_NATIVE}/python3-native/python3:${USRBINPATH}/env python3:g' ${D}${bindir}/hg -} -PACKAGES =+ "${PN}-python" - -FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}" - -FILES_${PN}-python = "${nonarch_libdir}/${PYTHON_DIR}" - diff --git a/meta-openembedded/meta-oe/recipes-devtools/mercurial/mercurial_5.4.bb b/meta-openembedded/meta-oe/recipes-devtools/mercurial/mercurial_5.4.bb new file mode 100644 index 000000000..fa3c73451 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/mercurial/mercurial_5.4.bb @@ -0,0 +1,38 @@ +SUMMARY = "The Mercurial distributed SCM" +HOMEPAGE = "http://mercurial.selenic.com/" +SECTION = "console/utils" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "python3 python3-native" +RDEPENDS_${PN} = "python3 python3-modules" + +inherit python3native + +SRC_URI = "https://www.mercurial-scm.org/release/${BP}.tar.gz" +SRC_URI[md5sum] = "0859029d0bb54bcf7c583c55680573cb" +SRC_URI[sha256sum] = "1df8d1978aefcbb65dc51e3666a452583f47aeaf3c5682e4c00a3b23cd805d6a" + +S = "${WORKDIR}/mercurial-${PV}" + +BBCLASSEXTEND = "native" + +export LDSHARED="${CCLD} -shared" + +EXTRA_OEMAKE = "STAGING_LIBDIR=${STAGING_LIBDIR} STAGING_INCDIR=${STAGING_INCDIR} \ + PREFIX=${prefix}" + +do_configure_append () { + sed -i -e 's:PYTHON?=python:PYTHON=python3:g' ${S}/Makefile +} + +do_install () { + oe_runmake -e install-bin DESTDIR=${D} PREFIX=${prefix} + sed -i -e 's:${STAGING_BINDIR_NATIVE}/python3-native/python3:${USRBINPATH}/env python3:g' ${D}${bindir}/hg +} +PACKAGES =+ "${PN}-python" + +FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}" + +FILES_${PN}-python = "${nonarch_libdir}/${PYTHON_DIR}" + diff --git a/meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-c_3.2.1.bb b/meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-c_3.2.1.bb index d410dc6e0..5224f32b0 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-c_3.2.1.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-c_3.2.1.bb @@ -17,3 +17,5 @@ SRCREV = "8085ab8721090a447cf98bb802d1406ad7afe420" S = "${WORKDIR}/git" inherit cmake pkgconfig + +BBCLASSEXTEND += "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Add-option-to-enable-internal-loopback.patch b/meta-openembedded/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Add-option-to-enable-internal-loopback.patch deleted file mode 100644 index f69254a29..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Add-option-to-enable-internal-loopback.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 059d5512e840fe68e2bb37add6c9208fa9c34d15 Mon Sep 17 00:00:00 2001 -From: Sekhar Nori -Date: Tue, 24 Feb 2015 22:16:37 +0530 -Subject: [PATCH 1/2] Add option to enable internal loopback - -Upstream-status: Pending ---- - serialcheck.c | 23 +++++++++++++++++++++++ - 1 file changed, 23 insertions(+) - -diff --git a/serialcheck.c b/serialcheck.c -index 4f5b747..4100c37 100644 ---- a/serialcheck.c -+++ b/serialcheck.c -@@ -12,6 +12,8 @@ - #include - #include - -+#define TIOCM_LOOP 0x8000 -+ - #define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b)) - #define BUILD_BUG_ON_ZERO(e) (sizeof(struct { int:-!!(e); })) - #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0])) -@@ -40,6 +42,7 @@ struct g_opt { - unsigned char hflow; - unsigned char do_termios; - unsigned char *cmp_buff; -+ unsigned char loopback; - }; - - /* name, key, arg, flags, doc, group */ -@@ -51,6 +54,7 @@ static struct argp_option options[] = { - {"mode", 'm', "M", 0, "transfer mode (d = duplex, t = send r = receive)", 0}, - {"loops", 'l', "NUM", 0, "loops to perform (0 => wait fot CTRL-C", 0}, - {"no-termios", 'n', NULL, 0, "No termios change (baud rate etc. remains unchanged)", 0}, -+ {"loopback", 'k', NULL, 0, "loopback mode", 0}, - {NULL, 0, NULL, 0, NULL, 0} - }; - -@@ -67,6 +71,7 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state) - go->baudrate = 115200; - go->loops = UINT_MAX; - go->do_termios = 1; -+ go->loopback = 0; - break; - case ARGP_KEY_ARG: - ret = ARGP_ERR_UNKNOWN; -@@ -113,6 +118,9 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state) - } else - go->loops = num; - break; -+ case 'k': -+ go->loopback = 1; -+ break; - default: - ret = ARGP_ERR_UNKNOWN; - } -@@ -487,6 +495,21 @@ int main(int argc, char *argv[]) - die("tcflush failed: %m\n"); - } - -+ if (opts.loopback) { -+ unsigned int mcr; -+ -+ ret = ioctl(fd, TIOCMGET, &mcr); -+ if (ret < 0) -+ die("mcr get failed: %m\n"); -+ -+ mcr |= TIOCM_LOOP; -+ -+ ret = ioctl(fd, TIOCMSET, &mcr); -+ if (ret < 0) -+ die ("mcr set failed: %m\n"); -+ -+ } -+ - ret = fcntl(fd, F_SETFL, 0); - if (ret) - printf("Failed to remove nonblock mode\n"); --- -1.9.1 diff --git a/meta-openembedded/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Makefile-Change-order-of-link-flags.patch b/meta-openembedded/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Makefile-Change-order-of-link-flags.patch deleted file mode 100644 index 2ab48345d..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Makefile-Change-order-of-link-flags.patch +++ /dev/null @@ -1,34 +0,0 @@ -From efc8a4e717ba919c869c2da1c7de2d08bc976926 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 24 Feb 2016 18:48:07 +0000 -Subject: [PATCH] Makefile: Change order of link flags - -This helps in injectcting LDFLAGS from env to take effect -as it appears last on cmdline now - -Signed-off-by: Khem Raj ---- -Upstream-Status: Pending - - Makefile | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index ba2bfbb..6d13e68 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,3 +1,9 @@ --CFLAGS=-O2 -Wall -Wextra -g -Wno-sign-compare -Wno-pointer-sign --CC=gcc -+CFLAGS?=-O2 -Wall -Wextra -g -Wno-sign-compare -Wno-pointer-sign -+CC?=gcc - all: serialcheck -+serialcheck : serialcheck.o -+ $(CC) -o serialcheck serialcheck.o $(CFLAGS) $(LDFLAGS) -+ -+%.o : %.c -+ $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@ -+ --- -1.9.1 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/serialcheck/serialcheck/0002-Restore-original-loopback-config.patch b/meta-openembedded/meta-oe/recipes-devtools/serialcheck/serialcheck/0002-Restore-original-loopback-config.patch deleted file mode 100644 index 1b8c95b10..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/serialcheck/serialcheck/0002-Restore-original-loopback-config.patch +++ /dev/null @@ -1,49 +0,0 @@ -From a6e5813d2f8402bf3a311c8bcda02623bfb76882 Mon Sep 17 00:00:00 2001 -From: Carlos Hernandez -Date: Tue, 24 Feb 2015 16:00:34 -0500 -Subject: [PATCH 2/2] Restore original loopback config - -If loopback option is enabled, disable it at the end of the test. - -Signed-off-by: Carlos Hernandez -Upstream-status: Pending ---- - serialcheck.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/serialcheck.c b/serialcheck.c -index 4100c37..06470f7 100644 ---- a/serialcheck.c -+++ b/serialcheck.c -@@ -427,6 +427,7 @@ int main(int argc, char *argv[]) - unsigned char *data; - unsigned int open_mode; - off_t data_len; -+ unsigned int mcr; - - argp_parse(&argp, argc, argv, 0, NULL, &opts); - if (!opts.file_trans) -@@ -496,8 +497,6 @@ int main(int argc, char *argv[]) - } - - if (opts.loopback) { -- unsigned int mcr; -- - ret = ioctl(fd, TIOCMGET, &mcr); - if (ret < 0) - die("mcr get failed: %m\n"); -@@ -535,6 +534,12 @@ int main(int argc, char *argv[]) - ret = tcsetattr(fd, TCSAFLUSH, &old_term); - if (ret) - printf("tcsetattr() of old ones failed: %m\n"); -+ if (opts.loopback) { -+ mcr &= ~(TIOCM_LOOP); -+ ret = ioctl(fd, TIOCMSET, &mcr); -+ } -+ if (ret) -+ printf("disabling loopback failed: %m\n"); - - close(fd); - return status; --- -1.9.1 diff --git a/meta-openembedded/meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb b/meta-openembedded/meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb index cd5e0a4e5..16eaf62f7 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb @@ -1,30 +1,31 @@ SUMMARY = "Application to verify operation of serial ports" -HOMEPAGE = "http://git.breakpoint.cc/cgit/bigeasy/serialcheck.git/" +HOMEPAGE = "https://github.com/nsekhar/serialcheck" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRC_URI = "git://git.breakpoint.cc/bigeasy/serialcheck.git \ - file://0001-Add-option-to-enable-internal-loopback.patch \ - file://0002-Restore-original-loopback-config.patch \ - file://0001-Makefile-Change-order-of-link-flags.patch \ - " +SRC_URI = " \ + git://github.com/nsekhar/serialcheck.git \ +" -SRCREV = "63854a2d0c0129efab132ec328a75279e013fb84" +SRCREV = "45eb2ffa5378396e85432872833890b0a1cba872" S = "${WORKDIR}/git" +inherit autotools + DEPENDS_append_libc-musl = " argp-standalone" -EXTRA_OEMAKE = "-e MAKEFLAGS=" +EXTRA_OEMAKE_append_libc-musl = " LIBS='-largp'" -CFLAGS_prepend = "-Wall -Wextra -Wno-sign-compare -Wno-pointer-sign " -LDFLAGS_append_libc-musl = " -largp" +PACKAGE_BEFORE_PN += "${PN}-stats" do_install() { install -d ${D}${bindir} - install ${S}/serialcheck ${D}${bindir} + install ${B}/serialcheck ${D}${bindir} + install ${B}/serialstats ${D}${bindir} install -d ${D}${docdir}/${BP} - install ${S}/Readme.txt ${D}${docdir}/${BP} + install ${S}/README ${D}${docdir}/${BP} } -CLEANBROKEN = "1" + +FILES_${PN}-stats = "${bindir}/serialstats" BBCLASSEXTEND = "nativesdk" -- cgit v1.2.3