diff options
author | Richard Purdie <richard@openedhand.com> | 2006-11-29 09:47:05 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2006-11-29 09:47:05 +0000 |
commit | 23e50d487da3e92df18a325a92d787f834a44570 (patch) | |
tree | bdc48db2d79e0221b6d271df2c7ddb958f3b103b /meta-extras | |
parent | db0b57e5620f51c7e8ccc94044f926ed5e025400 (diff) | |
download | poky-23e50d487da3e92df18a325a92d787f834a44570.tar.gz |
poky-extras: Update extras task and image with recent poky changes
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@968 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta-extras')
-rw-r--r-- | meta-extras/packages/images/oh-image-extras.bb (renamed from meta-extras/packages/meta/oh-image-extras.bb) | 3 | ||||
-rw-r--r-- | meta-extras/packages/tasks/task-oh-extras.bb (renamed from meta-extras/packages/meta/task-oh-extras.bb) | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/meta-extras/packages/meta/oh-image-extras.bb b/meta-extras/packages/images/oh-image-extras.bb index 4afba22688..b62774205e 100644 --- a/meta-extras/packages/meta/oh-image-extras.bb +++ b/meta-extras/packages/images/oh-image-extras.bb | |||
@@ -11,6 +11,7 @@ DEPENDS = "\ | |||
11 | task-oh-extras" | 11 | task-oh-extras" |
12 | 12 | ||
13 | RDEPENDS = "\ | 13 | RDEPENDS = "\ |
14 | task-base \ | ||
14 | task-oh-boot \ | 15 | task-oh-boot \ |
15 | task-oh-boot-extras \ | 16 | task-oh-boot-extras \ |
16 | task-oh-base \ | 17 | task-oh-base \ |
@@ -20,7 +21,7 @@ RDEPENDS = "\ | |||
20 | task-oh-extraapps \ | 21 | task-oh-extraapps \ |
21 | ${XSERVER} " | 22 | ${XSERVER} " |
22 | 23 | ||
23 | export IPKG_INSTALL = "${RDEPENDS}" | 24 | export PACKAGE_INSTALL = "${RDEPENDS}" |
24 | #ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; " | 25 | #ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; " |
25 | 26 | ||
26 | inherit image | 27 | inherit image |
diff --git a/meta-extras/packages/meta/task-oh-extras.bb b/meta-extras/packages/tasks/task-oh-extras.bb index 6c5b9a974c..fc2a3e0906 100644 --- a/meta-extras/packages/meta/task-oh-extras.bb +++ b/meta-extras/packages/tasks/task-oh-extras.bb | |||
@@ -7,4 +7,5 @@ ALLOW_EMPTY = "1" | |||
7 | 7 | ||
8 | RDEPENDS_task-oh-extraapps = "\ | 8 | RDEPENDS_task-oh-extraapps = "\ |
9 | madplay \ | 9 | madplay \ |
10 | maemo-mapper-nohildon \ | ||
10 | mc" | 11 | mc" |