Skip to content
This repository was archived by the owner on Jan 12, 2021. It is now read-only.

Commit 385e700

Browse files
jeonghanleejeonghanlee
committed
restructed configurations
1 parent b7de942 commit 385e700

14 files changed

+140
-155
lines changed

‎asyn

Submodule asyn updated 73 files

‎asyn.Makefile

+5-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ LEGACY_RSET = YES
2626

2727
where_am_I := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
2828
include $(E3_REQUIRE_TOOLS)/driver.makefile
29-
include $(where_am_I)/../configure/DECOUPLE_FLAGS
29+
include $(E3_REQUIRE_CONFIG)/DECOUPLE_FLAGS
3030

3131

3232
USR_CFLAGS += -Wno-unused-variable
@@ -321,3 +321,7 @@ $(DBDINC_DEPS): $(DBDINC_HDRS)
321321
# db rule is the default in RULES_E3, so add the empty one
322322

323323
db:
324+
#
325+
.PHONY: vlibs
326+
vlibs:
327+
#

‎configure/CONFIG

+4-15
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,20 @@
1+
#
12
VARS_EXCLUDES := $(.VARIABLES)
23

3-
44
ifneq (,$(findstring dev,$(MAKECMDGOALS)))
55
include $(TOP)/configure/RELEASE_DEV
66
else
77
include $(TOP)/configure/RELEASE
88
endif
99

10-
# CONFIG=$(EPICS_BASE)/configure
11-
# include $(CONFIG)/CONFIG
12-
1310
ifneq (,$(findstring dev,$(MAKECMDGOALS)))
1411
include $(TOP)/configure/CONFIG_MODULE_DEV
1512
else
1613
include $(TOP)/configure/CONFIG_MODULE
1714
endif
1815

16+
E3_REQUIRE_LOCATION := $(EPICS_BASE)/$(E3_REQUIRE_NAME)/$(E3_REQUIRE_VERSION)
17+
REQUIRE_CONFIG := $(E3_REQUIRE_LOCATION)/configure
1918

20-
-include $(TOP)/configure/CONFIG_OPTIONS
21-
22-
23-
## It is not necessary to modify the following files in most case.
24-
## Order is matter
19+
include $(REQUIRE_CONFIG)/CONFIG
2520

26-
include $(TOP)/configure/E3/CONFIG_REQUIRE
27-
include $(TOP)/configure/E3/CONFIG_E3_PATH
28-
include $(TOP)/configure/E3/CONFIG_E3_MAKEFILE
29-
include $(TOP)/configure/E3/CONFIG_EPICS
30-
include $(TOP)/configure/E3/CONFIG_SUDO
31-
include $(TOP)/configure/E3/CONFIG_EXPORT

‎configure/CONFIG_MODULE

+7-16
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,16 @@
1-
#
21
EPICS_MODULE_NAME:=asyn
2+
#
33
EPICS_MODULE_TAG:=tags/R4-33
44
#
55
E3_MODULE_VERSION:=4.33.0
6-
7-
8-
# ONLY IF this module has the sequencer dependency. However,
9-
# in most case, we don't need to enable the following line,
10-
# the default - latest version will be used
11-
#E3_SEQUENCER_NAME:=sequencer
12-
#E3_SEQUENCER_VERSION:=2.1.21
13-
#
14-
#
15-
# In most case, we don't need to touch the following variables.
166
#
177
E3_MODULE_NAME:=$(EPICS_MODULE_NAME)
8+
#
189
E3_MODULE_SRC_PATH:=$(EPICS_MODULE_NAME)
10+
#
1911
E3_MODULE_MAKEFILE:=$(EPICS_MODULE_NAME).Makefile
20-
21-
22-
23-
24-
# The definitions shown below can also be placed in an untracked CONFIG_MODULE.local
12+
#
13+
-include $(TOP)/configure/CONFIG_OPTIONS
14+
# The definitions shown below can also be placed in an untracked CONFIG_MODULE*.local
2515
-include $(TOP)/configure/CONFIG_MODULE.local
16+
#

‎configure/CONFIG_MODULE_DEV

