Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3860c97b authored by Boaz Harrosh's avatar Boaz Harrosh Committed by James Bottomley
Browse files

[SCSI] osd: Remove out-of-tree left overs 



* Delete Makefile. It is only used for out-of-tree compilation
  and was never needed. It slipped in by mistake.
* Remove from Kbuild all the out of tree stuff as promised.

Signed-off-by: default avatarBoaz Harrosh <bharrosh@panasas.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 03306793

drivers/scsi/osd/Kbuild

+0 −25
Original line number Diff line number Diff line
@@ -11,31 +11,6 @@ 
# it under the terms of the GNU General Public License version 2

#



ifneq ($(OSD_INC),)

# we are built out-of-tree Kconfigure everything as on



CONFIG_SCSI_OSD_INITIATOR=m

ccflags-y += -DCONFIG_SCSI_OSD_INITIATOR -DCONFIG_SCSI_OSD_INITIATOR_MODULE



CONFIG_SCSI_OSD_ULD=m

ccflags-y += -DCONFIG_SCSI_OSD_ULD -DCONFIG_SCSI_OSD_ULD_MODULE



# CONFIG_SCSI_OSD_DPRINT_SENSE =

#	0 - no print of errors

#	1 - print errors

#	2 - errors + warrnings

ccflags-y += -DCONFIG_SCSI_OSD_DPRINT_SENSE=1



# Uncomment to turn debug on

# ccflags-y += -DCONFIG_SCSI_OSD_DEBUG



# if we are built out-of-tree and the hosting kernel has OSD headers

# then "ccflags-y +=" will not pick the out-off-tree headers. Only by doing

# this it will work. This might break in future kernels

LINUXINCLUDE := -I$(OSD_INC) $(LINUXINCLUDE)



endif



# libosd.ko - osd-initiator library

libosd-y := osd_initiator.o

obj-$(CONFIG_SCSI_OSD_INITIATOR) += libosd.o

drivers/scsi/osd/Makefile

deleted100755 → 0
+0 −37
Original line number Diff line number Diff line 
#

# Makefile for the OSD modules (out of tree)

#

# Copyright (C) 2008 Panasas Inc.  All rights reserved.

#

# Authors:

#   Boaz Harrosh <bharrosh@panasas.com>

#   Benny Halevy <bhalevy@panasas.com>

#

# This program is free software; you can redistribute it and/or modify

# it under the terms of the GNU General Public License version 2

#

# This Makefile is used to call the kernel Makefile in case of an out-of-tree

# build.

# $KSRC should point to a Kernel source tree otherwise host's default is

# used. (eg. /lib/modules/`uname -r`/build)



# include path for out-of-tree Headers

OSD_INC ?= `pwd`/../../../include



# allow users to override these

# e.g. to compile for a kernel that you aren't currently running

KSRC ?= /lib/modules/$(shell uname -r)/build

KBUILD_OUTPUT ?=

ARCH ?=

V ?= 0



# this is the basic Kbuild out-of-tree invocation, with the M= option

KBUILD_BASE = +$(MAKE) -C $(KSRC) M=`pwd` KBUILD_OUTPUT=$(KBUILD_OUTPUT) ARCH=$(ARCH) V=$(V)



all: libosd



libosd: ;

	$(KBUILD_BASE) OSD_INC=$(OSD_INC) modules



clean:

	$(KBUILD_BASE) clean