meta-extras: Remove obsolete android goldfish code
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
Richard Purdie
parent
3073a73214
commit
d977cb25e5
|
|
@ -1,18 +0,0 @@
|
|||
#@TYPE: Machine
|
||||
#@NAME: Android Machine setup
|
||||
#@DESCRIPTION: Machine configuration for the Android platform
|
||||
|
||||
TARGET_ARCH = "arm"
|
||||
PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te"
|
||||
|
||||
require conf/machine/include/qemu.inc
|
||||
require conf/machine/include/tune-arm926ejs.inc
|
||||
|
||||
KERNEL_IMAGETYPE = "zImage"
|
||||
|
||||
IMAGE_FSTYPES = "tar.bz2 yaffs2"
|
||||
EXTRA_IMAGECMD_yaffs2 = "0"
|
||||
|
||||
SERIAL_CONSOLE = "115200 ttyS0"
|
||||
|
||||
PREFERRED_PROVIDER_virtual/kernel = "linux-android-goldfish"
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
---
|
||||
arch/arm/kernel/vmlinux.lds.S | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
Index: linux-2.6.22/arch/arm/kernel/vmlinux.lds.S
|
||||
===================================================================
|
||||
--- linux-2.6.22.orig/arch/arm/kernel/vmlinux.lds.S 2007-09-11 18:32:29.000000000 +0200
|
||||
+++ linux-2.6.22/arch/arm/kernel/vmlinux.lds.S 2007-09-11 18:33:42.000000000 +0200
|
||||
@@ -94,6 +94,7 @@
|
||||
TEXT_TEXT
|
||||
SCHED_TEXT
|
||||
LOCK_TEXT
|
||||
+ *(.note.*)
|
||||
#ifdef CONFIG_MMU
|
||||
*(.fixup)
|
||||
#endif
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,81 +0,0 @@
|
|||
DESCRIPTION = "2.6 Linux Android Kernel from Google"
|
||||
SECTION = "kernel"
|
||||
LICENSE = "GPL"
|
||||
|
||||
inherit kernel
|
||||
|
||||
PR = "r0"
|
||||
|
||||
SRC_URI = "http://android.googlecode.com/files/linux-2.6.23-android-m3-rc20.tar.gz \
|
||||
file://binutils-buildid-arm.patch;patch=1 \
|
||||
file://defconfig-android-goldfish"
|
||||
|
||||
S = "${WORKDIR}/kernel"
|
||||
|
||||
RPROVIDES_kernel-base += "hostap-modules"
|
||||
|
||||
RPSRC = "http://www.rpsys.net/openzaurus/patches/archive"
|
||||
|
||||
COMPATIBLE_HOST = "arm.*-linux"
|
||||
COMPATIBLE_MACHINE = 'android'
|
||||
|
||||
KERNEL_CUSTOM_NAME ?= ""
|
||||
KERNEL_DEPLOY_NAME ?= "${KERNEL_IMAGETYPE}-${PV}-${KERNEL_CUSTOM_NAME}${MACHINE}-${DATETIME}.bin"
|
||||
KERNEL_SYMLINK_NAME ?= "${KERNEL_IMAGETYPE}-${KERNEL_CUSTOM_NAME}${MACHINE}.bin"
|
||||
KERNEL_DEFCONFIG ?= "defconfig-${MACHINE}"
|
||||
|
||||
CMDLINE = ""
|
||||
|
||||
do_configure() {
|
||||
rm -f ${S}/.config
|
||||
|
||||
if [ ! -e ${WORKDIR}/${KERNEL_DEFCONFIG} ]; then
|
||||
die "No default configuration for ${MACHINE} available."
|
||||
fi
|
||||
|
||||
echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config
|
||||
|
||||
if [ "${TARGET_OS}" = "linux-gnueabi" -o "${TARGET_OS}" = "linux-uclibcgnueabi" ]; then
|
||||
echo "CONFIG_AEABI=y" >> ${S}/.config
|
||||
echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config
|
||||
else
|
||||
echo "# CONFIG_AEABI is not set" >> ${S}/.config
|
||||
echo "# CONFIG_OABI_COMPAT is not set" >> ${S}/.config
|
||||
fi
|
||||
|
||||
if [ "${DISTRO}" = "poky" -a "${MACHINE}" != "collie" ]; then
|
||||
echo "CONFIG_LOGO=y" >> ${S}/.config
|
||||
echo "CONFIG_LOGO_OHAND_CLUT224=y" >> ${S}/.config
|
||||
echo "# CONFIG_LOGO_LINUX_CLUT224 is not set" >> ${S}/.config
|
||||
else
|
||||
echo "# CONFIG_LOGO is not set" >> ${S}/.config
|
||||
echo "# CONFIG_LOGO_OHAND_CLUT224 is not set" >> ${S}/.config
|
||||
echo "# CONFIG_LOGO_LINUX_CLUT224 is not set" >> ${S}/.config
|
||||
fi
|
||||
|
||||
sed -e '/CONFIG_AEABI/d' \
|
||||
-e '/CONFIG_OABI_COMPAT=/d' \
|
||||
-e '/CONFIG_CMDLINE=/d' \
|
||||
-e '/CONFIG_MTD_MTDRAM_SA1100=/d' \
|
||||
-e '/CONFIG_MTDRAM_TOTAL_SIZE=/d' \
|
||||
-e '/CONFIG_MTDRAM_ERASE_SIZE=/d' \
|
||||
-e '/CONFIG_MTDRAM_ABS_POS=/d' \
|
||||
-e '/CONFIG_LOGO=/d' \
|
||||
-e '/CONFIG_LOGO_LINUX_CLUT224=/d' \
|
||||
-e '/CONFIG_LOGO_OHAND_CLUT224=/d' \
|
||||
'${WORKDIR}/${KERNEL_DEFCONFIG}' >>'${S}/.config'
|
||||
|
||||
yes '' | oe_runmake oldconfig
|
||||
}
|
||||
|
||||
do_deploy() {
|
||||
install -d ${DEPLOY_DIR_IMAGE}
|
||||
install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_DEPLOY_NAME}
|
||||
cd ${DEPLOY_DIR_IMAGE}
|
||||
ln -sf ${KERNEL_DEPLOY_NAME} ${KERNEL_SYMLINK_NAME}
|
||||
#tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_VERSION}-${MACHINE}.tgz -C ${D} lib
|
||||
}
|
||||
|
||||
do_deploy[dirs] = "${S}"
|
||||
|
||||
addtask deploy before do_package after do_install
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
LICENSE = "GPL"
|
||||
DEPENDS = "zlib-native"
|
||||
PV = "0.0-rc20"
|
||||
PR = "r0"
|
||||
|
||||
SRC_URI = "http://android.googlecode.com/files/android-emulator-m3-rc20.tar.bz2 \
|
||||
file://fixes.patch;patch=1"
|
||||
|
||||
S = "${WORKDIR}/android-emulator-20071111/qemu"
|
||||
|
||||
EXTRA_OECONF = "--disable-gfx-check --target-list=arm-softmmu --enable-nand --enable-skins --enable-trace --enable-shaper --use-sdl-config=${prefix}/hackedsdl/bin/sdl-config --disable-user --disable-kqemu --enable-sdl --static-png --static-sdl"
|
||||
|
||||
inherit autotools
|
||||
inherit native
|
||||
|
||||
do_unfubar () {
|
||||
chmod -R u+w ${WORKDIR}/
|
||||
cd ${WORKDIR}/android-emulator-20071111/sdl
|
||||
configure --prefix=${prefix}/hackedsdl
|
||||
make
|
||||
make install
|
||||
}
|
||||
|
||||
addtask unfubar after do_unpack before do_patch
|
||||
|
||||
|
|
@ -1,45 +0,0 @@
|
|||
Index: qemu/linux-user/elfload.c
|
||||
===================================================================
|
||||
--- qemu.orig/linux-user/elfload.c 2007-11-12 06:58:42.000000000 +0000
|
||||
+++ qemu/linux-user/elfload.c 2007-11-12 20:41:37.000000000 +0000
|
||||
@@ -12,6 +12,10 @@
|
||||
#include "qemu.h"
|
||||
#include "disas.h"
|
||||
|
||||
+#ifndef O_BINARY
|
||||
+#define O_BINARY 0
|
||||
+#endif
|
||||
+
|
||||
/* this flag is uneffective under linux too, should be deleted */
|
||||
#ifndef MAP_DENYWRITE
|
||||
#define MAP_DENYWRITE 0
|
||||
Index: qemu/linux-user/linuxload.c
|
||||
===================================================================
|
||||
--- qemu.orig/linux-user/linuxload.c 2007-11-12 06:58:42.000000000 +0000
|
||||
+++ qemu/linux-user/linuxload.c 2007-11-12 20:35:16.000000000 +0000
|
||||
@@ -12,6 +12,10 @@
|
||||
|
||||
#define NGROUPS 32
|
||||
|
||||
+#ifndef O_BINARY
|
||||
+#define O_BINARY 0
|
||||
+#endif
|
||||
+
|
||||
/* ??? This should really be somewhere else. */
|
||||
void memcpy_to_target(target_ulong dest, const void *src,
|
||||
unsigned long len)
|
||||
Index: qemu/hw/qfb_fs.c
|
||||
===================================================================
|
||||
--- qemu.orig/hw/qfb_fs.c 2007-11-12 06:58:41.000000000 +0000
|
||||
+++ qemu/hw/qfb_fs.c 2007-11-12 20:59:34.000000000 +0000
|
||||
@@ -14,6 +14,10 @@
|
||||
#include <sys/xattr.h>
|
||||
#include <errno.h>
|
||||
|
||||
+#ifndef O_BINARY
|
||||
+#define O_BINARY 0
|
||||
+#endif
|
||||
+
|
||||
/* all mount paths */
|
||||
static int next_path_index = 0;
|
||||
static struct mount_path mount_paths[MAX_MOUNT_PATHS];
|
||||
Loading…
Reference in New Issue