* [gentoo-commits] repo/gentoo:master commit in: sys-block/vblade/, sys-block/vblade/files/
@ 2020-07-21 7:10 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2020-07-21 7:10 UTC (permalink / raw
To: gentoo-commits
commit: 42454ff761c66d8dee04cc9147ffa99b86f7dbfb
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 19 18:38:51 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jul 21 07:09:06 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42454ff7
sys-block/vblade: Drop 20 and 23
Closes: https://bugs.gentoo.org/724170
Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sys-block/vblade/Manifest | 2 -
sys-block/vblade/files/init.d-vblade.vblade0 | 120 -----------------------
sys-block/vblade/files/init.d-vblade.vblade0-r1 | 125 ------------------------
sys-block/vblade/vblade-20.ebuild | 36 -------
sys-block/vblade/vblade-23.ebuild | 39 --------
5 files changed, 322 deletions(-)
diff --git a/sys-block/vblade/Manifest b/sys-block/vblade/Manifest
index 5cd43b3d182..6fe4544157f 100644
--- a/sys-block/vblade/Manifest
+++ b/sys-block/vblade/Manifest
@@ -1,3 +1 @@
-DIST vblade-20.tgz 26689 BLAKE2B 854b42535c884b670ae94ff3b27272664f6470dd1cb1993665fd64604a556700b05785de6bf5d2dd3c79f6bbf867248c77e4aa6218240e0a3c43535fdc556568 SHA512 b6c10ff9d75a2fc99c93af6b6de8f23c8b17ab70e2d5ed7049389ee8752ad001b3940764af16ff06f7f38c7bc528065edb0f285663af6fdd00fe58f022c26f02
-DIST vblade-23.tar.gz 27432 BLAKE2B 2151656f593771e44fe17a60216dceb4286a3a8d20cb88112c745213fb9c480542330dc67b0936e02cafd8c8de2f43e5ce942575f8508ba80ffde9676c75d264 SHA512 a27379933b5c0fc84966f47e0ee0089fe978fe77ea38d91c21fb6bb6bc4fa7f393b8b4c57f84c6840b549908eb8666847f121b836e3a076895e038e8096c0cfa
DIST vblade-24.tar.gz 27638 BLAKE2B 8a99d571b3b97d47ce9c81ef8141e0d6477181e88aa56e3ea7d03c689c747a60922c21969ea009cf978a3cb15bcb969b12df50f2bd8e6bb498a8bc6d483be1d3 SHA512 d5db85581db119b83a129fc00635d37b6d8fccfaf685dc58c68773c7299f7fe4e01735ec7fea6a0494a0cf2bc1400d643a720b55e4d6de37a0b8ec15d00d1f2a
diff --git a/sys-block/vblade/files/init.d-vblade.vblade0 b/sys-block/vblade/files/init.d-vblade.vblade0
deleted file mode 100644
index 253304dc187..00000000000
--- a/sys-block/vblade/files/init.d-vblade.vblade0
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-extra_commands="checkconfig"
-
-depend() {
- need net
-}
-
-# bug #218043
-if [ ! -f /etc/init.d/sysfs ]; then
- conf="$(add_suffix /etc/conf.d/vblade)"
- [[ -e "${conf}" ]] && source "${conf}"
- vblade_name="${myservice#*.}"
-else
- conf="/etc/conf.d/vblade"
- [[ -e "${conf}" ]] && source "${conf}"
- vblade_name="${RC_SVCNAME#*.}"
-fi
-
-vblade_conf_variable="config_${vblade_name}"
-vblade_conf="${!vblade_conf_variable}"
-pidfile="/var/run/vblade-${vblade_name}.pid"
-srvname="vblade.${vblade_name}"
-
-getconfig() {
- tmp="${vblade_conf}"
- shelf="${tmp/ *}"
- tmp="${tmp#* }"
- slot="${tmp/ *}"
- tmp="${tmp#* }"
- netif="${tmp/ *}"
- tmp="${tmp#* }"
- src="${tmp}"
- export shelf slot netif src
-}
-
-checkconfig() {
- if [ -z "${vblade_conf}" ]; then
- eerror "vblade configuration not specified for ${vblade_name}"
- return 1
- fi
- getconfig
-
- is_valid_numeric "${shelf}" 0
- if [[ $? -ne 0 ]]; then
- eerror "Shelf '${shelf}' is non-numeric or less than zero."
- return 1
- fi
- is_valid_numeric "${slot}" 0 15
- if [[ $? -ne 0 ]]; then
- eerror "Slot '${slot}' is outside the valid range [0..15]."
- return 1
- fi
-
- sysfs_base="/sys/class/net/"
- procfs_base="/proc/sys/net/ipv4/conf/"
- if test ! \( -e "${sysfs_base}${netif}" -o -e "${procfs_base}${netif}" \); then
- eerror "Network interface '${netif}' does not exist"
- return 1
- fi
-
- if test ! \( -f "${src}" -o -b "${src}" \) ; then
- eerror "Source '${src}' must be a file or block device"
- return 1
- fi
-
- if test ! \( -e "${src}" -a -r "${src}" \) ; then
- eerror "Source '${src}' is not readable."
- return 1
- fi
-
- return 0
-}
-
-is_valid_numeric() {
- num="${1}"
- min="${2}"
- max="${3}"
- # non-numeric
- test "$num" -ge "0" 2>/dev/null
- rc=$?
- test "$rc" -eq 2 && return 2
- # check for min
- test -z "$min" && return 0
- test "$num" -lt "$min" && return 1
- # check for max
- test -z "$max" && return 0
- test "$num" -gt "$max" && return 1
- # done
- return 0
-}
-
-start() {
- checkconfig || return 1
- getconfig
- ebegin "Starting ${srvname}: e${shelf}.${slot} on ${netif} using '${src}'"
- export LOGTAG="${srvname}"
- start-stop-daemon --start --quiet \
- --pidfile ${pidfile} --background \
- --make-pidfile --exec /usr/sbin/vbladed -- \
- ${shelf} ${slot} ${netif} "${src}"
- eend $?
-
- #${shelf} ${slot} ${netif} "${src}" 2>&1 | logger -t ${srvname} &
-}
-
-stop() {
- ebegin "Stopping ${srvname}"
- #start-stop-daemon --stop --quiet --pidfile ${pidfile}
- getconfig
- ps -Ao pid,args | egrep "^[[:space:]]*[[:digit:]]+ /usr/sbin/vbladed? ${shelf} ${slot}" | awk '{print $1}' | xargs kill
- eend $?
-
- #start-stop-daemon --stop --quiet --exec /usr/sbin/vblade
-}
-
-# vim: ft=gentoo-init-d syntax=gentoo-init-d :
-# vim: ai sw=4 sts=4 ts=4 :
diff --git a/sys-block/vblade/files/init.d-vblade.vblade0-r1 b/sys-block/vblade/files/init.d-vblade.vblade0-r1
deleted file mode 100644
index 174e473ffc1..00000000000
--- a/sys-block/vblade/files/init.d-vblade.vblade0-r1
+++ /dev/null
@@ -1,125 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-extra_commands="checkconfig"
-
-depend() {
- need net
-}
-
-# bug #218043
-if [ ! -f /etc/init.d/sysfs ]; then
- conf="$(add_suffix /etc/conf.d/vblade)"
- [[ -e "${conf}" ]] && source "${conf}"
- vblade_name="${myservice#*.}"
-else
- conf="/etc/conf.d/vblade"
- [[ -e "${conf}" ]] && source "${conf}"
- vblade_name="${RC_SVCNAME#*.}"
-fi
-
-vblade_conf_variable="config_${vblade_name}"
-vblade_conf="${!vblade_conf_variable}"
-pidfile="/var/run/vblade-${vblade_name}.pid"
-srvname="vblade.${vblade_name}"
-
-getconfig() {
- args=""
- while getopts b:dsrm: FLAG; do
- case "${FLAG}" in
- b) is_valid_numeric "${OPTARG}" && args="${args} -b ${OPTARG}" || ewarn "vblade block size argument is non-numeric IGNORING";;
-
- d|s|r) args="${args} -${FLAG}";;
-
- # FIXME: there is no sanity checking on the MAC address...we'll leave that up to vblade
- m) args="${args} -m ${OPTARG}";;
- esac
- done
-
- shift $(( OPTIND - 1 ))
-
- shelf=${1}
- slot=${2}
- netif=${3}
- src=${4}
-
- export args shelf slot netif src
-}
-
-checkconfig() {
- if [ -z "${vblade_conf}" ]; then
- eerror "vblade configuration not specified for ${vblade_name}"
- return 1
- fi
- getconfig ${vblade_conf}
-
- is_valid_numeric "${shelf}" 0
- if [[ $? -ne 0 ]]; then
- eerror "Shelf '${shelf}' is non-numeric or less than zero."
- return 1
- fi
- is_valid_numeric "${slot}" 0 15
- if [[ $? -ne 0 ]]; then
- eerror "Slot '${slot}' is outside the valid range [0..15]."
- return 1
- fi
-
- sysfs_base="/sys/class/net/"
- procfs_base="/proc/sys/net/ipv4/conf/"
- if test ! \( -e "${sysfs_base}${netif}" -o -e "${procfs_base}${netif}" \); then
- eerror "Network interface '${netif}' does not exist"
- return 1
- fi
-
- if test ! \( -f "${src}" -o -b "${src}" \) ; then
- eerror "Source '${src}' must be a file or block device"
- return 1
- fi
-
- if test ! \( -e "${src}" -a -r "${src}" \) ; then
- eerror "Source '${src}' is not readable."
- return 1
- fi
-
- return 0
-}
-
-is_valid_numeric() {
- num="${1}"
- min="${2}"
- max="${3}"
- # non-numeric
- test "$num" -ge "0" 2>/dev/null
- rc=$?
- test "$rc" -eq 2 && return 2
- # check for min
- test -z "$min" && return 0
- test "$num" -lt "$min" && return 1
- # check for max
- test -z "$max" && return 0
- test "$num" -gt "$max" && return 1
- # done
- return 0
-}
-
-start() {
- checkconfig || return 1
- ebegin "Starting ${srvname}: e${shelf}.${slot} on ${netif} using '${src}'"
- export LOGTAG="${srvname}"
- start-stop-daemon --start --quiet \
- --pidfile ${pidfile} --background \
- --make-pidfile --exec /usr/sbin/vbladed -- \
- ${args} ${shelf} ${slot} ${netif} "${src}"
- eend $?
-}
-
-stop() {
- ebegin "Stopping ${srvname}"
- getconfig ${vblade_conf}
- ps -Ao pid,args | egrep "^[[:space:]]*[[:digit:]]+ /usr/sbin/vblade.* ${shelf} ${slot} " | awk '{print $1}' | xargs kill
- eend $?
-}
-
-# vim: ft=gentoo-init-d syntax=gentoo-init-d :
-# vim: ai sw=4 sts=4 ts=4 :
diff --git a/sys-block/vblade/vblade-20.ebuild b/sys-block/vblade/vblade-20.ebuild
deleted file mode 100644
index 7d5ed1198e8..00000000000
--- a/sys-block/vblade/vblade-20.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit toolchain-funcs
-
-DESCRIPTION="vblade exports a block device using AoE"
-HOMEPAGE="http://sf.net/projects/aoetools/"
-SRC_URI="mirror://sourceforge/aoetools/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="sys-apps/util-linux"
-
-src_prepare() {
- sed -i -e 's,^CFLAGS.*,CFLAGS += -Wall,' \
- -e 's:-o vblade:${LDFLAGS} \0:' \
- makefile || die
-}
-
-src_compile() {
- emake CC="$(tc-getCC)"
-}
-
-src_install() {
- dosbin vblade
- dosbin "${FILESDIR}"/vbladed
- doman vblade.8
- dodoc HACKING NEWS README
- newconfd "${FILESDIR}"/conf.d-vblade vblade
- newinitd "${FILESDIR}"/init.d-vblade.vblade0 vblade.vblade0
-}
diff --git a/sys-block/vblade/vblade-23.ebuild b/sys-block/vblade/vblade-23.ebuild
deleted file mode 100644
index bf2ac029094..00000000000
--- a/sys-block/vblade/vblade-23.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="vblade exports a block device using AoE"
-HOMEPAGE="https://github.com/OpenAoE/vblade"
-SRC_URI="https://github.com/OpenAoE/${PN}/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-RDEPEND="sys-apps/util-linux"
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_prepare() {
- default
-
- sed -i -e 's,^CFLAGS.*,CFLAGS += -Wall,' \
- -e 's:-o vblade:${LDFLAGS} \0:' \
- makefile || die
-}
-
-src_compile() {
- emake CC="$(tc-getCC)"
-}
-
-src_install() {
- dosbin vblade
- dosbin "${FILESDIR}"/vbladed
- doman vblade.8
- dodoc HACKING NEWS README
- newconfd "${FILESDIR}"/conf.d-vblade vblade
- newinitd "${FILESDIR}"/init.d-vblade.vblade0-r1 vblade.vblade0
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-block/vblade/, sys-block/vblade/files/
@ 2020-12-28 11:50 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2020-12-28 11:50 UTC (permalink / raw
To: gentoo-commits
commit: c381d2a51249c41ce1b0322884f324db769feb66
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Mon Dec 28 11:50:16 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 11:50:16 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c381d2a5
sys-block/vblade: fix build with gcc-10
Closes: https://bugs.gentoo.org/707480
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sys-block/vblade/files/vblade-24-fno-common.patch | 48 +++++++++++++++++++++++
sys-block/vblade/files/vblade-24-makefile.patch | 35 +++++++++++++++++
sys-block/vblade/vblade-24.ebuild | 19 +++++----
3 files changed, 92 insertions(+), 10 deletions(-)
diff --git a/sys-block/vblade/files/vblade-24-fno-common.patch b/sys-block/vblade/files/vblade-24-fno-common.patch
new file mode 100644
index 00000000000..2a51ddea470
--- /dev/null
+++ b/sys-block/vblade/files/vblade-24-fno-common.patch
@@ -0,0 +1,48 @@
+Taken from: https://github.com/OpenAoE/vblade/pull/15
+Author: Andreas Kölbl <koelblandreas@freenet.de>
+
+--- /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];
diff --git a/sys-block/vblade/files/vblade-24-makefile.patch b/sys-block/vblade/files/vblade-24-makefile.patch
new file mode 100644
index 00000000000..ed5efb2c2e2
--- /dev/null
+++ b/sys-block/vblade/files/vblade-24-makefile.patch
@@ -0,0 +1,35 @@
+--- a/makefile
++++ b/makefile
+@@ -8,27 +8,22 @@
+ sharedir = ${prefix}/share
+ mandir = ${sharedir}/man
+
+-O=aoe.o bpf.o ${PLATFORM}.o ata.o
+-CFLAGS += -Wall -g -O2
+-CC = gcc
++O=aoe.o bpf.o ${PLATFORM}.o ata.o dat.o
++CFLAGS += -Wall
+
+ vblade: $O
+- ${CC} -o vblade $O
++ ${CC} ${LDFLAGS} -o vblade $O ${LIBS}
+
+ aoe.o : aoe.c config.h dat.h fns.h makefile
+- ${CC} ${CFLAGS} -c $<
+
+ ${PLATFORM}.o : ${PLATFORM}.c config.h dat.h fns.h makefile
+- ${CC} ${CFLAGS} -c $<
+
+ ata.o : ata.c config.h dat.h fns.h makefile
+- ${CC} ${CFLAGS} -c $<
+
+-bpf.o : bpf.c
+- ${CC} ${CFLAGS} -c $<
++dat.o : dat.c
+
+ config.h : config/config.h.in makefile
+- @if ${CC} ${CFLAGS} config/u64.c > /dev/null 2>&1; then \
++ @if ${CC} ${CFLAGS} ${CPPFLAGS} config/u64.c > /dev/null 2>&1; then \
+ sh -xc "cp config/config.h.in config.h"; \
+ else \
+ sh -xc "sed 's!^//u64 !!' config/config.h.in > config.h"; \
diff --git a/sys-block/vblade/vblade-24.ebuild b/sys-block/vblade/vblade-24.ebuild
index 418e75559d0..e8ee9b2db33 100644
--- a/sys-block/vblade/vblade-24.ebuild
+++ b/sys-block/vblade/vblade-24.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI=7
inherit toolchain-funcs
@@ -17,23 +17,22 @@ RDEPEND="sys-apps/util-linux"
S="${WORKDIR}/${PN}-${P}"
-src_prepare() {
- default
+PATCHES=(
+ "${FILESDIR}"/${P}-fno-common.patch
+ "${FILESDIR}"/${P}-makefile.patch
+)
- sed -i -e 's,^CFLAGS.*,CFLAGS += -Wall,' \
- -e 's:-o vblade:${LDFLAGS} \0:' \
- makefile || die
-}
-
-src_compile() {
- emake CC="$(tc-getCC)"
+src_configure() {
+ tc-export CC
}
src_install() {
dosbin vblade
dosbin "${FILESDIR}"/vbladed
+
doman vblade.8
dodoc HACKING NEWS README
+
newconfd "${FILESDIR}"/conf.d-vblade vblade
newinitd "${FILESDIR}"/init.d-vblade.vblade0-r2 vblade.vblade0
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-12-28 11:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-07-21 7:10 [gentoo-commits] repo/gentoo:master commit in: sys-block/vblade/, sys-block/vblade/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2020-12-28 11:50 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox