diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2020-05-15 22:09:53 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2020-05-21 23:43:47 +0300 |
commit | 7f40b7168b897da48694d6e71fd3fd45861bfb19 (patch) | |
tree | fc7d9f02c5a2e0322b6aaac5cac6d12959fd26bb /meta-openembedded/meta-oe/recipes-navigation | |
parent | dce5cf9dceda684d40fb0e9686ba884ed6b0751f (diff) | |
download | openbmc-7f40b7168b897da48694d6e71fd3fd45861bfb19.tar.xz |
meta-openembedded: subtree update:679bb49126..7c02c7d411
Adam Miartus (1):
toybox: allow user to provide own defconfig
Adrian Bunk (5):
uftrace: Fix PR
mraa: Replace -fcommon with fix
mozjs: Remove workaround for gcc < 4.9
flatbuffers: Remove workarounds for gcc < 6
protobuf-c: Remove workarounds for gcc < 6
Alejandro Enedino Hernandez Samaniego (2):
weechat: introduce weechat recipe providing a fully working IRC client
imapfilter: introduce imapfilter recipe providing a mailbox filter through the IMAP protocol
Alejandro Hernandez Samaniego (1):
remmina: Upgrade to version 1.4.3
Alexander Vickberg (2):
tcpdump: Fix PACKAGECONFIG for OpenSSL
iperf3: Add OpenSSL build option to PACKAGECONFIG
Alistair Francis (2):
geany-plugins: Support libgit2 version 1.0
libgit2: Update to v1.0.0
Andreas Müller (5):
xfce4-notifyd: upgrade 0.6.0 -> 0.6.1
xfconf: upgrade 4.14.1 -> 4.14.2
xfwm4: upgrade 4.14.1 -> 4.14.2
qpdf: upgrade 9.1.0 -> 10.0.1
qpdf: link libatomic explicitly on mips
Bartłomiej Burdukiewicz (2):
pugixml: generate pkgconfig files.
pugixml: add native and nativesdk BBCLASSEXTEND
Claude Bing (3):
php: fix PACKAGECONFIG for soap
php: fix opcache link error in 7.4
php: update fix for opcache link issue in 7.4.4
Emmanuel Roullit (1):
cockpit: fix metainfo.xml file ownership
Gianfranco Costamagna (1):
cpprest: Disable one more test requiring internet connection
Gregory Vimont (1):
opencv: 4.1.0 -> 4.3.0
Jonathan Liu (1):
x11vnc: fix xfc NULL pointer dereference
Jorge Solla (1):
Cockpit: Added missing dependency on udisks2 for package cockpit-storaged
Khem Raj (7):
remmina: Depend on avahi instead of Avahi-ui
libgit2: Enable pcre2 regexp backend
con2fbmap: Add recipe
xf86-input-void: Drop INC_PR
nodejs: Fix build with icu 67.1
nss: Remove mcpu to avoid march conflicts
pmdk: Update to 1.8
Konrad Weihmann (2):
php: fix zip package config
php: add multibyte string support config
Leon Anavi (1):
lirc: upgrade 0.9.4d -> 0.10.1
Michael Haener (1):
cockpit: Add recipe version 218
Mingli Yu (10):
python3-ntplib: add missing python3-io RDEPENDS
python3-pid: add the missing rdepends
python3-parallax: add the missing rdepends
python3-pkgconfig: add missing rdepends
python3-pathlib2: add the missing rdepends
python3-ptyprocess: add the missing rdepends
python3-pydbus: add the missing rdepends
python3-pyudev: add the missing rdepends
python3-zipp: add the missing rdepends
gnome-themes-extra: correct the recipe name
Pierre-Jean Texier (1):
ccid: upgrade 1.4.31 -> 1.4.32
Rasmus Villemoes (1):
libgpiod: split c++ library to its own package
Sean Nyekjaer (1):
gpsd: Upgrade 3.19 -> 3.20
Slater, Joseph (2):
python-pretty-table: add rdep's
python3-pyhamcrest: add rdep
Trevor Gamblin (7):
python3-py: add python3-netclient to RDEPENDS
python3-markdown: add logging and setuptools to RDEPENDS
python3-pyrsistent: add python3-numbers to RDEPENDS
python3-pytoml: add datetime and stringold to RDEPENDS
python3-dbusmock: re-add recipe and fix patch path
python3-pyyaml: add python3-netclient to RDEPENDS
python3-werkzeug: add python3-logging to RDEPENDS
Wang Mingyu (6):
mailcap: upgrade 2.1.48 -> 2.1.49
sanlock: upgrade 3.8.0 -> 3.8.1
libcgi-perl: upgrade 4.46 -> 4.47
libencode-perl: upgrade 3.05 -> 3.06
python3-idna: upgrade 2.8 -> 2.9
multipath-tools: upgrade 0.8.3 -> 0.8.4
Yi Zhao (1):
nginx: remove /var/log/nginx when do_install
Zang Ruochen (8):
python3-parse-type: Modify ptest output format
python3-pluggy: Modify ptest output format
python3-polyline: Modify ptest output format
python3-precise-runner: Modify ptest output format
python3-prettytable: Modify ptest output format
python3-ptyprocess: Modify ptest output format
python3-pyasn1: Modify ptest output format
python3-pyasn1-modules: Modify ptest output format
Zheng Ruoqin (4):
python3-pyserial: Modify ptest output format
python3-pyroute2: Modify ptest output format
v4l-utils: upgrade 1.18.0 -> 1.18.1
cpprest: upgrade 2.10.15 -> 2.10.16
Zong Li (1):
Upgrade testfloat to 3e version.
niko.mauno@vaisala.com (3):
python3-setuptools-scm: Cosmetic improvement
python3-setuptools-scm: Add nativesdk to BBCLASSEXTEND
python3-attrs: Add nativesdk to BBCLASSEXTEND
Change-Id: I696f29557eafda5f9f9d6e26525e1a5819982a4b
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-navigation')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd/0001-Revert-SConstruct-Add-test-for-sizeof-time_t-result-.patch | 108 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd/0001-gps_shm_close-Free-privdata.patch | 37 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.20.bb (renamed from meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.19.bb) | 6 |
3 files changed, 111 insertions, 40 deletions
diff --git a/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd/0001-Revert-SConstruct-Add-test-for-sizeof-time_t-result-.patch b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd/0001-Revert-SConstruct-Add-test-for-sizeof-time_t-result-.patch new file mode 100644 index 000000000..b021d0b72 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd/0001-Revert-SConstruct-Add-test-for-sizeof-time_t-result-.patch @@ -0,0 +1,108 @@ +Subject: [PATCH] Revert "SConstruct: Add test for sizeof(time_t), result in + SIZEOF_TIME_T." + +This reverts commit b32ff1a86c44fa738dabaf63de1b5462e0071ad3. + +Upstream-Status: Inappropriate [cross-compile specific] + +--- + SConstruct | 54 ++++-------------------------------------- + android/gpsd_config.in | 1 - + 2 files changed, 5 insertions(+), 50 deletions(-) + +diff --git a/SConstruct b/SConstruct +index 33e0ff326..e3c62fa3c 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -597,42 +597,6 @@ def CheckHeaderDefines(context, file, define): + return ret + + +-def CheckSizeOf(context, type): +- """Check sizeof 'type'""" +- context.Message('Checking size of ' + type + '... ') +- +- program = """ +-#include <stdlib.h> +-#include <stdio.h> +- +-/* +- * The CheckSizeOf function does not have a way for the caller to +- * specify header files to be included to provide the type being +- * checked. As a workaround until that is remedied, include the +- * header required for time_t, which is the sole current use of this +- * function. +- */ +-#include <time.h> +- +-int main() { +- printf("%d", (int)sizeof(""" + type + """)); +- return 0; +-} +-""" +- +- # compile it +- ret = context.TryCompile(program, '.c') +- if 0 == ret: +- announce('ERROR: TryCompile failed\n') +- # fall back to sizeof(time_t) is 8 +- return '8' +- +- # run it +- ret = context.TryRun(program, '.c') +- context.Result(ret[0]) +- return ret[1] +- +- + def CheckCompilerDefines(context, define): + context.Message('Checking if compiler supplies %s... ' % (define,)) + ret = context.TryLink(""" +@@ -703,15 +667,13 @@ env.Prepend(LIBPATH=[os.path.realpath(os.curdir)]) + + # CheckXsltproc works, but result is incorrectly saved as "no" + config = Configure(env, custom_tests={ +- 'CheckC11': CheckC11, +- 'CheckCompilerDefines': CheckCompilerDefines, +- 'CheckCompilerOption': CheckCompilerOption, +- 'CheckHeaderDefines': CheckHeaderDefines, + 'CheckPKG': CheckPKG, +- 'CheckSizeOf': CheckSizeOf, + 'CheckXsltproc': CheckXsltproc, +- 'GetPythonValue': GetPythonValue, +- }) ++ 'CheckCompilerOption': CheckCompilerOption, ++ 'CheckCompilerDefines': CheckCompilerDefines, ++ 'CheckC11': CheckC11, ++ 'CheckHeaderDefines': CheckHeaderDefines, ++ 'GetPythonValue': GetPythonValue}) + + # Use print, rather than announce, so we see it in -s mode. + print("This system is: %s" % sys.platform) +@@ -1043,12 +1005,6 @@ else: + confdefs.append("/* #undef HAVE_%s_H */\n" + % hdr.replace("/", "_").upper()) + +- sizeof_time_t = config.CheckSizeOf("time_t") +- confdefs.append("#define SIZEOF_TIME_T %s\n" % sizeof_time_t) +- announce("sizeof(time_t) is %s" % sizeof_time_t) +- if 4 >= int(sizeof_time_t): +- announce("WARNING: time_t is too small. It will fail in 2038") +- + # check function after libraries, because some function require libraries + # for example clock_gettime() require librt on Linux glibc < 2.17 + for f in ("cfmakeraw", "clock_gettime", "daemon", "fcntl", "fork", +diff --git a/android/gpsd_config.in b/android/gpsd_config.in +index 758251986..d240f6d34 100644 +--- a/android/gpsd_config.in ++++ b/android/gpsd_config.in +@@ -19,7 +19,6 @@ + #define HAVE_ARPA_INET_H 1 + #define HAVE_SYSLOG_H 1 + #define HAVE_DAEMON 1 +-#define SIZEOF_TIME_T 8 + #define HAVE_CLOCK_GETTIME 1 + #define HAVE_STRPTIME 1 + #define HAVE_GMTIME_R 1 +-- +2.26.2 + diff --git a/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd/0001-gps_shm_close-Free-privdata.patch b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd/0001-gps_shm_close-Free-privdata.patch deleted file mode 100644 index 9b3801580..000000000 --- a/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd/0001-gps_shm_close-Free-privdata.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 2a4b3bcde0d73a3a4a6644d5f944ac9d16023ba9 Mon Sep 17 00:00:00 2001 -From: Adrian Bunk <bunk@stusta.de> -Date: Mon, 21 Oct 2019 13:53:25 +0300 -Subject: gps_shm_close: Free privdata - -Previously every open/close cycle leaked privdata. - -Signed-off-by: Adrian Bunk <bunk@stusta.de> -Signed-off-by: Gary E. Miller <gem@rellim.com> - -Upstream-Status: Backport ---- - libgps_shm.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/libgps_shm.c b/libgps_shm.c -index d93972bba..12bb3760b 100644 ---- a/libgps_shm.c -+++ b/libgps_shm.c -@@ -163,8 +163,12 @@ int gps_shm_read(struct gps_data_t *gpsdata) - - void gps_shm_close(struct gps_data_t *gpsdata) - { -- if (PRIVATE(gpsdata) && PRIVATE(gpsdata)->shmseg != NULL) -- (void)shmdt((const void *)PRIVATE(gpsdata)->shmseg); -+ if (PRIVATE(gpsdata)) { -+ if (PRIVATE(gpsdata)->shmseg != NULL) -+ (void)shmdt((const void *)PRIVATE(gpsdata)->shmseg); -+ free(PRIVATE(gpsdata)); -+ gpsdata->privdata = NULL; -+ } - } - - int gps_shm_mainloop(struct gps_data_t *gpsdata, int timeout, --- -2.20.1 - diff --git a/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.19.bb b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.20.bb index f74ebda5f..0914f7ec2 100644 --- a/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.19.bb +++ b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.20.bb @@ -7,10 +7,10 @@ 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-gps_shm_close-Free-privdata.patch \ + file://0001-Revert-SConstruct-Add-test-for-sizeof-time_t-result-.patch \ " -SRC_URI[md5sum] = "b3bf88706794eb8e5f2c2543bf7ba87b" -SRC_URI[sha256sum] = "27dd24d45b2ac69baab7933da2bf6ae5fb0be90130f67e753c110a3477155f39" +SRC_URI[md5sum] = "cf7fdec7ce7221d20bee1a7246362b05" +SRC_URI[sha256sum] = "172a7805068eacb815a3c5225436fcb0be46e7e49a5001a94034eac43df85e50" inherit scons update-rc.d python3-dir python3native systemd update-alternatives |