Menu
▾
▴
iscsitarget-commits
|
From: <ag...@us...> - 2010-04-25 11:12:37
|
Revision: 337
http://iscsitarget.svn.sourceforge.net/iscsitarget/?rev=337&view=rev
Author: agr1
Date: 2010-04-25 11:12:31 +0000 (Sun, 25 Apr 2010)
Log Message:
-----------
Merge trunk, rev 332 + 333:
In 2.6.33 utsrelease.h was moved from include/linux to include/generated
-- adapt Makefile
Signed-off-by: Arne Redlich <arn...@go...>
Revision Links:
--------------
http://iscsitarget.svn.sourceforge.net/iscsitarget/?rev=332&view=rev
Modified Paths:
--------------
branches/1.4.20/Makefile
Modified: branches/1.4.20/Makefile
===================================================================
--- branches/1.4.20/Makefile 2010-04-25 11:09:59 UTC (rev 336)
+++ branches/1.4.20/Makefile 2010-04-25 11:12:31 UTC (rev 337)
@@ -15,10 +15,15 @@
KSRC ?= /lib/modules/$(shell uname -r)/build
endif
-ifneq ($(wildcard $(KSRC)/include/linux/utsrelease.h),)
- VERSION_FILE := $(KSRC)/include/linux/utsrelease.h
+
+ifneq ($(wildcard $(KSRC)/include/generated/utsrelease.h),)
+ VERSION_FILE := $(KSRC)/include/generated/utsrelease.h
else
- VERSION_FILE := $(KSRC)/include/linux/version.h
+ ifneq ($(wildcard $(KSRC)/include/linux/utsrelease.h),)
+ VERSION_FILE := $(KSRC)/include/linux/utsrelease.h
+ else
+ VERSION_FILE := $(KSRC)/include/linux/version.h
+ endif
endif
KVER := $(shell $(CC) $(CFLAGS) -E -dM $(VERSION_FILE) | \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rsw...@us...> - 2010-06-29 21:58:41
|
Revision: 344
http://iscsitarget.svn.sourceforge.net/iscsitarget/?rev=344&view=rev
Author: rswwalker
Date: 2010-06-29 21:58:35 +0000 (Tue, 29 Jun 2010)
Log Message:
-----------
To be more standard this patch changes all instances of DISTDIR
to DESTDIR in Makefile.
Signed-off-by: Ross Walker
Modified Paths:
--------------
branches/1.4.20/Makefile
Modified: branches/1.4.20/Makefile
===================================================================
--- branches/1.4.20/Makefile 2010-06-29 21:57:55 UTC (rev 343)
+++ branches/1.4.20/Makefile 2010-06-29 21:58:35 UTC (rev 344)
@@ -209,8 +209,8 @@
depmod:
@echo "Running depmod"
- @if [ x$(DISTDIR) != x -o x$(INSTALL_MOD_PATH) != x ]; then \
- depmod -aq -b $(DISTDIR)$(INSTALL_MOD_PATH) $(KVER); \
+ @if [ x$(DESTDIR) != x -o x$(INSTALL_MOD_PATH) != x ]; then \
+ depmod -aq -b $(DESTDIR)$(INSTALL_MOD_PATH) $(KVER); \
else \
depmod -aq $(KVER); \
fi
@@ -220,60 +220,60 @@
install: install-files depmod
install-kernel: kernel/iscsi_trgt.ko
- @if [ -d $(DISTDIR)$(INSTALL_MOD_PATH)/lib/modules/$(KVER) ]; then \
+ @if [ -d $(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/$(KVER) ]; then \
if [ -f /etc/debian_version ]; then \
- find $(DISTDIR)$(INSTALL_MOD_PATH)/lib/modules/$(KVER) \
+ find $(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/$(KVER) \
-name iscsi_trgt.ko -type f \
-exec /bin/sh -c "dpkg-divert --rename {}" \;; \
else \
- find $(DISTDIR)$(INSTALL_MOD_PATH)/lib/modules/$(KVER) \
+ find $(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/$(KVER) \
-name iscsi_trgt.ko -type f \
-execdir mv \{\} \{\}.orig \;; \
fi \
fi
@install -vD kernel/iscsi_trgt.ko \
- $(DISTDIR)$(INSTALL_MOD_PATH)$(KMOD)/iscsi/iscsi_trgt.ko
+ $(DESTDIR)$(INSTALL_MOD_PATH)$(KMOD)/iscsi/iscsi_trgt.ko
install-usr: usr/ietd usr/ietadm
- @install -vD usr/ietd $(DISTDIR)/usr/sbin/ietd
- @install -vD usr/ietadm $(DISTDIR)/usr/sbin/ietadm
+ @install -vD usr/ietd $(DESTDIR)/usr/sbin/ietd
+ @install -vD usr/ietadm $(DESTDIR)/usr/sbin/ietadm
install-etc: install-initd
- @if [ ! -e $(DISTDIR)/etc/ietd.conf ]; then \
- if [ ! -e $(DISTDIR)/etc/iet/ietd.conf ]; then \
+ @if [ ! -e $(DESTDIR)/etc/ietd.conf ]; then \
+ if [ ! -e $(DESTDIR)/etc/iet/ietd.conf ]; then \
install -vD -m 640 etc/ietd.conf \
- $(DISTDIR)/etc/iet/ietd.conf; \
+ $(DESTDIR)/etc/iet/ietd.conf; \
fi \
fi
- @if [ ! -e $(DISTDIR)/etc/initiators.allow ]; then \
- if [ ! -e $(DISTDIR)/etc/iet/initiators.allow ]; then \
+ @if [ ! -e $(DESTDIR)/etc/initiators.allow ]; then \
+ if [ ! -e $(DESTDIR)/etc/iet/initiators.allow ]; then \
install -vD -m 644 etc/initiators.allow \
- $(DISTDIR)/etc/iet/initiators.allow; \
+ $(DESTDIR)/etc/iet/initiators.allow; \
fi \
fi
- @if [ ! -e $(DISTDIR)/etc/targets.allow ]; then \
- if [ ! -e $(DISTDIR)/etc/iet/targets.allow ]; then \
+ @if [ ! -e $(DESTDIR)/etc/targets.allow ]; then \
+ if [ ! -e $(DESTDIR)/etc/iet/targets.allow ]; then \
install -vD -m 644 etc/targets.allow \
- $(DISTDIR)/etc/iet/targets.allow; \
+ $(DESTDIR)/etc/iet/targets.allow; \
fi \
fi
install-initd:
@if [ -f /etc/debian_version ]; then \
install -vD -m 755 etc/initd/initd.debian \
- $(DISTDIR)/etc/init.d/iscsi-target; \
+ $(DESTDIR)/etc/init.d/iscsi-target; \
elif [ -f /etc/redhat-release ]; then \
install -vD -m 755 etc/initd/initd.redhat \
- $(DISTDIR)/etc/init.d/iscsi-target; \
+ $(DESTDIR)/etc/rc.d/init.d/iscsi-target; \
elif [ -f /etc/gentoo-release ]; then \
install -vD -m 755 etc/initd/initd.gentoo \
- $(DISTDIR)/etc/init.d/iscsi-target; \
+ $(DESTDIR)/etc/init.d/iscsi-target; \
elif [ -f /etc/slackware-version ]; then \
install -vD -m 755 etc/initd/initd \
- $(DISTDIR)/etc/rc.d/iscsi-target; \
+ $(DESTDIR)/etc/rc.d/iscsi-target; \
else \
install -vD -m 755 etc/initd/initd \
- $(DISTDIR)/etc/init.d/iscsi-target; \
+ $(DESTDIR)/etc/init.d/iscsi-target; \
fi
install-doc: install-man
@@ -283,7 +283,7 @@
done ; $$ok
@set -e; for f in $(DOCS) ; do \
install -v -D -m 644 $$f \
- $(DISTDIR)$(DOCDIR)/$$f ; \
+ $(DESTDIR)$(DOCDIR)/$$f ; \
done
install-man:
@@ -294,50 +294,50 @@
@set -e; for f in $(MANPAGES) ; do \
s=$${f##*.}; \
install -v -D -m 644 doc/manpages/$$f \
- $(DISTDIR)$(MANDIR)/man$$s/$$f ; \
+ $(DESTDIR)$(MANDIR)/man$$s/$$f ; \
done
uninstall: uninstall-kernel depmod uninstall-usr uninstall-etc uninstall-doc
uninstall-kernel:
- rm -f $(DISTDIR)$(INSTALL_MOD_PATH)$(KMOD)/iscsi/iscsi_trgt.ko
+ rm -f $(DESTDIR)$(INSTALL_MOD_PATH)$(KMOD)/iscsi/iscsi_trgt.ko
@if [ -f /etc/debian_version ]; then \
- find $(DISTDIR)$(INSTALL_MOD_PATH)/lib/modules/$(KVER) \
+ find $(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/$(KVER) \
-name iscsi_trgt.ko.distrib -type f \
-exec /bin/sh -c "dpkg-divert --remove --rename \
\`dirname {}\`/iscsi_trgt.ko" \;; \
else \
- find $(DISTDIR)$(INSTALL_MOD_PATH)/lib/modules/$(KVER) \
+ find $(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/$(KVER) \
-name iscsi_trgt.ko.orig -type f \
-execdir mv \{\} iscsi_trgt.ko \;; \
fi
uninstall-usr:
- @rm -f $(DISTDIR)/usr/sbin/ietd
- @rm -f $(DISTDIR)/usr/sbin/ietadm
+ @rm -f $(DESTDIR)/usr/sbin/ietd
+ @rm -f $(DESTDIR)/usr/sbin/ietadm
uninstall-etc: uninstall-initd
uninstall-initd:
if [ -f /etc/debian_version ]; then \
- rm -f $(DISTDIR)/etc/init.d/iscsi-target; \
+ rm -f $(DESTDIR)/etc/init.d/iscsi-target; \
elif [ -f /etc/redhat-release ]; then \
- rm -f $(DISTDIR)/etc/init.d/iscsi-target; \
+ rm -f $(DESTDIR)/etc/rc.d/init.d/iscsi-target; \
elif [ -f /etc/gentoo-release ]; then \
- rm -f $(DISTDIR)/etc/init.d/iscsi-target; \
+ rm -f $(DESTDIR)/etc/init.d/iscsi-target; \
elif [ -f /etc/slackware-version ]; then \
- rm -f $(DISTDIR)/etc/rc.d/iscsi-target; \
+ rm -f $(DESTDIR)/etc/rc.d/iscsi-target; \
else \
- rm -f $(DISTDIR)/etc/init.d/iscsi-target; \
+ rm -f $(DESTDIR)/etc/init.d/iscsi-target; \
fi
uninstall-doc: uninstall-man
- rm -rf $(DISTDIR)$(DOCDIR)
+ rm -rf $(DESTDIR)$(DOCDIR)
uninstall-man:
set -e; for f in $(MANPAGES) ; do \
s=$${f##*.}; \
- rm -f $(DISTDIR)$(MANDIR)/man$$s/$$f ; \
+ rm -f $(DESTDIR)$(MANDIR)/man$$s/$$f ; \
done
clean:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ag...@us...> - 2011-03-12 12:09:32
|
Revision: 404
http://iscsitarget.svn.sourceforge.net/iscsitarget/?rev=404&view=rev
Author: agr1
Date: 2011-03-12 12:09:26 +0000 (Sat, 12 Mar 2011)
Log Message:
-----------
add variable for depmod
My embedded target buildsystem uses a special depmod. Add a variable
so I can specify the same depmod as is used with the rest of the
modules.
Signed-off-by: Martin Hicks <mo...@bo...>
Modified Paths:
--------------
branches/1.4.20/Makefile
Modified: branches/1.4.20/Makefile
===================================================================
--- branches/1.4.20/Makefile 2011-03-12 12:09:09 UTC (rev 403)
+++ branches/1.4.20/Makefile 2011-03-12 12:09:26 UTC (rev 404)
@@ -9,6 +9,8 @@
#export KSRC := /usr/src/linux
+DEPMOD = depmod
+
SUBDIRS := $(shell pwd)
ifeq ($(KSRC),)
@@ -215,9 +217,9 @@
depmod:
@echo "Running depmod"
@if [ x$(DESTDIR) != x -o x$(INSTALL_MOD_PATH) != x ]; then \
- depmod -aq -b $(DESTDIR)$(INSTALL_MOD_PATH) $(KVER); \
+ $(DEPMOD) -aq -b $(DESTDIR)$(INSTALL_MOD_PATH) $(KVER); \
else \
- depmod -aq $(KVER); \
+ $(DEPMOD) -aq $(KVER); \
fi
install-files: install-usr install-etc install-doc install-kernel
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ag...@us...> - 2011-03-12 12:09:47
|
Revision: 405
http://iscsitarget.svn.sourceforge.net/iscsitarget/?rev=405&view=rev
Author: agr1
Date: 2011-03-12 12:09:41 +0000 (Sat, 12 Mar 2011)
Log Message:
-----------
Don't install kernel module executable
This just changes the mode of the installed kernel module
to 644.
Signed-off-by: Martin Hicks <mo...@bo...>
Modified Paths:
--------------
branches/1.4.20/Makefile
Modified: branches/1.4.20/Makefile
===================================================================
--- branches/1.4.20/Makefile 2011-03-12 12:09:26 UTC (rev 404)
+++ branches/1.4.20/Makefile 2011-03-12 12:09:41 UTC (rev 405)
@@ -238,7 +238,7 @@
-execdir mv \{\} \{\}.orig \;; \
fi \
fi
- @install -vD kernel/iscsi_trgt.ko \
+ @install -vD -m 644 kernel/iscsi_trgt.ko \
$(DESTDIR)$(INSTALL_MOD_PATH)$(KMOD)/iscsi/iscsi_trgt.ko
install-usr: usr/ietd usr/ietadm
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ag...@us...> - 2011-09-03 11:51:14
|
Revision: 454
http://iscsitarget.svn.sourceforge.net/iscsitarget/?rev=454&view=rev
Author: agr1
Date: 2011-09-03 11:51:08 +0000 (Sat, 03 Sep 2011)
Log Message:
-----------
Makefile changes to support 3.x kernels
This patch was provided by Leho Kraav
Signed-off-by: Arne Redlich <arn...@go...>
Modified Paths:
--------------
branches/1.4.20/Makefile
Modified: branches/1.4.20/Makefile
===================================================================
--- branches/1.4.20/Makefile 2011-05-26 18:23:01 UTC (rev 453)
+++ branches/1.4.20/Makefile 2011-09-03 11:51:08 UTC (rev 454)
@@ -40,15 +40,23 @@
KREV := $(shell echo $(KVER) | \
sed -e 's/^[0-9][0-9]*\.[0-9][0-9]*\.\([0-9][0-9]*\).*/\1/')
-kver_eq = $(shell [ $(KMAJ)$(KMIN)$(KREV) -eq $(1)$(2)$(3) ] && \
+kver_eq = $(shell [ $(KMAJ) -eq $(1) -a $(KMIN) -eq $(2) -a $(KREV) -eq $(3) ] && \
echo 1 || echo 0)
-kver_lt = $(shell [ $(KMAJ)$(KMIN)$(KREV) -lt $(1)$(2)$(3) ] && \
+kver_lt = $(shell [ $(KMAJ) -lt $(1) -o \
+ $(KMAJ) -eq $(1) -a $(KMIN) -lt $(2) -o \
+ $(KMAJ) -eq $(1) -a $(KMIN) -eq $(2) -a $(KREV) -lt $(3) ] && \
echo 1 || echo 0)
-kver_le = $(shell [ $(KMAJ)$(KMIN)$(KREV) -le $(1)$(2)$(3) ] && \
+kver_le = $(shell [ $(KMAJ) -lt $(1) -o \
+ $(KMAJ) -eq $(1) -a $(KMIN) -lt $(2) -o \
+ $(KMAJ) -eq $(1) -a $(KMIN) -eq $(2) -a $(KREV) -le $(3) ] && \
echo 1 || echo 0)
-kver_gt = $(shell [ $(KMAJ)$(KMIN)$(KREV) -gt $(1)$(2)$(3) ] && \
+kver_gt = $(shell [ ( $(KMAJ) -gt $(1) ) -o \
+ $(KMAJ) -eq $(1) -a $(KMIN) -gt $(2) -o \
+ $(KMAJ) -eq $(1) -a $(KMIN) -eq $(2) -a $(KREV) -gt $(3) ] && \
echo 1 || echo 0)
-kver_ge = $(shell [ $(KMAJ)$(KMIN)$(KREV) -ge $(1)$(2)$(3) ] && \
+kver_ge = $(shell [ ( $(KMAJ) -gt $(1) ) -o \
+ $(KMAJ) -eq $(1) -a $(KMIN) -gt $(2) -o \
+ $(KMAJ) -eq $(1) -a $(KMIN) -eq $(2) -a $(KREV) -ge $(3) ] && \
echo 1 || echo 0)
kver_lk = $(shell [ `echo $(KVER) | egrep $(1)` ] && echo 1 || echo 0)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X