From 7c505534496d77769779f0c184c4bf96d72038ea Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 12 Aug 2020 08:53:51 -0700 Subject: vblade: Upgrade to version 24 Switch to github for src_uri Add a patch to fix build with -fno-common Signed-off-by: Khem Raj --- .../recipes-daemons/vblade/files/gcc-10.patch | 85 ++++++++++++++++++++++ .../recipes-daemons/vblade/vblade_22.bb | 55 -------------- .../recipes-daemons/vblade/vblade_24.bb | 56 ++++++++++++++ 3 files changed, 141 insertions(+), 55 deletions(-) create mode 100644 meta-networking/recipes-daemons/vblade/files/gcc-10.patch delete mode 100644 meta-networking/recipes-daemons/vblade/vblade_22.bb create mode 100644 meta-networking/recipes-daemons/vblade/vblade_24.bb diff --git a/meta-networking/recipes-daemons/vblade/files/gcc-10.patch b/meta-networking/recipes-daemons/vblade/files/gcc-10.patch new file mode 100644 index 0000000000..9a42aa3699 --- /dev/null +++ b/meta-networking/recipes-daemons/vblade/files/gcc-10.patch @@ -0,0 +1,85 @@ +From af17efc862b9acfd63ce2ecb21f75ed890a93a5d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20K=C3=B6lbl?= +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 +--- + 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 + + #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-networking/recipes-daemons/vblade/vblade_22.bb b/meta-networking/recipes-daemons/vblade/vblade_22.bb deleted file mode 100644 index a52a1e92b4..0000000000 --- a/meta-networking/recipes-daemons/vblade/vblade_22.bb +++ /dev/null @@ -1,55 +0,0 @@ -SUMMARY = "Virtual EtherDrive blade AoE target" -SECTION = "admin" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/aoetools/files/vblade/" - -SRC_URI = "${SOURCEFORGE_MIRROR}/aoetools/${BP}.tar.gz \ - file://cross.patch \ - file://makefile-add-ldflags.patch \ - file://${BPN}.conf \ - file://${BPN}.init \ - file://${BPN}.service \ - file://volatiles.99_vblade \ - " - -SRC_URI[md5sum] = "510d98ba0f231284a5fbe2da11cb2d6e" -SRC_URI[sha256sum] = "a990378f273f10eb431e42954a871aed52714035bbab28c54cef600c458356bb" - -UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/aoetools/files/vblade/" - -inherit autotools-brokensep update-rc.d systemd - -do_install() { - install -D -m 0755 ${S}/vblade ${D}/${sbindir}/vblade - install -D -m 0755 ${S}/vbladed ${D}/${sbindir}/vbladed - install -D -m 0644 ${S}/vblade.8 ${D}/${mandir}/man8/vblade.8 - - install -D -m 0644 ${WORKDIR}/${BPN}.conf ${D}/${sysconfdir}/${BPN}.conf - install -D -m 0755 ${WORKDIR}/${BPN}.init ${D}/${sysconfdir}/init.d/${BPN} - - if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then - install -d ${D}/${sysconfdir}/default/volatiles - install -m 0755 ${WORKDIR}/volatiles.99_vblade ${D}/${sysconfdir}/default/volatiles/99_vblade - fi - - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -d ${D}/${bindir} - install -m 0755 ${WORKDIR}/${BPN}.init ${D}/${bindir}/ - install -d ${D}${sysconfdir}/tmpfiles.d - echo "d /var/run/${BPN} 0755 root root -" > ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf - - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/vblade.service ${D}${systemd_system_unitdir} - sed -e 's,@BINDIR@,${bindir},g' -i ${D}${systemd_system_unitdir}/*.service - fi - -} - -INITSCRIPT_NAME = "vblade" -INITSCRIPT_PARAMS = "start 30 . stop 70 0 1 2 3 4 5 6 ." - -SYSTEMD_SERVICE_${PN} = "vblade.service" -SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta-networking/recipes-daemons/vblade/vblade_24.bb b/meta-networking/recipes-daemons/vblade/vblade_24.bb new file mode 100644 index 0000000000..09ba8cfd93 --- /dev/null +++ b/meta-networking/recipes-daemons/vblade/vblade_24.bb @@ -0,0 +1,56 @@ +SUMMARY = "Virtual EtherDrive blade AoE target" +SECTION = "admin" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/aoetools/files/vblade/" + +SRCREV = "a7f48bda5bf1646f6450601049bf4b74053adbb3" +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 \ + file://volatiles.99_vblade \ + " + +S = "${WORKDIR}/git" + +UPSTREAM_CHECK_URI = "https://github.com/OpenAoE/vblade/archive/" + +inherit autotools-brokensep update-rc.d systemd + +do_install() { + install -D -m 0755 ${S}/vblade ${D}/${sbindir}/vblade + install -D -m 0755 ${S}/vbladed ${D}/${sbindir}/vbladed + install -D -m 0644 ${S}/vblade.8 ${D}/${mandir}/man8/vblade.8 + + install -D -m 0644 ${WORKDIR}/${BPN}.conf ${D}/${sysconfdir}/${BPN}.conf + install -D -m 0755 ${WORKDIR}/${BPN}.init ${D}/${sysconfdir}/init.d/${BPN} + + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -d ${D}/${sysconfdir}/default/volatiles + install -m 0755 ${WORKDIR}/volatiles.99_vblade ${D}/${sysconfdir}/default/volatiles/99_vblade + fi + + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}/${bindir} + install -m 0755 ${WORKDIR}/${BPN}.init ${D}/${bindir}/ + install -d ${D}${sysconfdir}/tmpfiles.d + echo "d /var/run/${BPN} 0755 root root -" > ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf + + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/vblade.service ${D}${systemd_system_unitdir} + sed -e 's,@BINDIR@,${bindir},g' -i ${D}${systemd_system_unitdir}/*.service + fi + +} + +INITSCRIPT_NAME = "vblade" +INITSCRIPT_PARAMS = "start 30 . stop 70 0 1 2 3 4 5 6 ." + +SYSTEMD_SERVICE_${PN} = "vblade.service" +SYSTEMD_AUTO_ENABLE = "disable" -- cgit v1.2.3-54-g00ecf