pool/tgt
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 183831 from Base:System

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/183831
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tgt?expand=0&rev=21
This commit is contained in:
Stephan Kulow 2013-07-21 06:12:46 +00:00 committed by Git OBS Bridge
commit e5eaf7a17d
3 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
setup-tgt-conf-d.patch Normal file
View File

@ -0,0 +1,31 @@
--- conf/Makefile
+++ conf/Makefile
@@ -1,4 +1,5 @@
sysconfdir ?= /etc
+docdatadir ?= /usr/share/doc/packages/
EXAMPLES = targets.conf.example targets.conf.vtl.L700 targets.conf.vtl.MSL2024
@@ -11,9 +12,10 @@
if [ ! -f $(DESTDIR)$(sysconfdir)/tgt/targets.conf ] ; then \
install -m 644 targets.conf $(DESTDIR)$(sysconfdir)/tgt ; \
fi
- install -d -m 755 $(DESTDIR)$(sysconfdir)/tgt/examples
+ install -d -m 755 $(DESTDIR)$(sysconfdir)/tgt/conf.d
+ install -d -m 755 $(DESTDIR)$(docdatadir)/tgt/examples
for f in $(EXAMPLES) ; do \
- install -m 644 examples/$$f $(DESTDIR)$(sysconfdir)/tgt/examples ;\
+ install -m 644 examples/$$f $(DESTDIR)$(docdatadir)/tgt/examples ;\
done
.PHONY: clean
--- conf/targets.conf
+++ conf/targets.conf
@@ -1,2 +1,7 @@
# Empty targets configuration file -- please see the package
# documentation directory for an example.
+
+#
+# Include configuration from directory
+#
+include /etc/tgt/conf.d/*.conf

6
tgt.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Jul 13 14:25:21 UTC 2013 - dmueller@suse.com
- add setup-tgt-conf-d.patch: Configure a /etc/tgt/conf.d by default
- move examples to docdir
-------------------------------------------------------------------
Thu Apr 11 10:36:23 PDT 2013 - lduncan@suse.com

5
tgt.spec
View File

@ -38,6 +38,7 @@ Patch1: %{name}-git-update
Patch2: %{name}-fix-build
# PATCH-FIX-UPSTREAM tgt-mgmt-fixed-m-system-o-delete-handling.patch [bnc#767438] - lduncan@suse.com
Patch3: %{name}-mgmt-fixed-m-system-o-delete-handling.patch
Patch4: setup-tgt-conf-d.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -60,6 +61,7 @@ Authors:
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4
%build
%ifarch ppc ppc64
@ -93,9 +95,8 @@ rm -f filelist
/usr/sbin/*
/etc/init.d/tgtd
%dir /etc/tgt
%dir /etc/tgt/examples
%dir /etc/tgt/conf.d
%config %attr(0644,root,root) /etc/tgt/targets.conf
%config %attr(0644,root,root) /etc/tgt/examples/*
%config %attr(0644,root,root) /etc/sysconfig/SuSEfirewall2.d/services/tgt
%doc README doc/README.iscsi doc/README.iser doc/README.lu_configuration
%doc doc/README.mmc doc/README.passthrough doc/README.sbcjukebox doc/README.ssc