diff options
author | Khem Raj <raj.khem@gmail.com> | 2015-07-06 10:16:59 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2015-07-06 10:16:59 -0700 |
commit | 996b8127c431472cf35b691e8d1c9f0cc79a0650 (patch) | |
tree | 32055b48a5e7bb4ebf2f1378f550b9125a9cc757 | |
parent | 102225344291f7e3fc3744d36d651bf27a92d1fa (diff) | |
parent | 235deb5e7e17c36059c5c0ff4760c061638c9893 (diff) | |
download | meta-altera-996b8127c431472cf35b691e8d1c9f0cc79a0650.tar.gz |
Merge pull request #3 from nordoff/master
Build kernels properly in YP1.8
-rw-r--r-- | recipes-kernel/linux/linux-altera.inc | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/recipes-kernel/linux/linux-altera.inc b/recipes-kernel/linux/linux-altera.inc index 3e0a5a4..0cddc82 100644 --- a/recipes-kernel/linux/linux-altera.inc +++ b/recipes-kernel/linux/linux-altera.inc | |||
@@ -14,9 +14,9 @@ SECTION = "kernel" | |||
14 | DESCRIPTION = "Altera Linux kernel" | 14 | DESCRIPTION = "Altera Linux kernel" |
15 | LICENSE = "GPLv2" | 15 | LICENSE = "GPLv2" |
16 | 16 | ||
17 | LIC_FILES_CHKSUM = "file://${B}/COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" | 17 | LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" |
18 | 18 | ||
19 | B = "${WORKDIR}/git" | 19 | S = "${WORKDIR}/git" |
20 | 20 | ||
21 | MACHINE_DEFCONFIG = "${KERNEL_DEFCONFIG}" | 21 | MACHINE_DEFCONFIG = "${KERNEL_DEFCONFIG}" |
22 | 22 | ||
@@ -27,8 +27,9 @@ do_configure() { | |||
27 | export CROSS_COMPILE="${TARGET_PREFIX}" | 27 | export CROSS_COMPILE="${TARGET_PREFIX}" |
28 | export ARCH=${ARCH} | 28 | export ARCH=${ARCH} |
29 | 29 | ||
30 | oe_runmake ${MACHINE_DEFCONFIG} CONFIG_BLK_DEV_INITRD=y | 30 | oe_runmake -C ${S} O=${B} ${MACHINE_DEFCONFIG} CONFIG_BLK_DEV_INITRD=y |
31 | 31 | ||
32 | pushd ${B} | ||
32 | cp .config .config.ori | 33 | cp .config .config.ori |
33 | 34 | ||
34 | grep CONFIG_BLK_DEV_INITRD .config || echo "CONFIG_BLK_DEV_INITRD=y" >> .config | 35 | grep CONFIG_BLK_DEV_INITRD .config || echo "CONFIG_BLK_DEV_INITRD=y" >> .config |
@@ -45,7 +46,7 @@ do_configure() { | |||
45 | sed -i "s|^.*CONFIG_INITRAMFS_ROOT_UID[ =].*$|CONFIG_INITRAMFS_ROOT_UID=0|g" .config | 46 | sed -i "s|^.*CONFIG_INITRAMFS_ROOT_UID[ =].*$|CONFIG_INITRAMFS_ROOT_UID=0|g" .config |
46 | sed -i "s|^.*CONFIG_INITRAMFS_ROOT_GID[ =].*$|CONFIG_INITRAMFS_ROOT_GID=0|g" .config | 47 | sed -i "s|^.*CONFIG_INITRAMFS_ROOT_GID[ =].*$|CONFIG_INITRAMFS_ROOT_GID=0|g" .config |
47 | sed -i "s|^.*CONFIG_INITRAMFS_COMPRESSION_NONE[ =].*$|CONFIG_INITRAMFS_COMPRESSION_NONE=y|g" .config | 48 | sed -i "s|^.*CONFIG_INITRAMFS_COMPRESSION_NONE[ =].*$|CONFIG_INITRAMFS_COMPRESSION_NONE=y|g" .config |
48 | oe_runmake oldconfig | 49 | oe_runmake -C ${S} O=${B} oldconfig |
49 | else | 50 | else |
50 | rm -f *.cpio | 51 | rm -f *.cpio |
51 | echo "Initramfs disabled or can't find valid initramfs ${INITRAMFS_IMAGE_FILE}" | 52 | echo "Initramfs disabled or can't find valid initramfs ${INITRAMFS_IMAGE_FILE}" |
@@ -54,14 +55,15 @@ do_configure() { | |||
54 | sed -i "s|^CONFIG_INITRAMFS_ROOT_UID=.*$|# CONFIG_INITRAMFS_ROOT_UID is not set|g" .config | 55 | sed -i "s|^CONFIG_INITRAMFS_ROOT_UID=.*$|# CONFIG_INITRAMFS_ROOT_UID is not set|g" .config |
55 | sed -i "s|^CONFIG_INITRAMFS_ROOT_GID=.*$|# CONFIG_INITRAMFS_ROOT_GID is not set|g" .config | 56 | sed -i "s|^CONFIG_INITRAMFS_ROOT_GID=.*$|# CONFIG_INITRAMFS_ROOT_GID is not set|g" .config |
56 | sed -i "s|^CONFIG_INITRAMFS_COMPRESSION_NONE=.*$|# CONFIG_INITRAMFS_COMPRESSION_NONE is not set|g" .config | 57 | sed -i "s|^CONFIG_INITRAMFS_COMPRESSION_NONE=.*$|# CONFIG_INITRAMFS_COMPRESSION_NONE is not set|g" .config |
57 | oe_runmake oldconfig | 58 | oe_runmake -C ${S} O=${B} oldconfig |
58 | fi | 59 | fi |
60 | popd | ||
59 | } | 61 | } |
60 | 62 | ||
61 | kernel_do_compile() { | 63 | kernel_do_compile() { |
62 | unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE | 64 | unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE |
63 | oe_runmake __headers CC="${KERNEL_CC}" LD="${KERNEL_LD}" | 65 | oe_runmake -C ${S} O=${B} __headers CC="${KERNEL_CC}" LD="${KERNEL_LD}" |
64 | oe_runmake ${KERNEL_IMAGETYPE_FOR_MAKE} ${KERNEL_ALT_IMAGETYPE} CC="${KERNEL_CC}" LD="${KERNEL_LD}" LOADADDR=0x8000 | 66 | oe_runmake -C ${S} O=${B} ${KERNEL_IMAGETYPE_FOR_MAKE} ${KERNEL_ALT_IMAGETYPE} CC="${KERNEL_CC}" LD="${KERNEL_LD}" LOADADDR=0x8000 |
65 | if test "${KERNEL_IMAGETYPE_FOR_MAKE}.gz" = "${KERNEL_IMAGETYPE}"; then | 67 | if test "${KERNEL_IMAGETYPE_FOR_MAKE}.gz" = "${KERNEL_IMAGETYPE}"; then |
66 | gzip -9c < "${KERNEL_IMAGETYPE_FOR_MAKE}" > "${KERNEL_OUTPUT}" | 68 | gzip -9c < "${KERNEL_IMAGETYPE_FOR_MAKE}" > "${KERNEL_OUTPUT}" |
67 | fi | 69 | fi |
@@ -70,8 +72,8 @@ kernel_do_compile() { | |||
70 | do_compile_dtb() { | 72 | do_compile_dtb() { |
71 | unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE | 73 | unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE |
72 | sync | 74 | sync |
73 | oe_runmake ARCH=${ARCH} CROSS_COMPILE="${TARGET_PREFIX}" dtbs || | 75 | oe_runmake -C ${S} O=${B} ARCH=${ARCH} CROSS_COMPILE="${TARGET_PREFIX}" dtbs || |
74 | oe_runmake ARCH=${ARCH} CROSS_COMPILE="${TARGET_PREFIX}" dtbs | 76 | oe_runmake -C ${S} O=${B} ARCH=${ARCH} CROSS_COMPILE="${TARGET_PREFIX}" dtbs |
75 | } | 77 | } |
76 | 78 | ||
77 | addtask compile_dtb after do_compile before do_build | 79 | addtask compile_dtb after do_compile before do_build |