r1251 - in trunk/oe: conf conf/distro packages packages/alsa packages/ipkg packages/libftdi packages/libftdi/files packages/linux packages/openmoko-base packages/tasks packages/uboot

laforge at sita.openmoko.org laforge at sita.openmoko.org
Mon Mar 5 20:53:06 CET 2007


Author: laforge
Date: 2007-03-05 20:53:06 +0100 (Mon, 05 Mar 2007)
New Revision: 1251

Removed:
   trunk/oe/packages/alsa/alsa-lib/
   trunk/oe/packages/alsa/alsa-lib_1.0.13.bb
   trunk/oe/packages/base-files/
   trunk/oe/packages/dbus/
   trunk/oe/packages/gsm/
   trunk/oe/packages/gtk+/
   trunk/oe/packages/id3lib/
   trunk/oe/packages/images/
   trunk/oe/packages/ipkg/ipkg-collateral.bb
   trunk/oe/packages/ipkg/ipkg-native_0.99.163.bb
   trunk/oe/packages/ipkg/ipkg_0.99.163.bb
   trunk/oe/packages/libftdi/files/doxygen-configure.patch
   trunk/oe/packages/libftdi/libftdi-native_0.8.bb
   trunk/oe/packages/libftdi/libftdi_0.8.bb
   trunk/oe/packages/lm_sensors/
   trunk/oe/packages/matchbox2/
   trunk/oe/packages/mtpaint/
   trunk/oe/packages/netbase/
   trunk/oe/packages/openmoko-base/openmoko-libs_svn.bb
   trunk/oe/packages/openmoko-base/openmoko-session_svn.bb
   trunk/oe/packages/openmoko-examples/
   trunk/oe/packages/openmoko-panel-plugins/
   trunk/oe/packages/openmoko-pim/
   trunk/oe/packages/xoo/
   trunk/oe/packages/xserver-kdrive-common/
Modified:
   trunk/oe/conf/distro/openmoko.conf
   trunk/oe/conf/site.conf
   trunk/oe/packages/linux/linux-gta01_2.6.17.14.bb
   trunk/oe/packages/linux/linux-gta01_2.6.20.1.bb
   trunk/oe/packages/linux/linux-gta01_2.6.20.bb
   trunk/oe/packages/tasks/task-openmoko.bb
   trunk/oe/packages/uboot/uboot-gta01_svn.bb
Log:
update our 'oe' recipie collection to upstream OE.  This is known to build with
upstream OE mtn version 'e2dbb52fe39df7ef786b6068f6178f29508dfded' from 20070305


Modified: trunk/oe/conf/distro/openmoko.conf
===================================================================
--- trunk/oe/conf/distro/openmoko.conf	2007-03-05 19:47:55 UTC (rev 1250)
+++ trunk/oe/conf/distro/openmoko.conf	2007-03-05 19:53:06 UTC (rev 1251)
@@ -25,6 +25,9 @@
 PREFERRED_VERSION_glibc ?= "2.4"
 PREFERRED_VERSION_glibc-intermediate ?= "2.4"
 
+PREFERRED_VERSION_file ?= "4.18"
+PREFERRED_VERSION_file-native ?= "4.18"
+
 PREFERRED_VERSION_lmsensors-apps ?= "2.10.1"
 
 CVS_TARBALL_STASH = "\

Modified: trunk/oe/conf/site.conf
===================================================================
--- trunk/oe/conf/site.conf	2007-03-05 19:47:55 UTC (rev 1250)
+++ trunk/oe/conf/site.conf	2007-03-05 19:53:06 UTC (rev 1251)
@@ -19,6 +19,6 @@
 #DEBUG_BUILD = "1"
 #INHIBIT_PACKAGE_STRIP = "1"
 SOURCEFORGE_MIRROR = "http://heanet.dl.sf.net"
