From 2e9b165f708716837720f14aafe2ad9fedaa332e Mon Sep 17 00:00:00 2001 From: Baogen Shang Date: Tue, 23 Jan 2024 15:22:12 +0800 Subject: [PATCH 1/2] fix build error when running make command to compile the project. error log: make[3]: Entering directory '/home/storage/bshang/oec-hardware/tests/virtualization' make[3]: *** stratovirt.xml: Not a directory. Stop. make[3]: Leaving directory '/home/storage/bshang/oec-hardware/tests/virtualization' make[2]: *** [Makefile:19: all] Error 2 make[2]: Leaving directory '/home/storage/bshang/oec-hardware/tests/virtualization' make[1]: *** [Makefile:19: all] Error 2 Signed-off-by: Baogen Shang --- tests/virtualization/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/virtualization/Makefile b/tests/virtualization/Makefile index 42b579e..07bf8a2 100644 --- a/tests/virtualization/Makefile +++ b/tests/virtualization/Makefile @@ -13,7 +13,7 @@ .PHONY: all clean install HWCERT_TEST_LIB := $(DESTDIR)/usr/share/oech/lib/tests/virtualization -SUBDIRS := $(shell ls | grep -v Makefile) +SUBDIRS := $(shell ls | grep -v "Makefile\|stratovirt.xml\|__init__.py\|console_cmd.sh\|qemu.xml") all: for i in $(SUBDIRS); do $(MAKE) -C $$i; done -- Gitee From e5fccf9ee72e47f664c21fbf5271607472b6d1ca Mon Sep 17 00:00:00 2001 From: Baogen Shang Date: Tue, 23 Jan 2024 16:40:17 +0800 Subject: [PATCH 2/2] fix the install error when making install oech-hareware: Error log: make[3]: Entering directory '/home/storage/bshang/oec-hardware/tests/compatible/kabiwhitelist' mkdir -p /usr/share/oech/lib/tests/compatible/kabiwhitelist cp -a /build *.py /usr/share/oech/lib/tests/compatible/kabiwhitelist cp: cannot stat '/build': No such file or directory make[3]: *** [Makefile:20: install] Error 1 make[3]: Leaving directory '/home/storage/bshang/oec-hardware/tests/compatible/kabiwhitelist' make[3]: Entering directory '/home/storage/bshang/oec-hardware/tests/compatible/dpdk' mkdir -p /usr/share/oech/lib/tests/compatible/dpdk cp -a /build *.py /usr/share/oech/lib/tests/compatible/dpdk cp: cannot stat '/build': No such file or directory make[3]: *** [Makefile:20: install] Error 1 make[3]: Leaving directory '/home/storage/bshang/oec-hardware/tests/compatible/dpdk' Signed-off-by: Baogen Shang --- tests/compatible/dpdk/Makefile | 2 +- tests/compatible/kabiwhitelist/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/compatible/dpdk/Makefile b/tests/compatible/dpdk/Makefile index 858312e..8d9cd1e 100644 --- a/tests/compatible/dpdk/Makefile +++ b/tests/compatible/dpdk/Makefile @@ -17,7 +17,7 @@ all: ; install: mkdir -p $(DEST) - cp -a $(SUBDIR)/build *.py $(DEST) + cp -a *.py $(DEST) chmod a+x $(DEST)/*.py clean: diff --git a/tests/compatible/kabiwhitelist/Makefile b/tests/compatible/kabiwhitelist/Makefile index 5f683c9..373a7ef 100644 --- a/tests/compatible/kabiwhitelist/Makefile +++ b/tests/compatible/kabiwhitelist/Makefile @@ -17,8 +17,8 @@ all: ; install: mkdir -p $(DEST) - cp -a $(SUBDIR)/build *.py $(DEST) - cp -a $(SUBDIR)/build *.sh $(DEST) + cp -a *.py $(DEST) + cp -a *.sh $(DEST) chmod a+x $(DEST)/*.py chmod a+x $(DEST)/*.sh -- Gitee