diff options
100 files changed, 2038 insertions, 195 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index c1748aa120..8867e3b416 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -16,6 +16,7 @@ cwiiis@chris.(none) cwiiis@chrislaptop.(none) cwiiis@cwiiisdesktop.(none) dereky@builder.(none) +dp@cimmeria.(none) dyoung@builder.(none) emte@t.(none) erich@erichl.mine.nu diff --git a/classes/package.bbclass b/classes/package.bbclass index e7cf98edd8..774bd794af 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -272,6 +272,11 @@ fi python package_do_shlibs() { import os, re, os.path + exclude_shlibs = bb.data.getVar('EXCLUDE_FROM_SHLIBS', d, 0) + if exclude_shlibs: + bb.note("not generating shlibs") + return + lib_re = re.compile("^lib.*\.so") libdir_re = re.compile(".*/lib$") diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 76cab50ca7..2b99e29b0a 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -166,7 +166,7 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \ ${EXTRA_IMAGECMD}" IMAGE_CMD_cramfs = "mkcramfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cramfs ${EXTRA_IMAGECMD}" IMAGE_CMD_ext2 = "genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}" -IMAGE_CMD_ext2.gz = "genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.new ${EXTRA_IMAGECMD}; gzip -f -9 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.new; mv ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.new.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz" +IMAGE_CMD_ext2.gz = "mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz; genext2fs -b ${IMAGE_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_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend" IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.bz2 ." EXTRA_IMAGECMD = "" @@ -245,7 +245,7 @@ export BUILD_LDFLAGS = "-L${STAGING_DIR}/${BUILD_SYS}/lib \ export LDFLAGS = "${TARGET_LDFLAGS}" export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \ -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib \ - -Wl,-rpath,${libdir} -Wl,-O1" + -Wl,-O1" # Which flags to leave by strip-flags() in bin/build/oebuild.sh ? ALLOWED_FLAGS = "-O -mcpu -march -pipe" diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf index eb39766950..d0ce898056 100644 --- a/conf/distro/openslug.conf +++ b/conf/distro/openslug.conf @@ -3,12 +3,13 @@ #@DESCRIPTION: OpenSlug Linux Distribution for the NSLU2 DISTRO_NAME = "OpenSlug" -DISTRO_VERSION = "1.6-beta" +DISTRO_VERSION = "1.7-beta" TARGET_FPU = "soft" TARGET_OS = "linux" USE_NLS ?= "no" +USE_NLS_glib-2.0 = "yes" INHERIT += " package_ipk debian nslu2_flashimg" diff --git a/conf/distro/openzaurus-3.5.3.conf b/conf/distro/openzaurus-3.5.3.conf index 7a8c5750c9..f8c6486f5d 100644 --- a/conf/distro/openzaurus-3.5.3.conf +++ b/conf/distro/openzaurus-3.5.3.conf @@ -13,7 +13,7 @@ FEED_URIS += " \ console##http://openzaurus.org/official/unstable/3.5.2/feed/console \ devel##http://openzaurus.org/official/unstable/3.5.2/feed/devel" -CVSDATE = "20050305" +CVSDATE = "20050313" # # Zaurus diff --git a/packages/beepmp/beepmp/bugfix.patch b/packages/beepmp/beepmp/gnusource.patch index e69de29bb2..e69de29bb2 100644 --- a/packages/beepmp/beepmp/bugfix.patch +++ b/packages/beepmp/beepmp/gnusource.patch diff --git a/packages/beepmp/beepmp_0.9.7rc2.bb b/packages/beepmp/beepmp_0.9.7.bb index e69de29bb2..e69de29bb2 100644 --- a/packages/beepmp/beepmp_0.9.7rc2.bb +++ b/packages/beepmp/beepmp_0.9.7.bb diff --git a/packages/ccdv/ccdv.bb b/packages/ccdv/ccdv.bb index 2adf9f1a35..05aceabce1 100644 --- a/packages/ccdv/ccdv.bb +++ b/packages/ccdv/ccdv.bb @@ -3,7 +3,7 @@ finding actual problems easier." MAINTAINER = "Chris Larson <kergoth@handhelds.org>" LICENSE = "GPL" SRC_URI = "http://openembedded.org/dl/ccdv.c" -S = "${WORKDIR}/openembedded.org" +S = "${WORKDIR}" do_compile () { ${CC} ${CFLAGS} ${LDFLAGS} ccdv.c -o ccdv diff --git a/packages/ecore/ecore-native_cvs.bb b/packages/ecore/ecore-native_cvs.bb index e69de29bb2..6e5e1d1413 100644 --- a/packages/ecore/ecore-native_cvs.bb +++ b/packages/ecore/ecore-native_cvs.bb @@ -0,0 +1,14 @@ +include ecore_${PV}.bb +LICENSE = "MIT" +inherit native +DEPENDS = "edb-native eet-native evas-native freetype-native" + +do_stage () { + for p in ${parts}; do + dir=`echo $p|tr A-Z a-z` + install -m 0644 ${S}/src/lib/$dir/$p.h ${STAGING_INCDIR}/ + oe_libinstall -C src/lib/$dir lib$dir ${STAGING_LIBDIR}/ + done + install -m 0644 ${S}/src/lib/ecore/Ecore_Data.h ${STAGING_INCDIR}/ + install -m 0644 ${S}/ecore.m4 ${STAGING_DATADIR}/aclocal/ +} diff --git a/packages/ecore/ecore_cvs.bb b/packages/ecore/ecore_cvs.bb index e69de29bb2..1a90928fad 100644 --- a/packages/ecore/ecore_cvs.bb +++ b/packages/ecore/ecore_cvs.bb @@ -0,0 +1,49 @@ +DESCRIPTION = "Ecore is the core event abstraction layer for the enlightenment \ +foundation libraries. It makes makes doing selections, drag and drop, event loops, \ +timeouts and idle handlers fast, optimized, and convenient." +HOMEPAGE = "http://www.enlightenment.org" +SECTION = "e/libs" +PRIORITY = "optional" +LEAD_SONAME = "libecore.so" +LICENSE = "MIT" +PV = "${CVSDATE}" +DEPENDS = "edb eet evas freetype edb-native" +PR = "r5" + +SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/libs/ecore \ + file://no-x-test.patch;patch=1" +S = "${WORKDIR}/ecore" + +inherit autotools binconfig + +EXTRA_OECONF = "--enable-ecore-fb \ + --enable-ecore-job \ + --enable-ecore-evas-fb \ + --disable-ecore-evas-x \ + --disable-ecore-evas-gl \ + --enable-ecore-con \ + --enable-ecore-ipc \ + --enable-ecore-txt \ + --disable-ecore-x \ + --enable-ecore-config \ + --disable-openssl" + +parts = "Ecore Ecore_Job \ + Ecore_Txt Ecore_Fb Ecore_Con \ |