kernel bbclass: convert to new style staging (from poky)
PATCH 1/2 kernel bbclass: convert to new style staging (from poky)
--- classes/kernel.bbclass | 135 ++++++++++++++++++++++++------------------------ 1 files changed, 67 insertions(+), 68 deletions(-)
classes/kernel.bbclass +67 -68
@@ -97,108 +97,107 @@ kernel_do_compile() { } kernel_do_compile[depends] = "${INITRAMFS_TASK}" -kernel_do_stage() { +kernel_do_install() { + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE + if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then + oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" modules_install + else + oenote "no modules to install" + fi + + install -d ${D}/${KERNEL_IMAGEDEST} + install -d ${D}/boot + install -m 0644 ${KERNEL_OUTPUT} ${D}/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-${KERNEL_VERSION} + install -m 0644 System.map ${D}/boot/System.map-${KERNEL_VERSION} + install -m 0644 .config ${D}/boot/config-${KERNEL_VERSION} + install -m 0644 vmlinux ${D}/boot/vmlinux-${KERNEL_VERSION} + [ -e Module.symvers ] && install -m 0644 Module.symvers ${D}/boot/Module.symvers-${KERNEL_VERSION} + install -d ${D}/etc/modutils + if [ "${KERNEL_MAJOR_VERSION}" = "2.6" ]; then + install -d ${D}/etc/modprobe.d + fi + + # Check if scripts/genksyms exists and if so, build it + if [ -e scripts/genksyms/ ]; then + oe_runmake SUBDIRS="scripts/genksyms" + fi + + kerneldir=${D}/kernel/ + if [ -e include/asm ] ; then # This link is generated only in kernel before 2.6.33-rc1, don't stage it for newer kernels ASMDIR=`readlink include/asm` - mkdir -p ${STAGING_KERNEL_DIR}/include/$ASMDIR - cp -fR include/$ASMDIR/* ${STAGING_KERNEL_DIR}/include/$ASMDIR/ + mkdir -p $kerneldir/include/$ASMDIR + cp -fR include/$ASMDIR/* $kerneldir/include/$ASMDIR/ fi + + cp -fR include/$ASMDIR/* $kerneldir/include/$ASMDIR/ # Kernel 2.6.27 moved headers from includes/asm-${ARCH} to arch/${ARCH}/include/asm if [ -e arch/${ARCH}/include/asm/ ] ; then - if [ -e include/asm ] ; then - cp -fR arch/${ARCH}/include/asm/* ${STAGING_KERNEL_DIR}/include/$ASMDIR/ - fi - install -d ${STAGING_KERNEL_DIR}/arch/${ARCH}/include - cp -fR arch/${ARCH}/* ${STAGING_KERNEL_DIR}/arch/${ARCH}/ + cp -fR arch/${ARCH}/include/asm/* $kerneldir/include/$ASMDIR/ + install -d $kerneldir/arch/${ARCH}/include + cp -fR arch/${ARCH}/* $kerneldir/arch/${ARCH}/ # Check for arch/x86 on i386 elif [ -d arch/x86/include/asm/ ]; then - if [ -e include/asm ] ; then - cp -fR arch/x86/include/asm/* ${STAGING_KERNEL_DIR}/include/asm-x86/ - fi - install -d ${STAGING_KERNEL_DIR}/arch/x86/include - cp -fR arch/x86/* ${STAGING_KERNEL_DIR}/arch/x86/ + cp -fR arch/x86/include/asm/* $kerneldir/include/asm-x86/ + install -d $kerneldir/arch/x86/include + cp -fR arch/x86/* $kerneldir/arch/x86/ fi if [ -e include/asm ] ; then - rm -f ${STAGING_KERNEL_DIR}/include/asm - ln -sf $ASMDIR ${STAGING_KERNEL_DIR}/include/asm + rm -f $kerneldir/include/asm + ln -sf $ASMDIR $kerneldir/include/asm fi - mkdir -p ${STAGING_KERNEL_DIR}/include/asm-generic - cp -fR include/asm-generic/* ${STAGING_KERNEL_DIR}/include/asm-generic/ + mkdir -p $kerneldir/include/asm-generic + cp -fR include/asm-generic/* $kerneldir/include/asm-generic/ for entry in drivers/crypto drivers/media include/generated include/linux include/net include/pcmcia include/media include/acpi include/sound include/video include/scsi include/trace; do if [ -d $entry ]; then - mkdir -p ${STAGING_KERNEL_DIR}/$entry - cp -fR $entry/* ${STAGING_KERNEL_DIR}/$entry/ + mkdir -p $kerneldir/$entry + cp -fR $entry/* $kerneldir/$entry/ fi done if [ -d drivers/sound ]; then # 2.4 alsa needs some headers from this directory - mkdir -p ${STAGING_KERNEL_DIR}/include/drivers/sound - cp -fR drivers/sound/*.h ${STAGING_KERNEL_DIR}/include/drivers/sound/ + mkdir -p $kerneldir/include/drivers/sound + cp -fR drivers/sound/*.h $kerneldir/include/drivers/sound/ fi - install -m 0644 .config ${STAGING_KERNEL_DIR}/config-${KERNEL_VERSION} - ln -sf config-${KERNEL_VERSION} ${STAGING_KERNEL_DIR}/.config - ln -sf config-${KERNEL_VERSION} ${STAGING_KERNEL_DIR}/kernel-config - echo "${KERNEL_VERSION}" >${STAGING_KERNEL_DIR}/kernel-abiversion - echo "${S}" >${STAGING_KERNEL_DIR}/kernel-source - echo "${KERNEL_CCSUFFIX}" >${STAGING_KERNEL_DIR}/kernel-ccsuffix - echo "${KERNEL_LDSUFFIX}" >${STAGING_KERNEL_DIR}/kernel-ldsuffix - [ -e Rules.make ] && install -m 0644 Rules.make ${STAGING_KERNEL_DIR}/ - [ -e Makefile ] && install -m 0644 Makefile ${STAGING_KERNEL_DIR}/ + install -m 0644 .config $kerneldir/config-${KERNEL_VERSION} + ln -sf config-${KERNEL_VERSION} $kerneldir/.config + ln -sf config-${KERNEL_VERSION} $kerneldir/kernel-config + echo "${KERNEL_VERSION}" >$kerneldir/kernel-abiversion + echo "${S}" >$kerneldir/kernel-source + echo "${KERNEL_CCSUFFIX}" >$kerneldir/kernel-ccsuffix + echo "${KERNEL_LDSUFFIX}" >$kerneldir/kernel-ldsuffix + [ -e Rules.make ] && install -m 0644 Rules.make $kerneldir/ + [ -e Makefile ] && install -m 0644 Makefile $kerneldir/ # Check if arch/${ARCH}/Makefile exists and install it if [ -e arch/${ARCH}/Makefile ]; then - install -d ${STAGING_KERNEL_DIR}/arch/${ARCH} - install -m 0644 arch/${ARCH}/Makefile* ${STAGING_KERNEL_DIR}/arch/${ARCH} + install -d $kerneldir/arch/${ARCH} + install -m 0644 arch/${ARCH}/Makefile* $kerneldir/arch/${ARCH} # Otherwise check arch/x86/Makefile for i386 and x86_64 on kernels >= 2.6.24 elif [ -e arch/x86/Makefile ]; then - install -d ${STAGING_KERNEL_DIR}/arch/x86 - install -m 0644 arch/x86/Makefile* ${STAGING_KERNEL_DIR}/arch/x86 + install -d $kerneldir/arch/x86 + install -m 0644 arch/x86/Makefile* $kerneldir/arch/x86 fi - cp -fR include/config* ${STAGING_KERNEL_DIR}/include/ + cp -fR include/config* $kerneldir/include/ # Install kernel images and system.map to staging - [ -e vmlinux ] && install -m 0644 vmlinux ${STAGING_KERNEL_DIR}/ - install -m 0644 ${KERNEL_OUTPUT} ${STAGING_KERNEL_DIR}/${KERNEL_IMAGETYPE} - install -m 0644 System.map ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} - [ -e Module.symvers ] && install -m 0644 Module.symvers ${STAGING_KERNEL_DIR}/ + [ -e vmlinux ] && install -m 0644 vmlinux $kerneldir/ + install -m 0644 ${KERNEL_OUTPUT} $kerneldir/${KERNEL_IMAGETYPE} + install -m 0644 System.map $kerneldir/System.map-${KERNEL_VERSION} + [ -e Module.symvers ] && install -m 0644 Module.symvers $kerneldir/ - cp -fR scripts ${STAGING_KERNEL_DIR}/ + cp -fR scripts $kerneldir/ } -kernel_do_install() { - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE - if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then - oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" modules_install - else - oenote "no modules to install" - fi - - install -d ${D}/${KERNEL_IMAGEDEST} - install -d ${D}/boot - install -m 0644 ${KERNEL_OUTPUT} ${D}/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-${KERNEL_VERSION} - install -m 0644 System.map ${D}/boot/System.map-${KERNEL_VERSION} - install -m 0644 .config ${D}/boot/config-${KERNEL_VERSION} - install -m 0644 vmlinux ${D}/boot/vmlinux-${KERNEL_VERSION} - [ -e Module.symvers ] && install -m 0644 Module.symvers ${D}/boot/Module.symvers-${KERNEL_VERSION} - install -d ${D}/etc/modutils - if [ "${KERNEL_MAJOR_VERSION}" = "2.6" ]; then - install -d ${D}/etc/modprobe.d - fi - - # Check if scripts/genksyms exists and if so, build it - if [ -e scripts/genksyms/ ]; then - oe_runmake SUBDIRS="scripts/genksyms" - fi - - install -d ${STAGING_KERNEL_DIR} - cp -fR scripts ${STAGING_KERNEL_DIR}/ +sysroot_stage_all_append() { + sysroot_stage_dir ${D}/kernel ${SYSROOT_DESTDIR}${STAGING_KERNEL_DIR} } kernel_do_configure() {
@@ -234,7 +233,7 @@ pkg_postrm_kernel () { inherit cml1 -EXPORT_FUNCTIONS do_compile do_install do_stage do_configure +EXPORT_FUNCTIONS do_compile do_install do_configure # kernel-base becomes kernel-${KERNEL_VERSION} # kernel-image becomes kernel-image-${KERNEL_VERISON}
Signature · 1 line
1.7.0
linux-davinci git: add hack for hawkboard machine ID
From: Koen Kooi <[email protected]>
---
recipes/linux/linux-davinci_git.bb +7 -0
@@ -85,3 +85,10 @@ SRC_URI_append_da850-omapl138-evm = "file://logo_linux_clut224.ppm \ SRC_URI_append_hawkboard = "file://logo_linux_clut224.ppm \ file://da850_omapl138_opp456mhz.patch;patch=1 \ file://patch_hawk.diff;patch=1" + + +do_configure_prepend_hawkboard() { + sed -i s:2157:2495:g ${S}/arch/arm/tools/mach-types +} + +
Re: linux-davinci git: add hack for hawkboard machine ID
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Ignore this one, it was lingering in my git send-email outbox
Quoted 9 lines · Koen Kooi
From: Koen Kooi <[email protected]>
Signed-off-by Koen Kooi <[email protected]>---
recipes/linux/linux-davinci_git.bb +0
-0
recipes/linux/linux-davinci_git.bb SRC_URI_append_da850-omapl138-evm = "file://logo_linux_clut224.ppm \ · line 94
Quoted 10 lines
recipes/linux/linux-davinci_git.bb +7
-0@@ -85,3 +85,10 @@ SRC_URI_append_da850-omapl138-evm = "file://logo_linux_clut224.ppm \ SRC_URI_append_hawkboard = "file://logo_linux_clut224.ppm \ file://da850_omapl138_opp456mhz.patch;patch=1 \ file://patch_hawk.diff;patch=1" + + +do_configure_prepend_hawkboard() { + sed -i s:2157:2495:g ${S}/arch/arm/tools/mach-types +} + +
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
iD8DBQFLxuyWMkyGM64RGpERAggXAJsE+vrFBkI1FD1WbD9ojcm33TXc0ACfTtLp nDOGj7Bwd/7Hod0yp3ISDf4=
=Wl74
-----END PGP SIGNATURE-----
PATCH 2/2 recipes/linux: convert users of do_stage_append to new style staging
In reply to Koen Kooi--- recipes/linux/linux-bug_2.6.27.2.bb | 10 ++-- recipes/linux/linux-dht-walnut_2.6.20.bb | 12 ++-- recipes/linux/linux-dht-walnut_2.6.23.bb | 12 ++-- recipes/linux/linux-efika_2.6.20.20.bb | 14 +++--- recipes/linux/linux-efika_2.6.20.bb | 14 +++--- recipes/linux/linux-efika_2.6.21+git.bb | 14 +++--- recipes/linux/linux-magicbox_2.6.18.6.bb | 12 ++-- recipes/linux/linux-magicbox_2.6.19.2.bb | 12 ++-- recipes/linux/linux-ml403-mvista-2.6.x_git.bb | 14 +++--- recipes/linux/linux-nokia800_2.6.21-osso71.bb | 6 +- recipes/linux/linux-sequoia_2.6.21.bb | 14 +++--- recipes/linux/linux_2.6.20.bb | 70 ++++++++++++------------ recipes/linux/linux_2.6.26.bb | 6 +- recipes/linux/linux_2.6.27.bb | 6 +- 14 files changed, 108 insertions(+), 108 deletions(-)
recipes/linux/linux-bug_2.6.27.2.bb +5 -5
@@ -24,12 +24,12 @@ do_install_append() { cd ${D}/${KERNEL_IMAGEDEST} && ln -sf uImage-${KERNEL_VERSION} uImage } -do_stage_append() { - cp -fR arch/arm/include/asm/* ${STAGING_KERNEL_DIR}/include/asm/ - if [ ! -e ${STAGING_KERNEL_DIR}/include/mach ]; then - mkdir ${STAGING_KERNEL_DIR}/include/mach +do_install_append() { + cp -fR arch/arm/include/asm/* $kerneldir/include/asm/ + if [ ! -e $kerneldir/include/mach ]; then + mkdir $kerneldir/include/mach fi - cp -fR arch/arm/plat-mxc/include/mach/* ${STAGING_KERNEL_DIR}/include/mach/ + cp -fR arch/arm/plat-mxc/include/mach/* $kerneldir/include/mach/ } FILESDIR = "${WORKDIR}"
recipes/linux/linux-dht-walnut_2.6.20.bb +6 -6
@@ -19,15 +19,15 @@ FILES_kernel-image = "/boot/zImage.elf" export OS = "Linux" ARCH = "ppc" -do_stage_append () { +do_install_append () { #need ppc platforms includes + friends in order for external kernel modules to compile as headers as still split - install -d ${STAGING_KERNEL_DIR}/arch/ - cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/ - cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/ + install -d $kerneldir/arch/ + cp -pPR arch/ppc $kerneldir/arch/ + cp -pPR arch/powerpc $kerneldir/arch/ - cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ - cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-powerpc $kerneldir/include/ + cp -pPR include/asm-ppc $kerneldir/include/ } do_install_append () {
recipes/linux/linux-dht-walnut_2.6.23.bb +6 -6
@@ -21,15 +21,15 @@ FILES_kernel-image = "/boot/zImage.elf" export OS = "Linux" ARCH = "ppc" -do_stage_append () { +do_install_append () { #need ppc platforms includes + friends in order for external kernel modules to compile as headers as still split - install -d ${STAGING_KERNEL_DIR}/arch/ - cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/ - cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/ + install -d $kerneldir/arch/ + cp -pPR arch/ppc $kerneldir/arch/ + cp -pPR arch/powerpc $kerneldir/arch/ - cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ - cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-powerpc $kerneldir/include/ + cp -pPR include/asm-ppc $kerneldir/include/ } do_install_append () {
recipes/linux/linux-efika_2.6.20.20.bb +7 -7
@@ -59,16 +59,16 @@ do_configure() { make ARCH=${ARCH} oldconfig } -do_stage_append () { +do_install_append () { #need ppc platforms includes + friends in order for external kernel modules to compile as headers as still split - install -d ${STAGING_KERNEL_DIR}/arch/ - cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/ - cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/ + install -d $kerneldir/arch/ + cp -pPR arch/ppc $kerneldir/arch/ + cp -pPR arch/powerpc $kerneldir/arch/ - install -d ${STAGING_KERNEL_DIR}/include/asm - cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ - cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/ + install -d $kerneldir/include/asm + cp -pPR include/asm-powerpc $kerneldir/include/ + cp -pPR include/asm-ppc $kerneldir/include/ } SRC_URI[kernel.md5sum] = "34b0f354819217e6a345f48ebbd8f13e"
recipes/linux/linux-efika_2.6.20.bb +7 -7
@@ -56,16 +56,16 @@ do_configure() { make ARCH=${ARCH} oldconfig } -do_stage_append () { +do_install_append () { #need ppc platforms includes + friends in order for external kernel modules to compile as headers as still split - install -d ${STAGING_KERNEL_DIR}/arch/ - cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/ - cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/ + install -d $kerneldir/arch/ + cp -pPR arch/ppc $kerneldir/arch/ + cp -pPR arch/powerpc $kerneldir/arch/ - install -d ${STAGING_KERNEL_DIR}/include/asm - cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ - cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/ + install -d $kerneldir/include/asm + cp -pPR include/asm-powerpc $kerneldir/include/ + cp -pPR include/asm-ppc $kerneldir/include/ } SRC_URI[md5sum] = "34b0f354819217e6a345f48ebbd8f13e"
recipes/linux/linux-efika_2.6.21+git.bb +7 -7
@@ -43,14 +43,14 @@ do_configure() { make ARCH=${ARCH} oldconfig } -do_stage_append () { +do_install_append () { #need ppc platforms includes + friends in order for external kernel modules to compile as headers as still split - install -d ${STAGING_KERNEL_DIR}/arch/ - cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/ - cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/ + install -d $kerneldir/arch/ + cp -pPR arch/ppc $kerneldir/arch/ + cp -pPR arch/powerpc $kerneldir/arch/ - install -d ${STAGING_KERNEL_DIR}/include/asm - cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ - cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/ + install -d $kerneldir/include/asm + cp -pPR include/asm-powerpc $kerneldir/include/ + cp -pPR include/asm-ppc $kerneldir/include/ }
recipes/linux/linux-magicbox_2.6.18.6.bb +6 -6
@@ -40,15 +40,15 @@ do_configure_prepend() { } -do_stage_append () { +do_install_append () { #need ppc platforms includes + friends in order for external kernel modules to compile as headers as still split - install -d ${STAGING_KERNEL_DIR}/arch/ - cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/ - cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/ + install -d $kerneldir/arch/ + cp -pPR arch/ppc $kerneldir/arch/ + cp -pPR arch/powerpc $kerneldir/arch/ - cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ - cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-powerpc $kerneldir/include/ + cp -pPR include/asm-ppc $kerneldir/include/ }
recipes/linux/linux-magicbox_2.6.19.2.bb +6 -6
@@ -73,15 +73,15 @@ do_configure_prepend() { } -do_stage_append () { +do_install_append () { #need ppc platforms includes + friends in order for external kernel modules to compile as headers as still split - install -d ${STAGING_KERNEL_DIR}/arch/ - cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/ - cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/ + install -d $kerneldir/arch/ + cp -pPR arch/ppc $kerneldir/arch/ + cp -pPR arch/powerpc $kerneldir/arch/ - cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ - cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-powerpc $kerneldir/include/ + cp -pPR include/asm-ppc $kerneldir/include/ }
recipes/linux/linux-ml403-mvista-2.6.x_git.bb +7 -7
@@ -29,16 +29,16 @@ do_configure() { make ARCH=${ARCH} oldconfig } -do_stage_append () { +do_install_append () { #need ppc platforms includes + friends in order for external kernel modules to compile as headers a$ - install -d ${STAGING_KERNEL_DIR}/arch/ - cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/ - cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/ + install -d $kerneldir/arch/ + cp -pPR arch/ppc $kerneldir/arch/ + cp -pPR arch/powerpc $kerneldir/arch/ - install -d ${STAGING_KERNEL_DIR}/include/asm - cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ - cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/ + install -d $kerneldir/include/asm + cp -pPR include/asm-powerpc $kerneldir/include/ + cp -pPR include/asm-ppc $kerneldir/include/ }
recipes/linux/linux-nokia800_2.6.21-osso71.bb +3 -3
@@ -13,9 +13,9 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.21.tar.bz2;name=k S = "${WORKDIR}/linux-2.6.21" -do_stage_append () { - mkdir -p ${STAGING_KERNEL_DIR}/drivers/media/video/omap/ - cp -f drivers/media/video/omap/tcm825x.h ${STAGING_KERNEL_DIR}/drivers/media/video/omap/ +do_install_append () { + mkdir -p $kerneldir/drivers/media/video/omap/ + cp -f drivers/media/video/omap/tcm825x.h $kerneldir/drivers/media/video/omap/ } SRC_URI[kernel.md5sum] = "1b515f588078dfa7f4bab2634bd17e80"
recipes/linux/linux-sequoia_2.6.21.bb +7 -7
@@ -27,16 +27,16 @@ do_configure() { make ARCH=${ARCH} oldconfig } -do_stage_append () { +do_install_append () { #need ppc platforms includes + friends in order for external kernel modules to compile as headers a$ - install -d ${STAGING_KERNEL_DIR}/arch/ - cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/ - cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/ + install -d $kerneldir/arch/ + cp -pPR arch/ppc $kerneldir/arch/ + cp -pPR arch/powerpc $kerneldir/arch/ - install -d ${STAGING_KERNEL_DIR}/include/asm - cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ - cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/ + install -d $kerneldir/include/asm + cp -pPR include/asm-powerpc $kerneldir/include/ + cp -pPR include/asm-ppc $kerneldir/include/ } #seems like 2.6.21 kernel images have moved (or is this only for the Denx kernel ?)
recipes/linux/linux_2.6.20.bb +35 -35
80 lines not on this page · raw message
recipes/linux/linux_2.6.26.bb +3 -3
@@ -40,10 +40,10 @@ SRC_URI_append_mpc8313e-rdb = "\ SRC_URI_append_topas910 = "http://www.bplan-gmbh.org/data/toshiba/topas/linux/2.6.26.5/patch_2.6.26.5_topas910.bz2;patch=1;name=topaspatch" # see http://bugzilla.kernel.org/show_bug.cgi?id=11143 -do_stage_append() { +do_install_append() { if [ -f arch/${ARCH}/lib/crtsavres.o ]; then - mkdir -p ${STAGING_KERNEL_DIR}/arch/${ARCH}/lib - cp -a arch/${ARCH}/lib/crtsavres.o ${STAGING_KERNEL_DIR}/arch/${ARCH}/lib/ + mkdir -p $kerneldir/arch/${ARCH}/lib + cp -a arch/${ARCH}/lib/crtsavres.o $kerneldir/arch/${ARCH}/lib/ fi }
recipes/linux/linux_2.6.27.bb +3 -3
@@ -77,10 +77,10 @@ SRC_URI_append_ts72xx = "\ " # see http://bugzilla.kernel.org/show_bug.cgi?id=11143 -do_stage_append() { +do_install_append() { if [ -f arch/${ARCH}/lib/crtsavres.o ]; then - mkdir -p ${STAGING_KERNEL_DIR}/arch/${ARCH}/lib - cp -a arch/${ARCH}/lib/crtsavres.o ${STAGING_KERNEL_DIR}/arch/${ARCH}/lib/ + mkdir -p $kerneldir/arch/${ARCH}/lib + cp -a arch/${ARCH}/lib/crtsavres.o $kerneldir/arch/${ARCH}/lib/ fi }
Signature · 1 line
1.7.0
Re: [PATCH 2/2] recipes/linux: convert users of do_stage_append to new style staging
Quoted 419 lines · Koen Kooi
--- recipes/linux/linux-bug_2.6.27.2.bb | 10 ++-- recipes/linux/linux-dht-walnut_2.6.20.bb | 12 ++-- recipes/linux/linux-dht-walnut_2.6.23.bb | 12 ++-- recipes/linux/linux-efika_2.6.20.20.bb | 14 +++--- recipes/linux/linux-efika_2.6.20.bb | 14 +++--- recipes/linux/linux-efika_2.6.21+git.bb | 14 +++--- recipes/linux/linux-magicbox_2.6.18.6.bb | 12 ++-- recipes/linux/linux-magicbox_2.6.19.2.bb | 12 ++-- recipes/linux/linux-ml403-mvista-2.6.x_git.bb | 14 +++--- recipes/linux/linux-nokia800_2.6.21-osso71.bb | 6 +- recipes/linux/linux-sequoia_2.6.21.bb | 14 +++--- recipes/linux/linux_2.6.20.bb | 70 ++++++++++++------------ recipes/linux/linux_2.6.26.bb | 6 +- recipes/linux/linux_2.6.27.bb | 6 +- 14 files changed, 108 insertions(+), 108 deletions(-)recipes/linux/linux-bug_2.6.27.2.bb +5
-5@@ -24,12 +24,12 @@ do_install_append() { cd ${D}/${KERNEL_IMAGEDEST}&& ln -sf uImage-${KERNEL_VERSION} uImage } -do_stage_append() { - cp -fR arch/arm/include/asm/* ${STAGING_KERNEL_DIR}/include/asm/ - if [ ! -e ${STAGING_KERNEL_DIR}/include/mach ]; then - mkdir ${STAGING_KERNEL_DIR}/include/mach +do_install_append() { + cp -fR arch/arm/include/asm/* $kerneldir/include/asm/ + if [ ! -e $kerneldir/include/mach ]; then + mkdir $kerneldir/include/mach fi - cp -fR arch/arm/plat-mxc/include/mach/* ${STAGING_KERNEL_DIR}/include/mach/ + cp -fR arch/arm/plat-mxc/include/mach/* $kerneldir/include/mach/ } FILESDIR = "${WORKDIR}"recipes/linux/linux-dht-walnut_2.6.20.bb +6
-6@@ -19,15 +19,15 @@ FILES_kernel-image = "/boot/zImage.elf" export OS = "Linux" ARCH = "ppc" -do_stage_append () { +do_install_append () { #need ppc platforms includes + friends in order for external kernel modules to compile as headers as still split - install -d ${STAGING_KERNEL_DIR}/arch/ - cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/ - cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/ + install -d $kerneldir/arch/ + cp -pPR arch/ppc $kerneldir/arch/ + cp -pPR arch/powerpc $kerneldir/arch/ - cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ - cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-powerpc $kerneldir/include/ + cp -pPR include/asm-ppc $kerneldir/include/ } do_install_append () {recipes/linux/linux-dht-walnut_2.6.23.bb +6
-6@@ -21,15 +21,15 @@ FILES_kernel-image = "/boot/zImage.elf" export OS = "Linux" ARCH = "ppc" -do_stage_append () { +do_install_append () { #need ppc platforms includes + friends in order for external kernel modules to compile as headers as still split - install -d ${STAGING_KERNEL_DIR}/arch/ - cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/ - cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/ + install -d $kerneldir/arch/ + cp -pPR arch/ppc $kerneldir/arch/ + cp -pPR arch/powerpc $kerneldir/arch/ - cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ - cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-powerpc $kerneldir/include/ + cp -pPR include/asm-ppc $kerneldir/include/ } do_install_append () {recipes/linux/linux-efika_2.6.20.20.bb +7
-7@@ -59,16 +59,16 @@ do_configure() { make ARCH=${ARCH} oldconfig } -do_stage_append () { +do_install_append () { #need ppc platforms includes + friends in order for external kernel modules to compile as headers as still split - install -d ${STAGING_KERNEL_DIR}/arch/ - cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/ - cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/ + install -d $kerneldir/arch/ + cp -pPR arch/ppc $kerneldir/arch/ + cp -pPR arch/powerpc $kerneldir/arch/ - install -d ${STAGING_KERNEL_DIR}/include/asm - cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ - cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/ + install -d $kerneldir/include/asm + cp -pPR include/asm-powerpc $kerneldir/include/ + cp -pPR include/asm-ppc $kerneldir/include/ } SRC_URI[kernel.md5sum] = "34b0f354819217e6a345f48ebbd8f13e"recipes/linux/linux-efika_2.6.20.bb +7
-7@@ -56,16 +56,16 @@ do_configure() { make ARCH=${ARCH} oldconfig } -do_stage_append () { +do_install_append () { #need ppc platforms includes + friends in order for external kernel modules to compile as headers as still split - install -d ${STAGING_KERNEL_DIR}/arch/ - cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/ - cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/ + install -d $kerneldir/arch/ + cp -pPR arch/ppc $kerneldir/arch/ + cp -pPR arch/powerpc $kerneldir/arch/ - install -d ${STAGING_KERNEL_DIR}/include/asm - cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ - cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/ + install -d $kerneldir/include/asm + cp -pPR include/asm-powerpc $kerneldir/include/ + cp -pPR include/asm-ppc $kerneldir/include/ } SRC_URI[md5sum] = "34b0f354819217e6a345f48ebbd8f13e"recipes/linux/linux-efika_2.6.21+git.bb +7
-7@@ -43,14 +43,14 @@ do_configure() { make ARCH=${ARCH} oldconfig } -do_stage_append () { +do_install_append () { #need ppc platforms includes + friends in order for external kernel modules to compile as headers as still split - install -d ${STAGING_KERNEL_DIR}/arch/ - cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/ - cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/ + install -d $kerneldir/arch/ + cp -pPR arch/ppc $kerneldir/arch/ + cp -pPR arch/powerpc $kerneldir/arch/ - install -d ${STAGING_KERNEL_DIR}/include/asm - cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ - cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/ + install -d $kerneldir/include/asm + cp -pPR include/asm-powerpc $kerneldir/include/ + cp -pPR include/asm-ppc $kerneldir/include/ }recipes/linux/linux-magicbox_2.6.18.6.bb +6
-6@@ -40,15 +40,15 @@ do_configure_prepend() { } -do_stage_append () { +do_install_append () { #need ppc platforms includes + friends in order for external kernel modules to compile as headers as still split - install -d ${STAGING_KERNEL_DIR}/arch/ - cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/ - cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/ + install -d $kerneldir/arch/ + cp -pPR arch/ppc $kerneldir/arch/ + cp -pPR arch/powerpc $kerneldir/arch/ - cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ - cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-powerpc $kerneldir/include/ + cp -pPR include/asm-ppc $kerneldir/include/ }recipes/linux/linux-magicbox_2.6.19.2.bb +6
-6@@ -73,15 +73,15 @@ do_configure_prepend() { } -do_stage_append () { +do_install_append () { #need ppc platforms includes + friends in order for external kernel modules to compile as headers as still split - install -d ${STAGING_KERNEL_DIR}/arch/ - cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/ - cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/ + install -d $kerneldir/arch/ + cp -pPR arch/ppc $kerneldir/arch/ + cp -pPR arch/powerpc $kerneldir/arch/ - cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ - cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-powerpc $kerneldir/include/ + cp -pPR include/asm-ppc $kerneldir/include/ }recipes/linux/linux-ml403-mvista-2.6.x_git.bb +7
-7@@ -29,16 +29,16 @@ do_configure() { make ARCH=${ARCH} oldconfig } -do_stage_append () { +do_install_append () { #need ppc platforms includes + friends in order for external kernel modules to compile as headers a$ - install -d ${STAGING_KERNEL_DIR}/arch/ - cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/ - cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/ + install -d $kerneldir/arch/ + cp -pPR arch/ppc $kerneldir/arch/ + cp -pPR arch/powerpc $kerneldir/arch/ - install -d ${STAGING_KERNEL_DIR}/include/asm - cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ - cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/ + install -d $kerneldir/include/asm + cp -pPR include/asm-powerpc $kerneldir/include/ + cp -pPR include/asm-ppc $kerneldir/include/ }recipes/linux/linux-nokia800_2.6.21-osso71.bb +3
-3@@ -13,9 +13,9 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.21.tar.bz2;name=k S = "${WORKDIR}/linux-2.6.21" -do_stage_append () { - mkdir -p ${STAGING_KERNEL_DIR}/drivers/media/video/omap/ - cp -f drivers/media/video/omap/tcm825x.h ${STAGING_KERNEL_DIR}/drivers/media/video/omap/ +do_install_append () { + mkdir -p $kerneldir/drivers/media/video/omap/ + cp -f drivers/media/video/omap/tcm825x.h $kerneldir/drivers/media/video/omap/ } SRC_URI[kernel.md5sum] = "1b515f588078dfa7f4bab2634bd17e80"recipes/linux/linux-sequoia_2.6.21.bb +7
-7@@ -27,16 +27,16 @@ do_configure() { make ARCH=${ARCH} oldconfig } -do_stage_append () { +do_install_append () { #need ppc platforms includes + friends in order for external kernel modules to compile as headers a$ - install -d ${STAGING_KERNEL_DIR}/arch/ - cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/ - cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/ + install -d $kerneldir/arch/ + cp -pPR arch/ppc $kerneldir/arch/ + cp -pPR arch/powerpc $kerneldir/arch/ - install -d ${STAGING_KERNEL_DIR}/include/asm - cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ - cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/ + install -d $kerneldir/include/asm + cp -pPR include/asm-powerpc $kerneldir/include/ + cp -pPR include/asm-ppc $kerneldir/include/ } #seems like 2.6.21 kernel images have moved (or is this only for the Denx kernel ?)recipes/linux/linux_2.6.20.bb +35
-35@@ -41,45 +41,45 @@ SRC_URI_append_nhk15 = " \ file://hrw-make-create-kconfig-executable.patch;patch=1 \ " -do_stage_append_nhk15 () { - install -D -m 666 ${S}/drivers/video/nomadik/sga_interface.h ${STAGING_KERNEL_DIR}/drivers/video/nomadik/sga_interface.h - install -D -m 666 ${S}/drivers/video/nomadik/sga_defs.h ${STAGING_KERNEL_DIR}/drivers/video/nomadik/sga_defs.h - install -D -m 666 ${S}/drivers/video/nomadik/sga_err.h ${STAGING_KERNEL_DIR}/drivers/video/nomadik/sga_err.h - install -D -m 666 ${S}/drivers/video/nomadik/sga_interface.h ${STAGING_KERNEL_DIR}/drivers/video/nomadik/sga_interface.h - install -D -m 666 ${S}/drivers/video/nomadik/sga_ioctlfns.h ${STAGING_KERNEL_DIR}/drivers/video/nomadik/sga_ioctlfns.h - install -D -m 666 ${S}/drivers/video/nomadik/sga_main.h ${STAGING_KERNEL_DIR}/drivers/video/nomadik/sga_main.h - install -D -m 666 ${S}/drivers/video/nomadik/sga_typs.h ${STAGING_KERNEL_DIR}/drivers/video/nomadik/sga_typs.h +do_install_append_nhk15 () { + install -D -m 666 ${S}/drivers/video/nomadik/sga_interface.h $kerneldir/drivers/video/nomadik/sga_interface.h + install -D -m 666 ${S}/drivers/video/nomadik/sga_defs.h $kerneldir/drivers/video/nomadik/sga_defs.h + install -D -m 666 ${S}/drivers/video/nomadik/sga_err.h $kerneldir/drivers/video/nomadik/sga_err.h + install -D -m 666 ${S}/drivers/video/nomadik/sga_interface.h $kerneldir/drivers/video/nomadik/sga_interface.h + install -D -m 666 ${S}/drivers/video/nomadik/sga_ioctlfns.h $kerneldir/drivers/video/nomadik/sga_ioctlfns.h + install -D -m 666 ${S}/drivers/video/nomadik/sga_main.h $kerneldir/drivers/video/nomadik/sga_main.h + install -D -m 666 ${S}/drivers/video/nomadik/sga_typs.h $kerneldir/drivers/video/nomadik/sga_typs.h - install -D -m 666 ${S}/drivers/video/nomadik/hcl/debug.h ${STAGING_KERNEL_DIR}/drivers/video/nomadik/hcl/debug.h - install -D -m 666 ${S}/drivers/video/nomadik/hcl/hcl_defs.h ${STAGING_KERNEL_DIR}/drivers/video/nomadik/hcl/hcl_defs.h - install -D -m 666 ${S}/drivers/video/nomadik/hcl/platform_os.h ${STAGING_KERNEL_DIR}/drivers/video/nomadik/hcl/platform_os.h - install -D -m 666 ${S}/drivers/video/nomadik/hcl/sga.h ${STAGING_KERNEL_DIR}/drivers/video/nomadik/hcl/sga.h - install -D -m 666 ${S}/drivers/video/nomadik/hcl/sga_irq.h ${STAGING_KERNEL_DIR}/drivers/video/nomadik/hcl/sga_irq.h - install -D -m 666 ${S}/drivers/video/nomadik/hcl/sga_irqp.h ${STAGING_KERNEL_DIR}/drivers/video/nomadik/hcl/sga_irqp.h - install -D -m 666 ${S}/drivers/video/nomadik/hcl/sga_p.h ${STAGING_KERNEL_DIR}/drivers/video/nomadik/hcl/sga_p.h + install -D -m 666 ${S}/drivers/video/nomadik/hcl/debug.h $kerneldir/drivers/video/nomadik/hcl/debug.h + install -D -m 666 ${S}/drivers/video/nomadik/hcl/hcl_defs.h $kerneldir/drivers/video/nomadik/hcl/hcl_defs.h + install -D -m 666 ${S}/drivers/video/nomadik/hcl/platform_os.h $kerneldir/drivers/video/nomadik/hcl/platform_os.h + install -D -m 666 ${S}/drivers/video/nomadik/hcl/sga.h $kerneldir/drivers/video/nomadik/hcl/sga.h + install -D -m 666 ${S}/drivers/video/nomadik/hcl/sga_irq.h $kerneldir/drivers/video/nomadik/hcl/sga_irq.h + install -D -m 666 ${S}/drivers/video/nomadik/hcl/sga_irqp.h $kerneldir/drivers/video/nomadik/hcl/sga_irqp.h + install -D -m 666 ${S}/drivers/video/nomadik/hcl/sga_p.h $kerneldir/drivers/video/nomadik/hcl/sga_p.h - install -D -m 666 ${S}/drivers/media/video/hcl_defs.h ${STAGING_KERNEL_DIR}/drivers/video/nomadik/hcl_defs.h - install -D -m 666 ${S}/drivers/media/video/nomadik_camera.h ${STAGING_KERNEL_DIR}/drivers/video/nomadik/nomadik_camera.h - install -D -m 666 ${S}/drivers/media/video/nomadik_defs.h ${STAGING_KERNEL_DIR}/drivers/video/nomadik/nomadik_defs.h - install -D -m 666 ${S}/drivers/media/video/nomadik_sva.h ${STAGING_KERNEL_DIR}/drivers/video/nomadik/nomadik_sva.h - install -D -m 666 ${S}/drivers/media/video/nomadik_sva_services.h ${STAGING_KERNEL_DIR}/drivers/video/nomadik/nomadik_sva_services.h - install -D -m 666 ${S}/drivers/media/video/nomadik_sva_utils.h ${STAGING_KERNEL_DIR}/drivers/video/nomadik/nomadik_sva_utils.h - install -D -m 666 ${S}/drivers/media/video/platform_os.h ${STAGING_KERNEL_DIR}/drivers/video/nomadik/platform_os.h - install -D -m 666 ${S}/drivers/media/video/sva.h ${STAGING_KERNEL_DIR}/drivers/video/nomadik/sva.h - install -D -m 666 ${S}/drivers/media/video/v4l2-nomadik.h ${STAGING_KERNEL_DIR}/drivers/video/nomadik/v4l2-nomadik.h + install -D -m 666 ${S}/drivers/media/video/hcl_defs.h $kerneldir/drivers/video/nomadik/hcl_defs.h + install -D -m 666 ${S}/drivers/media/video/nomadik_camera.h $kerneldir/drivers/video/nomadik/nomadik_camera.h + install -D -m 666 ${S}/drivers/media/video/nomadik_defs.h $kerneldir/drivers/video/nomadik/nomadik_defs.h + install -D -m 666 ${S}/drivers/media/video/nomadik_sva.h $kerneldir/drivers/video/nomadik/nomadik_sva.h + install -D -m 666 ${S}/drivers/media/video/nomadik_sva_services.h $kerneldir/drivers/video/nomadik/nomadik_sva_services.h + install -D -m 666 ${S}/drivers/media/video/nomadik_sva_utils.h $kerneldir/drivers/video/nomadik/nomadik_sva_utils.h + install -D -m 666 ${S}/drivers/media/video/platform_os.h $kerneldir/drivers/video/nomadik/platform_os.h + install -D -m 666 ${S}/drivers/media/video/sva.h $kerneldir/drivers/video/nomadik/sva.h + install -D -m 666 ${S}/drivers/media/video/v4l2-nomadik.h $kerneldir/drivers/video/nomadik/v4l2-nomadik.h - install -D -m 666 ${S}/drivers/media/nomadik_mm/saa/saaioctl.h ${STAGING_KERNEL_DIR}/include/saaioctl.h - install -D -m 666 ${S}/drivers/media/nomadik_mm/hcl/saa/saa.h ${STAGING_KERNEL_DIR}/../multimedia/include/saa.h - install -D -m 666 ${S}/drivers/media/nomadik_mm/hcl/include/hcl_defs.h ${STAGING_KERNEL_DIR}/../multimedia/include/hcl_defs.h - install -D -m 666 ${S}/drivers/media/nomadik_mm/hcl/include/platform_os.h ${STAGING_KERNEL_DIR}/../multimedia/include/platform_os.h - install -D -m 666 ${S}/drivers/media/nomadik_mm/hcl/include/debug.h ${STAGING_KERNEL_DIR}/../multimedia/include/debug.h + install -D -m 666 ${S}/drivers/media/nomadik_mm/saa/saaioctl.h $kerneldir/include/saaioctl.h + install -D -m 666 ${S}/drivers/media/nomadik_mm/hcl/saa/saa.h $kerneldir/../multimedia/include/saa.h + install -D -m 666 ${S}/drivers/media/nomadik_mm/hcl/include/hcl_defs.h $kerneldir/../multimedia/include/hcl_defs.h + install -D -m 666 ${S}/drivers/media/nomadik_mm/hcl/include/platform_os.h $kerneldir/../multimedia/include/platform_os.h + install -D -m 666 ${S}/drivers/media/nomadik_mm/hcl/include/debug.h $kerneldir/../multimedia/include/debug.h - install -D -m 666 ${S}/drivers/media/nomadik_mm/hcl/saa/ha_hcl_fw_interface.h ${STAGING_KERNEL_DIR}/../multimedia/include/ha_hcl_fw_interface.h - install -D -m 666 ${S}/drivers/media/nomadik_mm/hcl/saa/ha_api_params.h ${STAGING_KERNEL_DIR}/../multimedia/include/ha_api_params.h - install -D -m 666 ${S}/drivers/media/nomadik_mm/hcl/saa/ha_codec_params.h ${STAGING_KERNEL_DIR}/../multimedia/include/ha_codec_params.h - install -D -m 666 ${S}/drivers/media/nomadik_mm/hcl/saa/ha_effect_params.h ${STAGING_KERNEL_DIR}/../multimedia/include/ha_effect_params.h - install -D -m 666 ${S}/drivers/media/nomadik_mm/hcl/saa/ha_effect_info.h ${STAGING_KERNEL_DIR}/../multimedia/include/ha_effect_info.h - install -D -m 666 ${S}/drivers/media/nomadik_mm/hcl/saa/ha_codec_info.h ${STAGING_KERNEL_DIR}/../multimedia/include/ha_codec_info.h + install -D -m 666 ${S}/drivers/media/nomadik_mm/hcl/saa/ha_hcl_fw_interface.h $kerneldir/../multimedia/include/ha_hcl_fw_interface.h + install -D -m 666 ${S}/drivers/media/nomadik_mm/hcl/saa/ha_api_params.h $kerneldir/../multimedia/include/ha_api_params.h + install -D -m 666 ${S}/drivers/media/nomadik_mm/hcl/saa/ha_codec_params.h $kerneldir/../multimedia/include/ha_codec_params.h + install -D -m 666 ${S}/drivers/media/nomadik_mm/hcl/saa/ha_effect_params.h $kerneldir/../multimedia/include/ha_effect_params.h + install -D -m 666 ${S}/drivers/media/nomadik_mm/hcl/saa/ha_effect_info.h $kerneldir/../multimedia/include/ha_effect_info.h + install -D -m 666 ${S}/drivers/media/nomadik_mm/hcl/saa/ha_codec_info.h $kerneldir/../multimedia/include/ha_codec_info.h }recipes/linux/linux_2.6.26.bb +3
-3@@ -40,10 +40,10 @@ SRC_URI_append_mpc8313e-rdb = "\ SRC_URI_append_topas910 = "http://www.bplan-gmbh.org/data/toshiba/topas/linux/2.6.26.5/patch_2.6.26.5_topas910.bz2;patch=1;name=topaspatch" # see http://bugzilla.kernel.org/show_bug.cgi?id=11143 -do_stage_append() { +do_install_append() { if [ -f arch/${ARCH}/lib/crtsavres.o ]; then - mkdir -p ${STAGING_KERNEL_DIR}/arch/${ARCH}/lib - cp -a arch/${ARCH}/lib/crtsavres.o ${STAGING_KERNEL_DIR}/arch/${ARCH}/lib/ + mkdir -p $kerneldir/arch/${ARCH}/lib + cp -a arch/${ARCH}/lib/crtsavres.o $kerneldir/arch/${ARCH}/lib/ fi }recipes/linux/linux_2.6.27.bb +3
-3@@ -77,10 +77,10 @@ SRC_URI_append_ts72xx = "\ " # see http://bugzilla.kernel.org/show_bug.cgi?id=11143 -do_stage_append() { +do_install_append() { if [ -f arch/${ARCH}/lib/crtsavres.o ]; then - mkdir -p ${STAGING_KERNEL_DIR}/arch/${ARCH}/lib - cp -a arch/${ARCH}/lib/crtsavres.o ${STAGING_KERNEL_DIR}/arch/${ARCH}/lib/ + mkdir -p $kerneldir/arch/${ARCH}/lib + cp -a arch/${ARCH}/lib/crtsavres.o $kerneldir/arch/${ARCH}/lib/ fi }
Both
Quoted 200 lines · Koen Kooi
--- classes/kernel.bbclass | 135 ++++++++++++++++++++++++------------------------ 1 files changed, 67 insertions(+), 68 deletions(-)classes/kernel.bbclass +67
-68@@ -97,108 +97,107 @@ kernel_do_compile() { } kernel_do_compile[depends] = "${INITRAMFS_TASK}" -kernel_do_stage() { +kernel_do_install() { + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE + if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then + oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" modules_install + else + oenote "no modules to install" + fi + + install -d ${D}/${KERNEL_IMAGEDEST} + install -d ${D}/boot + install -m 0644 ${KERNEL_OUTPUT} ${D}/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-${KERNEL_VERSION} + install -m 0644 System.map ${D}/boot/System.map-${KERNEL_VERSION} + install -m 0644 .config ${D}/boot/config-${KERNEL_VERSION} + install -m 0644 vmlinux ${D}/boot/vmlinux-${KERNEL_VERSION} + [ -e Module.symvers ] && install -m 0644 Module.symvers ${D}/boot/Module.symvers-${KERNEL_VERSION} + install -d ${D}/etc/modutils + if [ "${KERNEL_MAJOR_VERSION}" = "2.6" ]; then + install -d ${D}/etc/modprobe.d + fi + + # Check if scripts/genksyms exists and if so, build it + if [ -e scripts/genksyms/ ]; then + oe_runmake SUBDIRS="scripts/genksyms" + fi + + kerneldir=${D}/kernel/ + if [ -e include/asm ] ; then # This link is generated only in kernel before 2.6.33-rc1, don't stage it for newer kernels ASMDIR=`readlink include/asm` - mkdir -p ${STAGING_KERNEL_DIR}/include/$ASMDIR - cp -fR include/$ASMDIR/* ${STAGING_KERNEL_DIR}/include/$ASMDIR/ + mkdir -p $kerneldir/include/$ASMDIR + cp -fR include/$ASMDIR/* $kerneldir/include/$ASMDIR/ fi + + cp -fR include/$ASMDIR/* $kerneldir/include/$ASMDIR/ # Kernel 2.6.27 moved headers from includes/asm-${ARCH} to arch/${ARCH}/include/asm if [ -e arch/${ARCH}/include/asm/ ] ; then - if [ -e include/asm ] ; then - cp -fR arch/${ARCH}/include/asm/* ${STAGING_KERNEL_DIR}/include/$ASMDIR/ - fi - install -d ${STAGING_KERNEL_DIR}/arch/${ARCH}/include - cp -fR arch/${ARCH}/* ${STAGING_KERNEL_DIR}/arch/${ARCH}/ + cp -fR arch/${ARCH}/include/asm/* $kerneldir/include/$ASMDIR/ + install -d $kerneldir/arch/${ARCH}/include + cp -fR arch/${ARCH}/* $kerneldir/arch/${ARCH}/ # Check for arch/x86 on i386 elif [ -d arch/x86/include/asm/ ]; then - if [ -e include/asm ] ; then - cp -fR arch/x86/include/asm/* ${STAGING_KERNEL_DIR}/include/asm-x86/ - fi - install -d ${STAGING_KERNEL_DIR}/arch/x86/include - cp -fR arch/x86/* ${STAGING_KERNEL_DIR}/arch/x86/ + cp -fR arch/x86/include/asm/* $kerneldir/include/asm-x86/ + install -d $kerneldir/arch/x86/include + cp -fR arch/x86/* $kerneldir/arch/x86/ fi if [ -e include/asm ] ; then - rm -f ${STAGING_KERNEL_DIR}/include/asm - ln -sf $ASMDIR ${STAGING_KERNEL_DIR}/include/asm + rm -f $kerneldir/include/asm + ln -sf $ASMDIR $kerneldir/include/asm fi - mkdir -p ${STAGING_KERNEL_DIR}/include/asm-generic - cp -fR include/asm-generic/* ${STAGING_KERNEL_DIR}/include/asm-generic/ + mkdir -p $kerneldir/include/asm-generic + cp -fR include/asm-generic/* $kerneldir/include/asm-generic/ for entry in drivers/crypto drivers/media include/generated include/linux include/net include/pcmcia include/media include/acpi include/sound include/video include/scsi include/trace; do if [ -d $entry ]; then - mkdir -p ${STAGING_KERNEL_DIR}/$entry - cp -fR $entry/* ${STAGING_KERNEL_DIR}/$entry/ + mkdir -p $kerneldir/$entry + cp -fR $entry/* $kerneldir/$entry/ fi done if [ -d drivers/sound ]; then # 2.4 alsa needs some headers from this directory - mkdir -p ${STAGING_KERNEL_DIR}/include/drivers/sound - cp -fR drivers/sound/*.h ${STAGING_KERNEL_DIR}/include/drivers/sound/ + mkdir -p $kerneldir/include/drivers/sound + cp -fR drivers/sound/*.h $kerneldir/include/drivers/sound/ fi - install -m 0644 .config ${STAGING_KERNEL_DIR}/config-${KERNEL_VERSION} - ln -sf config-${KERNEL_VERSION} ${STAGING_KERNEL_DIR}/.config - ln -sf config-${KERNEL_VERSION} ${STAGING_KERNEL_DIR}/kernel-config - echo "${KERNEL_VERSION}" >${STAGING_KERNEL_DIR}/kernel-abiversion - echo "${S}" >${STAGING_KERNEL_DIR}/kernel-source - echo "${KERNEL_CCSUFFIX}" >${STAGING_KERNEL_DIR}/kernel-ccsuffix - echo "${KERNEL_LDSUFFIX}" >${STAGING_KERNEL_DIR}/kernel-ldsuffix - [ -e Rules.make ] && install -m 0644 Rules.make ${STAGING_KERNEL_DIR}/ - [ -e Makefile ] && install -m 0644 Makefile ${STAGING_KERNEL_DIR}/ + install -m 0644 .config $kerneldir/config-${KERNEL_VERSION} + ln -sf config-${KERNEL_VERSION} $kerneldir/.config + ln -sf config-${KERNEL_VERSION} $kerneldir/kernel-config + echo "${KERNEL_VERSION}" >$kerneldir/kernel-abiversion + echo "${S}" >$kerneldir/kernel-source + echo "${KERNEL_CCSUFFIX}" >$kerneldir/kernel-ccsuffix + echo "${KERNEL_LDSUFFIX}" >$kerneldir/kernel-ldsuffix + [ -e Rules.make ] && install -m 0644 Rules.make $kerneldir/ + [ -e Makefile ] && install -m 0644 Makefile $kerneldir/ # Check if arch/${ARCH}/Makefile exists and install it if [ -e arch/${ARCH}/Makefile ]; then - install -d ${STAGING_KERNEL_DIR}/arch/${ARCH} - install -m 0644 arch/${ARCH}/Makefile* ${STAGING_KERNEL_DIR}/arch/${ARCH} + install -d $kerneldir/arch/${ARCH} + install -m 0644 arch/${ARCH}/Makefile* $kerneldir/arch/${ARCH} # Otherwise check arch/x86/Makefile for i386 and x86_64 on kernels >= 2.6.24 elif [ -e arch/x86/Makefile ]; then - install -d ${STAGING_KERNEL_DIR}/arch/x86 - install -m 0644 arch/x86/Makefile* ${STAGING_KERNEL_DIR}/arch/x86 + install -d $kerneldir/arch/x86 + install -m 0644 arch/x86/Makefile* $kerneldir/arch/x86 fi - cp -fR include/config* ${STAGING_KERNEL_DIR}/include/ + cp -fR include/config* $kerneldir/include/ # Install kernel images and system.map to staging - [ -e vmlinux ] && install -m 0644 vmlinux ${STAGING_KERNEL_DIR}/ - install -m 0644 ${KERNEL_OUTPUT} ${STAGING_KERNEL_DIR}/${KERNEL_IMAGETYPE} - install -m 0644 System.map ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} - [ -e Module.symvers ] && install -m 0644 Module.symvers ${STAGING_KERNEL_DIR}/ + [ -e vmlinux ] && install -m 0644 vmlinux $kerneldir/ + install -m 0644 ${KERNEL_OUTPUT} $kerneldir/${KERNEL_IMAGETYPE} + install -m 0644 System.map $kerneldir/System.map-${KERNEL_VERSION} + [ -e Module.symvers ] && install -m 0644 Module.symvers $kerneldir/ - cp -fR scripts ${STAGING_KERNEL_DIR}/ + cp -fR scripts $kerneldir/ } -kernel_do_install() { - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE - if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then - oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" modules_install - else - oenote "no modules to install" - fi - - install -d ${D}/${KERNEL_IMAGEDEST} - install -d ${D}/boot - install -m 0644 ${KERNEL_OUTPUT} ${D}/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-${KERNEL_VERSION} - install -m 0644 System.map ${D}/boot/System.map-${KERNEL_VERSION} - install -m 0644 .config ${D}/boot/config-${KERNEL_VERSION} - install -m 0644 vmlinux ${D}/boot/vmlinux-${KERNEL_VERSION} - [ -e Module.symvers ] && install -m 0644 Module.symvers ${D}/boot/Module.symvers-${KERNEL_VERSION} - install -d ${D}/etc/modutils - if [ "${KERNEL_MAJOR_VERSION}" = "2.6" ]; then - install -d ${D}/etc/modprobe.d - fi - - # Check if scripts/genksyms exists and if so, build it - if [ -e scripts/genksyms/ ]; then - oe_runmake SUBDIRS="scripts/genksyms" - fi - - install -d ${STAGING_KERNEL_DIR} - cp -fR scripts ${STAGING_KERNEL_DIR}/ +sysroot_stage_all_append() { + sysroot_stage_dir ${D}/kernel ${SYSROOT_DESTDIR}${STAGING_KERNEL_DIR} } kernel_do_configure() {@@ -234,7 +233,7 @@ pkg_postrm_kernel () { inherit cml1 -EXPORT_FUNCTIONS do_compile do_install do_stage do_configure +EXPORT_FUNCTIONS do_compile do_install do_configure # kernel-base becomes kernel-${KERNEL_VERSION} # kernel-image becomes kernel-image-${KERNEL_VERISON}Signature · 7 lines
1.7.0 _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
ping
Quoted 184 lines · Koen Kooi
--- classes/kernel.bbclass | 135 ++++++++++++++++++++++++------------------------ 1 files changed, 67 insertions(+), 68 deletions(-)classes/kernel.bbclass +66
-67@@ -97,108 +97,107 @@ kernel_do_compile() { } kernel_do_compile[depends] = "${INITRAMFS_TASK}" -kernel_do_stage() { +kernel_do_install() { + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE + if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then + oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" modules_install + else + oenote "no modules to install" + fi + + install -d ${D}/${KERNEL_IMAGEDEST} + install -d ${D}/boot + install -m 0644 ${KERNEL_OUTPUT} ${D}/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-${KERNEL_VERSION} + install -m 0644 System.map ${D}/boot/System.map-${KERNEL_VERSION} + install -m 0644 .config ${D}/boot/config-${KERNEL_VERSION} + install -m 0644 vmlinux ${D}/boot/vmlinux-${KERNEL_VERSION} + [ -e Module.symvers ] && install -m 0644 Module.symvers ${D}/boot/Module.symvers-${KERNEL_VERSION} + install -d ${D}/etc/modutils + if [ "${KERNEL_MAJOR_VERSION}" = "2.6" ]; then + install -d ${D}/etc/modprobe.d + fi + + # Check if scripts/genksyms exists and if so, build it + if [ -e scripts/genksyms/ ]; then + oe_runmake SUBDIRS="scripts/genksyms" + fi + + kerneldir=${D}/kernel/ + if [ -e include/asm ] ; then # This link is generated only in kernel before 2.6.33-rc1, don't stage it for newer kernels ASMDIR=`readlink include/asm` - mkdir -p ${STAGING_KERNEL_DIR}/include/$ASMDIR - cp -fR include/$ASMDIR/* ${STAGING_KERNEL_DIR}/include/$ASMDIR/ + mkdir -p $kerneldir/include/$ASMDIR + cp -fR include/$ASMDIR/* $kerneldir/include/$ASMDIR/ fi + + cp -fR include/$ASMDIR/* $kerneldir/include/$ASMDIR/ # Kernel 2.6.27 moved headers from includes/asm-${ARCH} to arch/${ARCH}/include/asm if [ -e arch/${ARCH}/include/asm/ ] ; then - if [ -e include/asm ] ; then - cp -fR arch/${ARCH}/include/asm/* ${STAGING_KERNEL_DIR}/include/$ASMDIR/ - fi - install -d ${STAGING_KERNEL_DIR}/arch/${ARCH}/include - cp -fR arch/${ARCH}/* ${STAGING_KERNEL_DIR}/arch/${ARCH}/ + cp -fR arch/${ARCH}/include/asm/* $kerneldir/include/$ASMDIR/ + install -d $kerneldir/arch/${ARCH}/include + cp -fR arch/${ARCH}/* $kerneldir/arch/${ARCH}/ # Check for arch/x86 on i386 elif [ -d arch/x86/include/asm/ ]; then - if [ -e include/asm ] ; then - cp -fR arch/x86/include/asm/* ${STAGING_KERNEL_DIR}/include/asm-x86/ - fi - install -d ${STAGING_KERNEL_DIR}/arch/x86/include - cp -fR arch/x86/* ${STAGING_KERNEL_DIR}/arch/x86/ + cp -fR arch/x86/include/asm/* $kerneldir/include/asm-x86/ + install -d $kerneldir/arch/x86/include + cp -fR arch/x86/* $kerneldir/arch/x86/ fi if [ -e include/asm ] ; then - rm -f ${STAGING_KERNEL_DIR}/include/asm - ln -sf $ASMDIR ${STAGING_KERNEL_DIR}/include/asm + rm -f $kerneldir/include/asm + ln -sf $ASMDIR $kerneldir/include/asm fi - mkdir -p ${STAGING_KERNEL_DIR}/include/asm-generic - cp -fR include/asm-generic/* ${STAGING_KERNEL_DIR}/include/asm-generic/ + mkdir -p $kerneldir/include/asm-generic + cp -fR include/asm-generic/* $kerneldir/include/asm-generic/ for entry in drivers/crypto drivers/media include/generated include/linux include/net include/pcmcia include/media include/acpi include/sound include/video include/scsi include/trace; do if [ -d $entry ]; then - mkdir -p ${STAGING_KERNEL_DIR}/$entry - cp -fR $entry/* ${STAGING_KERNEL_DIR}/$entry/ + mkdir -p $kerneldir/$entry + cp -fR $entry/* $kerneldir/$entry/ fi done if [ -d drivers/sound ]; then # 2.4 alsa needs some headers from this directory - mkdir -p ${STAGING_KERNEL_DIR}/include/drivers/sound - cp -fR drivers/sound/*.h ${STAGING_KERNEL_DIR}/include/drivers/sound/ + mkdir -p $kerneldir/include/drivers/sound + cp -fR drivers/sound/*.h $kerneldir/include/drivers/sound/ fi - install -m 0644 .config ${STAGING_KERNEL_DIR}/config-${KERNEL_VERSION} - ln -sf config-${KERNEL_VERSION} ${STAGING_KERNEL_DIR}/.config - ln -sf config-${KERNEL_VERSION} ${STAGING_KERNEL_DIR}/kernel-config - echo "${KERNEL_VERSION}" >${STAGING_KERNEL_DIR}/kernel-abiversion - echo "${S}" >${STAGING_KERNEL_DIR}/kernel-source - echo "${KERNEL_CCSUFFIX}" >${STAGING_KERNEL_DIR}/kernel-ccsuffix - echo "${KERNEL_LDSUFFIX}" >${STAGING_KERNEL_DIR}/kernel-ldsuffix - [ -e Rules.make ] && install -m 0644 Rules.make ${STAGING_KERNEL_DIR}/ - [ -e Makefile ] && install -m 0644 Makefile ${STAGING_KERNEL_DIR}/ + install -m 0644 .config $kerneldir/config-${KERNEL_VERSION} + ln -sf config-${KERNEL_VERSION} $kerneldir/.config + ln -sf config-${KERNEL_VERSION} $kerneldir/kernel-config + echo "${KERNEL_VERSION}" >$kerneldir/kernel-abiversion + echo "${S}" >$kerneldir/kernel-source + echo "${KERNEL_CCSUFFIX}" >$kerneldir/kernel-ccsuffix + echo "${KERNEL_LDSUFFIX}" >$kerneldir/kernel-ldsuffix + [ -e Rules.make ] && install -m 0644 Rules.make $kerneldir/ + [ -e Makefile ] && install -m 0644 Makefile $kerneldir/ # Check if arch/${ARCH}/Makefile exists and install it if [ -e arch/${ARCH}/Makefile ]; then - install -d ${STAGING_KERNEL_DIR}/arch/${ARCH} - install -m 0644 arch/${ARCH}/Makefile* ${STAGING_KERNEL_DIR}/arch/${ARCH} + install -d $kerneldir/arch/${ARCH} + install -m 0644 arch/${ARCH}/Makefile* $kerneldir/arch/${ARCH} # Otherwise check arch/x86/Makefile for i386 and x86_64 on kernels >= 2.6.24 elif [ -e arch/x86/Makefile ]; then - install -d ${STAGING_KERNEL_DIR}/arch/x86 - install -m 0644 arch/x86/Makefile* ${STAGING_KERNEL_DIR}/arch/x86 + install -d $kerneldir/arch/x86 + install -m 0644 arch/x86/Makefile* $kerneldir/arch/x86 fi - cp -fR include/config* ${STAGING_KERNEL_DIR}/include/ + cp -fR include/config* $kerneldir/include/ # Install kernel images and system.map to staging - [ -e vmlinux ] && install -m 0644 vmlinux ${STAGING_KERNEL_DIR}/ - install -m 0644 ${KERNEL_OUTPUT} ${STAGING_KERNEL_DIR}/${KERNEL_IMAGETYPE} - install -m 0644 System.map ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} - [ -e Module.symvers ] && install -m 0644 Module.symvers ${STAGING_KERNEL_DIR}/ + [ -e vmlinux ] && install -m 0644 vmlinux $kerneldir/ + install -m 0644 ${KERNEL_OUTPUT} $kerneldir/${KERNEL_IMAGETYPE} + install -m 0644 System.map $kerneldir/System.map-${KERNEL_VERSION} + [ -e Module.symvers ] && install -m 0644 Module.symvers $kerneldir/ - cp -fR scripts ${STAGING_KERNEL_DIR}/ + cp -fR scripts $kerneldir/ } -kernel_do_install() { - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE - if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then - oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" modules_install - else - oenote "no modules to install" - fi - - install -d ${D}/${KERNEL_IMAGEDEST} - install -d ${D}/boot - install -m 0644 ${KERNEL_OUTPUT} ${D}/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-${KERNEL_VERSION} - install -m 0644 System.map ${D}/boot/System.map-${KERNEL_VERSION} - install -m 0644 .config ${D}/boot/config-${KERNEL_VERSION} - install -m 0644 vmlinux ${D}/boot/vmlinux-${KERNEL_VERSION} - [ -e Module.symvers ] && install -m 0644 Module.symvers ${D}/boot/Module.symvers-${KERNEL_VERSION} - install -d ${D}/etc/modutils - if [ "${KERNEL_MAJOR_VERSION}" = "2.6" ]; then - install -d ${D}/etc/modprobe.d - fi - - # Check if scripts/genksyms exists and if so, build it - if [ -e scripts/genksyms/ ]; then - oe_runmake SUBDIRS="scripts/genksyms" - fi - - install -d ${STAGING_KERNEL_DIR} - cp -fR scripts ${STAGING_KERNEL_DIR}/ +sysroot_stage_all_append() { + sysroot_stage_dir ${D}/kernel ${SYSROOT_DESTDIR}${STAGING_KERNEL_DIR} } kernel_do_configure() {
classes/kernel.bbclass pkg_postrm_kernel () { · line 239
Quoted 8 lines
classes/kernel.bbclass +1
-1@@ -234,7 +233,7 @@ pkg_postrm_kernel () { inherit cml1 -EXPORT_FUNCTIONS do_compile do_install do_stage do_configure +EXPORT_FUNCTIONS do_compile do_install do_configure # kernel-base becomes kernel-${KERNEL_VERSION} # kernel-image becomes kernel-image-${KERNEL_VERISON}
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
iD8DBQFLyC22MkyGM64RGpERAiylAJ9E8ZSO8jA+vYqXggzHRwBS7tJ4LACgh5dy VV8oofJx0A4zQnNvIke2fBA=
=gxY3
-----END PGP SIGNATURE-----
Quoted 192 lines · Koen Kooi
--- classes/kernel.bbclass | 135 ++++++++++++++++++++++++------------------------ 1 files changed, 67 insertions(+), 68 deletions(-)classes/kernel.bbclass +67
-68@@ -97,108 +97,107 @@ kernel_do_compile() { } kernel_do_compile[depends] = "${INITRAMFS_TASK}" -kernel_do_stage() { +kernel_do_install() { + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE + if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then + oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" modules_install + else + oenote "no modules to install" + fi + + install -d ${D}/${KERNEL_IMAGEDEST} + install -d ${D}/boot + install -m 0644 ${KERNEL_OUTPUT} ${D}/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-${KERNEL_VERSION} + install -m 0644 System.map ${D}/boot/System.map-${KERNEL_VERSION} + install -m 0644 .config ${D}/boot/config-${KERNEL_VERSION} + install -m 0644 vmlinux ${D}/boot/vmlinux-${KERNEL_VERSION} + [ -e Module.symvers ]&& install -m 0644 Module.symvers ${D}/boot/Module.symvers-${KERNEL_VERSION} + install -d ${D}/etc/modutils + if [ "${KERNEL_MAJOR_VERSION}" = "2.6" ]; then + install -d ${D}/etc/modprobe.d + fi + + # Check if scripts/genksyms exists and if so, build it + if [ -e scripts/genksyms/ ]; then + oe_runmake SUBDIRS="scripts/genksyms" + fi + + kerneldir=${D}/kernel/ + if [ -e include/asm ] ; then # This link is generated only in kernel before 2.6.33-rc1, don't stage it for newer kernels ASMDIR=`readlink include/asm` - mkdir -p ${STAGING_KERNEL_DIR}/include/$ASMDIR - cp -fR include/$ASMDIR/* ${STAGING_KERNEL_DIR}/include/$ASMDIR/ + mkdir -p $kerneldir/include/$ASMDIR + cp -fR include/$ASMDIR/* $kerneldir/include/$ASMDIR/ fi + + cp -fR include/$ASMDIR/* $kerneldir/include/$ASMDIR/ # Kernel 2.6.27 moved headers from includes/asm-${ARCH} to arch/${ARCH}/include/asm if [ -e arch/${ARCH}/include/asm/ ] ; then - if [ -e include/asm ] ; then - cp -fR arch/${ARCH}/include/asm/* ${STAGING_KERNEL_DIR}/include/$ASMDIR/ - fi - install -d ${STAGING_KERNEL_DIR}/arch/${ARCH}/include - cp -fR arch/${ARCH}/* ${STAGING_KERNEL_DIR}/arch/${ARCH}/ + cp -fR arch/${ARCH}/include/asm/* $kerneldir/include/$ASMDIR/ + install -d $kerneldir/arch/${ARCH}/include + cp -fR arch/${ARCH}/* $kerneldir/arch/${ARCH}/ # Check for arch/x86 on i386 elif [ -d arch/x86/include/asm/ ]; then - if [ -e include/asm ] ; then - cp -fR arch/x86/include/asm/* ${STAGING_KERNEL_DIR}/include/asm-x86/ - fi - install -d ${STAGING_KERNEL_DIR}/arch/x86/include - cp -fR arch/x86/* ${STAGING_KERNEL_DIR}/arch/x86/ + cp -fR arch/x86/include/asm/* $kerneldir/include/asm-x86/ + install -d $kerneldir/arch/x86/include + cp -fR arch/x86/* $kerneldir/arch/x86/ fi if [ -e include/asm ] ; then - rm -f ${STAGING_KERNEL_DIR}/include/asm - ln -sf $ASMDIR ${STAGING_KERNEL_DIR}/include/asm + rm -f $kerneldir/include/asm + ln -sf $ASMDIR $kerneldir/include/asm fi - mkdir -p ${STAGING_KERNEL_DIR}/include/asm-generic - cp -fR include/asm-generic/* ${STAGING_KERNEL_DIR}/include/asm-generic/ + mkdir -p $kerneldir/include/asm-generic + cp -fR include/asm-generic/* $kerneldir/include/asm-generic/ for entry in drivers/crypto drivers/media include/generated include/linux include/net include/pcmcia include/media include/acpi include/sound include/video include/scsi include/trace; do if [ -d $entry ]; then - mkdir -p ${STAGING_KERNEL_DIR}/$entry - cp -fR $entry/* ${STAGING_KERNEL_DIR}/$entry/ + mkdir -p $kerneldir/$entry + cp -fR $entry/* $kerneldir/$entry/ fi done if [ -d drivers/sound ]; then # 2.4 alsa needs some headers from this directory - mkdir -p ${STAGING_KERNEL_DIR}/include/drivers/sound - cp -fR drivers/sound/*.h ${STAGING_KERNEL_DIR}/include/drivers/sound/ + mkdir -p $kerneldir/include/drivers/sound + cp -fR drivers/sound/*.h $kerneldir/include/drivers/sound/ fi - install -m 0644 .config ${STAGING_KERNEL_DIR}/config-${KERNEL_VERSION} - ln -sf config-${KERNEL_VERSION} ${STAGING_KERNEL_DIR}/.config - ln -sf config-${KERNEL_VERSION} ${STAGING_KERNEL_DIR}/kernel-config - echo "${KERNEL_VERSION}">${STAGING_KERNEL_DIR}/kernel-abiversion - echo "${S}">${STAGING_KERNEL_DIR}/kernel-source - echo "${KERNEL_CCSUFFIX}">${STAGING_KERNEL_DIR}/kernel-ccsuffix - echo "${KERNEL_LDSUFFIX}">${STAGING_KERNEL_DIR}/kernel-ldsuffix - [ -e Rules.make ]&& install -m 0644 Rules.make ${STAGING_KERNEL_DIR}/ - [ -e Makefile ]&& install -m 0644 Makefile ${STAGING_KERNEL_DIR}/ + install -m 0644 .config $kerneldir/config-${KERNEL_VERSION} + ln -sf config-${KERNEL_VERSION} $kerneldir/.config + ln -sf config-${KERNEL_VERSION} $kerneldir/kernel-config + echo "${KERNEL_VERSION}">$kerneldir/kernel-abiversion + echo "${S}">$kerneldir/kernel-source + echo "${KERNEL_CCSUFFIX}">$kerneldir/kernel-ccsuffix + echo "${KERNEL_LDSUFFIX}">$kerneldir/kernel-ldsuffix + [ -e Rules.make ]&& install -m 0644 Rules.make $kerneldir/ + [ -e Makefile ]&& install -m 0644 Makefile $kerneldir/ # Check if arch/${ARCH}/Makefile exists and install it if [ -e arch/${ARCH}/Makefile ]; then - install -d ${STAGING_KERNEL_DIR}/arch/${ARCH} - install -m 0644 arch/${ARCH}/Makefile* ${STAGING_KERNEL_DIR}/arch/${ARCH} + install -d $kerneldir/arch/${ARCH} + install -m 0644 arch/${ARCH}/Makefile* $kerneldir/arch/${ARCH} # Otherwise check arch/x86/Makefile for i386 and x86_64 on kernels>= 2.6.24 elif [ -e arch/x86/Makefile ]; then - install -d ${STAGING_KERNEL_DIR}/arch/x86 - install -m 0644 arch/x86/Makefile* ${STAGING_KERNEL_DIR}/arch/x86 + install -d $kerneldir/arch/x86 + install -m 0644 arch/x86/Makefile* $kerneldir/arch/x86 fi - cp -fR include/config* ${STAGING_KERNEL_DIR}/include/ + cp -fR include/config* $kerneldir/include/ # Install kernel images and system.map to staging - [ -e vmlinux ]&& install -m 0644 vmlinux ${STAGING_KERNEL_DIR}/ - install -m 0644 ${KERNEL_OUTPUT} ${STAGING_KERNEL_DIR}/${KERNEL_IMAGETYPE} - install -m 0644 System.map ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} - [ -e Module.symvers ]&& install -m 0644 Module.symvers ${STAGING_KERNEL_DIR}/ + [ -e vmlinux ]&& install -m 0644 vmlinux $kerneldir/ + install -m 0644 ${KERNEL_OUTPUT} $kerneldir/${KERNEL_IMAGETYPE} + install -m 0644 System.map $kerneldir/System.map-${KERNEL_VERSION} + [ -e Module.symvers ]&& install -m 0644 Module.symvers $kerneldir/ - cp -fR scripts ${STAGING_KERNEL_DIR}/ + cp -fR scripts $kerneldir/ } -kernel_do_install() { - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE - if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then - oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" modules_install - else - oenote "no modules to install" - fi - - install -d ${D}/${KERNEL_IMAGEDEST} - install -d ${D}/boot - install -m 0644 ${KERNEL_OUTPUT} ${D}/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-${KERNEL_VERSION} - install -m 0644 System.map ${D}/boot/System.map-${KERNEL_VERSION} - install -m 0644 .config ${D}/boot/config-${KERNEL_VERSION} - install -m 0644 vmlinux ${D}/boot/vmlinux-${KERNEL_VERSION} - [ -e Module.symvers ]&& install -m 0644 Module.symvers ${D}/boot/Module.symvers-${KERNEL_VERSION} - install -d ${D}/etc/modutils - if [ "${KERNEL_MAJOR_VERSION}" = "2.6" ]; then - install -d ${D}/etc/modprobe.d - fi - - # Check if scripts/genksyms exists and if so, build it - if [ -e scripts/genksyms/ ]; then - oe_runmake SUBDIRS="scripts/genksyms" - fi - - install -d ${STAGING_KERNEL_DIR} - cp -fR scripts ${STAGING_KERNEL_DIR}/ +sysroot_stage_all_append() { + sysroot_stage_dir ${D}/kernel ${SYSROOT_DESTDIR}${STAGING_KERNEL_DIR} } kernel_do_configure() {@@ -234,7 +233,7 @@ pkg_postrm_kernel () { inherit cml1 -EXPORT_FUNCTIONS do_compile do_install do_stage do_configure +EXPORT_FUNCTIONS do_compile do_install do_configure # kernel-base becomes kernel-${KERNEL_VERSION} # kernel-image becomes kernel-image-${KERNEL_VERISON}
classes/kernel.bbclass kernel_do_compile() { · line 135
Quoted 11 lines · Koen Kooi
classes/kernel.bbclass +4
-2if [ -e include/asm ] ; then # This link is generated only in kernel before 2.6.33-rc1, don't stage it for newer kernels ASMDIR=`readlink include/asm` - mkdir -p ${STAGING_KERNEL_DIR}/include/$ASMDIR - cp -fR include/$ASMDIR/* ${STAGING_KERNEL_DIR}/include/$ASMDIR/ + mkdir -p $kerneldir/include/$ASMDIR + cp -fR include/$ASMDIR/* $kerneldir/include/$ASMDIR/ fi + + cp -fR include/$ASMDIR/* $kerneldir/include/$ASMDIR/
this breaks on recent kernels because they do no have include/asm and ASMDIR won't be defined here.
classes/kernel.bbclass kernel_do_compile() { · line 138
Quoted 7 lines
classes/kernel.bbclass +1
-5if [ -e arch/${ARCH}/include/asm/ ] ; then - if [ -e include/asm ] ; then - cp -fR arch/${ARCH}/include/asm/* ${STAGING_KERNEL_DIR}/include/$ASMDIR/ - fi - install -d ${STAGING_KERNEL_DIR}/arch/${ARCH}/include - cp -fR arch/${ARCH}/* ${STAGING_KERNEL_DIR}/arch/${ARCH}/ + cp -fR arch/${ARCH}/include/asm/* $kerneldir/include/$ASMDIR/
ditto
Enrico
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Quoted 18 lines · Enrico Scholz
classes/kernel.bbclass kernel_do_compile() { · line 135
Quoted 11 lines · Koen Kooi
classes/kernel.bbclass +4
-2if [ -e include/asm ] ; then # This link is generated only in kernel before 2.6.33-rc1, don't stage it for newer kernels ASMDIR=`readlink include/asm` - mkdir -p ${STAGING_KERNEL_DIR}/include/$ASMDIR - cp -fR include/$ASMDIR/* ${STAGING_KERNEL_DIR}/include/$ASMDIR/ + mkdir -p $kerneldir/include/$ASMDIR + cp -fR include/$ASMDIR/* $kerneldir/include/$ASMDIR/ fi + + cp -fR include/$ASMDIR/* $kerneldir/include/$ASMDIR/this breaks on recent kernels because they do no have
include/asmand ASMDIR won't be defined here.
Quoted 9 lines
classes/kernel.bbclass kernel_do_compile() { · line 138
Quoted 7 lines
classes/kernel.bbclass +1
-5if [ -e arch/${ARCH}/include/asm/ ] ; then - if [ -e include/asm ] ; then - cp -fR arch/${ARCH}/include/asm/* ${STAGING_KERNEL_DIR}/include/$ASMDIR/ - fi - install -d ${STAGING_KERNEL_DIR}/arch/${ARCH}/include - cp -fR arch/${ARCH}/* ${STAGING_KERNEL_DIR}/arch/${ARCH}/ + cp -fR arch/${ARCH}/include/asm/* $kerneldir/include/$ASMDIR/ditto
That should be fixed now, thanks for pointing it out.
regards,
Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
iD8DBQFLyaOlMkyGM64RGpERAnR7AJ4vt2QC6JdPRwyPsa1/Khsll9JlvgCfWRbU IjQvo6EZCAWkAbywrcna/MY=
=NAMq
-----END PGP SIGNATURE-----