aboutsummaryrefslogtreecommitdiffstats
path: root/packages/angstrom
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2006-07-03 12:39:13 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-07-03 12:39:13 +0000
commita536f91cda43bb451202269f3d86ea98f8cf3196 (patch)
treea4d438a12b4d00a8abe68abcc585f99407c01822 /packages/angstrom
parent5fd4ba0f952ce906c70ad9548d213e8c9439f10d (diff)
downloadopenembedded-a536f91cda43bb451202269f3d86ea98f8cf3196.tar.gz
angstrom: cleanups as per Marcins suggestions
Diffstat (limited to 'packages/angstrom')
-rw-r--r--packages/angstrom/angstrom-bootmanager-image.bb2
-rw-r--r--packages/angstrom/angstrom-bootstrap-image.bb2
-rw-r--r--packages/angstrom/angstrom-gpe-image.bb9
-rw-r--r--packages/angstrom/task-angstrom.bb4
4 files changed, 9 insertions, 8 deletions
diff --git a/packages/angstrom/angstrom-bootmanager-image.bb b/packages/angstrom/angstrom-bootmanager-image.bb
index b669d2b665..f6aaddd55e 100644
--- a/packages/angstrom/angstrom-bootmanager-image.bb
+++ b/packages/angstrom/angstrom-bootmanager-image.bb
@@ -8,7 +8,7 @@ RDEPENDS = "angstrom-base-depends angstrom-bootmanager"
export IMAGE_BASENAME = "bootmanager-image"
export IMAGE_LINGUAS = ""
-export IPKG_INSTALL = "angstrom-base-depends angstrom-bootmanager"
+export IPKG_INSTALL = "${RDEPENDS}"
inherit image_ipk
diff --git a/packages/angstrom/angstrom-bootstrap-image.bb b/packages/angstrom/angstrom-bootstrap-image.bb
index 84a4845569..b2b5565eb6 100644
--- a/packages/angstrom/angstrom-bootstrap-image.bb
+++ b/packages/angstrom/angstrom-bootstrap-image.bb
@@ -8,7 +8,7 @@ RDEPENDS = "angstrom-base-depends"
export IMAGE_BASENAME = "bootstrap-image"
export IMAGE_LINGUAS = ""
-export IPKG_INSTALL = "angstrom-base-depends"
+export IPKG_INSTALL = "${RDEPENDS}"
inherit image_ipk
diff --git a/packages/angstrom/angstrom-gpe-image.bb b/packages/angstrom/angstrom-gpe-image.bb
index 0419ea1b9a..df7f90987e 100644
--- a/packages/angstrom/angstrom-gpe-image.bb
+++ b/packages/angstrom/angstrom-gpe-image.bb
@@ -6,16 +6,17 @@ PR = "r0"
export IMAGE_BASENAME = "gpe-image"
DEPENDS = "task-angstrom"
-RDEPENDS = "${IPKG_INSTALL}"
-
-export IPKG_INSTALL = "\
+RDEPENDS = "\
angstrom-base-depends \
- angstrom-X-base-depends \
+ angstrom-x11-base-depends \
angsgrom-gpe-task-base \
angstrom-gpe-task-settings \
angstrom-gpe-task-pim \
${ANGSTROM_EXTRA_INSTALL}"
+
+export IPKG_INSTALL = "${RDEPENDS}"
+
#ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; "
inherit image_ipk
diff --git a/packages/angstrom/task-angstrom.bb b/packages/angstrom/task-angstrom.bb
index d058457e98..7447dc02e2 100644
--- a/packages/angstrom/task-angstrom.bb
+++ b/packages/angstrom/task-angstrom.bb
@@ -4,7 +4,7 @@ ALLOW_EMPTY = "1"
PACKAGES = "\
angstrom-base-depends \
- angstrom-X-base-depends \
+ angstrom-x11-base-depends \
angsgrom-gpe-task-base \
angstrom-gpe-task-settings \
angstrom-gpe-task-pim \
@@ -24,7 +24,7 @@ RDEPENDS_angstrom-base-depends = "\
angstrom-version \
"
-RDEPENDS_angstrom-X-base-depends := "\
+RDEPENDS_angstrom-x11-base-depends := "\
diet-x11 \
virtual/xserver"