Skip to content
Snippets Groups Projects
Commit 74c52d2b authored by Simon Rose's avatar Simon Rose
Browse files

Update to lates (theoretical) environment

parent b8d8a1d7
No related branches found
No related tags found
No related merge requests found
Pipeline #141266 passed
...@@ -5,16 +5,9 @@ EPICS_MODULE_TAG:=tags/R2-2 ...@@ -5,16 +5,9 @@ EPICS_MODULE_TAG:=tags/R2-2
# #
E3_MODULE_VERSION:=2.2.0 E3_MODULE_VERSION:=2.2.0
# DEPENDENT MODULE VERSION ADCORE_DEP_VERSION:=3.12.1+2
# For Example,
ASYN_DEP_VERSION:=4.37.0
ADCORE_DEP_VERSION:=3.9.0
ADGENICAM_DEP_VERSION:=1.4.0 ADGENICAM_DEP_VERSION:=1.4.0
#
# In most case, we don't need to touch the following variables.
#
E3_MODULE_NAME:=adspinnaker E3_MODULE_NAME:=adspinnaker
E3_MODULE_SRC_PATH:=$(EPICS_MODULE_NAME) E3_MODULE_SRC_PATH:=$(EPICS_MODULE_NAME)
E3_MODULE_MAKEFILE:=$(EPICS_MODULE_NAME).Makefile E3_MODULE_MAKEFILE:=$(EPICS_MODULE_NAME).Makefile
......
#
EPICS_MODULE_NAME:=ADSpinnaker
EPICS_MODULE_TAG:=master
#
E3_MODULE_VERSION:=develop
# DEPENDENT MODULE VERSION
# For Example,
ASYN_DEP_VERSION:=4.36.0
ADCORE_DEP_VERSION:=3.7.0
ADGENICAM_DEP_VERSION:=1.0.0
#
#
#
#E3_KMOD_SRC_PATH:=$(E3_MODULE_SRC_PATH)
#
# In most case, we don't need to touch the following variables.
#
E3_MODULE_NAME:=$(EPICS_MODULE_NAME)
E3_MODULE_SRC_PATH:=ADSpinnaker-dev
E3_MODULE_MAKEFILE:=$(EPICS_MODULE_NAME).Makefile
E3_MODULE_DEV_GITURL:="https://github.com/jeonghanlee/ADSpinnaker.git"
# The definitions shown below can also be placed in an untracked CONFIG_MODULE_DEV.local
-include $(TOP)/configure/CONFIG_MODULE_DEV.local
# #
EPICS_BASE:=/epics/base-7.0.4 EPICS_BASE:=/epics/base-7.0.7
E3_REQUIRE_NAME:=require E3_REQUIRE_NAME:=require
E3_REQUIRE_VERSION:=3.3.0 E3_REQUIRE_VERSION:=5.0.0
# The definitions shown below can also be placed in an untracked RELEASE.local # The definitions shown below can also be placed in an untracked RELEASE.local
-include $(TOP)/../../RELEASE.local -include $(TOP)/../../RELEASE.local
......
#
EPICS_BASE:=/epics/base-7.0.3
E3_REQUIRE_NAME:=require
E3_REQUIRE_VERSION:=3.1.0
# The definitions shown below can also be placed in an untracked RELEASE_DEV.local
-include $(TOP)/../../RELEASE_DEV.local
-include $(TOP)/../RELEASE_DEV.local
-include $(TOP)/configure/RELEASE_DEV.local
# KMOD_NAME := mrf
# .PHONY: dkms_add
# dkms_add: conf
# $(MSI) -M name="$(E3_MODULE_NAME)" -M version="$(E3_MODULE_VERSION)" -M kmod_name="$(KMOD_NAME)" $(TOP)/dkms/dkms_with_msi.conf.in > $(TOP)/dkms/dkms_with_msi.conf
# $(QUIET) cat $(TOP)/dkms/dkms_with_msi.conf $(TOP)/dkms/dkms_without_msi.conf > $(TOP)/dkms/dkms.conf
# $(QUIET) install -m 644 $(TOP)/dkms/dkms.conf $(E3_KMOD_SRC_PATH)/
# $(SUDO) install -d /usr/src/$(E3_MODULE_NAME)-$(E3_MODULE_VERSION)
# $(SUDO) cp -r $(TOP)/$(E3_KMOD_SRC_PATH)/* /usr/src/$(E3_MODULE_NAME)-$(E3_MODULE_VERSION)/
# $(SUDO) $(DKMS) add $(DKMS_ARGS)
# setup:
# $(QUIET) $(SUDO2) 'echo KERNEL==\"uio*\", ATTR{name}==\"mrf-pci\", MODE=\"0666\" | tee /etc/udev/rules.d/99-$(KMOD_NAME).rules'
# $(QUIET) $(SUDO) /bin/udevadm control --reload-rules
# $(QUIET) $(SUDO) /bin/udevadm trigger
# $(QUIET) $(SUDO2) 'echo $(KMOD_NAME) | tee /etc/modules-load.d/$(KMOD_NAME).conf'
# $(QUIET) $(SUDO) depmod --quick
# $(QUIET) $(SUDO) modprobe -rv $(KMOD_NAME)
# $(QUIET) $(SUDO) modprobe -v $(KMOD_NAME)
# $(QUIET) echo ""
# $(QUIET) echo ""
# $(QUIET) echo "It is OK to see \"E3/RULES_DKMS:37: recipe for target 'setup' failed\""
# $(QUIET) echo "---------------------------------------------------------------------"
# $(QUIET) -ls -l /dev/uio* 2>/dev/null
# $(QUIET) echo "---------------------------------------------------------------------"
# setup_clean:
# $(QUIET) $(SUDO) modprobe -rv $(KMOD_NAME)
# $(SUDO) rm -f /etc/modules-load.d/$(KMOD_NAME).conf
# $(SUDO) rm -f /etc/udev/rules.d/99-$(KMOD_NAME).rules
# .PHONY: setup setup_clean
...@@ -2,15 +2,3 @@ ...@@ -2,15 +2,3 @@
.PHONY: hdrs .PHONY: hdrs
hdrs: hdrs:
# $(SUDO) install -m 755 -d $(E3_MODULES_INSTALL_LOCATION_INC)/pv
# cd $(E3_MODULES_INSTALL_LOCATION_INC) && $(SUDO) mv *.h pv/
#.PHONY: epics
#epics:
# $(QUIET)echo "EPICS_BASE:=$(EPICS_BASE)" > $(TOP)/$(E3_MODULE_SRC_PATH)/configure/RELEASE
# $(QUIET)echo "ASYN:=$(M_ASYN)" > $(TOP)/$(E3_MODULE_SRC_PATH)/configure/RELEASE
# $(QUIET)echo "SSCAN:=$(M_SSCAN)" >> $(TOP)/$(E3_MODULE_SRC_PATH)/configure/RELEASE
# $(QUIET)echo "SNCSEQ:=$(M_SNCSEQ)" >> $(TOP)/$(E3_MODULE_SRC_PATH)/configure/RELEASE
# $(QUIET)echo "CHECK_RELEASE:=YES" > $(TOP)/$(E3_MODULE_SRC_PATH)/configure/CONFIG_SITE
# $(QUIET)echo "INSTALL_LOCATION:=$(M_DEVLIB2)" >> $(TOP)/$(E3_MODULE_SRC_PATH)/configure/CONFIG_SITE
# $(SUDOBASH) "$(MAKE) -C $(E3_MODULE_SRC_PATH)"
# E3_MODULE_VERSION-what_ever_filename.p0.patch
Generic Description.....
* created by Jeong Han Lee, han.lee@esss.se
* related URL or reference https://github.com/icshwi
* Tuesday, February 13 13:24:57 CET 2018
# Site Specific EPICS Module Patch Files
## Changes
The changes were tested in local environemnt, and commits to the forked repository and do pull request to the epics community module repository.
* Check the original HASH, and your own master
* feb8856 : The original HASH
* master : Changed
## How to create a p0 patch file between commits
* Show what the difference between commits
* Create p0 patch
```
$git diff feb8856 master --no-prefix > ../patch/Site/E3_MODULE_VERSION-what_ever_filename.p0.patch
```
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment