Skip to content

Commit 4db7865

Browse files
miguelinuxwenlingz
authored andcommitted
tools: acrn-manager: fix headers install for ioc cbc tools
The ioc-cbc-tools package depends on "acrn_mgr.h". This header was updated with new includes since b2f2d95 ("tools: acrnctl restrict length of vmname to 32 bytes") and in 517707d ("DM/HV: Increase VM name len") was updated to include dm.h This commit add all "acrn_mngr.h" dependencies and install them to "$(DESTDIR)/usr/include/acrn". Also modify install mode to 0644 to headers and libacrn-mngr.a file. This closes #3368 Tracked-On: #3368 Signed-off-by: Miguel Bernal Marin <miguel.bernal.marin@linux.intel.com> Reviewed-by: Yan, Like <like.yan@intel.com>
1 parent 5b1852e commit 4db7865

File tree

1 file changed

+13
-4
lines changed

1 file changed

+13
-4
lines changed

tools/acrn-manager/Makefile

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,14 @@ MANAGER_CFLAGS += -I../../devicemodel/include
2121
MANAGER_CFLAGS += -I../../devicemodel/include/public
2222
MANAGER_CFLAGS += -I../../hypervisor/include
2323

24+
MANAGER_HEADERS := ../../devicemodel/include/dm.h
25+
MANAGER_HEADERS += ../../devicemodel/include/types.h
26+
MANAGER_HEADERS += ../../devicemodel/include/vmm.h
27+
MANAGER_HEADERS += ../../devicemodel/include/dm_string.h
28+
MANAGER_HEADERS += ../../devicemodel/include/macros.h
29+
MANAGER_HEADERS += ../../devicemodel/include/public/vhm_ioctl_defs.h
30+
MANAGER_HEADERS += ../../devicemodel/include/public/acrn_common.h
31+
2432
GCC_MAJOR=$(shell echo __GNUC__ | $(CC) -E -x c - | tail -n 1)
2533
GCC_MINOR=$(shell echo __GNUC_MINOR__ | $(CC) -E -x c - | tail -n 1)
2634

@@ -58,12 +66,12 @@ else
5866
all: $(OUT_DIR)/libacrn-mngr.a $(OUT_DIR)/acrn_mngr.h $(OUT_DIR)/acrnd
5967
endif
6068

61-
$(OUT_DIR)/libacrn-mngr.a: acrn_mngr.c acrn_mngr.h
69+
$(OUT_DIR)/libacrn-mngr.a: acrn_mngr.c acrn_mngr.h $(MANAGER_HEADERS)
6270
$(CC) $(MANAGER_CFLAGS) -c acrn_mngr.c -o $(OUT_DIR)/acrn_mngr.o
6371
ar -cr $@ $(OUT_DIR)/acrn_mngr.o
6472

6573
ifneq ($(OUT_DIR),.)
66-
$(OUT_DIR)/acrn_mngr.h: ./acrn_mngr.h
74+
$(OUT_DIR)/acrn_mngr.h: ./acrn_mngr.h $(MANAGER_HEADERS)
6775
cp ./acrn_mngr.h $(OUT_DIR)/
6876
endif
6977

@@ -98,6 +106,7 @@ ifeq ($(RELEASE),0)
98106
install -t $(DESTDIR)/usr/bin $(OUT_DIR)/acrnctl
99107
endif
100108
install -t $(DESTDIR)/usr/bin $(OUT_DIR)/acrnd
101-
install -t $(DESTDIR)/usr/lib64/ $(OUT_DIR)/libacrn-mngr.a
102-
install -t $(DESTDIR)/usr/include/acrn $(OUT_DIR)/acrn_mngr.h
109+
install -m 0644 -t $(DESTDIR)/usr/lib64/ $(OUT_DIR)/libacrn-mngr.a
110+
install -m 0644 -t $(DESTDIR)/usr/include/acrn $(OUT_DIR)/acrn_mngr.h
111+
install -m 0644 -t $(DESTDIR)/usr/include/acrn $(MANAGER_HEADERS)
103112
install -p -D -m 0644 $(OUT_DIR)/acrnd.service $(DESTDIR)/usr/lib/systemd/system

0 commit comments

Comments
 (0)