ocxl_info cleanup

- Add patch level to the version string - Clean libocxl_info.h - Don't leak build machine hostname in ocxl_info() - Remove stray newline from the end of ocxl_info Signed-off-by: Alastair D'Silva <[email protected]>
OpenCAPI · May 1, 2018 · 6ec56ee · 6ec56ee
1 parent 62c15c6
commit 6ec56ee
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -35,7 +35,7 @@ endif
 
 src/libocxl_info.h: version.pl
 	VERSION_MAJOR=${VERSION_MAJOR} VERSION_MINOR=${VERSION_MINOR} \
-	CC="${CC}" CFLAGS="${CFLAGS}" \
+	VERSION_PATCH=${VERSION_PATCH} CC="${CC}" CFLAGS="${CFLAGS}" \
 	./version.pl > src/libocxl_info.h
 
 obj:
@@ -97,7 +97,7 @@ docs:
 	$(call Q,DOCS-HTML, doxygen Doxyfile-html,)
 
 clean:
-	rm -rf obj testobj sampleobj docs
+	rm -rf obj testobj sampleobj docs src/libocxl_info.h
 
 install: all docs
 	mkdir -p $(DESTDIR)$(libdir)

diff --git a/Makefile.vars b/Makefile.vars
@@ -8,6 +8,9 @@ VERSION_MAJOR = 1
 # Change VERSION_MINOR on new features
 VERSION_MINOR = 0
 
+# Change VERSION_PATCH on each tag
+VERSION_PATCH = 0
+
 AR  = $(CROSS_COMPILE)ar
 AS	= $(CROSS_COMPILE)as
 LD	= $(CROSS_COMPILE)ld

diff --git a/src/internal.c b/src/internal.c
@@ -66,7 +66,7 @@ void libocxl_init()
 
 	val = getenv("LIBOCXL_INFO");
 	if (val && (!strcasecmp(val, "yes") || !strcmp(val, "1"))) {
-		fprintf(stderr, "%s", libocxl_info);
+		fprintf(stderr, "%s\n", libocxl_info);
 	}
 
 	val = getenv("LIBOCXL_TRACE_ALL");

diff --git a/version.pl b/version.pl
@@ -24,15 +24,15 @@
     $gitHash = "\"Git hash: $hash$dirty\\n\"";
 }
 
-my $platform = `uname -a`;
+my $platform = `uname -srvmpio`;
 chomp $platform;
 
 print <<"EOF";
 const char *libocxl_info =
-    "LibOCXL Version: $ENV{VERSION_MAJOR}.$ENV{VERSION_MINOR}\\n"
+    "LibOCXL Version: $ENV{VERSION_MAJOR}.$ENV{VERSION_MINOR}.$ENV{VERSION_PATCH}\\n"
     "CC: $ENV{CC}\\n"
     "Compiler Version: $compilerLines[0]\\n"
     "CFLAGS: $ENV{CFLAGS}\\n"
     $gitHash
-    "Platform: $platform\\n\\n";
+    "Build platform: $platform\\n";
 EOF