diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/kernel.bbclass | 25 | ||||
-rw-r--r-- | meta/conf/bitbake.conf | 2 |
2 files changed, 12 insertions, 15 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 3ccd753529..d79ba9fb98 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass | |||
@@ -77,6 +77,10 @@ EXTRA_OEMAKE = "" | |||
77 | 77 | ||
78 | KERNEL_ALT_IMAGETYPE ??= "" | 78 | KERNEL_ALT_IMAGETYPE ??= "" |
79 | 79 | ||
80 | # Define where the kernel headers are installed on the target as well as where | ||
81 | # they are staged. | ||
82 | KERNEL_SRC_PATH = "/usr/src/kernel" | ||
83 | |||
80 | KERNEL_IMAGETYPE_FOR_MAKE = "${@(lambda s: s[:-3] if s[-3:] == ".gz" else s)(d.getVar('KERNEL_IMAGETYPE', True))}" | 84 | KERNEL_IMAGETYPE_FOR_MAKE = "${@(lambda s: s[:-3] if s[-3:] == ".gz" else s)(d.getVar('KERNEL_IMAGETYPE', True))}" |
81 | 85 | ||
82 | kernel_do_compile() { | 86 | kernel_do_compile() { |
@@ -130,7 +134,7 @@ kernel_do_install() { | |||
130 | # Support for external module building - create a minimal copy of the | 134 | # Support for external module building - create a minimal copy of the |
131 | # kernel source tree. | 135 | # kernel source tree. |
132 | # | 136 | # |
133 | kerneldir=${D}/kernel | 137 | kerneldir=${D}${KERNEL_SRC_PATH} |
134 | install -d $kerneldir | 138 | install -d $kerneldir |
135 | 139 | ||
136 | # | 140 | # |
@@ -191,20 +195,15 @@ kernel_do_install() { | |||
191 | # Remove the following binaries which cause strip errors | 195 | # Remove the following binaries which cause strip errors |
192 | # during do_package for cross-compiled platforms | 196 | # during do_package for cross-compiled platforms |
193 | bin_files="arch/powerpc/boot/addnote arch/powerpc/boot/hack-coff \ | 197 | bin_files="arch/powerpc/boot/addnote arch/powerpc/boot/hack-coff \ |
194 | arch/powerpc/boot/mktree" | 198 | arch/powerpc/boot/mktree scripts/kconfig/zconf.tab.o \ |
199 | scripts/kconfig/conf.o" | ||
195 | for entry in $bin_files; do | 200 | for entry in $bin_files; do |
196 | rm -f $kerneldir/$entry | 201 | rm -f $kerneldir/$entry |
197 | done | 202 | done |
198 | } | 203 | } |
199 | 204 | ||
200 | PACKAGE_PREPROCESS_FUNCS += "kernel_package_preprocess" | ||
201 | |||
202 | kernel_package_preprocess () { | ||
203 | rm -rf ${PKGD}/kernel | ||
204 | } | ||
205 | |||
206 | sysroot_stage_all_append() { | 205 | sysroot_stage_all_append() { |
207 | sysroot_stage_dir ${D}/kernel ${SYSROOT_DESTDIR}/kernel | 206 | sysroot_stage_dir ${D}${KERNEL_SRC_PATH} ${SYSROOT_DESTDIR}${KERNEL_SRC_PATH} |
208 | } | 207 | } |
209 | 208 | ||
210 | kernel_do_configure() { | 209 | kernel_do_configure() { |
@@ -252,13 +251,11 @@ EXPORT_FUNCTIONS do_compile do_install do_configure | |||
252 | 251 | ||
253 | # kernel-base becomes kernel-${KERNEL_VERSION} | 252 | # kernel-base becomes kernel-${KERNEL_VERSION} |
254 | # kernel-image becomes kernel-image-${KERNEL_VERISON} | 253 | # kernel-image becomes kernel-image-${KERNEL_VERISON} |
255 | PACKAGES = "kernel kernel-base kernel-image kernel-dev kernel-vmlinux kernel-misc" | 254 | PACKAGES = "kernel kernel-base kernel-vmlinux kernel-image kernel-dev" |
256 | FILES = "" | 255 | FILES = "" |
257 | FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*" | 256 | FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*" |
258 | FILES_kernel-dev = "/boot/System.map* /boot/Module.symvers* /boot/config*" | 257 | FILES_kernel-dev = "/boot/System.map* /boot/Module.symvers* /boot/config* ${KERNEL_SRC_PATH}" |
259 | FILES_kernel-vmlinux = "/boot/vmlinux*" | 258 | FILES_kernel-vmlinux = "/boot/vmlinux*" |
260 | # misc is a package to contain files we need in staging | ||
261 | FILES_kernel-misc = "/kernel/include/config /kernel/scripts /kernel/drivers/crypto /kernel/drivers/media" | ||
262 | RDEPENDS_kernel = "kernel-base" | 259 | RDEPENDS_kernel = "kernel-base" |
263 | # Allow machines to override this dependency if kernel image files are | 260 | # Allow machines to override this dependency if kernel image files are |
264 | # not wanted in images as standard | 261 | # not wanted in images as standard |
@@ -475,7 +472,7 @@ python populate_packages_prepend () { | |||
475 | metapkg = "kernel-modules" | 472 | metapkg = "kernel-modules" |
476 | d.setVar('ALLOW_EMPTY_' + metapkg, "1") | 473 | d.setVar('ALLOW_EMPTY_' + metapkg, "1") |
477 | d.setVar('FILES_' + metapkg, "") | 474 | d.setVar('FILES_' + metapkg, "") |
478 | blacklist = [ 'kernel-dev', 'kernel-image', 'kernel-base', 'kernel-vmlinux', 'perf', 'perf-dbg', 'kernel-misc' ] | 475 | blacklist = [ 'kernel-dev', 'kernel-image', 'kernel-base', 'kernel-vmlinux', 'perf', 'perf-dbg' ] |
479 | for l in module_deps.values(): | 476 | for l in module_deps.values(): |
480 | for i in l: | 477 | for i in l: |
481 | pkg = module_pattern % legitimize_package_name(re.match(module_regex, os.path.basename(i)).group(1)) | 478 | pkg = module_pattern % legitimize_package_name(re.match(module_regex, os.path.basename(i)).group(1)) |
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 618780c1a1..85ba1088a4 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
@@ -376,7 +376,7 @@ SDKPATHNATIVE = "${SDKPATH}/sysroots/${SDK_SYS}" | |||
376 | ################################################################## | 376 | ################################################################## |
377 | 377 | ||
378 | OLDEST_KERNEL = "2.6.16" | 378 | OLDEST_KERNEL = "2.6.16" |
379 | STAGING_KERNEL_DIR = "${STAGING_DIR_HOST}/kernel" | 379 | STAGING_KERNEL_DIR = "${STAGING_DIR_HOST}/usr/src/kernel" |
380 | 380 | ||
381 | ################################################################## | 381 | ################################################################## |
382 | # Specific image creation and rootfs population info. | 382 | # Specific image creation and rootfs population info. |