diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-01-04 11:22:16 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-01-04 11:22:16 +0000 |
| commit | 4b7e6a49215b00d0cfa9a0fde3808f032a9599e5 (patch) | |
| tree | f2e294728789ab01a7a89fa06b6c67c5464ceab0 /packages/angstrom | |
| parent | 4601ad28765bf7ef207974f9ad7fc209d3745088 (diff) | |
| parent | 8f19556367701b3a3fa50802903d0d67997407b7 (diff) | |
merge of '274cb1a3f97188420857e4b0650a1ace718148a6'
and '8091ca9b08503f4700e05ee8973cec755727ed4a'
Diffstat (limited to 'packages/angstrom')
| -rw-r--r-- | packages/angstrom/angstrom-bootmanager-image.bb | 4 | ||||
| -rw-r--r-- | packages/angstrom/angstrom-bootstrap-image.bb | 4 | ||||
| -rw-r--r-- | packages/angstrom/angstrom-gpe-image.bb | 6 | ||||
| -rw-r--r-- | packages/angstrom/task-angstrom-x11.bb | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/packages/angstrom/angstrom-bootmanager-image.bb b/packages/angstrom/angstrom-bootmanager-image.bb index 9a0bf12a08..43c25eb1ba 100644 --- a/packages/angstrom/angstrom-bootmanager-image.bb +++ b/packages/angstrom/angstrom-bootmanager-image.bb @@ -7,9 +7,9 @@ RDEPENDS = "angstrom-base-depends angstrom-bootmanager" export IMAGE_BASENAME = "bootmanager-image" export IMAGE_LINGUAS = "" -export IPKG_INSTALL = "${RDEPENDS}" +export PACKAGE_INSTALL = "${RDEPENDS}" -inherit image_ipk +inherit image diff --git a/packages/angstrom/angstrom-bootstrap-image.bb b/packages/angstrom/angstrom-bootstrap-image.bb index d4ce272558..3977e223af 100644 --- a/packages/angstrom/angstrom-bootstrap-image.bb +++ b/packages/angstrom/angstrom-bootstrap-image.bb @@ -12,7 +12,7 @@ RDEPENDS = "task-base-core-default \ export IMAGE_BASENAME = "bootstrap-image" export IMAGE_LINGUAS = "" -export IPKG_INSTALL = "${RDEPENDS}" +export PACKAGE_INSTALL = "${RDEPENDS}" -inherit image_ipk +inherit image diff --git a/packages/angstrom/angstrom-gpe-image.bb b/packages/angstrom/angstrom-gpe-image.bb index c0678431b2..d366a62bf7 100644 --- a/packages/angstrom/angstrom-gpe-image.bb +++ b/packages/angstrom/angstrom-gpe-image.bb @@ -25,9 +25,9 @@ RDEPENDS = "\ ${ANGSTROM_EXTRA_INSTALL}" -export IPKG_INSTALL = "${RDEPENDS}" +export PACKAGE_INSTALL = "${RDEPENDS}" #zap root password for release images -ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}' +ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}' -inherit image_ipk +inherit image diff --git a/packages/angstrom/task-angstrom-x11.bb b/packages/angstrom/task-angstrom-x11.bb index 817ac81f19..c7ac97d2e5 100644 --- a/packages/angstrom/task-angstrom-x11.bb +++ b/packages/angstrom/task-angstrom-x11.bb @@ -42,7 +42,7 @@ RDEPENDS_angstrom-gpe-task-base := "\ gpe-autostarter \ ${@base_contains("MACHINE_FEATURES", "touchscreen", "libgtkstylus", "",d)} \ ${@base_contains("MACHINE_FEATURES", "keyboard", "", "libgtkinput",d)} \ - ${@base_contains("MACHINE_FEATURES", "touchscreen", "detect-stylus", "",d)} \ + ${@base_contains("MACHINE_FEATURES", "touchscreen", "detect-stylus", "",d)} \ suspend-desktop \ teleport \ xauth \ |