From 344ad5e784560c0e88bc8c73ee6fcc2d96e1f56d Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 1 Sep 2007 16:57:37 +0000 Subject: images: Clean up image .bb files, moving functionality to image.bbclass (LICENCE default, setup of RDEPENDS and default IMAGE_BASENAME) --- packages/angstrom/angstrom-x11-image.bb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'packages/angstrom/angstrom-x11-image.bb') diff --git a/packages/angstrom/angstrom-x11-image.bb b/packages/angstrom/angstrom-x11-image.bb index 83f00cce66..4446c52a8d 100644 --- a/packages/angstrom/angstrom-x11-image.bb +++ b/packages/angstrom/angstrom-x11-image.bb @@ -1,6 +1,4 @@ #Angstrom X11 image -LICENSE = "MIT" -PR = "r11" PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget" PREFERRED_PROVIDER_tslib ?= "tslib" @@ -16,7 +14,7 @@ XSERVER ?= "xserver-kdrive-fbdev" export IMAGE_BASENAME = "x11-image" DEPENDS = "task-base" -RDEPENDS = "\ +IMAGE_INSTALL = "\ ${XSERVER} \ task-base-extended \ angstrom-x11-base-depends \ @@ -24,9 +22,6 @@ RDEPENDS = "\ angstrom-gpe-task-settings \ ${ANGSTROM_EXTRA_INSTALL}" - -export PACKAGE_INSTALL = "${RDEPENDS}" - #zap root password for release images ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}' -- cgit v1.2.3 From 33809a84cdb9dc9305a8da065c03a4b280ec6fbb Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 1 Sep 2007 22:07:55 +0000 Subject: images: Remove bogus PREFERRED_PROVIDERs (they don't work in .bb files) --- packages/angstrom/angstrom-x11-image.bb | 6 ------ 1 file changed, 6 deletions(-) (limited to 'packages/angstrom/angstrom-x11-image.bb') diff --git a/packages/angstrom/angstrom-x11-image.bb b/packages/angstrom/angstrom-x11-image.bb index 4446c52a8d..e430590a7f 100644 --- a/packages/angstrom/angstrom-x11-image.bb +++ b/packages/angstrom/angstrom-x11-image.bb @@ -1,11 +1,5 @@ #Angstrom X11 image -PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget" -PREFERRED_PROVIDER_tslib ?= "tslib" -PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11" -PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11" -PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" - ANGSTROM_EXTRA_INSTALL += " \ ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \ " -- cgit v1.2.3