-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
6 changed files
with
126 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
From: Michael Davidsaver <[email protected]> | ||
Date: Tue, 17 May 2016 14:41:52 -0400 | ||
Subject: add .so deps | ||
|
||
--- | ||
caPutLogApp/Makefile | 2 ++ | ||
1 file changed, 2 insertions(+) | ||
|
||
diff --git a/caPutLogApp/Makefile b/caPutLogApp/Makefile | ||
index 005c1b5..6f70e63 100644 | ||
--- a/caPutLogApp/Makefile | ||
+++ b/caPutLogApp/Makefile | ||
@@ -11,6 +11,8 @@ caPutLog_SRCS += caPutLogClient.c | ||
caPutLog_SRCS += caPutLog.c | ||
caPutLog_SRCS += caPutLogShellCommands.c | ||
|
||
+caPutLog_LIBS += $(EPICS_BASE_IOC_LIBS) | ||
+ | ||
# API for the IOC | ||
INC = caPutLog.h | ||
|
22 changes: 22 additions & 0 deletions
22
debian/patches/0002-quiet-warning-about-int-void-int.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
From: Michael Davidsaver <[email protected]> | ||
Date: Fri, 12 Jun 2015 15:53:33 -0400 | ||
Subject: quiet warning about int -> void* -> int | ||
|
||
Not a problem in this case. | ||
--- | ||
caPutLogApp/caPutLogTask.c | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/caPutLogApp/caPutLogTask.c b/caPutLogApp/caPutLogTask.c | ||
index fbb9e94..95e8602 100644 | ||
--- a/caPutLogApp/caPutLogTask.c | ||
+++ b/caPutLogApp/caPutLogTask.c | ||
@@ -179,7 +179,7 @@ void caPutLogTaskSend(LOGDATA *plogData) | ||
static void caPutLogTask(void *arg) | ||
{ | ||
int sent = FALSE, burst = FALSE; | ||
- int config = (size_t)arg; | ||
+ int config = (int)(size_t)arg; | ||
LOGDATA *pcurrent, *pnext; | ||
VALUE old_value, max_value, min_value; | ||
VALUE *pold=&old_value, *pmax=&max_value, *pmin=&min_value; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
From: Michael Davidsaver <[email protected]> | ||
Date: Fri, 12 Jun 2015 15:50:22 -0400 | ||
Subject: print config option on startup | ||
|
||
--- | ||
caPutLogApp/caPutLog.c | 17 +++++++++++++++-- | ||
1 file changed, 15 insertions(+), 2 deletions(-) | ||
|
||
diff --git a/caPutLogApp/caPutLog.c b/caPutLogApp/caPutLog.c | ||
index 7573f7a..ebbaa6a 100644 | ||
--- a/caPutLogApp/caPutLog.c | ||
+++ b/caPutLogApp/caPutLog.c | ||
@@ -69,9 +69,22 @@ int epicsShareAPI caPutLogInit (const char *addr_str, int config) | ||
{ | ||
int status; | ||
|
||
- if (config == caPutLogNone) { | ||
+ switch(config) { | ||
+ case caPutLogNone: | ||
+ printf("caPutLogInit config: Disabled\n"); | ||
return caPutLogSuccess; | ||
- errlogSevPrintf(errlogInfo, "caPutLog: disabled\n"); | ||
+ case caPutLogOnChange: | ||
+ printf("caPutLogInit config: OnChange\n"); | ||
+ break; | ||
+ case caPutLogAll: | ||
+ printf("caPutLogInit config: All\n"); | ||
+ break; | ||
+ case caPutLogAllNoFilter: | ||
+ printf("caPutLogInit config: AllNoFilter\n"); | ||
+ break; | ||
+ default: | ||
+ printf("caPutLogInit config: Unknown (must be -1, 0, 1, or 2)\n"); | ||
+ return caPutLogError; | ||
} | ||
|
||
status = caPutLogClientInit(addr_str); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
From: Michael Davidsaver <[email protected]> | ||
Date: Fri, 9 Mar 2012 14:08:31 -0500 | ||
Subject: no docs testing | ||
|
||
--- | ||
docs/Makefile | 2 ++ | ||
1 file changed, 2 insertions(+) | ||
|
||
diff --git a/docs/Makefile b/docs/Makefile | ||
index 35054e2..bbea1b6 100644 | ||
--- a/docs/Makefile | ||
+++ b/docs/Makefile | ||
@@ -174,3 +174,5 @@ doctest: | ||
"results in $(BUILDDIR)/doctest/output.txt." | ||
|
||
endif | ||
+ | ||
+runtests: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
From: Martin Konrad <[email protected]> | ||
Date: Mon, 15 Jul 2019 10:36:25 -0400 | ||
Subject: Modify RELEASE file for Debian | ||
|
||
--- | ||
configure/RELEASE | 4 +--- | ||
1 file changed, 1 insertion(+), 3 deletions(-) | ||
|
||
diff --git a/configure/RELEASE b/configure/RELEASE | ||
index 6da09f1..ba647a5 100644 | ||
--- a/configure/RELEASE | ||
+++ b/configure/RELEASE | ||
@@ -18,9 +18,7 @@ TEMPLATE_TOP=$(EPICS_BASE)/templates/makeBaseApp/top | ||
#SNCSEQ=$(EPICS_BASE)/../modules/soft/seq | ||
|
||
# EPICS_BASE usually appears last so other apps can override stuff: | ||
-#EPICS_BASE=/srv/csr/Epics/sumo/build/BASE/R3-14-12-5-bessy3+BII-093 | ||
-EPICS_BASE=/home/franksen/ctl/epics/base/base-3.15.2 | ||
-#EPICS_BASE=/home/franksen/ctl/epics/base/int64a | ||
+EPICS_BASE=/usr/lib/epics | ||
|
||
#Capfast users may need the following definitions | ||
#CAPFAST_TEMPLATES= |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
0001-add-.so-deps.patch | ||
0002-quiet-warning-about-int-void-int.patch | ||
0003-print-config-option-on-startup.patch | ||
0004-no-docs-testing.patch | ||
0005-Modify-RELEASE-file-for-Debian.patch |