diff options
| author | Joshua Lock <josh@linux.intel.com> | 2008-11-06 00:33:24 +0000 |
|---|---|---|
| committer | Joshua Lock <josh@linux.intel.com> | 2008-11-06 00:33:24 +0000 |
| commit | fa7a4cd807bf819c11d79ac0b22d8dc7246953e2 (patch) | |
| tree | 20a821e8d16cb4326aa808c304240234cfeeaaa6 /meta | |
| parent | 3ae3b2ba8a20c44b20ff322690872ff3f2893bee (diff) | |
| parent | b6b37f065c5715c04442184ca20c86258f1c1714 (diff) | |
| download | openembedded-core-fa7a4cd807bf819c11d79ac0b22d8dc7246953e2.tar.gz openembedded-core-fa7a4cd807bf819c11d79ac0b22d8dc7246953e2.tar.bz2 openembedded-core-fa7a4cd807bf819c11d79ac0b22d8dc7246953e2.tar.xz openembedded-core-fa7a4cd807bf819c11d79ac0b22d8dc7246953e2.zip | |
Merge branch 'master' of ssh://git@git.moblin.org/poky
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/conf/bitbake.conf | 2 | ||||
| -rw-r--r-- | meta/conf/machine/include/qemu.inc | 2 | ||||
| -rw-r--r-- | meta/packages/xorg-app/xeyes_1.0.1.bb | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 1289a34b4..f6cfe573e 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -479,7 +479,7 @@ FETCHCOMMAND = "ERROR, this must be a BitBake bug" FETCHCOMMAND_wget = "/usr/bin/env wget -t 5 --passive-ftp -P ${DL_DIR} '${URI}'" FETCHCOMMAND_cvs = "/usr/bin/env cvs '-d${CVSROOT}' co ${CVSCOOPTS} ${CVSMODULE}" FETCHCOMMAND_svn = "/usr/bin/env svn co ${SVNCOOPTS} ${SVNROOT} ${SVNMODULE}" -CHECKCOMMAND_wget = "/usr/bin/env wget --spider -t 5 --passive-ftp -P ${DL_DIR} ${URI}" +CHECKCOMMAND_wget = "/usr/bin/env wget --spider -t 5 --passive-ftp -P ${DL_DIR} '${URI}'" RESUMECOMMAND = "ERROR, this must be a BitBake bug" RESUMECOMMAND_wget = "/usr/bin/env wget -c -t 5 --passive-ftp -P ${DL_DIR} '${URI}'" UPDATECOMMAND = "ERROR, this must be a BitBake bug" diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc index c1e83ba7f..005472b17 100644 --- a/meta/conf/machine/include/qemu.inc +++ b/meta/conf/machine/include/qemu.inc @@ -5,7 +5,7 @@ GPE_EXTRA_INSTALL += "gaim sylpheed" MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget screen" -IMAGE_FSTYPES ?= "tar.bz2 ext2" +IMAGE_FSTYPES ?= "tar.bz2 ext3" ROOT_FLASH_SIZE = "280" IMAGE_ROOTFS_SIZE_ext2 ?= "280000" diff --git a/meta/packages/xorg-app/xeyes_1.0.1.bb b/meta/packages/xorg-app/xeyes_1.0.1.bb new file mode 100644 index 000000000..07ce0724f --- /dev/null +++ b/meta/packages/xorg-app/xeyes_1.0.1.bb @@ -0,0 +1,4 @@ +require xorg-app-common.inc +PE = "1" + +DEPENDS += " virtual/libx11 libxau libxt libxext libxmu" |