* [PATCH 1/2] kernel bbclass: convert to new style staging (from poky)
@ 2010-04-15 10:35 Koen Kooi
2010-04-15 10:35 ` [PATCH 2/2] recipes/linux: convert users of do_stage_append to new style staging Koen Kooi
` (5 more replies)
0 siblings, 6 replies; 10+ messages in thread
From: Koen Kooi @ 2010-04-15 10:35 UTC (permalink / raw)
To: openembedded-devel; +Cc: Koen Kooi
---
classes/kernel.bbclass | 135 ++++++++++++++++++++++++------------------------
1 files changed, 67 insertions(+), 68 deletions(-)
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index 7f7062b..20403ea 100644
--- a/classes/kernel.bbclass
+++ b/classes/kernel.bbclass
@@ -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}
--
1.7.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 2/2] recipes/linux: convert users of do_stage_append to new style staging
2010-04-15 10:35 [PATCH 1/2] kernel bbclass: convert to new style staging (from poky) Koen Kooi
@ 2010-04-15 10:35 ` Koen Kooi
2010-04-16 11:34 ` Philip Balister
2010-04-15 10:35 ` linux-davinci git: add hack for hawkboard machine ID Koen Kooi
` (4 subsequent siblings)
5 siblings, 1 reply; 10+ messages in thread
From: Koen Kooi @ 2010-04-15 10:35 UTC (permalink / raw)
To: openembedded-devel; +Cc: 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(-)
diff --git a/recipes/linux/linux-bug_2.6.27.2.bb b/recipes/linux/linux-bug_2.6.27.2.bb
index 74d74be..469a6e3 100644
--- a/recipes/linux/linux-bug_2.6.27.2.bb
+++ b/recipes/linux/linux-bug_2.6.27.2.bb
@@ -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}"
diff --git a/recipes/linux/linux-dht-walnut_2.6.20.bb b/recipes/linux/linux-dht-walnut_2.6.20.bb
index 49e8d69..4d0059a 100644
--- a/recipes/linux/linux-dht-walnut_2.6.20.bb
+++ b/recipes/linux/linux-dht-walnut_2.6.20.bb
@@ -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 () {
diff --git a/recipes/linux/linux-dht-walnut_2.6.23.bb b/recipes/linux/linux-dht-walnut_2.6.23.bb
index 3153d1d..fee1ff9 100644
--- a/recipes/linux/linux-dht-walnut_2.6.23.bb
+++ b/recipes/linux/linux-dht-walnut_2.6.23.bb
@@ -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 () {
diff --git a/recipes/linux/linux-efika_2.6.20.20.bb b/recipes/linux/linux-efika_2.6.20.20.bb
index be88b19..972677b 100644
--- a/recipes/linux/linux-efika_2.6.20.20.bb
+++ b/recipes/linux/linux-efika_2.6.20.20.bb
@@ -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"
diff --git a/recipes/linux/linux-efika_2.6.20.bb b/recipes/linux/linux-efika_2.6.20.bb
index b451a8d..2ef13fd 100644
--- a/recipes/linux/linux-efika_2.6.20.bb
+++ b/recipes/linux/linux-efika_2.6.20.bb
@@ -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"
diff --git a/recipes/linux/linux-efika_2.6.21+git.bb b/recipes/linux/linux-efika_2.6.21+git.bb
index e4f92c6..b1552c2 100644
--- a/recipes/linux/linux-efika_2.6.21+git.bb
+++ b/recipes/linux/linux-efika_2.6.21+git.bb
@@ -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/
}
diff --git a/recipes/linux/linux-magicbox_2.6.18.6.bb b/recipes/linux/linux-magicbox_2.6.18.6.bb
index 89f1c14..248f502 100644
--- a/recipes/linux/linux-magicbox_2.6.18.6.bb
+++ b/recipes/linux/linux-magicbox_2.6.18.6.bb
@@ -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/
}
diff --git a/recipes/linux/linux-magicbox_2.6.19.2.bb b/recipes/linux/linux-magicbox_2.6.19.2.bb
index a0bae17..5647dbd 100644
--- a/recipes/linux/linux-magicbox_2.6.19.2.bb
+++ b/recipes/linux/linux-magicbox_2.6.19.2.bb
@@ -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/
}
diff --git a/recipes/linux/linux-ml403-mvista-2.6.x_git.bb b/recipes/linux/linux-ml403-mvista-2.6.x_git.bb
index 28b6708..d600945 100644
--- a/recipes/linux/linux-ml403-mvista-2.6.x_git.bb
+++ b/recipes/linux/linux-ml403-mvista-2.6.x_git.bb
@@ -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/
}
diff --git a/recipes/linux/linux-nokia800_2.6.21-osso71.bb b/recipes/linux/linux-nokia800_2.6.21-osso71.bb
index 9e72d95..da167c3 100644
--- a/recipes/linux/linux-nokia800_2.6.21-osso71.bb
+++ b/recipes/linux/linux-nokia800_2.6.21-osso71.bb
@@ -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"
diff --git a/recipes/linux/linux-sequoia_2.6.21.bb b/recipes/linux/linux-sequoia_2.6.21.bb
index 121d530..35b74fa 100644
--- a/recipes/linux/linux-sequoia_2.6.21.bb
+++ b/recipes/linux/linux-sequoia_2.6.21.bb
@@ -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 ?)
diff --git a/recipes/linux/linux_2.6.20.bb b/recipes/linux/linux_2.6.20.bb
index 6ac225d..9452aac 100644
--- a/recipes/linux/linux_2.6.20.bb
+++ b/recipes/linux/linux_2.6.20.bb
@@ -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
}
diff --git a/recipes/linux/linux_2.6.26.bb b/recipes/linux/linux_2.6.26.bb
index 933664e..6089f47 100644
--- a/recipes/linux/linux_2.6.26.bb
+++ b/recipes/linux/linux_2.6.26.bb
@@ -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
}
diff --git a/recipes/linux/linux_2.6.27.bb b/recipes/linux/linux_2.6.27.bb
index 5ce50c9..b5c67e2 100644
--- a/recipes/linux/linux_2.6.27.bb
+++ b/recipes/linux/linux_2.6.27.bb
@@ -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
}
--
1.7.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* linux-davinci git: add hack for hawkboard machine ID
2010-04-15 10:35 [PATCH 1/2] kernel bbclass: convert to new style staging (from poky) Koen Kooi
2010-04-15 10:35 ` [PATCH 2/2] recipes/linux: convert users of do_stage_append to new style staging Koen Kooi
@ 2010-04-15 10:35 ` Koen Kooi
2010-04-15 10:38 ` Koen Kooi
2010-04-15 12:54 ` [PATCH 1/2] kernel bbclass: convert to new style staging (from poky) Graeme Gregory
` (3 subsequent siblings)
5 siblings, 1 reply; 10+ messages in thread
From: Koen Kooi @ 2010-04-15 10:35 UTC (permalink / raw)
To: openembedded-devel; +Cc: Koen Kooi
From: Koen Kooi <k-kooi@ti.com>
Signed-off-by: Koen Kooi <k-kooi@ti.com>
---
diff --git a/recipes/linux/linux-davinci_git.bb b/recipes/linux/linux-davinci_git.bb
index ee28d90..87f6824 100644
--- a/recipes/linux/linux-davinci_git.bb
+++ b/recipes/linux/linux-davinci_git.bb
@@ -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
+}
+
+
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: linux-davinci git: add hack for hawkboard machine ID
2010-04-15 10:35 ` linux-davinci git: add hack for hawkboard machine ID Koen Kooi
@ 2010-04-15 10:38 ` Koen Kooi
0 siblings, 0 replies; 10+ messages in thread
From: Koen Kooi @ 2010-04-15 10:38 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Ignore this one, it was lingering in my git send-email outbox
On 15-04-10 12:35, Koen Kooi wrote:
> From: Koen Kooi <k-kooi@ti.com>
>
> Signed-off-by: Koen Kooi <k-kooi@ti.com>
> ---
> diff --git a/recipes/linux/linux-davinci_git.bb b/recipes/linux/linux-davinci_git.bb
> index ee28d90..87f6824 100644
> --- a/recipes/linux/linux-davinci_git.bb
> +++ b/recipes/linux/linux-davinci_git.bb
> @@ -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-----
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/2] kernel bbclass: convert to new style staging (from poky)
2010-04-15 10:35 [PATCH 1/2] kernel bbclass: convert to new style staging (from poky) Koen Kooi
2010-04-15 10:35 ` [PATCH 2/2] recipes/linux: convert users of do_stage_append to new style staging Koen Kooi
2010-04-15 10:35 ` linux-davinci git: add hack for hawkboard machine ID Koen Kooi
@ 2010-04-15 12:54 ` Graeme Gregory
2010-04-16 9:28 ` Koen Kooi
` (2 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: Graeme Gregory @ 2010-04-15 12:54 UTC (permalink / raw)
To: openembedded-devel
Both
Acked-by: Graeme Gregory <dp@xora.org.uk>
On Thu, Apr 15, 2010 at 12:35:48PM +0200, Koen Kooi wrote:
> ---
> classes/kernel.bbclass | 135 ++++++++++++++++++++++++------------------------
> 1 files changed, 67 insertions(+), 68 deletions(-)
>
> diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
> index 7f7062b..20403ea 100644
> --- a/classes/kernel.bbclass
> +++ b/classes/kernel.bbclass
> @@ -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}
> --
> 1.7.0
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/2] kernel bbclass: convert to new style staging (from poky)
2010-04-15 10:35 [PATCH 1/2] kernel bbclass: convert to new style staging (from poky) Koen Kooi
` (2 preceding siblings ...)
2010-04-15 12:54 ` [PATCH 1/2] kernel bbclass: convert to new style staging (from poky) Graeme Gregory
@ 2010-04-16 9:28 ` Koen Kooi
2010-04-16 11:33 ` Philip Balister
2010-04-17 11:27 ` Enrico Scholz
5 siblings, 0 replies; 10+ messages in thread
From: Koen Kooi @ 2010-04-16 9:28 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
ping
On 15-04-10 12:35, Koen Kooi wrote:
> ---
> classes/kernel.bbclass | 135 ++++++++++++++++++++++++------------------------
> 1 files changed, 67 insertions(+), 68 deletions(-)
>
> diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
> index 7f7062b..20403ea 100644
> --- a/classes/kernel.bbclass
> +++ b/classes/kernel.bbclass
> @@ -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}
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
iD8DBQFLyC22MkyGM64RGpERAiylAJ9E8ZSO8jA+vYqXggzHRwBS7tJ4LACgh5dy
VV8oofJx0A4zQnNvIke2fBA=
=gxY3
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/2] kernel bbclass: convert to new style staging (from poky)
2010-04-15 10:35 [PATCH 1/2] kernel bbclass: convert to new style staging (from poky) Koen Kooi
` (3 preceding siblings ...)
2010-04-16 9:28 ` Koen Kooi
@ 2010-04-16 11:33 ` Philip Balister
2010-04-17 11:27 ` Enrico Scholz
5 siblings, 0 replies; 10+ messages in thread
From: Philip Balister @ 2010-04-16 11:33 UTC (permalink / raw)
To: openembedded-devel
Acked-by: Philip Balister <philip@balister.org>
On 04/15/2010 06:35 AM, Koen Kooi wrote:
> ---
> classes/kernel.bbclass | 135 ++++++++++++++++++++++++------------------------
> 1 files changed, 67 insertions(+), 68 deletions(-)
>
> diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
> index 7f7062b..20403ea 100644
> --- a/classes/kernel.bbclass
> +++ b/classes/kernel.bbclass
> @@ -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}
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 2/2] recipes/linux: convert users of do_stage_append to new style staging
2010-04-15 10:35 ` [PATCH 2/2] recipes/linux: convert users of do_stage_append to new style staging Koen Kooi
@ 2010-04-16 11:34 ` Philip Balister
0 siblings, 0 replies; 10+ messages in thread
From: Philip Balister @ 2010-04-16 11:34 UTC (permalink / raw)
To: openembedded-devel
Acked-by: Philip Balister <philip@balister.org>
On 04/15/2010 06:35 AM, Koen Kooi wrote:
> ---
> 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(-)
>
> diff --git a/recipes/linux/linux-bug_2.6.27.2.bb b/recipes/linux/linux-bug_2.6.27.2.bb
> index 74d74be..469a6e3 100644
> --- a/recipes/linux/linux-bug_2.6.27.2.bb
> +++ b/recipes/linux/linux-bug_2.6.27.2.bb
> @@ -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}"
> diff --git a/recipes/linux/linux-dht-walnut_2.6.20.bb b/recipes/linux/linux-dht-walnut_2.6.20.bb
> index 49e8d69..4d0059a 100644
> --- a/recipes/linux/linux-dht-walnut_2.6.20.bb
> +++ b/recipes/linux/linux-dht-walnut_2.6.20.bb
> @@ -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 () {
> diff --git a/recipes/linux/linux-dht-walnut_2.6.23.bb b/recipes/linux/linux-dht-walnut_2.6.23.bb
> index 3153d1d..fee1ff9 100644
> --- a/recipes/linux/linux-dht-walnut_2.6.23.bb
> +++ b/recipes/linux/linux-dht-walnut_2.6.23.bb
> @@ -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 () {
> diff --git a/recipes/linux/linux-efika_2.6.20.20.bb b/recipes/linux/linux-efika_2.6.20.20.bb
> index be88b19..972677b 100644
> --- a/recipes/linux/linux-efika_2.6.20.20.bb
> +++ b/recipes/linux/linux-efika_2.6.20.20.bb
> @@ -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"
> diff --git a/recipes/linux/linux-efika_2.6.20.bb b/recipes/linux/linux-efika_2.6.20.bb
> index b451a8d..2ef13fd 100644
> --- a/recipes/linux/linux-efika_2.6.20.bb
> +++ b/recipes/linux/linux-efika_2.6.20.bb
> @@ -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"
> diff --git a/recipes/linux/linux-efika_2.6.21+git.bb b/recipes/linux/linux-efika_2.6.21+git.bb
> index e4f92c6..b1552c2 100644
> --- a/recipes/linux/linux-efika_2.6.21+git.bb
> +++ b/recipes/linux/linux-efika_2.6.21+git.bb
> @@ -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/
> }
> diff --git a/recipes/linux/linux-magicbox_2.6.18.6.bb b/recipes/linux/linux-magicbox_2.6.18.6.bb
> index 89f1c14..248f502 100644
> --- a/recipes/linux/linux-magicbox_2.6.18.6.bb
> +++ b/recipes/linux/linux-magicbox_2.6.18.6.bb
> @@ -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/
> }
>
>
> diff --git a/recipes/linux/linux-magicbox_2.6.19.2.bb b/recipes/linux/linux-magicbox_2.6.19.2.bb
> index a0bae17..5647dbd 100644
> --- a/recipes/linux/linux-magicbox_2.6.19.2.bb
> +++ b/recipes/linux/linux-magicbox_2.6.19.2.bb
> @@ -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/
> }
>
>
> diff --git a/recipes/linux/linux-ml403-mvista-2.6.x_git.bb b/recipes/linux/linux-ml403-mvista-2.6.x_git.bb
> index 28b6708..d600945 100644
> --- a/recipes/linux/linux-ml403-mvista-2.6.x_git.bb
> +++ b/recipes/linux/linux-ml403-mvista-2.6.x_git.bb
> @@ -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/
> }
>
>
> diff --git a/recipes/linux/linux-nokia800_2.6.21-osso71.bb b/recipes/linux/linux-nokia800_2.6.21-osso71.bb
> index 9e72d95..da167c3 100644
> --- a/recipes/linux/linux-nokia800_2.6.21-osso71.bb
> +++ b/recipes/linux/linux-nokia800_2.6.21-osso71.bb
> @@ -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"
> diff --git a/recipes/linux/linux-sequoia_2.6.21.bb b/recipes/linux/linux-sequoia_2.6.21.bb
> index 121d530..35b74fa 100644
> --- a/recipes/linux/linux-sequoia_2.6.21.bb
> +++ b/recipes/linux/linux-sequoia_2.6.21.bb
> @@ -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 ?)
> diff --git a/recipes/linux/linux_2.6.20.bb b/recipes/linux/linux_2.6.20.bb
> index 6ac225d..9452aac 100644
> --- a/recipes/linux/linux_2.6.20.bb
> +++ b/recipes/linux/linux_2.6.20.bb
> @@ -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
>
> }
>
> diff --git a/recipes/linux/linux_2.6.26.bb b/recipes/linux/linux_2.6.26.bb
> index 933664e..6089f47 100644
> --- a/recipes/linux/linux_2.6.26.bb
> +++ b/recipes/linux/linux_2.6.26.bb
> @@ -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
> }
>
> diff --git a/recipes/linux/linux_2.6.27.bb b/recipes/linux/linux_2.6.27.bb
> index 5ce50c9..b5c67e2 100644
> --- a/recipes/linux/linux_2.6.27.bb
> +++ b/recipes/linux/linux_2.6.27.bb
> @@ -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
> }
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/2] kernel bbclass: convert to new style staging (from poky)
2010-04-15 10:35 [PATCH 1/2] kernel bbclass: convert to new style staging (from poky) Koen Kooi
` (4 preceding siblings ...)
2010-04-16 11:33 ` Philip Balister
@ 2010-04-17 11:27 ` Enrico Scholz
2010-04-17 12:03 ` Koen Kooi
5 siblings, 1 reply; 10+ messages in thread
From: Enrico Scholz @ 2010-04-17 11:27 UTC (permalink / raw)
To: openembedded-devel; +Cc: Koen Kooi
Koen Kooi <koen.kooi@gmail.com> writes:
> 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/
this breaks on recent kernels because they do no have include/asm and
ASMDIR won't be defined here.
> 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/
ditto
Enrico
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/2] kernel bbclass: convert to new style staging (from poky)
2010-04-17 11:27 ` Enrico Scholz
@ 2010-04-17 12:03 ` Koen Kooi
0 siblings, 0 replies; 10+ messages in thread
From: Koen Kooi @ 2010-04-17 12:03 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 17-04-10 13:27, Enrico Scholz wrote:
> Koen Kooi <koen.kooi@gmail.com> writes:
>
>> 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/
>
> this breaks on recent kernels because they do no have include/asm and
> ASMDIR won't be defined here.
>
>
>> 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/
>
> 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-----
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2010-04-17 12:07 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-15 10:35 [PATCH 1/2] kernel bbclass: convert to new style staging (from poky) Koen Kooi
2010-04-15 10:35 ` [PATCH 2/2] recipes/linux: convert users of do_stage_append to new style staging Koen Kooi
2010-04-16 11:34 ` Philip Balister
2010-04-15 10:35 ` linux-davinci git: add hack for hawkboard machine ID Koen Kooi
2010-04-15 10:38 ` Koen Kooi
2010-04-15 12:54 ` [PATCH 1/2] kernel bbclass: convert to new style staging (from poky) Graeme Gregory
2010-04-16 9:28 ` Koen Kooi
2010-04-16 11:33 ` Philip Balister
2010-04-17 11:27 ` Enrico Scholz
2010-04-17 12:03 ` Koen Kooi
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.