From 5e3196b053fef5099f0def4c6bdc858e8930ac3b Mon Sep 17 00:00:00 2001 From: Elena Grandi Date: Mon, 24 Aug 2009 09:52:10 +0200 Subject: xapian-core: updated to version 1.0.14 --- conf/checksums.ini | 4 ++++ recipes/xapian/xapian-core_1.0.14.bb | 16 ++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 recipes/xapian/xapian-core_1.0.14.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index 85de9c2d93..2a7d55ce79 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -25378,6 +25378,10 @@ sha256=fa52aa629bb882335d45d67401d270c3f21b5131aaea005ac0d4590f2ce8b043 md5=5442e7ffc75abd853d1ab1d12667a3e9 sha256=a474be06657bd83200231d938d48d4d2a83cff0252c618421f835604c5548dce +[http://www.oligarchy.co.uk/xapian/1.0.14/xapian-core-1.0.14.tar.gz] +md5=f318fe11143af82aa6679acc51723a1a +sha256=9db5a04e184bc06be17d007a58adbf2592e7a380dfd80ddc6aa9001084b9a134 + [http://www.oligarchy.co.uk/xapian/1.0.5/xapian-core-1.0.5.tar.gz] md5=5fbfec7f23b0f539d32b50de4a278b95 sha256=277e30cbd4a4d9355e9b2c02489d34cbaed87754bbdeb8956e5463e9fb592658 diff --git a/recipes/xapian/xapian-core_1.0.14.bb b/recipes/xapian/xapian-core_1.0.14.bb new file mode 100644 index 0000000000..5987b09491 --- /dev/null +++ b/recipes/xapian/xapian-core_1.0.14.bb @@ -0,0 +1,16 @@ +DESCRPITION = "Open Source Search Engine Library" +HOMEPAGE = "http://xapian.org" +SECTION = "devel/libs" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "zlib" +PR = "r0" + +SRC_URI = "http://www.oligarchy.co.uk/xapian/${PV}/xapian-core-${PV}.tar.gz" + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} + -- cgit v1.2.3 From 4b9209b15524615e9ebd670f04cbffa75de86388 Mon Sep 17 00:00:00 2001 From: Elena Grandi Date: Mon, 24 Aug 2009 10:00:03 +0200 Subject: xapian-bindings-python: new recipe --- conf/checksums.ini | 4 +++ recipes/xapian/xapian-bindings-python_1.0.14.bb | 42 +++++++++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 recipes/xapian/xapian-bindings-python_1.0.14.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index 2a7d55ce79..65cdb67501 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -25374,6 +25374,10 @@ sha256=18b38aff8e019f35bfee810831535685e69dcf91283e50bc62efa82e3a8dbc21 md5=fc805051f0fe505c7a4b1b5c8db9b9e3 sha256=fa52aa629bb882335d45d67401d270c3f21b5131aaea005ac0d4590f2ce8b043 +[http://www.oligarchy.co.uk/xapian/1.0.14/xapian-bindings-1.0.14.tar.gz] +md5=d6f86ccc3d1a534902e1cf8df1cb43f3 +sha256=05072405fd182425d90374d2d5b69c36fe9fd927f44e397c449a9bdd1a971218 + [http://www.oligarchy.co.uk/xapian/1.0.13/xapian-core-1.0.13.tar.gz] md5=5442e7ffc75abd853d1ab1d12667a3e9 sha256=a474be06657bd83200231d938d48d4d2a83cff0252c618421f835604c5548dce diff --git a/recipes/xapian/xapian-bindings-python_1.0.14.bb b/recipes/xapian/xapian-bindings-python_1.0.14.bb new file mode 100644 index 0000000000..665cd58913 --- /dev/null +++ b/recipes/xapian/xapian-bindings-python_1.0.14.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "Open Source Search Engine Library python bindings" +HOMEPAGE = "http://xapian.org" +SECTION = "devel/libs" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "xapian-core" +PR = "r0" + +SRC_URI = "http://www.oligarchy.co.uk/xapian/${PV}/xapian-bindings-${PV}.tar.gz" + +S = "${WORKDIR}/xapian-bindings-${PV}" + +inherit autotools pkgconfig distutils-base + +export XAPIAN_CONFIG = "${STAGING_BINDIR_NATIVE}/xapian-config" + +EXTRA_OECONF = "--with-python --without-php --without-ruby --without-tcl \ + --without-csharp --without-java" + +do_configure () { + BUILD_SYS=${BUILD_SYS} HOST_SYS=${MULTIMACH_HOST_SYS} \ + autotools_do_configure +} + +# we don't want make to generate pyc and pyo files, but make install +# expects them later +do_compile() { + oe_runmake PYTHON=true + touch ${S}/python/xapian.pyc + touch ${S}/python/xapian.pyo +} + +# workaround for bad installation destination and removal of fake .py? files +do_install_append() { + mv ${D}/${STAGING_DIR_HOST}/usr/* ${D}/usr/ + rm ${D}/usr/lib/python2.6/site-packages/xapian.py? +} + +do_stage () { + autotools_stage_all +} + -- cgit v1.2.3 From fec8c1fb53956b88b1ee105d22ce509803786b5f Mon Sep 17 00:00:00 2001 From: Elena Grandi Date: Mon, 24 Aug 2009 10:01:22 +0200 Subject: sugar-datastore: added runtime dependency on the xapian bindings --- recipes/sugar/sugar-datastore_0.84.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/sugar/sugar-datastore_0.84.0.bb b/recipes/sugar/sugar-datastore_0.84.0.bb index dde2748974..63fb91cb83 100644 --- a/recipes/sugar/sugar-datastore_0.84.0.bb +++ b/recipes/sugar/sugar-datastore_0.84.0.bb @@ -4,7 +4,7 @@ LICENSE = "GPLv2" PR = "r0" DEPENDS = "sugar-toolkit python-xappy " -RDEPENDS = "sugar-toolkit sugar-base python-xappy python-cjson" +RDEPENDS = "sugar-toolkit sugar-base python-xappy python-cjson xapian-bindings-python" SRC_URI = "http://download.sugarlabs.org/sources/sucrose/glucose/sugar-datastore/${PN}-${PV}.tar.bz2" -- cgit v1.2.3 From a701cc1e0a60097561dd2be7784f5dd8e6295a5a Mon Sep 17 00:00:00 2001 From: Steffen Sledz Date: Mon, 24 Aug 2009 10:13:14 +0200 Subject: linux-2.6.24: enable initrd support for hipox machine --- recipes/linux/linux-2.6.24/hipox/defconfig | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/recipes/linux/linux-2.6.24/hipox/defconfig b/recipes/linux/linux-2.6.24/hipox/defconfig index 62c6d16f6b..a1482fbf4b 100644 --- a/recipes/linux/linux-2.6.24/hipox/defconfig +++ b/recipes/linux/linux-2.6.24/hipox/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.24.4 -# Wed Jul 29 12:54:46 2009 +# Mon Aug 24 09:09:25 2009 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -48,7 +48,8 @@ CONFIG_LOG_BUF_SHIFT=14 # CONFIG_FAIR_GROUP_SCHED is not set CONFIG_SYSFS_DEPRECATED=y # CONFIG_RELAY is not set -# CONFIG_BLK_DEV_INITRD is not set +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_SYSCTL=y # CONFIG_EMBEDDED is not set -- cgit v1.2.3 From 0066ccb83118f8a7593dd589c8344af9b7afc2eb Mon Sep 17 00:00:00 2001 From: Elena Grandi Date: Mon, 24 Aug 2009 10:37:44 +0200 Subject: xapian-core: moved common lines in xapian-core.inc --- recipes/xapian/xapian-core.inc | 15 +++++++++++++++ recipes/xapian/xapian-core_1.0.13.bb | 17 +---------------- recipes/xapian/xapian-core_1.0.14.bb | 17 +---------------- recipes/xapian/xapian-core_1.0.5.bb | 17 +---------------- recipes/xapian/xapian-core_1.0.7.bb | 17 +---------------- 5 files changed, 19 insertions(+), 64 deletions(-) create mode 100644 recipes/xapian/xapian-core.inc diff --git a/recipes/xapian/xapian-core.inc b/recipes/xapian/xapian-core.inc new file mode 100644 index 0000000000..080de127ad --- /dev/null +++ b/recipes/xapian/xapian-core.inc @@ -0,0 +1,15 @@ +DESCRPITION = "Open Source Search Engine Library" +HOMEPAGE = "http://xapian.org" +SECTION = "devel/libs" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "zlib" + +SRC_URI = "http://www.oligarchy.co.uk/xapian/${PV}/xapian-core-${PV}.tar.gz" + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} + diff --git a/recipes/xapian/xapian-core_1.0.13.bb b/recipes/xapian/xapian-core_1.0.13.bb index 5987b09491..5428d8d135 100644 --- a/recipes/xapian/xapian-core_1.0.13.bb +++ b/recipes/xapian/xapian-core_1.0.13.bb @@ -1,16 +1 @@ -DESCRPITION = "Open Source Search Engine Library" -HOMEPAGE = "http://xapian.org" -SECTION = "devel/libs" -PRIORITY = "optional" -LICENSE = "GPL" -DEPENDS = "zlib" -PR = "r0" - -SRC_URI = "http://www.oligarchy.co.uk/xapian/${PV}/xapian-core-${PV}.tar.gz" - -inherit autotools pkgconfig - -do_stage () { - autotools_stage_all -} - +include xapian-core.inc diff --git a/recipes/xapian/xapian-core_1.0.14.bb b/recipes/xapian/xapian-core_1.0.14.bb index 5987b09491..5428d8d135 100644 --- a/recipes/xapian/xapian-core_1.0.14.bb +++ b/recipes/xapian/xapian-core_1.0.14.bb @@ -1,16 +1 @@ -DESCRPITION = "Open Source Search Engine Library" -HOMEPAGE = "http://xapian.org" -SECTION = "devel/libs" -PRIORITY = "optional" -LICENSE = "GPL" -DEPENDS = "zlib" -PR = "r0" - -SRC_URI = "http://www.oligarchy.co.uk/xapian/${PV}/xapian-core-${PV}.tar.gz" - -inherit autotools pkgconfig - -do_stage () { - autotools_stage_all -} - +include xapian-core.inc diff --git a/recipes/xapian/xapian-core_1.0.5.bb b/recipes/xapian/xapian-core_1.0.5.bb index 2af709324f..5428d8d135 100644 --- a/recipes/xapian/xapian-core_1.0.5.bb +++ b/recipes/xapian/xapian-core_1.0.5.bb @@ -1,16 +1 @@ -DESCRPITION = "Open Source Search Engine Library" -HOMEPAGE = "http://xapian.org" -SECTION = "devel/libs" -PRIORITY = "optional" -LICENSE = "GPL" -DEPENDS = "zlib" -PR = "r0" - -SRC_URI = "http://www.oligarchy.co.uk/xapian/1.0.5/xapian-core-${PV}.tar.gz" - -inherit autotools - -do_stage () { - autotools_stage_all -} - +include xapian-core.inc diff --git a/recipes/xapian/xapian-core_1.0.7.bb b/recipes/xapian/xapian-core_1.0.7.bb index 289cae4ead..5428d8d135 100644 --- a/recipes/xapian/xapian-core_1.0.7.bb +++ b/recipes/xapian/xapian-core_1.0.7.bb @@ -1,16 +1 @@ -DESCRPITION = "Open Source Search Engine Library" -HOMEPAGE = "http://xapian.org" -SECTION = "devel/libs" -PRIORITY = "optional" -LICENSE = "GPL" -DEPENDS = "zlib" -PR = "r0" - -SRC_URI = "http://www.oligarchy.co.uk/xapian/${PV}/xapian-core-${PV}.tar.gz" - -inherit autotools - -do_stage () { - autotools_stage_all -} - +include xapian-core.inc -- cgit v1.2.3 From 4f2d35ae98ab9f9fc7512ff91a3deeb842e5205b Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Mon, 24 Aug 2009 11:29:07 +0200 Subject: libecj-bootstrap 3.5: Set DEFAULT_PREFERENCE to -1. --- recipes/ecj/libecj-bootstrap_3.5.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipes/ecj/libecj-bootstrap_3.5.bb b/recipes/ecj/libecj-bootstrap_3.5.bb index 1665b337b6..005000eb4b 100644 --- a/recipes/ecj/libecj-bootstrap_3.5.bb +++ b/recipes/ecj/libecj-bootstrap_3.5.bb @@ -1,3 +1,7 @@ +# Causes problems with openjdk/icedtea. See Eclipse bug eclipse bug #285466 +# Might get fixed in IcedTea 1.6 +DEFAULT_PREFERENCE = "-1" + require libecj-bootstrap.inc PR = "r0" -- cgit v1.2.3 From 111ed2d52569e4865a5cd32fcbefce78c46f8565 Mon Sep 17 00:00:00 2001 From: Elena Grandi Date: Mon, 24 Aug 2009 17:19:55 +0200 Subject: sugar-base: fixed renamed dependency openssh-keygen --- recipes/sugar/sugar-base_0.84.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/sugar/sugar-base_0.84.1.bb b/recipes/sugar/sugar-base_0.84.1.bb index e95a43e3a9..c96cbf9470 100644 --- a/recipes/sugar/sugar-base_0.84.1.bb +++ b/recipes/sugar/sugar-base_0.84.1.bb @@ -25,7 +25,7 @@ RDEPENDS = "librsvg-gtk \ python-pydoc \ python-mmap \ python-doctest \ - ssh-keygen" + openssh-keygen" SRC_URI = "http://download.sugarlabs.org/sources/sucrose/glucose/sugar-base/${PN}-${PV}.tar.bz2" -- cgit v1.2.3 From dc929c2ebce4bd676cf725f9972de9604ed2db4d Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Mon, 13 Jul 2009 14:59:40 -0400 Subject: mesa-dri: set PACKAGE_ARCH to ${MACHINE} ${MACHINE_DRI_MODULES} is passed to configure, so the package output depends on MACHINE. As foretold by commit f06119fc :) Also switch to INC_PR and fix built of mesa-xprogs when prefix != /usr. Signed-off-by: Michael Smith --- recipes/mesa/mesa-common.inc | 10 +++++++++- recipes/mesa/mesa-dri_7.2.bb | 7 +------ recipes/mesa/mesa-dri_7.4.bb | 7 +------ recipes/mesa/mesa-dri_git.bb | 3 +-- 4 files changed, 12 insertions(+), 15 deletions(-) diff --git a/recipes/mesa/mesa-common.inc b/recipes/mesa/mesa-common.inc index 9cd10eb3e3..4f18c2f710 100644 --- a/recipes/mesa/mesa-common.inc +++ b/recipes/mesa/mesa-common.inc @@ -4,6 +4,8 @@ DESCRIPTION = "An open source implementation of the OpenGL spec" HOMEPAGE = "http://mesa3d.org" LICENSE = "MIT" +INC_PR = "r7" + SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 \ ${SOURCEFORGE_MIRROR}/mesa3d/MesaDemos-${PV}.tar.bz2 " S = "${WORKDIR}/Mesa-${PV}" @@ -20,6 +22,9 @@ EXTRA_OECONF = "--enable-glu \ require mesa-tls.inc EXTRA_OECONF += "${@get_tls_setting(bb, d)} " +# Package contents vary according to ${MACHINE_DRI_MODULES}. +PACKAGE_ARCH = "${MACHINE}" + PACKAGES =+ "libglu libglu-dev libosmesa libosmesa-dev libgl libgl-dev" FILES_libgl = "${libdir}/libGL.so.*" FILES_libglu = "${libdir}/libGLU.so.*" @@ -36,4 +41,7 @@ do_stage() { cp -pPr ${S}/include/GL/internal* ${STAGING_INCDIR}/GL/ } - +do_install_append () { + install -d ${D}/${bindir} + install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/${bindir} +} diff --git a/recipes/mesa/mesa-dri_7.2.bb b/recipes/mesa/mesa-dri_7.2.bb index 296a254841..93568432bc 100644 --- a/recipes/mesa/mesa-dri_7.2.bb +++ b/recipes/mesa/mesa-dri_7.2.bb @@ -6,7 +6,7 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes" DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" PE = "1" -PR = "r6" +PR = "${INC_PR}.0" # most of our targets do not have DRI so will use mesa-xlib DEFAULT_PREFERENCE = "-1" @@ -21,8 +21,3 @@ FILES_${PN}-dbg += "${libdir}/dri/.debug/*" FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo" EXTRA_OECONF += "--with-driver=dri --with-dri-drivers=swrast,${MACHINE_DRI_MODULES}" - -do_install_append () { - install -d ${D}/usr/bin - install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/usr/bin/ -} diff --git a/recipes/mesa/mesa-dri_7.4.bb b/recipes/mesa/mesa-dri_7.4.bb index 296a254841..93568432bc 100644 --- a/recipes/mesa/mesa-dri_7.4.bb +++ b/recipes/mesa/mesa-dri_7.4.bb @@ -6,7 +6,7 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes" DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" PE = "1" -PR = "r6" +PR = "${INC_PR}.0" # most of our targets do not have DRI so will use mesa-xlib DEFAULT_PREFERENCE = "-1" @@ -21,8 +21,3 @@ FILES_${PN}-dbg += "${libdir}/dri/.debug/*" FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo" EXTRA_OECONF += "--with-driver=dri --with-dri-drivers=swrast,${MACHINE_DRI_MODULES}" - -do_install_append () { - install -d ${D}/usr/bin - install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/usr/bin/ -} diff --git a/recipes/mesa/mesa-dri_git.bb b/recipes/mesa/mesa-dri_git.bb index bca681c76d..4ca1b73122 100644 --- a/recipes/mesa/mesa-dri_git.bb +++ b/recipes/mesa/mesa-dri_git.bb @@ -6,7 +6,7 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes" DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" PV = "7.2+gitr${SRCREV}" -PR = "r1" +PR = "${INC_PR}.0" PE = "1" DEFAULT_PREFERENCE = "-1" @@ -18,4 +18,3 @@ FILES_${PN} += "${libdir}/dri/*.so" FILES_${PN}-dbg += "${libdir}/dri/.debug/*" EXTRA_OECONF += "--with-driver=dri --with-dri-drivers=swrast,${MACHINE_DRI_MODULES}" - -- cgit v1.2.3 From dfe2bb428bb6db6938859927a8004caa167b96a8 Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Mon, 13 Jul 2009 15:07:18 -0400 Subject: mesa-dri: move tls configure logic to a class Will allow reuse by xorg-xserver. Signed-off-by: Michael Smith --- classes/glx-use-tls.bbclass | 7 +++++++ recipes/mesa/mesa-common.inc | 3 +-- recipes/mesa/mesa-tls.inc | 6 ------ 3 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 classes/glx-use-tls.bbclass delete mode 100644 recipes/mesa/mesa-tls.inc diff --git a/classes/glx-use-tls.bbclass b/classes/glx-use-tls.bbclass new file mode 100644 index 0000000000..7530872fa4 --- /dev/null +++ b/classes/glx-use-tls.bbclass @@ -0,0 +1,7 @@ +def get_tls_setting(bb, d): + # until we have no prober TLS support in uclibc disable it + if bb.data.getVar('TARGET_OS', d, 1).find('uclibc') >= 0 : + return "" + return "--enable-glx-tls" + +EXTRA_OECONF += "${@get_tls_setting(bb, d)}" diff --git a/recipes/mesa/mesa-common.inc b/recipes/mesa/mesa-common.inc index 4f18c2f710..d7bfc148c5 100644 --- a/recipes/mesa/mesa-common.inc +++ b/recipes/mesa/mesa-common.inc @@ -19,8 +19,7 @@ EXTRA_OECONF = "--enable-glu \ --disable-glut \ " -require mesa-tls.inc -EXTRA_OECONF += "${@get_tls_setting(bb, d)} " +inherit glx-use-tls # Package contents vary according to ${MACHINE_DRI_MODULES}. PACKAGE_ARCH = "${MACHINE}" diff --git a/recipes/mesa/mesa-tls.inc b/recipes/mesa/mesa-tls.inc deleted file mode 100644 index 1472aa7e74..0000000000 --- a/recipes/mesa/mesa-tls.inc +++ /dev/null @@ -1,6 +0,0 @@ - -def get_tls_setting(bb, d): - # until we have no prober TLS support in uclibc disable it - if bb.data.getVar('TARGET_OS', d, 1).find('uclibc') >= 0 : - return "" - return "--enable-glx-tls" -- cgit v1.2.3 From faac35c7aa18054c8d0eb4348ab252d249ba8bf4 Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Mon, 13 Jul 2009 15:27:48 -0400 Subject: xorg-xserver-common: pass --enable-glx-tls Uses the same inherit as mesa-dri, so they both get the same answer. Also switch to INC_PR. Signed-off-by: Michael Smith --- recipes/xorg-xserver/xorg-xserver-common.inc | 4 +++- recipes/xorg-xserver/xserver-xorg_1.2.0.bb | 2 +- recipes/xorg-xserver/xserver-xorg_1.3.0.0.bb | 2 +- recipes/xorg-xserver/xserver-xorg_1.4.2.bb | 2 +- recipes/xorg-xserver/xserver-xorg_1.4.bb | 2 +- recipes/xorg-xserver/xserver-xorg_1.5.1.bb | 2 +- recipes/xorg-xserver/xserver-xorg_1.5.3.bb | 2 +- recipes/xorg-xserver/xserver-xorg_1.6.1.bb | 2 +- 8 files changed, 10 insertions(+), 8 deletions(-) diff --git a/recipes/xorg-xserver/xorg-xserver-common.inc b/recipes/xorg-xserver/xorg-xserver-common.inc index ec565154b1..cfd350e886 100644 --- a/recipes/xorg-xserver/xorg-xserver-common.inc +++ b/recipes/xorg-xserver/xorg-xserver-common.inc @@ -2,6 +2,8 @@ HOMEPAGE = "http://www.x.org" SECTION = "x11/base" LICENSE = "MIT-X" +INC_PR = "r12" + PROVIDES = "virtual/xserver" DEPENDS = "hal fontconfig freetype flex-native lbxutil kbproto \ @@ -21,7 +23,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" -inherit autotools pkgconfig +inherit autotools pkgconfig glx-use-tls EXTRA_OECONF += " --enable-xcalibrate \ --enable-kdrive \ diff --git a/recipes/xorg-xserver/xserver-xorg_1.2.0.bb b/recipes/xorg-xserver/xserver-xorg_1.2.0.bb index 61f73b3454..50d182c2ea 100644 --- a/recipes/xorg-xserver/xserver-xorg_1.2.0.bb +++ b/recipes/xorg-xserver/xserver-xorg_1.2.0.bb @@ -2,7 +2,7 @@ MESA_VER = "6.5.2" require xorg-xserver-common.inc PE = "1" -PR = "r4" +PR = "${INC_PR}.0" export LDFLAGS += " -ldl " diff --git a/recipes/xorg-xserver/xserver-xorg_1.3.0.0.bb b/recipes/xorg-xserver/xserver-xorg_1.3.0.0.bb index 9d6dca4489..1efea750a5 100644 --- a/recipes/xorg-xserver/xserver-xorg_1.3.0.0.bb +++ b/recipes/xorg-xserver/xserver-xorg_1.3.0.0.bb @@ -2,7 +2,7 @@ MESA_VER = "6.5.2" require xorg-xserver-common.inc PE = "1" -PR = "r8" +PR = "${INC_PR}.0" SRC_URI += "file://drmfix.patch;patch=1 \ file://glyphstr.patch;patch=1" diff --git a/recipes/xorg-xserver/xserver-xorg_1.4.2.bb b/recipes/xorg-xserver/xserver-xorg_1.4.2.bb index 2c4f3d8716..13cceb96fd 100644 --- a/recipes/xorg-xserver/xserver-xorg_1.4.2.bb +++ b/recipes/xorg-xserver/xserver-xorg_1.4.2.bb @@ -4,7 +4,7 @@ DESCRIPTION = "the X.Org X server" DEPENDS += "pixman" RDEPENDS += "hal" PE = "1" -PR = "r11" +PR = "${INC_PR}.0" SRC_URI += "file://drmfix.patch;patch=1 \ file://pkgconfig_fix.patch;patch=1 \ diff --git a/recipes/xorg-xserver/xserver-xorg_1.4.bb b/recipes/xorg-xserver/xserver-xorg_1.4.bb index cb9ddcd9d3..edd1ac0865 100644 --- a/recipes/xorg-xserver/xserver-xorg_1.4.bb +++ b/recipes/xorg-xserver/xserver-xorg_1.4.bb @@ -4,7 +4,7 @@ DESCRIPTION = "the X.Org X server" DEPENDS += "pixman" RDEPENDS += "hal" PE = "1" -PR = "r9" +PR = "${INC_PR}.0" SRC_URI += "file://drmfix.patch;patch=1 \ file://pkgconfig_fix.patch;patch=1 \ diff --git a/recipes/xorg-xserver/xserver-xorg_1.5.1.bb b/recipes/xorg-xserver/xserver-xorg_1.5.1.bb index d4b8caffa0..4c2efd55fc 100644 --- a/recipes/xorg-xserver/xserver-xorg_1.5.1.bb +++ b/recipes/xorg-xserver/xserver-xorg_1.5.1.bb @@ -4,7 +4,7 @@ DESCRIPTION = "the X.Org X server" DEPENDS += "pixman libpciaccess openssl" RDEPENDS += "hal" PE = "1" -PR = "r3" +PR = "${INC_PR}.0" SRC_URI += "file://drmfix.patch;patch=1 \ file://sysroot_fix.patch;patch=1" diff --git a/recipes/xorg-xserver/xserver-xorg_1.5.3.bb b/recipes/xorg-xserver/xserver-xorg_1.5.3.bb index 74ea3c41e5..39697246e3 100644 --- a/recipes/xorg-xserver/xserver-xorg_1.5.3.bb +++ b/recipes/xorg-xserver/xserver-xorg_1.5.3.bb @@ -4,7 +4,7 @@ DESCRIPTION = "the X.Org X server" DEPENDS += "pixman libpciaccess openssl" RDEPENDS += "hal" PE = "2" -PR = "r5" +PR = "${INC_PR}.0" SRC_URI += "file://drmfix.patch;patch=1 \ file://sysroot_fix.patch;patch=1 \ diff --git a/recipes/xorg-xserver/xserver-xorg_1.6.1.bb b/recipes/xorg-xserver/xserver-xorg_1.6.1.bb index d8379eb396..5218fde00e 100644 --- a/recipes/xorg-xserver/xserver-xorg_1.6.1.bb +++ b/recipes/xorg-xserver/xserver-xorg_1.6.1.bb @@ -4,7 +4,7 @@ DESCRIPTION = "the X.Org X server" DEPENDS += "pixman libpciaccess openssl xineramaproto libxinerama" RDEPENDS += "hal" PE = "2" -PR = "r1" +PR = "${INC_PR}.0" SRC_URI += "file://sysroot_fix.patch;patch=1 \ file://dolt-fix.patch;patch=1" -- cgit v1.2.3 From e0041be7a72a025f0f292990161fc2158c1981e6 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 24 Aug 2009 20:25:59 +0200 Subject: linux-omap 2.6.29: update holes patch, make iommu modular for beagle --- conf/machine/include/omap3.inc | 2 +- recipes/linux/linux-omap-2.6.29/arch-has-holes.diff | 2 +- recipes/linux/linux-omap-2.6.29/beagleboard/defconfig | 2 +- recipes/linux/linux-omap-pm-2.6.29/arch-has-holes.diff | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc index 7d404a4f65..163c9c901a 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 = "r42" +MACHINE_KERNEL_PR = "r43" KERNEL_IMAGETYPE = "uImage" diff --git a/recipes/linux/linux-omap-2.6.29/arch-has-holes.diff b/recipes/linux/linux-omap-2.6.29/arch-has-holes.diff index 82cb12c575..f3935eb90a 100644 --- a/recipes/linux/linux-omap-2.6.29/arch-has-holes.diff +++ b/recipes/linux/linux-omap-2.6.29/arch-has-holes.diff @@ -124,7 +124,7 @@ diff -purN git2/arch/arm/mm/init.c git/arch/arm/mm/init.c + +static int __init meminfo_cmp(const void *_a, const void *_b) { + const struct membank *a = _a, *b = _b; -+ long cmp = bank_pfn_start(b) - bank_pfn_start(a); ++ long cmp = bank_pfn_start(a) - bank_pfn_start(b); + return cmp < 0 ? -1 : cmp > 0 ? 1 : 0; } + void __init bootmem_init(void) diff --git a/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig b/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig index 7da8bb9f2b..c9f8e9962b 100644 --- a/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig +++ b/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig @@ -199,7 +199,7 @@ CONFIG_OMAP_BOOT_REASON=y # CONFIG_OMAP_MUX is not set CONFIG_OMAP_MCBSP=y # CONFIG_OMAP_MBOX_FWK is not set -CONFIG_OMAP_IOMMU=y +CONFIG_OMAP_IOMMU=m # CONFIG_OMAP_MPU_TIMER is not set CONFIG_OMAP_32K_TIMER=y CONFIG_OMAP_32K_TIMER_HZ=128 diff --git a/recipes/linux/linux-omap-pm-2.6.29/arch-has-holes.diff b/recipes/linux/linux-omap-pm-2.6.29/arch-has-holes.diff index 82cb12c575..f3935eb90a 100644 --- a/recipes/linux/linux-omap-pm-2.6.29/arch-has-holes.diff +++ b/recipes/linux/linux-omap-pm-2.6.29/arch-has-holes.diff @@ -124,7 +124,7 @@ diff -purN git2/arch/arm/mm/init.c git/arch/arm/mm/init.c + +static int __init meminfo_cmp(const void *_a, const void *_b) { + const struct membank *a = _a, *b = _b; -+ long cmp = bank_pfn_start(b) - bank_pfn_start(a); ++ long cmp = bank_pfn_start(a) - bank_pfn_start(b); + return cmp < 0 ? -1 : cmp > 0 ? 1 : 0; } + void __init bootmem_init(void) -- cgit v1.2.3 From 743aaf30cc10e1490bbc126cfe96f94695dca32c Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Tue, 16 Jun 2009 10:32:23 -0700 Subject: distutils-common-base.bbclass: only raise missing python-native error if python-native isn't in DEPENDS. Signed-off-by: Chris Larson Acked-by: Michael 'Mickey' Lauer --- classes/distutils-common-base.bbclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/classes/distutils-common-base.bbclass b/classes/distutils-common-base.bbclass index 9ca392b84a..01bf9eaeba 100644 --- a/classes/distutils-common-base.bbclass +++ b/classes/distutils-common-base.bbclass @@ -8,7 +8,9 @@ def python_dir(d): staging_incdir = bb.data.getVar( "STAGING_INCDIR", d, 1 ) for majmin in "2.6 2.5 2.4 2.3".split(): if os.path.exists( "%s/python%s" % ( staging_incdir, majmin ) ): return "python%s" % majmin - raise "No Python in STAGING_INCDIR. Forgot to build python-native ?" + if not "python-native" in bb.data.getVar( "DEPENDS", d, 1 ).split(): + raise "No Python in STAGING_INCDIR. Forgot to build python-native ?" + return "INVALID" PYTHON_DIR = "${@python_dir(d)}" -- cgit v1.2.3 From d149d261d3a8b1bb192469b68f6389801fe82fff Mon Sep 17 00:00:00 2001 From: Jeremy Puhlman Date: Fri, 3 Apr 2009 15:49:06 -0700 Subject: bitbake.conf: Add export for cross NM. When not providing a cross nm, the configure for libtool-cross falls back to the system nm. This can lead to empty "global_symbol_pipe" and "global_symbol_to_cdeclvarble" variables in the generated libtool script. Signed-off-by: Jeremy Puhlman Signed-off-by: Chris Larson Acked-by: Holger Hans Peter Freyther --- conf/bitbake.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/bitbake.conf b/conf/bitbake.conf index c4af34e8d7..c2f7666ef2 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -405,6 +405,7 @@ export RANLIB = "${HOST_PREFIX}ranlib" export STRIP = "${HOST_PREFIX}strip" export OBJCOPY = "${HOST_PREFIX}objcopy" export OBJDUMP = "${HOST_PREFIX}objdump" +export NM = "${HOST_PREFIX}nm" PYTHON = "${@sys.executable}" export BUILD_CC = "${CCACHE}${BUILD_PREFIX}gcc ${BUILD_CC_ARCH}" -- cgit v1.2.3 From 278cec5e0eba9ce1d18ac4eb0699ce3ee167168f Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Tue, 28 Jul 2009 12:29:51 -0700 Subject: kernel.bbclass: Install & package symvers as /boot/Module.symvers-. Signed-off-by: Chris Larson Acked-by: Michael Smith --- classes/kernel.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index d084cefee8..4cf5bed448 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -182,6 +182,7 @@ kernel_do_install() { install -m 0644 System.map ${D}/boot/System.map-${KERNEL_VERSION} install -m 0644 .config ${D}/boot/config-${KERNEL_VERSION} install -m 0644 vmlinux ${D}/boot/vmlinux-${KERNEL_VERSION} + [ -e Module.symvers ] && install -m 0644 Module.symvers ${D}/boot/Module.symvers-${KERNEL_VERSION} install -d ${D}/etc/modutils if [ "${KERNEL_MAJOR_VERSION}" = "2.6" ]; then install -d ${D}/etc/modprobe.d @@ -232,7 +233,7 @@ EXPORT_FUNCTIONS do_compile do_install do_stage do_configure PACKAGES = "kernel kernel-base kernel-image kernel-dev kernel-vmlinux" FILES = "" FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*" -FILES_kernel-dev = "/boot/System.map* /boot/config*" +FILES_kernel-dev = "/boot/System.map* /boot/Module.symvers* /boot/config*" FILES_kernel-vmlinux = "/boot/vmlinux*" RDEPENDS_kernel = "kernel-base" RRECOMMENDS_kernel-module-hostap-cs += '${@base_version_less_or_equal("KERNEL_VERSION", "2.6.17", "", "apm-wifi-suspendfix", d)}' -- cgit v1.2.3 From 34cd6c2a37c03d694ba98414e902b9250cd67b77 Mon Sep 17 00:00:00 2001 From: Dale Farnsworth Date: Tue, 21 Jul 2009 11:32:21 -0700 Subject: kernel.bbclass: Set EXTRA_OEMAKE to null for kernel Currently the only thing in EXTRA_OEMAKE is '-e MAKEFLAGS='. We don't want to overide the kernel's Makefile variables from the environment. It caused the passed -j parameter from PARALLEL_MAKE to be ignored. Signed-off-by: Dale Farnsworth Signed-off-by: Chris Larson Acked-by: Denys Dmytriyenko --- classes/kernel.bbclass | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 4cf5bed448..c5192d59d4 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -78,6 +78,10 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" UBOOT_ENTRYPOINT ?= "20008000" UBOOT_LOADADDRESS ?= "${UBOOT_ENTRYPOINT}" +# For the kernel, we don't want the '-e MAKEFLAGS=' in EXTRA_OEMAKE. +# We don't want to override kernel Makefile variables from the environment +EXTRA_OEMAKE = "" + kernel_do_compile() { unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE oe_runmake include/linux/version.h CC="${KERNEL_CC}" LD="${KERNEL_LD}" -- cgit v1.2.3 From c62f14e1aa31dd1b6d67e298108486163b61de59 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Mon, 24 Aug 2009 21:13:14 +0000 Subject: subversion: Updated to version 1.6.5. Deleted old unused versions. --- conf/checksums.ini | 4 ++++ recipes/subversion/files/apr-regex.patch | 19 ---------------- recipes/subversion/files/libtool.patch | 12 ----------- recipes/subversion/subversion_1.3.1.bb | 25 --------------------- recipes/subversion/subversion_1.4.0.bb | 28 ------------------------ recipes/subversion/subversion_1.4.5.bb | 37 -------------------------------- recipes/subversion/subversion_1.6.5.bb | 29 +++++++++++++++++++++++++ 7 files changed, 33 insertions(+), 121 deletions(-) delete mode 100644 recipes/subversion/files/apr-regex.patch delete mode 100644 recipes/subversion/files/libtool.patch delete mode 100644 recipes/subversion/subversion_1.3.1.bb delete mode 100644 recipes/subversion/subversion_1.4.0.bb delete mode 100644 recipes/subversion/subversion_1.4.5.bb create mode 100644 recipes/subversion/subversion_1.6.5.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index 65cdb67501..6104853154 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -23038,6 +23038,10 @@ sha256=763b8c9c16c03adc3ad00ccf1b5b47a08b5ffe94e499d3c87bb02acbc1026b53 md5=6f3701a0f2acf3fe53093491ba3d77ee sha256=88cf24ba5d589351791709ff7556ababc019ec59f3240ac2087dacabb9ad77be +[http://subversion.tigris.org/downloads/subversion-1.6.5.tar.bz2] +md5=1a53a0e72bee0bf814f4da83a9b6a636 +sha256=64331bda459e984b8d369b449eec89daa2f3cd288186f1d2a9ad8011badd4dad + [http://ftp.sudo.ws/sudo/dist/sudo-1.6.8p12.tar.gz] md5=b29893c06192df6230dd5f340f3badf5 sha256=56f7d86032538a4a98d90af3742903a09ba16d6db82b593e4a47605f87fa581a diff --git a/recipes/subversion/files/apr-regex.patch b/recipes/subversion/files/apr-regex.patch deleted file mode 100644 index 4f1f50a7d5..0000000000 --- a/recipes/subversion/files/apr-regex.patch +++ /dev/null @@ -1,19 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- subversion-1.3.1/configure~apr-regex -+++ subversion-1.3.1/configure -@@ -2933,9 +2933,9 @@ - - - --APR_VER_REGEX="0\.9\.[5-9]" -+APR_VER_REGEX="0\.9\.12" - APR_VER_REGEX_TOO="1\." --APU_VER_REGEX="0\.9\.[5-9]" -+APU_VER_REGEX="0\.9\.12" - APU_VER_REGEX_TOO="1\." - - diff --git a/recipes/subversion/files/libtool.patch b/recipes/subversion/files/libtool.patch deleted file mode 100644 index d296806b12..0000000000 --- a/recipes/subversion/files/libtool.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: subversion-1.4.5/configure.in -=================================================================== ---- subversion-1.4.5.orig/configure.in 2007-01-01 14:41:51.000000000 +0000 -+++ subversion-1.4.5/configure.in 2009-04-30 21:19:12.000000000 +0000 -@@ -11,6 +11,7 @@ - - AC_CONFIG_SRCDIR(subversion/include/svn_types.h) - AC_CONFIG_AUX_DIR([build]) -+AC_CONFIG_MACRO_DIR([build/ac-macros]) - - AC_MSG_NOTICE([Configuring Subversion ]AC_PACKAGE_VERSION) - diff --git a/recipes/subversion/subversion_1.3.1.bb b/recipes/subversion/subversion_1.3.1.bb deleted file mode 100644 index 79e5e67d7b..0000000000 --- a/recipes/subversion/subversion_1.3.1.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "The Subversion (svn) client" -SECTION = "console/network" -DEPENDS = "apr-util-0.9.12 neon" -LICENSE = "Apache BSD" -HOMEPAGE = "http://subversion.tigris.org" -PR = "r1" - -SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \ - file://disable-revision-install.patch;patch=1 \ - file://apr-regex.patch;patch=1" - -EXTRA_OECONF = "--with-neon=${STAGING_EXECPREFIXDIR} \ - --without-berkeley-db --without-apxs --without-apache \ - --without-swig --with-apr=${STAGING_BINDIR_CROSS} \ - --with-apr-util=${STAGING_BINDIR_CROSS}" - -inherit autotools - -do_configure() { - oe_runconf -} - -do_stage() { - autotools_stage_all -} diff --git a/recipes/subversion/subversion_1.4.0.bb b/recipes/subversion/subversion_1.4.0.bb deleted file mode 100644 index 305b13c6a4..0000000000 --- a/recipes/subversion/subversion_1.4.0.bb +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION = "The Subversion (svn) client" -SECTION = "console/network" -DEPENDS = "apr-util neon" -RDEPENDS = "neon" -LICENSE = "Apache BSD" -HOMEPAGE = "http://subversion.tigris.org" -PR = "r1" - -SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \ - file://disable-revision-install.patch;patch=1 \ - file://neon-detection.patch;patch=1" - -EXTRA_OECONF = "--with-neon=${STAGING_EXECPREFIXDIR} \ - --without-berkeley-db --without-apxs --without-apache \ - --without-swig --with-apr=${STAGING_BINDIR_CROSS} \ - --with-apr-util=${STAGING_BINDIR_CROSS}" - - -inherit autotools - -export LDFLAGS += " -L${STAGING_LIBDIR} " - -do_configure() { - gnu-configize - libtoolize --force - aclocal -I build/ -I build/ac-macros/ && autoconf - oe_runconf -} diff --git a/recipes/subversion/subversion_1.4.5.bb b/recipes/subversion/subversion_1.4.5.bb deleted file mode 100644 index 1029e70c5c..0000000000 --- a/recipes/subversion/subversion_1.4.5.bb +++ /dev/null @@ -1,37 +0,0 @@ -DESCRIPTION = "The Subversion (svn) client" -SECTION = "console/network" -DEPENDS = "apr-util neon" -RDEPENDS = "neon" -LICENSE = "Apache BSD" -HOMEPAGE = "http://subversion.tigris.org" - -PR = "r0" - -SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \ - file://disable-revision-install.patch;patch=1 \ - file://neon-detection.patch;patch=1 \ - file://libtool.patch;patch=1" - -EXTRA_OECONF = "--with-neon=${STAGING_EXECPREFIXDIR} \ - --without-berkeley-db --without-apxs --without-apache \ - --without-swig --with-apr=${STAGING_BINDIR_CROSS} \ - --with-apr-util=${STAGING_BINDIR_CROSS}" - - -inherit autotools - -export LDFLAGS += " -L${STAGING_LIBDIR} " - -acpaths = "-I build/ -I build/ac-macros/" - -# FIXME: Ugly hack! Instead of fully porting to the new libtool, apply libtool.patch and do the rest here. -do_configure_prepend() { - rm -f build/libtool.m4 -} -do_configure_append() { - if ! test -f libtool ; then cp -a *-libtool libtool ; fi -} - -do_stage() { - autotools_stage_all -} diff --git a/recipes/subversion/subversion_1.6.5.bb b/recipes/subversion/subversion_1.6.5.bb new file mode 100644 index 0000000000..50f5e6e5d6 --- /dev/null +++ b/recipes/subversion/subversion_1.6.5.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "The Subversion (svn) client" +SECTION = "console/network" +DEPENDS = "apr-util neon" +RDEPENDS = "neon" +LICENSE = "Apache BSD" +HOMEPAGE = "http://subversion.tigris.org/" + +PR = "r0" + +SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \ + file://disable-revision-install.patch;patch=1" + +EXTRA_OECONF = "--without-berkeley-db --without-apxs --without-apache \ + --without-swig --with-apr=${STAGING_BINDIR_CROSS} \ + --with-apr-util=${STAGING_BINDIR_CROSS}" + + +inherit autotools + +acpaths = "-I build/ac-macros" + +# FIXME: Ugly hack! +do_configure_append() { + if ! test -f libtool ; then cp -a *-libtool libtool ; fi +} + +do_stage() { + autotools_stage_all +} -- cgit v1.2.3 From 97cd9822750689a733b07b01b21acf93f3877e33 Mon Sep 17 00:00:00 2001 From: Dale Farnsworth Date: Wed, 8 Jul 2009 13:47:18 -0700 Subject: patch.bbclass: Add "git" patchtool mechanism, which uses git-apply It can be selected by setting PATCHTOOL = "git". This is useful because git-apply honors the permissions information produced by git-format-patch. Signed-off-by: Dale Farnsworth Signed-off-by: Chris Larson Acked-by: Denys Dmytriyenko --- classes/patch.bbclass | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/classes/patch.bbclass b/classes/patch.bbclass index 2f99e4cf30..dfb8ec960f 100644 --- a/classes/patch.bbclass +++ b/classes/patch.bbclass @@ -189,6 +189,24 @@ def patch_init(d): def Clean(self): """""" + class GitApplyTree(PatchTree): + def __init__(self, dir, d): + PatchTree.__init__(self, dir, d) + + def _applypatch(self, patch, force = False, reverse = False, run = True): + shellcmd = ["git", "--git-dir=.", "apply", "-p%s" % patch['strippath']] + + if reverse: + shellcmd.append('-R') + + shellcmd.append(patch['file']) + + if not run: + return "sh" + "-c" + " ".join(shellcmd) + + return runcmd(["sh", "-c", " ".join(shellcmd)], self.dir) + + class QuiltTree(PatchSet): def _runcmd(self, args, run = True): quiltrc = bb.data.getVar('QUILTRCFILE', self.d, 1) @@ -424,6 +442,7 @@ def patch_init(d): g["PatchSet"] = PatchSet g["PatchTree"] = PatchTree g["QuiltTree"] = QuiltTree + g["GitApplyTree"] = GitApplyTree g["Resolver"] = Resolver g["UserResolver"] = UserResolver g["NOOPResolver"] = NOOPResolver @@ -449,6 +468,7 @@ python patch_do_patch() { patchsetmap = { "patch": PatchTree, "quilt": QuiltTree, + "git": GitApplyTree, } cls = patchsetmap[bb.data.getVar('PATCHTOOL', d, 1) or 'quilt'] -- cgit v1.2.3 From 48c52b45a0296f3cb4c7fda41c259313664521ef Mon Sep 17 00:00:00 2001 From: Evan Doiron Date: Mon, 24 Aug 2009 10:55:08 -0400 Subject: dmidecode: add v2.10 Signed-off-by: Evan Doiron Signed-off-by: Michael Smith Acked-by: Khem Raj --- conf/checksums.ini | 4 ++++ recipes/dmidecode/dmidecode_2.10.bb | 12 ++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 recipes/dmidecode/dmidecode_2.10.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index 6104853154..c67f91afc5 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -4982,6 +4982,10 @@ sha256=f1a6dea51be9798903a0543fb50f463b0594b1f11b897bc50e40825fb7527c61 md5=f92e5606c23a8092f3d5694e8d1c932e sha256=d3be5c6eec24950cb3bd67dbfbcdf036f1278fae5fd78655ef8cdf9e911e428a +[http://savannah.nongnu.org/download/dmidecode/dmidecode-2.10.tar.bz2] +md5=3c9c4d55a40b78600f3b43bfa64616f9 +sha256=4d74a3e93353320317a424816f9a045df06d9ed4b5b80881e16fdfcc74c9e2c0 + [http://savannah.nongnu.org/download/dmidecode/dmidecode-2.9.tar.bz2] md5=3dac4b1817012ffebd78671473d8f56c sha256=888eb2c25bdcef5ee34c38cd5cb0f491d7dd82029dc0f4ae96183a0088a5e015 diff --git a/recipes/dmidecode/dmidecode_2.10.bb b/recipes/dmidecode/dmidecode_2.10.bb new file mode 100644 index 0000000000..d3a646dfd1 --- /dev/null +++ b/recipes/dmidecode/dmidecode_2.10.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "DMI (Desktop Management Interface) table related utilities" +HOMEPAGE = "http://www.nongnu.org/dmidecode/" +LICENSE = "GPLv2" +PR = "r0" + +SRC_URI = "http://savannah.nongnu.org/download/dmidecode/${P}.tar.bz2" + +COMPATIBLE_HOST = "(i.86|x86_64).*-linux" + +do_install() { + oe_runmake DESTDIR="${D}" install +} -- cgit v1.2.3 From 571084dd3f9874b27d918b077cd3e2b694df78e0 Mon Sep 17 00:00:00 2001 From: Evan Doiron Date: Mon, 24 Aug 2009 11:07:08 -0400 Subject: nano: add v2.0.9 Signed-off-by: Evan Doiron Signed-off-by: Michael Smith Acked-by: Khem Raj --- conf/checksums.ini | 4 ++++ recipes/nano/nano_2.0.9.bb | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 recipes/nano/nano_2.0.9.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index c67f91afc5..f0fc4bb306 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -17762,6 +17762,10 @@ sha256=0d10d8f70a6fadfb9cfaa7b66c5fe7eba17e64ecb96104c4ddedc82f89765d5c md5=16187fed2bdefec6275ece6401ce4cd2 sha256=5dc783c412c4d1ff463c450d2a2f9e1ea53a43d9ba1dda92bbf5182f60db532f +[http://www.nano-editor.org/dist/v2.0/nano-2.0.9.tar.gz] +md5=2be94dc43fb60fff4626a2401a977220 +sha256=6d212385680d29dcda35dda7801da19c80182a8bc6bc6d5cf7533034c853d37f + [http://downloads.sourceforge.net/nasm/nasm-0.98.38.tar.bz2] md5=9f682490c132b070d54e395cb6ee145e sha256=87e64eff736196862ed46c04a3dffa612d765df980fa974fc65e026d811bd9d0 diff --git a/recipes/nano/nano_2.0.9.bb b/recipes/nano/nano_2.0.9.bb new file mode 100644 index 0000000000..0951466b82 --- /dev/null +++ b/recipes/nano/nano_2.0.9.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "GNU nano (Nano's ANOther editor, or \ +Not ANOther editor) is an enhanced clone of the \ +Pico text editor." +HOMEPAGE = "http://www.nano-editor.org/" +LICENSE = "GPLv2" +SECTION = "console/utils" +DEPENDS = "ncurses" + +SRC_URI = "http://www.nano-editor.org/dist/v2.0/nano-${PV}.tar.gz \ + file://glib.m4" + +inherit autotools + +# only 16K more to get everything but the kitchen sink +EXTRA_OECONF = "--enable-all" + +do_configure_prepend () { + install -m 0644 ${WORKDIR}/glib.m4 m4/ +} -- cgit v1.2.3 From f1b3ee840783ceb38067e26c05184e723cf0b214 Mon Sep 17 00:00:00 2001 From: Roger Monk Date: Mon, 24 Aug 2009 22:00:51 +0100 Subject: gnome-games: fix previous bad patch -I/SDL error --- recipes/gnome/gnome-games_2.24.0.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes/gnome/gnome-games_2.24.0.bb b/recipes/gnome/gnome-games_2.24.0.bb index cc795e14a5..6449c82c8a 100644 --- a/recipes/gnome/gnome-games_2.24.0.bb +++ b/recipes/gnome/gnome-games_2.24.0.bb @@ -24,7 +24,10 @@ do_configure_prepend() { do_configure_append() { for i in $(find ${S} -name "Makefile") ; do - sed -i -e s:'I/usr/include'::g -e s:'-I /usr/include -I /usr/local/include'::g $i + sed -i \ + -e s:'-I/usr/include/SDL':'-I${STAGING_INCDIR}/SDL':g \ + -e s:'-I/usr/local/include/SDL':'-I${STAGING_INCDIR}/SDL':g \ + $i done } -- cgit v1.2.3 From 1548843c0ee58aadd7d0a2c817e98c47d2c2c4e5 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 25 Aug 2009 12:21:17 +0200 Subject: octave: fix QA issues --- recipes/octave/octave.inc | 4 +++- recipes/octave/octave_3.0.3.bb | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/recipes/octave/octave.inc b/recipes/octave/octave.inc index 440de5c1a0..a7161bbec1 100644 --- a/recipes/octave/octave.inc +++ b/recipes/octave/octave.inc @@ -2,7 +2,7 @@ DESCRIPTION = "Matlab alternative for numerical computations" HOMEPAGE = "http://www.gnu.org/software/octave/" SECTION = "console/scientific" LICENSE = "GPL" -DEPENDS = "readline ncurses fftw" +DEPENDS = "gperf-native readline ncurses fftw" RDEPENDS = "libfftw3" # fftw compiled with --disable-fortran @@ -14,6 +14,8 @@ EXTRA_OECONF = "--without-hdf5 --without-glpk -without-umfpack \ --without-colamd --without-ccolamd --without-cholmod \ --without-cxsparse" +TARGET_CC_ARCH += "${LDFLAGS}" + # additional missing dependency/functionality: Qhull gperf do_configure() { diff --git a/recipes/octave/octave_3.0.3.bb b/recipes/octave/octave_3.0.3.bb index b0fc06557d..c43cf166e0 100644 --- a/recipes/octave/octave_3.0.3.bb +++ b/recipes/octave/octave_3.0.3.bb @@ -1,6 +1,6 @@ require octave.inc -PR = "r1" +PR = "r2" SRC_URI = "ftp://ftp.octave.org/pub/octave/${PN}-${PV}.tar.gz \ file://configure.patch;patch=1" -- cgit v1.2.3 From acdd06bbf06ab549d3e9b35958cb4177c1b88836 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 25 Aug 2009 18:47:57 +0800 Subject: libmusicbrainz: Add version 3.0.2 and fix link error With gcc 4.3 stdc++ symbols leak into the library. One way to solve it is to use a custom linker script, another one is to just point gcc to the c++ library. The second option is used here right now. --- conf/checksums.ini | 4 ++++ recipes/musicbrainz/libmusicbrainz.inc | 19 +++++++++++++++++++ recipes/musicbrainz/libmusicbrainz_3.0.1.bb | 17 +---------------- recipes/musicbrainz/libmusicbrainz_3.0.2.bb | 1 + 4 files changed, 25 insertions(+), 16 deletions(-) create mode 100644 recipes/musicbrainz/libmusicbrainz.inc create mode 100644 recipes/musicbrainz/libmusicbrainz_3.0.2.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index f0fc4bb306..57b86c5a6b 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -14286,6 +14286,10 @@ sha256=c6629c4bed428f9df3f89efc065b2d96f05eba36286532ebe8b8e404022371a0 md5=d42110ae548dae1eea73e83b03a1a936 sha256=243311225a6bdcee065aaabc63334086cdd4298f13def45c7e798201f88d08cc +[ftp://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-3.0.2.tar.gz] +md5=648ecd43f7b80852419aaf73702bc23f +sha256=b9a35e56826239add731cf083108cbc313d4a2d1770e6f5006966daa66a21eda + [ftp://ftp.debian.org/debian/pool/main/libn/libnet0/libnet0_1.0.2a.orig.tar.gz] md5=bf4983ea440542f3ec019cc1bb6ca87d sha256=cf6bf75d590884fa9d0725d4d86afa93211e29cf0c5f333a60bb4e4eb347dc29 diff --git a/recipes/musicbrainz/libmusicbrainz.inc b/recipes/musicbrainz/libmusicbrainz.inc new file mode 100644 index 0000000000..64a7f50794 --- /dev/null +++ b/recipes/musicbrainz/libmusicbrainz.inc @@ -0,0 +1,19 @@ +DEFAULT_PREFERENCE = "-1" + +DESCRIPTION = "The MusicBrainz client is a library which can be built into other programs. \ +It allows you to access the data held on the MusicBrainz server." +HOMEPAGE = "http://musicbrainz.org" +LICENSE = "LGPL" +DEPENDS = "expat neon" + +SRC_URI = "ftp://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-${PV}.tar.gz" + +inherit cmake pkgconfig + +# Fight a compiler/link bug that leaks too many c++ symbols +TARGET_LDFLAGS += " -Wl,-rpath-link,${CROSS_DIR}/${TARGET_SYS}/lib " + +do_stage() { + autotools_stage_all +} + diff --git a/recipes/musicbrainz/libmusicbrainz_3.0.1.bb b/recipes/musicbrainz/libmusicbrainz_3.0.1.bb index e01695eb3d..bd54419686 100644 --- a/recipes/musicbrainz/libmusicbrainz_3.0.1.bb +++ b/recipes/musicbrainz/libmusicbrainz_3.0.1.bb @@ -1,16 +1 @@ -DEFAULT_PREFERENCE = "-1" - -DESCRIPTION = "The MusicBrainz client is a library which can be built into other programs. \ -It allows you to access the data held on the MusicBrainz server." -HOMEPAGE = "http://musicbrainz.org" -LICENSE = "LGPL" -DEPENDS = "expat neon" - -SRC_URI = "http://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-${PV}.tar.gz" - -inherit cmake pkgconfig - -do_stage() { - autotools_stage_all -} - +require ${PN}.inc diff --git a/recipes/musicbrainz/libmusicbrainz_3.0.2.bb b/recipes/musicbrainz/libmusicbrainz_3.0.2.bb new file mode 100644 index 0000000000..bd54419686 --- /dev/null +++ b/recipes/musicbrainz/libmusicbrainz_3.0.2.bb @@ -0,0 +1 @@ +require ${PN}.inc -- cgit v1.2.3 From 8d516d8ef61a6769e7391fb27ff43ff622517e68 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 25 Aug 2009 13:39:19 +0200 Subject: openssh: make openssh-keygen conflict with ssh-keygen (old name of it) Should fix situation after e05310f4958ba6c73488d398325670704401ee70 commit. Before: * Package openssh-keygen wants to install file /usr/bin/ssh-keygen But that file is already provided by package * ssh-keygen After: * ERROR: The following packages conflict with openssh-keygen: * ssh-keygen * --- recipes/openssh/openssh.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/openssh/openssh.inc b/recipes/openssh/openssh.inc index 086c9015ad..9e4ca1467e 100644 --- a/recipes/openssh/openssh.inc +++ b/recipes/openssh/openssh.inc @@ -2,6 +2,7 @@ DEPENDS = "zlib openssl" RCONFLICTS_${PN} = "dropbear" RCONFLICTS_${PN}-sshd = "dropbear" +RCONFLICTS_${PN}-keygen = "ssh-keygen" SECTION = "console/network" DESCRIPTION = "Secure rlogin/rsh/rcp/telnet replacement (OpenSSH) \ @@ -15,7 +16,7 @@ used to provide applications with a secure communication channel." HOMEPAGE = "http://www.openssh.org/" LICENSE = "BSD" -INC_PR = "r7" +INC_PR = "r8" inherit autotools -- cgit v1.2.3 From 344230ab1958b528944f4d11fa8c0200d8ab7930 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 25 Aug 2009 20:13:03 +0800 Subject: oprofile-0.9.5: Add oprofile version 0.9.5 We can drop the other two patches as they have been applied. --- conf/checksums.ini | 4 ++++ recipes/oprofile/oprofile_0.9.5.bb | 27 +++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 recipes/oprofile/oprofile_0.9.5.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index 57b86c5a6b..ab8b320cb5 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -18722,6 +18722,10 @@ sha256=cb1452159036ba7d3003b75dfef38fcbc61503f76adfca2879ebf7766931cade md5=82b059379895cf125261d7d773465915 sha256=cb1452159036ba7d3003b75dfef38fcbc61503f76adfca2879ebf7766931cade +[http://downloads.sourceforge.net/oprofile/oprofile-0.9.5.tar.gz] +md5=4b2ceca3fa013c95cc8d47c790807dc2 +sha256=1cb7c3968e3e01e7597f54b87ebc87a48c6c8e569db7e353adb91841db5b4190 + [http://www.rpsys.net/openzaurus/patches/archive/oprofile_always_bt_arm-r0.patch] md5=9d1e6a9bd4d6dc9cae3c54c18c303ace sha256=e0e33fae512e54ff27474c926a758cf687e35d2c3007f69d4c647b69d47352ae diff --git a/recipes/oprofile/oprofile_0.9.5.bb b/recipes/oprofile/oprofile_0.9.5.bb new file mode 100644 index 0000000000..d89624000d --- /dev/null +++ b/recipes/oprofile/oprofile_0.9.5.bb @@ -0,0 +1,27 @@ +require oprofile.inc + +RDEPENDS += "binutils-symlinks" +RRECOMMENDS += "kernel-vmlinux" +PR = "r3" + +SRC_URI = "\ + ${SOURCEFORGE_MIRROR}/oprofile/oprofile-${PV}.tar.gz \ + file://acinclude.m4 \ + " + +do_stage () { + # As of 0.9.4 there is a libopagent library to compile and link against. + autotools_stage_all +} + +PACKAGES = "${PN}-dev ${PN}-doc ${PN}-dbg ${PN}" + +FILES_${PN} += "\ + ${libdir}/oprofile/libopagent.so.* \ +" + +FILES_${PN}-dev += "\ + ${libdir}/oprofile/lib*.so \ + ${libdir}/oprofile/lib*.a \ + ${libdir}/oprofile/lib*.la \ +" -- cgit v1.2.3 From 2ec03e65ddc5d3c50e0020808577815cb1fd51a4 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 25 Aug 2009 20:42:40 +0800 Subject: gdb: Make 6.8 packages match regarding patches and license 6.8 was the first release to use GPLv3+, make sure the license is set correctly. Also make sure the karmic compile fix is applied for everyone. --- recipes/gdb/gdb-canadian-sdk_6.8.bb | 2 ++ recipes/gdb/gdb-cross-sdk_6.8.bb | 1 + recipes/gdb/gdb-cross_6.8.bb | 4 +++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/recipes/gdb/gdb-canadian-sdk_6.8.bb b/recipes/gdb/gdb-canadian-sdk_6.8.bb index 1eefddc917..db45cfdf16 100644 --- a/recipes/gdb/gdb-canadian-sdk_6.8.bb +++ b/recipes/gdb/gdb-canadian-sdk_6.8.bb @@ -1,8 +1,10 @@ require gdb-canadian-cross.inc +LICENSE = "GPLv3" SRC_URI += "file://gcc-4.3-build-error.patch;patch=1;pnum=0 \ file://gdb-6.8-mingw-3.patch;patch=1 \ file://gdb-6.8-pr9638-ppc-canadian-configh.patch;patch=1 \ + file://gdb-6.8-fix-compile-karmic.patch;patch=1 \ file://gdb-6.8-mips-mingw-sim-fixup.patch;patch=1" PR = "r1" diff --git a/recipes/gdb/gdb-cross-sdk_6.8.bb b/recipes/gdb/gdb-cross-sdk_6.8.bb index 66e1454779..6d6fba7993 100644 --- a/recipes/gdb/gdb-cross-sdk_6.8.bb +++ b/recipes/gdb/gdb-cross-sdk_6.8.bb @@ -1,4 +1,5 @@ require gdb-cross.inc +LICENSE = "GPLv3" SRC_URI += "file://gcc-4.3-build-error.patch;patch=1;pnum=0 \ file://gdb-6.8-fix-compile-karmic.patch;patch=1" diff --git a/recipes/gdb/gdb-cross_6.8.bb b/recipes/gdb/gdb-cross_6.8.bb index 664ab5e323..2c24d4cac8 100644 --- a/recipes/gdb/gdb-cross_6.8.bb +++ b/recipes/gdb/gdb-cross_6.8.bb @@ -1,6 +1,8 @@ require gdb-cross.inc +LICENSE = "GPLv3" -SRC_URI += "file://gcc-4.3-build-error.patch;patch=1;pnum=0" +SRC_URI += "file://gcc-4.3-build-error.patch;patch=1;pnum=0 \ + file://gdb-6.8-fix-compile-karmic.patch;patch=1" inherit cross -- cgit v1.2.3 From 728dd524726daf2810bb383b89a17d035cda45e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= Date: Tue, 25 Aug 2009 18:48:36 +0200 Subject: linux-2.6.29: update lm73 driver for boc01 --- .../linux/linux-2.6.29/boc01/007-081217-lm73.patch | 269 -------------------- .../linux/linux-2.6.29/boc01/007-090825-lm73.patch | 280 +++++++++++++++++++++ recipes/linux/linux-2.6.29/boc01/boc01.dts | 4 + recipes/linux/linux_2.6.29.bb | 2 +- 4 files changed, 285 insertions(+), 270 deletions(-) delete mode 100644 recipes/linux/linux-2.6.29/boc01/007-081217-lm73.patch create mode 100644 recipes/linux/linux-2.6.29/boc01/007-090825-lm73.patch diff --git a/recipes/linux/linux-2.6.29/boc01/007-081217-lm73.patch b/recipes/linux/linux-2.6.29/boc01/007-081217-lm73.patch deleted file mode 100644 index ec2a4e40e8..0000000000 --- a/recipes/linux/linux-2.6.29/boc01/007-081217-lm73.patch +++ /dev/null @@ -1,269 +0,0 @@ -Index: linux-2.6.29/drivers/hwmon/Kconfig -=================================================================== ---- linux-2.6.29.orig/drivers/hwmon/Kconfig 2009-03-24 00:12:14.000000000 +0100 -+++ linux-2.6.29/drivers/hwmon/Kconfig 2009-04-01 17:37:50.000000000 +0200 -@@ -448,6 +448,15 @@ - This driver can also be built as a module. If so, the module - will be called lm70. - -+config SENSORS_LM73 -+ tristate "National Semiconductor LM73" -+ depends on I2C -+ help -+ If you say yes here you get support for National Semiconductor LM73 -+ sensor chips -+ This driver can also be built as a module. If so, the module -+ will be called lm73. -+ - config SENSORS_LM75 - tristate "National Semiconductor LM75 and compatibles" - depends on I2C -Index: linux-2.6.29/drivers/hwmon/lm73.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.29/drivers/hwmon/lm73.c 2009-04-01 17:37:50.000000000 +0200 -@@ -0,0 +1,232 @@ -+ /* -+ * LM73 Sensor driver -+ * Based on LM75 -+ * -+ * -+ * Copyright (C) 2007, CenoSYS (www.cenosys.com). -+ * Guillaume Ligneul -+ * Guillaume.ligneul@gmail.com -+ * -+ * This software program is licensed subject to the GNU General Public License -+ * (GPL).Version 2,June 1991, available at http://www.fsf.org/copyleft/gpl.html -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+ -+/* Addresses to scan */ -+static const unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b, 0x4c, -+ 0x4d, 0x4e, 0x4f, I2C_CLIENT_END }; -+ -+/* Insmod parameters */ -+I2C_CLIENT_INSMOD_1(lm73); -+ -+/* LM73 registers */ -+#define LM73_REG_INPUT 0x00 -+#define LM73_REG_CONF 0x01 -+#define LM73_REG_T_HIGH 0x02 -+#define LM73_REG_T_LOW 0x03 -+ -+static const u8 LM73_REG_TEMP[3] = { -+ LM73_REG_INPUT, /* input */ -+ LM73_REG_T_HIGH, /* max */ -+ LM73_REG_T_LOW, /* min */ -+}; -+ -+/* Each client has this additional data */ -+struct lm73_data { -+ struct i2c_client client; -+ struct device *hwmon_dev; -+ struct mutex update_lock; -+ char valid; /* !=0 if following fields are valid */ -+ unsigned long last_updated; /* In jiffies */ -+ u16 temp[3]; /* Register values, -+ 0 = input -+ 1 = max -+ 2 = min */ -+}; -+ -+static int lm73_attach_adapter(struct i2c_adapter *adapter); -+static int lm73_detect(struct i2c_adapter *adapter, int address, int kind); -+static int lm73_detach_client(struct i2c_client *client); -+static int lm73_read_value(struct i2c_client *client, u8 reg); -+static int lm73_write_value(struct i2c_client *client, u8 reg, short value); -+ -+/* This is the driver that will be inserted */ -+static struct i2c_driver lm73_driver = { -+ .driver = { -+ .name = "lm73", -+ }, -+ .attach_adapter = lm73_attach_adapter, -+ .detach_client = lm73_detach_client, -+}; -+ -+static ssize_t show_temp(struct device *dev, struct device_attribute *da, -+ char *buf) -+{ -+ struct sensor_device_attribute *attr = to_sensor_dev_attr(da); -+ struct i2c_client *client = to_i2c_client(dev); -+ int iTemp = 0; -+ -+ iTemp = lm73_read_value(client, LM73_REG_TEMP[attr->index]); -+ -+ return sprintf(buf, "%d\n", iTemp); -+ -+ -+} -+ -+static ssize_t set_temp(struct device *dev, struct device_attribute *da, -+ const char *buf, size_t count) -+{ -+ struct sensor_device_attribute *attr = to_sensor_dev_attr(da); -+ struct i2c_client *client = to_i2c_client(dev); -+ int nr = attr->index; -+ -+ long tmp = simple_strtol(buf, NULL, 10); -+ -+ lm73_write_value(client, LM73_REG_TEMP[nr], tmp); -+ return count; -+} -+ -+static SENSOR_DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO, -+ show_temp, set_temp, 1); -+static SENSOR_DEVICE_ATTR(temp1_min, S_IWUSR | S_IRUGO, -+ show_temp, set_temp, 2); -+static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp, NULL, 0); -+ -+static int lm73_attach_adapter(struct i2c_adapter *adapter) -+{ -+ if (!(adapter->class & I2C_CLASS_HWMON)) -+ return 0; -+ -+ return i2c_probe(adapter, &addr_data, lm73_detect); -+} -+ -+static struct attribute *lm73_attributes[] = { -+ &sensor_dev_attr_temp1_input.dev_attr.attr, -+ &sensor_dev_attr_temp1_max.dev_attr.attr, -+ &sensor_dev_attr_temp1_min.dev_attr.attr, -+ -+ NULL -+}; -+ -+static const struct attribute_group lm73_group = { -+ .attrs = lm73_attributes, -+}; -+ -+/* This function is called by i2c_probe */ -+static int lm73_detect(struct i2c_adapter *adapter, int address, int kind) -+{ -+ struct i2c_client *new_client; -+ struct lm73_data *data; -+ int err = 0; -+ const char *name = ""; -+ -+ if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA | -+ I2C_FUNC_SMBUS_WORD_DATA)) -+ goto exit; -+ -+ if (!(data = kzalloc(sizeof(struct lm73_data), GFP_KERNEL))) { -+ err = -ENOMEM; -+ goto exit; -+ } -+ -+ new_client = &data->client; -+ i2c_set_clientdata(new_client, data); -+ new_client->addr = address; -+ new_client->adapter = adapter; -+ new_client->driver = &lm73_driver; -+ new_client->flags = 0; -+ -+ name = "lm73"; -+ -+ /* Fill in the remaining client fields and put it into the global list */ -+ strlcpy(new_client->name, name, I2C_NAME_SIZE); -+ data->valid = 0; -+ mutex_init(&data->update_lock); -+ -+ /* Tell the I2C layer a new client has arrived */ -+ if ((err = i2c_attach_client(new_client))) -+ goto exit_free; -+ -+ /* Register sysfs hooks */ -+ if ((err = sysfs_create_group(&new_client->dev.kobj, &lm73_group))) -+ goto exit_detach; -+ -+ data->hwmon_dev = hwmon_device_register(&new_client->dev); -+ if (IS_ERR(data->hwmon_dev)) { -+ err = PTR_ERR(data->hwmon_dev); -+ goto exit_remove; -+ } -+ -+ return 0; -+ -+exit_remove: -+ sysfs_remove_group(&new_client->dev.kobj, &lm73_group); -+exit_detach: -+ i2c_detach_client(new_client); -+exit_free: -+ kfree(data); -+exit: -+ return err; -+} -+ -+static int lm73_detach_client(struct i2c_client *client) -+{ -+ struct lm73_data *data = i2c_get_clientdata(client); -+ hwmon_device_unregister(data->hwmon_dev); -+ sysfs_remove_group(&client->dev.kobj, &lm73_group); -+ i2c_detach_client(client); -+ kfree(data); -+ return 0; -+} -+ -+static int lm73_read_value(struct i2c_client *client, u8 reg) -+{ -+ short sVal; -+ -+ if (reg == LM73_REG_CONF) -+ return i2c_smbus_read_byte_data(client, reg); -+ else -+ { -+ sVal = swab16(i2c_smbus_read_word_data(client, reg)); -+ sVal = sVal >> 7; -+ return sVal; -+ } -+} -+ -+static int lm73_write_value(struct i2c_client *client, u8 reg, short value) -+{ -+ if (reg == LM73_REG_CONF) -+ return i2c_smbus_write_byte_data(client, reg, value); -+ else -+ { -+ value = value<<7; -+ return i2c_smbus_write_word_data(client, reg, swab16(value)); -+ } -+} -+ -+static int __init sensors_lm73_init(void) -+{ -+ return i2c_add_driver(&lm73_driver); -+} -+ -+static void __exit sensors_lm73_exit(void) -+{ -+ i2c_del_driver(&lm73_driver); -+} -+ -+MODULE_AUTHOR("Ligneul Guillaume "); -+MODULE_DESCRIPTION("LM73 driver"); -+MODULE_LICENSE("GPL"); -+ -+module_init(sensors_lm73_init); -+module_exit(sensors_lm73_exit); -Index: linux-2.6.29/drivers/hwmon/Makefile -=================================================================== ---- linux-2.6.29.orig/drivers/hwmon/Makefile 2009-03-24 00:12:14.000000000 +0100 -+++ linux-2.6.29/drivers/hwmon/Makefile 2009-04-01 17:37:50.000000000 +0200 -@@ -54,6 +54,7 @@ - obj-$(CONFIG_SENSORS_LIS3LV02D) += lis3lv02d.o hp_accel.o - obj-$(CONFIG_SENSORS_LM63) += lm63.o - obj-$(CONFIG_SENSORS_LM70) += lm70.o -+obj-$(CONFIG_SENSORS_LM73) += lm73.o - obj-$(CONFIG_SENSORS_LM75) += lm75.o - obj-$(CONFIG_SENSORS_LM77) += lm77.o - obj-$(CONFIG_SENSORS_LM78) += lm78.o diff --git a/recipes/linux/linux-2.6.29/boc01/007-090825-lm73.patch b/recipes/linux/linux-2.6.29/boc01/007-090825-lm73.patch new file mode 100644 index 0000000000..8ffae6a2b0 --- /dev/null +++ b/recipes/linux/linux-2.6.29/boc01/007-090825-lm73.patch @@ -0,0 +1,280 @@ +Index: linux-2.6.29/drivers/hwmon/Kconfig +=================================================================== +--- linux-2.6.29.orig/drivers/hwmon/Kconfig 2009-08-25 17:33:48.000000000 +0200 ++++ linux-2.6.29/drivers/hwmon/Kconfig 2009-08-25 17:34:24.000000000 +0200 +@@ -448,6 +448,15 @@ + This driver can also be built as a module. If so, the module + will be called lm70. + ++config SENSORS_LM73 ++ tristate "National Semiconductor LM73" ++ depends on I2C ++ help ++ If you say yes here you get support for National Semiconductor LM73 ++ sensor chips ++ This driver can also be built as a module. If so, the module ++ will be called lm73. ++ + config SENSORS_LM75 + tristate "National Semiconductor LM75 and compatibles" + depends on I2C +Index: linux-2.6.29/drivers/hwmon/lm73.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.29/drivers/hwmon/lm73.c 2009-08-25 18:43:49.000000000 +0200 +@@ -0,0 +1,243 @@ ++ /* ++ * LM73 Sensor driver ++ * Based on LM75 ++ * ++ * Copyright (C) 2007, CenoSYS (www.cenosys.com). ++ * Copyright (C) 2009, Bollore telecom (www.bolloretelecom.eu). ++ * ++ * Guillaume Ligneul (Guillaume.ligneul@gmail.com) ++ * Adrien Demarez ++ * Jeremy Laine ++ * ++ * This software program is licensed subject to the GNU General Public License ++ * (GPL).Version 2,June 1991, available at http://www.fsf.org/copyleft/gpl.html ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++ ++/* Addresses scanned */ ++static const unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b, 0x4c, ++ 0x4d, 0x4e, 0x4f, I2C_CLIENT_END }; ++ ++/* Insmod parameters */ ++I2C_CLIENT_INSMOD_1(lm73); ++ ++/* LM73 registers */ ++#define LM73_REG_CONF 0x01 ++static const u8 LM73_REG_TEMP[3] = { ++ 0x00, /* input */ ++ 0x02, /* max */ ++ 0x03, /* min */ ++}; ++ ++/* Each client has this additional data */ ++struct lm73_data { ++ struct devi