diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2021-01-09 01:11:14 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2021-01-09 01:12:46 +0300 |
commit | 72956edabebd4188f98e3b0d9f8ce727e8d13ea3 (patch) | |
tree | 2948237a0026b455367cc7fd5f64f3fe60f75c53 /meta-openembedded/meta-networking/recipes-daemons | |
parent | 015e6aa5df52e64da55eb64ea70ff1a58540d1f6 (diff) | |
download | openbmc-72956edabebd4188f98e3b0d9f8ce727e8d13ea3.tar.xz |
meta-openembedded: subtree update:936f2380bb..4599fea881
Alexander Vickberg (1):
mbedtls: upgrade to 2.25.0
Andreas Müller (44):
xfce4-panel-profiles: upgrade 1.0.10 -> 1.0.12
mousepad: upgrade 0.4.2 -> 0.5.2
xfce4-screenshooter: upgrade 1.9.7 -> 1.9.8
xfce4-taskmanager: upgrade 1.2.3 -> 1.4.0
xfce4-calculator-plugin: upgrade 0.7.0 -> 0.7.1
xfce4-cpugraph-plugin: upgrade 1.1.0 -> 1.2.0
xfce4-datetime-plugin: upgrade 0.8.0 -> 0.8.1
xfce4-diskperf-plugin: upgrade 2.6.2 -> 2.6.3
xfce4-fsguard-plugin: upgrade 1.1.1 -> 1.1.2
xfce4-smartbookmark-plugin: upgrade 0.5.1 -> 0.5.2
xfce4-systemload-plugin: upgrade 1.2.3 -> 1.2.4
xfce4-verve-plugin: upgrade 2.0.0 -> 2.0.1
xfce4-wavelan-plugin: upgrade 0.6.1 -> 0.6.2
xfce4-whiskermenu-plugin: upgrade 2.4.6 -> 2.5.1
xfce4-xkb-plugin: upgrade 0.8.1 -> 0.8.2
xfce4-mount-plugin: upgrade 1.1.3 -> 1.1.5
xfce4-dev-tools: upgrade 4.14.0 -> 4.16.0
libxfce4util: upgrade 4.14.0 -> 4.16.0
xfconf: upgrade 4.14.3 -> 4.16.0
libxfce4ui: upgrade 4.14.1 -> 4.16.0
exo: upgrade 0.12.11 -> 4.16.0
garcon: upgrade 0.7.0 -> 0.8.0
xfwm4: upgrade 4.14.5 -> 4.16.0
xfce4-settings: upgrade 4.14.3 -> 4.16.0
xfce4-panel: upgrade 4.14.4 -> 4.16.0
xfce4-session: upgrade 4.14.2 -> 4.16.0
xfdesktop: upgrade 4.14.2 -> 4.16.0
xfce4-power-manager: upgrade 1.6.6 -> 4.16.0
tumbler: upgrade 0.3.1 -> 4.16.0
thunar-volman: upgrade 0.9.5 -> 4.16.0
thunar: upgrade 1.8.15 -> 4.16.0
xfce4-appfinder: upgrade 4.14.0 -> 4.16.0
xfce4-terminal: 0.8.9.2 -> 0.8.10
xfce4-screensaver: upgrade 0.1.10 -> 4.16.0
xfce4-taskmanager: remove exo-native from DEPENDS
xfce4-closebutton-plugin: upgrade 0.1.0+ -> 4.16.0
xfce4-sensors-plugin: upgrade 1.3.92 -> 1.3.95
xfce4-genmon-plugin: upgrade 4.0.2 -> 4.1.0
xfce4-hotcorner-plugin: remove
xfce4-embed-plugin: remove for now
xfce4-equake-plugin: remove for now
xfce4-notes-plugin: remove for now
fluidsynth: upgrade 2.1.5 -> 2.1.6
blueman: upgrade 2.1.3 -> 2.1.4
Bruce Ashfield (1):
vboxguestdrivers: fix build against kernel v5.10+
Caio Toledo (3):
Add recipe for dbus-cxx
Add dbus-cxx to packagegroup-meta-oe
Fix dbus-cxx build for musl
Changqing Li (1):
libssh2: enhance ptest
Chen Qi (1):
tclap: fix branch
Chencheng Zhang (1):
tclap: align version to tag v1.2.2
Diego Santa Cruz (2):
gssdp: Upgrade to 1.2.2 -> 1.2.3
gupnp: Upgrade to 1.2.2 -> 1.2.4
Dmitry Baryshkov (11):
android-tools-conf-configfs: add an alternative to anrdoid-tools-conf
android-tools-conf: fix android-tools build-deps warning
conf/layer.conf: provide default PREFERRED_PROVIDER_android-tools-conf
imlib2: add image manipulation libray from englightenment project
feh: imlib2 based image viewer
obconf: Openbox configuration tool
xterm: install xterm and uxterm desktop files
xterm: update to version 362
xterm: provide virtual/x-terminal-emulator
layer.conf: add gnome-layer dynamic entry
openbox-xdgmenu: Openbox menu generator
He Zhe (2):
ebtables: Add symbol link /sbin/ebtables
lmbench: Fix setting LDLIBS failure
Hongxu Jia (2):
flatbuffers: add python3 support
python3-wrapt: add native support
Joe Slater (1):
multipath-tools: fix error handling for udev_monitor_set_receive_buffer_size
Khem Raj (9):
pidgin-sipe: Do not add native libdir to pkgconfig search path
sdbus-c++-libsystemd: Fix reallocarray check in meson
networkmanager: Fix reallocarray check in meson and configure
redis: Update to 6.0.9
python3-matplotlib: Disable LTO on mips/clang
cyrus-sasl: Disable ntlm plugin by default
postgresql: Use /dev/urandom when openssl is not used
xrdp: Upgrade to 0.9.14
iwd: Upgrade to 1.10
Leon Anavi (33):
python3-stevedore: Upgrade 3.2.2 -> 3.3.0
python3-pychromecast: Upgrade 7.5.1 -> 7.6.0
python3-humanize: Upgrade 3.1.0 -> 3.2.0
python3-fasteners: Upgrade 0.15 -> 0.16
python3-luma-core: Upgrade 2.0.1 -> 2.2.0
python3-chardet: Upgrade 3.0.4 -> 4.0.0
python3-watchdog: Upgrade 0.10.3 -> 1.0.2
python3-natsort: Upgrade 7.0.1 -> 7.1.0
python3-gmqtt: Upgrade 0.6.8 -> 0.6.9
python3-pymongo: Upgrade 3.11.0 -> 3.11.2
python3-requests: Upgrade 2.25.0 -> 2.25.1
python3-nocasedict: Upgrade 1.0.1 -> 1.0.2
python3-soupsieve: Upgrade 2.0.1 -> 2.1
python3-jsonpatch: Upgrade 1.26 -> 1.28
python3-psutil: Upgrade 5.7.3 -> 5.8.0
python3-argcomplete: Upgrade 1.12.1 -> 1.12.2
python3-multidict: Upgrade 5.0.0 -> 5.1.0
python3-nocaselist: Upgrade 1.0.3 -> 1.0.4
python3-prompt-toolkit: Upgrade 3.0.8 -> 3.0.9
python3-pychromecast: Upgrade 7.6.0 -> 7.7.1
python3-txaio: Upgrade 20.4.1 -> 20.12.1
python3-croniter: Upgrade 0.3.36 -> 0.3.37
python3-pandas: Upgrade 1.1.4 -> 1.2.0
python3-sympy: Upgrade 1.6.2 -> 1.7.1
python3-twine: Upgrade 3.2.0 -> 3.3.0
python3-humanfriendly: Upgrade 8.2 -> 9.1
python3-sqlalchemy: Upgrade 1.3.20 -> 1.3.22
python3-transitions: Upgrade 0.8.5 -> 0.8.6
python3-pytest-metadata: Upgrade 1.10.0 -> 1.11.0
python3-smbus2: Upgrade 0.3.0 -> 0.4.0
python3-cantools: Upgrade 35.5.0 -> 36.1.0
python3-sentry-sdk: Upgrade 0.19.1 -> 0.19.5
python3-babel: Upgrade 2.8.0 -> 2.9.0
Mark Jonas (1):
beep: Update to 1.4.9 in new repository
Martin Jansa (1):
linuxconsole: move jscal to separate package, add to packagegroup
Michael Vetter (1):
jasper: upgrade 2.0.23 -> 2.0.24
Mingli Yu (3):
traceroute: change the ALTERNATIVE_PRIORITY
tftp-hpa: change the ALTERNATIVE_PRIORITY
python3-astor: switch to python3
Ola X Nilsson (1):
python3-idna Remove 2.8
Qi.Chen@windriver.com (1):
python3-requests: upgrade to 2.25.0
Ramon Fried (2):
bitwise: add new recipe
yaml-cpp: add new recipe
Roland Hieber (3):
openct: remove lines that resulted in a no-op
openct: clean up do_install
openct: allow building as native package
Sean Nyekjaer (1):
nodejs: 12.19.1 -> 12.20.1
Stacy Gaikovaia (1):
nodejs: 12.19.0 -> 12.19.1
Trevor Woerner (1):
glmark2: fix precision handling bugs
Wang Mingyu (1):
zabbix: CVE-2020-15803 Security Advisory
Wenlin Kang (1):
syslog-ng: add bison-native to dependencies
Yi Zhao (9):
ebtables: do not install /etc/ethertypes
yaffs2-utils: update to latest git rev
f2fs-tools: upgrade 1.13.0 -> 1.14.0
dracut: upgrade 049 -> 051
ebtables: add missing file ebtables.common
ebtables: remove upstream ebtables-legacy-save
ebtables: do not install /etc/ethertypes
tcpdump: add UPSTREAM_CHECK_REGEX
phpmyadmin: 5.0.2 -> 5.0.4
Zang Ruochen (5):
mcpp: Normalize the patch format of CVE
python3-aenum: upgrade 2.2.4 -> 2.2.6
python3-autobahn: upgrade 20.7.1 -> 20.12.3
python3-bandit: upgrade 1.6.2 -> 1.7.0
python3-cachetools: upgrade 4.1.1 -> 4.2.0
Zheng Ruoqin (5):
samba: CVE-2020-14318 Security Advisory
samba: CVE-2020-14383 Security Advisory
php: CVE-2020-7070
php: CVE-2020-7069
poppler: upgrade 20.11.0 -> 20.12.1
changqing.li@windriver.com (3):
postgresql: upgrade 12.4 -> 13.1
nginx: upgrade 1.16.1 -> 1.18.0
nginx: upgrade 1.17.8 -> 1.19.6
jabdoa2 (2):
libsdl2-mixer: Fix ogg/vorbis support in libsdl2-mixer
libsdl2-mixer: set --disable-music-ogg-shared to link statically
lumag (2):
android-tools: fix package split
android-tools: split adbd to the separate package
zangrc (35):
fuse3: upgrade 3.10.0 -> 3.10.1
openipmi: upgrade 2.0.29 -> 2.0.30
vblade: upgrade 24 -> 25
dumb-init: upgrade 1.2.2 -> 1.2.5
fio: upgrade 3.24 -> 3.25
hwdata: upgrade 0.341 -> 0.342
nano: upgrade 5.3 -> 5.4
ocl-icd: upgrade 2.2.13 -> 2.2.14
ebtables: upgrade 2.0.10-4 -> 2.0.11
iscsi-initiator-utils: upgrade 2.1.2 -> 2.1.3
opencl-headers: upgrade 2020.06.16 -> 2020.12.18
opencl-icd-loader: upgrade 2020.06.16 -> 2020.12.18
c-periphery: upgrade 2.2.5 -> 2.3.0
opencl-clhpp: upgrade 2.0.12 -> 2.0.13
uthash: upgrade 2.1.0 -> 2.2.0
libtalloc: upgrade 2.3.0 -> 2.3.1
libtevent: upgrade 0.10.1 -> 0.10.2
ace: upgrade 6.5.10 -> 6.5.12
python3-ldap: upgrade 3.2.0 -> 3.3.1
wolfssl: upgrade 4.5.0 -> 4.6.0
asio: upgrade 1.18.0 -> 1.18.1
dash: upgrade 0.5.11.2 -> 0.5.11.3
geoclue: upgrade 2.5.6 -> 2.5.7
libmicrohttpd: upgrade 0.9.71 -> 0.9.72
nss: upgrade 3.59 -> 3.60
paho-mqtt-c: upgrade 1.3.7 -> 1.3.8
terminus-font: upgrade 4.48 -> 4.49.1
libnet-ldap-perl: upgrade 0.66 -> 0.67
rdma-core: upgrade 32.0 -> 33.0
can-utils: upgrade 2020.11.0 -> 2020.12.0
cpprest: upgrade 2.10.16 -> 2.10.17
haveged: upgrade 1.9.13 -> 1.9.14
live555: upgrade 20201105 -> 20210101
smartmontools: upgrade 7.1 -> 7.2
openjpeg: upgrade 2.3.1 -> 2.4.0
zhengruoqin (12):
pugixml: upgrade 1.11 -> 1.11.2
spdlog: upgrade 1.8.1 -> 1.8.2
spitools: upgrade 0.8.5 -> 0.8.6
uhubctl: upgrade 2.2.0 -> 2.3.0
xserver-xorg-cvt-native: upgrade 1.20.9 -> 1.20.10
zchunk: upgrade 1.1.7 -> 1.1.8
libencode-perl: upgrade 3.07 -> 3.08
bridge-utils: upgrade 1.6 -> 1.7
netplan: upgrade 0.100 -> 0.101
opensaf: upgrade 5.20.08 -> 5.20.11
cppzmq: upgrade 4.7.0 -> 4.7.1
gperftools: upgrade 2.8 -> 2.8.1
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I53939ad487155ca87e27cfd77d65962458d892e0
Diffstat (limited to 'meta-openembedded/meta-networking/recipes-daemons')
9 files changed, 9 insertions, 144 deletions
diff --git a/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb index d55dc4ab7..33de8ca7e 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb @@ -29,7 +29,7 @@ EXTRA_OECONF += "--with-dblib=berkeley \ --with-plugindir='${libdir}/sasl2' \ andrew_cv_runpath_switch=none" -PACKAGECONFIG ??= "ntlm \ +PACKAGECONFIG ??= "\ ${@bb.utils.filter('DISTRO_FEATURES', 'ldap pam', d)} \ " PACKAGECONFIG[gssapi] = "--enable-gssapi=yes,--enable-gssapi=no,krb5," diff --git a/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-libopeniscsiusr-Compare-with-max-int-instead-of-max-.patch b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-libopeniscsiusr-Compare-with-max-int-instead-of-max-.patch deleted file mode 100644 index c71f01299..000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-libopeniscsiusr-Compare-with-max-int-instead-of-max-.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 7bdaa32c80bb7d37668c1ff6d88bb02428459a0f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 21 Oct 2020 09:11:20 -0700 -Subject: [PATCH] libopeniscsiusr: Compare with max int instead of max long - -This compares value member of int_list_tbl struct which is of unsigned -int type. - -struct int_list_tbl { -const char *name; -unsigned int value; -}; - -Clang compiler reports this comparison when --Wtautological-constant-out-of-range-compare is enabled - -| idbm.c:1042:2: error: result of comparison of constant 18446744073709551615 with expression of type 'unsigned int' is always true [-Werror,-Wtautological-constant-out-of-range-compare] -| _rec_int_list(SESSION_CHAP_ALGS, recs, node, session.auth.chap_algs, -| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -| idbm.c:263:23: note: expanded from macro '_rec_int_list' -| if (_org->_name[_i] != ~0UL) { \ -| ~~~~~~~~~~~~~~~ ^ ~~~~ - -Since max value for int can be less than unsinged long e.g. on LP64 its -better to use UINT_MAX here - -Upstream-Status: Submitted [https://github.com/open-iscsi/open-iscsi/pull/227] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - libopeniscsiusr/idbm.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libopeniscsiusr/idbm.c b/libopeniscsiusr/idbm.c -index 7bc2381..060196f 100644 ---- a/libopeniscsiusr/idbm.c -+++ b/libopeniscsiusr/idbm.c -@@ -260,7 +260,7 @@ do {\ - _recs[_n].type = TYPE_INT_LIST; \ - _strncpy(_recs[_n].name, _key, NAME_MAXVAL); \ - for (unsigned int _i = 0; _i < ARRAY_LEN(_org->_name); _i++) { \ -- if (_org->_name[_i] != ~0UL) { \ -+ if (_org->_name[_i] != UINT_MAX) { \ - for (unsigned int _j = 0; _j < ARRAY_LEN(_tbl); _j++) { \ - if (_tbl[_j].value == _org->_name[_i]) { \ - strcat(_recs[_n].value, _tbl[_j].name); \ --- -2.29.0 - diff --git a/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.2.bb b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.3.bb index dfcd4ee3c..4a9cf9db4 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.2.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.3.bb @@ -12,11 +12,10 @@ DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d) LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRCREV ?= "802688debcd88c48edabe86deb7e7ed47ebadc26" +SRCREV ?= "34e3ffb194f6fa3028c0eb2ff57e7db2d1026771" SRC_URI = "git://github.com/open-iscsi/open-iscsi \ file://0001-Makefile-Do-not-set-Werror.patch \ - file://0001-libopeniscsiusr-Compare-with-max-int-instead-of-max-.patch \ file://initd.debian \ file://99_iscsi-initiator-utils \ file://iscsi-initiator \ diff --git a/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.20.08.bb b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.20.11.bb index 5516fc43a..ade2816f5 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.20.08.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.20.11.bb @@ -29,8 +29,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/releases/${BPN}-${PV}.tar.gz \ file://0001-Fix-build-with-fno-common.patch \ file://0001-Use-correct-printf-format-for-__fsblkcnt_t.patch \ " -SRC_URI[md5sum] = "02cfe732d194339237da6adce8e54384" -SRC_URI[sha256sum] = "84268b90dc48a6675e5a77e2b20390a04bb59deb48a829102a9dbc4b9ac27483" +SRC_URI[md5sum] = "9c7871a2b45f262b7aee2e9d073798e4" +SRC_URI[sha256sum] = "11b62e6d20c449a297da0c0c15b560747c9ec884305beffed4ca4c192fa9f22c" UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/opensaf/files/releases" diff --git a/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb b/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb index 4c62da818..dc1d6c67e 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb @@ -89,7 +89,7 @@ ALTERNATIVE_LINK_NAME[tftp.1] = "${mandir}/man1/tftp.1" ALTERNATIVE_${PN} = "tftp" ALTERNATIVE_TARGET[tftp] = "${bindir}/tftp-hpa" -ALTERNATIVE_PRIORITY = "60" +ALTERNATIVE_PRIORITY = "100" SYSTEMD_PACKAGES = "tftp-hpa-server" diff --git a/meta-openembedded/meta-networking/recipes-daemons/vblade/files/cross.patch b/meta-openembedded/meta-networking/recipes-daemons/vblade/files/cross.patch index d2eb15614..f3dc31c93 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/vblade/files/cross.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/vblade/files/cross.patch @@ -8,8 +8,8 @@ diff -urN vblade-19.old//makefile vblade-19//makefile @@ -9,8 +9,6 @@ mandir = ${sharedir}/man - O=aoe.o bpf.o ${PLATFORM}.o ata.o --CFLAGS += -Wall -g -O2 + O=aoe.o bpf.o ${PLATFORM}.o ata.o dat.o +-CFLAGS += -Wall -g -O2 -fno-common -CC = gcc vblade: $O diff --git a/meta-openembedded/meta-networking/recipes-daemons/vblade/files/gcc-10.patch b/meta-openembedded/meta-networking/recipes-daemons/vblade/files/gcc-10.patch deleted file mode 100644 index 9a42aa369..000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/vblade/files/gcc-10.patch +++ /dev/null @@ -1,85 +0,0 @@ -From af17efc862b9acfd63ce2ecb21f75ed890a93a5d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20K=C3=B6lbl?= <koelblandreas@freenet.de> -Date: Thu, 9 Jul 2020 14:29:18 +0200 -Subject: [PATCH] Fix linkage of global identifiers -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Align the code to the standard and modern compilers. - -Upstream-Status: Submitted [https://github.com/OpenAoE/vblade/pull/15] -Signed-off-by: Andreas Kölbl <koelblandreas@freenet.de> ---- - dat.c | 12 ++++++++++++ - dat.h | 19 ++++++++++--------- - makefile | 7 +++++-- - 3 files changed, 27 insertions(+), 11 deletions(-) - create mode 100644 dat.c - ---- /dev/null -+++ b/dat.c -@@ -0,0 +1,12 @@ -+/* dat.c: Global memory for vblade AoE target */ -+#include "dat.h" -+ -+int shelf, slot; -+ulong aoetag; -+uchar mac[6]; -+int bfd; // block file descriptor -+int sfd; // socket file descriptor -+vlong size; // size of vblade -+vlong offset; -+char *progname; -+char serial[Nserial+1]; ---- a/dat.h -+++ b/dat.h -@@ -1,4 +1,5 @@ - /* dat.h: include file for vblade AoE target */ -+#include <sys/types.h> - - #define nil ((void *)0) - /* -@@ -163,12 +164,12 @@ enum { - Nserial= 20, - }; - --int shelf, slot; --ulong aoetag; --uchar mac[6]; --int bfd; // block file descriptor --int sfd; // socket file descriptor --vlong size; // size of vblade --vlong offset; --char *progname; --char serial[Nserial+1]; -+extern int shelf, slot; -+extern ulong aoetag; -+extern uchar mac[6]; -+extern int bfd; // block file descriptor -+extern int sfd; // socket file descriptor -+extern vlong size; // size of vblade -+extern vlong offset; -+extern char *progname; -+extern char serial[Nserial+1]; ---- a/makefile -+++ b/makefile -@@ -8,7 +8,7 @@ sbindir = ${prefix}/sbin - sharedir = ${prefix}/share - mandir = ${sharedir}/man - --O=aoe.o bpf.o ${PLATFORM}.o ata.o -+O=aoe.o bpf.o ${PLATFORM}.o ata.o dat.o - - vblade: $O - ${CC} ${LDFLAGS} -o vblade $O -@@ -25,6 +25,9 @@ ata.o : ata.c config.h dat.h fns.h makef - bpf.o : bpf.c - ${CC} ${CFLAGS} -c $< - -+dat.o : dat.c -+ ${CC} ${CFLAGS} -c $< -+ - config.h : config/config.h.in makefile - @if ${CC} ${CFLAGS} config/u64.c > /dev/null 2>&1; then \ - sh -xc "cp config/config.h.in config.h"; \ diff --git a/meta-openembedded/meta-networking/recipes-daemons/vblade/files/makefile-add-ldflags.patch b/meta-openembedded/meta-networking/recipes-daemons/vblade/files/makefile-add-ldflags.patch index a74452db6..71af47ac7 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/vblade/files/makefile-add-ldflags.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/vblade/files/makefile-add-ldflags.patch @@ -9,7 +9,7 @@ index 98008da..c328ba7 100644 --- a/makefile +++ b/makefile @@ -11,7 +11,7 @@ mandir = ${sharedir}/man - O=aoe.o bpf.o ${PLATFORM}.o ata.o + O=aoe.o bpf.o ${PLATFORM}.o ata.o dat.o vblade: $O - ${CC} -o vblade $O diff --git a/meta-openembedded/meta-networking/recipes-daemons/vblade/vblade_24.bb b/meta-openembedded/meta-networking/recipes-daemons/vblade/vblade_25.bb index 09ba8cfd9..647abbfd2 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/vblade/vblade_24.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/vblade/vblade_25.bb @@ -6,11 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/aoetools/files/vblade/" -SRCREV = "a7f48bda5bf1646f6450601049bf4b74053adbb3" +SRCREV = "5f1a0ba8b9815e3f08a3e2635a17f78bbf2a5b10" SRC_URI = "git://github.com/OpenAoE/vblade \ file://cross.patch \ file://makefile-add-ldflags.patch \ - file://gcc-10.patch \ file://${BPN}.conf \ file://${BPN}.init \ file://${BPN}.service \ |