diff options
author | Khem Raj <raj.khem@gmail.com> | 2020-03-29 20:03:23 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2020-03-29 20:15:18 -0700 |
commit | 4cb98122778521aac4274099772a20448b051a07 (patch) | |
tree | bd13dd6e4210269e9d2f3bdee02f3da0fa32c074 /meta-oe/recipes-core | |
parent | 4d01b009bb08a23f4eea64fcef329c321fbcf04e (diff) | |
download | meta-openembedded-contrib-4cb98122778521aac4274099772a20448b051a07.tar.gz |
emlog: Do not clean modules when building apps
Fixes
make -C /lib/modules/5.5.13-arch1-1/build M=/mnt/b/yoe/build/tmp/work/core2-64-yoe-linux/emlog/git-r0/git clean
make[1]: *** /lib/modules/5.5.13-arch1-1/build: No such file or directory. Stop.
make: *** [Makefile:36: modules_clean] Error 2
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-core')
-rw-r--r-- | meta-oe/recipes-core/emlog/emlog/0001-Remove-modules_clean-from-clean-target.patch | 33 | ||||
-rw-r--r-- | meta-oe/recipes-core/emlog/emlog_git.bb | 6 |
2 files changed, 38 insertions, 1 deletions
diff --git a/meta-oe/recipes-core/emlog/emlog/0001-Remove-modules_clean-from-clean-target.patch b/meta-oe/recipes-core/emlog/emlog/0001-Remove-modules_clean-from-clean-target.patch new file mode 100644 index 0000000000..beba528b33 --- /dev/null +++ b/meta-oe/recipes-core/emlog/emlog/0001-Remove-modules_clean-from-clean-target.patch @@ -0,0 +1,33 @@ +From fd0a4ee201b5c7b24da79dcd346ac121978951a0 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 29 Mar 2020 19:58:36 -0700 +Subject: [PATCH] Remove modules_clean from clean target + +This is needed when building applications (w/o module) +Since OE will run 'make clean' before reconfiguring, this +will try to run module_clean and will wrongly try to look for removing +modules from /lib/modules + +Upstream-Status: Inappropriate [ OE-Specific ] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index c60863f..fc897d5 100644 +--- a/Makefile ++++ b/Makefile +@@ -23,7 +23,7 @@ all: modules nbcat mkemlog + + install: modules_install nbcat_install mkemlog_install + +-clean: modules_clean nbcat_clean mkemlog_clean ++clean: nbcat_clean mkemlog_clean + + modules: + $(MAKE) -C $(KDIR) M=$(CURDIR) modules +-- +2.26.0 + diff --git a/meta-oe/recipes-core/emlog/emlog_git.bb b/meta-oe/recipes-core/emlog/emlog_git.bb index 22308d7e85..387dd67123 100644 --- a/meta-oe/recipes-core/emlog/emlog_git.bb +++ b/meta-oe/recipes-core/emlog/emlog_git.bb @@ -1,6 +1,8 @@ require ${BPN}.inc -SRC_URI += "file://${BPN}.initd" +SRC_URI += "file://${BPN}.initd \ + file://0001-Remove-modules_clean-from-clean-target.patch \ + " SRC_URI_append_libc-musl = " file://Drop-use-of-error-h.patch" @@ -8,6 +10,8 @@ inherit update-rc.d INITSCRIPT_NAME = "${BPN}" + + do_compile() { oe_runmake nbcat oe_runmake mkemlog |