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 | |
| parent | 4d01b009bb08a23f4eea64fcef329c321fbcf04e (diff) | |
| download | meta-openembedded-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>
| -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 @@ | |||
| 1 | From fd0a4ee201b5c7b24da79dcd346ac121978951a0 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Sun, 29 Mar 2020 19:58:36 -0700 | ||
| 4 | Subject: [PATCH] Remove modules_clean from clean target | ||
| 5 | |||
| 6 | This is needed when building applications (w/o module) | ||
| 7 | Since OE will run 'make clean' before reconfiguring, this | ||
| 8 | will try to run module_clean and will wrongly try to look for removing | ||
| 9 | modules from /lib/modules | ||
| 10 | |||
| 11 | Upstream-Status: Inappropriate [ OE-Specific ] | ||
| 12 | |||
| 13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 14 | --- | ||
| 15 | Makefile | 2 +- | ||
| 16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 17 | |||
| 18 | diff --git a/Makefile b/Makefile | ||
| 19 | index c60863f..fc897d5 100644 | ||
| 20 | --- a/Makefile | ||
| 21 | +++ b/Makefile | ||
| 22 | @@ -23,7 +23,7 @@ all: modules nbcat mkemlog | ||
| 23 | |||
| 24 | install: modules_install nbcat_install mkemlog_install | ||
| 25 | |||
| 26 | -clean: modules_clean nbcat_clean mkemlog_clean | ||
| 27 | +clean: nbcat_clean mkemlog_clean | ||
| 28 | |||
| 29 | modules: | ||
| 30 | $(MAKE) -C $(KDIR) M=$(CURDIR) modules | ||
| 31 | -- | ||
| 32 | 2.26.0 | ||
| 33 | |||
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 @@ | |||
| 1 | require ${BPN}.inc | 1 | require ${BPN}.inc |
| 2 | 2 | ||
| 3 | SRC_URI += "file://${BPN}.initd" | 3 | SRC_URI += "file://${BPN}.initd \ |
| 4 | file://0001-Remove-modules_clean-from-clean-target.patch \ | ||
| 5 | " | ||
| 4 | 6 | ||
| 5 | SRC_URI_append_libc-musl = " file://Drop-use-of-error-h.patch" | 7 | SRC_URI_append_libc-musl = " file://Drop-use-of-error-h.patch" |
| 6 | 8 | ||
| @@ -8,6 +10,8 @@ inherit update-rc.d | |||
| 8 | 10 | ||
| 9 | INITSCRIPT_NAME = "${BPN}" | 11 | INITSCRIPT_NAME = "${BPN}" |
| 10 | 12 | ||
| 13 | |||
| 14 | |||
| 11 | do_compile() { | 15 | do_compile() { |
| 12 | oe_runmake nbcat | 16 | oe_runmake nbcat |
| 13 | oe_runmake mkemlog | 17 | oe_runmake mkemlog |
