From 393d5e5204f96482bf64d144b138c254773be665 Mon Sep 17 00:00:00 2001 From: Han Han Date: Sat, 14 Sep 2024 15:07:51 +0800 Subject: [PATCH 1/2] Add utils.h to dist_noinst_HEADERS Fix the compiling error when runing packaging/RPM/makerpms.sh: libtool: compile: gcc -DHAVE_CONFIG_H -I. -I.. -I./../include -I./include -Wall -W -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-align -Wcast-qual -Wvla -Wno-unknown-warning-option -Wno-stringop-truncation -Wno-unused-parameter -Werror -Wwrite-strings -O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -march=x86-64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -c sync.c -o libiscsipriv_la-sync.o >/dev/null 2>&1 scsi-lowlevel.c:59:10: fatal error: utils.h: No such file or directory 59 | #include "utils.h" | ^~~~~~~~~ Signed-off-by: Han Han --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index bd2ca58..abefb53 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,5 +29,5 @@ pkgconfig_DATA = libiscsi.pc iscsi_includedir = $(includedir)/iscsi dist_iscsi_include_HEADERS = include/iscsi.h include/scsi-lowlevel.h dist_noinst_HEADERS = include/iscsi-private.h include/md5.h include/slist.h \ - include/iser-private.h + include/iser-private.h include/utils.h From 7d4becaeb4167482a2ea8fc42af5a824795175f2 Mon Sep 17 00:00:00 2001 From: Han Han Date: Sat, 14 Sep 2024 15:27:54 +0800 Subject: [PATCH 2/2] install binaries and manpage to rpm Add these files to libiscsi-utils package: - /usr/bin/iscsi-discard - /usr/bin/iscsi-md5sum - /usr/bin/iscsi-pr - /usr/share/man/man1/iscsi-md5sum.1.gz Signed-off-by: Han Han --- packaging/RPM/libiscsi.spec.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packaging/RPM/libiscsi.spec.in b/packaging/RPM/libiscsi.spec.in index 4043761..19602b0 100644 --- a/packaging/RPM/libiscsi.spec.in +++ b/packaging/RPM/libiscsi.spec.in @@ -75,9 +75,13 @@ to iSCSI servers without having to set up the Linux iSCSI initiator. %{_bindir}/iscsi-perf %{_bindir}/iscsi-readcapacity16 %{_bindir}/iscsi-swp +%{_bindir}/iscsi-discard +%{_bindir}/iscsi-md5sum +%{_bindir}/iscsi-pr %{_mandir}/man1/iscsi-inq.1.gz %{_mandir}/man1/iscsi-ls.1.gz %{_mandir}/man1/iscsi-swp.1.gz +%{_mandir}/man1/iscsi-md5sum.1.gz %package devel Summary: iSCSI client development libraries