Module: meta-angstrom
Branch: master
Commit: a9917fce50dea21cfcb050dfb23a98295c81d5b5
Author: Koen Kooi <k...@dominion.thruhere.net>
Date: Sun Oct 9 19:36:15 2011 +0200
angstrom-task-boot, images: adjust to new task-boot and task-basic in meta-oe
Signed-off-by: Koen Kooi <k...@dominion.thruhere.net>
---
recipes-angstrom/images/hardware-bringup-image.bb | 9 +------
recipes-angstrom/images/systemd-image.bb | 9 +------
recipes-angstrom/tasks/angstrom-task-boot.bb | 25 +++-----------------
3 files changed, 7 insertions(+), 36 deletions(-)
diff --git a/recipes-angstrom/images/hardware-bringup-image.bb
b/recipes-angstrom/images/hardware-bringup-image.bb
index a50cd4a..145e367 100644
--- a/recipes-angstrom/images/hardware-bringup-image.bb
+++ b/recipes-angstrom/images/hardware-bringup-image.bb
@@ -8,14 +8,9 @@ IMAGE_PREPROCESS_COMMAND = "rootfs_update_timestamp"
IMAGE_INSTALL += " \
angstrom-task-boot \
- rsyslog \
- dropbear-systemd openssh-sftp \
- e2fsprogs-e2fsck e2fsprogs-blkid \
- avahi-daemon avahi-utils avahi-systemd \
+ task-basic \
${CONMANPKGS} \
- systemd-compat-units python-dbus python-pycairo \
- cpufrequtils \
- htop \
+ python-dbus python-pycairo \
usbutils \
i2c-tools \
alsa-utils \
diff --git a/recipes-angstrom/images/systemd-image.bb
b/recipes-angstrom/images/systemd-image.bb
index 788f4a1..cbbae91 100644
--- a/recipes-angstrom/images/systemd-image.bb
+++ b/recipes-angstrom/images/systemd-image.bb
@@ -5,17 +5,10 @@ LIC_FILES_CHKSUM =
"file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
IMAGE_PREPROCESS_COMMAND = "rootfs_update_timestamp"
-
IMAGE_INSTALL += " \
angstrom-task-boot \
- rsyslog \
- dropbear-systemd openssh-sftp \
- e2fsprogs-e2fsck e2fsprogs-blkid \
- avahi-daemon avahi-utils avahi-systemd \
+ task-basic \
${CONMANPKGS} \
- systemd-compat-units \
- cpufrequtils \
- htop \
"
CONMANPKGS = "connman connman-plugin-loopback connman-plugin-ethernet
connman-plugin-wifi connman-systemd"
CONMANPKGS_libc-uclibc = ""
diff --git a/recipes-angstrom/tasks/angstrom-task-boot.bb
b/recipes-angstrom/tasks/angstrom-task-boot.bb
index 9155349..0046afd 100644
--- a/recipes-angstrom/tasks/angstrom-task-boot.bb
+++ b/recipes-angstrom/tasks/angstrom-task-boot.bb
@@ -1,8 +1,8 @@
-DESCRIPTION = "Basic task to get a device booting"
+DESCRIPTION = "Basic task to get an Angstrom powered device booting"
LICENSE = "MIT"
LIC_FILES_CHKSUM =
"file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
-PR = "r1"
+PR = "r3"
inherit task
@@ -10,33 +10,16 @@ inherit task
#
PACKAGE_ARCH = "${MACHINE_ARCH}"
-#
-# those ones can be set in machine config to supply packages needed to get
machine booting
-#
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
-
-DISTRO_UPDATE_ALTERNATIVES ?=
"${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "",
"update-alternatives-cworth", d)}"
OPKGCONFIG ?= "${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "",
"opkg opkg-config-base angstrom-feed-configs", d)}"
-# Make sure we build the kernel
-DEPENDS = "virtual/kernel"
+DEPENDS = "task-boot"
#
# minimal set of packages - needed to boot
#
RDEPENDS_${PN} = "\
+ task-boot \
angstrom-version \
- base-files \
- base-passwd \
- busybox \
- netbase \
- ${DISTRO_UPDATE_ALTERNATIVES} \
${OPKGCONFIG} \
- ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS} \
"
-RRECOMMENDS_${PN} = "\
- kernel \
- ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS} \
- "
_______________________________________________
Angstrom-distro-devel mailing list
Angstrom-distro-devel@linuxtogo.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/angstrom-distro-devel
