* [gentoo-commits] repo/gentoo:master commit in: sys-block/vblade/files/, sys-block/vblade/
@ 2017-08-14 13:36 Lars Wendler
0 siblings, 0 replies; 4+ messages in thread
From: Lars Wendler @ 2017-08-14 13:36 UTC (permalink / raw
To: gentoo-commits
commit: cc62e07606d5568e34dde4c9343e894044587214
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 14 13:31:37 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Aug 14 13:36:12 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc62e076
sys-block/vblade: Bump to version 23 (bug #536330).
Added new init script provided by Mark Tomich in bug #522898.
Package-Manager: Portage-2.3.7, Repoman-2.3.3
sys-block/vblade/Manifest | 1 +
sys-block/vblade/files/init.d-vblade.vblade0-r1 | 125 ++++++++++++++++++++++++
sys-block/vblade/vblade-23.ebuild | 39 ++++++++
3 files changed, 165 insertions(+)
diff --git a/sys-block/vblade/Manifest b/sys-block/vblade/Manifest
index 8a3e40e86f9..d755caad894 100644
--- a/sys-block/vblade/Manifest
+++ b/sys-block/vblade/Manifest
@@ -1,2 +1,3 @@
DIST vblade-20.tgz 26689 SHA256 c8fe2fc4f2fba8e07e5cfdf17335982584eef2cd5c78bf8b1db93f2b56e7121d SHA512 b6c10ff9d75a2fc99c93af6b6de8f23c8b17ab70e2d5ed7049389ee8752ad001b3940764af16ff06f7f38c7bc528065edb0f285663af6fdd00fe58f022c26f02 WHIRLPOOL c663c997216d5b2694331911376f61464187bf2225a92e812fb8e152a40ae0582abeefcbed61fbdd902fc188f90a68bf83b32f3f319bd30620d92c57d50decb3
DIST vblade-21.tgz 26434 SHA256 b5740bb7d57141769ba77baa3c690f134dd62069f1df310debc2520d416a1b92 SHA512 cf2826fd40a5c1377dd65149581b10460a55eb17f480a7fd3bdd35fbe8066a8c571b62ebb93dbfadad3aac569a03b142bff1df2c4a49efff98ad5ed084739d14 WHIRLPOOL e9555817ccaad19a3d36824efcb3339d67f5e5dbb6a39a5980eb2b17282a4ea173907d3917d98fb991b6816aac065ec36f6be6079d55b2786bfa22d03f35d16c
+DIST vblade-23.tar.gz 27432 SHA256 aa3c2035d6b14ab30ef1cee333092fcd5d1509211d737f181833a6a370973b21 SHA512 a27379933b5c0fc84966f47e0ee0089fe978fe77ea38d91c21fb6bb6bc4fa7f393b8b4c57f84c6840b549908eb8666847f121b836e3a076895e038e8096c0cfa WHIRLPOOL a89ec60c3d457962b8e2d95850e5083d16e1556d3da228dabc8ffb1ed0168a560cf6b7dc590c03a0272c79de62958fea4e6cd7b9c95aa16999fd75296ddf8a22
diff --git a/sys-block/vblade/files/init.d-vblade.vblade0-r1 b/sys-block/vblade/files/init.d-vblade.vblade0-r1
new file mode 100644
index 00000000000..174e473ffc1
--- /dev/null
+++ b/sys-block/vblade/files/init.d-vblade.vblade0-r1
@@ -0,0 +1,125 @@
+#!/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-23.ebuild b/sys-block/vblade/vblade-23.ebuild
new file mode 100644
index 00000000000..bf2ac029094
--- /dev/null
+++ b/sys-block/vblade/vblade-23.ebuild
@@ -0,0 +1,39 @@
+# 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] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-block/vblade/files/, sys-block/vblade/
@ 2018-08-31 3:17 Thomas Deutschmann
0 siblings, 0 replies; 4+ messages in thread
From: Thomas Deutschmann @ 2018-08-31 3:17 UTC (permalink / raw
To: gentoo-commits
commit: a5cdeb049a1105a784ce4ab2735d4f2d83fc986d
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 31 03:16:27 2018 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Aug 31 03:16:52 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5cdeb04
sys-block/vblade: bump to v24
Package-Manager: Portage-2.3.48, Repoman-2.3.10
sys-block/vblade/Manifest | 1 +
sys-block/vblade/files/init.d-vblade.vblade0-r2 | 125 ++++++++++++++++++++++++
sys-block/vblade/vblade-24.ebuild | 39 ++++++++
3 files changed, 165 insertions(+)
diff --git a/sys-block/vblade/Manifest b/sys-block/vblade/Manifest
index 36c8a9b03ff..5cd43b3d182 100644
--- a/sys-block/vblade/Manifest
+++ b/sys-block/vblade/Manifest
@@ -1,2 +1,3 @@
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-r2 b/sys-block/vblade/files/init.d-vblade.vblade0-r2
new file mode 100644
index 00000000000..879c07d4e53
--- /dev/null
+++ b/sys-block/vblade/files/init.d-vblade.vblade0-r2
@@ -0,0 +1,125 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 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}" ] && . "${conf}"
+ vblade_name="${myservice#*.}"
+else
+ conf="/etc/conf.d/vblade"
+ [ -e "${conf}" ] && . "${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-24.ebuild b/sys-block/vblade/vblade-24.ebuild
new file mode 100644
index 00000000000..b14ea838c8c
--- /dev/null
+++ b/sys-block/vblade/vblade-24.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 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-r2 vblade.vblade0
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-block/vblade/files/, sys-block/vblade/
@ 2021-06-17 23:20 Thomas Deutschmann
0 siblings, 0 replies; 4+ messages in thread
From: Thomas Deutschmann @ 2021-06-17 23:20 UTC (permalink / raw
To: gentoo-commits
commit: a49812e7bf4df3e98a90f29c7a0423812a6e6003
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 17 23:17:51 2021 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jun 17 23:20:10 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a49812e7
sys-block/vblade: bump to v25
Closes: https://bugs.gentoo.org/763015
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
sys-block/vblade/Manifest | 1 +
sys-block/vblade/files/vblade-25-makefile.patch | 36 +++++++++++++++++++++++++
sys-block/vblade/vblade-25.ebuild | 35 ++++++++++++++++++++++++
3 files changed, 72 insertions(+)
diff --git a/sys-block/vblade/Manifest b/sys-block/vblade/Manifest
index 6fe4544157f..68b547c1620 100644
--- a/sys-block/vblade/Manifest
+++ b/sys-block/vblade/Manifest
@@ -1 +1,2 @@
DIST vblade-24.tar.gz 27638 BLAKE2B 8a99d571b3b97d47ce9c81ef8141e0d6477181e88aa56e3ea7d03c689c747a60922c21969ea009cf978a3cb15bcb969b12df50f2bd8e6bb498a8bc6d483be1d3 SHA512 d5db85581db119b83a129fc00635d37b6d8fccfaf685dc58c68773c7299f7fe4e01735ec7fea6a0494a0cf2bc1400d643a720b55e4d6de37a0b8ec15d00d1f2a
+DIST vblade-25.tar.gz 32524 BLAKE2B 5bc396e5f47fa293968b58d589a9f8c5c837434abcc93be5f859047b25a5c6d3e3ecce8119f536fda222574b5b1d598a009f4ae393075c597c3f0f1f1f7ea79c SHA512 a70ee7e98a71bc2a649501c92e6c37fc0410837f5f68f9501e75b688743f0bbe2d1f93969b3a9fe068247cd49c209ba72f794dcbb68ee9d955c0f7fad774fd92
diff --git a/sys-block/vblade/files/vblade-25-makefile.patch b/sys-block/vblade/files/vblade-25-makefile.patch
new file mode 100644
index 00000000000..072c963b1c3
--- /dev/null
+++ b/sys-block/vblade/files/vblade-25-makefile.patch
@@ -0,0 +1,36 @@
+--- a/makefile
++++ b/makefile
+@@ -9,29 +9,23 @@ sharedir = ${prefix}/share
+ mandir = ${sharedir}/man
+
+ O=aoe.o bpf.o ${PLATFORM}.o ata.o dat.o
+-CFLAGS += -Wall -g -O2 -fno-common
+-CC = gcc
++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
+- ${CC} ${CFLAGS} -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-25.ebuild b/sys-block/vblade/vblade-25.ebuild
new file mode 100644
index 00000000000..040f3e71f42
--- /dev/null
+++ b/sys-block/vblade/vblade-25.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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}"
+
+PATCHES=( "${FILESDIR}"/vblade-25-makefile.patch )
+
+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] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-block/vblade/files/, sys-block/vblade/
@ 2021-09-04 17:35 David Seifert
0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2021-09-04 17:35 UTC (permalink / raw
To: gentoo-commits
commit: bf9971eee2a48953679bced3420072cc8a100f01
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 4 17:34:15 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Sep 4 17:34:15 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf9971ee
sys-block/vblade: drop 24
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sys-block/vblade/Manifest | 1 -
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 | 38 ------------------
4 files changed, 122 deletions(-)
diff --git a/sys-block/vblade/Manifest b/sys-block/vblade/Manifest
index 68b547c1620..b71e8970646 100644
--- a/sys-block/vblade/Manifest
+++ b/sys-block/vblade/Manifest
@@ -1,2 +1 @@
-DIST vblade-24.tar.gz 27638 BLAKE2B 8a99d571b3b97d47ce9c81ef8141e0d6477181e88aa56e3ea7d03c689c747a60922c21969ea009cf978a3cb15bcb969b12df50f2bd8e6bb498a8bc6d483be1d3 SHA512 d5db85581db119b83a129fc00635d37b6d8fccfaf685dc58c68773c7299f7fe4e01735ec7fea6a0494a0cf2bc1400d643a720b55e4d6de37a0b8ec15d00d1f2a
DIST vblade-25.tar.gz 32524 BLAKE2B 5bc396e5f47fa293968b58d589a9f8c5c837434abcc93be5f859047b25a5c6d3e3ecce8119f536fda222574b5b1d598a009f4ae393075c597c3f0f1f1f7ea79c SHA512 a70ee7e98a71bc2a649501c92e6c37fc0410837f5f68f9501e75b688743f0bbe2d1f93969b3a9fe068247cd49c209ba72f794dcbb68ee9d955c0f7fad774fd92
diff --git a/sys-block/vblade/files/vblade-24-fno-common.patch b/sys-block/vblade/files/vblade-24-fno-common.patch
deleted file mode 100644
index 2a51ddea470..00000000000
--- a/sys-block/vblade/files/vblade-24-fno-common.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-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
deleted file mode 100644
index ed5efb2c2e2..00000000000
--- a/sys-block/vblade/files/vblade-24-makefile.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- 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
deleted file mode 100644
index e8ee9b2db33..00000000000
--- a/sys-block/vblade/vblade-24.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-fno-common.patch
- "${FILESDIR}"/${P}-makefile.patch
-)
-
-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] 4+ messages in thread
end of thread, other threads:[~2021-09-04 17:35 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-06-17 23:20 [gentoo-commits] repo/gentoo:master commit in: sys-block/vblade/files/, sys-block/vblade/ Thomas Deutschmann
-- strict thread matches above, loose matches on Subject: below --
2021-09-04 17:35 David Seifert
2018-08-31 3:17 Thomas Deutschmann
2017-08-14 13:36 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox