Re: The Freeze (for 1.2.3)
Paul Eggleton <[email protected]> Sun, 4 Mar 2007 13:08:11 +1300
| Newsgroups | gmane.comp.handhelds.opie.devel |
|---|---|
| Message-ID | <[email protected]> |
On Sunday 04 March 2007 10:09, Erik Hovland wrote: > On Sat, Mar 03, 2007 at 01:48:33AM +1300, Paul Eggleton wrote: > > Honestly I think we should postpone the release until Dmitriy gets back, > > or we are able to verify for sure that bluetooth and IR are working > > properly. > > I don't have a problem with this. But I have a big problem with leaving > the tree frozen for so long. Me too. To work around this we will have to branch 1.2.3, right? > Can we start with getting some bugs together that attempts to capture > everything you have found? Can we attach them to a 1.2.3 release? I think some of it may be base system problems though, rather than Opie - I can't even get the bluetooth LED to come on from the command line in the new image I built. Without that working though I can't test the bluetooth changes in Opie. > If you get a hankering, feel free to patchify your bbs for the familiar > tree. I will incorporate them into my familiar git tree (which has write > access to the familiar tree). It would be helpful if you split the > patches into openobex pieces and Opie pieces. Attached. Note that these are more or less just copies of what is in the OE tree for the few places where things refused to build. I also had to disable USB support in OpenOBEX since the new libusb .bb from OE wouldn't build properly. I haven't bothered to update any of the individual .bb's for Opie - at the moment I just build with the CVS version. Cheers, Paul _______________________________________________ http://opie.handhelds.org/cgi-bin/moin.cgi/DeveloperWikiIndex Opie-devel mailing list [email protected] https://handhelds.org/mailman/listinfo/opie-devel
obexftp.patch
(text/x-diff, 4.4 KB)
diff -urNd familiar-build-orig/org.handhelds.familiar/packages/obexftp/files/i-hate-libtool.patch familiar-build/org.handhelds.familiar/packages/obexftp/files/i-hate-libtool.patch
--- familiar-build-orig/org.handhelds.familiar/packages/obexftp/files/i-hate-libtool.patch 1970-01-01 12:00:00.000000000 +1200
+++ familiar-build/org.handhelds.familiar/packages/obexftp/files/i-hate-libtool.patch 2007-03-01 19:27:14.000000000 +1300
@@ -0,0 +1,20 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- obexftp-0.20/apps/Makefile.am~i-hate-libtool
++++ obexftp-0.20/apps/Makefile.am
+@@ -9,9 +9,9 @@
+ LDADD = ../obexftp/libobexftp.la \
+ ../multicobex/libmulticobex.la \
+ ../bfb/libbfb.la \
+- @OPENOBEX_LIBS@
+-# @BLUETOOTH_LIBS@
+-# @USB_LIBS@
++ @OPENOBEX_LIBS@ \
++ @BLUETOOTH_LIBS@
++# @USB_LIBS@
+ # need on win32:
+ # getopt.o getopt1.o libopenobex.a libwsock32.a
+
diff -urNd familiar-build-orig/org.handhelds.familiar/packages/obexftp/files/m4.patch familiar-build/org.handhelds.familiar/packages/obexftp/files/m4.patch
--- familiar-build-orig/org.handhelds.familiar/packages/obexftp/files/m4.patch 1970-01-01 12:00:00.000000000 +1200
+++ familiar-build/org.handhelds.familiar/packages/obexftp/files/m4.patch 2007-03-01 19:27:13.000000000 +1300
@@ -0,0 +1,64 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- /dev/null 2003-09-23 18:19:32.000000000 -0400
++++ obexftp-0.10.3/m4/openobex.m4 2004-03-06 05:10:27.000000000 -0500
+@@ -0,0 +1,56 @@
++dnl Check for openobex library
++dnl Written by Pontus Fuchs 2000-08-18
++dnl Version checking fixed by Christian W. Zuckschwerdt 2002-10-17
++
++AC_DEFUN([AM_PATH_OPENOBEX], [
++ AC_PATH_PROG(OPENOBEX_CONFIG, openobex-config, no)
++
++ if test "$OPENOBEX_CONFIG" = "no" ; then
++ AC_MSG_ERROR(openobex-config not found. Pehaps openobex is not installed.)
++ fi
++
++ min_obex_version=ifelse([$1], ,0.9.6,$1)
++ AC_MSG_CHECKING(for openobex - version >= $min_obex_version)
++
++ OPENOBEX_CFLAGS=`$OPENOBEX_CONFIG --cflags`
++ OPENOBEX_LIBS=`$OPENOBEX_CONFIG --libs`
++
++ obex_config_version=`$OPENOBEX_CONFIG --version`
++
++ obex_config_major_version=`$OPENOBEX_CONFIG --version | \
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
++ obex_config_minor_version=`$OPENOBEX_CONFIG --version | \
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
++ obex_config_micro_version=`$OPENOBEX_CONFIG --version | \
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
++
++ obex_req_major_version=`echo $min_obex_version | \
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
++ obex_req_minor_version=`echo $min_obex_version | \
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
++ obex_req_micro_version=`echo $min_obex_version | \
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
++
++
++ if test $obex_req_major_version -lt $obex_config_major_version ; then
++ obex_config_version_ok="yes"
++ fi
++ if test $obex_req_major_version -eq $obex_config_major_version ; then
++ if test $obex_req_minor_version -lt $obex_config_minor_version ; then
++ obex_config_version_ok="yes"
++ fi
++ if test $obex_req_minor_version -eq $obex_config_minor_version ; then
++ if test $obex_req_micro_version -le $obex_config_micro_version ; then
++ obex_config_version_ok="yes"
++ fi
++ fi
++ fi
++
++ if test "$obex_config_version_ok" != "yes" ; then
++ AC_MSG_ERROR(Installed openobex library too old ($obex_config_version))
++ fi
++
++ AC_SUBST(OPENOBEX_CFLAGS)
++ AC_SUBST(OPENOBEX_LIBS)
++ AC_MSG_RESULT(yes)
++])
diff -urNd familiar-build-orig/org.handhelds.familiar/packages/obexftp/obexftp_0.20.bb familiar-build/org.handhelds.familiar/packages/obexftp/obexftp_0.20.bb
--- familiar-build-orig/org.handhelds.familiar/packages/obexftp/obexftp_0.20.bb 1970-01-01 12:00:00.000000000 +1200
+++ familiar-build/org.handhelds.familiar/packages/obexftp/obexftp_0.20.bb 2007-03-01 21:46:23.000000000 +1300
@@ -0,0 +1,21 @@
+DESCRIPTION = "OBEX Ftp Client based on openobex."
+SECTION = "console/network"
+HOMEPAGE = "http://openobex.triq.net"
+LICENSE = "GPL"
+DEPENDS = "openobex libgsm"
+PR = "r2"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/obexftp-${PV}.tar.gz \
+ file://i-hate-libtool.patch;patch=1 \
+ file://m4.patch;patch=1"
+
+inherit autotools
+
+EXTRA_OECONF = "--enable-bluetooth --disable-swig --disable-perl --disable-python --disable-tcl --disable-builddocs"
+
+PARALLEL_MAKE = ""
+
+do_stage() {
+ autotools_stage_all
+}
+
openobex.patch
(text/x-diff, 3.5 KB)
diff -urNd familiar-build-orig/org.handhelds.familiar/packages/openobex/files/disable-cable-test.patch familiar-build/org.handhelds.familiar/packages/openobex/files/disable-cable-test.patch
--- familiar-build-orig/org.handhelds.familiar/packages/openobex/files/disable-cable-test.patch 1970-01-01 12:00:00.000000000 +1200
+++ familiar-build/org.handhelds.familiar/packages/openobex/files/disable-cable-test.patch 2007-03-01 19:27:13.000000000 +1300
@@ -0,0 +1,16 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- openobex-1.2/apps/Makefile.am~disable-cable-test
++++ openobex-1.2/apps/Makefile.am
+@@ -6,7 +6,7 @@
+ obex_io.c obex_io.h \
+ obex_put_common.c obex_put_common.h
+
+-bin_PROGRAMS = irxfer obex_tcp irobex_palm3 obex_test
++bin_PROGRAMS = irxfer obex_tcp irobex_palm3
+
+ obex_test_SOURCES = \
+ obex_test.c obex_test.h \
diff -urNd familiar-build-orig/org.handhelds.familiar/packages/openobex/files/libusb_crosscompile_check.patch familiar-build/org.handhelds.familiar/packages/openobex/files/libusb_crosscompile_check.patch
--- familiar-build-orig/org.handhelds.familiar/packages/openobex/files/libusb_crosscompile_check.patch 1970-01-01 12:00:00.000000000 +1200
+++ familiar-build/org.handhelds.familiar/packages/openobex/files/libusb_crosscompile_check.patch 2007-03-01 19:27:13.000000000 +1300
@@ -0,0 +1,12 @@
+diff -Naur openobex-1.2_old/acinclude.m4 openobex-1.2/acinclude.m4
+--- openobex-1.2_old/acinclude.m4 2006-03-07 19:57:49.000000000 +0200
++++ openobex-1.2/acinclude.m4 2006-04-18 23:07:25.000000000 +0300
+@@ -195,7 +195,7 @@
+
+ if (test "${usb_enable}" = "yes" && test "${usb_found}" = "yes"); then
+ AC_DEFINE(HAVE_USB, 1, [Define if system supports USB and it's enabled])
+- AC_CHECK_FILE(${usb_prefix}/lib/pkgconfig/libusb.pc, REQUIRES="$REQUIRES libusb")
++ REQUIRES="libusb"
+ fi
+
+ AM_CONDITIONAL(APPS, test "${apps_enable}" = "yes")
diff -urNd familiar-build-orig/org.handhelds.familiar/packages/openobex/openobex_1.2.bb familiar-build/org.handhelds.familiar/packages/openobex/openobex_1.2.bb
--- familiar-build-orig/org.handhelds.familiar/packages/openobex/openobex_1.2.bb 1970-01-01 12:00:00.000000000 +1200
+++ familiar-build/org.handhelds.familiar/packages/openobex/openobex_1.2.bb 2007-03-01 22:15:29.000000000 +1300
@@ -0,0 +1,34 @@
+DESCRIPTION = "The Openobex project is an open source implementation of the \
+Object Exchange (OBEX) protocol."
+HOMEPAGE = "http://openobex.triq.net"
+SECTION = "libs"
+PROVIDES = "openobex-apps"
+DEPENDS = "libusb bluez-libs"
+LICENSE = "GPL"
+PR = "r5"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/openobex-${PV}.tar.gz \
+ file://disable-cable-test.patch;patch=1" \
+ file://libusb_crosscompile_check.patch;patch=1"
+
+inherit autotools binconfig pkgconfig
+
+EXTRA_OECONF = "--enable-apps --enable-syslog --enable-dump \
+# --with-usb=${STAGING_LIBDIR}/.. --with-bluez=${STAGING_LIBDIR}/.."
+ --disable-usb --with-bluez=${STAGING_LIBDIR}/.."
+
+do_stage() {
+ oe_libinstall -so -C lib libopenobex ${STAGING_LIBDIR}
+ ln -sf libopenobex.so ${STAGING_LIBDIR}/libopenobex-1.2.so
+ install -d ${STAGING_INCDIR}/openobex
+ install -m 0644 include/*.h ${STAGING_INCDIR}/openobex/
+ install -d ${STAGING_DIR}/aclocal
+ install -m 0644 openobex.m4 ${STAGING_DATADIR}/aclocal/
+}
+
+# how to stop shlibrename from renaming -apps?
+PACKAGES += "openobex-apps"
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev += "${bindir}/openobex-config"
+FILES_${PN}-apps = "${bindir}/*"
+DEBIAN_NOAUTONAME_${PN}-apps = "1"
opie-bluetoothmanager.patch
(text/x-diff, 1 KB)
diff -urNd familiar-build-orig/org.handhelds.familiar/packages/opie-bluetoothmanager/opie-bluetoothmanager.inc familiar-build/org.handhelds.familiar/packages/opie-bluetoothmanager/opie-bluetoothmanager.inc --- familiar-build-orig/org.handhelds.familiar/packages/opie-bluetoothmanager/opie-bluetoothmanager.inc 2007-01-27 21:33:11.000000000 +1300 +++ familiar-build/org.handhelds.familiar/packages/opie-bluetoothmanager/opie-bluetoothmanager.inc 2007-03-01 20:49:36.000000000 +1300 @@ -1,15 +1,15 @@ DESCRIPTION = "Bluetooth manager for Opie" SECTION = "opie/settings" PRIORITY = "optional" -DEPENDS = "libopietooth1" +DEPENDS = "libopietooth1 obexftp" RDEPENDS = "opie-bluepin" -MAINTAINER = "Team Opie <[email protected]>" LICENSE = "GPL" APPNAME = "bluetooth-manager" S = "${WORKDIR}/manager" -EXTRA_QMAKEVARS_POST += " INCLUDEPATH+=${STAGING_INCDIR}/opietooth " +EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${STAGING_INCDIR}/opietooth" +EXTRA_QMAKEVARS_PRE += "LIBOBEXFTP_INC_DIR=${STAGING_INCDIR}/obexftp" inherit opie