[oe-commits] Andre McCurdy : kernel.bbclass: dont assume ${B}/include/generated exists

git at git.openembedded.org git at git.openembedded.org
Tue Aug 11 16:23:25 UTC 2015


Module: openembedded-core.git
Branch: master-next
Commit: 5bebaf37429c28134aeb6fd261e282e9a0397771
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=5bebaf37429c28134aeb6fd261e282e9a0397771

Author: Andre McCurdy <armccurdy at gmail.com>
Date:   Fri Aug  7 18:15:21 2015 -0700

kernel.bbclass: dont assume ${B}/include/generated exists

Older kernels (e.g. 2.6.32) don't create an include/generated directory,
so check that the directory exists before trying to copy files from it
in do_shared_workdir().

Signed-off-by: Andre McCurdy <armccurdy at gmail.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 meta/classes/kernel.bbclass | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index d06f6cf..5318b5f 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -300,8 +300,10 @@ do_shared_workdir () {
 		cp arch/powerpc/lib/crtsavres.o $kerneldir/arch/powerpc/lib/crtsavres.o
 	fi
 
-	mkdir -p $kerneldir/include/generated/
-	cp -fR include/generated/* $kerneldir/include/generated/
+	if [ -d include/generated ]; then
+		mkdir -p $kerneldir/include/generated/
+		cp -fR include/generated/* $kerneldir/include/generated/
+	fi
 
 	if [ -d arch/${ARCH}/include/generated ]; then
 		mkdir -p $kerneldir/arch/${ARCH}/include/generated/



More information about the Openembedded-commits mailing list