[oe-commits] org.oe.dev merge of '0dc157d146c11b00a52d985950481dd2a8c370de'
thesing commit
oe at amethyst.openembedded.net
Sun Jul 27 17:29:45 UTC 2008
merge of '0dc157d146c11b00a52d985950481dd2a8c370de'
and '6ee0dff6c561c5d9ad21138f2fc8a037a98fa6d0'
Author: thesing at openembedded.org
Branch: org.openembedded.dev
Revision: a7a11fde4813257fd795ba98b5cfa99942623f8c
ViewMTN: http://monotone.openembedded.org/revision/info/a7a11fde4813257fd795ba98b5cfa99942623f8c
Files:
1
packages/linux/linux-rp-2.6.26/initramfs-config-collie
packages/linux/linux-kexecboot-2.6.26
files/device_table_add-mmc.txt
packages/linux/linux-kexecboot.inc
packages/linux/linux-kexecboot_2.6.26.bb
classes/kernel.bbclass
conf/machine/collie.conf
conf/machine/include/zaurus-2.6.inc
packages/images/initramfs-kexec-image.bb
packages/linux/linux-rp-2.6.26/collie.patch
packages/linux/linux-rp-2.6.26/defconfig-collie
packages/linux/linux-rp.inc
packages/linux/linux-rp_2.6.26.bb
packages/jamvm/files/jamvm_1.4.5-initial.patch
packages/jamvm/jamvm-initial_1.4.5.bb
packages/images/fso-image.bb
Diffs:
#
# mt diff -r0dc157d146c11b00a52d985950481dd2a8c370de -ra7a11fde4813257fd795ba98b5cfa99942623f8c
#
#
#
# delete "packages/linux/linux-rp-2.6.26/initramfs-config-collie"
#
# add_dir "packages/linux/linux-kexecboot-2.6.26"
#
# add_file "files/device_table_add-mmc.txt"
# content [fcb6f461f63fe3444ef486405ff97906d7c7fb9a]
#
# add_file "packages/linux/linux-kexecboot.inc"
# content [1a5dde189f3eed29477082972af6e8298f55c4a6]
#
# add_file "packages/linux/linux-kexecboot_2.6.26.bb"
# content [287d3bbbebb212c90ad5294bbd7bf094aa17bed4]
#
# patch "classes/kernel.bbclass"
# from [7cbc09d4f4fd3e7051928da4ba4f8a6034393be9]
# to [3ffe1672ca1e9239f5d1d1b3d0b8264888a6808b]
#
# patch "conf/machine/collie.conf"
# from [c23a85835bc13ac978f36742cfc8ccf5880e0ec8]
# to [334ab4b53eea3f3be4a7b39b8fac9412b650aef2]
#
# patch "conf/machine/include/zaurus-2.6.inc"
# from [f56c5d7f00ad90430d1cfa3e9ff6283245f5e5c6]
# to [8294b7a8b586a8481132e82ee1e468c413001cb9]
#
# patch "packages/images/initramfs-kexec-image.bb"
# from [4e2703a70b61d827efd410dd7cd1627f0fd071d2]
# to [5d39e3585a4b60bb1a3abbb4cb5182e5a43b2e7b]
#
# patch "packages/linux/linux-rp-2.6.26/collie.patch"
# from [8a5d0916b37087cb7db9e5343a30aeba767cab10]
# to [98c325a4a359d1c1486ffc16439210f5f5adb9b6]
#
# patch "packages/linux/linux-rp-2.6.26/defconfig-collie"
# from [c605cec73bcfbadfc27203a557ee8ae481f7370f]
# to [1e9b95a0d88a54777e7f56273ef6fdb091b59ba4]
#
# patch "packages/linux/linux-rp.inc"
# from [8c503982eb0f04c622745f3b357ce507a502d408]
# to [2c46a07cacd6773da1465135b93706ce46d94b79]
#
# patch "packages/linux/linux-rp_2.6.26.bb"
# from [85f16a25da2b1ef154850e283cc2acbc720956f1]
# to [ff9b4547b7210312365df450c44cf68b21e2987a]
#
============================================================
--- files/device_table_add-mmc.txt fcb6f461f63fe3444ef486405ff97906d7c7fb9a
+++ files/device_table_add-mmc.txt fcb6f461f63fe3444ef486405ff97906d7c7fb9a
@@ -0,0 +1,2 @@
+# mmc numbers are assigned dynamicly so if you have other dynamic assigned block devices it may be wrong
+/dev/mmcblk0p1 b 660 0 6 179 1 - - -
============================================================
--- packages/linux/linux-kexecboot.inc 1a5dde189f3eed29477082972af6e8298f55c4a6
+++ packages/linux/linux-kexecboot.inc 1a5dde189f3eed29477082972af6e8298f55c4a6
@@ -0,0 +1,39 @@
+DESCRIPTION = "2.6 Linux kexec bootloader for Zaurus devices and iPAQ hx2750."
+SECTION = "kernel"
+LICENSE = "GPL"
+
+INITRAMFS_IMAGE = "initramfs-kexec-image"
+inherit kernel
+PACKAGES = ""
+PROVIDES = ""
+
+DOSRC = "http://www.do13.de/openzaurus/patches"
+RPSRC = "http://www.rpsys.net/openzaurus/patches/archive"
+JLSRC = "http://www.cs.wisc.edu/~lenz/zaurus/files"
+BASRC = "http://www.orca.cx/zaurus/patches"
+CHSRC = "http://oz.drigon.com/patches"
+TKSRC = "http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches"
+
+COMPATIBLE_HOST = "(arm|i.86).*-linux"
+COMPATIBLE_MACHINE = '(collie|poodle|c7x0|akita|spitz|tosa|hx2000|qemuarm|qemux86|bootcdx86|htcuniversal|zylonite)'
+
+KERNEL_IMAGE_BASE_NAME = "${KERNEL_IMAGETYPE}-kexecboot-${PV}-${PR}-${MACHINE}"
+KERNEL_IMAGE_SYMLINK_NAME = "${KERNEL_IMAGETYPE}-kexecboot-${MACHINE}"
+
+KERNEL_DEFCONFIG ?= "defconfig-${MACHINE}"
+
+do_compile[depends] += "${INITRAMFS_IMAGE}:do_rootfs"
+
+do_configure() {
+ cp '${WORKDIR}/${KERNEL_DEFCONFIG}' '${S}/.config'
+ yes '' | oe_runmake oldconfig
+}
+
+do_stage() {
+}
+
+do_install() {
+}
+
+python do_package() {
+}
============================================================
--- packages/linux/linux-kexecboot_2.6.26.bb 287d3bbbebb212c90ad5294bbd7bf094aa17bed4
+++ packages/linux/linux-kexecboot_2.6.26.bb 287d3bbbebb212c90ad5294bbd7bf094aa17bed4
@@ -0,0 +1,175 @@
+require linux-kexecboot.inc
+
+PR = "r1"
+FILESDIR = "linux-rp_${PV}"
+DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_qemuarm = "-1"
+DEFAULT_PREFERENCE_qemux86 = "-1"
+DEFAULT_PREFERENCE_spitz = "1"
+DEFAULT_PREFERENCE_collie = "1"
+
+# Handy URLs
+# git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
+# ${KERNELORG_MIRROR}pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2
+# ${KERNELORG_MIRROR}pub/linux/kernel/v2.6/testing/linux-2.6.20-rc4.tar.bz2
+# ${KERNELORG_MIRROR}pub/linux/kernel/v2.6/testing/patch-2.6.18-rc6.bz2;patch=1
+# ${KERNELORG_MIRROR}pub/linux/kernel/v2.6/snapshots/patch-2.6.18-rc2-git1.bz2;patch=1
+# ${KERNELORG_MIRROR}pub/linux/kernel/people/alan/linux-2.6/2.6.10/patch-2.6.10-ac8.gz;patch=1
+# ${KERNELORG_MIRROR}pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;patch=1
+
+# Patches submitted upstream are towards top of this list
+# Hacks should clearly named and at the bottom
+SRC_URI = "${KERNELORG_MIRROR}pub/linux/kernel/v2.6/linux-2.6.26.tar.bz2 \
+ ${RPSRC}/lzo_jffs2_sysfs-r1.patch;patch=1 \
+ ${RPSRC}/hx2750_base-r34.patch;patch=1 \
+ ${RPSRC}/hx2750_bl-r9.patch;patch=1 \
+ ${RPSRC}/hx2750_pcmcia-r3.patch;patch=1 \
+ ${RPSRC}/pxa_keys-r9.patch;patch=1 \
+ ${RPSRC}/tsc2101-r19.patch;patch=1 \
+ ${RPSRC}/hx2750_test1-r8.patch;patch=1 \
+ ${RPSRC}/sharpsl_pm_fixes1-r0.patch;patch=1 \
+ ${RPSRC}/pm_changes-r1.patch;patch=1 \
+ ${RPSRC}/locomo_kbd_tweak-r2.patch;patch=1 \
+# ${RPSRC}/pxa27x_overlay-r8.patch;patch=1 \
+ ${RPSRC}/w100_extaccel-r2.patch;patch=1 \
+ ${RPSRC}/w100_extmem-r1.patch;patch=1 \
+ ${RPSRC}/poodle_pm-r6.patch;patch=1 \
+ ${RPSRC}/poodle_lcd_hack-r0.patch;patch=1 \
+ ${RPSRC}/poodle_asoc_fix-r1.patch;patch=1 \
+ file://zaurus-i2c-init.patch;patch=1;status=upstream \
+ ${RPSRC}/logo_oh-r1.patch.bz2;patch=1;status=unmergable \
+ ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable \
+ file://hostap-monitor-mode.patch;patch=1;status=unmergable \
+ file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1;status=unmergable \
+ ${RPSRC}/mmcsd_large_cards-r1.patch;patch=1;status=hack \
+ ${RPSRC}/mmcsd_no_scr_check-r2.patch;patch=1;status=hack \
+ ${RPSRC}/integrator_rgb-r1.patch;patch=1;status=hack \
+ ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1;status=hack \
+ file://sharpsl-rc-r1.patch;patch=1 \
+ file://spitz_h_rewrite.patch;patch=1 \
+ file://pxa-serial-hack.patch;patch=1;status=hack \
+ file://connectplus-remove-ide-HACK.patch;patch=1;status=hack \
+ file://connectplus-prevent-oops-HACK.patch;patch=1;status=hack \
+ file://htcuni.patch;patch=1 \
+ file://versatile-armv6.patch;patch=1 \
+ file://defconfig-c7x0 \
+ file://defconfig-hx2000 \
+ file://defconfig-akita \
+ file://defconfig-spitz \
+ file://defconfig-qemuarm \
+ file://defconfig-qemux86 \
+ file://defconfig-bootcdx86 \
+ file://defconfig-htcuniversal \
+ file://defconfig-collie \
+ file://defconfig-zylonite"
+# Disabled until the patchset is updated:
+# file://defconfig-tosa
+# file://defconfig-poodle
+
+
+# FIXMEs before made default
+# ${RPSRC}/mmcsd_no_scr_check-r1.patch;patch=1;status=hack
+
+
+# Add this to enable pm debug code (useful with a serial lead)
+# ${RPSRC}/sharpsl_pm_debug-r0.patch;patch=1
+
+# Disabled until I find the reason this gives issues with cdc_subset
+# ${RPSRC}/usb_rndis_tweaks-r0.patch;patch=1 \
+
+
+SRC_URI_append_collie = "\
+ file://collie.patch;patch=1 \
+ file://collie_keymap.patch;patch=1 \
+"
+
+SRC_URI_append_poodle = "\
+ ${RPSRC}/poodle_serial_vcc-r0.patch;patch=1 \
+ file://poodle_ts.patch;patch=1 \
+ file://pxafb.patch;patch=1 \
+"
+
+SRC_URI_append_tosa = "\
+ file://tosa/0001-Allow-runtime-registration-of-regions-of-memory-that.patch;patch=1 \
+ file://tosa/0002-Modify-dma_alloc_coherent-on-ARM-so-that-it-supports.patch;patch=1 \
+ file://tosa/0003-Core-MFD-support.patch;patch=1 \
+ file://tosa/0004-Add-support-for-tc6393xb-MFD-core.patch;patch=1 \
+ file://tosa/0005-Add-support-for-tc6387xb-MFD-core.patch;patch=1 \
+ file://tosa/0006-Add-support-for-t7l66xb-MFD-core.patch;patch=1 \
+ file://tosa/0007-Common-headers-for-TMIO-MFD-subdevices.patch;patch=1 \
+ file://tosa/0008-Nand-driver-for-TMIO-devices.patch;patch=1 \
+ file://tosa/0009-FB-driver-for-TMIO-devices.patch;patch=1 \
+ file://tosa/0010-OHCI-driver-for-TMIO-devices.patch;patch=1 \
+ file://tosa/0011-MMC-driver-for-TMIO-devices.patch;patch=1 \
+ file://tosa/0012-Tosa-keyboard-support.patch;patch=1 \
+ file://tosa/0013-USB-gadget-pxa2xx_udc-supports-inverted-vbus.patch;patch=1 \
+ file://tosa/0014-tosa_udc_use_gpio_vbus.patch.patch;patch=1 \
+ file://tosa/0015-sharpsl-export-params.patch;patch=1 \
+ file://tosa/0016-This-patch-fixes-the-pxa25x-clocks-definitions-to-ad.patch;patch=1 \
+ file://tosa/0017-Convert-pxa2xx-UDC-to-use-debugfs.patch;patch=1 \
+ file://tosa/0018-Fix-the-pxa2xx_udc-to-balance-calls-to-clk_enable-cl.patch;patch=1 \
+ file://tosa/0026-I-don-t-think-we-should-check-for-IRQs-when-determin.patch;patch=1 \
+ file://tosa/0027-Add-LiMn-one-of-the-most-common-for-small-non-recha.patch;patch=1 \
+ file://tosa/0028-Add-suspend-resume-wakeup-support-for-pda_power.patch;patch=1 \
+ file://tosa/0029-Support-using-VOLTAGE_-properties-for-apm-calculati.patch;patch=1 \
+ file://tosa/0030-Core-driver-for-WM97xx-touchscreens.patch;patch=1 \
+ file://tosa/0031-Add-chip-driver-for-WM9705-touchscreen.patch;patch=1 \
+ file://tosa/0032-Add-chip-driver-for-WM9712-touchscreen.patch;patch=1 \
+ file://tosa/0033-Add-chip-driver-for-WM9713-touchscreen.patch;patch=1 \
+ file://tosa/0034-Driver-for-WM97xx-touchscreens-in-streaming-mode-on.patch;patch=1 \
+ file://tosa/0035-Build-system-and-MAINTAINERS-entry-for-WM97xx-touchs.patch;patch=1 \
+ file://tosa/0036-Set-id-to-1-for-wm97xx-subdevices.patch;patch=1 \
+ file://tosa/0037-Don-t-lock-the-codec-list-in-snd_soc_dapm_new_widget.patch;patch=1 \
+ file://tosa/0038-Don-t-lock-the-codec-list-in-snd_soc_dapm_new_widget.patch;patch=1 \
+ file://tosa/0044-fix-tmio_mmc-debug-compilation.patch;patch=1 \
+ file://tosa/0045-Update-tmio_ohci.patch;patch=1 \
+ file://tosa/0046-patch-tc6393xb-cleanup.patch;patch=1 \
+ file://tosa/0047-tc6393xb-use-bitmasks-instead-of-bit-field-structs.patch;patch=1 \
+ file://tosa/0048-tc6393xb-GPIO-support.patch;patch=1 \
+ file://tosa/0049-platform-support-for-TMIO-on-tosa.patch;patch=1 \
+ file://tosa/0050-tosa-update-for-tc6393xb-gpio.patch;patch=1 \
+ file://tosa/0051-fix-sound-soc-pxa-tosa.c-to-new-gpio-api.patch;patch=1 \
+ file://tosa/0052-tosa-platform-backlight-support.patch;patch=1 \
+ file://tosa/0053-sound-soc-codecs-wm9712.c-28.patch;patch=1 \
+ file://tosa/0054-sound-soc-codecs-wm9712.c-2.patch;patch=1 \
+ file://tosa/0055-Add-GPIO_POWERON-to-the-list-of-devices-that-we-supp.patch;patch=1 \
+ file://tosa/0058-Fix-tosakbd-suspend.patch;patch=1 \
+ file://tosa/0059-patch-tosa-wakeup-test.patch;patch=1 \
+ file://tosa/0060-Add-support-for-power_supply-on-tosa.patch;patch=1 \
+ file://tosa/0061-tosa-bat-unify.patch;patch=1 \
+ file://tosa/0062-tosa-bat-fix-charging.patch;patch=1 \
+ file://tosa/0063-patch-tosa-bat-jacket-detect.patch;patch=1 \
+ file://tosa/0064-Export-modes-via-sysfs.patch;patch=1 \
+ file://tosa/0065-wm97xx-core-fixes.patch;patch=1 \
+ file://tosa/0066-tmiofb_probe-should-be-__devinit.patch;patch=1 \
+ file://tosa/0067-modeswitching.patch;patch=1 \
+ file://tosa/0068-Preliminary-tosa-denoiser.patch;patch=1 \
+ file://tosa/0019-pxa-remove-periodic-mode-emulation-support.patch;patch=1 \
+ file://tosa/0020-Provide-dew-device-clock-backports-from-2.6.24-git.patch;patch=1 \
+ file://tosa/0021-Add-an-empty-drivers-gpio-directory-for-gpiolib-infr.patch;patch=1 \
+ file://tosa/0022-Provide-new-implementation-infrastructure-that-platf.patch;patch=1 \
+ file://tosa/0023-This-adds-gpiolib-support-for-the-PXA-architecture.patch;patch=1 \
+ file://tosa/0024-Update-Documentation-gpio.txt-primarily-to-include.patch;patch=1 \
+ file://tosa/0025-Signed-off-by-Dmitry-Baryshkov-dbaryshkov-gmail.co.patch;patch=1 \
+ file://tosa/0039-Add-generic-framework-for-managing-clocks.patch;patch=1 \
+ file://tosa/0040-Clocklib-debugfs-support.patch;patch=1 \
+ file://tosa/0041-From-80a359e60c2aec59ccf4fca0a7fd20495f82b1d2-Mon-Se.patch;patch=1 \
+ file://tosa/0042-Use-correct-clock-for-IrDA-on-pxa.patch;patch=1 \
+ file://tosa/0043-Use-clocklib-for-sa1100-sub-arch.patch;patch=1 \
+ file://tosa/0056-Support-resetting-by-asserting-GPIO-pin.patch;patch=1 \
+ file://tosa/0057-Clean-up-tosa-resetting.patch;patch=1 \
+ "
+
+SRC_URI_append_htcuniversal ="\
+ file://htcuni-acx.patch;patch=1;status=external \
+ "
+
+SRC_URI_append_zylonite ="\
+ file://pxa_fb_overlay.patch;patch=1 \
+ file://zylonite-boot.patch;patch=1 \
+ file://zylonite_mtd-r0.patch;patch=1 \
+ file://zylonite_touch-r0.patch;patch=1 \
+ file://zylonite_keypad-r0.patch;patch=1 \
+ "
+
+S = "${WORKDIR}/linux-2.6.26"
============================================================
--- classes/kernel.bbclass 7cbc09d4f4fd3e7051928da4ba4f8a6034393be9
+++ classes/kernel.bbclass 3ffe1672ca1e9239f5d1d1b3d0b8264888a6808b
@@ -73,6 +73,9 @@ kernel_do_compile() {
UBOOT_LOADADDRESS ?= "${UBOOT_ENTRYPOINT}"
kernel_do_compile() {
+ if [ ! -z "${INITRAMFS_IMAGE}" ]; then
+ cp "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.cpio.gz" initramfs.cpio.gz
+ fi
unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
oe_runmake include/linux/version.h CC="${KERNEL_CC}" LD="${KERNEL_LD}"
if [ "${KERNEL_MAJOR_VERSION}" != "2.6" ]; then
@@ -85,30 +88,9 @@ kernel_do_compile() {
oenote "no modules to compile"
fi
}
+kernel_do_compile[depends] = "${INITRAMFS_TASK}"
-do_builtin_initramfs() {
- if [ ! -z "${INITRAMFS_IMAGE}" ]; then
- unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
- cp "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.cpio.gz" usr/initramfs_data.cpio.gz
- oe_runmake ${KERNEL_IMAGETYPE} CC="${KERNEL_CC}" LD="${KERNEL_LD}"
-
- install -d ${DEPLOY_DIR_IMAGE}
- install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}-${INITRAMFS_IMAGE}.bin
- package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}-${INITRAMFS_IMAGE}.bin
-
- # Make sure to kill injected initramfs, in case someone will do "-c compile -f"
- rm usr/initramfs_data.cpio.gz
-
- cd ${DEPLOY_DIR_IMAGE}
- rm -f ${KERNEL_IMAGE_SYMLINK_NAME}-${INITRAMFS_IMAGE}.bin
- ln -sf ${KERNEL_IMAGE_BASE_NAME}-${INITRAMFS_IMAGE}.bin ${KERNEL_IMAGE_SYMLINK_NAME}-${INITRAMFS_IMAGE}.bin
- package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_SYMLINK_NAME}-${INITRAMFS_IMAGE}.bin
- fi
-}
-addtask builtin_initramfs before do_build after do_package_write
-do_builtin_initramfs[depends] = '${INITRAMFS_TASK}'
-
kernel_do_stage() {
ASMDIR=`readlink include/asm`
@@ -468,7 +450,7 @@ do_sizecheck() {
# Support checking the kernel size since some kernels need to reside in partitions
# with a fixed length or there is a limit in transferring the kernel to memory
do_sizecheck() {
- if [ ! -z "${KERNEL_IMAGE_MAXSIZE}" ]; then
+ if [ ! -z "${KERNEL_IMAGE_MAXSIZE}" -a -z "${DONT_CHECK_KERNELSIZE}"]; then
size=`ls -l arch/${ARCH}/boot/${KERNEL_IMAGETYPE} | awk '{ print $5}'`
if [ $size -ge ${KERNEL_IMAGE_MAXSIZE} ]; then
rm arch/${ARCH}/boot/${KERNEL_IMAGETYPE}
============================================================
--- conf/machine/collie.conf c23a85835bc13ac978f36742cfc8ccf5880e0ec8
+++ conf/machine/collie.conf 334ab4b53eea3f3be4a7b39b8fac9412b650aef2
@@ -8,11 +8,19 @@ %s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r6ee0dff6c561c5d9ad21138f2fc8a037a98fa6d0 -ra7a11fde4813257fd795ba98b5cfa99942623f8c
#
#
#
# add_file "packages/jamvm/files/jamvm_1.4.5-initial.patch"
# content [5f7d5417f566f9937a18bddfa1e2ed462babbc22]
#
# add_file "packages/jamvm/jamvm-initial_1.4.5.bb"
# content [c21b003fb1ee97620f078412147c76fa95f9926e]
#
# patch "packages/images/fso-image.bb"
# from [5c8597f6d160a644126f564543e5c4e542223e4b]
# to [0846b765e7589f6a8a71d18695fd72da40666a8f]
#
============================================================
--- packages/jamvm/files/jamvm_1.4.5-initial.patch 5f7d5417f566f9937a18bddfa1e2ed462babbc22
+++ packages/jamvm/files/jamvm_1.4.5-initial.patch 5f7d5417f566f9937a18bddfa1e2ed462babbc22
@@ -0,0 +1,73 @@
+Index: jamvm-1.4.5/configure.ac
+===================================================================
+--- jamvm-1.4.5.orig/configure.ac
++++ jamvm-1.4.5/configure.ac
+@@ -1,6 +1,6 @@
+ dnl Process this file with autoconf to produce a configure script.
+ AC_INIT(src/jam.c)
+-AM_INIT_AUTOMAKE(jamvm, 1.4.5)
++AM_INIT_AUTOMAKE(jamvm-initial, 1.4.5)
+ AC_CONFIG_HEADERS([src/config.h])
+ AC_PREFIX_DEFAULT(/usr/local/jamvm)
+
+Index: jamvm-1.4.5/java-initial
+===================================================================
+--- /dev/null
++++ jamvm-1.4.5/java-initial
+@@ -0,0 +1,5 @@
++#!/bin/sh
++#
++# Wrapper script inspired by the one provided by cacao.
++
++exec jamvm-initial ${1+"$@"}
+Index: jamvm-1.4.5/lib/Makefile.am
+===================================================================
+--- jamvm-1.4.5.orig/lib/Makefile.am
++++ jamvm-1.4.5/lib/Makefile.am
+@@ -1,4 +1,4 @@
+- at use_zip_yes@ GLIBJ_ZIP = ${with_classpath_install_dir}/share/classpath/glibj.zip
++ at use_zip_yes@ GLIBJ_ZIP = ${with_classpath_install_dir}/share/classpath-initial/glibj.zip
+ @use_zip_no@ GLIBJ_ZIP = ${with_classpath_install_dir}/share/classpath/
+
+ SUBDIRS = jamvm java gnu sun
+Index: jamvm-1.4.5/src/dll.c
+===================================================================
+--- jamvm-1.4.5.orig/src/dll.c
++++ jamvm-1.4.5/src/dll.c
+@@ -294,7 +294,7 @@ char *getDllPath() {
+ }
+
+ char *getBootDllPath() {
+- return CLASSPATH_INSTALL_DIR"/lib/classpath";
++ return CLASSPATH_INSTALL_DIR"/lib/classpath-initial";
+ }
+
+ char *getDllName(char *name) {
+Index: jamvm-1.4.5/src/Makefile.am
+===================================================================
+--- jamvm-1.4.5.orig/src/Makefile.am
++++ jamvm-1.4.5/src/Makefile.am
+@@ -2,7 +2,7 @@ SUBDIRS = os
+ DIST_SUBDIRS = os arch
+
+ bin_PROGRAMS = jamvm
+-include_HEADERS = jni.h
++noinst_HEADERS = jni.h
+
+ lib_LTLIBRARIES = libjvm.la
+ noinst_LTLIBRARIES = libcore.la
+Index: jamvm-1.4.5/src/class.c
+===================================================================
+--- jamvm-1.4.5.orig/src/class.c
++++ jamvm-1.4.5/src/class.c
+@@ -1653,8 +1653,8 @@ void scanDirsForJars(char *directories)
+ }
+
+ #ifdef USE_ZIP
+-#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes.zip"
+-#define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath/glibj.zip"
++#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm-initial/classes.zip"
++#define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath-initial/glibj.zip"
+ #else
+ #define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes"
+ #define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath"
============================================================
--- packages/jamvm/jamvm-initial_1.4.5.bb c21b003fb1ee97620f078412147c76fa95f9926e
+++ packages/jamvm/jamvm-initial_1.4.5.bb c21b003fb1ee97620f078412147c76fa95f9926e
@@ -0,0 +1,38 @@
+SUMMARY = "A compact Java Virtual Machine which conforms to the JVM specification version 2."
+HOMEPAGE = "http://jamvm.sourceforge.net/"
+LICENSE = "GPL"
+
+DEPENDS = "zlib-native classpath-initial jikes-initial"
+
+PR = "r0"
+
+PROVIDES = "virtual/java-initial"
+
+S = "${WORKDIR}/jamvm-${PV}"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/jamvm/jamvm-${PV}.tar.gz \
+ file://jamvm_${PV}-initial.patch;patch=1;pnum=1 \
+ "
+
+# This uses 32 bit arm, so force the instruction set to arm, not thumb
+ARM_INSTRUCTION_SET = "arm"
+
+inherit native autotools
+
+EXTRA_OECONF = "\
+ --with-classpath-install-dir=${prefix} \
+ --program-suffix=-initial \
+ "
+
+CFLAGS += "-DDEFAULT_MAX_HEAP=16*MB"
+
+do_compile() {
+ oe_runmake \
+ JAVAC=jikes-initial \
+ GLIBJ_ZIP=${STAGING_DATADIR_NATIVE}/classpath-initial/glibj.zip
+}
+
+do_stage_append() {
+ install -d ${STAGING_BINDIR}
+ install -m 0755 java-initial ${STAGING_BINDIR}
+}
============================================================
--- packages/images/fso-image.bb 5c8597f6d160a644126f564543e5c4e542223e4b
+++ packages/images/fso-image.bb 0846b765e7589f6a8a71d18695fd72da40666a8f
@@ -64,6 +64,13 @@ AUDIO_INSTALL = "\
fso-sounds \
"
+GTK_INSTALL = "\
+ openmoko-calculator2 \
+ openmoko-terminal2 \
+ gpe-scap \
+ tangogps \
+"
+
# FIXME these should rather be part of alsa-state,
# once Om stabilizes them...
AUDIO_INSTALL_append_om-gta01 = "\
@@ -90,6 +97,7 @@ IMAGE_INSTALL = "\
IMAGE_INSTALL = "\
${BASE_INSTALL} \
${X_INSTALL} \
+ ${GTK_INSTALL} \
${AUDIO_INSTALL} \
${TOOLS_INSTALL} \
${PYTHON_INSTALL} \
@@ -102,14 +110,25 @@ fso_rootfs_postprocess() {
fso_rootfs_postprocess() {
curdir=$PWD
cd ${IMAGE_ROOTFS}
+ # date/time
date "+%m%d%H%M%Y" >./etc/timestamp
+ # alias foo
echo "alias pico=nano" >>./etc/profile
echo "alias fso='cd /local/pkg/fso'" >>./etc/profile
echo "alias ipkg='opkg'" >>./etc/profile
+ # nfs
mkdir -p ./local/pkg
echo >>./etc/fstab
echo "# NFS Host" >>./etc/fstab
echo "192.168.0.200:/local/pkg /local/pkg nfs noauto,nolock,soft,rsize=32768,wsize=32768 0 0" >>./etc/fstab
+ # fix .desktop files for illume
+ desktop=`find ./usr/share/applications -name "*.desktop"`
+ for file in $desktop; do
+ echo "Categories=Office;" >>$file
+ done
+ # minimal gtk theme foo
+ mkdir -p ./etc/gtk-2.0/
+ echo 'gtk-font-name = "Sans 5"' >> ./etc/gtk-2.0/gtkrc
cd $curdir
}
More information about the Openembedded-commits
mailing list