diff options
Diffstat (limited to 'packages')
-rw-r--r-- | packages/glibc/eglibc-svn/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/glibc/eglibc-svn/export-fcntl2.patch | 11 | ||||
-rw-r--r-- | packages/glibc/eglibc_svn.bb | 52 | ||||
-rw-r--r-- | packages/linux/linux-gta01.inc | 1 | ||||
-rw-r--r-- | packages/maemo3/hildon-thumbnail_0.11.bb | 25 | ||||
-rw-r--r-- | packages/meta/meta-gpephone.bb | 3 | ||||
-rw-r--r-- | packages/openmoko2/openmoko-today2_svn.bb | 2 | ||||
-rw-r--r-- | packages/tasks/task-gpephone.bb | 6 | ||||
-rw-r--r-- | packages/uboot/uboot-openmoko_svn.bb | 2 |
9 files changed, 93 insertions, 9 deletions
diff --git a/packages/glibc/eglibc-svn/.mtn2git_empty b/packages/glibc/eglibc-svn/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/glibc/eglibc-svn/.mtn2git_empty diff --git a/packages/glibc/eglibc-svn/export-fcntl2.patch b/packages/glibc/eglibc-svn/export-fcntl2.patch new file mode 100644 index 0000000000..0bf6c57852 --- /dev/null +++ b/packages/glibc/eglibc-svn/export-fcntl2.patch @@ -0,0 +1,11 @@ +--- libc/io/Makefile.orig 2007-08-07 17:41:33.000000000 -0700 ++++ libc/io/Makefile 2007-08-07 17:42:25.000000000 -0700 +@@ -23,7 +23,7 @@ subdir := io + + headers := sys/stat.h bits/stat.h sys/statfs.h bits/statfs.h sys/vfs.h \ + sys/statvfs.h bits/statvfs.h fcntl.h sys/fcntl.h bits/fcntl.h \ +- poll.h sys/poll.h bits/poll.h \ ++ poll.h sys/poll.h bits/poll.h bits/fcntl2.h \ + utime.h ftw.h fts.h sys/sendfile.h + + routines := \ diff --git a/packages/glibc/eglibc_svn.bb b/packages/glibc/eglibc_svn.bb index bf5023ca85..81d5916a21 100644 --- a/packages/glibc/eglibc_svn.bb +++ b/packages/glibc/eglibc_svn.bb @@ -1,10 +1,12 @@ require glibc.inc DEFAULT_PREFERENCE = "-1" - +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn" PV = "2.6+svn${SRCDATE}" SRC_URI = "svn://svn.eglibc.org;module=trunk \ - " + file://export-fcntl2.patch;patch=1 \ + file://etc/ld.so.conf \ + file://generate-supported.mk" S = "${WORKDIR}/trunk/libc" B = "${WORKDIR}/build-${TARGET_SYS}" @@ -83,5 +85,51 @@ do_compile () { ) } +do_stage() { + rm -f ${STAGING_LIBDIR}/libc.so.6 + oe_runmake 'install_root=${STAGING_DIR}/${HOST_SYS}' \ + 'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \ + '${STAGING_LIBDIR}/libc.so.6' \ + install-headers install-lib + + install -d ${STAGING_INCDIR}/gnu \ + ${STAGING_INCDIR}/bits \ + ${STAGING_INCDIR}/rpcsvc + install -m 0644 ${S}/include/gnu/stubs.h ${STAGING_INCDIR}/gnu/ + install -m 0644 ${B}/bits/stdio_lim.h ${STAGING_INCDIR}/bits/ + install -m 0644 misc/syscall-list.h ${STAGING_INCDIR}/bits/syscall.h + for r in ${rpcsvc}; do + h=`echo $r|sed -e's,\.x$,.h,'` + install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/ + done + for i in libc.a libc_pic.a libc_nonshared.a; do + install -m 0644 ${B}/$i ${STAGING_LIBDIR}/ || die "failed to install $i" + done + echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so + echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so + + rm -f ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6 + oe_runmake 'install_root=${CROSS_DIR}/${TARGET_SYS}' \ + 'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \ + '${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6' \ + install-headers install-lib + + install -d ${CROSS_DIR}/${TARGET_SYS}/include/gnu \ + ${CROSS_DIR}/${TARGET_SYS}/include/bits \ + ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc + install -m 0644 ${S}/include/gnu/stubs.h ${CROSS_DIR}/${TARGET_SYS}/include/gnu/ + install -m 0644 ${B}/bits/stdio_lim.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/ + install -m 0644 misc/syscall-list.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/syscall.h + for r in ${rpcsvc}; do + h=`echo $r|sed -e's,\.x$,.h,'` + install -m 0644 ${S}/sunrpc/rpcsvc/$h ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc/ + done + + for i in libc.a libc_pic.a libc_nonshared.a; do + install -m 0644 ${B}/$i ${CROSS_DIR}/${TARGET_SYS}/lib/ || die "failed to install $i" + done + echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libpthread.so + echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so +} require glibc-package.bbclass diff --git a/packages/linux/linux-gta01.inc b/packages/linux/linux-gta01.inc index 7cc6c58b6b..8554d2413c 100644 --- a/packages/linux/linux-gta01.inc +++ b/packages/linux/linux-gta01.inc @@ -93,6 +93,7 @@ do_deploy() { rm -f linux.bin.gz gzip -9 linux.bin ${STAGING_BINDIR_NATIVE}/uboot-mkimage -A arm -O linux -T kernel -C gzip -a 30008000 -e 30008000 -n "OpenMoko Kernel Image Neo1973(GTA01)" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin + ln -sf ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin ${DEPLOY_DIR_IMAGE}/uImage-${MACHINE}-latest.bin rm -f linux.bin.gz } diff --git a/packages/maemo3/hildon-thumbnail_0.11.bb b/packages/maemo3/hildon-thumbnail_0.11.bb new file mode 100644 index 0000000000..54646e7630 --- /dev/null +++ b/packages/maemo3/hildon-thumbnail_0.11.bb @@ -0,0 +1,25 @@ +LICENSE = "LGPL" +DESCRIPTION = "Nokia hildon thumbnail library" + +DEPENDS = "libhildonmime hildon-libs osso-thumbnail" + +PR = "r0" + +SRC_URI = "http://repository.maemo.org/pool/sardine/main/source/h/${PN}/${PN}_${PV}.tar.gz \ + " + +inherit autotools pkgconfig lib_package + +S = "${WORKDIR}/${PV}" + +do_configure_prepend() { + # remove Werror from OSSO_CFLAGS + sed -i s:-Werror::g configure.ac + touch gtk-doc.make +} + +do_stage() { + autotools_stage_all +} + + diff --git a/packages/meta/meta-gpephone.bb b/packages/meta/meta-gpephone.bb index c159333539..9912ddbf30 100644 --- a/packages/meta/meta-gpephone.bb +++ b/packages/meta/meta-gpephone.bb @@ -1,9 +1,8 @@ DESCRIPTION = "Meta-package for GPE Palmtop Environment Phone packages" LICENSE = "MIT" -PR = "r0" +PR = "r1" RDEPENDS = "\ - gpe-base-depends \ gpephone-task-base \ gpephone-task-settings \ gpephone-task-pim \ diff --git a/packages/openmoko2/openmoko-today2_svn.bb b/packages/openmoko2/openmoko-today2_svn.bb index a129d15aee..93e0b47456 100644 --- a/packages/openmoko2/openmoko-today2_svn.bb +++ b/packages/openmoko2/openmoko-today2_svn.bb @@ -1,6 +1,8 @@ DESCRIPTION = "The OpenMoko Application Launcher" SECTION = "openmoko/pim" DEPENDS = "libmokoui2 libmokojournal2 startup-notification dbus-glib libice libsm" +RDEPENDS = "libedata-cal" PV = "0.1.0+svn${SVNREV}" +PR = "r1" inherit openmoko2 gtk-icon-cache diff --git a/packages/tasks/task-gpephone.bb b/packages/tasks/task-gpephone.bb index 8bf39d8af9..f2a108b712 100644 --- a/packages/tasks/task-gpephone.bb +++ b/packages/tasks/task-gpephone.bb @@ -1,10 +1,9 @@ DESCRIPTION = "Task packages for GPE Palmtop Environment Phone Edition" -PR = "r7" +PR = "r8" LICENSE = "MIT" ALLOW_EMPTY = "1" PACKAGES = "\ - gpephone-base-depends \ gpephone-task-base \ gpephone-task-settings \ gpephone-task-pim \ @@ -12,9 +11,6 @@ PACKAGES = "\ gpephone-task-apps \ gpephone-task-development" -RDEPENDS_gpephone-base-depends = "\ - virtual/libx11" - RDEPENDS_gpephone-task-development = "\ rxvt-unicode \ gpe-terminal \ diff --git a/packages/uboot/uboot-openmoko_svn.bb b/packages/uboot/uboot-openmoko_svn.bb index 06c15c14c2..d7a07a7d00 100644 --- a/packages/uboot/uboot-openmoko_svn.bb +++ b/packages/uboot/uboot-openmoko_svn.bb @@ -73,8 +73,10 @@ do_deploy () { for mach in ${UBOOT_MACHINES} do install -m 0644 ${S}/u-boot_${mach}.bin ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PV}-${PR}.bin + ln -sf ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PV}-${PR}.bin ${DEPLOY_DIR_IMAGE}/uboot-${mach}-latest.bin if [ -f ${S}/lowlevel_foo_${mach}.bin ]; then install -m 0644 ${S}/lowlevel_foo_${mach}.bin ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PV}-${PR}.bin + ln -sf ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PV}-${PR}.bin ${DEPLOY_DIR_IMAGE}/lowlevel-foo-${mach}-latest.bin fi done install -m 0755 tools/mkimage ${STAGING_BINDIR_NATIVE}/uboot-mkimage |