diff options
| -rw-r--r-- | classes/kernel.bbclass | 3 | ||||
| -rw-r--r-- | conf/distro/include/preferred-om-2008-versions.inc | 4 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 2 | ||||
| -rw-r--r-- | conf/machine/htckaiser.conf | 25 | ||||
| -rw-r--r-- | conf/machine/om-gta02.conf | 5 | ||||
| -rw-r--r-- | packages/linux/linux-kaiser_2.6.24+git.bb | 15 |
6 files changed, 47 insertions, 7 deletions
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 90583b42a4..a295c144e7 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -470,7 +470,10 @@ do_deploy() { install -d ${DEPLOY_DIR_IMAGE} install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin + + if [ -d "${D}lib" ]; then tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${PV}-${PR}-${MACHINE}.tgz -C ${D} lib + fi if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then if test -e arch/${ARCH}/boot/compressed/vmlinux ; then diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index a54cf9174f..f2d816cd9e 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -1,7 +1,8 @@ PREFERRED_VERSION_asterisk = "1.4.17" PREFERRED_VERSION_busybox = "1.9.1" -PREFERRED_VERSION_dbus = "1.1.20" +PREFERRED_VERSION_dbus = "1.2.1" PREFERRED_VERSION_dbus-glib = "0.74" +PREFERRED_VERSION_glib-2.0 = "2.16.1" PREFERRED_VERSION_gnash = "0.8.2" PREFERRED_VERSION_gpsdrive = "2.10pre4" PREFERRED_VERSION_gst-pulse = "0.9.7" @@ -12,4 +13,3 @@ PREFERRED_VERSION_midori = "0.0.17" PREFERRED_VERSION_pulseaudio = "0.9.9" PREFERRED_VERSION_udev = "118" PREFERRED_VERSION_vte = "0.16.9" - diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index bc86ba7e67..9028630653 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -37,7 +37,7 @@ SRCREV_pn-fstests ?= "204" SRCREV_pn-gconf-dbus ?= "641" SRCREV_pn-gnuradio ?= "6377" SRCREV_pn-gpe-contacts ?= "9312" -SRCREV_pn-gsm0710muxd ?= "193" +SRCREV_pn-gsm0710muxd ?= "263" SRCREV_pn-gtkhtml2 ?= "1158" SRCREV_pn-gypsy ?= "134" SRCREV_pn-hildon-1 ?= "14429" diff --git a/conf/machine/htckaiser.conf b/conf/machine/htckaiser.conf new file mode 100644 index 0000000000..ad17bb82bf --- /dev/null +++ b/conf/machine/htckaiser.conf @@ -0,0 +1,25 @@ +#@TYPE: Machine +#@NAME: HTC Kaiser phone +#@DESCRIPTION: Machine configuration for HTC Kaiser phone +TARGET_ARCH = "arm" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6" + +PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" +XSERVER = "xserver-kdrive-fbdev" + +GUI_MACHINE_CLASS = "smallscreen" +MACHINE_DISPLAY_WIDTH_PIXELS = "240" +MACHINE_DISPLAY_HEIGHT_PIXELS = "320" + +TARGET_FPU = "soft" +TARGET_CC_ARCH = "-march=armv6j -mtune=arm1136jf-s" +FEED_ARCH = "armv6" +PACKAGE_ARCH = "armv6" + + +IMAGE_FSTYPES ?= "tar.gz cpio.gz" + +PREFERRED_PROVIDER_virtual/kernel = "linux-kaiser" + +MACHINE_FEATURES = "kernel26 touchscreen screen keyboard" + diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf index 18678cc336..e041b34c6f 100644 --- a/conf/machine/om-gta02.conf +++ b/conf/machine/om-gta02.conf @@ -34,6 +34,7 @@ SERIAL_CONSOLE = "115200 ttySAC2" ROOT_FLASH_SIZE = "256" # extra jffs2 tweaks +IMAGE_FSTYPES ?= "jffs2" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pagesize=0x800 \ --no-cleanmarkers --pad -n ; sumtool --eraseblock=0x20000 --no-cleanmarkers \ --littleendian --pad \ @@ -45,7 +46,3 @@ EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native" # tune for S3C24x0 include conf/machine/include/tune-arm920t.inc - -# build YAFFS2 -IMAGE_FSTYPES ?= "jffs2 yaffs2" - diff --git a/packages/linux/linux-kaiser_2.6.24+git.bb b/packages/linux/linux-kaiser_2.6.24+git.bb new file mode 100644 index 0000000000..ba4e6c1973 --- /dev/null +++ b/packages/linux/linux-kaiser_2.6.24+git.bb @@ -0,0 +1,15 @@ +require linux.inc + +PV = "2.6.24+git${SRCREV}" + +COMPATIBLE_MACHINE = "htckaiser" + +SRC_URI = "git://git.android.com/kernel.git;branch=android-msm;protocol=git \ + http://baliniak.pl/android/kernel.diff;patch=1" + +S = "${WORKDIR}/git" + +do_configure_prepend() { + cp .config ../defconfig +} + |