Merge branch 'prepare_next_release' into 'master'

E3-962: Apply changes for the next e3 release

See merge request !12

configure/CONFIG

@@ -14,7 +14,7 @@ include $(TOP)/configure/CONFIG_MODULE
 endif
 
 E3_REQUIRE_LOCATION := $(EPICS_BASE)/$(E3_REQUIRE_NAME)/$(E3_REQUIRE_VERSION)
-REQUIRE_CONFIG := $(E3_REQUIRE_LOCATION)/configure
 
-include $(REQUIRE_CONFIG)/CONFIG
+
+include $(E3_REQUIRE_LOCATION)/configure/CONFIG
 

configure/RULES

 
-include $(REQUIRE_CONFIG)/RULES_SITEMODS
+include $(E3_REQUIRE_CONFIG)/RULES_SITEMODS
 
 include $(TOP)/configure/module/RULES_MODULE
 -include $(TOP)/configure/module/RULES_DKMS_L

configure/module/RULES_MODULE

 #
-.PHONY: db hdrs epics epics-clean
-
-db: conf
-	$(QUIET) $(E3_MODULE_MAKE_CMDS) db
+.PHONY: hdrs epics epics-clean
 
 hdrs:
 #	$(SUDO) install -m 755 -d $(E3_MODULES_INSTALL_LOCATION_INC)/pv

devlib2.Makefile

 where_am_I := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
 include ${E3_REQUIRE_TOOLS}/driver.makefile
-include $(E3_REQUIRE_CONFIG)/DECOUPLE_FLAGS
+
 
 COMMON:= common
 
@@ -69,8 +69,5 @@ SOURCES += $(VMEAPP)/devlib_compat.c
 DBDS += $(VMEAPP)/epicsvme.dbd
 
 
-.PHONY: db
-db:
-
 .PHONY: vlibs
 vlibs:

patch/Site/2.9.0+0/shareLib.p0.patch

-diff --git vmeApp/devcsr.h vmeApp/devcsr.h
-index f825fcb..9d745a3 100644
---- vmeApp/devcsr.h
-+++ vmeApp/devcsr.h
-@@ -34,6 +34,7 @@
- #endif
- 
- #include <epicsTypes.h>
-+#include <shareLib.h>
- #include "epicsMMIO.h"
- #include "vmedefs.h"
- 

patch/Site/HISTORY.md

-# shareLib.p0.patch
-
-Add required include directive to fix change between base 7.0.3.1 and 7.0.4
-Fixed in devlib2 commit 0d41740 (post 2.11 tag).
-
-* created Wayne Lewis, wayne.lewis@ess.eu
-* 2020-07-07

patch/Site/README.md

-# 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/what_ever_filename.p0.patch
-```
-