Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 517230 Details for
Bug 645910
sys-block/open-iscsi-2.0.876 version bump
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
open-iscsi-2.0.876-Makefiles.patch
open-iscsi-2.0.876-Makefiles.patch (text/plain), 4.51 KB, created by
Reinhard Biegel
on 2018-01-31 11:06:37 UTC
(
hide
)
Description:
open-iscsi-2.0.876-Makefiles.patch
Filename:
MIME Type:
Creator:
Reinhard Biegel
Created:
2018-01-31 11:06:37 UTC
Size:
4.51 KB
patch
obsolete
>diff -Naur open-iscsi-2.0.876.old/Makefile open-iscsi-2.0.876.new/Makefile >--- open-iscsi-2.0.876.old/Makefile 2018-01-22 19:50:07.000000000 +0100 >+++ open-iscsi-2.0.876.new/Makefile 2018-01-31 10:28:51.468904784 +0100 >@@ -16,10 +16,10 @@ > rulesdir = $(etcdir)/udev/rules.d > > MANPAGES = doc/iscsid.8 doc/iscsiadm.8 doc/iscsi_discovery.8 \ >- iscsiuio/docs/iscsiuio.8 doc/iscsi_fw_login.8 doc/iscsi-iname.8 \ >+ doc/iscsi-iname.8 \ > doc/iscsistart.8 >-PROGRAMS = usr/iscsid usr/iscsiadm utils/iscsi-iname iscsiuio/src/unix/iscsiuio >-SCRIPTS = utils/iscsi_discovery utils/iscsi_fw_login utils/iscsi_offload \ >+PROGRAMS = usr/iscsid usr/iscsiadm usr/iscsistart utils/iscsi-iname >+SCRIPTS = utils/iscsi_discovery utils/iscsi_offload \ > utils/iscsi-gen-initiatorname > INSTALL = install > ETCFILES = etc/iscsid.conf >@@ -104,11 +104,11 @@ > # ugh, auto-detection is evil > # Gentoo maintains their own init.d stuff > install_initd: >- if [ -f /etc/debian_version ]; then \ >+ if [ -f $(DESTDIR)$(etcdir)/debian_version ]; then \ > $(MAKE) install_initd_debian ; \ >- elif [ -f /etc/redhat-release ]; then \ >+ elif [ -f $(DESTDIR)$(etcdir)/redhat-release ]; then \ > $(MAKE) install_initd_redhat ; \ >- elif [ -f /etc/SuSE-release ]; then \ >+ elif [ -f $(DESTDIR)$(etcdir)/SuSE-release ]; then \ > $(MAKE) install_initd_suse ; \ > fi > >@@ -135,7 +135,7 @@ > $(INSTALL) -m 644 $^ $(DESTDIR)$(etcdir)/iscsi/ifaces > > install_etc: $(ETCFILES) >- if [ ! -f $(DESTDIR)/etc/iscsi/iscsid.conf ]; then \ >+ if [ ! -f $(DESTDIR)$(etcdir)/iscsi/iscsid.conf ]; then \ > $(INSTALL) -d $(DESTDIR)$(etcdir)/iscsi ; \ > $(INSTALL) -m 644 $^ $(DESTDIR)$(etcdir)/iscsi ; \ > fi >@@ -145,11 +145,11 @@ > $(INSTALL) -m 644 $^ $(DESTDIR)$(mandir)/man8 > > install_iname: >- if [ ! -f $(DESTDIR)/etc/iscsi/initiatorname.iscsi ]; then \ >- echo "InitiatorName=`$(DESTDIR)/sbin/iscsi-iname`" > $(DESTDIR)/etc/iscsi/initiatorname.iscsi ; \ >+ if [ ! -f $(DESTDIR)$(etcdir)/iscsi/initiatorname.iscsi ]; then \ >+ echo "InitiatorName=`$(DESTDIR)$(sbindir)/iscsi-iname`" > $(DESTDIR)$(etcdir)/iscsi/initiatorname.iscsi ; \ > echo "***************************************************" ; \ >- echo "Setting InitiatorName to `cat $(DESTDIR)/etc/iscsi/initiatorname.iscsi`" ; \ >- echo "To override edit $(DESTDIR)/etc/iscsi/initiatorname.iscsi" ; \ >+ echo "Setting InitiatorName to `cat $(DESTDIR)$(etcdir)/etc/iscsi/initiatorname.iscsi`" ; \ >+ echo "To override edit $(etcdir)/iscsi/initiatorname.iscsi" ; \ > echo "***************************************************" ; \ > fi > >diff -Naur open-iscsi-2.0.876.old/usr/Makefile open-iscsi-2.0.876.new/usr/Makefile >--- open-iscsi-2.0.876.old/usr/Makefile 2018-01-22 19:50:07.000000000 +0100 >+++ open-iscsi-2.0.876.new/usr/Makefile 2018-01-31 10:30:09.818291670 +0100 >@@ -69,9 +69,9 @@ > iscsistart.o statics.o > $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lrt $(ISCSI_LIB) > clean: >- rm -f *.o $(PROGRAMS) .depend $(LIBSYS) >+ $(RM) *.o $(PROGRAMS) .depend $(LIBSYS) > > depend: >- gcc $(CFLAGS) -M `ls *.c` > .depend >+ $(CC) $(CFLAGS) -M `ls *.c` > .depend > > -include .depend >diff -Naur open-iscsi-2.0.876.old/utils/Makefile open-iscsi-2.0.876.new/utils/Makefile >--- open-iscsi-2.0.876.old/utils/Makefile 2018-01-22 19:50:07.000000000 +0100 >+++ open-iscsi-2.0.876.new/utils/Makefile 2018-01-31 10:31:14.987782245 +0100 >@@ -10,9 +10,9 @@ > $(CC) $(CFLAGS) $(LDFLAGS) $^ $(DBM_LIB) -o $@ > > clean: >- rm -f *.o $(PROGRAMS) .depend >+ $(RM) *.o $(PROGRAMS) .depend > > depend: >- gcc $(CFLAGS) -M `ls *.c` > .depend >+ $(CC) $(CFLAGS) -M `ls *.c` > .depend > > -include .depend >diff -Naur open-iscsi-2.0.876.old/utils/fwparam_ibft/Makefile open-iscsi-2.0.876.new/utils/fwparam_ibft/Makefile >--- open-iscsi-2.0.876.old/utils/fwparam_ibft/Makefile 2018-01-22 19:50:07.000000000 +0100 >+++ open-iscsi-2.0.876.new/utils/fwparam_ibft/Makefile 2018-01-31 10:30:49.397982219 +0100 >@@ -41,11 +41,11 @@ > all: $(OBJS) > > clean: >- rm -f *.o $(CLEANFILES) .depend >+ $(RM) *.o $(CLEANFILES) .depend > > $(OBJS): prom_parse.tab.h prom_parse.h fwparam_ibft.h > > depend: >- gcc $(CFLAGS) -M `ls *.c` > .depend >+ $(CC) $(CFLAGS) -M `ls *.c` > .depend > > -include .depend >diff -Naur open-iscsi-2.0.876.old/utils/sysdeps/Makefile open-iscsi-2.0.876.new/utils/sysdeps/Makefile >--- open-iscsi-2.0.876.old/utils/sysdeps/Makefile 2018-01-22 19:50:07.000000000 +0100 >+++ open-iscsi-2.0.876.new/utils/sysdeps/Makefile 2018-01-31 10:31:32.457645767 +0100 >@@ -8,9 +8,9 @@ > all: $(SYSDEPS_OBJS) > > clean: >- rm -f *.o .depend >+ $(RM) *.o .depend > > depend: >- gcc $(CFLAGS) -M `ls *.c` > .depend >+ $(CC) $(CFLAGS) -M `ls *.c` > .depend > > -include .depend
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 645910
: 517230 |
517232