diff options
author | Rod Whitby <rod@whitby.id.au> | 2005-11-21 07:42:32 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-11-21 07:42:32 +0000 |
commit | 94d14ff9e7623337ece7bcafa4c373949ed78c19 (patch) | |
tree | c4ac4ee935f915f0e48173bcce7277dfbf24402e /packages/linux/nas100d-kernel.inc | |
parent | c3036f11360cf4992c635dcdc43f1d703b004cac (diff) |
nas100d-kernel: Updated for 2.6.15-rc2
Diffstat (limited to 'packages/linux/nas100d-kernel.inc')
-rw-r--r-- | packages/linux/nas100d-kernel.inc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/packages/linux/nas100d-kernel.inc b/packages/linux/nas100d-kernel.inc index f8da5d3059..6dd8a46001 100644 --- a/packages/linux/nas100d-kernel.inc +++ b/packages/linux/nas100d-kernel.inc @@ -188,6 +188,9 @@ EXTRA_OEMAKE += "EXTRAVERSION=" EXTRA_OEMAKE += "LOCALVERSION=" EXTRA_OEMAKE += "MAKEFLAGS='--no-print-directory'" +# Override KERNEL_RELEASE from kernel.bbclass to match: +KERNEL_RELEASE = "${KERNEL_VERSION}" + # By putting the added files in place in a separate task before # do_patch it becomes possible to patch these files. do_unpacklocal() { @@ -201,14 +204,13 @@ do_unpacklocal() { addtask unpacklocal before do_patch after do_unpack do_configure_prepend() { - install -m 0644 ${WORKDIR}/defconfig ${S}/.config - if test '${ARCH_BYTE_SEX}' = le + rm -f ${S}/.config + echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >>'${S}/.config' + if test '${ARCH_BYTE_SEX}' = be then - sed -i '/CONFIG_CPU_BIG_ENDIAN/d' '${S}/.config' - else echo 'CONFIG_CPU_BIG_ENDIAN=y' >>'${S}/.config' fi - echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config + sed -e '/CONFIG_CPU_BIG_ENDIAN/d' -e '/CONFIG_CMDLINE=/d' '${WORKDIR}/defconfig' >>'${S}/.config' rm -rf ${S}/include/asm-arm/arch ${S}/include/asm-arm/proc \ ${S}/include/asm-arm/.proc ${S}/include/asm-arm/.arch } |