diff options
author | Denis 'Gnutoo' Carikli <GNUtoo@no-log.org> | 2009-04-27 20:31:20 +0200 |
---|---|---|
committer | Denis 'Gnutoo' Carikli <GNUtoo@no-log.org> | 2009-04-27 20:31:20 +0200 |
commit | cf47f64bfadf5c341f67e0686f9da0f3202d6882 (patch) | |
tree | 357eb2c0c87efeb7129c2d76e255c4103bf7edac | |
parent | 691fd364dc741a8df339a1c3f74d941589ebaa99 (diff) | |
parent | 755970ac7c85a24af1a7e736a62c01dd18f7f1c8 (diff) |
Merge branch 'org.openembedded.dev' of git://git.openembedded.net/openembedded into org.openembedded.dev
-rw-r--r-- | conf/bitbake.conf | 4 | ||||
-rw-r--r-- | recipes/cherokee/cherokee_0.98.0.bb | 2 | ||||
-rw-r--r-- | recipes/cherokee/files/cherokee.init | 2 | ||||
-rw-r--r-- | recipes/qt4/qt4-embedded_4.5.1.bb | 1 | ||||
-rw-r--r-- | recipes/qt4/qt4-tools-native_4.5.1.bb | 1 | ||||
-rw-r--r-- | recipes/qt4/qt4-x11-free_4.5.1.bb | 1 |
6 files changed, 5 insertions, 6 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 9e026e44c4..95ee9c6136 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -342,9 +342,9 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS} --faketime --output= IMAGE_CMD_yaffs2 = "mkyaffs2image ${EXTRA_IMAGECMD} ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.yaffs2" IMAGE_CMD_cramfs = "mkcramfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cramfs ${EXTRA_IMAGECMD}" IMAGE_CMD_ext2 = "genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}" -IMAGE_CMD_ext2.gz = "rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz && mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz; rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz" +IMAGE_CMD_ext2.gz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.gz ; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz" IMAGE_CMD_ext3 = "genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3" -IMAGE_CMD_ext3.gz = "rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz && mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.gz; rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz" +IMAGE_CMD_ext3.gz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.gz ; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.gz" IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend" IMAGE_CMD_squashfs-lzma = "mksquashfs-lzma ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-lzma ${EXTRA_IMAGECMD} -noappend" IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -cvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar ." diff --git a/recipes/cherokee/cherokee_0.98.0.bb b/recipes/cherokee/cherokee_0.98.0.bb index 7a296940e7..a8ebaa8f72 100644 --- a/recipes/cherokee/cherokee_0.98.0.bb +++ b/recipes/cherokee/cherokee_0.98.0.bb @@ -1,5 +1,7 @@ require cherokee.inc +PR = "r1" + SRC_URI = "http://www.cherokee-project.com/download/0.98/${PV}/cherokee-${PV}.tar.gz \ file://cherokee.init " diff --git a/recipes/cherokee/files/cherokee.init b/recipes/cherokee/files/cherokee.init index ea1263aff5..93603b84db 100644 --- a/recipes/cherokee/files/cherokee.init +++ b/recipes/cherokee/files/cherokee.init @@ -12,7 +12,7 @@ test ! -r "$CONFIG" && exit 0 case "$1" in start) echo "Starting $DESC: " - start-stop-daemon --oknodo -S -x $DAEMON -- -b -C $CONFIG + start-stop-daemon --oknodo -S -x $DAEMON -- -d -C $CONFIG ;; stop) diff --git a/recipes/qt4/qt4-embedded_4.5.1.bb b/recipes/qt4/qt4-embedded_4.5.1.bb index 5da55f9c1c..3ec4b9aeb5 100644 --- a/recipes/qt4/qt4-embedded_4.5.1.bb +++ b/recipes/qt4/qt4-embedded_4.5.1.bb @@ -4,7 +4,6 @@ LICENSE = "GPL LGPL QPL" PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" DEPENDS += "tslib" -DEFAULT_PREFERENCE = "-1" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \ file://0001-cross-compile.patch;patch=1 \ diff --git a/recipes/qt4/qt4-tools-native_4.5.1.bb b/recipes/qt4/qt4-tools-native_4.5.1.bb index ab633149ba..adb341d465 100644 --- a/recipes/qt4/qt4-tools-native_4.5.1.bb +++ b/recipes/qt4/qt4-tools-native_4.5.1.bb @@ -1,5 +1,4 @@ require qt4-tools-native.inc PR = "r1" -DEFAULT_PREFERENCE = "-1" TOBUILD := "src/tools/bootstrap ${TOBUILD}" diff --git a/recipes/qt4/qt4-x11-free_4.5.1.bb b/recipes/qt4/qt4-x11-free_4.5.1.bb index 0ffbbc2e09..af3a7c702c 100644 --- a/recipes/qt4/qt4-x11-free_4.5.1.bb +++ b/recipes/qt4/qt4-x11-free_4.5.1.bb @@ -5,7 +5,6 @@ HOMEPAGE = "http://www.trolltech.com" LICENSE = "GPL LGPL QPL" DEPENDS += "virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor" PROVIDES = "qt4x11" -DEFAULT_PREFERENCE = "-1" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \ file://0001-cross-compile.patch;patch=1 \ |