From 1ce197c73faf5acf29bd08e30e6ad3640810c226 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 5 Nov 2018 20:31:49 -0800 Subject: [PATCH] tgt: Update to 1.0.74 Remove KERNEL_AIO dependency to avoid recursive dependency with libaio in a future commit. Signed-off-by: Rosen Penev --- net/tgt/Makefile | 8 ++++---- net/tgt/patches/020-usr_Makefile.patch | 2 -- net/tgt/patches/030-Makefile.patch | 6 +++--- net/tgt/patches/100-musl-compat.patch | 4 ---- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/net/tgt/Makefile b/net/tgt/Makefile index 75339ac1a..cba1d50c0 100644 --- a/net/tgt/Makefile +++ b/net/tgt/Makefile @@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tgt -PKG_VERSION:=1.0.73 -PKG_RELEASE:=2 +PKG_VERSION:=1.0.74 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/fujita/tgt/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=2e3899a2235386a68df8cbf0eccb6a44e221a3e9e6bd9215c903c3fc9ed34bbf +PKG_HASH:=bfc202790d5326d7a18bd3928b4bb204ffb0acf443a5ec5c16a1a0fbc53be99f PKG_MAINTAINER:=Maxim Storchak PKG_LICENSE:=GPL-2.0 @@ -26,7 +26,7 @@ define Package/tgt CATEGORY:=Network URL:=http://stgt.sourceforge.net/ TITLE:=userspace iSCSI target - DEPENDS:=+libpthread +libaio @KERNEL_AIO + DEPENDS:=+libpthread +libaio endef define Package/tgt/description diff --git a/net/tgt/patches/020-usr_Makefile.patch b/net/tgt/patches/020-usr_Makefile.patch index 0120595fd..99c0d82bb 100644 --- a/net/tgt/patches/020-usr_Makefile.patch +++ b/net/tgt/patches/020-usr_Makefile.patch @@ -1,5 +1,3 @@ -diff --git a/usr/Makefile b/usr/Makefile -index d4e3eaf..ec1c9a3 100644 --- a/usr/Makefile +++ b/usr/Makefile @@ -1,11 +1,11 @@ diff --git a/net/tgt/patches/030-Makefile.patch b/net/tgt/patches/030-Makefile.patch index ab54f2291..6ac58f57e 100644 --- a/net/tgt/patches/030-Makefile.patch +++ b/net/tgt/patches/030-Makefile.patch @@ -1,6 +1,6 @@ ---- tgt-1.0.48.orig/Makefile 2014-06-04 15:03:53.000000000 +0300 -+++ tgt-1.0.48/Makefile 2014-06-04 15:18:13.132963670 +0300 -@@ -64,7 +64,7 @@ +--- a/Makefile ++++ b/Makefile +@@ -64,7 +64,7 @@ clean-conf: $(MAKE) -C conf clean .PHONY: install diff --git a/net/tgt/patches/100-musl-compat.patch b/net/tgt/patches/100-musl-compat.patch index f606207d2..3d142c216 100644 --- a/net/tgt/patches/100-musl-compat.patch +++ b/net/tgt/patches/100-musl-compat.patch @@ -1,5 +1,3 @@ -diff --git a/usr/tgtd.h b/usr/tgtd.h -index d8b2ac1..c6eee54 100644 --- a/usr/tgtd.h +++ b/usr/tgtd.h @@ -9,6 +9,10 @@ @@ -13,8 +11,6 @@ index d8b2ac1..c6eee54 100644 struct concat_buf; #define NR_SCSI_OPCODES 256 -diff --git a/usr/util.h b/usr/util.h -index 0e34c35..3e2e63b 100644 --- a/usr/util.h +++ b/usr/util.h @@ -16,6 +16,10 @@