added my Recipes
This commit is contained in:
@@ -0,0 +1,47 @@
|
||||
From 93fea40915d01be6d02587a0b8be85a642e6a8d5 Mon Sep 17 00:00:00 2001
|
||||
From: Zhenhua Luo <zhenhua.luo@freescale.com>
|
||||
Date: Thu, 10 Apr 2014 11:26:39 +0800
|
||||
Subject: [PATCH] Correct the path of header files check in Yocto build env
|
||||
|
||||
Upstream-Status: Inappropriate [the fix is specific to Yocto build env]
|
||||
|
||||
Current Makefile will check headers on host instead of Yocto sysroot, following
|
||||
error appears. Change the path of header check.
|
||||
| bs_aio.c:34:20: fatal error: libaio.h: No such file or directory
|
||||
| #include <libaio.h>
|
||||
| ^
|
||||
| compilation terminated.
|
||||
|
||||
Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
|
||||
|
||||
---
|
||||
usr/Makefile | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/usr/Makefile b/usr/Makefile
|
||||
index decf13c..9ff8f15 100644
|
||||
--- a/usr/Makefile
|
||||
+++ b/usr/Makefile
|
||||
@@ -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 $(SYSROOT)/usr/include/linux/signalfd.h && echo 1),)
|
||||
CFLAGS += -DUSE_SIGNALFD
|
||||
endif
|
||||
|
||||
-ifneq ($(shell test -n $(shell find /usr/include -name "timerfd.h" | head -n1) && echo 1),)
|
||||
+ifneq ($(shell test -n $(shell find $(SYSROOT)/usr/include -name "timerfd.h" | head -n1) && echo 1),)
|
||||
CFLAGS += -DUSE_TIMERFD
|
||||
endif
|
||||
|
||||
@@ -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),)
|
||||
+ifneq ($(shell test -e $(SYSROOT)/usr/include/sys/eventfd.h && test -e $(SYSROOT)/usr/include/libaio.h && echo 1),)
|
||||
CFLAGS += -DUSE_EVENTFD
|
||||
TGTD_OBJS += bs_aio.o
|
||||
LIBS += -laio
|
||||
@@ -0,0 +1,29 @@
|
||||
From 6f4e3b11c7dccf83e2d18635c84837b212dfcc1c Mon Sep 17 00:00:00 2001
|
||||
From: Li xin <lixin.fnst@cn.fujitsu.com>
|
||||
Date: Sun, 26 Jul 2015 04:23:51 +0900
|
||||
Subject: [PATCH] usr/Makefile: WARNING fix WARNING: QA Issue: tgt:
|
||||
/work/i586-oe-linux/tgt/1.0.60+gitAUTOINC+ab51727a36-r0/
|
||||
packages-split/tgt/usr/sbin/tgtd contains probably-redundant RPATH /usr/lib
|
||||
[useless-rpaths]
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
|
||||
|
||||
---
|
||||
usr/Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/usr/Makefile b/usr/Makefile
|
||||
index 9ff8f15..cc8df11 100644
|
||||
--- a/usr/Makefile
|
||||
+++ b/usr/Makefile
|
||||
@@ -63,7 +63,7 @@ TGTD_OBJS += tgtd.o mgmt.o target.o scsi.o log.o driver.o util.o work.o \
|
||||
|
||||
TGTD_DEP = $(TGTD_OBJS:.o=.d)
|
||||
|
||||
-LDFLAGS = -Wl,-E,-rpath=$(libdir)
|
||||
+LDFLAGS += -Wl,-E
|
||||
|
||||
.PHONY:all
|
||||
all: $(PROGRAMS) $(MODULES)
|
||||
@@ -0,0 +1,5 @@
|
||||
# options for tgtd
|
||||
TGTD_OPTS=""
|
||||
|
||||
# configuration file
|
||||
TGTD_CONFIG=/etc/tgt/targets.conf
|
||||
@@ -0,0 +1,116 @@
|
||||
#!/bin/sh
|
||||
|
||||
### BEGIN INIT INFO
|
||||
# Provides: tgtd
|
||||
# Required-Start: $remote_fs $network $syslog
|
||||
# Required-Stop: $remote_fs $syslog
|
||||
# Default-Start: 3 5
|
||||
# Default-Stop: 0 1 2 6
|
||||
# Short-Description: SCSI target daemon
|
||||
# Description: Linux SCSI target framework (tgt)
|
||||
### END INIT INFO
|
||||
|
||||
DESC="tgtd"
|
||||
DAEMON="/usr/sbin/tgtd"
|
||||
TGTD_CONFIG=/etc/tgt/targets.conf
|
||||
|
||||
start ()
|
||||
{
|
||||
echo -n "Starting $DESC..."
|
||||
|
||||
# Ensure service isn't running
|
||||
tgt-admin -s >/dev/null 2>&1
|
||||
RETVAL=$?
|
||||
if [ "$RETVAL" -ne 107 ] ; then
|
||||
echo "$DESC is already running."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Start tgtd first
|
||||
$DAEMON &>/dev/null
|
||||
RETVAL=$?
|
||||
if [ "$RETVAL" -ne 0 ]; then
|
||||
echo "failed."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Put tgtd into "offline" state until all the targets are configured.
|
||||
# We don't want initiators to (re)connect and fail the connection
|
||||
# if it's not ready.
|
||||
tgtadm --op update --mode sys --name State -v offline
|
||||
# Configure the targets.
|
||||
tgt-admin -f -e -c $TGTD_CONFIG
|
||||
# Put tgtd into "ready" state.
|
||||
tgtadm --op update --mode sys --name State -v ready
|
||||
|
||||
echo "done."
|
||||
}
|
||||
|
||||
stop ()
|
||||
{
|
||||
echo -n "Stopping $DESC..."
|
||||
|
||||
# Remove all targets. It only removes targets which are not in use.
|
||||
tgt-admin --update ALL -c /dev/null &>/dev/null
|
||||
# tgtd will exit if all targets were removed
|
||||
tgtadm --op delete --mode system &>/dev/null
|
||||
RETVAL=$?
|
||||
if [ "$RETVAL" -eq 107 ] ; then
|
||||
if [ "$TASK" != "restart" ] ; then
|
||||
return 1
|
||||
fi
|
||||
elif [ "$RETVAL" -ne 0 ] ; then
|
||||
echo "Some initiators are still connected - could not stop tgtd"
|
||||
return 2
|
||||
fi
|
||||
echo -n
|
||||
}
|
||||
|
||||
reload()
|
||||
{
|
||||
echo "Reloading configuration of $DESC" "$NAME"
|
||||
# Update configuration for targets. Only targets which
|
||||
# are not in use will be updated.
|
||||
tgt-admin --update ALL -c $TGTD_CONFIG &>/dev/null
|
||||
RETVAL=$?
|
||||
if [ "$RETVAL" -eq 107 ] ; then
|
||||
echo "tgtd is not running"
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
status()
|
||||
{
|
||||
tgt-admin -s >/dev/null 2>&1
|
||||
RETVAL=$?
|
||||
if [ "$RETVAL" -eq 107 ] ; then
|
||||
echo "tgtd is not running"
|
||||
else
|
||||
echo "tgtd is running"
|
||||
fi
|
||||
}
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
start
|
||||
;;
|
||||
stop)
|
||||
stop
|
||||
;;
|
||||
restart|force-reload)
|
||||
stop
|
||||
start
|
||||
;;
|
||||
reload)
|
||||
reload
|
||||
;;
|
||||
status)
|
||||
status
|
||||
;;
|
||||
*)
|
||||
echo "Usage: $0 {start|stop|force-reload|restart|status|reload}"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
exit 0
|
||||
33
meta-openembedded/meta-networking/recipes-extended/tgt/files/tgtd.service
Executable file
33
meta-openembedded/meta-networking/recipes-extended/tgt/files/tgtd.service
Executable file
@@ -0,0 +1,33 @@
|
||||
[Unit]
|
||||
Description=tgtd iSCSI target daemon
|
||||
After=network.target
|
||||
|
||||
[Service]
|
||||
EnvironmentFile=@SYSCONFDIR@/sysconfig/tgtd
|
||||
|
||||
ExecStart=@SBINDIR@/tgtd -f $TGTD_OPTS
|
||||
# see bz 848942. workaround for a race for now.
|
||||
ExecStartPost=@BASE_BINDIR@/sleep 5
|
||||
# Put tgtd into "offline" state until all the targets are configured.
|
||||
# We don't want initiators to (re)connect and fail the connection
|
||||
# if it's not ready.
|
||||
ExecStartPost=@SBINDIR@/tgtadm --op update --mode sys --name State -v offline
|
||||
# Configure the targets.
|
||||
ExecStartPost=@SBINDIR@/tgt-admin -e -c $TGTD_CONFIG
|
||||
# Put tgtd into "ready" state.
|
||||
ExecStartPost=@SBINDIR@/tgtadm --op update --mode sys --name State -v ready
|
||||
|
||||
# Update configuration for targets. Only targets which
|
||||
# are not in use will be updated.
|
||||
ExecReload=@SBINDIR@/tgt-admin --update ALL -c $TGTD_CONFIG
|
||||
|
||||
# NOTE: Shutdown of the iscsi target may cause data corruption
|
||||
# for initiators that are connected.
|
||||
ExecStop=@SBINDIR@/tgtadm --op update --mode sys --name State -v offline
|
||||
# Remove all targets. It only removes targets which are not in use.
|
||||
ExecStop=@SBINDIR@/tgt-admin --update ALL -c /dev/null
|
||||
# tgtd will exit if all targets were removed
|
||||
ExecStop=@SBINDIR@/tgtadm --op delete --mode system
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
@@ -0,0 +1,35 @@
|
||||
From a815ac8ee16b344d9e24b445957f32bf2aafa532 Mon Sep 17 00:00:00 2001
|
||||
From: Mark Asselstine <mark.asselstine@windriver.com>
|
||||
Date: Thu, 5 Jan 2017 11:07:51 -0500
|
||||
Subject: [PATCH] usr/Makefile: apply LDFLAGS to all executables
|
||||
|
||||
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
|
||||
---
|
||||
usr/Makefile | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/usr/Makefile b/usr/Makefile
|
||||
index cc8df11..c55fd68 100644
|
||||
--- a/usr/Makefile
|
||||
+++ b/usr/Makefile
|
||||
@@ -78,7 +78,7 @@ TGTADM_OBJS = tgtadm.o concat_buf.o
|
||||
TGTADM_DEP = $(TGTADM_OBJS:.o=.d)
|
||||
|
||||
tgtadm: $(TGTADM_OBJS)
|
||||
- $(CC) $^ -o $@
|
||||
+ $(CC) $^ -o $@ $(LDFLAGS)
|
||||
|
||||
-include $(TGTADM_DEP)
|
||||
|
||||
@@ -86,7 +86,7 @@ TGTIMG_OBJS = tgtimg.o libssc.o libcrc32c.o
|
||||
TGTIMG_DEP = $(TGTIMG_OBJS:.o=.d)
|
||||
|
||||
tgtimg: $(TGTIMG_OBJS)
|
||||
- $(CC) $^ -o $@
|
||||
+ $(CC) $^ -o $@ $(LDFLAGS)
|
||||
|
||||
-include $(TGTIMG_DEP)
|
||||
|
||||
--
|
||||
2.7.4
|
||||
|
||||
Reference in New Issue
Block a user