diff options
| author | Andrew Geissler <geissonator@yahoo.com> | 2020-06-13 18:40:47 +0300 |
|---|---|---|
| committer | Andrew Geissler <geissonator@yahoo.com> | 2020-06-13 18:45:48 +0300 |
| commit | 89770b09490d616883ab728cc628a844ca0e1150 (patch) | |
| tree | a24e3c597afe31a84abbb2685bf10c8ba6c9af74 /meta-openembedded/meta-oe | |
| parent | 4accb8864625d1bb909b299d5ddbc11df53c22d3 (diff) | |
| download | openbmc-89770b09490d616883ab728cc628a844ca0e1150.tar.xz | |
meta-openembedded: subtree update:5caca0f7bd..fe77eaab8f
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 <geissonator@yahoo.com>
Change-Id: I15cb7860a288b903ef186f1979ee028e6f54ea50
Diffstat (limited to 'meta-openembedded/meta-oe')
64 files changed, 778 insertions, 491 deletions
diff --git a/meta-openembedded/meta-oe/licenses/ACE-TAO-CIAO b/meta-openembedded/meta-oe/licenses/ACE-TAO-CIAO new file mode 100644 index 0000000000..67fc56322e --- /dev/null +++ b/meta-openembedded/meta-oe/licenses/ACE-TAO-CIAO @@ -0,0 +1,111 @@ + + _________________________________________________________________ + + Copyright and Licensing Information for ACE(TM), TAO(TM), CIAO(TM), + DAnCE(TM), and CoSMIC(TM) + + [1]ACE(TM), [2]TAO(TM), [3]CIAO(TM), DAnCE(TM), and [4]CoSMIC(TM) + (henceforth referred to as "DOC software") are copyrighted by + [5]Douglas C. Schmidt and his [6]research group at [7]Washington + University, [8]University of California, Irvine, and [9]Vanderbilt + University, Copyright (c) 1993-2018, all rights reserved. Since DOC + software is open-source, freely available software, you are free to + use, modify, copy, and distribute--perpetually and irrevocably--the + DOC software source code and object code produced from the source, as + well as copy and distribute modified versions of this software. You + must, however, include this copyright statement along with any code + built using DOC software that you release. No copyright statement + needs to be provided if you just ship binary executables of your + software products. + + You can use DOC software in commercial and/or binary software releases + and are under no obligation to redistribute any of your source code + that is built using DOC software. Note, however, that you may not + misappropriate the DOC software code, such as copyrighting it yourself + or claiming authorship of the DOC software code, in a way that will + prevent DOC software from being distributed freely using an + open-source development model. You needn't inform anyone that you're + using DOC software in your software, though we encourage you to let + [10]us know so we can promote your project in the [11]DOC software + success stories. + + The [12]ACE, [13]TAO, [14]CIAO, [15]DAnCE, and [16]CoSMIC web sites + are maintained by the [17]DOC Group at the [18]Institute for Software + Integrated Systems (ISIS) and the [19]Center for Distributed Object + Computing of Washington University, St. Louis for the development of + open-source software as part of the open-source software community. + Submissions are provided by the submitter ``as is'' with no warranties + whatsoever, including any warranty of merchantability, noninfringement + of third party intellectual property, or fitness for any particular + purpose. In no event shall the submitter be liable for any direct, + indirect, special, exemplary, punitive, or consequential damages, + including without limitation, lost profits, even if advised of the + possibility of such damages. Likewise, DOC software is provided as is + with no warranties of any kind, including the warranties of design, + merchantability, and fitness for a particular purpose, + noninfringement, or arising from a course of dealing, usage or trade + practice. Washington University, UC Irvine, Vanderbilt University, + their employees, and students shall have no liability with respect to + the infringement of copyrights, trade secrets or any patents by DOC + software or any part thereof. Moreover, in no event will Washington + University, UC Irvine, or Vanderbilt University, their employees, or + students be liable for any lost revenue or profits or other special, + indirect and consequential damages. + + DOC software is provided with no support and without any obligation on + the part of Washington University, UC Irvine, Vanderbilt University, + their employees, or students to assist in its use, correction, + modification, or enhancement. A [20]number of companies around the + world provide commercial support for DOC software, however. DOC + software is Y2K-compliant, as long as the underlying OS platform is + Y2K-compliant. Likewise, DOC software is compliant with the new US + daylight savings rule passed by Congress as "The Energy Policy Act of + 2005," which established new daylight savings times (DST) rules for + the United States that expand DST as of March 2007. Since DOC software + obtains time/date and calendaring information from operating systems + users will not be affected by the new DST rules as long as they + upgrade their operating systems accordingly. + + The names ACE(TM), TAO(TM), CIAO(TM), DAnCE(TM), CoSMIC(TM), + Washington University, UC Irvine, and Vanderbilt University, may not + be used to endorse or promote products or services derived from this + source without express written permission from Washington University, + UC Irvine, or Vanderbilt University. This license grants no permission + to call products or services derived from this source ACE(TM), + TAO(TM), CIAO(TM), DAnCE(TM), or CoSMIC(TM), nor does it grant + permission for the name Washington University, UC Irvine, or + Vanderbilt University to appear in their names. + + If you have any suggestions, additions, comments, or questions, please + let [21]me know. + + [22]Douglas C. Schmidt + _________________________________________________________________ + + Back to the [23]ACE home page. + +References + + 1. http://www.dre.vanderbilt.edu/~schmidt/ACE.html + 2. http://www.dre.vanderbilt.edu/~schmidt/TAO.html + 3. http://www.dre.vanderbilt.edu/CIAO/ + 4. http://www.dre.vanderbilt.edu/cosmic/ + 5. http://www.dre.vanderbilt.edu/~schmidt/ + 6. http://www.dre.vanderbilt.edu/~schmidt/ACE-members.html + 7. http://www.wustl.edu/ + 8. http://www.uci.edu/ + 9. http://www.vanderbilt.edu/ + 10. mailto:doc_group@cs.wustl.edu + 11. http://www.dre.vanderbilt.edu/~schmidt/ACE-users.html + 12. http://www.dre.vanderbilt.edu/~schmidt/ACE.html + 13. http://www.dre.vanderbilt.edu/~schmidt/TAO.html + 14. http://www.dre.vanderbilt.edu/CIAO/ + 15. http://www.dre.vanderbilt.edu/~schmidt/DOC_ROOT/DAnCE/ + 16. http://www.dre.vanderbilt.edu/cosmic/ + 17. http://www.dre.vanderbilt.edu/ + 18. http://www.isis.vanderbilt.edu/ + 19. http://www.cs.wustl.edu/~schmidt/doc-center.html + 20. http://www.dre.vanderbilt.edu/~schmidt/commercial-support.html + 21. mailto:d.schmidt@vanderbilt.edu + 22. http://www.dre.vanderbilt.edu/~schmidt/ + 23. http://www.dre.vanderbilt.edu/~schmidt/ACE.html diff --git a/meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.8.bb b/meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.8.bb new file mode 100644 index 0000000000..24315320e4 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.8.bb @@ -0,0 +1,40 @@ +SUMMARY = "C++ framework for implementing distributed and networked applications" +DESCRIPTION = "C++ network programming framework that implements many core \ +patterns for concurrent communication software" +LICENSE = "ACE-TAO-CIAO" +HOMEPAGE = "http://www.dre.vanderbilt.edu/~schmidt/ACE.html" +LIC_FILES_CHKSUM = "file://COPYING;md5=96ef88a5529594698e8ceabdd47df92c" + +DEPENDS += "openssl gperf-native" + +SRC_URI = "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_8/ACE-${PV}.tar.bz2 \ + file://ace_config.patch \ + " + +SRC_URI[md5sum] = "a6ba6a944612fe0696c90cbb5c3078ee" +SRC_URI[sha256sum] = "cda2a960dbb9970a907663627711b2e2b14b3484a2859ae936370bcad0b16923" + +COMPATIBLE_HOST_libc-musl = "null" + +S = "${WORKDIR}/ACE_wrappers" +B = "${WORKDIR}/ACE_wrappers/ace" +export ACE_ROOT="${WORKDIR}/ACE_wrappers" + +inherit pkgconfig + +CXXFLAGS_append = " -fpermissive -Wnodeprecated-declarations" + +do_install() { + export D="${D}" + oe_runmake install + + for i in $(find ${D} -name "*.pc") ; do + sed -i -e s:${D}::g \ + -e s:/${TARGET_SYS}::g \ + $i + done + + rm -r ${D}/usr/share +} + +UPSTREAM_CHECK_URI = "https://github.com/DOCGroup/ACE_TAO/releases" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/ace/files/ace_config.patch b/meta-openembedded/meta-oe/recipes-connectivity/ace/files/ace_config.patch new file mode 100644 index 0000000000..207b85ab9c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/ace/files/ace_config.patch @@ -0,0 +1,12 @@ +diff -ruN ACE_wrappers1/ace/config.h ACE_wrappers/ace/config.h +--- ACE_wrappers1/ace/config.h 1970-01-01 02:00:00.000000000 +0200 ++++ ACE_wrappers/ace/config.h 2019-01-10 13:36:52.698012477 +0200 +@@ -0,0 +1,1 @@ ++#include "ace/config-linux.h" +diff -ruN ACE_wrappers1/include/makeinclude/platform_macros.GNU ACE_wrappers/include/makeinclude/platform_macros.GNU +--- ACE_wrappers1/include/makeinclude/platform_macros.GNU 1970-01-01 02:00:00.000000000 +0200 ++++ ACE_wrappers/include/makeinclude/platform_macros.GNU 2018-10-31 15:11:18.265392460 +0200 +@@ -0,0 +1,3 @@ ++INSTALL_PREFIX = $(D)$(exec_prefix) ++INSTALL_LIB = $(base_libdir) ++include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU diff --git a/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift_0.13.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift_0.13.0.bb index 92bcb21bf1..e3880b357a 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift_0.13.0.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift_0.13.0.bb @@ -24,7 +24,6 @@ export BUILD_SYS export HOST_SYS EXTRA_OECMAKE = " \ - -DENABLE_PRECOMPILED_HEADERS=OFF \ -DBUILD_LIBRARIES=ON \ -DBUILD_COMPILER=ON \ -DBUILD_TESTING=OFF \ @@ -36,15 +35,12 @@ EXTRA_OECMAKE = " \ -DWITH_STATIC_LIB=ON \ -DWITH_SHARED_LIB=ON \ -DWITH_OPENSSL=ON \ - -DWITH_QT4=OFF \ -DWITH_QT5=OFF \ - -DWITH_BOOST_FUNCTIONAL=OFF \ " -PACKAGECONFIG ??= "libevent glib boost-smart-ptr" +PACKAGECONFIG ??= "libevent glib" PACKAGECONFIG[libevent] = "-DWITH_LIBEVENT=ON,-DWITH_LIBEVENT=OFF,libevent" PACKAGECONFIG[glib] = "-DWITH_C_GLIB=ON,-DWITH_C_GLIB=OFF,glib-2.0" -PACKAGECONFIG[boost-smart-ptr] = "-DWITH_BOOST_SMART_PTR=ON,-DWITH_BOOST_SMART_PTR=OFF,boost" do_install_append () { ln -sf thrift ${D}/${bindir}/thrift-compiler diff --git a/meta-openembedded/meta-oe/recipes-connectivity/transmission/transmission_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/transmission/transmission_git.bb index ee5578f8b9..412bd9d3fa 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/transmission/transmission_git.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/transmission/transmission_git.bb @@ -19,7 +19,7 @@ PV = "2.94" S = "${WORKDIR}/git" -inherit autotools gettext update-rc.d systemd mime-xdg features_check +inherit autotools gettext update-rc.d systemd mime-xdg PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" diff --git a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_22.bb b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_23.bb index c0b6f7f882..c622e4857c 100644 --- a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_22.bb +++ b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_23.bb @@ -7,8 +7,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=7b486c2338d225a1405d979ed2c15ce8" SRC_URI = "https://github.com/bus1/dbus-broker/releases/download/v${PV}/dbus-broker-${PV}.tar.xz" -SRC_URI[md5sum] = "03c4730f2110b5492e1212c81af325dc" -SRC_URI[sha256sum] = "32f30700cefc997c479d75fcc42f3177940f1ebbee9c5a60c1e3ee39b90a9783" +SRC_URI[sha256sum] = "95adfde56bce898c3b69eee0524732365e802348dd8189a35d5d00c30990dc81" UPSTREAM_CHECK_URI = "https://github.com/bus1/${BPN}/releases" diff --git a/meta-openembedded/meta-oe/recipes-core/libnfc/libnfc/0001-usbbus-Include-stdint.h-for-uintX_t.patch b/meta-openembedded/meta-oe/recipes-core/libnfc/libnfc/0001-usbbus-Include-stdint.h-for-uintX_t.patch deleted file mode 100644 index b8ed87aa0f..0000000000 --- a/meta-openembedded/meta-oe/recipes-core/libnfc/libnfc/0001-usbbus-Include-stdint.h-for-uintX_t.patch +++ /dev/null @@ -1,24 +0,0 @@ -From cb2a3991545ba9e885704226ed3e831bd5e4cb27 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 20 May 2019 22:10:05 -0700 -Subject: [PATCH] usbbus: Include stdint.h for uintX_t - -stdint.h is needed for uintX_t typedefs which are -used to replace u_intX_t in libusb API headers in the cmake files - -Upstream-Status: Submitted [https://github.com/nfc-tools/libnfc/pull/544] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - libnfc/buses/usbbus.h | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/libnfc/buses/usbbus.h -+++ b/libnfc/buses/usbbus.h -@@ -35,6 +35,7 @@ - - #ifndef _WIN32 - // Under POSIX system, we use libusb (>= 0.1.12) -+#include <stdint.h> - #include <usb.h> - #define USB_TIMEDOUT ETIMEDOUT - #define _usb_strerror( X ) strerror(-X) diff --git a/meta-openembedded/meta-oe/recipes-core/libnfc/libnfc_git.bb b/meta-openembedded/meta-oe/recipes-core/libnfc/libnfc_git.bb index 2851ecf9fe..9e602f193b 100644 --- a/meta-openembedded/meta-oe/recipes-core/libnfc/libnfc_git.bb +++ b/meta-openembedded/meta-oe/recipes-core/libnfc/libnfc_git.bb @@ -7,13 +7,11 @@ SECTION = "libs" inherit autotools pkgconfig -PV = "1.7.1+git${SRCPV}" +PV = "1.8.0+git${SRCPV}" S = "${WORKDIR}/git" -SRCREV = "2d4543673e9b76c02679ca8b89259659f1afd932" -SRC_URI = "git://github.com/nfc-tools/libnfc.git \ - file://0001-usbbus-Include-stdint.h-for-uintX_t.patch \ - " +SRCREV = "f02ff51449240102c27a97173dc495e8e7789046" +SRC_URI = "git://github.com/nfc-tools/libnfc.git" CFLAGS_append_libc-musl = " -D_GNU_SOURCE" DEPENDS = "libusb" diff --git a/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_1.0.0.bb b/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_1.0.1.bb index c7d1f2b73c..64b58db548 100644 --- a/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_1.0.0.bb +++ b/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_1.0.1.bb @@ -6,8 +6,8 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase -SRC_URI[archive.md5sum] = "9087b8612d75cbc1fad0c99e15c2a718" -SRC_URI[archive.sha256sum] = "b97d9b041e5952486cab620b44ab09f6013a478f43b6699ae899b8a4da189cd4" +SRC_URI[archive.md5sum] = "5b5a589f648bd83bfa6291081ebf5864" +SRC_URI[archive.sha256sum] = "28a2d775afbf05c5c957b24b220ed6e9b2023179b98ecde471d89e9754ea5ac9" SRC_URI += "file://0001-meson.build-do-not-ask-for-python-installation-versi.patch" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-core/ocl-icd/ocl-icd_git.bb b/meta-openembedded/meta-oe/recipes-core/ocl-icd/ocl-icd_git.bb new file mode 100644 index 0000000000..d14ec53e3d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/ocl-icd/ocl-icd_git.bb @@ -0,0 +1,19 @@ +SUMMARY = "OpenCL ICD library" +DESCRIPTION = "Open Source alternative to vendor specific OpenCL ICD loaders." + +# The LICENSE is BSD 2-Clause "Simplified" License +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=232257bbf7320320725ca9529d3782ab" + +SRC_URI = "git://github.com/OCL-dev/ocl-icd.git;protocol=https" + +PV = "2.2.12+git${SRCPV}" +SRCREV = "af79aebe4649f30dbd711c1bf6fc661eac6e5f01" + +S = "${WORKDIR}/git" + +inherit autotools + +DEPENDS = "ruby-native" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-core/toybox/toybox-inittab/inittab b/meta-openembedded/meta-oe/recipes-core/toybox/toybox-inittab/inittab new file mode 100644 index 0000000000..ffb2f17a66 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/toybox/toybox-inittab/inittab @@ -0,0 +1,26 @@ +# STARTUP +::sysinit:/bin/mount -t proc proc /proc +::sysinit:/bin/mount -t sysfs sysfs /sys +::sysinit:/bin/mount -t devtmpfs devtmpfs /dev +::sysinit:/bin/mount -o remount,rw / +::sysinit:/bin/mkdir -p /dev/pts +::sysinit:/bin/mount -t devpts devpts /dev/pts +::sysinit:/bin/mount -a + +::sysinit:/bin/ln -sf /proc/self/fd /dev/fd +::sysinit:/bin/ln -sf /proc/self/fd/0 /dev/stdin +::sysinit:/bin/ln -sf /proc/self/fd/1 /dev/stdout +::sysinit:/bin/ln -sf /proc/self/fd/2 /dev/stderr + +::sysinit:/bin/hostname -F /etc/hostname + +::sysinit:/etc/init.d/rcS + +# REBOOT +::ctrlaltdel:/sbin/reboot +::shutdown:/etc/init.d/rcK +::shutdown:/bin/umount -a -r + +# RESTART INIT +::restart:/sbin/init + diff --git a/meta-openembedded/meta-oe/recipes-core/toybox/toybox-inittab/rcK b/meta-openembedded/meta-oe/recipes-core/toybox/toybox-inittab/rcK new file mode 100644 index 0000000000..617d3c0c3f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/toybox/toybox-inittab/rcK @@ -0,0 +1,26 @@ +#!/bin/sh + +# Stop all init scripts in /etc/rc6.d +# executing them in numerical order. +# +for i in /etc/rc6.d/K??*; do + + # Ignore dangling symlinks (if any). + [ ! -f "$i" ] && continue + + case "$i" in + *.sh) + # Source shell script for speed. + ( + trap - INT QUIT TSTP + set stop + . $i + ) + ;; + *) + # No sh extension, so fork subprocess. + $i stop + ;; + esac +done + diff --git a/meta-openembedded/meta-oe/recipes-core/toybox/toybox-inittab/rcS b/meta-openembedded/meta-oe/recipes-core/toybox/toybox-inittab/rcS new file mode 100644 index 0000000000..b8e29855d4 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/toybox/toybox-inittab/rcS @@ -0,0 +1,27 @@ +#!/bin/sh + +# Start all init scripts in /etc/rcS.d and /etc/rc5.d +# executing them in numerical order. +# + +for i in /etc/rcS.d/S??* /etc/rc5.d/S??* ;do + + # Ignore dangling symlinks (if any). + [ ! -f "$i" ] && continue + + case "$i" in + *.sh) + # Source shell script for speed. + ( + trap - INT QUIT TSTP + set start + . $i + ) + ;; + *) + # No sh extension, so fork subprocess. + $i start + ;; + esac +done + diff --git a/meta-openembedded/meta-oe/recipes-core/toybox/toybox-inittab_0.8.2.bb b/meta-openembedded/meta-oe/recipes-core/toybox/toybox-inittab_0.8.2.bb new file mode 100644 index 0000000000..9af1e3f149 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/toybox/toybox-inittab_0.8.2.bb @@ -0,0 +1,61 @@ +SUMMARY = "Toybox Inittab Configuration" +LICENSE = "BSD-0-Clause" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD-0-Clause;md5=81eeb0083e31f11ab1e33ded846d521c" + +SRC_URI = "\ + file://inittab \ + file://rcK \ + file://rcS \ +" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +RCONFLICTS_${PN} = "\ + busybox-inittab \ + sysvinit-inittab \ +" + +# most users may want to have getty enabled by default +PACKAGECONFIG ??= "getty" + +PACKAGECONFIG[getty] = "\ + enable_getty \ +" + +do_patch[noexec] = "1" + +do_configure() { + # copy over files now to have a fresh start on each config + for f in inittab rcK rcS; do + cp ${WORKDIR}/$f ${S} + done + + for config in ${PACKAGECONFIG_CONFARGS}; do + if [[ ${config} == "enable_getty" ]]; then + echo "# generated by bitbake recipe ${PN}" >> ${S}/inittab + for console in "${SERIAL_CONSOLES}"; do + param=$(echo ${console} | sed s/\;/\ /g) + name=$(echo ${param} | cut -d' ' -f2) + echo "$name::respawn:${base_sbindir}/getty ${param}" >> ${S}/inittab + done + fi + done +} + +do_compile[noexec] = "1" + +do_install() { + install -d ${D}${sysconfdir} + install -D -m 0644 ${S}/inittab ${D}${sysconfdir}/inittab + + install -d ${D}${sysconfdir}/init.d + install -D -m 0744 ${S}/rcK ${D}${sysconfdir}/init.d/rcK + install -D -m 0744 ${S}/rcS ${D}${sysconfdir}/init.d/rcS +} + +FILES_${PN} = "\ + ${sysconfdir}/inittab \ + ${sysconfdir}/init.d/rcK \ + ${sysconfdir}/init.d/rcS \ +" + diff --git a/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.8.3.bb b/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.8.3.bb index 4e72f295d3..5d453219f2 100644 --- a/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.8.3.bb +++ b/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.8.3.bb @@ -15,6 +15,8 @@ SRC_URI[sha256sum] = "eab28fd29d19d4e61ef09704e5871940e6f35fd35a3bb1285e41f20450 SECTION = "base" +RDEPENDS_${PN} = "${@["", "toybox-inittab"][(d.getVar('VIRTUAL-RUNTIME_init_manager') == 'toybox')]}" + TOYBOX_BIN = "generated/unstripped/toybox" # Toybox is strict on what CC, CFLAGS and CROSS_COMPILE variables should contain. @@ -52,6 +54,11 @@ do_configure() { # Disable swapon as it doesn't handle the '-a' argument used during boot sed -e 's/CONFIG_SWAPON=y/# CONFIG_SWAPON is not set/' -i .config + + # Enable init if toybox was set as init manager + if [[ ${VIRTUAL-RUNTIME_init_manager} == *"toybox"* ]]; then + sed -e 's/# CONFIG_INIT is not set/CONFIG_INIT=y/' -i .config + fi } do_compile() { diff --git a/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.3.2.bb b/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.3.3.bb index b9668eb099..93eba93a95 100644 --- a/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.3.2.bb +++ b/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.3.3.bb @@ -21,8 +21,8 @@ RDEPENDS_${PN} = " \ " SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}/${BP}.tar.xz" -SRC_URI[md5sum] = "6e4ffb6d35a73f7539a5d0c1354654cd" -SRC_URI[sha256sum] = "a89e13dff0798fd0280e801d5f0cc8cfdb2aa5b1929bec1b7322e13d3eca95fb" +SRC_URI[md5sum] = "6c0ce8be21a7687b89354c77757d0c5b" +SRC_URI[sha256sum] = "3bca4ffe39e2f94cef50f6ea65acb873a6dbce5db34fc6bcefe38b6d095e82df" inherit autotools gettext pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch deleted file mode 100644 index 84cd5c1579..0000000000 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch +++ /dev/null @@ -1,50 +0,0 @@ -From d3ee8c8df5808b63e86f40831f2ba62cbb33d291 Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Wed, 8 Aug 2018 09:18:27 +0800 -Subject: [PATCH] postgresql: Use pkg-config for libxml2 detection. - -Upstream-Status: Inappropriate [configuration] - -xml2-config does not work. Use pkgconfig to set CPPFLAGS and LIBS. - -Signed-off-by: Philip Balister <philip@balister.org> - -update to version 10.4 -Signed-off-by: Changqing Li <changqing.li@windriver.com> - -Update for version 12.0 -Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> ---- - configure.in | 16 ++-------------- - 1 file changed, 2 insertions(+), 14 deletions(-) - -diff --git a/configure.in b/configure.in -index 6942f81..7fd3e78 100644 ---- a/configure.in -+++ b/configure.in -@@ -923,20 +923,8 @@ PGAC_ARG_BOOL(with, libxml, no, [build with XML support], - [AC_DEFINE([USE_LIBXML], 1, [Define to 1 to build with XML support. (--with-libxml)])]) - - if test "$with_libxml" = yes ; then -- PGAC_PATH_PROGS(XML2_CONFIG, xml2-config) -- AC_ARG_VAR(XML2_CONFIG, [path to xml2-config utility])dnl -- if test -n "$XML2_CONFIG"; then -- for pgac_option in `$XML2_CONFIG --cflags`; do -- case $pgac_option in -- -I*|-D*) CPPFLAGS="$CPPFLAGS $pgac_option";; -- esac -- done -- for pgac_option in `$XML2_CONFIG --libs`; do -- case $pgac_option in -- -L*) LDFLAGS="$LDFLAGS $pgac_option";; -- esac -- done -- fi -+ CPPFLAGS="$CPPFLAGS `pkg-config --short-errors --print-errors --cflags "libxml-2.0" 2>&1`" -+ LIBS="`pkg-config --short-errors --print-errors --libs "libxml-2.0" 2>&1` $LIBS" - fi - - AC_SUBST(with_libxml) --- -2.7.4 - diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc index d35711c1e5..5b20098a72 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc @@ -29,7 +29,6 @@ SRC_URI = "http://ftp.postgresql.org/pub/source/v${PV}/${BP}.tar.bz2 \ file://postgresql.pam \ file://postgresql-setup \ file://postgresql.service \ - file://0001-Use-pkg-config-for-libxml2-detection.patch \ " LEAD_SONAME = "libpq.so" diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_12.2.bb b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_12.3.bb index 0613e50c72..cc7e3ff52b 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_12.2.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_12.3.bb @@ -8,5 +8,5 @@ SRC_URI += "\ file://0001-Improve-reproducibility.patch \ " -SRC_URI[md5sum] = "a88ceea8ecf2741307f663e4539b58b7" -SRC_URI[sha256sum] = "ad1dcc4c4fc500786b745635a9e1eba950195ce20b8913f50345bb7d5369b5de" +SRC_URI[md5sum] = "a30c023dd7088e44d73be71af2ef404a" +SRC_URI[sha256sum] = "94ed64a6179048190695c86ec707cc25d016056ce10fc9d229267d9a8f1dcf41" 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 f059002161..0000000000 --- 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 <ipeace5@gmail.com>" - -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 0000000000..2b799fd5e4 --- /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 <ipeace5@gmail.com>" + +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.3.bb index a88410f2ff..97c6361ad8 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.2.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.3.bb @@ -11,7 +11,7 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=fa2a23dd1dc6c139f35105379d76df2b" -SRCREV = "d2e6a971f4544c55b8e3b25cf96db266971b778f" +SRCREV = "6aba23f4a8628d599a9ef7fa4811c4ff6e4070e2" SRC_URI = "git://github.com/open-source-parsers/jsoncpp" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/mercurial/mercurial_5.2.bb b/meta-openembedded/meta-oe/recipes-devtools/mercurial/mercurial_5.4.bb index 6dedb02aa3..fa3c734519 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/mercurial/mercurial_5.2.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/mercurial/mercurial_5.4.bb @@ -10,8 +10,8 @@ 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" +SRC_URI[md5sum] = "0859029d0bb54bcf7c583c55680573cb" +SRC_URI[sha256sum] = "1df8d1978aefcbb65dc51e3666a452583f47aeaf3c5682e4c00a3b23cd805d6a" S = "${WORKDIR}/mercurial-${PV}" 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 d410dc6e0a..5224f32b03 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 f69254a292..0000000000 --- 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 <nsekhar@ti.com> -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 <sys/ioctl.h> - #include <linux/serial.h> - -+#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 2ab48345dc..0000000000 --- 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 <raj.khem@gmail.com> -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 <raj.khem@gmail.com> ---- -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 1b8c95b10c..0000000000 --- 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 <ceh@ti.com> -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 <ceh@ti.com> -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 cd5e0a4e5c..16eaf62f78 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" diff --git a/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb b/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb index 06895a03aa..21d13ac935 100644 --- a/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb +++ b/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb @@ -52,7 +52,7 @@ EXTRA_OECMAKE_append_riscv64 = " -DFLB_DEPS='atomic'" # DEPENDS += "openssl " # EXTRA_OECMAKE += "-DFLB_OUT_KAFKA=On " -inherit cmake systemd features_check +inherit cmake systemd SYSTEMD_SERVICE_${PN} = "td-agent-bit.service" TARGET_CC_ARCH_append = " ${SELECTED_OPTIMIZATION}" diff --git a/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.8.bb b/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.9.bb index 403956efa1..c1839b37a8 100644 --- a/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.8.bb +++ b/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.9.bb @@ -5,8 +5,8 @@ HOMEPAGE = "http://www.issihosts.com/haveged/index.html" LICENSE = "GPLv3" LIC_FILES_CHKSUM="file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -# v1.9.8 -SRCREV = "8cd0266472aff59821718c4410e80f28978310f9" +# v1.9.9 +SRCREV = "6da706c8026b629d9bb7ebebc32239305a03da8e" SRC_URI = "git://github.com/jirka-h/haveged.git \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb b/meta-openembedded/meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb index d2819f76c5..50dd74b685 100644 --- a/meta-openembedded/meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb @@ -2,10 +2,10 @@ SUMMARY = "A handy serial sniffer" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a" -PV = "2.3.4+git${SRCPV}" +PV = "2.3.5+git${SRCPV}" SRC_URI = "git://github.com/snarlistic/jpnevulator.git;protocol=http" -SRCREV = "97438ecbd52fbc01540221bc590f8388a43c74e0" +SRCREV = "c2d857091c0dfed05139ac07ea9b0f36ad259638" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.23.bb b/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.24.bb index 3f4eec274f..99cdee5bba 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.23.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.24.bb @@ -10,11 +10,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c" inherit autotools gobject-introspection -SRCREV = "f5d2458e9e52d8c55b609ae8cf46ef0673b4a02a" -SRC_URI = " \ - git://github.com/rhinstaller/libblockdev;branch=master \ -" - +SRC_URI = "git://github.com/storaged-project/libblockdev;branch=2.x-branch" +SRCREV = "f5a4ba8bb298f8cbc435707d0b19b4b2ff836a8e" S = "${WORKDIR}/git" FILES_${PN} += "${libdir}/python2.7/dist-packages ${libdir}/python3.*/site-packages" diff --git a/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.6.1.bb b/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.7.0.bb index 41ad552987..e7cb6a06db 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.6.1.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.7.0.bb @@ -15,5 +15,4 @@ inherit cmake SRC_URI = "https://libzip.org/download/libzip-${PV}.tar.xz" -SRC_URI[md5sum] = "f9a228619aab2446addc9c9e0e2de149" -SRC_URI[sha256sum] = "705dac7a671b3f440181481e607b0908129a9cf1ddfcba75d66436c0e7d33641" +SRC_URI[sha256sum] = "d26b2952426d2518f3db5cdeda4fe3cd668fc5bb38a598781e4d1d3f7f8ca7be" diff --git a/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/graphviz-setup.sh b/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/graphviz-setup.sh new file mode 100644 index 0000000000..df0be9e3ed --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/graphviz-setup.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +echo "Setting up graphviz..." + +# Create /usr/lib/graphviz/config6 +$OECORE_NATIVE_SYSROOT/usr/bin/dot -c diff --git a/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_2.40.1.bb b/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_2.40.1.bb index 12ecb99091..aa5c0c8206 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_2.40.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_2.40.1.bb @@ -16,6 +16,7 @@ DEPENDS = " \ freetype \ " DEPENDS_append_class-target = " ${BPN}-native" +DEPENDS_append_class-nativesdk = " ${BPN}-native" inherit autotools-brokensep pkgconfig gettext @@ -33,6 +34,10 @@ SRC_URI_append_class-target = "\ file://0001-Use-native-mkdefs.patch \ file://0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch \ " +SRC_URI_append_class-nativesdk = "\ + file://0001-Use-native-mkdefs.patch \ + file://graphviz-setup.sh \ +" SRC_URI[md5sum] = "2acf30ca8e6cc8b001b0334db65fd072" SRC_URI[sha256sum] = "e6c3f8dbfde1c4523055403927bef29f97f9fc12715c1042b5dcf648a2c1c62a" @@ -47,7 +52,17 @@ EXTRA_OECONF_class-target = "\ --disable-r \ --disable-sharp \ " +EXTRA_OECONF_class-nativesdk = "\ + --with-expatincludedir=${STAGING_INCDIR} \ + --with-expatlibdir=${STAGING_LIBDIR} \ + --without-included-ltdl \ + --disable-java \ + --disable-tcl \ + --disable-r \ + --disable-sharp \ + " CFLAGS_append_class-target = " -D_typ_ssize_t=1 -D_long_double=1" +CFLAGS_append_class-nativesdk = " -D_typ_ssize_t=1 -D_long_double=1" do_configure_prepend() { cd ${S} # create version.m4 and ignore libtoolize errors @@ -59,6 +74,13 @@ do_install_append_class-native() { install -m755 ${B}/lib/gvpr/mkdefs ${D}${bindir} } +do_install_append_class-nativesdk() { + # graphviz-setup.sh must be executed at SDK installation + install -d ${D}${SDKPATHNATIVE}/post-relocate-setup.d + install -m 0755 ${WORKDIR}/graphviz-setup.sh ${D}${SDKPATHNATIVE}/post-relocate-setup.d +} +FILES_${PN}_class-nativesdk += "${SDKPATHNATIVE}" + PACKAGES =+ "${PN}-python ${PN}-perl ${PN}-demo" FILES_${PN}-python += "${libdir}/python*/site-packages/ ${libdir}/graphviz/python/" @@ -74,4 +96,4 @@ INSANE_SKIP_${PN}-python = "dev-so" FILES_SOLIBSDEV_append = " ${libdir}/graphviz/lib*${SOLIBSDEV}" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.37.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.37.bb index f74e5ce6c3..03f30bf4ac 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.37.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.37.bb @@ -45,3 +45,9 @@ FILES_${PN}-common = "${sysconfdir}" SRC_URI[md5sum] = "d0efec10b9f110a32e9b8f796e21782c" SRC_URI[sha256sum] = "fa9ca4d13871dd122f61258a80d01751d603b4d3ee14095d65453b4e846e17d7" + +BBCLASSEXTEND = "native nativesdk" + +# Allow installation of fonts into recipe-sysroot-native +SYSROOT_DIRS_BLACKLIST_remove = "${datadir}/fonts" + diff --git a/meta-openembedded/meta-oe/recipes-kernel/intel-speed-select/intel-speed-select.bb b/meta-openembedded/meta-oe/recipes-kernel/intel-speed-select/intel-speed-select.bb new file mode 100644 index 0000000000..53f6de1068 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-kernel/intel-speed-select/intel-speed-select.bb @@ -0,0 +1,30 @@ +SUMMARY = "A tool to validate Intel Speed Select commands" + +DESCRIPTION = "The Intel Speed Select Technology (Intel SST) is a powerful new \ +collection of features giving you more granular control over CPU performance \ +for optimized total cost of ownership." + +LICENSE = "GPLv2" + +inherit kernelsrc + +COMPATIBLE_HOST = '(x86_64|i.86).*-linux' +COMPATIBLE_HOST_libc-musl = 'null' + +do_populate_lic[depends] += "virtual/kernel:do_patch" + +B = "${WORKDIR}/${BPN}-${PV}" + +EXTRA_OEMAKE = "-C ${S}/tools/power/x86/intel-speed-select O=${B} CROSS=${TARGET_PREFIX} CC="${CC}" LD="${LD}" AR=${AR} ARCH=${ARCH}" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +do_configure[depends] += "virtual/kernel:do_shared_workdir" + +do_compile() { + oe_runmake +} + +do_install() { + oe_runmake DESTDIR=${D} install +} diff --git a/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb b/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb index f7b0f30fb9..e5f1096b6a 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb @@ -22,7 +22,7 @@ SRC_URI = " \ S = "${WORKDIR}/git" -inherit waf pkgconfig features_check mime-xdg +inherit waf pkgconfig mime-xdg LUA ?= "lua" LUA_mips64 = "" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.8.1.bb b/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.8.2.bb index 006e73af46..4a98ec17dd 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.8.1.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.8.2.bb @@ -7,7 +7,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=d5b04755015be901744a78cc30d390d4" -SRCREV = "8ae686757b708cd8df1d10c71586aff5355cfe1e" +SRCREV = "7ec7a33a081aeeb53fed1a8d87e4cbd189152527" SRC_URI += "git://chromium.googlesource.com/webm/libvpx;protocol=https \ file://libvpx-configure-support-blank-prefix.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-navigation/geoclue/geoclue_2.5.3.bb b/meta-openembedded/meta-oe/recipes-navigation/geoclue/geoclue_2.5.3.bb index b46445a2ba..e57e7a7209 100644 --- a/meta-openembedded/meta-oe/recipes-navigation/geoclue/geoclue_2.5.3.bb +++ b/meta-openembedded/meta-oe/recipes-navigation/geoclue/geoclue_2.5.3.bb @@ -31,7 +31,7 @@ PACKAGECONFIG ??= "3g modem-gps cdma nmea lib" PACKAGECONFIG[3g] = "-D3g-source=true,-D3g-source=false,modemmanager" PACKAGECONFIG[modem-gps] = "-Dmodem-gps-source=true,-Dmodem-gps-source=false,modemmanager" PACKAGECONFIG[cdma] = "-Dcdma-source=true,-Dcdma-source=false,modemmanager" -PACKAGECONFIG[nmea] = "-Dnmea-source=true,-Dnmea-source=false,avahi" +PACKAGECONFIG[nmea] = "-Dnmea-source=true,-Dnmea-source=false,avahi,avahi-daemon" PACKAGECONFIG[lib] = "-Dlibgeoclue=true,-Dlibgeoclue=false,gobject-introspection" GTKDOC_MESON_OPTION = "gtk-doc" diff --git a/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd/gpsd.init b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd/gpsd.init new file mode 100644 index 0000000000..c9db0bb5c2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd/gpsd.init @@ -0,0 +1,158 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: gpsd +# Required-Start: $remote_fs $syslog $network +# Should-Start: bluetooth dbus udev +# Required-Stop: $remote_fs $syslog $network +# Should-Stop: +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# X-Start-Before: ntp +# Short-Description: GPS (Global Positioning System) daemon start/stop script +# Description: Start/Stop script for the gpsd service daemon, +# which is able to monitor one or more GPS devices +# connected to a host computer, making all data on +# the location and movements of the sensors available +# to be queried on TCP port 2947. +### END INIT INFO + + +# PATH should only include /usr/* if it runs after the mountnfs.sh script +PATH=/sbin:/usr/sbin:/bin:/usr/bin + +DESC="GPS (Global Positioning System) daemon" +NAME="gpsd" +DAEMON=/usr/sbin/$NAME +PIDFILE=/var/run/$NAME.pid + +. /etc/init.d/functions || exit 1 + +# Exit if the package is not installed +[ -x "$DAEMON" ] || exit 0 + +# Read configuration variable file if it is present +[ -r /etc/default/$NAME ] && . /etc/default/$NAME + +if [ -z "$GPSD_SOCKET" ] && [ -z "$DEVICES" ]; then + GPSD_SOCKET=/var/run/gpsd.sock +fi + +if [ -n "$GPSD_SOCKET" ]; then + GPSD_OPTIONS="$GPSD_OPTIONS -F $GPSD_SOCKET" +fi + +DAEMON_ARGS="$GPSD_OPTIONS $DEVICES" + +# +# Function that starts the daemon/service +# +do_start() { + local status pid + + status=0 + pid=`pidofproc $NAME` || status=$? + case $status in + 0) + echo "$DESC already running ($pid)." + exit 1 + ;; + *) + echo "Starting $DESC ..." + exec $DAEMON $DAEMON_ARGS >/dev/null 2>&1 || status=$? + echo "ERROR: Failed to start $DESC." + exit $status + ;; + esac +} + +# +# Function that stops the daemon/service +# +do_stop() { + local pid status + + status=0 + pid=`pidofproc $NAME` || status=$? + case $status in + 0) + # Exit when fail to stop, the kill would complain when fail + kill -s 15 $pid >/dev/null && rm -f $PIDFILE && \ + echo "Stopped $DESC ($pid)." || exit $? + ;; + *) + echo "$DESC is not running; none killed." >&2 + ;; + esac + + return $status +} + +# +# Function that sends a SIGHUP to the daemon/service +# +do_reload() { + local pid status + + status=0 + # If the daemon can reload its configuration without + # restarting (for example, when it is sent a SIGHUP), + # then implement that here. + pid=`pidofproc $NAME` || status=$? + case $status in + 0) + echo "Reloading $DESC ..." + kill -s 1 $pid || exit $? + ;; + *) + echo "$DESC is not running; none reloaded." >&2 + ;; + esac + exit $status +} + + +# +# Function that shows the daemon/service status +# +status_of_proc () { + local pid status + + status=0 + # pidof output null when no program is running, so no "2>/dev/null". + pid=`pidofproc $NAME` || status=$? + case $status in + 0) + echo "$DESC is running ($pid)." + exit 0 + ;; + *) + echo "$DESC is not running." >&2 + exit $status + ;; + esac +} + +case "$1" in +start) + do_start + ;; +stop) + do_stop || exit $? + ;; +status) + status_of_proc + ;; +restart) + # Always start the service regardless the status of do_stop + do_stop + do_start + ;; +force-reload) + # Only start the service when do_stop succeeds + do_stop && do_start + ;; +*) + echo "Usage: $0 {start|stop|status|restart|force-reload}" >&2 + exit 3 + ;; +esac diff --git a/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.20.bb b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.20.bb index 390e6a8c3b..3888ad8fa3 100644 --- a/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.20.bb +++ b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.20.bb @@ -8,6 +8,7 @@ PROVIDES = "virtual/gpsd" SRC_URI = "${SAVANNAH_GNU_MIRROR}/${BPN}/${BP}.tar.gz \ file://0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch \ file://0001-Revert-SConstruct-Add-test-for-sizeof-time_t-result-.patch \ + file://gpsd.init \ " SRC_URI[md5sum] = "cf7fdec7ce7221d20bee1a7246362b05" SRC_URI[sha256sum] = "172a7805068eacb815a3c5225436fcb0be46e7e49a5001a94034eac43df85e50" @@ -66,7 +67,7 @@ do_install() { do_install_append() { install -d ${D}/${sysconfdir}/init.d - install -m 0755 ${S}/packaging/deb/etc_init.d_gpsd ${D}/${sysconfdir}/init.d/gpsd + install -m 0755 ${WORKDIR}/gpsd.init ${D}/${sysconfdir}/init.d/gpsd install -d ${D}/${sysconfdir}/default install -m 0644 ${S}/packaging/deb/etc_default_gpsd ${D}/${sysconfdir}/default/gpsd.default diff --git a/meta-openembedded/meta-oe/recipes-navigation/proj/proj_7.0.0.bb b/meta-openembedded/meta-oe/recipes-navigation/proj/proj_7.0.1.bb index 44674244ef..2cfaa7121b 100644 --- a/meta-openembedded/meta-oe/recipes-navigation/proj/proj_7.0.0.bb +++ b/meta-openembedded/meta-oe/recipes-navigation/proj/proj_7.0.1.bb @@ -6,7 +6,9 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=74d9aaec5fa0cd734341e8c4dc91b608" SRC_URI = "http://download.osgeo.org/${BPN}/${BP}.tar.gz" -SRC_URI[sha256sum] = "ee0e14c1bd2f9429b1a28999240304c0342ed739ebaea3d4ff44c585b1097be8" + +SRC_URI[md5sum] = "5ba7536b579a6c9e0ad822dbdd455985" +SRC_URI[sha256sum] = "a7026d39c9c80d51565cfc4b33d22631c11e491004e19020b3ff5a0791e1779f" DEPENDS = "sqlite3 sqlite3-native tiff" diff --git a/meta-openembedded/meta-oe/recipes-shells/dash/dash/0001-Fix-printf-format-errors-with-clang.patch b/meta-openembedded/meta-oe/recipes-shells/dash/dash/0001-Fix-printf-format-errors-with-clang.patch deleted file mode 100644 index b3991faa88..0000000000 --- a/meta-openembedded/meta-oe/recipes-shells/dash/dash/0001-Fix-printf-format-errors-with-clang.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 3ddf397febf47f8de9ca2805e92355ecb3ba0e9f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 8 Apr 2017 12:37:54 -0700 -Subject: [PATCH] Fix printf format errors with clang - -error: format string is not a string literal (potentially insecure) - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/jobs.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/jobs.c b/src/jobs.c -index c2c2332..dcb81c1 100644 ---- a/src/jobs.c -+++ b/src/jobs.c -@@ -427,7 +427,7 @@ sprint_status(char *s, int status, int sigonly) - goto out; - #endif - } -- col = fmtstr(s, 32, strsignal(st)); -+ col = fmtstr(s, 32, "%s", strsignal(st)); - #ifdef WCOREDUMP - if (WCOREDUMP(status)) { - col += fmtstr(s + col, 16, " (core dumped)"); --- -2.12.2 - diff --git a/meta-openembedded/meta-oe/recipes-shells/dash/dash_0.5.10.2.bb b/meta-openembedded/meta-oe/recipes-shells/dash/dash_0.5.11.bb index 18566284c0..b3a36651fc 100644 --- a/meta-openembedded/meta-oe/recipes-shells/dash/dash_0.5.10.2.bb +++ b/meta-openembedded/meta-oe/recipes-shells/dash/dash_0.5.11.bb @@ -7,11 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b5262b4a1a1bff72b48e935531976d2e" inherit autotools update-alternatives -SRC_URI = "http://gondor.apana.org.au/~herbert/${BPN}/files/${BP}.tar.gz \ - file://0001-Fix-printf-format-errors-with-clang.patch \ - " -SRC_URI[md5sum] = "8f485f126c05d0ab800e85abfe1987aa" -SRC_URI[sha256sum] = "3c663919dc5c66ec991da14c7cf7e0be8ad00f3db73986a987c118862b5f6071" +SRC_URI = "http://gondor.apana.org.au/~herbert/${BPN}/files/${BP}.tar.gz" +SRC_URI[md5sum] = "027236e48b9202607b1418fee42c473e" +SRC_URI[sha256sum] = "4dd9a6ed5fe7546095157918fe5d784bb0b7887ae13de50e1e2d11e1b5a391cb" EXTRA_OECONF += "--bindir=${base_bindir}" diff --git a/meta-openembedded/meta-oe/recipes-shells/mksh/mksh_58.bb b/meta-openembedded/meta-oe/recipes-shells/mksh/mksh_59.bb index a9940f88a4..110e793b07 100644 --- a/meta-openembedded/meta-oe/recipes-shells/mksh/mksh_58.bb +++ b/meta-openembedded/meta-oe/recipes-shells/mksh/mksh_59.bb @@ -3,14 +3,14 @@ HOMEPAGE = "http://www.mirbsd.org/mksh.htm" SECTION = "base/shell" LICENSE = "${@bb.utils.contains("TCLIBC", "glibc", "MirOS & ISC", "MirOS", d)}" -LIC_FILES_CHKSUM = "file://main.c;beginline=6;endline=26;md5=0651e575e39d1a3e884562e25d491fc7 \ +LIC_FILES_CHKSUM = "file://main.c;beginline=6;endline=26;md5=6efc2c249328e4d2bd3e595d5b1f9d31 \ file://strlcpy.c;beginline=1;endline=17;md5=d953f28f0c43ee29e238ec9bc15df2a0 \ " -SRC_URI = "http://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R58.tgz" +SRC_URI = "http://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R59b.tgz" -SRC_URI[md5sum] = "6922a3e2228de2f0e78ff25398ccf8df" -SRC_URI[sha256sum] = "608beb7b71870b23309ba1da8ca828da0e4540f2b9bd981eb39e04f8b7fc678c" +SRC_URI[md5sum] = "dce6abffc2036288540b9ba11dfb2ec8" +SRC_URI[sha256sum] = "907ed1a9586e7f18bdefdd4a763aaa8397b755e15034aa54f4d753bfb272e0e6" inherit update-alternatives diff --git a/meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.2.1.bb b/meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.2.1.bb new file mode 100644 index 0000000000..b53cd6b19f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.2.1.bb @@ -0,0 +1,21 @@ +SUMMURY = "C-Periphery lib used to access GPIO, LED, PWM, SPI, I2C, MMIO, Serial" +DESCRIPTION = "A C library for peripheral I/O (GPIO, LED, PWM, SPI, I2C, MMIO, Serial) in Linux" + +HOMEPAGE = "https://github.com/vsergeev/c-periphery" + +SECTION = "libs" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4097ec544cf01e9c7cfc4bdf8e4ed887" + +SRC_URI = "git://github.com/vsergeev/c-periphery;protocol=https" +SRCREV = "c2aa7d164f87b807077daeeb3443a56b89e1d1c9" + +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON" + +BBCLASSEXTEND = "native nativesdk" + diff --git a/meta-openembedded/meta-oe/recipes-support/gd/gd_2.3.0.bb b/meta-openembedded/meta-oe/recipes-support/gd/gd_2.3.0.bb index eec8a05ae8..554e07fd3c 100644 --- a/meta-openembedded/meta-oe/recipes-support/gd/gd_2.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/gd/gd_2.3.0.bb @@ -35,7 +35,7 @@ EXTRA_OEMAKE = 'LDFLAGS="${LDFLAGS}"' DEBUG_OPTIMIZATION_append = " -Wno-error=maybe-uninitialized" -do_install_append() { +do_install_append_class-target() { # cleanup buildpaths from gdlib.pc sed -i -e 's#${STAGING_DIR_HOST}##g' ${D}${libdir}/pkgconfig/gdlib.pc } @@ -50,3 +50,5 @@ RPROVIDES_${PN}-tools = "${PN}-tools" RDEPENDS_${PN}-tools = "perl perl-module-strict" CVE_PRODUCT = "libgd" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb b/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb index 5f3e3f686a..035a11c894 100644 --- a/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb @@ -5,8 +5,8 @@ SECTION = "System/Base" LICENSE = "GPL-2.0+" LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57" -PV = "0.333" -SRCREV = "2de52be0d00015fa6cde70bb845fa9b86cf6f420" +PV = "0.336" +SRCREV = "e0e15bc7930f6d7befa4e7060fd03cc4935f6190" SRC_URI = "git://github.com/vcrhonek/${BPN}.git" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb/0001-generate-version-script-Don-t-hard-code-the-path-of-.patch b/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb/0001-generate-version-script-Don-t-hard-code-the-path-of-.patch new file mode 100644 index 0000000000..41e64d7d80 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb/0001-generate-version-script-Don-t-hard-code-the-path-of-.patch @@ -0,0 +1,53 @@ +From 76c23503ed1002d3aad0118795006fe2128006ae Mon Sep 17 00:00:00 2001 +From: Ting-Wei Lan <lantw@src.gnome.org> +Date: Sat, 21 Mar 2020 22:13:57 +0800 +Subject: [PATCH] generate-version-script: Don't hard-code the path of python3 + +Python can be installed in different directories on different operating +systems, so we can't hard-code the path of it. Instead, use meson to +find it to avoid 'no such file or directory' error on the bad path. + +Upstream-Status: Backport [https://github.com/hughsie/libgusb/pull/36] +Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> +--- + contrib/generate-version-script.py | 1 - + gusb/meson.build | 4 ++++ + 2 files changed, 4 insertions(+), 1 deletion(-) + mode change 100755 => 100644 contrib/generate-version-script.py + +diff --git a/contrib/generate-version-script.py b/contrib/generate-version-script.py +old mode 100755 +new mode 100644 +index c4ee238ab0ab..0fe2b24e47e3 +--- a/contrib/generate-version-script.py ++++ b/contrib/generate-version-script.py +@@ -1,4 +1,3 @@ +-#!/usr/bin/python3 + # pylint: disable=invalid-name,missing-docstring + # + # Copyright (C) 2017 Richard Hughes <richard@hughsie.com> +diff --git a/gusb/meson.build b/gusb/meson.build +index 10a6f537a642..28ca3c63e595 100644 +--- a/gusb/meson.build ++++ b/gusb/meson.build +@@ -142,6 +142,9 @@ libgusb_girtarget = gnome.generate_gir(gusb, + libgusb_gir = libgusb_girtarget[0] + libgusb_typelib = libgusb_girtarget[1] + ++pymod = import('python') ++py_installation = pymod.find_installation('python3') ++ + # Verify the map file is correct -- note we can't actually use the generated + # file for two reasons: + # +@@ -154,6 +157,7 @@ mapfile_target = custom_target('gusb_mapfile', + input: libgusb_girtarget[0], + output: 'libgusb.ver', + command: [ ++ py_installation, + join_paths(meson.source_root(), 'contrib', 'generate-version-script.py'), + 'LIBGUSB', + '@INPUT@', +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_git.bb b/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_0.3.4.bb index e3c0bdd15e..bd88c8ed4c 100644 --- a/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_0.3.4.bb @@ -6,7 +6,8 @@ DEPENDS = "glib-2.0 libusb" inherit meson gobject-introspection gtk-doc gettext vala -SRC_URI = "git://github.com/hughsie/libgusb.git" -SRCREV = "636efc0624aa2a88174220fcabc9764c13d7febf" -PV = "0.3.0+git${SRCPV}" +SRC_URI = "git://github.com/hughsie/libgusb.git \ + file://0001-generate-version-script-Don-t-hard-code-the-path-of-.patch \ + " +SRCREV = "377917fed85476d615f72279d0c97bc391d0f191" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb b/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb index f83d9c9225..d12fac633f 100644 --- a/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb @@ -4,8 +4,8 @@ SECTION = "libs" LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING.txt;md5=7c13b3376cea0ce68d2d2da0a1b3a72c" -SRCREV = "5f5af2e417129ad8f4e05fc5c1b730f0694dca12" -PV = "0.19+git${SRCPV}" +SRCREV = "26c5be5ae37334abf3021b52d27f84aa6a6b1842" +PV = "0.20+git${SRCPV}" SRC_URI = "git://github.com/analogdevicesinc/libiio.git;protocol=https" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.06.bb b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.06.bb index e2b551bbc6..bc86810ecb 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.06.bb +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.06.bb @@ -32,7 +32,7 @@ PACKAGE_BEFORE_PN = "${PN}-scripts ${PN}-udevrules" SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'dmeventd', 'lvm2-monitor.service dm-event.socket dm-event.service', '', d)} \ - blk-availability.service lvm2-pvscan@.service" + blk-availability.service" SYSTEMD_AUTO_ENABLE = "disable" TARGET_CC_ARCH += "${LDFLAGS}" @@ -52,7 +52,11 @@ FILES_libdevmapper = " \ ${sbindir}/dmstats \ " -FILES_${PN} += "${libdir}/device-mapper/*.so" +FILES_${PN} += " \ + ${libdir}/device-mapper/*.so \ + ${systemd_system_unitdir}/lvm2-pvscan@.service \ +" + FILES_${PN}-scripts = " \ ${sbindir}/blkdeactivate \ ${sbindir}/fsadm \ diff --git a/meta-openembedded/meta-oe/recipes-support/mscgen/mscgen_0.20.bb b/meta-openembedded/meta-oe/recipes-support/mscgen/mscgen_0.20.bb index 276ad201fd..49899edd73 100644 --- a/meta-openembedded/meta-oe/recipes-support/mscgen/mscgen_0.20.bb +++ b/meta-openembedded/meta-oe/recipes-support/mscgen/mscgen_0.20.bb @@ -16,3 +16,5 @@ inherit autotools gettext do_configure_prepend() { sed -i "s#AC_PATH_PROG(GDLIB_CONFIG,gdlib-config)#AC_PATH_PROG([GDLIB_CONFIG],[gdlib-config], ,[${STAGING_BINDIR_CROSS}])#" ${S}/configure.ac } + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0001-fix-boolean-value-with-json-c-0.14.patch b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0001-fix-boolean-value-with-json-c-0.14.patch new file mode 100644 index 0000000000..cf97b491e1 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0001-fix-boolean-value-with-json-c-0.14.patch @@ -0,0 +1,42 @@ +From 5ae81386a8cfea4180738c261cd3f7944a631199 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 3 Jun 2020 16:03:56 -0700 +Subject: [PATCH] fix boolean value with json-c 0.14 + +Patch from Christian Hesse posted here +https://www.spinics.net/lists/dm-devel/msg40646.html + +Upstream json-c 0.14+ removed the TRUE and FALSE defines in commit +0992aac61f8b087efd7094e9ac2b84fa9c040fcd. + +Upstream-Status: Submitted [https://www.spinics.net/lists/dm-devel/msg40646.html] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libdmmp/libdmmp_private.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libdmmp/libdmmp_private.h b/libdmmp/libdmmp_private.h +index ac85b63f..29400826 100644 +--- a/libdmmp/libdmmp_private.h ++++ b/libdmmp/libdmmp_private.h +@@ -82,7 +82,7 @@ static out_type func_name(struct dmmp_context *ctx, const char *var_name) { \ + do { \ + json_type j_type = json_type_null; \ + json_object *j_obj_tmp = NULL; \ +- if (json_object_object_get_ex(j_obj, key, &j_obj_tmp) != TRUE) { \ ++ if (json_object_object_get_ex(j_obj, key, &j_obj_tmp) != 1) { \ + _error(ctx, "Invalid JSON output from multipathd IPC: " \ + "key '%s' not found", key); \ + rc = DMMP_ERR_IPC_ERROR; \ +@@ -90,7 +90,7 @@ do { \ + } \ + if (j_obj_tmp == NULL) { \ + _error(ctx, "BUG: Got NULL j_obj_tmp from " \ +- "json_object_object_get_ex() while it return TRUE"); \ ++ "json_object_object_get_ex() while it return 1"); \ + rc = DMMP_ERR_BUG; \ + goto out; \ + } \ +-- +2.27.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb b/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb index af34a4b392..0d03191373 100644 --- a/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb +++ b/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb @@ -45,6 +45,7 @@ SRC_URI = "git://git.opensvc.com/multipath-tools/.git;protocol=http \ file://0031-Always-use-devmapper-for-kpartx.patch \ file://0001-fix-bug-of-do_compile-and-do_install.patch \ file://0001-add-explicit-dependency-on-libraries.patch \ + file://0001-fix-boolean-value-with-json-c-0.14.patch \ " LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.88.0.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.89.0.bb index d6a27f923b..f8b7c075ac 100644 --- a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.88.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.89.0.bb @@ -7,8 +7,8 @@ SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ file://0001-Do-not-overwrite-all-our-build-flags.patch \ file://basename-include.patch \ " -SRC_URI[md5sum] = "d9aafddce4c079c9ebc7405e42ac25ba" -SRC_URI[sha256sum] = "b4453804e9a5a519e6ceee0ac8f5efc229e3b0bf70419263c239124474d256c7" +SRC_URI[md5sum] = "92ac57f60ae8c3a1f8bfe01c9530b7b5" +SRC_URI[sha256sum] = "fba230364537782cc5d43b08d693ef69c36586286349683c7b127156a8ef9b5c" DEPENDS = "fontconfig zlib cairo lcms glib-2.0" diff --git a/meta-openembedded/meta-oe/recipes-support/uchardet/uchardet_0.0.7.bb b/meta-openembedded/meta-oe/recipes-support/uchardet/uchardet_0.0.7.bb new file mode 100644 index 0000000000..4a595e6432 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/uchardet/uchardet_0.0.7.bb @@ -0,0 +1,9 @@ +SUMMARY = "uchardet is an encoding detector library" +LICENSE = "MPLv1.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=6ecda54f6f525388d71d6b3cd92f7474" + +inherit cmake + +SRC_URI = "https://www.freedesktop.org/software/uchardet/releases/uchardet-0.0.7.tar.xz" +SRC_URI[md5sum] = "623406dac5c5ad89e40eedd7f279efae" +SRC_URI[sha256sum] = "3fc79408ae1d84b406922fa9319ce005631c95ca0f34b205fad867e8b30e45b1" diff --git a/meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.11.bb b/meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.11.bb index 6408417920..d6c89a65d0 100644 --- a/meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.11.bb +++ b/meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.11.bb @@ -10,7 +10,7 @@ SRC_URI = " \ SRC_URI[md5sum] = "abe6acb617f11f2e8dbd9846fcf86e24" SRC_URI[sha256sum] = "64b5ffbfccd5bdb15d925777979a4dbee1a957f9eaeb158dc76175267eddbdef" -inherit autotools pkgconfig gettext gobject-introspection systemd features_check +inherit autotools pkgconfig gettext gobject-introspection systemd PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[idevice] = "--with-idevice,--without-idevice,libimobiledevice libplist" diff --git a/meta-openembedded/meta-oe/recipes-support/uriparser/uriparser_0.9.3.bb b/meta-openembedded/meta-oe/recipes-support/uriparser/uriparser_0.9.4.bb index da52bb5a36..d02cf5de8e 100644 --- a/meta-openembedded/meta-oe/recipes-support/uriparser/uriparser_0.9.3.bb +++ b/meta-openembedded/meta-oe/recipes-support/uriparser/uriparser_0.9.4.bb @@ -2,11 +2,10 @@ SUMMARY = "RFC 3986 compliant URI parsing library" HOMEPAGE = "https://uriparser.github.io" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=fc3bbde670fc6e95392a0e23bf57bda0" +LIC_FILES_CHKSUM = "file://COPYING;md5=fcc5a53146c2401f4b4f6a3bdf3f0168" SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${BP}/${BP}.tar.gz" -SRC_URI[md5sum] = "9874b64f6f4ff656f3f69598e38f12b7" -SRC_URI[sha256sum] = "6cef39d6eaf1a48504ee0264ce85f078758057dafb1edd0a898183b55ff76014" +SRC_URI[sha256sum] = "095e8a358a9ccbbef9d1f10d40495ca0fcb3d4490a948ba6449b213a66e08ef0" UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" diff --git a/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk/0001-zck.h-fix-build-on-musl.patch b/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk/0001-zck.h-fix-build-on-musl.patch deleted file mode 100644 index 64e0e8ed61..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk/0001-zck.h-fix-build-on-musl.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 78247d478cec254bad27f4ed97b532f4f54bf1b0 Mon Sep 17 00:00:00 2001 -From: Pierre-Jean Texier <pjtexier@koncepto.io> -Date: Thu, 23 Jan 2020 19:14:40 +0100 -Subject: [PATCH 1/2] zck.h: fix build on musl - -The ssize_t type requires the <sys/types.h> header. This fixes build with musl -libc: - -include/zck.h:68:1: error: unknown type name 'ssize_t'; did you mean 'size_t'? - 68 | ssize_t zck_read(zckCtx *zck, char *dst, size_t dst_size) - | ^~~~~~~ - | size_t -include/zck.h:81:1: error: unknown type name 'ssize_t'; did you mean 'size_t'? - 81 | ssize_t zck_write(zckCtx *zck, const char *src, const size_t src_size) - | ^~~~~~~ - | size_t - -Upstream-Status: Submitted [https://github.com/zchunk/zchunk/pull/23] - -Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io> ---- - include/zck.h.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/zck.h.in b/include/zck.h.in -index 91d2557..b847576 100644 ---- a/include/zck.h.in -+++ b/include/zck.h.in -@@ -5,6 +5,7 @@ - - #include <stdlib.h> - #include <stdbool.h> -+#include <sys/types.h> - - typedef enum zck_hash { - ZCK_HASH_SHA1, --- -2.7.4 - diff --git a/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk/0002-unzck-fix-build-with-musl-libc.patch b/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk/0002-unzck-fix-build-with-musl-libc.patch deleted file mode 100644 index a1c95bf362..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk/0002-unzck-fix-build-with-musl-libc.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 72c55e3da59eccdfea3778d11f83862b58af723d Mon Sep 17 00:00:00 2001 -From: Pierre-Jean Texier <pjtexier@koncepto.io> -Date: Thu, 23 Jan 2020 22:42:40 +0100 -Subject: [PATCH 2/2] unzck: fix build with musl libc - -On musl libc "stdout" is a preprocessor macro whose expansion leads to -compilation errors. - -Fixes: - -| In file included from ../git/src/unzck.c:31: -| ../git/src/unzck.c: In function 'parse_opt': -| ../git/src/unzck.c:78:24: error: expected identifier before '(' token -| 78 | arguments->stdout = true; -| | ^~~~~~ -| ../git/src/unzck.c: In function 'main': -| ../git/src/unzck.c:141:20: error: expected identifier before '(' token -| 141 | if(!(arguments.stdout)) { -| | ^~~~~~ - -Upstream-Status: Submitted [https://github.com/zchunk/zchunk/pull/23] - -Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io> ---- - src/unzck.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/unzck.c b/src/unzck.c -index 8d6c62a..002492c 100644 ---- a/src/unzck.c -+++ b/src/unzck.c -@@ -58,7 +58,7 @@ struct arguments { - char *args[1]; - zck_log_type log_level; - bool dict; -- bool stdout; -+ bool stdOut; - bool exit; - }; - -@@ -75,7 +75,7 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state) { - arguments->log_level = ZCK_LOG_DDEBUG; - break; - case 'c': -- arguments->stdout = true; -+ arguments->stdOut = true; - break; - case 'V': - version(); -@@ -138,7 +138,7 @@ int main (int argc, char *argv[]) { - snprintf(out_name + strlen(base_name) - 4, 7, ".zdict"); - - int dst_fd = STDOUT_FILENO; -- if(!arguments.stdout) { -+ if(!arguments.stdOut) { - dst_fd = open(out_name, O_TRUNC | O_WRONLY | O_CREAT, 0666); - if(dst_fd < 0) { - dprintf(STDERR_FILENO, "Unable to open %s", out_name); --- -2.7.4 - diff --git a/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.5.bb b/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.6.bb index f75412f49e..e041132b1c 100644 --- a/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.5.bb +++ b/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.6.bb @@ -4,13 +4,9 @@ AUTHOR = "Jonathan Dieter" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=cd6e590282010ce90a94ef25dd31410f" -SRC_URI = " \ - git://github.com/zchunk/zchunk.git;protocol=https \ - file://0001-zck.h-fix-build-on-musl.patch \ - file://0002-unzck-fix-build-with-musl-libc.patch \ - " +SRC_URI = "git://github.com/zchunk/zchunk.git;protocol=https" -SRCREV = "c01bf12feede792982f165f52f4a6c573e3a8c17" +SRCREV = "f5593aa11584faa691c81b4898f0aaded47f8bf7" S = "${WORKDIR}/git" DEPENDS = "\ diff --git a/meta-openembedded/meta-oe/recipes-support/zile/zile_2.4.14.bb b/meta-openembedded/meta-oe/recipes-support/zile/zile_2.4.14.bb index 3b846c1511..acd491498e 100644 --- a/meta-openembedded/meta-oe/recipes-support/zile/zile_2.4.14.bb +++ b/meta-openembedded/meta-oe/recipes-support/zile/zile_2.4.14.bb @@ -20,6 +20,6 @@ do_install_append() { } PACKAGECONFIG ??= "" -PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)}" +PACKAGECONFIG_append = " ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)}" PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl," |