Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #9127 from mstorchak/tgt

Browse source 
tgt: update to 1.0.78
This commit is contained in:
Rosen Penev 2019-06-03 02:10:30 -07:00 committed by GitHub
commit 88c709829a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
net/tgt/Makefile
View file

@ -4,12 +4,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=tgt PKG_NAME:=tgt
PKG_VERSION:=1.0.77 PKG_VERSION:=1.0.78
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/fujita/tgt/tar.gz/v$(PKG_VERSION)? PKG_SOURCE_URL:=https://codeload.github.com/fujita/tgt/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=7eab72f47e69102c709be2b48b11228470d7a84c88e64f5c354b83ed84d2d04e PKG_HASH:=3ba44d5195b2007c6d9008f46a10f7754c90b9bcf6117a7f3e136accb209faac
PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com> PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0

31
net/tgt/patches/110-iscsi_tcp-Replace-deprecated-valloc-function.patch
View file

@ -1,31 +0,0 @@
From ced49c99ef0b120d32bcbb3bb6985ff90833052e Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Tue, 30 Apr 2019 22:34:45 -0700
Subject: [PATCH 1/2] iscsi_tcp: Replace deprecated valloc function
Replaced with posix_memalign as valloc is not available on uClibc.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
usr/iscsi/iscsi_tcp.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/usr/iscsi/iscsi_tcp.c b/usr/iscsi/iscsi_tcp.c
index 536f22e..5762c23 100644
--- a/usr/iscsi/iscsi_tcp.c
+++ b/usr/iscsi/iscsi_tcp.c
@@ -578,7 +578,10 @@ static void iscsi_tcp_free_task(struct iscsi_task *task)
static void *iscsi_tcp_alloc_data_buf(struct iscsi_connection *conn, size_t sz)
{
- return valloc(sz);
+ void *addr = NULL;
+
+ posix_memalign(&addr, sysconf(_SC_PAGESIZE), sz);
+ return addr;
}
static void iscsi_tcp_free_data_buf(struct iscsi_connection *conn, void *buf)
--
2.21.0

36
net/tgt/patches/111-iscsi_tcp-fix-compile-warning.patch
View file

@ -1,36 +0,0 @@
From 23f3bb1ab8311601db03757a6d4538e747364454 Mon Sep 17 00:00:00 2001
From: FUJITA Tomonori <fujita.tomonori@gmail.com>
Date: Fri, 3 May 2019 19:30:07 +0900
Subject: [PATCH 2/2] iscsi_tcp: fix compile warning
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
iscsi/iscsi_tcp.c: In function ‘iscsi_tcp_alloc_data_buf’:
iscsi/iscsi_tcp.c:583:2: error: ignoring return value of ‘posix_memalign’, declared with attribute warn_unused_result [-Werror=unused-result]
posix_memalign(&addr, sysconf(_SC_PAGESIZE), sz);
^
Signed-off-by: FUJITA Tomonori <fujita.tomonori@gmail.com>
---
usr/iscsi/iscsi_tcp.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/usr/iscsi/iscsi_tcp.c b/usr/iscsi/iscsi_tcp.c
index 5762c23..0a076b0 100644
--- a/usr/iscsi/iscsi_tcp.c
+++ b/usr/iscsi/iscsi_tcp.c
@@ -579,8 +579,8 @@ static void iscsi_tcp_free_task(struct iscsi_task *task)
static void *iscsi_tcp_alloc_data_buf(struct iscsi_connection *conn, size_t sz)
{
void *addr = NULL;
-
- posix_memalign(&addr, sysconf(_SC_PAGESIZE), sz);
+ if (posix_memalign(&addr, sysconf(_SC_PAGESIZE), sz) != 0)
+ return addr;
return addr;
}
--
2.21.0