Author: arekm Date: Wed Nov 10 13:30:42 2010 GMT Module: packages Tag: HEAD ---- Log message: - up to 872
---- Files affected: packages/open-iscsi: open-iscsi.spec (1.20 -> 1.21) , open-iscsi-build.patch (NONE -> 1.1) (NEW), stat.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/open-iscsi/open-iscsi.spec diff -u packages/open-iscsi/open-iscsi.spec:1.20 packages/open-iscsi/open-iscsi.spec:1.21 --- packages/open-iscsi/open-iscsi.spec:1.20 Mon Jun 7 21:17:01 2010 +++ packages/open-iscsi/open-iscsi.spec Wed Nov 10 14:30:37 2010 @@ -2,7 +2,7 @@ # TODO # - /sbin/iscsistart is linked static, should it be linked uclibc/klibc-static for initrd? # -%define subver 871.3 +%define subver 872 %define rel 1 Summary: iSCSI - SCSI over IP Summary(pl.UTF-8): iSCSI - SCSI po IP @@ -12,13 +12,15 @@ License: GPL Group: Networking/Daemons Source0: http://kernel.org/pub/linux/kernel/people/mnc/open-iscsi/releases/%{name}-%{version}-%{subver}.tar.gz -# Source0-md5: 16474cb7cd5a41aea1b7b0b631ac996d +# Source0-md5: b4df94f08c241352bb964043b3e44779 Source1: %{name}.init Source2: %{name}.sysconfig -Patch0: stat.patch +Patch0: %{name}-build.patch URL: http://www.open-iscsi.org/ BuildRequires: db-devel BuildRequires: glibc-static +BuildRequires: openslp-static +BuildRequires: openssl-static BuildRequires: rpmbuild(macros) >= 1.379 Requires(post,preun): /sbin/chkconfig Requires: rc-scripts @@ -49,10 +51,17 @@ %patch0 -p1 %build +cd utils/open-isns +%configure \ + --with-slp \ + --with-security +%{__make} +cd ../.. for i in utils/sysdeps utils/fwparam_ibft usr utils; do %{__make} -C $i \ CC="%{__cc}" \ - CFLAGS="%{rpmcflags} -I../include -I../usr -I../../include -I../../usr -DLinux -DNETLINK_ISCSI=12 -D_GNU_SOURCE" + OPTFLAGS="%{rpmcflags} %{rpmcppflags}" \ + KSRC="%{_kernelsrcdir}" done %install @@ -119,6 +128,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.21 2010/11/10 13:30:37 arekm +- up to 872 + Revision 1.20 2010/06/07 19:17:01 wiget - added stat.patch (added missing includes for S_ISDIR and co) - fix -I in CFLAGS ================================================================ Index: packages/open-iscsi/open-iscsi-build.patch diff -u /dev/null packages/open-iscsi/open-iscsi-build.patch:1.1 --- /dev/null Wed Nov 10 14:30:42 2010 +++ packages/open-iscsi/open-iscsi-build.patch Wed Nov 10 14:30:37 2010 @@ -0,0 +1,19 @@ +--- oiscsi/usr/Makefile 2010-08-11 17:27:07.000000000 +0200 ++++ oiscsi/usr/Makefile 2010-11-10 14:26:59.085995691 +0100 +@@ -53,13 +53,13 @@ + + iscsid: $(ISCSI_LIB_SRCS) $(IPC_OBJ) $(INITIATOR_SRCS) $(DISCOVERY_SRCS) \ + iscsid.o session_mgmt.o discoveryd.o +- $(CC) $(CFLAGS) $^ -o $@ -L../utils/open-isns -lisns -lcrypto ++ $(CC) $(CFLAGS) $^ -o $@ -L../utils/open-isns -lisns -lcrypto -lslp + + iscsiadm: $(ISCSI_LIB_SRCS) $(DISCOVERY_SRCS) iscsiadm.o session_mgmt.o +- $(CC) $(CFLAGS) $^ -o $@ -L../utils/open-isns -lisns -lcrypto ++ $(CC) $(CFLAGS) $^ -o $@ -L../utils/open-isns -lisns -lcrypto -lslp + + iscsistart: $(IPC_OBJ) $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \ + iscsistart.o statics.o +- $(CC) $(CFLAGS) -static $^ -o $@ ++ $(CC) $(CFLAGS) -static $^ -o $@ -lslp + clean: + rm -f *.o $(PROGRAMS) .depend $(LIBSYS) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/open-iscsi/open-iscsi.spec?r1=1.20&r2=1.21&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