-PARALLEL_MAKE = ""
+#PARALLEL_MAKE = ""
 
 SRCDATE = "20060814"

Deleted: trunk/oe/packages/alsa/alsa-lib_1.0.13.bb
===================================================================
--- trunk/oe/packages/alsa/alsa-lib_1.0.13.bb	2007-03-05 19:47:55 UTC (rev 1250)
+++ trunk/oe/packages/alsa/alsa-lib_1.0.13.bb	2007-03-05 19:53:06 UTC (rev 1251)
@@ -1,34 +0,0 @@
-DESCRIPTION = "Alsa sound library"
-HOMEPAGE = "http://www.alsa-project.org"
-SECTION = "libs/multimedia"
-LICENSE = "GPL"
-PR = "r1"
-
-# configure.in sets -D__arm__ on the command line for any arm system
-# (not just those with the ARM instruction set), this should be removed,
-# (or replaced by a permitted #define).
-#FIXME: remove the following
-ARM_INSTRUCTION_SET = "arm"
-
-SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \
-           file://fix-tstamp-declaration.patch;patch=1"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes"
-
-do_stage() {
-	oe_libinstall -so -C src libasound ${STAGING_LIBDIR}/
-	install -d ${STAGING_INCDIR}/alsa/sound
-	install -m 0644 include/*.h ${STAGING_INCDIR}/alsa/
-	install -m 0644 include/sound/ainstr*.h ${STAGING_INCDIR}/alsa/sound/
-	install -d ${STAGING_DATADIR}/aclocal
-	install -m 0644 utils/alsa.m4 ${STAGING_DATADIR}/aclocal/
-}
-
-PACKAGES =+ "alsa-server libasound alsa-conf alsa-doc alsa-dev"
-FILES_${PN}-dbg += "${libdir}/alsa-lib/*/.debu*"
-FILES_libasound = "${libdir}/libasound.so.*"
-FILES_alsa-server = "${bindir}/*"
-FILES_alsa-conf = "${datadir}"
-FILES_alsa-dev += "${libdir}/pkgconfig/ /usr/include/"

Deleted: trunk/oe/packages/ipkg/ipkg-collateral.bb
===================================================================
--- trunk/oe/packages/ipkg/ipkg-collateral.bb	2007-03-05 19:47:55 UTC (rev 1250)
+++ trunk/oe/packages/ipkg/ipkg-collateral.bb	2007-03-05 19:53:06 UTC (rev 1251)
@@ -1,26 +0,0 @@
-DESCRIPTION = "ipkg configuration files"
-SECTION = "base"
-LICENSE = "MIT"
-PR = "r5"
-PACKAGE_ARCH = "all"
-
-SRC_URI = " \
-file://ipkg.conf.comments	\
-file://lists \
-file://dest \
-file://src \
-"
-
-do_compile () {
-	cat ${WORKDIR}/ipkg.conf.comments >${WORKDIR}/ipkg.conf
-	cat ${WORKDIR}/src	>>${WORKDIR}/ipkg.conf
-	cat ${WORKDIR}/dest	>>${WORKDIR}/ipkg.conf
-	cat ${WORKDIR}/lists	>>${WORKDIR}/ipkg.conf
-}
-
-do_install () {
-	install -d ${D}${sysconfdir}/
-	install -m 0644 ${WORKDIR}/ipkg.conf ${D}${sysconfdir}/ipkg.conf
-}
-
-CONFFILES_${PN} = "${sysconfdir}/ipkg.conf"

Deleted: trunk/oe/packages/ipkg/ipkg-native_0.99.163.bb
===================================================================
--- trunk/oe/packages/ipkg/ipkg-native_0.99.163.bb	2007-03-05 19:47:55 UTC (rev 1250)
+++ trunk/oe/packages/ipkg/ipkg-native_0.99.163.bb	2007-03-05 19:53:06 UTC (rev 1251)
@@ -1,10 +0,0 @@
-S = "${WORKDIR}/ipkg-${PV}"
-
-#require ipkg_${PV}.bb
-require ipkg-native.inc
-PR = "r1"
-
-inherit autotools pkgconfig native
-
-SRC_URI = "http://www.handhelds.org/pub/packages/ipkg/ipkg-${PV}.tar.gz"
-

Deleted: trunk/oe/packages/ipkg/ipkg_0.99.163.bb
===================================================================
--- trunk/oe/packages/ipkg/ipkg_0.99.163.bb	2007-03-05 19:47:55 UTC (rev 1250)
+++ trunk/oe/packages/ipkg/ipkg_0.99.163.bb	2007-03-05 19:53:06 UTC (rev 1251)
@@ -1,18 +0,0 @@
-include ipkg.inc
-PR = "r2"
-
-S = "${WORKDIR}/ipkg-${PV}"
-
-SRC_URI = "http://www.handhelds.org/pub/packages/ipkg/ipkg-${PV}.tar.gz \
-	file://terse.patch;patch=1 \
-	file://is-processing.patch;patch=1"
-
-do_stage() {
-	oe_libinstall -so libipkg ${STAGING_LIBDIR}
-	install -d ${STAGING_INCDIR}/libipkg/
-	for f in *.h
-	do
-		install -m 0644 $f ${STAGING_INCDIR}/libipkg/
-	done
-}
-

Deleted: trunk/oe/packages/libftdi/files/doxygen-configure.patch
===================================================================
--- trunk/oe/packages/libftdi/files/doxygen-configure.patch	2007-03-05 19:47:55 UTC (rev 1250)
+++ trunk/oe/packages/libftdi/files/doxygen-configure.patch	2007-03-05 19:53:06 UTC (rev 1251)
@@ -1,28 +0,0 @@
-Index: libftdi-0.8/configure.in
-===================================================================
---- libftdi-0.8.orig/configure.in
-+++ libftdi-0.8/configure.in
-@@ -32,9 +32,5 @@ else
-    AC_MSG_RESULT(yes)
- fi
- 
--dnl check for doxygen
--AC_PATH_PROG(DOXYGEN, doxygen, $PATH)
--AM_CONDITIONAL(HAVE_DOXYGEN, test -n $DOXYGEN);
--
- AC_OUTPUT([libftdi-config],[chmod a+x libftdi-config])
--AC_OUTPUT(Makefile src/Makefile examples/Makefile doc/Doxyfile doc/Makefile libftdi.pc)
-+AC_OUTPUT(Makefile src/Makefile examples/Makefile libftdi.pc)
-Index: libftdi-0.8/Makefile.am
-===================================================================
---- libftdi-0.8.orig/Makefile.am
-+++ libftdi-0.8/Makefile.am
-@@ -2,7 +2,7 @@
- # have all needed files, that a GNU package needs
- AUTOMAKE_OPTIONS = foreign 1.4
- 
--SUBDIRS = src examples doc
-+SUBDIRS = src examples
- 
- EXTRA_DIST = libftdi.spec COPYING.LIB README ChangeLog libftdi-config.in
- 

Deleted: trunk/oe/packages/libftdi/libftdi-native_0.8.bb
===================================================================
--- trunk/oe/packages/libftdi/libftdi-native_0.8.bb	2007-03-05 19:47:55 UTC (rev 1250)
+++ trunk/oe/packages/libftdi/libftdi-native_0.8.bb	2007-03-05 19:53:06 UTC (rev 1251)
@@ -1,5 +0,0 @@
-require libftdi_${PV}.bb
-
-inherit native
-
-DEPENDS = "libusb-native"

Deleted: trunk/oe/packages/libftdi/libftdi_0.8.bb
===================================================================
--- trunk/oe/packages/libftdi/libftdi_0.8.bb	2007-03-05 19:47:55 UTC (rev 1250)
+++ trunk/oe/packages/libftdi/libftdi_0.8.bb	2007-03-05 19:53:06 UTC (rev 1251)
@@ -1,17 +0,0 @@
-DESCRIPTION = "libftdi is a library (using libusb) to talk to FTDI's \
-FT232BM, FT245BM and FT2232C type chips including the popular bitbang mode."
-HOMEPAGE = "http://www.intra2net.com/de/produkte/opensource/ftdi"
-LICENSE = "GPL"
-DEPENDS = "libusb"
-
-SRC_URI = "http://www.intra2net.com/de/produkte/opensource/ftdi/TGZ/libftdi-${PV}.tar.gz \
-           file://doxygen-configure.patch;patch=1"
-S = "${WORKDIR}/libftdi-${PV}"
-
-inherit autotools
-
-EXTRA_OECONF = "--disable-docs"
-
-do_stage() {
-    autotools_stage_all
-}

Modified: trunk/oe/packages/linux/linux-gta01_2.6.17.14.bb
===================================================================
--- trunk/oe/packages/linux/linux-gta01_2.6.17.14.bb	2007-03-05 19:47:55 UTC (rev 1250)
+++ trunk/oe/packages/linux/linux-gta01_2.6.17.14.bb	2007-03-05 19:53:06 UTC (rev 1251)
@@ -91,7 +91,7 @@
 	arm-linux-objcopy -O binary -R .note -R .comment -S vmlinux linux.bin
 	rm -f linux.bin.gz
 	gzip -9 linux.bin
-	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}-${DATETIME}.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}-${DATETIME}.bin
 	rm -f linux.bin.gz
 }
 

