[oe-commits] org.oe.dev merge of '6f7c6c0d226901d61dbd149693b1d376efe3b4d2'
woglinde2 commit
oe at amethyst.openembedded.net
Sat May 17 16:16:59 UTC 2008
merge of '6f7c6c0d226901d61dbd149693b1d376efe3b4d2'
and 'bbe1f43b109ad4a796a0fb8e5edee36e28a20276'
Author: woglinde2 at openembedded.org
Branch: org.openembedded.dev
Revision: 2b6778e1634a75fcf4e15e2d5625eb2429054d0a
ViewMTN: http://monotone.openembedded.org/revision/info/2b6778e1634a75fcf4e15e2d5625eb2429054d0a
Files:
1
packages/gettext/gettext-0.14.1/linklib_from_0.17.patch
packages/gettext/gettext-native_0.14.1.bb
packages/gettext/gettext_0.14.1.bb
packages/linux/linux-omap2-git/beagleboard/0001-board-omap3beagle-fix-merge-damage-in-RTC-code.patch
packages/linux/linux-omap2-git/beagleboard/0001-omap3beagle-add-driver-to-turn-on-the-TFP410-framer.patch
packages/linux/linux-omap2-git/beagleboard/l2-cache.patch
packages/linux/linux-omap2-git/beagleboard/usb-timout.patch
packages/bitlbee
packages/bitlbee/files
packages/freesmartphone/python-ousaged
packages/freesmartphone/zhone
packages/bitlbee/bitlbee_1.0.4.bb
packages/bitlbee/files/configure.patch
packages/bitlbee/files/init-script
packages/dillo/dillo2-0.6.6/dillo2-gcc4.patch
packages/freesmartphone/python-ophoned/ophoned
packages/freesmartphone/python-ousaged/ousaged
packages/freesmartphone/python-ousaged_git.bb
packages/freesmartphone/zhone/80zhone
packages/images/fso-image.bb
packages/linux/linux-2.6.24/ts72xx/ep93xx-eth-phylib-framework.patch
classes/oestats-client.bbclass
conf/distro/include/fso-autorev.inc
conf/distro/include/sane-srcrevs.inc
packages/avahi/avahi-python_0.6.21.bb
packages/avahi/avahi-ui_0.6.21.bb
packages/avahi/avahi.inc
packages/avahi/avahi_0.6.19.bb
packages/avahi/avahi_0.6.20.bb
packages/avahi/avahi_0.6.21.bb
packages/avahi/avahi_0.6.22.bb
packages/dillo/dillo2_0.6.6.bb
packages/freesmartphone/python-ophoned_git.bb
packages/freesmartphone/zhone_git.bb
packages/ipaq-sleep/ipaq-sleep_0.9.bb
packages/linux/linux-2.6.24/ts72xx/ts72xx-rs485.patch
packages/linux/linux-omap2-git/beagleboard/defconfig
packages/linux/linux-omap2_git.bb
packages/linux/linux_2.6.24.bb
packages/openssl/openssl-0.9.8g/debian.patch
packages/openssl/openssl-native_0.9.7m.bb
packages/openssl/openssl-native_0.9.8g.bb
packages/openssl/openssl.inc
packages/openssl/openssl_0.9.8g.bb
Diffs:
#
# mt diff -r6f7c6c0d226901d61dbd149693b1d376efe3b4d2 -r2b6778e1634a75fcf4e15e2d5625eb2429054d0a
#
#
#
# add_file "packages/gettext/gettext-0.14.1/linklib_from_0.17.patch"
# content [2c7c2af754692bd64cb23395724103e9ef59d60e]
#
# patch "packages/gettext/gettext-native_0.14.1.bb"
# from [5573b70e6cbee4dc9639ecbef5e47e8c411d325c]
# to [2e903067b552793b23bc96c5ec738ada09f03316]
#
# patch "packages/gettext/gettext_0.14.1.bb"
# from [de52cbbadfde1d2a8520b9e08d233b8c44267b54]
# to [3a0fa051089a75ecb61149ba3b56405116c60bb2]
#
============================================================
--- packages/gettext/gettext-0.14.1/linklib_from_0.17.patch 2c7c2af754692bd64cb23395724103e9ef59d60e
+++ packages/gettext/gettext-0.14.1/linklib_from_0.17.patch 2c7c2af754692bd64cb23395724103e9ef59d60e
@@ -0,0 +1,1131 @@
+Index: gettext-0.14.1/autoconf-lib-link/m4/lib-ld.m4
+===================================================================
+--- gettext-0.14.1.orig/autoconf-lib-link/m4/lib-ld.m4 2008-04-15 14:32:45.000000000 +0100
++++ gettext-0.14.1/autoconf-lib-link/m4/lib-ld.m4 2008-04-15 14:32:47.000000000 +0100
+@@ -1,10 +1,8 @@
+ # lib-ld.m4 serial 3 (gettext-0.13)
+ dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
+-dnl This file is free software, distributed under the terms of the GNU
+-dnl General Public License. As a special exception to the GNU General
+-dnl Public License, this file may be distributed as part of a program
+-dnl that contains a configuration script generated by Autoconf, under
+-dnl the same distribution terms as the rest of that program.
++dnl This file is free software; the Free Software Foundation
++dnl gives unlimited permission to copy and/or distribute it,
++dnl with or without modifications, as long as this notice is preserved.
+
+ dnl Subroutines of libtool.m4,
+ dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
+Index: gettext-0.14.1/autoconf-lib-link/m4/lib-link.m4
+===================================================================
+--- gettext-0.14.1.orig/autoconf-lib-link/m4/lib-link.m4 2008-04-15 14:32:45.000000000 +0100
++++ gettext-0.14.1/autoconf-lib-link/m4/lib-link.m4 2008-04-15 14:32:47.000000000 +0100
+@@ -1,17 +1,19 @@
+-# lib-link.m4 serial 4 (gettext-0.12)
+-dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
+-dnl This file is free software, distributed under the terms of the GNU
+-dnl General Public License. As a special exception to the GNU General
+-dnl Public License, this file may be distributed as part of a program
+-dnl that contains a configuration script generated by Autoconf, under
+-dnl the same distribution terms as the rest of that program.
++# lib-link.m4 serial 13 (gettext-0.17)
++dnl Copyright (C) 2001-2007 Free Software Foundation, Inc.
++dnl This file is free software; the Free Software Foundation
++dnl gives unlimited permission to copy and/or distribute it,
++dnl with or without modifications, as long as this notice is preserved.
+
+ dnl From Bruno Haible.
+
++AC_PREREQ(2.54)
++
+ dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
+ dnl the libraries corresponding to explicit and implicit dependencies.
+ dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
+ dnl augments the CPPFLAGS variable.
++dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
++dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
+ AC_DEFUN([AC_LIB_LINKFLAGS],
+ [
+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+@@ -24,13 +26,16 @@
+ ac_cv_lib[]Name[]_libs="$LIB[]NAME"
+ ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
+ ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
++ ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX"
+ ])
+ LIB[]NAME="$ac_cv_lib[]Name[]_libs"
+ LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
+ INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
++ LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix"
+ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
+ AC_SUBST([LIB]NAME)
+ AC_SUBST([LTLIB]NAME)
++ AC_SUBST([LIB]NAME[_PREFIX])
+ dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
+ dnl results of this search when this library appears as a dependency.
+ HAVE_LIB[]NAME=yes
+@@ -46,6 +51,8 @@
+ dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
+ dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
+ dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
++dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
++dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
+ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
+ [
+ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+@@ -82,19 +89,27 @@
+ CPPFLAGS="$ac_save_CPPFLAGS"
+ LIB[]NAME=
+ LTLIB[]NAME=
++ LIB[]NAME[]_PREFIX=
+ fi
+ AC_SUBST([HAVE_LIB]NAME)
+ AC_SUBST([LIB]NAME)
+ AC_SUBST([LTLIB]NAME)
++ AC_SUBST([LIB]NAME[_PREFIX])
+ undefine([Name])
+ undefine([NAME])
+ ])
+
+ dnl Determine the platform dependent parameters needed to use rpath:
+-dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
+-dnl hardcode_direct, hardcode_minus_L.
++dnl acl_libext,
++dnl acl_shlibext,
++dnl acl_hardcode_libdir_flag_spec,
++dnl acl_hardcode_libdir_separator,
++dnl acl_hardcode_direct,
++dnl acl_hardcode_minus_L.
+ AC_DEFUN([AC_LIB_RPATH],
+ [
++ dnl Tell automake >= 1.10 to complain if config.rpath is missing.
++ m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
+ AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS
+ AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
+@@ -107,12 +122,14 @@
+ acl_cv_rpath=done
+ ])
+ wl="$acl_cv_wl"
+- libext="$acl_cv_libext"
+- shlibext="$acl_cv_shlibext"
+- hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+- hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+- hardcode_direct="$acl_cv_hardcode_direct"
+- hardcode_minus_L="$acl_cv_hardcode_minus_L"
++ acl_libext="$acl_cv_libext"
++ acl_shlibext="$acl_cv_shlibext"
++ acl_libname_spec="$acl_cv_libname_spec"
++ acl_library_names_spec="$acl_cv_library_names_spec"
++ acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
++ acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
++ acl_hardcode_direct="$acl_cv_hardcode_direct"
++ acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
+ dnl Determine whether the user wants rpath handling at all.
+ AC_ARG_ENABLE(rpath,
+ [ --disable-rpath do not hardcode runtime library paths],
+@@ -122,19 +139,24 @@
+ dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
+ dnl the libraries corresponding to explicit and implicit dependencies.
+ dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
++dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found
++dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
+ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+ [
++ AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
+ define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
++ dnl Autoconf >= 2.61 supports dots in --with options.
++ define([N_A_M_E],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit([$1],[.],[_])],[$1])])
+ dnl By default, look in $includedir and $libdir.
+ use_additional=yes
+ AC_LIB_WITH_FINAL_PREFIX([
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+ ])
+- AC_LIB_ARG_WITH([lib$1-prefix],
+-[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib
+- --without-lib$1-prefix don't search for lib$1 in includedir and libdir],
++ AC_LIB_ARG_WITH([lib]N_A_M_E[-prefix],
++[ --with-lib]N_A_M_E[-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib
++ --without-lib]N_A_M_E[-prefix don't search for lib$1 in includedir and libdir],
+ [
+ if test "X$withval" = "Xno"; then
+ use_additional=no
+@@ -146,7 +168,7 @@
+ ])
+ else
+ additional_includedir="$withval/include"
+- additional_libdir="$withval/lib"
++ additional_libdir="$withval/$acl_libdirstem"
+ fi
+ fi
+ ])
+@@ -155,6 +177,7 @@
+ LIB[]NAME=
+ LTLIB[]NAME=
+ INC[]NAME=
++ LIB[]NAME[]_PREFIX=
+ rpathdirs=
+ ltrpathdirs=
+ names_already_handled=
+@@ -194,22 +217,55 @@
+ found_la=
+ found_so=
+ found_a=
++ eval libname=\"$acl_libname_spec\" # typically: libname=lib$name
++ if test -n "$acl_shlibext"; then
++ shrext=".$acl_shlibext" # typically: shrext=.so
++ else
++ shrext=
++ fi
+ if test $use_additional = yes; then
+- if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
+- found_dir="$additional_libdir"
+- found_so="$additional_libdir/lib$name.$shlibext"
+- if test -f "$additional_libdir/lib$name.la"; then
+- found_la="$additional_libdir/lib$name.la"
+- fi
+- else
+- if test -f "$additional_libdir/lib$name.$libext"; then
+- found_dir="$additional_libdir"
+- found_a="$additional_libdir/lib$name.$libext"
+- if test -f "$additional_libdir/lib$name.la"; then
+- found_la="$additional_libdir/lib$name.la"
++ dir="$additional_libdir"
++ dnl The same code as in the loop below:
++ dnl First look for a shared library.
++ if test -n "$acl_shlibext"; then
++ if test -f "$dir/$libname$shrext"; then
++ found_dir="$dir"
++ found_so="$dir/$libname$shrext"
++ else
++ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
++ ver=`(cd "$dir" && \
++ for f in "$libname$shrext".*; do echo "$f"; done \
++ | sed -e "s,^$libname$shrext\\\\.,," \
++ | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
++ | sed 1q ) 2>/dev/null`
++ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
++ found_dir="$dir"
++ found_so="$dir/$libname$shrext.$ver"
++ fi
++ else
++ eval library_names=\"$acl_library_names_spec\"
++ for f in $library_names; do
++ if test -f "$dir/$f"; then
++ found_dir="$dir"
++ found_so="$dir/$f"
++ break
++ fi
++ done
+ fi
+ fi
+ fi
++ dnl Then look for a static library.
++ if test "X$found_dir" = "X"; then
++ if test -f "$dir/$libname.$acl_libext"; then
++ found_dir="$dir"
++ found_a="$dir/$libname.$acl_libext"
++ fi
++ fi
++ if test "X$found_dir" != "X"; then
++ if test -f "$dir/$libname.la"; then
++ found_la="$dir/$libname.la"
++ fi
++ fi
+ fi
+ if test "X$found_dir" = "X"; then
+ for x in $LDFLAGS $LTLIB[]NAME; do
+@@ -217,21 +273,46 @@
+ case "$x" in
+ -L*)
+ dir=`echo "X$x" | sed -e 's/^X-L//'`
+- if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
+- found_dir="$dir"
+- found_so="$dir/lib$name.$shlibext"
+- if test -f "$dir/lib$name.la"; then
+- found_la="$dir/lib$name.la"
+- fi
+- else
+- if test -f "$dir/lib$name.$libext"; then
++ dnl First look for a shared library.
++ if test -n "$acl_shlibext"; then
++ if test -f "$dir/$libname$shrext"; then
+ found_dir="$dir"
+- found_a="$dir/lib$name.$libext"
+- if test -f "$dir/lib$name.la"; then
+- found_la="$dir/lib$name.la"
++ found_so="$dir/$libname$shrext"
++ else
++ if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
++ ver=`(cd "$dir" && \
++ for f in "$libname$shrext".*; do echo "$f"; done \
++ | sed -e "s,^$libname$shrext\\\\.,," \
++ | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
++ | sed 1q ) 2>/dev/null`
++ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
++ found_dir="$dir"
++ found_so="$dir/$libname$shrext.$ver"
++ fi
++ else
++ eval library_names=\"$acl_library_names_spec\"
++ for f in $library_names; do
++ if test -f "$dir/$f"; then
++ found_dir="$dir"
++ found_so="$dir/$f"
++ break
++ fi
++ done
+ fi
+ fi
+ fi
++ dnl Then look for a static library.
++ if test "X$found_dir" = "X"; then
++ if test -f "$dir/$libname.$acl_libext"; then
++ found_dir="$dir"
++ found_a="$dir/$libname.$acl_libext"
++ fi
++ fi
++ if test "X$found_dir" != "X"; then
++ if test -f "$dir/$libname.la"; then
++ found_la="$dir/$libname.la"
++ fi
++ fi
+ ;;
+ esac
+ if test "X$found_dir" != "X"; then
+@@ -246,7 +327,7 @@
+ dnl Linking with a shared library. We attempt to hardcode its
+ dnl directory into the executable's runpath, unless it's the
+ dnl standard /usr/lib.
+- if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
++ if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
+ dnl No hardcoding is needed.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+ else
+@@ -265,12 +346,12 @@
+ ltrpathdirs="$ltrpathdirs $found_dir"
+ fi
+ dnl The hardcoding into $LIBNAME is system dependent.
+- if test "$hardcode_direct" = yes; then
++ if test "$acl_hardcode_direct" = yes; then
+ dnl Using DIR/libNAME.so during linking hardcodes DIR into the
+ dnl resulting binary.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+ else
+- if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
++ if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+ dnl Use an explicit option to hardcode DIR into the resulting
+ dnl binary.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+@@ -301,13 +382,13 @@
+ if test -z "$haveit"; then
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
+ fi
+- if test "$hardcode_minus_L" != no; then
++ if test "$acl_hardcode_minus_L" != no; then
+ dnl FIXME: Not sure whether we should use
+ dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
+ dnl here.
+ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+ else
+- dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
++ dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH
+ dnl here, because this doesn't fit in flags passed to%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rbbe1f43b109ad4a796a0fb8e5edee36e28a20276 -r2b6778e1634a75fcf4e15e2d5625eb2429054d0a
#
#
#
# delete "packages/linux/linux-omap2-git/beagleboard/0001-board-omap3beagle-fix-merge-damage-in-RTC-code.patch"
#
# delete "packages/linux/linux-omap2-git/beagleboard/0001-omap3beagle-add-driver-to-turn-on-the-TFP410-framer.patch"
#
# delete "packages/linux/linux-omap2-git/beagleboard/l2-cache.patch"
#
# delete "packages/linux/linux-omap2-git/beagleboard/usb-timout.patch"
#
# add_dir "packages/bitlbee"
#
# add_dir "packages/bitlbee/files"
#
# add_dir "packages/freesmartphone/python-ousaged"
#
# add_dir "packages/freesmartphone/zhone"
#
# add_file "packages/bitlbee/bitlbee_1.0.4.bb"
# content [2d002b5029deb10855521e57f2217dafe30ccf11]
#
# add_file "packages/bitlbee/files/configure.patch"
# content [37fda3e3363eb37a6adf06b7248897ce9a1210bf]
#
# add_file "packages/bitlbee/files/init-script"
# content [7a96fdac2d2c3c1ee4ef10bc69e941a0f3bc3f44]
#
# add_file "packages/dillo/dillo2-0.6.6/dillo2-gcc4.patch"
# content [202c5030197c77a7e591f45e2c3c1f1c64514008]
#
# add_file "packages/freesmartphone/python-ophoned/ophoned"
# content [04ac655816cc1bcffc208b9a49671a917fa078eb]
#
# add_file "packages/freesmartphone/python-ousaged/ousaged"
# content [c51f4851c9816bae9c38bbb52a7ae117ae697d0f]
#
# add_file "packages/freesmartphone/python-ousaged_git.bb"
# content [7e85950cc2cc762a57a6e4933d57332db89c97f4]
#
# add_file "packages/freesmartphone/zhone/80zhone"
# content [9ff83a5124c6c03330a51793cd6cf90e486b185e]
#
# add_file "packages/images/fso-image.bb"
# content [e842729f8da66c4407499fe16327a5107ca1895d]
#
# add_file "packages/linux/linux-2.6.24/ts72xx/ep93xx-eth-phylib-framework.patch"
# content [99af35319f6b2016811c7992eb22244ef90a0026]
#
# patch "classes/oestats-client.bbclass"
# from [c9260fde7f5ef0dc89229f308c6ec355d98efd23]
# to [a710c44a7f932fd458136ca8079856a4b2962a61]
#
# patch "conf/distro/include/fso-autorev.inc"
# from [f9276705864b02b4689fddd0fdbfb8f5ce705e91]
# to [1bd8343974f0b1a558fc8a74c6c3960c49fafd3e]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [2cff5a66720adf7279a2d1efa08468aa48d8a0d0]
# to [8ab516eb346939396ae72444623b5b352271c190]
#
# patch "packages/avahi/avahi-python_0.6.21.bb"
# from [91ec6e3aec765ad2c28ed09baa8424126d0b5baa]
# to [61691bf795fcb5502b22b55588066bb9405d0d9f]
#
# patch "packages/avahi/avahi-ui_0.6.21.bb"
# from [e412222da63522fb4d3b04fc8d646bf516526c50]
# to [8a306168cac64bd46961428b3e2bab662fb8ef34]
#
# patch "packages/avahi/avahi.inc"
# from [3e4dfba2b48cd49083cfa3aa95d9a06656feebda]
# to [4fa00bfeab78501b5f96381ad7362170b9b43670]
#
# patch "packages/avahi/avahi_0.6.19.bb"
# from [80d86f2e2b46546f508edb4d277fa1ef7bceb3b7]
# to [b79ad80e97d4543f28d1a53c5b017057371d031f]
#
# patch "packages/avahi/avahi_0.6.20.bb"
# from [617eee50014403513ca14be25fd16c61c19bac14]
# to [b79ad80e97d4543f28d1a53c5b017057371d031f]
#
# patch "packages/avahi/avahi_0.6.21.bb"
# from [0c0e3bca847dc2a17de283ac8228facff54df0ab]
# to [26918362d7839d99e5016a6b67015a2f5e442910]
#
# patch "packages/avahi/avahi_0.6.22.bb"
# from [f286a6ffada3390d2b72ee15d958159d8547d3b1]
# to [7cc7310ab622a94d9c9df777edca8e64664ab30d]
#
# patch "packages/dillo/dillo2_0.6.6.bb"
# from [4af6de83b3689bac200b30de963eee3f08d233a4]
# to [bb11f1c4f78265b997d5349730d44e6214a83106]
#
# patch "packages/freesmartphone/python-ophoned_git.bb"
# from [c3a23270719f3ed39a3432f18c7e5dd0ad4b8847]
# to [e858c518c17070ad938fb291af8a6bd7474d439c]
#
# patch "packages/freesmartphone/zhone_git.bb"
# from [be991be982f74c721ed53468671e7ecce2218df4]
# to [d0d277f5c32f22996b96396481571321668f1dc1]
#
# patch "packages/ipaq-sleep/ipaq-sleep_0.9.bb"
# from [c0035c4957bce898f34f3281aa0a918dc2263f38]
# to [01b62a93ba7e8b0fc7677b1262d8ceef98c78777]
#
# patch "packages/linux/linux-2.6.24/ts72xx/ts72xx-rs485.patch"
# from [bf8b5960a3374edaa12ff48191b73f12ed963a98]
# to [4ffc457e9040af36e18d46516d9cbb85b1fb8165]
#
# patch "packages/linux/linux-omap2-git/beagleboard/defconfig"
# from [6858cc66b2653f490febf14da821d7bb22f86de1]
# to [a85580d79b52077d3a62b921dea5d7de0827ff0d]
#
# patch "packages/linux/linux-omap2_git.bb"
# from [ff28a88cc78eaf1d0a39ca0bedaa3aeb4c0f30fb]
# to [a05dfd66bdd95a25bffd9f9ea592f03165e7321e]
#
# patch "packages/linux/linux_2.6.24.bb"
# from [d00d1d26eff1df7f8f4b4e251972025636b93a0a]
# to [63875a6eee8aa238e6c6d0365c05c542648d6549]
#
# patch "packages/openssl/openssl-0.9.8g/debian.patch"
# from [e2524f821f3c1693aabb548a7c6c9cfac5a7a56b]
# to [c1328d956d529b0b900a5be54a395f7c64290adc]
#
# patch "packages/openssl/openssl-native_0.9.7m.bb"
# from [a7e810d1f91585491c6c3f0f1404c6fef062ee5c]
# to [69af4325c51cf9c0e85833785b2726217c47ae07]
#
# patch "packages/openssl/openssl-native_0.9.8g.bb"
# from [2ca0e07e42caa326c5ec3f9611fdd2def25638a8]
# to [4fbbb75fff6aebc9aa3c130e2452f2c0296326c0]
#
# patch "packages/openssl/openssl.inc"
# from [936b80ecc8f702aae977abc2f0c764a83f99493a]
# to [e90c4b9d90061ead6c183227dd8d78a8c4ee9b9c]
#
# patch "packages/openssl/openssl_0.9.8g.bb"
# from [c4ef5c341f4702a94b6ff131484ec85914e162f4]
# to [75c5c189365287e96a0122de43437e6f3b548076]
#
============================================================
--- packages/bitlbee/bitlbee_1.0.4.bb 2d002b5029deb10855521e57f2217dafe30ccf11
+++ packages/bitlbee/bitlbee_1.0.4.bb 2d002b5029deb10855521e57f2217dafe30ccf11
@@ -0,0 +1,59 @@
+DESCRIPTION = "Bitlbee is an IRC to IM gateway that support multiple IM protocols."
+HOMEPAGE = "http://www.bitlbee.org/"
+SECTION = "console/network"
+LICENSE = "GPLv2"
+DEPENDS = "glib-2.0 gnutls"
+PR = "r0"
+
+SRC_URI = "http://get.bitlbee.org/src/${P}.tar.gz \
+ file://configure.patch;patch=1 \
+ file://init-script"
+
+S = "${WORKDIR}/bitlbee-${PV}"
+
+EXTRA_OECONF = "--prefix=/usr \
+ --datadir=/usr/share/bitlbee \
+ --etcdir=/etc/bitlbee \
+ --oscar=0 \
+ --cpu=${TARGET_ARCH}"
+
+do_configure () {
+ # NOTE: bitlbee's configure script is not an autotool creation,
+ # so we do not use the default autotools_do_configure.
+ ./configure ${EXTRA_OECONF} || die "./configure failed"
+}
+
+do_compile () {
+ make CC="${CC}" LD="${LD}" || die "make failed"
+
+ # make bitlbeed forking server
+ cd ${S}/utils
+ ${CC} bitlbeed.c -o bitlbeed || die "bitlbeed failed to compile"
+}
+
+do_install () {
+ # install bitlbee
+ install -d ${D}${localstatedir}/lib/bitlbee
+ make install DESTDIR=${D} || die "install failed"
+ make install-etc DESTDIR=${D} || die "install failed"
+
+ # copy bitlbee forking server
+ install ${S}/utils/bitlbeed ${D}${sbindir}/bitlbeed
+
+ # copy init script
+ install -d ${D}${sysconfdir}/init.d
+ install ${WORKDIR}/init-script ${D}${sysconfdir}/init.d/bitlbee
+ sed -i -e "s:BITLBEED_EXEC:${sbindir}/bitlbeed:" ${D}${sysconfdir}/init.d/bitlbee
+ sed -i -e "s:BITLBEED_OPTS::" ${D}${sysconfdir}/init.d/bitlbee
+
+ # copy bitlbee utils
+ install -d ${D}${datadir}/bitlbee
+ cp ${S}/utils/* ${D}${datadir}/bitlbee/
+ rm ${D}${datadir}/bitlbee/bitlbeed*
+}
+
+pkg_postinst () {
+ chown nobody:nogroup ${localstatedir}/lib/bitlbee
+ chmod 700 ${localstatedir}/lib/bitlbee
+}
+
============================================================
--- packages/bitlbee/files/configure.patch 37fda3e3363eb37a6adf06b7248897ce9a1210bf
+++ packages/bitlbee/files/configure.patch 37fda3e3363eb37a6adf06b7248897ce9a1210bf
@@ -0,0 +1,21 @@
+--- bitlbee/configure.orig 2006-11-25 13:01:16.000000000 +0100
++++ bitlbee/configure 2006-11-25 13:09:19.000000000 +0100
+@@ -57,6 +57,9 @@
+
+ --ssl=... SSL library to use (gnutls, nss, openssl, bogus, auto)
+ $ssl
++
++--arch=... The target architecture $arch
++--cpu=... The target cpu $cpu
+ EOF
+ exit;
+ fi
+@@ -366,6 +369,8 @@
+ ;;
+ esac
+
++echo Cpu: $cpu
++
+ echo
+ echo 'Configuration done:'
+
============================================================
--- packages/bitlbee/files/init-script 7a96fdac2d2c3c1ee4ef10bc69e941a0f3bc3f44
+++ packages/bitlbee/files/init-script 7a96fdac2d2c3c1ee4ef10bc69e941a0f3bc3f44
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+case "$1" in
+ start)
+ echo "Starting bitlbee daemon"
+ start-stop-daemon --start --startas BITLBEED_EXEC \
+ -c nobody:nogroup --exec BITLBEED_EXEC -- \
+ BITLBEED_OPTS /usr/sbin/bitlbee
+ [ $? -eq 0 ] || echo $? "Failed to start bitlbee daemon"
+ ;;
+
+ stop)
+ echo "Stopping bitlbee daemon"
+ start-stop-daemon --stop --signal 9 \
+ --exec BITLBEED_EXEC
+ [ $? -eq 0 ] || echo $? "Failed to stop bitlbee daemon"
+ ;;
+
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+
+ *)
+ echo "usage: $0 { start | stop }"
+ exit 1
+ ;;
+esac
+
+exit 0
============================================================
--- packages/dillo/dillo2-0.6.6/dillo2-gcc4.patch 202c5030197c77a7e591f45e2c3c1f1c64514008
+++ packages/dillo/dillo2-0.6.6/dillo2-gcc4.patch 202c5030197c77a7e591f45e2c3c1f1c64514008
@@ -0,0 +1,27 @@
+diff -Naur dillo-0.6.6-orig/src/dw_table.c dillo-0.6.6/src/dw_table.c
+--- dillo-0.6.6-orig/src/dw_table.c 2007-03-22 22:46:10.000000000 +0100
++++ dillo-0.6.6/src/dw_table.c 2007-03-22 22:48:57.000000000 +0100
+@@ -1177,7 +1177,10 @@
+ sub_extr_width = rest_w * cols_per_sub / rest_n;
+ rest_w -= sub_extr_width;
+ rest_n -= cols_per_sub;
+- EXTR_VALUE (sub_extremes[i]) = sub_extr_width;
++ if(max)
++ sub_extremes[i].max_width = sub_extr_width;
++ else
++ sub_extremes[i].min_width = sub_extr_width;
+ }
+ }
+ } else {
+@@ -1196,7 +1199,10 @@
+ delta = rest_w * EXTR_VALUE (sub_extremes[i]) / rest_n;
+ rest_w -= delta;
+ rest_n -= EXTR_VALUE (sub_extremes[i]);
+- EXTR_VALUE (sub_extremes[i]) += delta;
++ if(max)
++ sub_extremes[i].max_width += delta;
++ else
++ sub_extremes[i].min_width += delta;
+ }
+ DEBUG_MSG (DEBUG_WIDTH_LEVEL + 2, "%d\n",
+ EXTR_VALUE (sub_extremes[i]));
============================================================
--- packages/freesmartphone/python-ophoned/ophoned 04ac655816cc1bcffc208b9a49671a917fa078eb
+++ packages/freesmartphone/python-ophoned/ophoned 04ac655816cc1bcffc208b9a49671a917fa078eb
@@ -0,0 +1,40 @@
+#! /bin/sh
+#
+# ophoned This shell script starts and stops the open phone daemon.
+#
+# chkconfig: 345 90 20
+# description: py-ophoned is the open phone daemon
+# processname: python
+
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+NAME=ophoned
+
+[ -f /etc/default/rcS ] && . /etc/default/rcS
+
+case "$1" in
+ start)
+ echo -n "Starting open phone daemon: "
+ start-stop-daemon --start --pidfile /var/run/${NAME}.pid --make-pidfile --background -x /usr/bin/ophoned
+ if [ $? = 0 ]; then
+ echo "(ok)"
+ else
+ echo "(failed)"
+ fi
+ ;;
+ stop)
+ echo -n "Stopping open phone daemon: "
+ start-stop-daemon --stop --pidfile /var/run/${NAME}.pid --oknodo
+ rm -f /var/run/${NAME}.pid
+ echo "(done)"
+ ;;
+ restart|force-reload)
+ $0 stop
+ $0 start
+ ;;
+ *)
+ echo "Usage: /etc/init.d/ophoned {start|stop|restart|force-reload}"
+ exit 1
+ ;;
+esac
+
+exit 0
============================================================
--- packages/freesmartphone/python-ousaged/ousaged c51f4851c9816bae9c38bbb52a7ae117ae697d0f
+++ packages/freesmartphone/python-ousaged/ousaged c51f4851c9816bae9c38bbb52a7ae117ae697d0f
@@ -0,0 +1,40 @@
+#! /bin/sh
+#
+# odeviced This shell script starts and stops the open device daemon.
+#
+# chkconfig: 345 90 20
+# description: py-ousaged is the open usage daemon
+# processname: python
+
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+NAME=odeviced
+
+[ -f /etc/default/rcS ] && . /etc/default/rcS
+
+case "$1" in
+ start)
+ echo -n "Starting open usage daemon: "
+ start-stop-daemon --start --pidfile /var/run/${NAME}.pid --make-pidfile --background -x /usr/bin/ousaged
+ if [ $? = 0 ]; then
+ echo "(ok)"
+ else
+ echo "(failed)"
+ fi
+ ;;
+ stop)
+ echo -n "Stopping open usage daemon: "
+ start-stop-daemon --stop --pidfile /var/run/${NAME}.pid --oknodo
+ rm -f /var/run/${NAME}.pid
+ echo "(done)"
+ ;;
+ restart|force-reload)
+ $0 stop
+ $0 start
+ ;;
+ *)
+ echo "Usage: /etc/init.d/ousaged {start|stop|restart|force-reload}"
+ exit 1
+ ;;
+esac
+
+exit 0
============================================================
--- packages/freesmartphone/python-ousaged_git.bb 7e85950cc2cc762a57a6e4933d57332db89c97f4
+++ packages/freesmartphone/python-ousaged_git.bb 7e85950cc2cc762a57a6e4933d57332db89c97f4
@@ -0,0 +1,36 @@
+DESCRIPTION = "The Open Usage Daemon Prototype in Python"
+HOMEPAGE = "http://www.freesmartphone.org/mediawiki/index.php/Implementations/OpenUsageDaemon"
+AUTHOR = "Michael 'Mickey' Lauer <mlauer at vanille-media.de>"
+SECTION = "console/network"
+DEPENDS = "python-cython-native python-pyrex-native"
+LICENSE = "GPLv2"
+PV = "0.7.9+gitr${SRCREV}"
+PR = "r0"
+
+inherit distutils update-rc.d
+
+INITSCRIPT_NAME = "ousaged"
+INITSCRIPT_PARAMS = "defaults 20"
+
+SRC_URI = "\
+ ${FREESMARTPHONE_GIT}/usaged.git;protocol=git;branch=master \
+ file://ousaged \
+"
+S = "${WORKDIR}/git"
+
+do_install_append() {
+ install -d ${D}${sysconfdir}/init.d/
+ install -m 0755 ${WORKDIR}/ousaged ${D}${sysconfdir}/init.d/
+ install -d ${D}${sysconfdir}/dbus-1/system.d/
+ mv -f ${D}${datadir}/etc/dbus-1/system.d/ousaged.conf ${D}${sysconfdir}/dbus-1/system.d/
+}
+
+RDEPENDS_${PN} += "\
+ python-dbus \
+ python-pygobject \
+ python-pyrtc \
+ python-syslog \
+ python-odeviced \
+"
+
+FILES_${PN} += "${sysconfdir}"
============================================================
--- packages/freesmartphone/zhone/80zhone 9ff83a5124c6c03330a51793cd6cf90e486b185e
+++ packages/freesmartphone/zhone/80zhone 9ff83a5124c6c03330a51793cd6cf90e486b185e
@@ -0,0 +1,4 @@
+#!/bin/sh -e
+zhone --fullscreen > /dev/null 2>&1 &
+renice -3 $!
+exit 0
============================================================
--- packages/images/fso-image.bb e842729f8da66c4407499fe16327a5107ca1895d
+++ packages/images/fso-image.bb e842729f8da66c4407499fe16327a5107ca1895d
@@ -0,0 +1,61 @@
+#------------------------------------------------------
+# freesmartphone.org Image Recipe
+#------------------------------------------------------
+
+IMAGE_LINGUAS = ""
+
+ADD_INSTALL = "\
+ fontconfig-utils \
+ \
+ ttf-dejavu-common \
+ ttf-dejavu-sans \
+ ttf-dejavu-serif \
+ \
+"
+
+MICKEY_INSTALL = "\
+ htop \
+ mickeyterm \
+ nano \
+ powertop \
+ s3c24xx-gpio \
+"
+
+ZHONE_INSTALL = "\
+ gsm0710muxd \
+ python-odeviced \
+ python-ophoned \
+ python-ousaged \
+ zhone \
+"
+
+IMAGE_INSTALL = "\
+ ${MACHINE_TASK_PROVIDER} \
+ netbase \
+ sysfsutils \
+ module-init-tools-depmod \
+ rsync \
+ screen \
+ fbset \
+ fbset-modes \
+ \
+ matchbox-wm \
+ ${XSERVER} \
+ xserver-kdrive-common \
+ xserver-nodm-init \
+ xauth \
+ xhost \
+ xset \
+ xrandr \
+ \
+ python-codecs \
+ \
+ ${ADD_INSTALL} \
+ ${MICKEY_INSTALL} \
+ ${ZHONE_INSTALL} \
+"
+
+inherit image
+
+ROOTFS_POSTPROCESS_COMMAND += 'date "+%m%d%H%M%Y" >${IMAGE_ROOTFS}/etc/timestamp'
+
============================================================
--- packages/linux/linux-2.6.24/ts72xx/ep93xx-eth-phylib-framework.patch 99af35319f6b2016811c7992eb22244ef90a0026
+++ packages/linux/linux-2.6.24/ts72xx/ep93xx-eth-phylib-framework.patch 99af35319f6b2016811c7992eb22244ef90a0026
@@ -0,0 +1,548 @@
+Currently, the ep93xx_eth driver doesn't care about the PHY state,
+but it should, in order to tell the MAC when full duplex operation is
+required; failure to do so causes degraded performance on full duplex
+links. This patch implements proper PHY handling via the phylib framework:
+
+ - clean up ep93xx_mdio_{read,write} to conform to ep93xx manual
+ - convert ep93xx_eth driver to phylib framework
+ - set full duplex bit in configurati%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list