diff --git a/0043-Fix-devel-without-node-header-files.patch b/0043-Fix-devel-without-node-header-files.patch new file mode 100644 index 0000000..0f3b066 --- /dev/null +++ b/0043-Fix-devel-without-node-header-files.patch @@ -0,0 +1,34 @@ +From f01725cfd9b2214f7c602bd72a5af9578dc9d023 Mon Sep 17 00:00:00 2001 +From: si-gui <245140120@qq.com> +Date: Mon, 15 Jun 2020 17:07:36 +0800 +Subject: [PATCH] Fix devel without node header files + +When user include libopeniscsiusr.h in the c files,we will get an error: +"/usr/include/libopeniscsiusr.h:33:10: fatal error: +libopeniscsiusr_node.h: No such file or directory" + +We find libopeniscsiusr_node.h was forgetton in our +libopeniscsiusr/Makefile, so fix it. Otherwise user can't use open-iscsi +header file for development + +--- + libopeniscsiusr/Makefile | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/libopeniscsiusr/Makefile b/libopeniscsiusr/Makefile +index bf7c96c..75f6fb3 100644 +--- a/libopeniscsiusr/Makefile ++++ b/libopeniscsiusr/Makefile +@@ -35,7 +35,8 @@ PKGFILE = libopeniscsiusr.pc + HEADERS = libopeniscsiusr/libopeniscsiusr.h \ + libopeniscsiusr/libopeniscsiusr_common.h \ + libopeniscsiusr/libopeniscsiusr_session.h \ +- libopeniscsiusr/libopeniscsiusr_iface.h ++ libopeniscsiusr/libopeniscsiusr_iface.h \ ++ libopeniscsiusr/libopeniscsiusr_node.h + TESTS = tests/test_context tests/test_session tests/test_iface tests/test_node + EXTRA_MAN_FILES = libopeniscsiusr.h.3 + +-- +2.23.0 + diff --git a/fix-devel-without-node-header-files.patch b/fix-devel-without-node-header-files.patch deleted file mode 100644 index 9630445..0000000 --- a/fix-devel-without-node-header-files.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Nur open-iscsi-f3c8e90fc0894c088950a15ee6618b427f9e2457-old/libopeniscsiusr/Makefile open-iscsi-f3c8e90fc0894c088950a15ee6618b427f9e2457/libopeniscsiusr/Makefile ---- open-iscsi-f3c8e90fc0894c088950a15ee6618b427f9e2457-old/libopeniscsiusr/Makefile 2020-06-15 15:09:30.624567419 +0800 -+++ open-iscsi-f3c8e90fc0894c088950a15ee6618b427f9e2457/libopeniscsiusr/Makefile 2020-06-15 15:11:09.378006613 +0800 -@@ -35,7 +35,8 @@ - HEADERS = libopeniscsiusr/libopeniscsiusr.h \ - libopeniscsiusr/libopeniscsiusr_common.h \ - libopeniscsiusr/libopeniscsiusr_session.h \ -- libopeniscsiusr/libopeniscsiusr_iface.h -+ libopeniscsiusr/libopeniscsiusr_iface.h \ -+ libopeniscsiusr/libopeniscsiusr_node.h - TESTS = tests/test_context tests/test_session tests/test_iface tests/test_node - EXTRA_MAN_FILES = libopeniscsiusr.h.3 - diff --git a/open-iscsi.spec b/open-iscsi.spec index 0ba207f..ffbc60f 100644 --- a/open-iscsi.spec +++ b/open-iscsi.spec @@ -54,7 +54,7 @@ Patch0039: 0039-iscsi-iname-verify-prefix-length-is-at-most-210.patch Patch0040: 0040-iscsi-iname-remove-unneeded-temp-buffer.patch Patch0041: 0041-Fix-issue-where-iscsi-iname-p-core-dumps.patch Patch0042: 0042-modify-iSCSI-shared-memory-permissions-for-logs.patch -Patch0043: fix-devel-without-node-header-files.patch +Patch0043: 0043-Fix-devel-without-node-header-files.patch BuildRequires: flex bison doxygen kmod-devel systemd-units gcc git isns-utils-devel BuildRequires: autoconf automake libtool libmount-devel openssl-devel pkg-config gdb