Modified: trunk/oe/packages/linux/linux-gta01_2.6.20.1.bb
===================================================================
--- trunk/oe/packages/linux/linux-gta01_2.6.20.1.bb	2007-03-05 19:47:55 UTC (rev 1250)
+++ trunk/oe/packages/linux/linux-gta01_2.6.20.1.bb	2007-03-05 19:53:06 UTC (rev 1251)
@@ -92,7 +92,7 @@
 	arm-linux-objcopy -O binary -R .note -R .comment -S vmlinux linux.bin
 	rm -f linux.bin.gz
 	gzip -9 linux.bin
-	${STAGING_BINDIR}/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
+	${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
 	rm -f linux.bin.gz
 }
 

Modified: trunk/oe/packages/linux/linux-gta01_2.6.20.bb
===================================================================
--- trunk/oe/packages/linux/linux-gta01_2.6.20.bb	2007-03-05 19:47:55 UTC (rev 1250)
+++ trunk/oe/packages/linux/linux-gta01_2.6.20.bb	2007-03-05 19:53:06 UTC (rev 1251)
@@ -92,7 +92,7 @@
 	arm-linux-objcopy -O binary -R .note -R .comment -S vmlinux linux.bin
 	rm -f linux.bin.gz
 	gzip -9 linux.bin
