Signed-off-by: Maxim Storchak <m.storc...@gmail.com>
---
 net/tgt/Makefile                       |    6 +++---
 net/tgt/patches/010-fallocate.patch    |    4 ++--
 net/tgt/patches/020-usr_Makefile.patch |   16 ++++++++--------
 net/tgt/patches/030-Makefile.patch     |    6 +++---
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/net/tgt/Makefile b/net/tgt/Makefile
index 5f918d4..6d7fc96 100644
--- a/net/tgt/Makefile
+++ b/net/tgt/Makefile
@@ -7,9 +7,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tgt
-PKG_VERSION:=1.0.46
-PKG_REV:=601a44d6c833f59d9d2472ad11d421481a25b2e7
-PKG_RELEASE:=2
+PKG_VERSION:=1.0.48
+PKG_REV:=22d9567f39e5eb8a794ce2cb5a2190abdbecaa1f
+PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/fujita/tgt.git
diff --git a/net/tgt/patches/010-fallocate.patch 
b/net/tgt/patches/010-fallocate.patch
index cb8ddb4..9d572d6 100644
--- a/net/tgt/patches/010-fallocate.patch
+++ b/net/tgt/patches/010-fallocate.patch
@@ -1,5 +1,5 @@
---- tgt-1.0.42/usr/util.h.orig 2013-12-26 16:18:54.000000000 +0200
-+++ tgt-1.0.42/usr/util.h      2013-12-26 16:19:10.000000000 +0200
+--- tgt-1.0.48.orig/usr/util.h 2014-06-04 15:03:53.000000000 +0300
++++ tgt-1.0.48/usr/util.h      2014-06-04 15:17:48.548123039 +0300
 @@ -212,11 +212,6 @@
   */
  static inline int unmap_file_region(int fd, off_t offset, off_t length)
diff --git a/net/tgt/patches/020-usr_Makefile.patch 
b/net/tgt/patches/020-usr_Makefile.patch
index 33b235b..2deb305 100644
--- a/net/tgt/patches/020-usr_Makefile.patch
+++ b/net/tgt/patches/020-usr_Makefile.patch
@@ -1,5 +1,5 @@
---- tgt-1.0.46.orig/usr/Makefile       2014-04-06 09:55:49.000000000 +0300
-+++ tgt-1.0.46/usr/Makefile    2014-04-06 09:57:04.000000000 +0300
+--- tgt-1.0.48.orig/usr/Makefile       2014-06-04 15:03:53.000000000 +0300
++++ tgt-1.0.48/usr/Makefile    2014-06-04 15:17:56.373670618 +0300
 @@ -1,13 +1,13 @@
  sbindir ?= $(PREFIX)/sbin
  libdir ?= $(PREFIX)/lib/tgt
@@ -18,8 +18,8 @@
  
  TGTD_OBJS += $(addprefix iscsi/, conn.o param.o session.o \
                iscsid.o target.o chap.o sha1.o md5.o transport.o iscsi_tcp.o \
-@@ -21,8 +21,9 @@
- MODULES += bs_glfs.so
+@@ -25,8 +25,9 @@
+ CFLAGS += -DUSE_SYSTEMD
  endif
  
 -ifneq ($(shell test -e /usr/include/sys/eventfd.h && test -e 
/usr/include/libaio.h && echo 1),)
@@ -30,16 +30,16 @@
  TGTD_OBJS += bs_aio.o
  LIBS += -laio
  endif
-@@ -47,7 +48,7 @@
- 
- LIBS += -lpthread -ldl
+@@ -55,7 +56,7 @@
+ LIBS += -lsystemd-daemon
+ endif
  
 -PROGRAMS += tgtd tgtadm tgtimg
 +PROGRAMS += tgtd tgtadm
  TGTD_OBJS += tgtd.o mgmt.o target.o scsi.o log.o driver.o util.o work.o \
                concat_buf.o parser.o spc.o sbc.o mmc.o osd.o scc.o smc.o \
                ssc.o libssc.o bs_rdwr.o bs_ssc.o \
-@@ -74,14 +75,8 @@
+@@ -82,14 +83,8 @@
  
  -include $(TGTADM_DEP)
  
diff --git a/net/tgt/patches/030-Makefile.patch 
b/net/tgt/patches/030-Makefile.patch
index 5ef9b82..ab54f22 100644
--- a/net/tgt/patches/030-Makefile.patch
+++ b/net/tgt/patches/030-Makefile.patch
@@ -1,6 +1,6 @@
---- tgt-1.0.46.orig/Makefile   2014-04-06 09:55:49.000000000 +0300
-+++ tgt-1.0.46/Makefile        2014-04-06 09:57:04.000000000 +0300
-@@ -63,7 +63,7 @@
+--- 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 @@
        $(MAKE) -C conf clean
  
  .PHONY: install
-- 
1.7.10.4
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Reply via email to