]> git.openpandora.org Git - openembedded.git/commitdiff
Add MACHINE_TASK_PROVIDER to remove hardcoded references to task-bootstrap and allow...
authorRichard Purdie <rpurdie@rpsys.net>
Sun, 27 Aug 2006 17:31:47 +0000 (17:31 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Sun, 27 Aug 2006 17:31:47 +0000 (17:31 +0000)
15 files changed:
conf/bitbake.conf
packages/images/bootstrap-image-bootchart.bb
packages/images/bootstrap-image.bb
packages/images/dvb-image.bb
packages/images/e-image-core.bb
packages/images/gpe-image.bb
packages/images/maemo-image.bb
packages/images/mythfront-image.bb
packages/images/opie-image.bb
packages/images/sdl-image.bb
packages/images/sectest-gpe-image.bb
packages/images/twin-image.bb
packages/images/uml-image.bb
packages/images/xfce-image.bb
packages/images/xterminal-image.bb

index 1cb03f30bd06331e329dca9a487575b8d3543210..9f94bae3f54954744d3199fac529495b10eb4439 100644 (file)
@@ -409,6 +409,7 @@ require conf/sanity.conf
 
 IMAGE_FSTYPES ?= "jffs2"
 PCMCIA_MANAGER ?= "pcmcia-cs"
+MACHINE_TASK_PROVIDER ?= "task-bootstrap"
 
 
 ##################################################################
index 68cfac74903c1c2576f8fc6b58809a18da1de319..04b1aa299dfa7a383b3355da24a1636fb22b4fad 100644 (file)
@@ -1,8 +1,8 @@
 export IMAGE_BASENAME = "bootstrap-image-bootchart"
 export IMAGE_LINGUAS = ""
-export IPKG_INSTALL = "task-bootstrap bootchart acct"
+export IPKG_INSTALL = "${MACHINE_TASK_PROVIDER} bootchart acct"
 
-DEPENDS = "task-bootstrap bootchart"
+DEPENDS = "${MACHINE_TASK_PROVIDER} bootchart"
 RDEPENDS = "acct"
 
 inherit image_ipk
index 1791dd8f56ff6ae2e30a659cc25e515bb8f1be26..50c1a8f354ebff76a74dcd9e172890f77bf13433 100644 (file)
@@ -1,8 +1,8 @@
 export IMAGE_BASENAME = "bootstrap-image"
 export IMAGE_LINGUAS = ""
-export IPKG_INSTALL = "task-bootstrap"
+export IPKG_INSTALL = "${MACHINE_TASK_PROVIDER}"
 
-DEPENDS = "task-bootstrap"
+DEPENDS = "${MACHINE_TASK_PROVIDER}"
 
 inherit image_ipk
 
index fa964b4490950810ed52cb18dd2952b1291802f7..b1c714c79e2c385ac4d5c295d347900d7f156f38 100644 (file)
@@ -2,7 +2,7 @@ export IMAGE_BASENAME = "dvb-image"
 
 IMAGE_LINGUAS = ""
 
-DVB_PACKAGES = "task-bootstrap task-dvb"
+DVB_PACKAGES = "${MACHINE_TASK_PROVIDER} task-dvb"
 
 export IPKG_INSTALL = "${DVB_PACKAGES}"
 DEPENDS = "${DVB_PACKAGES}"
index 9a1ed51a1af14cba99cd669bd7872b86bc5c32b8..f41f04ee238109e3cbdee8bf4b684a941b4d14cb 100644 (file)
@@ -5,7 +5,7 @@ PR = "r1"
 export IMAGE_BASENAME = "e-image-core"
 export IMAGE_LINGUAS = ""
 
-DEPENDS = "task-bootstrap \
+DEPENDS = "${MACHINE_TASK_PROVIDER} \
            xserver-kdrive \
            task-e-x11-core"
 
@@ -16,6 +16,6 @@ PREFERRED_PROVIDER_virtual/imlib2 = "imlib2-x11"
 PREFERRED_PROVIDER_virtual/libxine = "libxine-x11"
 PREFERRED_PROVIDER_libx11 = "libx11"
 
-export IPKG_INSTALL = "task-bootstrap task-e-x11-core xserver-kdrive-fbdev glibc-charmap-utf-8 glibc-localedata-i18n"
+export IPKG_INSTALL = "${MACHINE_TASK_PROVIDER} task-e-x11-core xserver-kdrive-fbdev glibc-charmap-utf-8 glibc-localedata-i18n"
 
 inherit image_ipk
index 92bed0dd5cefbb0ad74eee044b3565e772875776..75aa14a0f4e2a61812c805ad5c833c7c03188111 100644 (file)
@@ -24,11 +24,11 @@ GPE_EXTRA_INSTALL += ${GPE_BIGFLASH_INSTALL}
 
 XSERVER ?= "xserver-kdrive-fbdev"
 
-DEPENDS = "task-bootstrap task-gpe"
+DEPENDS = "${MACHINE_TASK_PROVIDER} task-gpe"
 RDEPENDS = "${IPKG_INSTALL}"
 
 export IPKG_INSTALL = "\
-    task-bootstrap \
+    ${MACHINE_TASK_PROVIDER} \
     gpe-task-base \
     gpe-task-pim \
     gpe-task-settings \
index 2adc88b958be9593aadf06658ad5afe3d208a15c..19157b6a5f44d2912e300b549c8a9bf2f6e41d16 100644 (file)
@@ -15,11 +15,11 @@ MAEMO_EXTRA_INSTALL = "osso-af-services osso-af-base-apps scap dosfstools"
 
 XSERVER ?= "xserver-kdrive-omap"
 
-DEPENDS = "task-bootstrap \
+DEPENDS = "${MACHINE_TASK_PROVIDER} \
           meta-maemo \
           ${MAEMO_EXTRA_DEPENDS}"
 
-export IPKG_INSTALL = "task-bootstrap maemo-task-base maemo-task-theme \
+export IPKG_INSTALL = "${MACHINE_TASK_PROVIDER} maemo-task-base maemo-task-theme \
                       maemo-task-apps ${MAEMO_EXTRA_INSTALL} \
                       ${XSERVER}"
 
index 7836258940a5a354b71c5dac24d58885bbf2eb82..31992e4bc880232af9df4b02a4606a210f988a6f 100644 (file)
@@ -4,7 +4,7 @@ IMAGE_ROOTFS_SIZE_ext2 = "85000"
 IMAGE_ROOTFS_SIZE_ext2.gz = "85000"
 IMAGE_LINGUAS = ""
 
-MYTHFRONT_PACKAGES = "task-bootstrap task-mythfront"
+MYTHFRONT_PACKAGES = "${MACHINE_TASK_PROVIDER} task-mythfront"
 
 export IPKG_INSTALL = "${MYTHFRONT_PACKAGES}"
 DEPENDS = "${MYTHFRONT_PACKAGES}"
index c786f67e0bee35f55e0f6ea8485253ca7c203df4..b7c68ec505764a7a5693cd2128c85458740ef1f0 100644 (file)
@@ -6,12 +6,12 @@ FEED_URIS_append_familiar   = " opie##http://familiar.handhelds.org/releases/${D
 LICENSE = "MIT"
 PR = "r21"
 
-DEPENDS = "task-bootstrap task-opie"
+DEPENDS = "${MACHINE_TASK_PROVIDER} task-opie"
 RDEPENDS = "${INSTALL_PACKAGES}"
 
 extra_stuff := '${@base_conditional("ROOT_FLASH_SIZE", "24", "", "task-opie-extra-games task-opie-extra-apps task-opie-extra-styles",d)}'
 
-INSTALL_PACKAGES = "task-bootstrap task-opie-base task-opie-base-applets \
+INSTALL_PACKAGES = "${MACHINE_TASK_PROVIDER} 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 \
index 0f3254b56ece533fa6236db48ad91b449793456c..79c8094f34de051eaeb1884cc352e186a8065fee 100644 (file)
@@ -2,8 +2,8 @@ LICENSE = MIT
 
 export IMAGE_BASENAME = "sdl-image"
 
-DEPENDS = "task-bootstrap task-sdl"
+DEPENDS = "${MACHINE_TASK_PROVIDER} task-sdl"
 
-export IPKG_INSTALL = "task-bootstrap sdl-base"
+export IPKG_INSTALL = "${MACHINE_TASK_PROVIDER} sdl-base"
 
 inherit image_ipk
index be7f28fb918d4e228d066048e66709a689804ba5..1ddd022d084c0abe7c18e1e86b9a0a47fde04d92 100644 (file)
@@ -21,11 +21,11 @@ GPE_EXTRA_INSTALL += "${GPE_EXTRA_INSTALL_${GUI_MACHINE_CLASS}}"
 
 XSERVER ?= "xserver-kdrive-fbdev"
 
-DEPENDS = "task-bootstrap task-gpe"
+DEPENDS = "${MACHINE_TASK_PROVIDER} task-gpe"
 RDEPENDS = "${IPKG_INSTALL}"
 
 export IPKG_INSTALL = "\
-    task-bootstrap \
+    ${MACHINE_TASK_PROVIDER} \
     gpe-task-base \
     gpe-task-pim \
     gpe-task-settings \
index 7015f7020c32a2d499cbaf001d7dfa7ae008759a..f609dfd07e3cd5eecc3632d2afc58d950b140485 100644 (file)
@@ -1,13 +1,13 @@
 export IMAGE_BASENAME="twin-image"
 
-DEPENDS = 'task-bootstrap \
+DEPENDS = '${MACHINE_TASK_PROVIDER} \
           twin \
          orpheus \
          nano \
          vim \
          mutt'
 
-export IPKG_INSTALL = 'task-bootstrap \
+export IPKG_INSTALL = '${MACHINE_TASK_PROVIDER} \
                       twin \
                       orpheus \
                       nano \
index 6ebbf04537b31e1bcb66705cc1dbb1978656e494..5b6981488ef509e5938e14bdf9aeb7c4ef276fa8 100644 (file)
@@ -6,7 +6,7 @@ export IMAGE_BASENAME = "uml-image"
 OPIE_LIBS = "qte qpf-bitstream-vera libqpe-opie libopie2"
 OPIE_BASE = "opie-qcop opie-quicklauncher opie-taskbar"
 
-DEPENDS = "task-bootstrap"
+DEPENDS = "${MACHINE_TASK_PROVIDER}"
 export IPKG_INSTALL = "${DEPENDS}"
 
 inherit image_ipk
index 5605a6b2ee37c4b24da3a90d41c72423dc32be6e..f861b9e6ddec8742be38000351fc1146e53b7352 100644 (file)
@@ -5,7 +5,7 @@ IMAGE_LINGUAS = ""
 X_DEPENDS = "virtual/xserver"
 X_RDEPENDS = "xserver-kdrive-fbdev"
 
-XFCE_DEPENDS = "task-bootstrap task-xfce-base"
+XFCE_DEPENDS = "${MACHINE_TASK_PROVIDER} task-xfce-base"
 XFCE_RDEPENDS = "${XFCE_DEPENDS}"
 
 export IPKG_INSTALL = "${X_RDEPENDS} ${XFCE_RDEPENDS}"
index 2b98ec98fc340744b50c8ee69a4c4f7213162714..d6cc7b1640cc9857cee5aa305c63145952a86080 100644 (file)
@@ -2,7 +2,7 @@ export IMAGE_BASENAME = "xterminal-image"
 
 IMAGE_LINGUAS = ""
 
-XTERMINAL_PACKAGES = "task-bootstrap task-xterminal"
+XTERMINAL_PACKAGES = "${MACHINE_TASK_PROVIDER} task-xterminal"
 
 export IPKG_INSTALL = "${XTERMINAL_PACKAGES}"
 DEPENDS = "${XTERMINAL_PACKAGES}"