-	${STAGING_BINDIR}/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
+	${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
 	rm -f linux.bin.gz
 }
 

Deleted: trunk/oe/packages/openmoko-base/openmoko-libs_svn.bb
===================================================================
--- trunk/oe/packages/openmoko-base/openmoko-libs_svn.bb	2007-03-05 19:47:55 UTC (rev 1250)
+++ trunk/oe/packages/openmoko-base/openmoko-libs_svn.bb	2007-03-05 19:53:06 UTC (rev 1251)
@@ -1,19 +0,0 @@
-DESCRIPTION = "openmoko-libs is a set of libraries implementing a Gtk+ based application framework for mobile communication applications"
-SECTION = "openmoko/libs"
-LICENSE = "LGPL"
-DEPENDS += "gtk+"
-PV = "0.0.1+svn${SRCDATE}"
-PR = "r1"
-
-inherit openmoko
-
-do_configure_prepend() {
-	touch libmokocore/Makefile.in
-	touch libmokopim/Makefile.in
-	touch libmokonet/Makefile.in
-}
-
-do_stage() {
-	autotools_stage_all
-}
-

Deleted: trunk/oe/packages/openmoko-base/openmoko-session_svn.bb
===================================================================
--- trunk/oe/packages/openmoko-base/openmoko-session_svn.bb	2007-03-05 19:47:55 UTC (rev 1250)
+++ trunk/oe/packages/openmoko-base/openmoko-session_svn.bb	2007-03-05 19:53:06 UTC (rev 1251)
@@ -1,29 +0,0 @@
-DESCRIPTION = "Matchbox session files for OpenMoko"
-SECTION = "openmoko/base"
-RDEPENDS = "matchbox matchbox-applet-startup-monitor gtk-theme-clearlooks"
-PV = "0.0+svn${SRCDATE}"
-PR = "r1"
-
-inherit openmoko-base
-
-SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE};module=etc;proto=http \
-           file://session"
-S = "${WORKDIR}"
-
-do_install() {
-	cp -R ${S}/etc ${D}/etc
-	rm -fR ${D}/etc/.svn
-	rm -fR ${D}/etc/matchbox/.svn
-	chmod -R 755 ${D}/etc
-        # DEMO only!
-	install -m 0755 ${WORKDIR}/session ${D}/etc/matchbox/session
-}
-
-pkg_postinst_openmoko-session () {
-#!/bin/sh -e
-if [ "x$D" != "x" ]; then
-    exit 1
-fi
-
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/openmoko/interface/theme Clearlooks
-}

