Skip to content
Browse files

woce: Fix images to be bootable on qemu

leverage core infrastructure about images
use ARM instruction set by default for eglibc based image
use thumb ISA with uclibc

Signed-off-by: Khem Raj <raj.khem@gmail.com>
  • Loading branch information...
1 parent 195b74b commit 191a681ba31ab6c11a9dc2345e7815fe8f691c58 @kraj committed
View
2 conf/distro/include/woce-uclibc.inc
@@ -1,3 +1,3 @@
ARM_INSTRUCTION_SET = "thumb"
-IMAGE_DEV_MANAGER = "busybox-mdev"
+VIRTUAL-RUNTIME_dev_manager = "busybox-mdev"
PREFERRED_PROVIDER_virtual/libintl = "proxy-libintl"
View
6 conf/distro/woce.conf
@@ -5,7 +5,7 @@
DISTRO_NAME = "WOCE"
DISTRO_TYPE = "alpha"
-ARM_INSTRUCTION_SET = "thumb"
+ARM_INSTRUCTION_SET ?= "arm"
PREFERRED_PROVIDER_opkg ?= "opkg"
PREFERRED_PROVIDER_opkg-native ?= "opkg-native"
@@ -13,7 +13,7 @@ PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native"
PREFERRED_PROVIDER_virtual/update-alternatives ?= "opkg"
PREFERRED_PROVIDER_opkg-nativesdk ?= "opkg-nativesdk"
VIRTUAL-RUNTIME_update-alternatives = "opkg"
-IMAGE_DEV_MANAGER = "udev"
+VIRTUAL-RUNTIME_dev_manager = "udev"
# Disable installing ldconfig
USE_LDCONFIG = "0"
@@ -23,7 +23,7 @@ TARGET_FPU_arm ?= "soft"
TARGET_FPU_armeb ?= "soft"
EGLIBCVERSION ?= "2.15"
-UCLIBCVERSION = "0.9.32+0.9.33%"
+UCLIBCVERSION = "0.9.33"
TCMODE ?= "default"
TCLIBC ?= "eglibc"
View
20 recipes-core/images/woce-image.inc
@@ -5,24 +5,18 @@
HOMEPAGE = "http://www.webosinternals.org"
-DEPENDS = "task-woce"
+DEPENDS = "task-woce task-core-boot task-core-ssh-openssh"
-IMAGE_FEATURES += "package-management"
-IMAGE_INSTALL = "task-woce \
- ${@oe.utils.contains('IMAGE_FEATURES', 'package-management', 'opkg', '', d)} \
- "
+IMAGE_INSTALL = "task-core-boot \
+ task-woce \
+ task-core-ssh-openssh \
+ "
COMPATIBLE_MACHINE = "(qemuarm)"
IMAGE_NAME = "${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}"
IMAGE_LINK_NAME = "${IMAGE_BASENAME}-${MACHINE}"
-IMAGE_FSTYPES = "jffs2 tar.gz ext2.gz"
+IMAGE_FSTYPES = "jffs2 tar.gz ext3"
IMAGE_LINGUAS = ""
-# IMAGE_PREPROCESS_COMMAND is run before making the image. In SlugOS the
-# kernel image is removed from the root file system to recover the space used -
-# SlugOS is assumed to boot from a separate kernel image in flash (not in the
-# root file system), if this is not the case the following must not be done!
-IMAGE_PREPROCESS_COMMAND += "rm -f ${IMAGE_ROOTFS}/boot/?Image*;"
-
-inherit image
+inherit core-image
View
11 recipes-core/tasks/task-woce.bb
@@ -7,6 +7,9 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE = "(qemuarm)"
ALLOW_EMPTY = "1"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+inherit task
+
#----------------------------------------------------------------------------------
# FIRMWARE CONFIGURATION
#----------------------------------------------------------------------------------
@@ -77,20 +80,12 @@ DEPENDS += "${DISTRO_EXTRA_DEPENDS}"
DISTRO_EXTRA_RDEPENDS ?= ""
RDEPENDS_${PN} += "\
- base-files base-passwd netbase \
- busybox initscripts \
- sysvinit update-modules \
- module-init-tools modutils-initscripts \
- libgcc \
- ${IMAGE_DEV_MANAGER} \
${WOCE_STANDARD_RDEPENDS} \
${WOCE_MACHINE_RDEPENDS} \
${DISTRO_EXTRA_RDEPENDS}"
DISTRO_EXTRA_RRECOMMENDS ?= ""
RRECOMMENDS_${PN} += "\
- openssh-keygen \
- openssh-sshd \
${WOCE_STANDARD_RRECOMMENDS} \
${WOCE_MACHINE_RRECOMMENDS} \
${DISTRO_EXTRA_RRECOMMENDS}"

0 comments on commit 191a681

Please sign in to comment.
Something went wrong with that request. Please try again.