+8-12
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,18 @@
1-
#
21
EPICS_MODULE_NAME:=asyn
2+
#
33
EPICS_MODULE_TAG:=master
44
#
55
E3_MODULE_VERSION:=master
6-
7-
8-
#
9-
# In most case, we don't need to touch the following variables.
106
#
117
E3_MODULE_NAME:=$(EPICS_MODULE_NAME)
8+
#
129
E3_MODULE_SRC_PATH:=$(EPICS_MODULE_NAME)-dev
10+
#
1311
E3_MODULE_MAKEFILE:=$(EPICS_MODULE_NAME).Makefile
14-
15-
#export DEV_GIT_URL:="https://where your git repo"
12+
#
1613
E3_MODULE_DEV_GITURL:="https://github.com/epics-modules/asyn"
17-
18-
19-
20-
21-
# The definitions shown below can also be placed in an untracked CONFIG_MODULE_DEV.local
14+
#
15+
-include $(TOP)/configure/CONFIG_OPTIONS
16+
# The definitions shown below can also be placed in an untracked CONFIG_MODULE*.local
2217
-include $(TOP)/configure/CONFIG_MODULE_DEV.local
18+
#

‎configure/DECOUPLE_FLAGS

-86
This file was deleted.

‎configure/RELEASE

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1+
#
12
EPICS_BASE=/epics/base-3.15.5
23

3-
44
E3_REQUIRE_NAME:=require
5-
E3_REQUIRE_VERSION:=3.0.2
6-
5+
E3_REQUIRE_VERSION:=3.0.4
76

87
# The definitions shown below can also be placed in an untracked RELEASE.local
98
-include $(TOP)/../../RELEASE.local
109
-include $(TOP)/../RELEASE.local
1110
-include $(TOP)/configure/RELEASE.local
11+

‎configure/RELEASE_DEV

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
EPICS_BASE=/testing/epics/base-3.15.5
2-
1+
#
2+
EPICS_BASE=/epics/base-3.15.5
33

44
E3_REQUIRE_NAME:=require
5-
E3_REQUIRE_VERSION:=0.0.0
6-
5+
E3_REQUIRE_VERSION:=3.0.4
76

8-
9-
# The definitions shown below can also be placed in an untracked RELEASE.local
7+
# The definitions shown below can also be placed in an untracked RELEASE_DEV.local
108
-include $(TOP)/../../RELEASE_DEV.local
119
-include $(TOP)/../RELEASE_DEV.local
1210
-include $(TOP)/configure/RELEASE_DEV.local
11+

‎configure/RULES

+3-15
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,6 @@
1-
#CONFIG
2-
# include $(EPICS_BASE)/configure/RULES
31

4-
include $(TOP)/configure/E3/DEFINES_FT
5-
-include $(TOP)/configure/E3/RULES_PATCH
6-
include $(TOP)/configure/E3/RULES_E3
7-
include $(TOP)/configure/E3/RULES_E3_SITELIBS
8-
include $(TOP)/configure/E3/RULES_EPICS
9-
10-
include $(TOP)/configure/E3/RULES_DB
11-
include $(TOP)/configure/E3/RULES_VARS
12-
13-
14-
ifneq (,$(findstring dev,$(MAKECMDGOALS)))
15-
include $(TOP)/configure/E3/RULES_DEV
16-
endif
2+
include $(REQUIRE_CONFIG)/RULES_SITEMODS
173

4+
include $(TOP)/configure/module/RULES_MODULE
5+
-include $(TOP)/configure/module/RULES_DKMS_L
186

‎configure/module/RULES_DKMS_L

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
2+
# KMOD_NAME := mrf
3+
4+
# .PHONY: dkms_add
5+
6+
# dkms_add: conf
7+
# $(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
8+
# $(QUIET) cat $(TOP)/dkms/dkms_with_msi.conf $(TOP)/dkms/dkms_without_msi.conf > $(TOP)/dkms/dkms.conf
9+
# $(QUIET) install -m 644 $(TOP)/dkms/dkms.conf $(E3_KMOD_SRC_PATH)/
10+
# $(SUDO) install -d /usr/src/$(E3_MODULE_NAME)-$(E3_MODULE_VERSION)
11+
# $(SUDO) cp -r $(TOP)/$(E3_KMOD_SRC_PATH)/* /usr/src/$(E3_MODULE_NAME)-$(E3_MODULE_VERSION)/
12+
# $(SUDO) $(DKMS) add $(DKMS_ARGS)
13+
14+
15+
# setup:
16+
# $(QUIET) $(SUDO2) 'echo KERNEL==\"uio*\", ATTR{name}==\"mrf-pci\", MODE=\"0666\" | tee /etc/udev/rules.d/99-$(KMOD_NAME).rules'
17+
# $(QUIET) $(SUDO) /bin/udevadm control --reload-rules
18+
# $(QUIET) $(SUDO) /bin/udevadm trigger
19+
# $(QUIET) $(SUDO2) 'echo $(KMOD_NAME) | tee /etc/modules-load.d/$(KMOD_NAME).conf'
20+
# $(QUIET) $(SUDO) depmod --quick
21+
# $(QUIET) $(SUDO) modprobe -rv $(KMOD_NAME)
22+
# $(QUIET) $(SUDO) modprobe -v $(KMOD_NAME)
23+
# $(QUIET) echo ""
24+
# $(QUIET) echo ""
25+
# $(QUIET) echo "It is OK to see \"E3/RULES_DKMS:37: recipe for target 'setup' failed\""
26+
# $(QUIET) echo "---------------------------------------------------------------------"
27+
# $(QUIET) -ls -l /dev/uio* 2>/dev/null
28+
# $(QUIET) echo "---------------------------------------------------------------------"
29+
30+
31+
# setup_clean:
32+
# $(QUIET) $(SUDO) modprobe -rv $(KMOD_NAME)
33+
# $(SUDO) rm -f /etc/modules-load.d/$(KMOD_NAME).conf
34+
# $(SUDO) rm -f /etc/udev/rules.d/99-$(KMOD_NAME).rules
35+
36+
37+
# .PHONY: setup setup_clean
38+