Modified: trunk/oe/packages/tasks/task-openmoko.bb
===================================================================
--- trunk/oe/packages/tasks/task-openmoko.bb	2007-03-05 19:47:55 UTC (rev 1250)
+++ trunk/oe/packages/tasks/task-openmoko.bb	2007-03-05 19:53:06 UTC (rev 1251)
@@ -5,7 +5,7 @@
 LICENSE = "MIT"
 PROVIDES = "task-openmoko-everything"
 DEPENDS = "dropbear"
-PR = "r25"
+PR = "r29"
 
 PACKAGES = "\
   task-openmoko-linux \
@@ -65,6 +65,7 @@
   gsmd \
   libgsmd-tools \
   openmoko-dialer \
+  openmoko-panel-gsm \
 "
 
 #
@@ -81,7 +82,7 @@
   gtk+ \
   matchbox-common \
   matchbox-wm \
-  matchbox-panel \
+  matchbox-panel-2 \
   xserver-kdrive-fbdev \
   xserver-kdrive-common \
   xserver-nodm-init \
@@ -105,6 +106,7 @@
 # matchbox-panel-2 \
   openmoko-footer \
   openmoko-taskmanager \
+  openmoko-panel-mainmenu \
 "
 
 #

Modified: trunk/oe/packages/uboot/uboot-gta01_svn.bb
===================================================================
--- trunk/oe/packages/uboot/uboot-gta01_svn.bb	2007-03-05 19:47:55 UTC (rev 1250)
+++ trunk/oe/packages/uboot/uboot-gta01_svn.bb	2007-03-05 19:53:06 UTC (rev 1251)
@@ -38,11 +38,11 @@
 	for mach in ${UBOOT_MACHINES}
 	do
 		install ${S}/u-boot_${mach}.bin \
-		    ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${DATETIME}.bin
+		    ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PR}.bin
 		install ${S}/lowlevel_foo_${mach}.bin \
-		    ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${DATETIME}.bin
+		    ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PR}.bin
 	done
-	install -m 0755 tools/mkimage ${STAGING_BINDIR}/uboot-mkimage
+	install -m 0755 tools/mkimage ${STAGING_BINDIR_NATIVE}/uboot-mkimage
 }
 
 do_deploy[dirs] = "${S}"





More information about the commitlog mailing list