Skip to content

Commit aeb9d3a

Browse files
authored
Merge pull request #28 from IBM/jo5ta/dev
Fix kernel Makefile to generate version header
2 parents 19139aa + 57f544d commit aeb9d3a

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

VERSION.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
1.2.62
1+
1.2.63
22

33
# Change log
4+
## 1.2.63
5+
- fix: kernel Makefile now generates version header automatically
46
## 1.2.62
57
- fix: kernel module build warnings
68
## 1.2.61

kernel_tracing_library/src/Makefile

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,18 @@ M ?= $(PWD)
77
INSTALL_MOD_PATH ?= /
88
INSTALL_HDR_PATH ?= $(INSTALL_MOD_PATH)/usr/include/kernel/
99

10+
# Paths relative to kernel_tracing_library/src/
11+
ROOT_DIR := $(M)/../..
12+
VERSION_SCRIPT := $(ROOT_DIR)/cmake/gen_version_header.sh
13+
VERSION_TEMPLATE := $(ROOT_DIR)/cmake/version.h.template
14+
VERSION_OUTPUT := $(ROOT_DIR)/tracing_library/include/CommonLowLevelTracingKit/version.gen.h
15+
1016
all: modules
1117

12-
modules:
18+
$(VERSION_OUTPUT): $(VERSION_TEMPLATE) $(ROOT_DIR)/VERSION.md
19+
$(VERSION_SCRIPT) -t $(VERSION_TEMPLATE) -o $(VERSION_OUTPUT)
20+
21+
modules: $(VERSION_OUTPUT)
1322
$(MAKE) -C $(KERNEL_SRC) M=$(M) modules
1423

1524
modules_install:

0 commit comments

Comments
 (0)