diff --git a/configure/CONFIG_MODULE b/configure/CONFIG_MODULE index b4ba0e35f406cf4e56c1c3bb2eea66fbdece7ade..1ba9a58acbb689bacc6fe3f75139af629d77cb3e 100644 --- a/configure/CONFIG_MODULE +++ b/configure/CONFIG_MODULE @@ -5,16 +5,9 @@ EPICS_MODULE_TAG:=tags/R2-2 # E3_MODULE_VERSION:=2.2.0 -# DEPENDENT MODULE VERSION -# For Example, -ASYN_DEP_VERSION:=4.37.0 -ADCORE_DEP_VERSION:=3.9.0 +ADCORE_DEP_VERSION:=3.12.1+2 ADGENICAM_DEP_VERSION:=1.4.0 -# -# In most case, we don't need to touch the following variables. -# - E3_MODULE_NAME:=adspinnaker E3_MODULE_SRC_PATH:=$(EPICS_MODULE_NAME) E3_MODULE_MAKEFILE:=$(EPICS_MODULE_NAME).Makefile diff --git a/configure/CONFIG_MODULE_DEV b/configure/CONFIG_MODULE_DEV deleted file mode 100644 index f373f910c7cd694e5f3a0d296dc378f63ca645ad..0000000000000000000000000000000000000000 --- a/configure/CONFIG_MODULE_DEV +++ /dev/null @@ -1,28 +0,0 @@ -# -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 diff --git a/configure/RELEASE b/configure/RELEASE index 4ae383b379625f8c57f5106330c0a64dafb96b26..592f1e7469789a64c27e4aa8ae6714646d954a32 100644 --- a/configure/RELEASE +++ b/configure/RELEASE @@ -1,8 +1,8 @@ # -EPICS_BASE:=/epics/base-7.0.4 +EPICS_BASE:=/epics/base-7.0.7 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 -include $(TOP)/../../RELEASE.local diff --git a/configure/RELEASE_DEV b/configure/RELEASE_DEV deleted file mode 100644 index 3dff9cd18ed0f53b0e874feee83295602e91694b..0000000000000000000000000000000000000000 --- a/configure/RELEASE_DEV +++ /dev/null @@ -1,10 +0,0 @@ -# -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 diff --git a/configure/module/RULES_DKMS_L b/configure/module/RULES_DKMS_L deleted file mode 100644 index 5198fb9478bc73c2970d8f3f930c533683efa97b..0000000000000000000000000000000000000000 --- a/configure/module/RULES_DKMS_L +++ /dev/null @@ -1,37 +0,0 @@ - -# 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 diff --git a/configure/module/RULES_MODULE b/configure/module/RULES_MODULE index 1f4c1ca577e46624f2fcfca8f0c0b0be89f97613..6167e87f74f993948696aa803e46cf17ef61c12e 100644 --- a/configure/module/RULES_MODULE +++ b/configure/module/RULES_MODULE @@ -2,15 +2,3 @@ .PHONY: 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)" diff --git a/patch/Site/HISTORY.md b/patch/Site/HISTORY.md deleted file mode 100644 index 3516ac75cd72b0486e1ea5dcef691ac975fb2df5..0000000000000000000000000000000000000000 --- a/patch/Site/HISTORY.md +++ /dev/null @@ -1,7 +0,0 @@ -# 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 diff --git a/patch/Site/README.md b/patch/Site/README.md deleted file mode 100644 index c2653b4af73eca98cb149bf3cc9665916b899054..0000000000000000000000000000000000000000 --- a/patch/Site/README.md +++ /dev/null @@ -1,21 +0,0 @@ -# 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 -```