From 3a26240e09072ec125f80e3a0131080265a2fac7 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 4 Nov 2009 22:03:23 +0100 Subject: boost 1.36: various ARM fixups: * changed intrinsics patch to work for armv6 and armv7a * disabled atomic ops for arm versions <6 * fix associated build damage * pass in correct gcc version --- recipes/boost/boost-36.inc | 2 +- recipes/boost/boost_1.36.0.bb | 5 ++++- recipes/boost/files/01-no-serialization-test.patch | 12 ++++++++++++ .../boost/files/02-atomic-count-pthreads-on-arm.patch | 17 +++++++++++++++++ .../boost/files/03-exception-clone-destructor-fix.patch | 12 ++++++++++++ recipes/boost/files/arm-intrinsics.patch | 6 +++--- 6 files changed, 49 insertions(+), 5 deletions(-) create mode 100644 recipes/boost/files/01-no-serialization-test.patch create mode 100644 recipes/boost/files/02-atomic-count-pthreads-on-arm.patch create mode 100644 recipes/boost/files/03-exception-clone-destructor-fix.patch diff --git a/recipes/boost/boost-36.inc b/recipes/boost/boost-36.inc index 4bd065f13a..1200e9a5a6 100644 --- a/recipes/boost/boost-36.inc +++ b/recipes/boost/boost-36.inc @@ -128,7 +128,7 @@ BJAM_OPTS = '${BJAM_TOOLS} \ do_configure_prepend() { cp -f boost/config/platform/linux.hpp boost/config/platform/linux-gnueabi.hpp - echo 'using gcc : 4.3.1 : ${CXX} : compileflags -DBOOST_SP_USE_PTHREADS -I${includedir} linkflags -L${libdir} ;' >> ${S}/tools/build/v2/user-config.jam + echo "using gcc : $(${CXX} -dumpversion) : ${CXX} : compileflags -DBOOST_SP_USE_PTHREADS -I${includedir} linkflags -L${libdir} ;" >> ${S}/tools/build/v2/user-config.jam } do_compile() { diff --git a/recipes/boost/boost_1.36.0.bb b/recipes/boost/boost_1.36.0.bb index 140ab290ba..898d1b1603 100644 --- a/recipes/boost/boost_1.36.0.bb +++ b/recipes/boost/boost_1.36.0.bb @@ -1,9 +1,12 @@ include boost-36.inc -PR = "r6" +PR = "r7" SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2 \ file://arm-intrinsics.patch;patch=1 \ + file://01-no-serialization-test.patch;patch=1 \ + file://02-atomic-count-pthreads-on-arm.patch;patch=1 \ + file://03-exception-clone-destructor-fix.patch;patch=1 \ " BJAM_OPTS = '${BJAM_TOOLS} \ diff --git a/recipes/boost/files/01-no-serialization-test.patch b/recipes/boost/files/01-no-serialization-test.patch new file mode 100644 index 0000000000..f1c9ca8572 --- /dev/null +++ b/recipes/boost/files/01-no-serialization-test.patch @@ -0,0 +1,12 @@ +diff -purN orig/libs/serialization/build/Jamfile.v2 boost_1_36_0/libs/serialization/build/Jamfile.v2 +--- orig/libs/serialization/build/Jamfile.v2 2008-09-11 18:45:03.000000000 -0400 ++++ boost_1_36_0/libs/serialization/build/Jamfile.v2 2008-09-11 18:45:40.000000000 -0400 +@@ -8,7 +8,7 @@ + + project boost/serialization + : source-location ../src +- : requirements ../../config/test/all//BOOST_NO_STD_LOCALE ++ : requirements + @include-spirit + ; + diff --git a/recipes/boost/files/02-atomic-count-pthreads-on-arm.patch b/recipes/boost/files/02-atomic-count-pthreads-on-arm.patch new file mode 100644 index 0000000000..c6f2e19685 --- /dev/null +++ b/recipes/boost/files/02-atomic-count-pthreads-on-arm.patch @@ -0,0 +1,17 @@ +diff -purN orig/boost/detail/atomic_count.hpp boost_1_36_0/boost/detail/atomic_count.hpp +--- orig/boost/detail/atomic_count.hpp 2008-09-12 11:48:45.000000000 -0400 ++++ boost_1_36_0/boost/detail/atomic_count.hpp 2008-09-12 14:36:33.000000000 -0400 +@@ -93,6 +93,13 @@ typedef long atomic_count; + + # include + ++#elif defined(BOOST_HAS_PTHREADS) && defined(__arm__) && !defined(__ARM_ARCH_7A__) && !defined(__ARM_ARCH_6J__) ++ ++// MLC: need this on ARM, otherwise it'll attempt to use atomic_count_sync, ++// which has no ARM implementation. ++# define BOOST_AC_USE_PTHREADS ++# include ++ + #elif defined( __GNUC__ ) && ( defined( __i386__ ) || defined( __x86_64__ ) ) + + # include diff --git a/recipes/boost/files/03-exception-clone-destructor-fix.patch b/recipes/boost/files/03-exception-clone-destructor-fix.patch new file mode 100644 index 0000000000..d78759b5e3 --- /dev/null +++ b/recipes/boost/files/03-exception-clone-destructor-fix.patch @@ -0,0 +1,12 @@ +diff -purN orig/boost/exception/enable_current_exception.hpp boost_1_36_0/boost/exception/enable_current_exception.hpp +--- orig/boost/exception/enable_current_exception.hpp 2008-09-12 11:48:45.000000000 -0400 ++++ boost_1_36_0/boost/exception/enable_current_exception.hpp 2008-09-12 15:13:06.000000000 -0400 +@@ -96,6 +96,8 @@ boost + *be1 = *be2; + } + ++ ~exception_clone() throw() { } ++ + private: + + detail::atomic_count mutable count_; diff --git a/recipes/boost/files/arm-intrinsics.patch b/recipes/boost/files/arm-intrinsics.patch index 860b6df67c..1f1eed684a 100644 --- a/recipes/boost/files/arm-intrinsics.patch +++ b/recipes/boost/files/arm-intrinsics.patch @@ -5,7 +5,7 @@ diff -Nurd boost_1_36_0.orig/boost/detail/atomic_count_sync.hpp boost_1_36_0.arm void operator++() { -+#ifdef __ARM_ARCH_7A__ ++#if defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_6J__) + int v1, tmp; + asm volatile ("1: \n\t" + "ldrex %0, %1 \n\t" @@ -22,7 +22,7 @@ diff -Nurd boost_1_36_0.orig/boost/detail/atomic_count_sync.hpp boost_1_36_0.arm long operator--() { -+#ifdef __ARM_ARCH_7A__ ++#if defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_6J__) + int v1, tmp; + asm volatile ("1: \n\t" + "ldrex %0, %1 \n\t" @@ -40,7 +40,7 @@ diff -Nurd boost_1_36_0.orig/boost/detail/atomic_count_sync.hpp boost_1_36_0.arm operator long() const { -+#if __ARM_ARCH_7A__ ++#if defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_6J__) + return value_; +#else return __sync_fetch_and_add( &value_, 0 ); -- cgit v1.2.3 From 11b63303a09583386d2400c8535282fc0a76bf39 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 4 Nov 2009 22:05:17 +0100 Subject: asio: bump PR to get boost fixes --- recipes/asio/asio_1.1.1.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/asio/asio_1.1.1.bb b/recipes/asio/asio_1.1.1.bb index a724921676..e0b610d8c9 100644 --- a/recipes/asio/asio_1.1.1.bb +++ b/recipes/asio/asio_1.1.1.bb @@ -4,6 +4,8 @@ SECTION = "libs" PRIORITY = "optional" LICENSE = "Boost Software License" +PR = "r1" + DEPENDS = "boost" SRC_URI = "${SOURCEFORGE_MIRROR}/asio/${PN}-${PV}.tar.bz2" -- cgit v1.2.3 From 276e2fbec4e59eab3169f8fe55eab45e48883cb6 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Wed, 4 Nov 2009 21:33:42 +0000 Subject: linux-rp-2.6.26 for spitz and akita: Added netfilter support. Disabled two deprecated networking options. --- recipes/linux/linux-rp-2.6.26/defconfig-akita | 49 ++++++++++++++++++++++++--- recipes/linux/linux-rp-2.6.26/defconfig-spitz | 49 ++++++++++++++++++++++++--- recipes/linux/linux-rp_2.6.26.bb | 2 +- 3 files changed, 91 insertions(+), 9 deletions(-) diff --git a/recipes/linux/linux-rp-2.6.26/defconfig-akita b/recipes/linux/linux-rp-2.6.26/defconfig-akita index f863b28483..a8308e92e8 100644 --- a/recipes/linux/linux-rp-2.6.26/defconfig-akita +++ b/recipes/linux/linux-rp-2.6.26/defconfig-akita @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.26 -# Tue Feb 3 01:08:10 2009 +# Tue Nov 3 13:06:26 2009 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -330,7 +330,7 @@ CONFIG_IP_FIB_HASH=y # CONFIG_NET_IPIP is not set # CONFIG_NET_IPGRE is not set # CONFIG_ARPD is not set -CONFIG_SYN_COOKIES=y +# CONFIG_SYN_COOKIES is not set # CONFIG_INET_AH is not set # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set @@ -376,21 +376,44 @@ CONFIG_NETFILTER_ADVANCED=y # # CONFIG_NETFILTER_NETLINK_QUEUE is not set # CONFIG_NETFILTER_NETLINK_LOG is not set -# CONFIG_NF_CONNTRACK is not set +CONFIG_NF_CONNTRACK=m +# CONFIG_NF_CT_ACCT is not set +# CONFIG_NF_CONNTRACK_MARK is not set +# CONFIG_NF_CONNTRACK_EVENTS is not set +# CONFIG_NF_CT_PROTO_DCCP is not set +# CONFIG_NF_CT_PROTO_SCTP is not set +# CONFIG_NF_CT_PROTO_UDPLITE is not set +# CONFIG_NF_CONNTRACK_AMANDA is not set +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_H323=m +CONFIG_NF_CONNTRACK_IRC=m +# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set +# CONFIG_NF_CONNTRACK_PPTP is not set +# CONFIG_NF_CONNTRACK_SANE is not set +CONFIG_NF_CONNTRACK_SIP=m +# CONFIG_NF_CONNTRACK_TFTP is not set +# CONFIG_NF_CT_NETLINK is not set CONFIG_NETFILTER_XTABLES=m # CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set +# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set # CONFIG_NETFILTER_XT_TARGET_DSCP is not set # CONFIG_NETFILTER_XT_TARGET_MARK is not set # CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set +# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set # CONFIG_NETFILTER_XT_TARGET_RATEEST is not set # CONFIG_NETFILTER_XT_TARGET_TRACE is not set # CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set # CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set # CONFIG_NETFILTER_XT_MATCH_COMMENT is not set +# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set +# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set +# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set +# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set # CONFIG_NETFILTER_XT_MATCH_DCCP is not set # CONFIG_NETFILTER_XT_MATCH_DSCP is not set # CONFIG_NETFILTER_XT_MATCH_ESP is not set +# CONFIG_NETFILTER_XT_MATCH_HELPER is not set # CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set # CONFIG_NETFILTER_XT_MATCH_LENGTH is not set # CONFIG_NETFILTER_XT_MATCH_LIMIT is not set @@ -404,6 +427,7 @@ CONFIG_NETFILTER_XTABLES=m # CONFIG_NETFILTER_XT_MATCH_RATEEST is not set # CONFIG_NETFILTER_XT_MATCH_REALM is not set # CONFIG_NETFILTER_XT_MATCH_SCTP is not set +# CONFIG_NETFILTER_XT_MATCH_STATE is not set # CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set # CONFIG_NETFILTER_XT_MATCH_STRING is not set # CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set @@ -414,7 +438,9 @@ CONFIG_NETFILTER_XTABLES=m # # IP: Netfilter Configuration # -CONFIG_IP_NF_QUEUE=m +CONFIG_NF_CONNTRACK_IPV4=m +CONFIG_NF_CONNTRACK_PROC_COMPAT=y +# CONFIG_IP_NF_QUEUE is not set CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_MATCH_RECENT=m CONFIG_IP_NF_MATCH_ECN=m @@ -425,9 +451,23 @@ CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_LOG=m CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +# CONFIG_NF_NAT_TFTP is not set +# CONFIG_NF_NAT_AMANDA is not set +# CONFIG_NF_NAT_PPTP is not set +CONFIG_NF_NAT_H323=m +CONFIG_NF_NAT_SIP=m CONFIG_IP_NF_MANGLE=m CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_TTL=m +# CONFIG_IP_NF_TARGET_CLUSTERIP is not set CONFIG_IP_NF_RAW=m CONFIG_IP_NF_ARPTABLES=m CONFIG_IP_NF_ARPFILTER=m @@ -436,6 +476,7 @@ CONFIG_IP_NF_ARP_MANGLE=m # # IPv6: Netfilter Configuration # +# CONFIG_NF_CONNTRACK_IPV6 is not set # CONFIG_IP6_NF_QUEUE is not set # CONFIG_IP6_NF_IPTABLES is not set # CONFIG_IP_DCCP is not set diff --git a/recipes/linux/linux-rp-2.6.26/defconfig-spitz b/recipes/linux/linux-rp-2.6.26/defconfig-spitz index fd2285d4fb..f4a2739b22 100644 --- a/recipes/linux/linux-rp-2.6.26/defconfig-spitz +++ b/recipes/linux/linux-rp-2.6.26/defconfig-spitz @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.26 -# Tue Feb 3 01:16:06 2009 +# Tue Nov 3 13:06:26 2009 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -330,7 +330,7 @@ CONFIG_IP_FIB_HASH=y # CONFIG_NET_IPIP is not set # CONFIG_NET_IPGRE is not set # CONFIG_ARPD is not set -CONFIG_SYN_COOKIES=y +# CONFIG_SYN_COOKIES is not set # CONFIG_INET_AH is not set # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set @@ -376,21 +376,44 @@ CONFIG_NETFILTER_ADVANCED=y # # CONFIG_NETFILTER_NETLINK_QUEUE is not set # CONFIG_NETFILTER_NETLINK_LOG is not set -# CONFIG_NF_CONNTRACK is not set +CONFIG_NF_CONNTRACK=m +# CONFIG_NF_CT_ACCT is not set +# CONFIG_NF_CONNTRACK_MARK is not set +# CONFIG_NF_CONNTRACK_EVENTS is not set +# CONFIG_NF_CT_PROTO_DCCP is not set +# CONFIG_NF_CT_PROTO_SCTP is not set +# CONFIG_NF_CT_PROTO_UDPLITE is not set +# CONFIG_NF_CONNTRACK_AMANDA is not set +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_H323=m +CONFIG_NF_CONNTRACK_IRC=m +# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set +# CONFIG_NF_CONNTRACK_PPTP is not set +# CONFIG_NF_CONNTRACK_SANE is not set +CONFIG_NF_CONNTRACK_SIP=m +# CONFIG_NF_CONNTRACK_TFTP is not set +# CONFIG_NF_CT_NETLINK is not set CONFIG_NETFILTER_XTABLES=m # CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set +# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set # CONFIG_NETFILTER_XT_TARGET_DSCP is not set # CONFIG_NETFILTER_XT_TARGET_MARK is not set # CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set +# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set # CONFIG_NETFILTER_XT_TARGET_RATEEST is not set # CONFIG_NETFILTER_XT_TARGET_TRACE is not set # CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set # CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set # CONFIG_NETFILTER_XT_MATCH_COMMENT is not set +# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set +# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set +# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set +# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set # CONFIG_NETFILTER_XT_MATCH_DCCP is not set # CONFIG_NETFILTER_XT_MATCH_DSCP is not set # CONFIG_NETFILTER_XT_MATCH_ESP is not set +# CONFIG_NETFILTER_XT_MATCH_HELPER is not set # CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set # CONFIG_NETFILTER_XT_MATCH_LENGTH is not set # CONFIG_NETFILTER_XT_MATCH_LIMIT is not set @@ -404,6 +427,7 @@ CONFIG_NETFILTER_XTABLES=m # CONFIG_NETFILTER_XT_MATCH_RATEEST is not set # CONFIG_NETFILTER_XT_MATCH_REALM is not set # CONFIG_NETFILTER_XT_MATCH_SCTP is not set +# CONFIG_NETFILTER_XT_MATCH_STATE is not set # CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set # CONFIG_NETFILTER_XT_MATCH_STRING is not set # CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set @@ -414,7 +438,9 @@ CONFIG_NETFILTER_XTABLES=m # # IP: Netfilter Configuration # -CONFIG_IP_NF_QUEUE=m +CONFIG_NF_CONNTRACK_IPV4=m +CONFIG_NF_CONNTRACK_PROC_COMPAT=y +# CONFIG_IP_NF_QUEUE is not set CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_MATCH_RECENT=m CONFIG_IP_NF_MATCH_ECN=m @@ -425,9 +451,23 @@ CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_LOG=m CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +# CONFIG_NF_NAT_TFTP is not set +# CONFIG_NF_NAT_AMANDA is not set +# CONFIG_NF_NAT_PPTP is not set +CONFIG_NF_NAT_H323=m +CONFIG_NF_NAT_SIP=m CONFIG_IP_NF_MANGLE=m CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_TTL=m +# CONFIG_IP_NF_TARGET_CLUSTERIP is not set CONFIG_IP_NF_RAW=m CONFIG_IP_NF_ARPTABLES=m CONFIG_IP_NF_ARPFILTER=m @@ -436,6 +476,7 @@ CONFIG_IP_NF_ARP_MANGLE=m # # IPv6: Netfilter Configuration # +# CONFIG_NF_CONNTRACK_IPV6 is not set # CONFIG_IP6_NF_QUEUE is not set # CONFIG_IP6_NF_IPTABLES is not set # CONFIG_IP_DCCP is not set diff --git a/recipes/linux/linux-rp_2.6.26.bb b/recipes/linux/linux-rp_2.6.26.bb index 2d6c9f6742..c508f27c1f 100644 --- a/recipes/linux/linux-rp_2.6.26.bb +++ b/recipes/linux/linux-rp_2.6.26.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r11" +PR = "r12" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_qemuarm = "-1" -- cgit v1.2.3 From 68cdc74da781c0755b26bb336dd666cb58104dce Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Wed, 4 Nov 2009 21:43:03 +0000 Subject: gpsd: Removed custom do_stage. --- recipes/gpsd/gpsd.inc | 8 +------- recipes/gpsd/gpsd_2.38.bb | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/recipes/gpsd/gpsd.inc b/recipes/gpsd/gpsd.inc index 1022091c6c..0bd2b207f5 100644 --- a/recipes/gpsd/gpsd.inc +++ b/recipes/gpsd/gpsd.inc @@ -19,7 +19,7 @@ SRC_URI_append_om-gta01 = " \ file://restart_gllin.sh \ " -inherit autotools update-rc.d +inherit autotools_stage update-rc.d INITSCRIPT_NAME = "gpsd" INITSCRIPT_PARAMS = "defaults 35" @@ -39,12 +39,6 @@ do_install_prepend() { export HOST_SYS="${HOST_SYS}" } -do_stage() { - oe_libinstall -so libgps ${STAGING_LIBDIR} - install -m 0644 ${S}/gps.h ${STAGING_INCDIR} - install -m 0644 ${S}/gpsd.h ${STAGING_INCDIR} -} - do_install_append() { install -d ${D}/${sysconfdir}/init.d install -d ${D}/dev diff --git a/recipes/gpsd/gpsd_2.38.bb b/recipes/gpsd/gpsd_2.38.bb index 95260ff2be..fb7f57d980 100644 --- a/recipes/gpsd/gpsd_2.38.bb +++ b/recipes/gpsd/gpsd_2.38.bb @@ -1,5 +1,5 @@ require gpsd.inc -PR = "r0" +PR = "r1" # make attempts to link gpspacket.so without waiting for all compiler tasks: PARALLEL_MAKE = "" -- cgit v1.2.3 From 292709ae7e6e29e161afee4934e7f40891ea63d0 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Wed, 4 Nov 2009 21:48:26 +0000 Subject: mplayer-svn: Worked around internal compiler error on iwmmxt. --- recipes/mplayer/mplayer_svn.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipes/mplayer/mplayer_svn.bb b/recipes/mplayer/mplayer_svn.bb index 1a434a5829..b5ef88030a 100644 --- a/recipes/mplayer/mplayer_svn.bb +++ b/recipes/mplayer/mplayer_svn.bb @@ -188,6 +188,9 @@ EXTRA_OECONF_append = " ${@base_contains('MACHINE_FEATURES', 'x86', '--enable-ru FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O4 -ffast-math" FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -ftree-vectorize -fomit-frame-pointer -O4 -ffast-math" BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}" +# FIXME: Temporarily disable debugging to work-around http://gcc.gnu.org/bugzilla/show_bug.cgi?id=37987 +DEBUG_OPTIMIZATION_spitz = "-O -fomit-frame-pointer -g" +DEBUG_OPTIMIZATION_akita = "-O -fomit-frame-pointer -g" do_configure_prepend_armv7a() { cp ${WORKDIR}/yuv.S ${S}/libvo -- cgit v1.2.3 From 691030b524bf1a4f94f3d7da846ce61ea20ece0a Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Wed, 4 Nov 2009 21:51:00 +0000 Subject: angstrom-2008.1.conf: Must use mplayer-svn, anything older is incompatible with linux-libc-headers-2.6.31. --- conf/distro/angstrom-2008.1.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 1429fa0d65..5f6ef768ad 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -167,6 +167,8 @@ PREFERRED_PROVIDER_bluez-utils-dbus = "bluez-utils" PREFERRED_PROVIDER_bluez-libs = "bluez4" PREFERRED_PROVIDER_bluez-utils = "bluez4" PREFERRED_PROVIDER_util-linux = "util-linux-ng" +# The default is too old for linux-libc-headers-2.6.31: +PREFERRED_VERSION_mplayer = "0.0+1.0rc2+svnr29789" ANGSTROM_BLACKLIST_pn-bluez-libs = "bluez-libs 3.x has been replaced by bluez4" ANGSTROM_BLACKLIST_pn-bluez-utils = "bluez-utils 3.x has been replaced by bluez4" -- cgit v1.2.3 From 846588de960200be9cc2553fc8fac1ae81758466 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Wed, 4 Nov 2009 21:57:05 +0000 Subject: prismstumbler-0.7.3+0.7.4pre1: Use much simper and more robust libgps check. --- .../libgps-check.patch | 57 ++++++++++++++++++++++ .../prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb | 6 +-- 2 files changed, 60 insertions(+), 3 deletions(-) create mode 100644 recipes/prismstumbler/prismstumbler-0.7.3+0.7.4pre1/libgps-check.patch diff --git a/recipes/prismstumbler/prismstumbler-0.7.3+0.7.4pre1/libgps-check.patch b/recipes/prismstumbler/prismstumbler-0.7.3+0.7.4pre1/libgps-check.patch new file mode 100644 index 0000000000..613adb2255 --- /dev/null +++ b/recipes/prismstumbler/prismstumbler-0.7.3+0.7.4pre1/libgps-check.patch @@ -0,0 +1,57 @@ +Index: prismstumbler-0.7.4pre1/configure.ac +=================================================================== +--- prismstumbler-0.7.4pre1.orig/configure.ac ++++ prismstumbler-0.7.4pre1/configure.ac +@@ -137,51 +137,11 @@ AC_ARG_ENABLE(static-libgps, + ], [ static_libgps="no"] + ) + +-AC_MSG_CHECKING(for libgps) +-AC_ARG_WITH(libgps, +-[ --with-libgps=DIR use libgps in DIR], +-[ case "$withval" in +- *) +- AC_MSG_RESULT($withval) +- if test -f $withval/include/gps.h -a -f $withval/lib/libgps.a; then +- owd=`pwd` +- if cd $withval; then withval=`pwd`; cd $owd; fi +- libgps_dir=${withval} +- GPSD_CFLAGS="-I$withval/include" +- if test "x$static_libgps" = "xyes"; then +- GPSD_LIBS="-lm -lpthread $withval/lib/libgps.a" +- else +- GPSD_LIBS="-L$withval/lib -lgps" +- fi +- else +- AC_ERROR(libgps not found in $withval prefix) +- fi +- ;; +- esac ], +-[ +- for dir in ${prefix} ${prefix}/local /usr /usr/local; do +- if test -f ${dir}/include/gps.h -a -f ${dir}/lib/libgps.a; then +- libgps_dir=${dir} +- GPSD_CFLAGS="-I${dir}/include" +- if test "x$static_libgps" = "xyes"; then +- GPSD_LIBS="-lm -lpthread ${dir}/lib/libgps.a" +- else +- GPSD_LIBS="-L${dir}/lib -lgps" +- fi +- fi +- done +- if test -z ${libgps_dir}; then +- AC_MSG_RESULT(no) +- AC_ERROR(libgps not found) +- fi +- AC_MSG_RESULT(yes) ] +-) ++PKG_CHECK_MODULES([GPSD], [libgps]) + + if test -z "$GPSD_CFLAGS"; then + AC_ERROR("libgps not found") + fi +-AC_SUBST(GPSD_CFLAGS) +-AC_SUBST(GPSD_LIBS) + + + dnl Checks for wireless lib diff --git a/recipes/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb b/recipes/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb index bc23824e42..fb444e2f01 100644 --- a/recipes/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb +++ b/recipes/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb @@ -1,5 +1,5 @@ SECTION = "x11/network" -PR = "r3" +PR = "r4" PACKAGES = "${PN}-dbg prismstumbler prismstumbler-frontend prismstumbler-doc" DESCRIPTION = "Prismstumbler wireless LAN scanner" @@ -14,7 +14,8 @@ RRECOMMENDS = "gpsd" SRC_URI = "http://projects.linuxtogo.org/frs/download.php/14/${PN}-0.7.4pre1.tar.gz \ file://gpsapi.patch;patch=1 \ ${@['', 'file://wireless.patch;patch=1'][bb.data.getVar('PREFERRED_VERSION_linux-libc-headers', d, 1) and bb.data.getVar('PREFERRED_VERSION_linux-libc-headers', d, 1).split('.')[2] < '30']} \ - file://fix-includes.patch;patch=1;pnum=0" + file://fix-includes.patch;patch=1;pnum=0 \ + file://libgps-check.patch;patch=1" S = "${WORKDIR}/${PN}-0.7.4pre1" @@ -22,7 +23,6 @@ inherit autotools pkgconfig EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ --x-libraries=${STAGING_LIBDIR} \ - --with-libgps=${STAGING_EXECPREFIXDIR} \ --with-libpcap=${STAGING_EXECPREFIXDIR} \ --with-sqlite-includes=${STAGING_INCDIR} \ --with-sqlite-libs=${STAGING_LIBDIR} \ -- cgit v1.2.3 From e0e13253cda40005f5f24bb09db68b66636d2924 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Wed, 4 Nov 2009 22:05:08 +0000 Subject: balsa-2.4.1: Depends on gnome-icon-theme. --- recipes/balsa/balsa-2.4.1/gnome-icon-theme.patch | 27 ++++++++++++++++++++++++ recipes/balsa/balsa_2.4.1.bb | 7 ++++-- 2 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 recipes/balsa/balsa-2.4.1/gnome-icon-theme.patch diff --git a/recipes/balsa/balsa-2.4.1/gnome-icon-theme.patch b/recipes/balsa/balsa-2.4.1/gnome-icon-theme.patch new file mode 100644 index 0000000000..7e16171ecc --- /dev/null +++ b/recipes/balsa/balsa-2.4.1/gnome-icon-theme.patch @@ -0,0 +1,27 @@ +https://bugzilla.gnome.org/show_bug.cgi?id=596309 +Index: balsa-2.4.1/src/balsa-app.c +=================================================================== +--- balsa-2.4.1.orig/src/balsa-app.c ++++ balsa-2.4.1/src/balsa-app.c +@@ -436,6 +436,9 @@ balsa_app_init(void) + /* Message filing */ + balsa_app.folder_mru=NULL; + balsa_app.fcc_mru=NULL; ++ ++ g_object_set (gtk_settings_get_default (), ++ "gtk-fallback-icon-theme", "gnome", NULL); + } + + void +Index: balsa-2.4.1/configure.in +=================================================================== +--- balsa-2.4.1.orig/configure.in ++++ balsa-2.4.1/configure.in +@@ -329,6 +329,7 @@ glib-2.0 >= 2.16.0 + gtk+-2.0 >= 2.14.0 + gmime-2.4 + gio-2.0 ++gnome-icon-theme + $gnome_extras + ]) + diff --git a/recipes/balsa/balsa_2.4.1.bb b/recipes/balsa/balsa_2.4.1.bb index c66ec5a2bc..59b0b10ac0 100644 --- a/recipes/balsa/balsa_2.4.1.bb +++ b/recipes/balsa/balsa_2.4.1.bb @@ -2,9 +2,12 @@ DESCRIPTION = "Robust and configurable e-mail client for GNOME" HOMEPAGE = "http://pawsa.fedorapeople.org/balsa/" SECTION = "x11/network" LICENSE = "GPL" -SRC_URI = "http://pawsa.fedorapeople.org/balsa/${P}.tar.bz2" +SRC_URI = "http://pawsa.fedorapeople.org/balsa/${P}.tar.bz2 \ + file://gnome-icon-theme.patch;patch=1" +PR = "r1" -DEPENDS = "glib-2.0 libgmime-2.4 gtk+ intltool-native libesmtp libxml-parser-perl-native" +DEPENDS = "glib-2.0 libgmime-2.4 gnome-icon-theme gtk+ intltool-native libesmtp libxml-parser-perl-native" +RDEPENDS_${PN} = "gnome-icon-theme" # FIXME: It is possible to build several variants of balsa: lite (SSL, gqlite/GPE, maybe HTML), # standard (GNOME, spell checking, HTML), full (Kerberos, LDAP, PGP, Rubrica, X-Face) -- cgit v1.2.3 From a74f86eab3b1482e3528c6ec61edde8f68f34917 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Wed, 4 Nov 2009 22:58:41 +0000 Subject: lame: Fix possible linking QA error. --- recipes/lame/lame/ldflags-qa.patch | 43 ++++++++++++++++++++++++++++++++++++++ recipes/lame/lame_3.96.1.bb | 5 +++-- 2 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 recipes/lame/lame/ldflags-qa.patch diff --git a/recipes/lame/lame/ldflags-qa.patch b/recipes/lame/lame/ldflags-qa.patch new file mode 100644 index 0000000000..b92f9ca0cd --- /dev/null +++ b/recipes/lame/lame/ldflags-qa.patch @@ -0,0 +1,43 @@ +https://sourceforge.net/tracker/?func=detail&aid=2892273&group_id=290&atid=300290 + +Depending on configure arguments libmp3lame may be built only as a +shared library. But lame frntends link command using this library +has -static. + +Such clash may cause ugly libtool behavior. + +In context of lame, linking should probably respect configure flags +and link frontend dynamically if shared linking is enabled. + +As a consequence of bug in libtool, this combination +with --disable-static may create incorrect binary. For more see: +http://lists.gnu.org/archive/html/bug-libtool/2009-11/msg00004.html + +Signed-off-by: Stanislav Brabec + +Index: lame-3.96.1/frontend/Makefile.am +=================================================================== +--- lame-3.96.1.orig/frontend/Makefile.am ++++ lame-3.96.1/frontend/Makefile.am +@@ -50,7 +50,7 @@ mp3x__EXEEXT__SOURCES = mp3x.c gtkanal.c + endif + + CFLAGS = @CFLAGS@ @GTK_CFLAGS@ @FRONTEND_CFLAGS@ +-LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ -static ++LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ + + INCLUDES = -I$(top_srcdir)/libmp3lame -I$(top_srcdir)/include -I$(top_builddir) + +Index: lame-3.96.1/frontend/Makefile.in +=================================================================== +--- lame-3.96.1.orig/frontend/Makefile.in ++++ lame-3.96.1/frontend/Makefile.in +@@ -91,7 +91,7 @@ LDADD = @LDADD@ \ + $(top_builddir)/libmp3lame/libmp3lame.la \ + @FRONTEND_LDADD@ + +-LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ -static ++LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ diff --git a/recipes/lame/lame_3.96.1.bb b/recipes/lame/lame_3.96.1.bb index ab9a99c064..9507032307 100644 --- a/recipes/lame/lame_3.96.1.bb +++ b/recipes/lame/lame_3.96.1.bb @@ -1,11 +1,12 @@ SECTION = "console/utils" DESCRIPTION = "Not an MP3 encoder" LICENSE = "LGPL" -PR = "r4" +PR = "r5" SRC_URI = "${SOURCEFORGE_MIRROR}/lame/lame-${PV}.tar.gz \ file://no-gtk1.patch;patch=1 \ - file://Makefile-lm.patch;patch=1" + file://Makefile-lm.patch;patch=1 \ + file://ldflags-qa.patch;patch=1" inherit autotools -- cgit v1.2.3 From 3d79f309ec2a75a3e6606a2899260e4d05c22500 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Wed, 4 Nov 2009 23:03:20 +0000 Subject: lame: Update to version 3.98.2. --- conf/checksums.ini | 4 +++ recipes/lame/lame-3.98.2/ldflags-qa.patch | 43 +++++++++++++++++++++++++++++++ recipes/lame/lame-3.98.2/no-gtk1.patch | 18 +++++++++++++ recipes/lame/lame_3.98.2.bb | 26 +++++++++++++++++++ 4 files changed, 91 insertions(+) create mode 100644 recipes/lame/lame-3.98.2/ldflags-qa.patch create mode 100644 recipes/lame/lame-3.98.2/no-gtk1.patch create mode 100644 recipes/lame/lame_3.98.2.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index 811a9752c5..5a9b1e7a89 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -13078,6 +13078,10 @@ sha256=f4f093e371c999a2a079607b74582a8ef5c1c3c9b322e3e997a47c1ea2afe2a5 md5=e1206c46a5e276feca11a7149e2fc6ac sha256=f4f093e371c999a2a079607b74582a8ef5c1c3c9b322e3e997a47c1ea2afe2a5 +[http://downloads.sourceforge.net/lame/lame-398-2.tar.gz] +md5=719dae0ee675d0c16e0e89952930ed35 +sha256=a17a28569d8ed1e514915c1f12bdf4eedac506e5fbdf9a429ba97d5d42c9af32 + [http://lasertraq.googlecode.com/files/lasertraq-0.8-r213.tar.bz2] md5=c24cc9ba196b32134186843324bfe784 sha256=7a2162c783f98a2de9658a217cd0409a7bd16d40040c34a6077df376a2135aea diff --git a/recipes/lame/lame-3.98.2/ldflags-qa.patch b/recipes/lame/lame-3.98.2/ldflags-qa.patch new file mode 100644 index 0000000000..c4df610bb2 --- /dev/null +++ b/recipes/lame/lame-3.98.2/ldflags-qa.patch @@ -0,0 +1,43 @@ +https://sourceforge.net/tracker/?func=detail&aid=2892273&group_id=290&atid=300290 + +Depending on configure arguments libmp3lame may be built only as a +shared library. But lame frntends link command using this library +has -static. + +Such clash may cause ugly libtool behavior. + +In context of lame, linking should probably respect configure flags +and link frontend dynamically if shared linking is enabled. + +As a consequence of bug in libtool, this combination +with --disable-static may create incorrect binary. For more see: +http://lists.gnu.org/archive/html/bug-libtool/2009-11/msg00004.html + +Signed-off-by: Stanislav Brabec + +Index: lame-398-2/frontend/Makefile.am +=================================================================== +--- lame-398-2.orig/frontend/Makefile.am ++++ lame-398-2/frontend/Makefile.am +@@ -52,7 +52,7 @@ mp3x_SOURCES = mp3x.c gtkanal.c gpkplott + endif + + CFLAGS = @CFLAGS@ @GTK_CFLAGS@ @FRONTEND_CFLAGS@ @SNDFILE_CFLAGS@ +-LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@ -static ++LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@ + + INCLUDES = -I$(top_srcdir)/libmp3lame -I$(top_srcdir)/include -I$(top_builddir) + +Index: lame-398-2/frontend/Makefile.in +=================================================================== +--- lame-398-2.orig/frontend/Makefile.in ++++ lame-398-2/frontend/Makefile.in +@@ -152,7 +152,7 @@ LDADD = @LDADD@ \ + $(top_builddir)/libmp3lame/libmp3lame.la \ + @FRONTEND_LDADD@ + +-LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@ -static ++LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ diff --git a/recipes/lame/lame-3.98.2/no-gtk1.patch b/recipes/lame/lame-3.98.2/no-gtk1.patch new file mode 100644 index 0000000000..3cc06308f5 --- /dev/null +++ b/recipes/lame/lame-3.98.2/no-gtk1.patch @@ -0,0 +1,18 @@ +Index: lame-398-2/configure.in +=================================================================== +--- lame-398-2.orig/configure.in ++++ lame-398-2/configure.in +@@ -385,7 +385,12 @@ CONFIG_MATH_LIB="${USE_LIBM}" + + dnl configure use of features + +-AM_PATH_GTK(1.2.0, HAVE_GTK="yes", HAVE_GTK="no") ++dnl AM_PATH_GTK(1.2.0, HAVE_GTK="yes", HAVE_GTK="no") ++HAVE_GTK="no" ++GTK_CFLAGS="" ++GTK_LIBS="" ++AC_SUBST(GTK_CFLAGS) ++AC_SUBST(GTK_LIBS) + + dnl ElectricFence malloc debugging + AC_MSG_CHECKING(use of ElectricFence malloc debugging) diff --git a/recipes/lame/lame_3.98.2.bb b/recipes/lame/lame_3.98.2.bb new file mode 100644 index 0000000000..f279857810 --- /dev/null +++ b/recipes/lame/lame_3.98.2.bb @@ -0,0 +1,26 @@ +SECTION = "console/utils" +DESCRIPTION = "Not an MP3 encoder" +LICENSE = "LGPL" +PR = "r0" + +S = "${WORKDIR}/${PN}-398-2" +SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-398-2.tar.gz \ + file://no-gtk1.patch;patch=1 \ + file://ldflags-qa.patch;patch=1" + +inherit autotools_stage + +PACKAGES += "libmp3lame libmp3lame-dev" +FILES_${PN} = "${bindir}/lame" +FILES_libmp3lame = "${libdir}/libmp3lame.so.*" +FILES_libmp3lame-dev = "${includedir} ${libdir}/*" +FILES_${PN}-dev = "" + +do_configure() { + # no autoreconf please + aclocal + autoconf + libtoolize --force + gnu-configize --force + oe_runconf +} -- cgit v1.2.3 From 8bfbb10c9848c2decd4ea32616f1e880b0ec389e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 4 Nov 2009 15:24:07 -0800 Subject: x86.conf: Fix typo in comments * Write NPTL instead of NTPL Signed-off-by: Khem Raj --- conf/machine/alix.conf | 2 +- conf/machine/guinness.conf | 2 +- conf/machine/progear.conf | 2 +- conf/machine/x86.conf | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/machine/alix.conf b/conf/machine/alix.conf index 10b298c0f0..e116e611ad 100644 --- a/conf/machine/alix.conf +++ b/conf/machine/alix.conf @@ -4,7 +4,7 @@ # # http://pcengines.ch/alix1c.htm -# i386 doesn't work with NTPL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html +# i386 doesn't work with NPTL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html TARGET_ARCH = "i586" PREFERRED_PROVIDER_virtual/kernel = "linux" diff --git a/conf/machine/guinness.conf b/conf/machine/guinness.conf index f17451556f..dd21c1ecc2 100644 --- a/conf/machine/guinness.conf +++ b/conf/machine/guinness.conf @@ -2,7 +2,7 @@ #@NAME: Guinness #@DESCRIPTION: Machine configuration for Linux running on a tyan 2462 mainboard (codenamed guinness) -# i386 doesn't work with NTPL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html +# i386 doesn't work with NPTL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html TARGET_ARCH = "i686" PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586" diff --git a/conf/machine/progear.conf b/conf/machine/progear.conf index 60716f6153..627bbc1c69 100644 --- a/conf/machine/progear.conf +++ b/conf/machine/progear.conf @@ -2,7 +2,7 @@ #@NAME: Progear #@DESCRIPTION: Machine configuration for Progear 1050HX+ webpad -# i386 doesn't work with NTPL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html +# i386 doesn't work with NPTL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html TARGET_ARCH = "i586" require conf/machine/include/tune-pentiummmx.inc diff --git a/conf/machine/x86.conf b/conf/machine/x86.conf index 30eb943cc6..5e43102fb3 100644 --- a/conf/machine/x86.conf +++ b/conf/machine/x86.conf @@ -4,7 +4,7 @@ #@NAME: X86 #@DESCRIPTION: Machine configuration for a Linux running on x86 compatible machines -# i386 doesn't work with NTPL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html +# i386 doesn't work with NPTL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html TARGET_ARCH = "i486" PREFERRED_PROVIDER_virtual/kernel = "linux" -- cgit v1.2.3 From b084808fca53235980c49784adf13d42edabcb28 Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Thu, 5 Nov 2009 08:24:10 +0100 Subject: vala: add version 0.7.8 and checksums Signed-off-by: Sebastian Spaeth --- conf/checksums.ini | 4 ++++ recipes/vala/vala_0.7.8.bb | 4 ++++ 2 files changed, 8 insertions(+) create mode 100644 recipes/vala/vala_0.7.8.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index 5a9b1e7a89..d0e01ae40b 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -26334,6 +26334,10 @@ sha256=16971189b3cb95648b9574eb7c4c7cc0dff9978458aff7f3f7c54ab823ada721 md5=7d11fcddb2bd30b9ecbdacfaa20f2769 sha256=ebb1afbb0a61dd8f5f8ef13512e789697e98d5ad5f98739120f3b3cc02d46d8f +[http://ftp.acc.umu.se/pub/GNOME/sources/vala/0.7/vala-0.7.8.tar.bz2] +md5=accd0d350c6d6de7527a0a65c40f8be2 +sha256=b2daf636d95ef66ffd5132eacf18335073b71bfaa18f7ad06f25bcf9673aa747 + [http://www.valgrind.org/downloads/valgrind-3.2.1.tar.bz2] md5=9407d33961186814cef0e6ecedfd6318 sha256=7f9a15d7be16ca03a0912191e8d55a486bf69690e11bb76ccece3eaff3730a33 diff --git a/recipes/vala/vala_0.7.8.bb b/recipes/vala/vala_0.7.8.bb new file mode 100644 index 0000000000..0b93248116 --- /dev/null +++ b/recipes/vala/vala_0.7.8.bb @@ -0,0 +1,4 @@ +require vala.inc +PR = "r0" + +SRC_URI = "http://download.gnome.org/sources/vala/0.7/vala-${PV}.tar.bz2" -- cgit v1.2.3 From ce66333fb47019040f6e8a366bbea2d670387b1b Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Thu, 5 Nov 2009 08:33:04 +0100 Subject: vala-native: add 0.7.8 Signed-off-by: Sebastian Spaeth --- recipes/vala/vala-native_0.7.8.bb | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 recipes/vala/vala-native_0.7.8.bb diff --git a/recipes/vala/vala-native_0.7.8.bb b/recipes/vala/vala-native_0.7.8.bb new file mode 100644 index 0000000000..0be4626488 --- /dev/null +++ b/recipes/vala/vala-native_0.7.8.bb @@ -0,0 +1,8 @@ +require vala.inc +inherit native + +PR = "r0" + +DEPENDS = "glib-2.0-native" + +SRC_URI = "http://download.gnome.org/sources/vala/0.7/vala-${PV}.tar.bz2" -- cgit v1.2.3 From cbda7eff8230b4a11718b8024bc1a2083f71f27a Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 5 Nov 2009 09:09:20 +0100 Subject: angstrom: raise default pref in mplayer recipe as well --- recipes/mplayer/mplayer_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/mplayer/mplayer_svn.bb b/recipes/mplayer/mplayer_svn.bb index b5ef88030a..7d2f27aa3a 100644 --- a/recipes/mplayer/mplayer_svn.bb +++ b/recipes/mplayer/mplayer_svn.bb @@ -36,7 +36,7 @@ RREPLACES_${PN} = "mplayer-atty" PV = "0.0+1.0rc2+svnr${SRCREV}" PR = "r14" DEFAULT_PREFERENCE = "-1" -DEFAULT_PREFERENCE_armv7a = "1" +DEFAULT_PREFERENCE_angstrom = "1" PARALLEL_MAKE = "" -- cgit v1.2.3 From 6d51f2acd45855fe1d623d7920cffbe3b9945b83 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 5 Nov 2009 09:20:37 +0100 Subject: checksums: sort and add missing checksum --- conf/checksums.ini | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/conf/checksums.ini b/conf/checksums.ini index d0e01ae40b..3650367bba 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -3274,6 +3274,10 @@ sha256=2d1c6b2cfdc17d6348f25f0830e1fa5c1c1dd3f014caff74005294c9ed6a0cbf md5=77a1ba78f37bdd7f024b67e1e36ad151 sha256=c674f1182f4c20f1e6d038feceb0a6617fc3e7658dfbbac89396043b49612a26 +[http://sodium.resophonic.com/boost-cmake/1.40.0.cmake2/boost-1.40.0.cmake2.tar.gz] +md5=1a0926fe4c8228f14a2622b4182b801e +sha256=ce6e6c3a6b9a3e7695cb7a0f83d4dbb58f1fb246eb706e3caf3fce3b77e186c0 + [http://downloads.sourceforge.net/boost/boost-jam-3.1.11.tgz] md5=b86fb56a824d4a3dedcbda12f8b1a2b3 sha256=6cdb945ac41b5ac78e05435e742b3a9928e5d1a5ff22728656deff29249edc66 @@ -3322,10 +3326,6 @@ sha256=9a4a0cfbbd227c20a13519a2c41f2e707dc0d89e518a3c7bfcd381f7b7fbcdef md5=328bfec66c312150e4c2a78dcecb504b sha256=9a4a0cfbbd227c20a13519a2c41f2e707dc0d89e518a3c7bfcd381f7b7fbcdef -[http://sodium.resophonic.com/boost-cmake/1.40.0.cmake2/boost-1.40.0.cmake2.tar.gz] -md5=1a0926fe4c8228f14a2622b4182b801e -sha256=ce6e6c3a6b9a3e7695cb7a0f83d4dbb58f1fb246eb706e3caf3fce3b77e186c0 - [http://downloads.sourceforge.net/asio/boost_asio_0_3_7.tar.bz2] md5=e006cde4b4a28cfce95e43710cd126a9 sha256=ade3663edc611d558f5a383abccd0a9ab87d6168f422ef4c2a38775e8b7ca575 @@ -26334,6 +26334,10 @@ sha256=16971189b3cb95648b9574eb7c4c7cc0dff9978458aff7f3f7c54ab823ada721 md5=7d11fcddb2bd30b9ecbdacfaa20f2769 sha256=ebb1afbb0a61dd8f5f8ef13512e789697e98d5ad5f98739120f3b3cc02d46d8f +[http://download.gnome.org/sources/vala/0.7/vala-0.7.8.tar.bz2] +md5=accd0d350c6d6de7527a0a65c40f8be2 +sha256=b2daf636d95ef66ffd5132eacf18335073b71bfaa18f7ad06f25bcf9673aa747 + [http://ftp.acc.umu.se/pub/GNOME/sources/vala/0.7/vala-0.7.8.tar.bz2] md5=accd0d350c6d6de7527a0a65c40f8be2 sha256=b2daf636d95ef66ffd5132eacf18335073b71bfaa18f7ad06f25bcf9673aa747 -- cgit v1.2.3 From 810df5f14cb2f87371787ba3a935b6e7dec11570 Mon Sep 17 00:00:00 2001 From: "Robert P. J. Day" Date: Tue, 3 Nov 2009 22:09:17 +0000 Subject: usermanual: Aesthetic fix in chapter 1. A simple tidy of a comma-separated list in Chapter 1. Signed-off-by: Robert P. J. Day Acked-by: Holger Hans Peter Freyther --- docs/usermanual/chapters/introduction.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/usermanual/chapters/introduction.xml b/docs/usermanual/chapters/introduction.xml index 31f1f1f516..28e7725add 100644 --- a/docs/usermanual/chapters/introduction.xml +++ b/docs/usermanual/chapters/introduction.xml @@ -30,7 +30,7 @@ - Must be able to emit packages (tar, rpm, deb,ipk) + Must be able to emit packages (tar, rpm, deb, ipk) -- cgit v1.2.3 From aa6bc115054acc2507119086ebfc7995873c67ca Mon Sep 17 00:00:00 2001 From: "Robert P. J. Day" Date: Tue, 3 Nov 2009 23:01:11 +0000 Subject: User manual typoes and aesthetics, chapter 2 only. Some minor cleanups for Chapter 2 of the User Manual: * add some DocBook tags for filenames * update BitBake version to 1.8.16 * add missing space after "wget" command * correct misspelled "local/conf" to "local.conf" Signed-off-by: Robert P. J. Day Signed-off-by: Holger Hans Peter Freyther --- docs/usermanual/chapters/getting_oe.xml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/usermanual/chapters/getting_oe.xml b/docs/usermanual/chapters/getting_oe.xml index e8d1f2cc9d..8d9c5b7a0a 100644 --- a/docs/usermanual/chapters/getting_oe.xml +++ b/docs/usermanual/chapters/getting_oe.xml @@ -30,9 +30,9 @@ $ cd $OEBASE you to build your applications and images. - The $OEBASE will also contain both bitbake/ and - openembedded/ directories. These will be discussed in - and + The $OEBASE will also contain both of the + bitbake/ and openembedded/ directories. + These will be discussed in and . @@ -47,19 +47,19 @@ $ cd $OEBASE directory of openembedded/ and build/ directories. Indeed, as bitbake is written in python it does not need compilation for being used. You'll just have to - set the PATH variable so that the BitBake tools are accessible (see - ). + set the PATH variable so that the BitBake tools are + accessible (see ).
Downloading a <application>BitBake</application> release Releases are available from the berlios project website. The current release series is BitBake 1.8 - and the current release is 1.8.12. To download execute + and the current release is 1.8.16. To download execute the following commands: $ cd $OEBASE -$ wgethttp://download.berlios.de/bitbake/bitbake-1.8.12.tar.gz -$ tar -xvzf bitbake-1.8.12.tar.gz -$ mv bitbake-1.8.12 bitbake +$ wget http://download.berlios.de/bitbake/bitbake-1.8.16.tar.gz +$ tar -xvzf bitbake-1.8.16.tar.gz +$ mv bitbake-1.8.16 bitbake @@ -270,7 +270,7 @@ MACHINE = "om-gta01" BitBake file is a logical unit of tasks to be executed. Normally this is a package to be built. Inter-recipe dependencies are obeyed. The recipes are located by BitBake via the BBFILES variable (set - in your $OEBASE/build/conf/local/conf), which is a + in your $OEBASE/build/conf/local.conf), which is a space separated list of .bb files, and does handle wildcards. -- cgit v1.2.3 From f2b43d21cfb2696df8047604e447b5c9826ff9fd Mon Sep 17 00:00:00 2001 From: "Robert P. J. Day" Date: Tue, 3 Nov 2009 23:11:19 +0000 Subject: User Manual: Warn readers about mmap and SELinux issue. On some Linux distros, if you set the kernel /proc file /proc/sys/vm/mmap_min_addr to zero, you will probably get an SELinux violation if you're running SELinux in enforcing mode. Explain to the reader how to get around that. Signed-off-by: Robert P. J. Day Signed-off-by: Holger Hans Peter Freyther --- docs/usermanual/chapters/getting_oe.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/usermanual/chapters/getting_oe.xml b/docs/usermanual/chapters/getting_oe.xml index 8d9c5b7a0a..4ec5fecb1f 100644 --- a/docs/usermanual/chapters/getting_oe.xml +++ b/docs/usermanual/chapters/getting_oe.xml @@ -257,7 +257,13 @@ MACHINE = "om-gta01" If your system does not provide the /etc/sysctl.conf mechanism, you can try adding the above echo command line to - your /etc/rc.local. + your /etc/rc.local. But that's not all. + + On some systems (such as Fedora 11), changing that kernel setting + will cause an SELinux violation if you're running SELinux in enforcing + mode. If that's the case, you can either disable SELinux or run: + + $ setsebool -P allow_unconfirmed_mmap_low 1 -- cgit v1.2.3 From 56b84b4f4c4bbdbaac646222a09630fc5542eaf7 Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Thu, 5 Nov 2009 10:35:03 +0100 Subject: vala vala-native: Make use of GNOME_MIRROR in SRC_URI Signed-off-by: Sebastian Spaeth --- recipes/vala/vala-native_0.7.8.bb | 2 +- recipes/vala/vala_0.7.8.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/vala/vala-native_0.7.8.bb b/recipes/vala/vala-native_0.7.8.bb index 0be4626488..7a5cad2d30 100644 --- a/recipes/vala/vala-native_0.7.8.bb +++ b/recipes/vala/vala-native_0.7.8.bb @@ -5,4 +5,4 @@ PR = "r0" DEPENDS = "glib-2.0-native" -SRC_URI = "http://download.gnome.org/sources/vala/0.7/vala-${PV}.tar.bz2" +SRC_URI = "${GNOME_MIRROR}/vala/0.7/vala-${PV}.tar.bz2" diff --git a/recipes/vala/vala_0.7.8.bb b/recipes/vala/vala_0.7.8.bb index 0b93248116..2d0b5b7765 100644 --- a/recipes/vala/vala_0.7.8.bb +++ b/recipes/vala/vala_0.7.8.bb @@ -1,4 +1,4 @@ require vala.inc PR = "r0" -SRC_URI = "http://download.gnome.org/sources/vala/0.7/vala-${PV}.tar.bz2" +SRC_URI = "${GNOME_MIRROR}/vala/0.7/vala-${PV}.tar.bz2" -- cgit v1.2.3 From 7f845d2618f8e7ba27ee6cc908311fb214df6771 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 5 Nov 2009 10:15:11 +0100 Subject: transmission: fix breakage of "r3" version - GUI in PN-gui, daemon in PN update-rc.d.bbclass adds only to PN package so I moved PN-daemon into PN and PN became PN-gui now --- recipes/transmission/transmission.inc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/recipes/transmission/transmission.inc b/recipes/transmission/transmission.inc index 7f3ca2a035..9c8b395b07 100644 --- a/recipes/transmission/transmission.inc +++ b/recipes/transmission/transmission.inc @@ -3,7 +3,7 @@ SECTION = "network" HOMEPAGE = "www.transmissionbt.com/" DEPENDS = "gtk+ gnutls openssl gettext libtool intltool-native curl glib-2.0-native" LICENSE = "GPLv2" -PR = "r3" +PR = "r4" SRC_URI = "http://mirrors.m0k.org/transmission/files/transmission-${PV}.tar.bz2 \ file://init \ file://config" @@ -21,12 +21,12 @@ do_install_append() { install -d ${D}${localstatedir}/lib/transmission-daemon } -PACKAGES =+ "${PN}-daemon ${PN}-client" +PACKAGES += "${PN}-gui ${PN}-client" -FILES_${PN}-daemon = "${bindir}/transmission-daemon ${datadir}/transmission ${sysconfdir} ${localstatedir}/lib/${PN}-daemon" +FILES_${PN} = "${bindir}/transmission-daemon ${datadir}/transmission ${sysconfdir} ${localstatedir}/lib/${PN}-daemon" FILES_${PN}-client = "${bindir}/transmissioncli ${bindir}/transmission-remote" -FILES_${PN} += "${datadir}/icons" -CONFFILES_${PN}-daemon = "${sysconfdir}/default/transmission-daemon" +FILES_${PN}-gui += "${bindir}/transmission ${datadir}/icons ${datadir}/applications ${datadir}/pixmaps" +CONFFILES_${PN} = "${sysconfdir}/default/transmission-daemon" # No need for online check, since update-rc.d will prepend it to here pkg_postinst_${PN}() { @@ -39,4 +39,3 @@ pkg_postrm_${PN}() { delgroup transmission deluser transmission } - -- cgit v1.2.3 From ac8425fce9249cb483e6a206334ce23e95be0250 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 5 Nov 2009 10:59:34 +0100 Subject: squashfs-tools: fix up native version --- recipes/squashfs-tools/squashfs-tools-native_4.0.bb | 5 ++++- recipes/squashfs-tools/squashfs-tools_4.0.bb | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/recipes/squashfs-tools/squashfs-tools-native_4.0.bb b/recipes/squashfs-tools/squashfs-tools-native_4.0.bb index f21bf99645..8fc80a64f1 100644 --- a/recipes/squashfs-tools/squashfs-tools-native_4.0.bb +++ b/recipes/squashfs-tools/squashfs-tools-native_4.0.bb @@ -1,6 +1,9 @@ +require squashfs-tools_${PV}.bb + inherit native -require squashfs-tools_${PV}.bb +DEPENDS = "zlib-native lzma-native " + PR = "${INC_PR}.1" PACKAGES = "" diff --git a/recipes/squashfs-tools/squashfs-tools_4.0.bb b/recipes/squashfs-tools/squashfs-tools_4.0.bb index a4503fcf0f..17ab6dc61b 100644 --- a/recipes/squashfs-tools/squashfs-tools_4.0.bb +++ b/recipes/squashfs-tools/squashfs-tools_4.0.bb @@ -7,6 +7,8 @@ EXTRA_OEMAKE = "USE_LZMA=1 \ LZMA_LIB='${STAGING_LIBDIR}/liblzma.a'" DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE_angstrom = "1" + SRC_URI += " file://portability.patch;patch=1;pnum=2 \ file://lzma-support.patch;patch=1;pnum=2" -- cgit v1.2.3 From 6f0e47264d01494bdf74368acc6330537f6361c7 Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Thu, 5 Nov 2009 12:49:22 +0100 Subject: linux-omap 2.6.29: fix FIFO issues with large transfers on the MUSB controller --- .../linux-omap-2.6.29/musb/0030-musb-fifo.patch | 26 ++++++++++++++++++++++ recipes/linux/linux-omap_2.6.29.bb | 1 + 2 files changed, 27 insertions(+) create mode 100644 recipes/linux/linux-omap-2.6.29/musb/0030-musb-fifo.patch diff --git a/recipes/linux/linux-omap-2.6.29/musb/0030-musb-fifo.patch b/recipes/linux/linux-omap-2.6.29/musb/0030-musb-fifo.patch new file mode 100644 index 0000000000..8ac3707ad3 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/musb/0030-musb-fifo.patch @@ -0,0 +1,26 @@ +diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c +index d3b8e0e..cee974e 100644 +--- a/drivers/usb/musb/musb_core.c ++++ b/drivers/usb/musb/musb_core.c +@@ -1103,15 +1103,12 @@ static struct fifo_cfg __initdata mode_4_cfg[] = { + { .hw_ep_num = 8, .style = FIFO_RX, .maxpacket = 512, }, + { .hw_ep_num = 9, .style = FIFO_TX, .maxpacket = 512, }, + { .hw_ep_num = 9, .style = FIFO_RX, .maxpacket = 512, }, +-{ .hw_ep_num = 10, .style = FIFO_TX, .maxpacket = 256, }, +-{ .hw_ep_num = 10, .style = FIFO_RX, .maxpacket = 64, }, +-{ .hw_ep_num = 11, .style = FIFO_TX, .maxpacket = 256, }, +-{ .hw_ep_num = 11, .style = FIFO_RX, .maxpacket = 64, }, +-{ .hw_ep_num = 12, .style = FIFO_TX, .maxpacket = 256, }, +-{ .hw_ep_num = 12, .style = FIFO_RX, .maxpacket = 64, }, +-{ .hw_ep_num = 13, .style = FIFO_RXTX, .maxpacket = 4096, }, +-{ .hw_ep_num = 14, .style = FIFO_RXTX, .maxpacket = 1024, }, +-{ .hw_ep_num = 15, .style = FIFO_RXTX, .maxpacket = 1024, }, ++{ .hw_ep_num = 10, .style = FIFO_TX, .maxpacket = 512, }, ++{ .hw_ep_num = 10, .style = FIFO_RX, .maxpacket = 512, }, ++{ .hw_ep_num = 11, .style = FIFO_RXTX, .maxpacket = 512, }, ++{ .hw_ep_num = 12, .style = FIFO_RXTX, .maxpacket = 4096,}, ++{ .hw_ep_num = 13, .style = FIFO_RXTX, .maxpacket = 512, }, ++{ .hw_ep_num = 14, .style = FIFO_RXTX, .maxpacket = 512, }, + }; + + diff --git a/recipes/linux/linux-omap_2.6.29.bb b/recipes/linux/linux-omap_2.6.29.bb index 130f9a8f69..6996416e58 100644 --- a/recipes/linux/linux-omap_2.6.29.bb +++ b/recipes/linux/linux-omap_2.6.29.bb @@ -131,6 +131,7 @@ SRC_URI_append = " \ file://musb/0027-musb-otg-timer-cleanup.patch;patch=1 \ file://musb/0028-musb-make-initial-HNP-roleswitch-work-v2.patch;patch=1 \ file://musb/0029-musb-support-disconnect-after-HNP-roleswitch.patch;patch=1 \ + file://musb/0030-musb-fifo.patch;patch=1 \ file://isp/v4l/0001-V4L2-Add-COLORFX-user-control.patch;patch=1 \ file://isp/v4l/0002-V4L-Int-if-v4l2_int_device_try_attach_all-requires.patch;patch=1 \ file://isp/v4l/0003-V4L-Int-if-Dummy-slave.patch;patch=1 \ -- cgit v1.2.3 From f389ecae0287535b6df5cc1a8e2c49e16cf7efed Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 5 Nov 2009 13:12:39 +0100 Subject: linux-omap-pm 2.6.29: cleanup some touchbook stuff --- conf/machine/include/omap3.inc | 2 +- .../omap3-touchbook/board-omap3beagle.c | 744 --------------------- .../linux-omap-pm-2.6.29/omap3-touchbook/defconfig | 8 +- 3 files changed, 6 insertions(+), 748 deletions(-) delete mode 100644 recipes/linux/linux-omap-pm-2.6.29/omap3-touchbook/board-omap3beagle.c diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc index e87b56c282..2c5c4f2387 100644 --- a/conf/machine/include/omap3.inc +++ b/conf/machine/include/omap3.inc @@ -1,7 +1,7 @@ require conf/machine/include/tune-cortexa8.inc PREFERRED_PROVIDER_virtual/kernel = "linux-omap" # Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r48" +MACHINE_KERNEL_PR = "r49" KERNEL_IMAGETYPE = "uImage" diff --git a/recipes/linux/linux-omap-pm-2.6.29/omap3-touchbook/board-omap3beagle.c b/recipes/linux/linux-omap-pm-2.6.29/omap3-touchbook/board-omap3beagle.c deleted file mode 100644 index c7867bef2f..0000000000 --- a/recipes/linux/linux-omap-pm-2.6.29/omap3-touchbook/board-omap3beagle.c +++ /dev/null @@ -1,744 +0,0 @@ -/* - * linux/arch/arm/mach-omap2/board-omap3beagle.c - * - * Copyright (C) 2008 Texas Instruments - * - * Modified from mach-omap2/board-3430sdp.c - * - * Initial code: Syed Mohammed Khasim - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#include -#include -#include -#include - -#include -#include - -#include -#include -#include - -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "twl4030-generic-scripts.h" -#include "mmc-twl4030.h" -#include "pm.h" -#include "omap3-opp.h" - - -#define GPMC_CS0_BASE 0x60 -#define GPMC_CS_SIZE 0x30 - -#define NAND_BLOCK_SIZE SZ_128K - -#define OMAP3_AC_GPIO 136 //Int1 DRDY -#define OMAP3_TS_GPIO 162 -#define TB_BL_PWM_TIMER 9 -#define TB_KILL_POWER_GPIO 168 - -static struct mtd_partition omap3beagle_nand_partitions[] = { - /* All the partition sizes are listed in terms of NAND block size */ - { - .name = "X-Loader", - .offset = 0, - .size = 4 * NAND_BLOCK_SIZE, - .mask_flags = MTD_WRITEABLE, /* force read-only */ - }, - { - .name = "U-Boot", - .offset = MTDPART_OFS_APPEND, /* Offset = 0x80000 */ - .size = 15 * NAND_BLOCK_SIZE, - .mask_flags = MTD_WRITEABLE, /* force read-only */ - }, - { - .name = "U-Boot Env", - .offset = MTDPART_OFS_APPEND, /* Offset = 0x260000 */ - .size = 1 * NAND_BLOCK_SIZE, - }, - { - .name = "Kernel", - .offset = MTDPART_OFS_APPEND, /* Offset = 0x280000 */ - .size = 32 * NAND_BLOCK_SIZE, - }, - { - .name = "File System", - .offset = MTDPART_OFS_APPEND, /* Offset = 0x680000 */ - .size = MTDPART_SIZ_FULL, - }, -}; - -static struct omap_nand_platform_data omap3beagle_nand_data = { - .options = NAND_BUSWIDTH_16, - .parts = omap3beagle_nand_partitions, - .nr_parts = ARRAY_SIZE(omap3beagle_nand_partitions), - .dma_channel = -1, /* disable DMA in OMAP NAND driver */ - .nand_setup = NULL, - .dev_ready = NULL, -}; - -static struct resource omap3beagle_nand_resource = { - .flags = IORESOURCE_MEM, -}; - -static struct platform_device omap3beagle_nand_device = { - .name = "omap2-nand", - .id = -1, - .dev = { - .platform_data = &omap3beagle_nand_data, - }, - .num_resources = 1, - .resource = &omap3beagle_nand_resource, -}; - -#include "sdram-micron-mt46h32m32lf-6.h" - -static struct omap_uart_config omap3_beagle_uart_config __initdata = { - .enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)), -}; - -static struct twl4030_usb_data beagle_usb_data = { - .usb_mode = T2_USB_MODE_ULPI, -}; - -static struct twl4030_hsmmc_info mmc[] = { - { - .mmc = 1, - .wires = 8, - .gpio_wp = 29, - }, - {} /* Terminator */ -}; - -static struct regulator_consumer_supply beagle_vmmc1_supply = { - .supply = "vmmc", -}; - -static struct regulator_consumer_supply beagle_vsim_supply = { - .supply = "vmmc_aux", -}; - -static struct gpio_led gpio_leds[]; - -static int beagle_twl_gpio_setup(struct device *dev, - unsigned gpio, unsigned ngpio) -{ - /* gpio + 0 is "mmc0_cd" (input/IRQ) */ - omap_cfg_reg(AH8_34XX_GPIO29); - mmc[0].gpio_cd = gpio + 0; - twl4030_mmc_init(mmc); - - /* link regulators to MMC adapters */ - beagle_vmmc1_supply.dev = mmc[0].dev; - beagle_vsim_supply.dev = mmc[0].dev; - - /* REVISIT: need ehci-omap hooks for external VBUS - * power switch and overcurrent detect - */ - -#if 0 /* TODO: This needs to be modified to not rely on u-boot */ - gpio_request(gpio + 1, "EHCI_nOC"); - gpio_direction_input(gpio + 1); - - /* TWL4030_GPIO_MAX + 0 == ledA, EHCI nEN_USB_PWR (out, active low) */ - gpio_request(gpio + TWL4030_GPIO_MAX, "nEN_USB_PWR"); - gpio_direction_output(gpio + TWL4030_GPIO_MAX, 1); - - /* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */ - gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1; -#endif - return 0; -} - -static struct twl4030_gpio_platform_data beagle_gpio_data = { - .gpio_base = OMAP_MAX_GPIO_LINES, - .irq_base = TWL4030_GPIO_IRQ_BASE, - .irq_end = TWL4030_GPIO_IRQ_END, - .use_leds = true, - .pullups = BIT(1), - .pulldowns = BIT(2) | BIT(6) | BIT(7) | BIT(8) | BIT(13) - | BIT(15) | BIT(16) | BIT(17), - .setup = beagle_twl_gpio_setup, -}; - -static struct platform_device omap3_beagle_lcd_device = { - .name = "omap3beagle_lcd", - .id = -1, -}; - -static struct regulator_consumer_supply beagle_vdac_supply = { - .supply = "vdac", - .dev = &omap3_beagle_lcd_device.dev, -}; - -static struct regulator_consumer_supply beagle_vdvi_supply = { - .supply = "vdvi", - .dev = &omap3_beagle_lcd_device.dev, -}; - -/* VMMC1 for MMC1 pins CMD, CLK, DAT0..DAT3 (20 mA, plus card == max 220 mA) */ -static struct regulator_init_data beagle_vmmc1 = { - .constraints = { - .min_uV = 1850000, - .max_uV = 3150000, - .valid_modes_mask = REGULATOR_MODE_NORMAL - | REGULATOR_MODE_STANDBY, - .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE - | REGULATOR_CHANGE_MODE - | REGULATOR_CHANGE_STATUS, - }, - .num_consumer_supplies = 1, - .consumer_supplies = &beagle_vmmc1_supply, -}; - -/* VSIM for MMC1 pins DAT4..DAT7 (2 mA, plus card == max 50 mA) */ -static struct regulator_init_data beagle_vsim = { - .constraints = { - .min_uV = 1800000, - .max_uV = 3000000, - .valid_modes_mask = REGULATOR_MODE_NORMAL - | REGULATOR_MODE_STANDBY, - .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE - | REGULATOR_CHANGE_MODE - | REGULATOR_CHANGE_STATUS, - }, - .num_consumer_supplies = 1, - .consumer_supplies = &beagle_vsim_supply, -}; - -/* VDAC for DSS driving S-Video (8 mA unloaded, max 65 mA) */ -static struct regulator_init_data beagle_vdac = { - .constraints = { - .min_uV = 1800000, - .max_uV = 1800000, - .valid_modes_mask = REGULATOR_MODE_NORMAL - | REGULATOR_MODE_STANDBY, - .valid_ops_mask = REGULATOR_CHANGE_MODE - | REGULATOR_CHANGE_STATUS, - }, - .num_consumer_supplies = 1, - .consumer_supplies = &beagle_vdac_supply, -}; - -/* VPLL2 for digital video outputs */ -static struct regulator_init_data beagle_vpll2 = { - .constraints = { - .name = "VDVI", - .min_uV = 1800000, - .max_uV = 1800000, - .valid_modes_mask = REGULATOR_MODE_NORMAL - | REGULATOR_MODE_STANDBY, - .valid_ops_mask = REGULATOR_CHANGE_MODE - | REGULATOR_CHANGE_STATUS, - }, - .num_consumer_supplies = 1, - .consumer_supplies = &beagle_vdvi_supply, -}; - -static const struct twl4030_resconfig beagle_resconfig[] = { - /* disable regulators that u-boot left enabled; the - * devices' drivers should be managing these. - */ - { .resource = RES_VAUX3, }, /* not even connected! */ - { .resource = RES_VMMC1, }, - { .resource = RES_VSIM, }, - { .resource = RES_VPLL2, }, - { .resource = RES_VDAC, }, - { .resource = RES_VUSB_1V5, }, - { .resource = RES_VUSB_1V8, }, - { .resource = RES_VUSB_3V1, }, - { 0, }, -}; - -static struct twl4030_power_data beagle_power_data = { - .resource_config = beagle_resconfig, - /* REVISIT can't use GENERIC3430_T2SCRIPTS_DATA; - * among other things, it makes reboot fail. - */ -}; - -static struct twl4030_bci_platform_data touchbook_bci_data = { - .tblsize = 0, - .no_backup_battery = 1, -}; - -static struct twl4030_platform_data beagle_twldata = { - .irq_base = TWL4030_IRQ_BASE, - .irq_end = TWL4030_IRQ_END, - - /* platform_data for children goes here */ - .usb = &beagle_usb_data, - .gpio = &beagle_gpio_data, - .power = &beagle_power_data, - .vmmc1 = &beagle_vmmc1, - .vsim = &beagle_vsim, - .vdac = &beagle_vdac, - .vpll2 = &beagle_vpll2, - - /* TouchBook BCI */ - .bci = &touchbook_bci_data, -}; - -static struct i2c_board_info __initdata beagle_i2c_boardinfo[] = { - { - I2C_BOARD_INFO("twl4030", 0x48), - .flags = I2C_CLIENT_WAKE, - .irq = INT_34XX_SYS_NIRQ, - .platform_data = &beagle_twldata, - }, -}; - -static struct i2c_board_info __initdata touchBook_i2c_boardinfo[] = { - { - I2C_BOARD_INFO("bq27200", 0x55), - }, -}; - -static int __init omap3_beagle_i2c_init(void) -{ - /* Standard BeagleBoard bus */ - omap_register_