Mercurial > illumos > illumos-gate
changeset 10699:5c59ad6abe2c
6726110 pmcs driver (driver for thebe) (fix build race)
| author | dh142964 <David.Hollister@Sun.COM> |
|---|---|
| date | Wed, 30 Sep 2009 18:56:19 -0600 |
| parents | 3ca3c489210e |
| children | 2f0266180e4f |
| files | usr/src/uts/common/io/scsi/adapters/pmcs/pmcs_attach.c usr/src/uts/intel/pmcs/Makefile usr/src/uts/sparc/pmcs/Makefile |
| diffstat | 3 files changed, 6 insertions(+), 40 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/uts/common/io/scsi/adapters/pmcs/pmcs_attach.c Wed Sep 30 17:43:46 2009 -0700 +++ b/usr/src/uts/common/io/scsi/adapters/pmcs/pmcs_attach.c Wed Sep 30 18:56:19 2009 -0600 @@ -23,10 +23,8 @@ * Use is subject to license terms. */ #include <sys/scsi/adapters/pmcs/pmcs.h> -#include <sys/scsi/adapters/pmcs/pmcs_bldrev.h> - -#define PMCS_DRIVER_VERSION "PMC-Sierra HBA Driver "\ - PMCS_BUILD_VERSION + +#define PMCS_DRIVER_VERSION "pmcs HBA device driver" static char *pmcs_driver_rev = PMCS_DRIVER_VERSION;
--- a/usr/src/uts/intel/pmcs/Makefile Wed Sep 30 17:43:46 2009 -0700 +++ b/usr/src/uts/intel/pmcs/Makefile Wed Sep 30 18:56:19 2009 -0600 @@ -42,8 +42,6 @@ WARLOCK_OUT = $(PMCS_OBJS:%.o=%.ll) WARLOCK_OK = $(MODULE).ok WLCMD_DIR = $(UTSBASE)/common/io/warlock -BLDREVHDR = ../../common/sys/scsi/adapters/pmcs/pmcs_bldrev.h -BLDREVHDR_T = ../../common/sys/scsi/adapters/pmcs/pmcs_bldrev.h.tmp # # Kernel Module Dependencies @@ -77,25 +75,11 @@ # .KEEP_STATE: -all: ADDBUILDREV $(ALL_DEPS) - -ADDBUILDREV: - @$(ECHO) '#define PMCS_BUILD_VERSION "'`date '+v20%y%m%d'`\"> \ - $(BLDREVHDR_T); \ - if [ -f $(BLDREVHDR) ]; then \ - RD=`$(DIFF) $(BLDREVHDR) $(BLDREVHDR_T) || $(TRUE)`; \ - if [ ! -z "$$RD" ]; then \ - $(MV) $(BLDREVHDR_T) $(BLDREVHDR); \ - fi; \ - else \ - $(MV) $(BLDREVHDR_T) $(BLDREVHDR); \ - fi; \ - $(RM) $(BLDREVHDR_T) +all: $(ALL_DEPS) def: $(DEF_DEPS) clean: $(CLEAN_DEPS) - -$(RM) $(BLDREVHDR) clobber: $(CLOBBER_DEPS) @@ -105,7 +89,7 @@ clean.lint: $(CLEAN_LINT_DEPS) -install: ADDBUILDREV $(INSTALL_DEPS) +install: $(INSTALL_DEPS) # # Include common targets.
--- a/usr/src/uts/sparc/pmcs/Makefile Wed Sep 30 17:43:46 2009 -0700 +++ b/usr/src/uts/sparc/pmcs/Makefile Wed Sep 30 18:56:19 2009 -0600 @@ -42,8 +42,6 @@ WARLOCK_OUT = $(PMCS_OBJS:%.o=%.ll) WARLOCK_OK = $(MODULE).ok WLCMD_DIR = $(UTSBASE)/common/io/warlock -BLDREVHDR = ../../common/sys/scsi/adapters/pmcs/pmcs_bldrev.h -BLDREVHDR_T = ../../common/sys/scsi/adapters/pmcs/pmcs_bldrev.h.tmp # # Kernel Module Dependencies @@ -77,25 +75,11 @@ # .KEEP_STATE: -all: ADDBUILDREV $(ALL_DEPS) - -ADDBUILDREV: - @$(ECHO) '#define PMCS_BUILD_VERSION "'`date '+v20%y%m%d'`\"> \ - $(BLDREVHDR_T); \ - if [ -f $(BLDREVHDR) ]; then \ - RD=`$(DIFF) $(BLDREVHDR) $(BLDREVHDR_T) || $(TRUE)`; \ - if [ ! -z "$$RD" ]; then \ - $(MV) $(BLDREVHDR_T) $(BLDREVHDR); \ - fi; \ - else \ - $(MV) $(BLDREVHDR_T) $(BLDREVHDR); \ - fi; \ - $(RM) $(BLDREVHDR_T) +all: $(ALL_DEPS) def: $(DEF_DEPS) clean: $(CLEAN_DEPS) - -$(RM) $(BLDREVHDR) clobber: $(CLOBBER_DEPS) @@ -105,7 +89,7 @@ clean.lint: $(CLEAN_LINT_DEPS) -install: ADDBUILDREV $(INSTALL_DEPS) +install: $(INSTALL_DEPS) # # Include common targets.