diff --git a/net/tgt/Makefile b/net/tgt/Makefile index 93c1a88de..266dfb2eb 100644 --- a/net/tgt/Makefile +++ b/net/tgt/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2012-2015 OpenWrt.org +# Copyright (C) 2012-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tgt -PKG_VERSION:=1.0.61 -PKG_REV:=f13345e12f49e5bcae2cfd6c5c7d530b328753f0 +PKG_VERSION:=1.0.64 +PKG_REV:=c4d6222b996cae8065fbede9fb2fa2b3cc48290d PKG_RELEASE:=1 PKG_USE_MIPS16:=0 diff --git a/net/tgt/patches/020-usr_Makefile.patch b/net/tgt/patches/020-usr_Makefile.patch index c67d68542..0120595fd 100644 --- a/net/tgt/patches/020-usr_Makefile.patch +++ b/net/tgt/patches/020-usr_Makefile.patch @@ -1,38 +1,31 @@ diff --git a/usr/Makefile b/usr/Makefile -index 1fae7e7..b05b970 100644 +index d4e3eaf..ec1c9a3 100644 --- a/usr/Makefile +++ b/usr/Makefile -@@ -1,13 +1,13 @@ +@@ -1,11 +1,11 @@ sbindir ?= $(PREFIX)/sbin libdir ?= $(PREFIX)/lib/tgt -ifneq ($(shell test -e /usr/include/linux/signalfd.h && echo 1),) -+#ifneq ($(shell test -e /usr/include/linux/signalfd.h && echo 1),) ++ifneq ($(shell test -n $(shell find $(STAGING_DIR)/usr/include -name "signalfd.h" | head -n1) && echo 1),) CFLAGS += -DUSE_SIGNALFD --endif -+#endif + endif --ifneq ($(shell test -e /usr/include/sys/timerfd.h && echo 1),) -+#ifneq ($(shell test -e /usr/include/sys/timerfd.h && echo 1),) +-ifneq ($(shell test -n $(shell find /usr/include -name "timerfd.h" | head -n1) && echo 1),) ++ifneq ($(shell test -n $(shell find $(STAGING_DIR)/usr/include -name "timerfd.h" | head -n1) && echo 1),) CFLAGS += -DUSE_TIMERFD --endif -+#endif + endif - 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 \ -@@ -25,8 +25,9 @@ ifneq ($(SD_NOTIFY),) +@@ -25,7 +25,7 @@ ifneq ($(SD_NOTIFY),) CFLAGS += -DUSE_SYSTEMD endif -ifneq ($(shell test -e /usr/include/sys/eventfd.h && test -e /usr/include/libaio.h && echo 1),) --CFLAGS += -DUSE_EVENTFD -+#ifneq ($(shell test -e /usr/include/sys/eventfd.h && test -e $(STAGING_DIR)/usr/include/libaio.h && echo 1),) -+ifneq ((test -e $(STAGING_DIR)/usr/include/libaio.h && echo 1),) -+CFLAGS += -DUSE_EVENTFD -I$(STAGING_DIR)/usr/include/ ++ifneq ($(shell test -n $(shell find $(STAGING_DIR)/usr/include -name "eventfd.h" | head -n1) && test -n $(shell find $(STAGING_DIR)/usr/include -name "libaio.h" | head -n1) && echo 1),) + CFLAGS += -DUSE_EVENTFD TGTD_OBJS += bs_aio.o LIBS += -laio - endif -@@ -55,7 +56,7 @@ ifneq ($(SD_NOTIFY),) +@@ -55,7 +55,7 @@ ifneq ($(SD_NOTIFY),) LIBS += -lsystemd endif @@ -41,13 +34,13 @@ index 1fae7e7..b05b970 100644 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 \ -@@ -82,14 +83,8 @@ tgtadm: $(TGTADM_OBJS) +@@ -82,14 +82,6 @@ tgtadm: $(TGTADM_OBJS) -include $(TGTADM_DEP) -TGTIMG_OBJS = tgtimg.o libssc.o libcrc32c.o - TGTIMG_DEP = $(TGTIMG_OBJS:.o=.d) - +-TGTIMG_DEP = $(TGTIMG_OBJS:.o=.d) +- -tgtimg: $(TGTIMG_OBJS) - $(CC) $^ -o $@ -