diff options
| -rw-r--r-- | classes/kernel.bbclass | 11 | ||||
| -rw-r--r-- | conf/machine/include/tune-arm1136jf-s.conf | 2 | ||||
| -rw-r--r-- | conf/machine/mx31ads.conf | 18 | ||||
| -rw-r--r-- | packages/dosfstools/dosfstools_2.11.bb | 22 | ||||
| -rw-r--r-- | packages/linux/mainstone-kernel_2.6.18.bb | 4 | ||||
| -rw-r--r-- | packages/xorg-xserver/xserver-kdrive_git.bb | 15 |
6 files changed, 56 insertions, 16 deletions
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index c81112ede7..f5938a798f 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -45,11 +45,18 @@ export CMDLINE_CONSOLE = "console=${@bb.data.getVar("KERNEL_CONSOLE",d,1) or "tt # parse kernel ABI version out of <linux/version.h> def get_kernelversion(p): + import re, os + + fn = p + '/include/linux/utsrelease.h' + if not os.path.isfile(fn): + fn = p + '/include/linux/version.h' + import re try: - f = open(p, 'r') + f = open(fn, 'r') except IOError: return None + l = f.readlines() f.close() r = re.compile("#define UTS_RELEASE \"(.*)\"") @@ -67,7 +74,7 @@ def get_kernelmajorversion(p): return m.group(1) return None -KERNEL_VERSION = "${@get_kernelversion('${S}/include/linux/version.h')}" +KERNEL_VERSION = "${@get_kernelversion('${S}')}" KERNEL_MAJOR_VERSION = "${@get_kernelmajorversion('${KERNEL_VERSION}')}" KERNEL_LOCALVERSION ?= "" diff --git a/conf/machine/include/tune-arm1136jf-s.conf b/conf/machine/include/tune-arm1136jf-s.conf new file mode 100644 index 0000000000..9b4174018c --- /dev/null +++ b/conf/machine/include/tune-arm1136jf-s.conf @@ -0,0 +1,2 @@ +TARGET_CC_ARCH = "-march=armv6 -mtune=arm1136jf-s -mfpu=vfp" +PACKAGE_ARCH = "armv6"
\ No newline at end of file diff --git a/conf/machine/mx31ads.conf b/conf/machine/mx31ads.conf new file mode 100644 index 0000000000..2215af3239 --- /dev/null +++ b/conf/machine/mx31ads.conf @@ -0,0 +1,18 @@ +#@TYPE: Machine +#@Name: Freescale MX31ADS +#@DESCRIPTION: Machine configuration for Freescale MX31ADS + +TARGET_ARCH = "arm" + +GUI_MACHINE_CLASS = "smallscreen" +IPKG_EXTRA_ARCHS = "armv6" + +PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" + +include conf/machine/include/tune-arm1136jf-s.conf + +# used by sysvinit_2 +SERIAL_CONSOLE = "115200 ttymxc0" + +# used by opie-collections.inc +ROOT_FLASH_SIZE = "32" diff --git a/packages/dosfstools/dosfstools_2.11.bb b/packages/dosfstools/dosfstools_2.11.bb new file mode 100644 index 0000000000..c7398708e4 --- /dev/null +++ b/packages/dosfstools/dosfstools_2.11.bb @@ -0,0 +1,22 @@ +# dosfstools OE build file +# Copyright (C) 2004-2006, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +DESCRIPTION = "DOS FAT Filesystem Utilities" +MAINTAINER = "Raymond Danks <info-linux@geode.amd.com>" + +SECTION = "base" +PRIORITY = "optional" +LICENSE = "GPL" + +PR = "r0" + +SRC_URI = "ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-${PV}.src.tar.gz \ + file://alignment_hack.patch;patch=1 \ + file://msdos_fat12_undefined.patch;patch=1 \ + file://include-linux-types.patch;patch=1" + +do_install () { + oe_runmake "PREFIX=${D}" "SBINDIR=${D}${sbindir}" \ + "MANDIR=${D}${mandir}/man8" install +} diff --git a/packages/linux/mainstone-kernel_2.6.18.bb b/packages/linux/mainstone-kernel_2.6.18.bb index 6b90f73f3e..d17b6097b8 100644 --- a/packages/linux/mainstone-kernel_2.6.18.bb +++ b/packages/linux/mainstone-kernel_2.6.18.bb @@ -2,12 +2,12 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for the Mainstone (PXA270 ref design)" LICENSE = "GPL" MAINTAINER = "Cliff Brake <cliff.brake@gmail.com>" -PR = "r0 +PR = "r0" SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \ file://mainstone_defconfig" -S = "${WORKDIR}/linux-2.6.18 +S = "${WORKDIR}/linux-2.6.18" COMPATIBLE_HOST = 'arm.*-linux' diff --git a/packages/xorg-xserver/xserver-kdrive_git.bb b/packages/xorg-xserver/xserver-kdrive_git.bb index 27632f628c..198556c58d 100644 --- a/packages/xorg-xserver/xserver-kdrive_git.bb +++ b/packages/xorg-xserver/xserver-kdrive_git.bb @@ -62,19 +62,10 @@ EXTRA_OECONF = "--enable-composite --enable-sdl --enable-kdrive \ --disable-xorg --disable-xorgcfg \ --disable-xkb --disable-xnest --disable-xvfb \ --disable-xevie --disable-xprint --disable-xtrap \ - --disable-dmx --enable-w100 \ + --disable-dmx \ --with-default-font-path=built-ins \ --enable-tslib --enable-xcalibrate \ ac_cv_file__usr_share_X11_sgml_defs_ent=no" -# w100 doesn't build for x86 -EXTRA_OECONF_x86 = "--enable-composite --enable-sdl --enable-kdrive \ - --disable-dga --disable-dri --disable-xinerama \ - --disable-xf86misc --disable-xf86vidmode \ - --disable-xorg --disable-xorgcfg \ - --disable-xkb --disable-xnest --disable-xvfb \ - --disable-xevie --disable-xprint --disable-xtrap \ - --disable-dmx --disable-w100 \ - --with-default-font-path=built-ins \ - --enable-tslib --enable-xcalibrate \ - ac_cv_file__usr_share_X11_sgml_defs_ent=no" +EXTRA_OECONF_append_arm = " --enable-w100" +EXTRA_OECONF_append_x86 = " --disable-w100" |