diff options
Diffstat (limited to 'packages/images')
| -rw-r--r-- | packages/images/liveramdisk-image.bb | 7 | ||||
| -rw-r--r-- | packages/images/opie-image-16mb.bb | 4 | ||||
| -rw-r--r-- | packages/images/opie-image.bb | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/packages/images/liveramdisk-image.bb b/packages/images/liveramdisk-image.bb index b3c288ec31..5d2362353b 100644 --- a/packages/images/liveramdisk-image.bb +++ b/packages/images/liveramdisk-image.bb @@ -12,6 +12,11 @@ export IMAGE_BASENAME = "liveramdisk" export IMAGE_LINGUAS = "" # Install only ${IMAGE_INSTALL}, not even deps -PACKAGE_INSTALL_NO_DEPS = "1" +#PACKAGE_INSTALL_NO_DEPS = "1" + +# Remove any kernel-image that the kernel-module-* packages may have pulled in. +PACKAGE_REMOVE = "kernel-image-* update-modules module-init-tools-depmod uclibc update-rc.d" +ROOTFS_POSTPROCESS_COMMAND += "ipkg-cl ${IPKG_ARGS} -force-depends \ + remove ${PACKAGE_REMOVE};" inherit image diff --git a/packages/images/opie-image-16mb.bb b/packages/images/opie-image-16mb.bb index 42bf611880..3abab2e726 100644 --- a/packages/images/opie-image-16mb.bb +++ b/packages/images/opie-image-16mb.bb @@ -1,6 +1,6 @@ IMAGE_LINGUAS = "" -DEPENDS = "${MACHINE_TASK_PROVIDER} task-opie-16mb" +DEPENDS = "task-boot task-opie-16mb" IMAGE_INSTALL = "task-boot \ ipkg ipkg-collateral \ @@ -14,6 +14,6 @@ IMAGE_INSTALL = "task-boot \ task-opie-irda" # create /etc/timestamp from build date -IMAGE_PREPROCESS_COMMAND = "merge_feeds; create_etc_timestamp" +IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp" inherit image diff --git a/packages/images/opie-image.bb b/packages/images/opie-image.bb index 04c1f260e8..54e38c498f 100644 --- a/packages/images/opie-image.bb +++ b/packages/images/opie-image.bb @@ -1,8 +1,8 @@ IMAGE_LINGUAS = "" -DEPENDS = "${MACHINE_TASK_PROVIDER} task-opie" +DEPENDS = "task-base task-opie" -IMAGE_INSTALL = "${MACHINE_TASK_PROVIDER} task-opie-base task-opie-base-applets \ +IMAGE_INSTALL = "task-base-extended task-opie-base task-opie-base-applets \ task-opie-base-inputmethods task-opie-base-apps \ task-opie-base-settings task-opie-base-decorations \ task-opie-base-styles task-opie-base-pim \ |