[oe-commits] org.oe.dev Add MACHINE_TASK_PROVIDER to remove hardcoded references to task-bootstrap and allow machines/distros to elect an alternative
rpurdie commit
openembedded-commits at lists.openembedded.org
Sun Aug 27 17:43:05 UTC 2006
Add MACHINE_TASK_PROVIDER to remove hardcoded references to task-bootstrap and allow machines/distros to elect an alternative
Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 8a47f06bdca56a32047a0429f5d0c3d70cdea442
ViewMTN: http://monotone.openembedded.org/revision.psp?id=8a47f06bdca56a32047a0429f5d0c3d70cdea442
Files:
1
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
Diffs:
#
# mt diff -rd66b0dea0aa4e703d7a60f2cf070d33361ccf14a -r8a47f06bdca56a32047a0429f5d0c3d70cdea442
#
#
#
# patch "conf/bitbake.conf"
# from [3caee3c203180714a1c24cde13b3b8ac54dc5ad0]
# to [3f036deee88f94f3e748f3816d6fb652206797cb]
#
# patch "packages/images/bootstrap-image-bootchart.bb"
# from [c85210cae1668b832e717ed0f45cba34e24fd811]
# to [c4b2c24bc530fedceb5c938c6be3d59158ba282b]
#
# patch "packages/images/bootstrap-image.bb"
# from [6410798e02b1a98a92883739734f82d3953b0acc]
# to [0a72a890824c1524ac123d90f181ad5da2e821d0]
#
# patch "packages/images/dvb-image.bb"
# from [d6623c5beea53392b75d663851ca789b3aabd8f4]
# to [0a97d2b5706a00ac4673cb7e3196d9ea38af0da4]
#
# patch "packages/images/e-image-core.bb"
# from [165d14e2cd7f287b1831d8234feccfa7facd6bac]
# to [efca432bc74a9be272be62be417882aad79526e9]
#
# patch "packages/images/gpe-image.bb"
# from [448c7bf3021843e0467ea669e9435be71471f2fd]
# to [6c9897c0f605eb2affbd649ab578abccccd87351]
#
# patch "packages/images/maemo-image.bb"
# from [1248a5065c2d5bae9c953004e73f7b0ddb1ad2e6]
# to [55ffa9fb3e235c8b8bb7d1ed0c19db6e30b0a178]
#
# patch "packages/images/mythfront-image.bb"
# from [17803ae05635c10c4345fa37ae38b7b6646616fd]
# to [4139f57be6cb66838fea1480f117e3514f54c4bc]
#
# patch "packages/images/opie-image.bb"
# from [6941d38eb38a6b5be3696e42e1e88ce5710cfd9f]
# to [b54b4801e20701e0784fc283cb9a4b14b46086f9]
#
# patch "packages/images/sdl-image.bb"
# from [93b9aec5c97cf7833c2fa1db38adb0efa3cca5ac]
# to [722d3ab200a3f775e2c105c5305bec4173940a8e]
#
# patch "packages/images/sectest-gpe-image.bb"
# from [3beea8e71d6f63a85f17a42e98c84090deb0a84d]
# to [718d044792e27f22079cf74038b3513aeac5beed]
#
# patch "packages/images/twin-image.bb"
# from [4f27a6675197185c2a9db8cf05bcb0736af3c5b9]
# to [d697da2351543e0bb571d71099b407c1bec6c46c]
#
# patch "packages/images/uml-image.bb"
# from [efcf4c7a612c1af59344c7d860bc14498a8cc799]
# to [0886e453f9ad13ee4ab1a9c53f370f9db17cb891]
#
# patch "packages/images/xfce-image.bb"
# from [bf43c56e78985788541d117c852c84ec2df34b04]
# to [dc313a8eb1dc563609e8bac89a31f0fd9bc792bd]
#
# patch "packages/images/xterminal-image.bb"
# from [5c8ae0ddb041d10a8ccd8cdc26edc90d05025f30]
# to [e9704c080d88a2e6add0ec669171e97e3090ea5e]
#
============================================================
--- conf/bitbake.conf 3caee3c203180714a1c24cde13b3b8ac54dc5ad0
+++ conf/bitbake.conf 3f036deee88f94f3e748f3816d6fb652206797cb
@@ -409,6 +409,7 @@ PCMCIA_MANAGER ?= "pcmcia-cs"
IMAGE_FSTYPES ?= "jffs2"
PCMCIA_MANAGER ?= "pcmcia-cs"
+MACHINE_TASK_PROVIDER ?= "task-bootstrap"
##################################################################
============================================================
--- packages/images/bootstrap-image-bootchart.bb c85210cae1668b832e717ed0f45cba34e24fd811
+++ packages/images/bootstrap-image-bootchart.bb c4b2c24bc530fedceb5c938c6be3d59158ba282b
@@ -1,8 +1,8 @@ export IMAGE_LINGUAS = ""
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
============================================================
--- packages/images/bootstrap-image.bb 6410798e02b1a98a92883739734f82d3953b0acc
+++ packages/images/bootstrap-image.bb 0a72a890824c1524ac123d90f181ad5da2e821d0
@@ -1,8 +1,8 @@ export IMAGE_LINGUAS = ""
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
============================================================
--- packages/images/dvb-image.bb d6623c5beea53392b75d663851ca789b3aabd8f4
+++ packages/images/dvb-image.bb 0a97d2b5706a00ac4673cb7e3196d9ea38af0da4
@@ -1,8 +1,8 @@ IMAGE_LINGUAS = ""
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}"
============================================================
--- packages/images/e-image-core.bb 165d14e2cd7f287b1831d8234feccfa7facd6bac
+++ packages/images/e-image-core.bb efca432bc74a9be272be62be417882aad79526e9
@@ -5,7 +5,7 @@ export IMAGE_LINGUAS = ""
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_libx11 = "libx11"
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
============================================================
--- packages/images/gpe-image.bb 448c7bf3021843e0467ea669e9435be71471f2fd
+++ packages/images/gpe-image.bb 6c9897c0f605eb2affbd649ab578abccccd87351
@@ -24,11 +24,11 @@ XSERVER ?= "xserver-kdrive-fbdev"
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 \
============================================================
--- packages/images/maemo-image.bb 1248a5065c2d5bae9c953004e73f7b0ddb1ad2e6
+++ packages/images/maemo-image.bb 55ffa9fb3e235c8b8bb7d1ed0c19db6e30b0a178
@@ -15,11 +15,11 @@ XSERVER ?= "xserver-kdrive-omap"
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}"
============================================================
--- packages/images/mythfront-image.bb 17803ae05635c10c4345fa37ae38b7b6646616fd
+++ packages/images/mythfront-image.bb 4139f57be6cb66838fea1480f117e3514f54c4bc
@@ -1,10 +1,10 @@ IMAGE_LINGUAS = ""
export IMAGE_BASENAME = "mythfront-image"
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}"
============================================================
--- packages/images/opie-image.bb 6941d38eb38a6b5be3696e42e1e88ce5710cfd9f
+++ packages/images/opie-image.bb b54b4801e20701e0784fc283cb9a4b14b46086f9
@@ -6,12 +6,12 @@ PR = "r21"
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 \
============================================================
--- packages/images/sdl-image.bb 93b9aec5c97cf7833c2fa1db38adb0efa3cca5ac
+++ packages/images/sdl-image.bb 722d3ab200a3f775e2c105c5305bec4173940a8e
@@ -1,9 +1,9 @@ export IMAGE_BASENAME = "sdl-image"
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
============================================================
--- packages/images/sectest-gpe-image.bb 3beea8e71d6f63a85f17a42e98c84090deb0a84d
+++ packages/images/sectest-gpe-image.bb 718d044792e27f22079cf74038b3513aeac5beed
@@ -21,11 +21,11 @@ XSERVER ?= "xserver-kdrive-fbdev"
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 \
============================================================
--- packages/images/twin-image.bb 4f27a6675197185c2a9db8cf05bcb0736af3c5b9
+++ packages/images/twin-image.bb d697da2351543e0bb571d71099b407c1bec6c46c
@@ -1,13 +1,13 @@ export IMAGE_BASENAME="twin-image"
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 \
============================================================
--- packages/images/uml-image.bb efcf4c7a612c1af59344c7d860bc14498a8cc799
+++ packages/images/uml-image.bb 0886e453f9ad13ee4ab1a9c53f370f9db17cb891
@@ -6,7 +6,7 @@ OPIE_BASE = "opie-qcop opie-quicklaunche
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
============================================================
--- packages/images/xfce-image.bb bf43c56e78985788541d117c852c84ec2df34b04
+++ packages/images/xfce-image.bb dc313a8eb1dc563609e8bac89a31f0fd9bc792bd
@@ -5,7 +5,7 @@ X_RDEPENDS = "xserver-kdrive-fbdev"
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}"
============================================================
--- packages/images/xterminal-image.bb 5c8ae0ddb041d10a8ccd8cdc26edc90d05025f30
+++ packages/images/xterminal-image.bb e9704c080d88a2e6add0ec669171e97e3090ea5e
@@ -1,8 +1,8 @@ IMAGE_LINGUAS = ""
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}"
More information about the Openembedded-commits
mailing list