‎configure/module/RULES_MODULE

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#
2+
.PHONY: db pv epics epics-clean
3+
4+
db: conf
5+
$(QUIET) $(E3_MODULE_MAKE_CMDS) db
6+
7+
pv:
8+
# $(SUDO) install -m 755 -d $(E3_MODULES_INSTALL_LOCATION_INC)/pv
9+
# cd $(E3_MODULES_INSTALL_LOCATION_INC) && $(SUDO) mv *.h pv/
10+
11+
epics:
12+
$(QUIET)echo "EPICS_BASE=$(EPICS_BASE)" > $(TOP)/$(E3_MODULE_SRC_PATH)/configure/RELEASE
13+
# $(QUIET)echo "ASYN=$(M_ASYN)" > $(TOP)/$(E3_MODULE_SRC_PATH)/configure/RELEASE
14+
# $(QUIET)echo "SSCAN=$(M_SSCAN)" >> $(TOP)/$(E3_MODULE_SRC_PATH)/configure/RELEASE
15+
# $(QUIET)echo "SNCSEQ=$(M_SNCSEQ)" >> $(TOP)/$(E3_MODULE_SRC_PATH)/configure/RELEASE
16+
$(QUIET)echo "CHECK_RELEASE = YES" > $(TOP)/$(E3_MODULE_SRC_PATH)/configure/CONFIG_SITE
17+
# $(QUIET)echo "INSTALL_LOCATION=$(M_DEVLIB2)" >> $(TOP)/$(E3_MODULE_SRC_PATH)/configure/CONFIG_SITE
18+
$(SUDOBASH) "$(MAKE) -C $(E3_MODULE_SRC_PATH)"
19+
20+
epics-clean:
21+
$(SUDOBASH) "$(MAKE) -C $(E3_MODULE_SRC_PATH) clean"
22+
23+

‎docs/.UPDATE_MODULE_LOG

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
2+
>>
3+
Update Log Time : 2018Nov09-2228-04CET
4+
>>
5+
Script is used : e3TemplateGenerator
6+
Script Path : /home/jhlee/gitsrc/e3-tools/e3TemplateGenerator
7+
User : jhlee
8+
e3 repo Hash : 90415f4
9+
10+
EPICS_MODULE_NAME : asyn
11+
E3 MODULE VERSION : 4.33.0
12+
EPICS BASE VERSION : base-3.15.5
13+
E3 REQUIRE VERSION : 3.0.2
14+
>>

‎patch/Site/HISTORY.md

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# what_ever_filename.p0.patch
2+
3+
Generic Description.....
4+
5+
* created by Jeong Han Lee, [email protected]
6+
* related URL or reference https://github.com/icshwi
7+
* Tuesday, February 13 13:24:57 CET 2018

‎patch/Site/README.md

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Site Specific EPICS Module Patch Files
2+
3+
## Changes
4+
The changes were tested in local environemnt, and commits to the forked repository and do pull request to the epics community module repository.
5+
6+
* Check the original HASH, and your own master
7+
* feb8856 : The original HASH
8+
* master : Changed
9+
10+
11+
## How to create a p0 patch file between commits
12+
13+
14+
* Show what the difference between commits
15+
16+
17+
* Create p0 patch
18+
19+
```
20+
$git diff feb8856 master --no-prefix > ../patch/Site/what_ever_filename.p0.patch
21+
```
22+

0 commit comments

Comments
 (0)