From fe1a4e022daec1e44665fa3ff1540842f9ca716d Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Sun, 4 Oct 2009 16:00:09 +0000 Subject: gnome-doc-utils: Fixed invalid reference to host python in xml2po. Introduced INC_PR. --- recipes/gnome/gnome-doc-utils.inc | 4 ++-- recipes/gnome/gnome-doc-utils_0.10.3.bb | 2 +- recipes/gnome/gnome-doc-utils_0.12.0.bb | 2 +- recipes/gnome/gnome-doc-utils_0.7.1.bb | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/recipes/gnome/gnome-doc-utils.inc b/recipes/gnome/gnome-doc-utils.inc index ff62257aa8..8858dac05d 100644 --- a/recipes/gnome/gnome-doc-utils.inc +++ b/recipes/gnome/gnome-doc-utils.inc @@ -1,11 +1,11 @@ LICENSE = "GPL LGPL" DEPENDS = "libxml2 libxslt libxslt-native" -PR = "r1" +INC_PR = "r2" inherit gnome -EXTRA_OECONF = "--disable-scrollkeeper" +EXTRA_OECONF = "--disable-scrollkeeper ac_cv_path_PYTHON=${bindir}/python" do_stage() { mkdir -p ${STAGING_DATADIR}/xml/gnome/xslt/ diff --git a/recipes/gnome/gnome-doc-utils_0.10.3.bb b/recipes/gnome/gnome-doc-utils_0.10.3.bb index cfb4788076..d501a7db4c 100644 --- a/recipes/gnome/gnome-doc-utils_0.10.3.bb +++ b/recipes/gnome/gnome-doc-utils_0.10.3.bb @@ -1,3 +1,3 @@ require gnome-doc-utils.inc -PR = "r0" +PR = "${INC_PR}.0" diff --git a/recipes/gnome/gnome-doc-utils_0.12.0.bb b/recipes/gnome/gnome-doc-utils_0.12.0.bb index 2499ac36e4..d501a7db4c 100644 --- a/recipes/gnome/gnome-doc-utils_0.12.0.bb +++ b/recipes/gnome/gnome-doc-utils_0.12.0.bb @@ -1,3 +1,3 @@ require gnome-doc-utils.inc -PR = "r1" +PR = "${INC_PR}.0" diff --git a/recipes/gnome/gnome-doc-utils_0.7.1.bb b/recipes/gnome/gnome-doc-utils_0.7.1.bb index 2499ac36e4..d501a7db4c 100644 --- a/recipes/gnome/gnome-doc-utils_0.7.1.bb +++ b/recipes/gnome/gnome-doc-utils_0.7.1.bb @@ -1,3 +1,3 @@ require gnome-doc-utils.inc -PR = "r1" +PR = "${INC_PR}.0" -- cgit v1.2.3 From 0e95309087dfb9fcd2aaf1a713d856398eb45a91 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Sun, 4 Oct 2009 16:01:19 +0000 Subject: gnome-desktop: Disabled doc build to not depend on host system xml2po. --- recipes/gnome/gnome-desktop_2.28.0.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/gnome/gnome-desktop_2.28.0.bb b/recipes/gnome/gnome-desktop_2.28.0.bb index 9ae69b28ff..03079e3a83 100644 --- a/recipes/gnome/gnome-desktop_2.28.0.bb +++ b/recipes/gnome/gnome-desktop_2.28.0.bb @@ -4,3 +4,5 @@ inherit gnome pkgconfig DEPENDS += "gnome-doc-utils gnome-vfs libxrandr" +# FIXME: docs build requires gnome-doc-utils-native (for xml2po) and docbook +SRC_URI += "file://no-desktop-docs.patch;patch=1;pnum=0" -- cgit v1.2.3 From 3a663867510f00548cb1d4db5d44d7df3aafb62c Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Sat, 3 Oct 2009 00:57:03 +0200 Subject: dietlibc: update to version 0.32 * switch to .inc and PR_INC --- classes/dietlibc.bbclass | 4 +- conf/checksums.ini | 4 ++ recipes/dietlibc/dietlibc-0.32/ccache.patch | 74 +++++++++++++++++++++++++++ recipes/dietlibc/dietlibc-0.32/diethome.patch | 24 +++++++++ recipes/dietlibc/dietlibc.inc | 45 ++++++++++++++++ recipes/dietlibc/dietlibc_0.31.bb | 51 +++--------------- recipes/dietlibc/dietlibc_0.32.bb | 9 ++++ 7 files changed, 164 insertions(+), 47 deletions(-) create mode 100644 recipes/dietlibc/dietlibc-0.32/ccache.patch create mode 100644 recipes/dietlibc/dietlibc-0.32/diethome.patch create mode 100644 recipes/dietlibc/dietlibc.inc create mode 100644 recipes/dietlibc/dietlibc_0.32.bb diff --git a/classes/dietlibc.bbclass b/classes/dietlibc.bbclass index 7c7b5fec81..e0a657806a 100644 --- a/classes/dietlibc.bbclass +++ b/classes/dietlibc.bbclass @@ -4,8 +4,8 @@ def dietlibc_after_parse(d): import bb # Remove the NLS cfg = oe_filter_out('--(dis|en)able-nls', bb.data.getVar('EXTRA_OECONF', d, 1) or "", d) - # Remove shared and static and set it right - cfg += " --disable-nls --disbale-shared --enable-static" + # Remove shared enable static only + cfg += " --disable-nls --disable-shared --enable-static" bb.data.setVar('EXTRA_OECONF', cfg, d) cfg = bb.data.getVar('EXTRA_OEMAKE', d, 1) or "" cfg = oe_filter_out("\'CC=", bb.data.getVar('EXTRA_OEMAKE', d, 1) or "", d) diff --git a/conf/checksums.ini b/conf/checksums.ini index bb61d09889..67d3ea2790 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -5050,6 +5050,10 @@ sha256=dcc1809e8477b95317a7ff503cdd8b6d3f85b8d83a3245252ff47cf631523620 md5=acb98d469ee932d902fdf6de07802b7c sha256=99613d6a67f747f52e4184c613f7cba5cbb76af237c9acd04742e3ca24cf56cd +[http://kernel.org/pub/linux/libs/dietlibc/dietlibc-0.32.tar.bz2] +md5=0098761c17924c15e21d25acdda4a8b5 +sha256=6613a2cae3b39e340779735d7500d284f5a691c5ed67e59a6057e0888726e458 + [ftp://source.mvista.com/pub/xscale/pxa/diff-2.4.18-rmk7-pxa3.gz] md5=249c7a63a506d302c96be26517a70298 sha256=ca569dfa1e5cfd2f4134f3f61f667bcfab5e15c7d43c8a6e835d384ac5b31a07 diff --git a/recipes/dietlibc/dietlibc-0.32/ccache.patch b/recipes/dietlibc/dietlibc-0.32/ccache.patch new file mode 100644 index 0000000000..fb067f038f --- /dev/null +++ b/recipes/dietlibc/dietlibc-0.32/ccache.patch @@ -0,0 +1,74 @@ +Index: dietlibc-0.32/diet.c +=================================================================== +--- dietlibc-0.32.orig/diet.c 2009-03-17 00:17:58.000000000 +0100 ++++ dietlibc-0.32/diet.c 2009-10-02 14:12:14.306929201 +0200 +@@ -132,7 +132,12 @@ + } + } + { +- char *cc=argv[1]; ++ char *cc; ++ if (!strcmp(argv[1],"ccache")) { ++ cc=argv[2]; ++ } else { ++ cc=argv[1]; ++ } + char *tmp=strchr(cc,0)-2; + char *tmp2,*tmp3; + if (tmp90) error("platform name too long!\n"); + shortplatform=platform+len; +- memmove(shortplatform,argv[1],(size_t)(tmp2-cc)); ++ memmove(shortplatform,cc,(size_t)(tmp2-cc)); + platform[tmp2-cc+len]=0; + if (shortplatform[0]=='i' && shortplatform[2]=='8' && shortplatform[3]=='6') shortplatform[1]='3'; + } else { +@@ -291,6 +296,9 @@ + + dest=newargv; + *dest++=argv[1]; ++ if (strcmp(argv[1],"ccache") == 0) { ++ *dest++=argv[2]; ++ } + if (argv[2]) { + if (!strcmp(argv[2],"-V")) { + *dest++=argv[2]; +@@ -300,9 +308,9 @@ + } else if (!memcmp(argv[2],"-V",2)) { + *dest++=argv[2]; + ++argv; +- --argc; + } + } ++ + #ifndef __DYN_LIB + if (_link) { *dest++=(char*)nostdlib; *dest++=dashstatic; *dest++=dashL; } + #else +@@ -320,7 +328,15 @@ + #ifdef WANT_DYNAMIC + if (_link) { *dest++=d; } + #endif +- for (i=2; i /dev/null 2>&1 -} - -do_compile () { - oe_runmake all CC="${BUILD_CC}" CFLAGS="${BUILD_CFLAGS}" prefix=${STAGING_DIR_TARGET}/lib/dietlibc - oe_runmake all ARCH="${TARGET_ARCH}" CROSS=" " prefix=${STAGING_DIR_TARGET}/lib/dietlibc -} - -#no packages needed, all binaries will be compiled with -static -PACKAGES = " " - -#otherwise the whole run scripts got broken -do_install () { - echo "moo" > /dev/null 2>&1 -} - -do_stage () { - DIETLIBC_BUILD_ARCH=`echo ${BUILD_ARCH} | sed -e s'/.86/386/'` - DIETLIBC_TARGET_ARCH=`echo ${TARGET_ARCH} | sed -e s'/.86/386/'` - rm -rf ${STAGING_DIR_TARGET}/lib/dietlibc || true - rm ${CROSS_DIR}/bin/diet || true - install -d ${STAGING_DIR_TARGET}/lib/dietlibc/lib-${DIETLIBC_TARGET_ARCH} - install -d ${STAGING_DIR_TARGET}/lib/dietlibc/include - for i in `find include -name \*.h`; do install -m 644 -D $i ${STAGING_DIR_TARGET}/lib/dietlibc/$i; done - - install -m755 bin-${DIETLIBC_BUILD_ARCH}/diet-i ${CROSS_DIR}/bin/diet - - cd bin-${DIETLIBC_TARGET_ARCH} - install -m 644 start.o libm.a libpthread.a librpc.a \ - liblatin1.a libcompat.a libcrypt.a \ - ${STAGING_DIR_TARGET}/lib/dietlibc/lib-${DIETLIBC_TARGET_ARCH} - install -m 644 dietlibc.a ${STAGING_DIR_TARGET}/lib/dietlibc/lib-${DIETLIBC_TARGET_ARCH}/libc.a -} +PR = "${INC_PR}.1" +SRC_URI += "file://ccache.patch;patch=1 \ + file://ceil.patch;patch=1 \ + file://ai_addrconfig.patch;patch=1 \ + " diff --git a/recipes/dietlibc/dietlibc_0.32.bb b/recipes/dietlibc/dietlibc_0.32.bb new file mode 100644 index 0000000000..5e644fa750 --- /dev/null +++ b/recipes/dietlibc/dietlibc_0.32.bb @@ -0,0 +1,9 @@ +require dietlibc.inc + +PR = "${INC_PR}.1" + +SRC_URI += "file://ccache.patch;patch=1 \ + file://ceil.patch;patch=1 \ + file://diethome.patch;patch=1 \ + " + -- cgit v1.2.3 From 63e32e66c3c89722039050db15cf12dd3b8ec6a0 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Sun, 4 Oct 2009 22:07:43 +0200 Subject: opie-image-16mb: remove broken irda-task for now --- recipes/images/opie-image-16mb.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes/images/opie-image-16mb.bb b/recipes/images/opie-image-16mb.bb index 6fa8bab1e0..b4a0e03e16 100644 --- a/recipes/images/opie-image-16mb.bb +++ b/recipes/images/opie-image-16mb.bb @@ -12,7 +12,6 @@ IMAGE_INSTALL = "task-boot \ task-opie-16mb-settings \ task-opie-16mb-apps \ task-opie-16mb-pim \ - task-opie-irda \ ${ANGSTROM_EXTRA_INSTALL} " # create /etc/timestamp from build date -- cgit v1.2.3 From aeee8bb9ac0f1c89bb1d409cdbea20a865915fb4 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Sun, 4 Oct 2009 22:08:45 +0200 Subject: dietlibc: rework getrlimit function for eabi --- recipes/dietlibc/dietlibc-0.32/getrlimit.patch | 12 ++++++++++++ recipes/dietlibc/dietlibc_0.32.bb | 3 ++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 recipes/dietlibc/dietlibc-0.32/getrlimit.patch diff --git a/recipes/dietlibc/dietlibc-0.32/getrlimit.patch b/recipes/dietlibc/dietlibc-0.32/getrlimit.patch new file mode 100644 index 0000000000..1d9792eaa3 --- /dev/null +++ b/recipes/dietlibc/dietlibc-0.32/getrlimit.patch @@ -0,0 +1,12 @@ +Index: dietlibc-0.32/syscalls.s/getrlimit.S +=================================================================== +--- dietlibc-0.32.orig/syscalls.s/getrlimit.S 2001-01-09 18:57:48.000000000 +0100 ++++ dietlibc-0.32/syscalls.s/getrlimit.S 2009-10-03 14:28:55.098309914 +0200 +@@ -1,3 +1,7 @@ + #include "syscalls.h" + ++#if defined(__ARM_EABI__) ++syscall(ugetrlimit,getrlimit) ++#else + syscall(getrlimit,getrlimit) ++#endif diff --git a/recipes/dietlibc/dietlibc_0.32.bb b/recipes/dietlibc/dietlibc_0.32.bb index 5e644fa750..7cdc121f77 100644 --- a/recipes/dietlibc/dietlibc_0.32.bb +++ b/recipes/dietlibc/dietlibc_0.32.bb @@ -1,9 +1,10 @@ require dietlibc.inc -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" SRC_URI += "file://ccache.patch;patch=1 \ file://ceil.patch;patch=1 \ file://diethome.patch;patch=1 \ + file://getrlimit.patch;patch=1 \ " -- cgit v1.2.3 From 7f7b1e65c6371f0c73ad89e58b9080c9bd18384e Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Sun, 4 Oct 2009 22:10:18 +0200 Subject: dietlibc.class: disable rewriting of configure stuff for now --- classes/dietlibc.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/classes/dietlibc.bbclass b/classes/dietlibc.bbclass index e0a657806a..2676385197 100644 --- a/classes/dietlibc.bbclass +++ b/classes/dietlibc.bbclass @@ -9,13 +9,13 @@ def dietlibc_after_parse(d): bb.data.setVar('EXTRA_OECONF', cfg, d) cfg = bb.data.getVar('EXTRA_OEMAKE', d, 1) or "" cfg = oe_filter_out("\'CC=", bb.data.getVar('EXTRA_OEMAKE', d, 1) or "", d) - cfgtmp = "\'CC=diet ${CCACHE}" + cfgtmp = "\'CC=\"diet ${CCACHE}\"" cfgtmp += cfg bb.data.setVar('EXTRA_OEMAKE', cfgtmp, d) -python () { - dietlibc_after_parse(d) -} +#python () { +# dietlibc_after_parse(d) +#} set_dietlibc_env () { export CC="diet ${CC}" -- cgit v1.2.3 From 1d4b26de0ac1d106420dfaadeb16f9acdc01f1b9 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Sun, 4 Oct 2009 22:12:14 +0200 Subject: kexec: add recipe for dietlibc --- recipes/kexec/files/dietlibc.patch | 35 +++++++++++++++++++++++++++++ recipes/kexec/kexec-tools-dietlibc_2.0.1.bb | 17 ++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 recipes/kexec/files/dietlibc.patch create mode 100644 recipes/kexec/kexec-tools-dietlibc_2.0.1.bb diff --git a/recipes/kexec/files/dietlibc.patch b/recipes/kexec/files/dietlibc.patch new file mode 100644 index 0000000000..0048d7a6a2 --- /dev/null +++ b/recipes/kexec/files/dietlibc.patch @@ -0,0 +1,35 @@ +Index: kexec-tools-2.0.1/kexec/kexec-elf.c +=================================================================== +--- kexec-tools-2.0.1.orig/kexec/kexec-elf.c 2009-10-03 14:19:35.347504269 +0200 ++++ kexec-tools-2.0.1/kexec/kexec-elf.c 2009-10-03 14:23:00.414497203 +0200 +@@ -9,6 +9,17 @@ + #include "kexec.h" + #include "kexec-elf.h" + ++#ifdef __dietlibc__ ++#include ++# define UINT32_MAX (4294967295U) ++# if __WORDSIZE == 64 ++# define __UINT64_C(c) c ## UL ++# else ++# define __UINT64_C(c) c ## ULL ++# endif ++# define UINT64_MAX (__UINT64_C(18446744073709551615)) ++#endif ++ + static const int probe_debug = 0; + + uint16_t elf16_to_cpu(const struct mem_ehdr *ehdr, uint16_t value) +Index: kexec-tools-2.0.1/kexec/Makefile +=================================================================== +--- kexec-tools-2.0.1.orig/kexec/Makefile 2009-10-03 14:43:59.574859089 +0200 ++++ kexec-tools-2.0.1/kexec/Makefile 2009-10-03 14:44:08.190707689 +0200 +@@ -70,7 +70,7 @@ + + $(KEXEC): $(KEXEC_OBJS) $(UTIL_LIB) + @$(MKDIR) -p $(@D) +- $(LINK.o) -o $@ $^ $(LIBS) ++ $(LINK.o) -o $@ $^ $(LIBS) -lcompat + + $(KEXEC): CPPFLAGS+=-I$(srcdir)/kexec/arch/$(ARCH)/include + diff --git a/recipes/kexec/kexec-tools-dietlibc_2.0.1.bb b/recipes/kexec/kexec-tools-dietlibc_2.0.1.bb new file mode 100644 index 0000000000..0155e72793 --- /dev/null +++ b/recipes/kexec/kexec-tools-dietlibc_2.0.1.bb @@ -0,0 +1,17 @@ +# the binaries are statical linked against klibc +require kexec-tools2.inc + +SRC_URI += "file://dietlibc.patch;patch=1" + +inherit dietlibc + +#DEFAULT_PREFERENCE = "-1" + +PR = "r0" + +S = "${WORKDIR}/kexec-tools-${PV}" + +PACKAGES =+ "kexec-dietlibc kdump-dietlibc" + +FILES_kexec-dietlibc = "${sbindir}/kexec" +FILES_kdump-dietlibc = "${sbindir}/kdump" -- cgit v1.2.3 From 571fb9f63920660ad5bdb332856bfe9129a1f343 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Sun, 4 Oct 2009 23:37:52 +0200 Subject: kexec-tools_2.0.1: clean arm detection patch before sending it upstream Signed-off-by: Andrea Adami --- recipes/kexec/files/fix-arm-arch-detection.patch | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/recipes/kexec/files/fix-arm-arch-detection.patch b/recipes/kexec/files/fix-arm-arch-detection.patch index e581830ff0..6116c5bb84 100644 --- a/recipes/kexec/files/fix-arm-arch-detection.patch +++ b/recipes/kexec/files/fix-arm-arch-detection.patch @@ -1,20 +1,16 @@ ---- kexec-tools/kexec/phys_arch.c.old 2009-09-25 23:46:04.000000000 +0200 -+++ kexec-tools/kexec/phys_arch.c 2009-09-28 22:26:04.000000000 +0200 -@@ -13,9 +13,16 @@ +--- kexec-tools/kexec/phys_arch.c.old 2008-07-15 02:46:43.000000000 +0200 ++++ kexec-tools/kexec/phys_arch.c 2009-10-04 23:58:04.000000000 +0200 +@@ -13,9 +13,12 @@ return -1; } - for (i = 0; arches[i].machine; ++i) - if (strcmp(utsname.machine, arches[i].machine) == 0) + for (i = 0; arches[i].machine; ++i) { -+ -+ if ((strcmp(arches[i].machine, "arm") == 0) && (strncmp(utsname.machine, arches[i].machine, 3) == 0)) { ++ if ((strcmp(arches[i].machine, "arm") == 0) && (strncmp(utsname.machine, arches[i].machine, 3) == 0)) + return arches[i].arch; -+ } -+ -+ if (strcmp(utsname.machine, arches[i].machine) == 0) { ++ if (strcmp(utsname.machine, arches[i].machine) == 0) return arches[i].arch; -+ } + } fprintf(stderr, "Unsupported machine type: %s\n", -- cgit v1.2.3 From 280be5d65abd35492163f78c602c695cecf7c43c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= Date: Mon, 5 Oct 2009 18:48:17 +0200 Subject: linux-2.6.29: update patch for lm73 on boc01 --- .../linux/linux-2.6.29/boc01/007-090825-lm73.patch | 280 --------------------- .../linux/linux-2.6.29/boc01/007-091005-lm73.patch | 242 ++++++++++++++++++ recipes/linux/linux_2.6.29.bb | 2 +- 3 files changed, 243 insertions(+), 281 deletions(-) delete mode 100644 recipes/linux/linux-2.6.29/boc01/007-090825-lm73.patch create mode 100644 recipes/linux/linux-2.6.29/boc01/007-091005-lm73.patch 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 deleted file mode 100644 index 8ffae6a2b0..0000000000 --- a/recipes/linux/linux-2.6.29/boc01/007-090825-lm73.patch +++ /dev/null @@ -1,280 +0,0 @@ -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 device *hwmon_dev; -+ struct mutex update_lock; -+ u16 temp[3]; /* Register values, -+ 0 = input -+ 1 = max -+ 2 = min */ -+}; -+ -+static int lm73_read_value(struct i2c_client *client, u8 reg); -+static int lm73_write_value(struct i2c_client *client, u8 reg, short value); -+ -+ -+/*-----------------------------------------------------------------------*/ -+ -+/* sysfs attributes for hwmon */ -+ -+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); -+ struct lm73_data *data = i2c_get_clientdata(client); -+ int iTemp = 0; -+ -+ mutex_lock(&data->update_lock); -+ iTemp = lm73_read_value(client, LM73_REG_TEMP[attr->index]); -+ mutex_unlock(&data->update_lock); -+ -+ 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); -+ struct lm73_data *data = i2c_get_clientdata(client); -+ int nr = attr->index; -+ long temp = simple_strtol(buf, NULL, 10); -+ -+ mutex_lock(&data->update_lock); -+ lm73_write_value(client, LM73_REG_TEMP[nr], temp); -+ mutex_unlock(&data->update_lock); -+ 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 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, -+}; -+ -+/*-----------------------------------------------------------------------*/ -+ -+/* device probe and removal */ -+ -+static int -+lm73_probe(struct i2c_client *client, const struct i2c_device_id *id) -+{ -+ struct lm73_data *data; -+ int status; -+ -+ if (!i2c_check_functionality(client->adapter, -+ I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_WORD_DATA)) -+ return -EIO; -+ -+ data = kzalloc(sizeof(struct lm73_data), GFP_KERNEL); -+ if (!data) -+ return -ENOMEM; -+ -+ i2c_set_clientdata(client, data); -+ mutex_init(&data->update_lock); -+ -+ /* Register sysfs hooks */ -+ status = sysfs_create_group(&client->dev.kobj, &lm73_group); -+ if (status) -+ goto exit_free; -+ -+ data->hwmon_dev = hwmon_device_register(&client->dev); -+ if (IS_ERR(data->hwmon_dev)) { -+ status = PTR_ERR(data->hwmon_dev); -+ goto exit_remove; -+ } -+ -+ dev_info(&client->dev, "%s: sensor '%s'\n", -+ dev_name(data->hwmon_dev), client->name); -+ -+ return 0; -+ -+exit_remove: -+ sysfs_remove_group(&client->dev.kobj, &lm73_group); -+exit_free: -+ i2c_set_clientdata(client, NULL); -+ kfree(data); -+ return status; -+} -+ -+static int lm73_remove(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_set_clientdata(client, NULL); -+ kfree(data); -+ return 0; -+} -+ -+static const struct i2c_device_id lm73_ids[] = { -+ { "lm73", lm73 }, -+ { /* LIST END */ } -+}; -+MODULE_DEVICE_TABLE(i2c, lm73_ids); -+ -+/* Return 0 if detection is successful, -ENODEV otherwise */ -+static int lm73_detect(struct i2c_client *new_client, int kind, -+ struct i2c_board_info *info) -+{ -+ struct i2c_adapter *adapter = new_client->adapter; -+ -+ if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA | -+ I2C_FUNC_SMBUS_WORD_DATA)) -+ return -ENODEV; -+ -+ /* NOTE: we treat "force=..." and "force_lm73=..." the same. -+ * Only new-style driver binding distinguishes chip types. -+ */ -+ strlcpy(info->type, "lm73", I2C_NAME_SIZE); -+ -+ return 0; -+} -+ -+static struct i2c_driver lm73_driver = { -+ .class = I2C_CLASS_HWMON, -+ .driver = { -+ .name = "lm73", -+ }, -+ .probe = lm73_probe, -+ .remove = lm73_remove, -+ .id_table = lm73_ids, -+ .detect = lm73_detect, -+ .address_data = &addr_data, -+}; -+ -+/*-----------------------------------------------------------------------*/ -+ -+/* register access */ -+ -+static int lm73_read_value(struct i2c_client *client, u8 reg) -+{ -+ short value; -+ -+ if (reg == LM73_REG_CONF) -+ return i2c_smbus_read_byte_data(client, reg); -+ -+ value = swab16(i2c_smbus_read_word_data(client, reg)) >> 7; -+ return value; -+} -+ -+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 -+ return i2c_smbus_write_word_data(client, reg, swab16(value<<7)); -+} -+ -+/*-----------------------------------------------------------------------*/ -+ -+/* module glue */ -+ -+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-08-25 17:33:48.000000000 +0200 -+++ linux-2.6.29/drivers/hwmon/Makefile 2009-08-25 17:34:24.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-091005-lm73.patch b/recipes/linux/linux-2.6.29/boc01/007-091005-lm73.patch new file mode 100644 index 0000000000..bc43a0a70a --- /dev/null +++ b/recipes/linux/linux-2.6.29/boc01/007-091005-lm73.patch @@ -0,0 +1,242 @@ +Index: linux-2.6.29/drivers/hwmon/Kconfig +=================================================================== +--- linux-2.6.29.orig/drivers/hwmon/Kconfig 2009-10-05 18:27:57.000000000 +0200 ++++ linux-2.6.29/drivers/hwmon/Kconfig 2009-10-05 18:28:35.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-10-05 18:28:49.000000000 +0200 +@@ -0,0 +1,205 @@ ++/* ++ * LM73 Sensor driver ++ * Based on LM75 ++ * ++ * Copyright (C) 2007, CenoSYS (www.cenosys.com). ++ * Copyright (C) 2009, Bollore telecom (www.bolloretelecom.eu). ++ * ++ * Guillaume Ligneul ++ * 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.gnu.org/licenses/old-licenses/gpl-2.0.html ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++ ++/* Addresses scanned */ ++static const unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4c, ++ 0x4d, 0x4e, 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_MAX 0x02 ++#define LM73_REG_MIN 0x03 ++#define LM73_REG_CTRL 0x04 ++#define LM73_REG_ID 0x07 ++ ++#define LM73_ID 0x9001 /* or 0x190 after a swab16() */ ++#define DRVNAME "lm73" ++#define LM73_TEMP_MIN (-40) ++#define LM73_TEMP_MAX 150 ++ ++/*-----------------------------------------------------------------------*/ ++ ++ ++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); ++ long temp; ++ short value; ++ ++ int status = strict_strtol(buf, 10, &temp); ++ if(status < 0) ++ return status; ++ ++ /* Write value */ ++ value = (short) SENSORS_LIMIT(temp/250, (LM73_TEMP_MIN*4), ++ (LM73_TEMP_MAX*4)) << 5; ++ i2c_smbus_write_word_data(client, attr->index, swab16(value)); ++ return count; ++} ++ ++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); ++ /* use integer division instead of equivalent right shift to ++ guarantee arithmetic shift and preserve the sign */ ++ int temp = ((s16) (swab16(i2c_smbus_read_word_data(client, ++ attr->index)))*250) / 32; ++ return sprintf(buf, "%d\n", temp); ++} ++ ++ ++/*-----------------------------------------------------------------------*/ ++ ++/* sysfs attributes for hwmon */ ++ ++static SENSOR_DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO, ++ show_temp, set_temp, LM73_REG_MAX); ++static SENSOR_DEVICE_ATTR(temp1_min, S_IWUSR | S_IRUGO, ++ show_temp, set_temp, LM73_REG_MIN); ++static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, ++ show_temp, NULL, LM73_REG_INPUT); ++ ++ ++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, ++}; ++ ++/*-----------------------------------------------------------------------*/ ++ ++/* device probe and removal */ ++ ++static int ++lm73_probe(struct i2c_client *client, const struct i2c_device_id *id) ++{ ++ struct device *hwmon_dev; ++ int status; ++ ++ /* Register sysfs hooks */ ++ status = sysfs_create_group(&client->dev.kobj, &lm73_group); ++ if (status) ++ return status; ++ ++ hwmon_dev = hwmon_device_register(&client->dev); ++ if (IS_ERR(hwmon_dev)) { ++ status = PTR_ERR(hwmon_dev); ++ goto exit_remove; ++ } ++ i2c_set_clientdata(client, hwmon_dev); ++ ++ dev_info(&client->dev, "%s: sensor '%s'\n", ++ dev_name(hwmon_dev), client->name); ++ ++ return 0; ++ ++exit_remove: ++ sysfs_remove_group(&client->dev.kobj, &lm73_group); ++ return status; ++} ++ ++static int lm73_remove(struct i2c_client *client) ++{ ++ struct device *hwmon_dev = i2c_get_clientdata(client); ++ ++ hwmon_device_unregister(hwmon_dev); ++ sysfs_remove_group(&client->dev.kobj, &lm73_group); ++ i2c_set_clientdata(client, NULL); ++ return 0; ++} ++ ++static const struct i2c_device_id lm73_ids[] = { ++ { "lm73", lm73 }, ++ { /* LIST END */ } ++}; ++MODULE_DEVICE_TABLE(i2c, lm73_ids); ++ ++/* Return 0 if detection is successful, -ENODEV otherwise */ ++static int lm73_detect(struct i2c_client *new_client, int kind, ++ struct i2c_board_info *info) ++{ ++ struct i2c_adapter *adapter = new_client->adapter; ++ u16 id; ++ u8 ctrl; ++ ++ if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA | ++ I2C_FUNC_SMBUS_WORD_DATA)) ++ return -ENODEV; ++ ++ /* Check device ID */ ++ id = i2c_smbus_read_word_data(new_client, LM73_REG_ID); ++ ctrl = i2c_smbus_read_byte_data(new_client, LM73_REG_CTRL); ++ if ((id != LM73_ID) || (ctrl & 0x10)) ++ return -ENODEV; ++ ++ strlcpy(info->type, "lm73", I2C_NAME_SIZE); ++ ++ return 0; ++} ++ ++static struct i2c_driver lm73_driver = { ++ .class = I2C_CLASS_HWMON, ++ .driver = { ++ .name = "lm73", ++ }, ++ .probe = lm73_probe, ++ .remove = lm73_remove, ++ .id_table = lm73_ids, ++ .detect = lm73_detect, ++ .address_data = &addr_data, ++}; ++ ++/* module glue */ ++ ++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("Guillaume Ligneul "); ++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-10-05 18:27:57.000000000 +0200 ++++ linux-2.6.29/drivers/hwmon/Makefile 2009-10-05 18:28:35.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.bb b/recipes/linux/linux_2.6.29.bb index ba50a9b3a2..eb6b8b98bf 100644 --- a/recipes/linux/linux_2.6.29.bb +++ b/recipes/linux/linux_2.6.29.bb @@ -26,7 +26,7 @@ SRC_URI_append_boc01 = "\ file://boc01.dts.v1 \ file://004-081205-usb.patch;patch=1 \ file://005-090226-isl12024.patch;patch=1 \ - file://007-090825-lm73.patch;patch=1 \ + file://007-091005-lm73.patch;patch=1 \ file://008-081208-spi.patch;patch=1 \ file://011-090115-gpio.patch;patch=1 \ file://012-090219-capsense.patch;patch=1 \ -- cgit v1.2.3 From 5d021e5237305dbcc2004816dbaf9cb5f273442f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= Date: Mon, 5 Oct 2009 19:17:56 +0200 Subject: linux-2.6.29: update SPI patch for boc01 --- .../boc01/001-090114-sqn11x0-usb-hack.patch | 17 --- .../linux/linux-2.6.29/boc01/008-081208-spi.patch | 147 --------------------- .../linux/linux-2.6.29/boc01/008-091005-spi.patch | 137 +++++++++++++++++++ recipes/linux/linux_2.6.29.bb | 2 +- 4 files changed, 138 insertions(+), 165 deletions(-) delete mode 100644 recipes/linux/linux-2.6.29/boc01/001-090114-sqn11x0-usb-hack.patch delete mode 100644 recipes/linux/linux-2.6.29/boc01/008-081208-spi.patch create mode 100644 recipes/linux/linux-2.6.29/boc01/008-091005-spi.patch diff --git a/recipes/linux/linux-2.6.29/boc01/001-090114-sqn11x0-usb-hack.patch b/recipes/linux/linux-2.6.29/boc01/001-090114-sqn11x0-usb-hack.patch deleted file mode 100644 index 4bd44e25db..0000000000 --- a/recipes/linux/linux-2.6.29/boc01/001-090114-sqn11x0-usb-hack.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -ur linux-2.6.27.orig/drivers/usb/host/ehci-q.c linux-2.6.27/drivers/usb/host/ehci-q.c ---- linux-2.6.27.orig/drivers/usb/host/ehci-q.c 2008-10-10 00:13:53.000000000 +0200 -+++ linux-2.6.27/drivers/usb/host/ehci-q.c 2009-01-06 18:31:38.000000000 +0100 -@@ -799,7 +799,12 @@ - * to help them do so. So now people expect to use - * such nonconformant devices with Linux too; sigh. - */ -- info1 |= max_packet(maxp) << 16; -+ struct usb_device_descriptor *desc = &urb->dev->descriptor; -+ if (desc->idVendor == cpu_to_le16(0x148e) && desc->idProduct == cpu_to_le16(0x0900)) { -+ info1 |= 256 << 16; -+ } else { -+ info1 |= max_packet(maxp) << 16; -+ } - info2 |= (EHCI_TUNE_MULT_HS << 30); - } else { /* PIPE_INTERRUPT */ - info1 |= max_packet (maxp) << 16; diff --git a/recipes/linux/linux-2.6.29/boc01/008-081208-spi.patch b/recipes/linux/linux-2.6.29/boc01/008-081208-spi.patch deleted file mode 100644 index 9c9e402ea3..0000000000 --- a/recipes/linux/linux-2.6.29/boc01/008-081208-spi.patch +++ /dev/null @@ -1,147 +0,0 @@ -Index: linux-2.6.29/arch/powerpc/platforms/83xx/mpc831x_rdb.c -=================================================================== ---- linux-2.6.29.orig/arch/powerpc/platforms/83xx/mpc831x_rdb.c 2009-03-24 00:12:14.000000000 +0100 -+++ linux-2.6.29/arch/powerpc/platforms/83xx/mpc831x_rdb.c 2009-04-01 17:37:53.000000000 +0200 -@@ -15,17 +15,87 @@ - - #include - #include -+#include - - #include - #include - #include - #include -+#include -+#include - - #include "mpc83xx.h" - - /* - * Setup the architecture - */ -+struct gpio { -+ __be32 gpdir; -+ __be32 gpodr; -+ __be32 gpdat; -+ __be32 gpier; -+ __be32 gpimr; -+ __be32 gpicr; -+} __attribute__ ((packed)); -+static struct gpio *gpio_regs; -+ -+static void mpc83xx_spi_activate_cs(u8 cs, u8 polarity) -+{ -+ //printk(KERN_INFO "%s %d %d\n", __func__, cs, polarity); -+ if (polarity) -+ setbits32(&gpio_regs->gpdat, 1 << (31 - 14)); -+ else -+ clrbits32(&gpio_regs->gpdat, 1 << (31 - 14)); -+} -+ -+static void mpc83xx_spi_deactivate_cs(u8 cs, u8 polarity) -+{ -+//printk(KERN_INFO "%s %d %d\n", __func__, cs, polarity); -+ if (polarity) -+ clrbits32(&gpio_regs->gpdat, 1 << (31 - 14)); -+ else -+ setbits32(&gpio_regs->gpdat, 1 << (31 - 14)); -+ -+} -+ -+//static struct mmc_spi_platform_data mpc8313_mmc_pdata = { -+// .ocr_mask = MMC_VDD_33_34, -+//}; -+ -+static struct spi_board_info mpc8313_spi_boardinfo = { -+ .bus_num = 0x7000, -+ .chip_select = 0, -+ .max_speed_hz = 50000000, -+ .modalias = "spidev", -+// .platform_data = &mpc8313_mmc_pdata, -+}; -+ -+static int __init mpc8313_spi_init(void) -+{ -+ __be32 __iomem *psicrl; -+ -+ /* System I/O Configuration Register Low */ -+ psicrl = ioremap(get_immrbase() + MPC83XX_SICRL_OFFS, 0x4); -+ gpio_regs = ioremap(get_immrbase() + 0xc00, 0x20); -+ if (!psicrl || !gpio_regs) -+ return -ENOMEM; -+ -+ clrbits32(psicrl, 0x03F00000); -+ setbits32(psicrl, 0x30000000); -+ iounmap(psicrl); -+ -+ /* set GPIO13 as output */ -+ setbits32(&gpio_regs->gpdir, 1 << (31 - 14)); -+ clrbits32(&gpio_regs->gpodr, 1 << (31 - 14)); -+ setbits32(&gpio_regs->gpdat, 1 << (31 - 14)); -+ -+ return fsl_spi_init(&mpc8313_spi_boardinfo, 1, -+ mpc83xx_spi_activate_cs, -+ mpc83xx_spi_deactivate_cs); -+} -+ -+device_initcall(mpc8313_spi_init); -+ - static void __init mpc831x_rdb_setup_arch(void) - { - #ifdef CONFIG_PCI -@@ -40,6 +110,8 @@ - mpc83xx_add_bridge(np); - #endif - mpc831x_usb_cfg(); -+ -+ mpc8313_spi_init(); - } - - static void __init mpc831x_rdb_init_IRQ(void) -Index: linux-2.6.29/drivers/spi/spi_mpc83xx.c -=================================================================== ---- linux-2.6.29.orig/drivers/spi/spi_mpc83xx.c 2009-03-24 00:12:14.000000000 +0100 -+++ linux-2.6.29/drivers/spi/spi_mpc83xx.c 2009-04-01 17:37:53.000000000 +0200 -@@ -280,7 +280,9 @@ - if (pm) - pm--; - -- cs->hw_mode |= SPMODE_PM(pm); -+ cs->hw_mode = 0x0F700000; -+ mpc83xx_spi_write_reg(&mpc83xx_spi->base->mode,cs->hw_mode); -+ - regval = mpc83xx_spi_read_reg(&mpc83xx_spi->base->mode); - if (cs->hw_mode != regval) { - unsigned long flags; -@@ -448,7 +450,7 @@ - cs->hw_mode = mpc83xx_spi_read_reg(&mpc83xx_spi->base->mode); - /* mask out bits we are going to set */ - cs->hw_mode &= ~(SPMODE_CP_BEGIN_EDGECLK | SPMODE_CI_INACTIVEHIGH -- | SPMODE_REV | SPMODE_LOOP); -+ | SPMODE_REV ); - - if (spi->mode & SPI_CPHA) - cs->hw_mode |= SPMODE_CP_BEGIN_EDGECLK; -@@ -456,8 +458,10 @@ - cs->hw_mode |= SPMODE_CI_INACTIVEHIGH; - if (!(spi->mode & SPI_LSB_FIRST)) - cs->hw_mode |= SPMODE_REV; -- if (spi->mode & SPI_LOOP) -- cs->hw_mode |= SPMODE_LOOP; -+ -+ cs->hw_mode = 0x0F700000; -+ mpc83xx_spi_write_reg(&mpc83xx_spi->base->mode,cs->hw_mode); -+ cs->hw_mode = mpc83xx_spi_read_reg(&mpc83xx_spi->base->mode); - - retval = mpc83xx_spi_setup_transfer(spi, NULL); - if (retval < 0) { -@@ -637,7 +641,7 @@ - INIT_LIST_HEAD(&mpc83xx_spi->queue); - - mpc83xx_spi->workqueue = create_singlethread_workqueue( -- master->dev.parent->bus_id); -+ dev->dev.bus_id); - if (mpc83xx_spi->workqueue == NULL) { - ret = -EBUSY; - goto free_irq; diff --git a/recipes/linux/linux-2.6.29/boc01/008-091005-spi.patch b/recipes/linux/linux-2.6.29/boc01/008-091005-spi.patch new file mode 100644 index 0000000000..dce5b59f85 --- /dev/null +++ b/recipes/linux/linux-2.6.29/boc01/008-091005-spi.patch @@ -0,0 +1,137 @@ +Index: linux-2.6.29/arch/powerpc/platforms/83xx/mpc831x_rdb.c +=================================================================== +--- linux-2.6.29.orig/arch/powerpc/platforms/83xx/mpc831x_rdb.c 2009-10-05 18:55:57.000000000 +0200 ++++ linux-2.6.29/arch/powerpc/platforms/83xx/mpc831x_rdb.c 2009-10-05 18:57:15.000000000 +0200 +@@ -15,17 +15,78 @@ + + #include + #include ++#include + + #include + #include + #include + #include ++#include ++#include + + #include "mpc83xx.h" + + /* + * Setup the architecture + */ ++struct gpio { ++ __be32 gpdir; ++ __be32 gpodr; ++ __be32 gpdat; ++ __be32 gpier; ++ __be32 gpimr; ++ __be32 gpicr; ++} __attribute__ ((packed)); ++static struct gpio *gpio_regs; ++ ++static void mpc83xx_spi_activate_cs(u8 cs, u8 polarity) ++{ ++ if (polarity) ++ setbits32(&gpio_regs->gpdat, 1 << (31 - 14)); ++ else ++ clrbits32(&gpio_regs->gpdat, 1 << (31 - 14)); ++} ++ ++static void mpc83xx_spi_deactivate_cs(u8 cs, u8 polarity) ++{ ++ if (polarity) ++ clrbits32(&gpio_regs->gpdat, 1 << (31 - 14)); ++ else ++ setbits32(&gpio_regs->gpdat, 1 << (31 - 14)); ++ ++} ++ ++static struct spi_board_info mpc8313_spi_boardinfo = { ++ .bus_num = 0x7000, ++ .chip_select = 0, ++ .max_speed_hz = 50000000, ++ .modalias = "spidev", ++}; ++ ++static int __init mpc8313_spi_init(void) ++{ ++ __be32 __iomem *psicrl; ++ ++ /* System I/O Configuration Register Low */ ++ psicrl = ioremap(get_immrbase() + MPC83XX_SICRL_OFFS, 0x4); ++ gpio_regs = ioremap(get_immrbase() + 0xc00, 0x20); ++ if (!psicrl || !gpio_regs) ++ return -ENOMEM; ++ ++ clrbits32(psicrl, 0x03F00000); ++ setbits32(psicrl, 0x30000000); ++ iounmap(psicrl); ++ ++ /* set GPIO13 as output */ ++ setbits32(&gpio_regs->gpdir, 1 << (31 - 14)); ++ clrbits32(&gpio_regs->gpodr, 1 << (31 - 14)); ++ setbits32(&gpio_regs->gpdat, 1 << (31 - 14)); ++ ++ return fsl_spi_init(&mpc8313_spi_boardinfo, 1, ++ mpc83xx_spi_activate_cs, ++ mpc83xx_spi_deactivate_cs); ++} ++ + static void __init mpc831x_rdb_setup_arch(void) + { + #ifdef CONFIG_PCI +@@ -40,6 +101,7 @@ + mpc83xx_add_bridge(np); + #endif + mpc831x_usb_cfg(); ++ mpc8313_spi_init(); + } + + static void __init mpc831x_rdb_init_IRQ(void) +Index: linux-2.6.29/drivers/spi/spi_mpc83xx.c +=================================================================== +--- linux-2.6.29.orig/drivers/spi/spi_mpc83xx.c 2009-10-05 18:55:57.000000000 +0200 ++++ linux-2.6.29/drivers/spi/spi_mpc83xx.c 2009-10-05 18:59:01.000000000 +0200 +@@ -280,7 +280,9 @@ + if (pm) + pm--; + +- cs->hw_mode |= SPMODE_PM(pm); ++ cs->hw_mode = 0x0F700000; ++ mpc83xx_spi_write_reg(&mpc83xx_spi->base->mode,cs->hw_mode); ++ + regval = mpc83xx_spi_read_reg(&mpc83xx_spi->base->mode); + if (cs->hw_mode != regval) { + unsigned long flags; +@@ -448,7 +450,7 @@ + cs->hw_mode = mpc83xx_spi_read_reg(&mpc83xx_spi->base->mode); + /* mask out bits we are going to set */ + cs->hw_mode &= ~(SPMODE_CP_BEGIN_EDGECLK | SPMODE_CI_INACTIVEHIGH +- | SPMODE_REV | SPMODE_LOOP); ++ | SPMODE_REV ); + + if (spi->mode & SPI_CPHA) + cs->hw_mode |= SPMODE_CP_BEGIN_EDGECLK; +@@ -456,8 +458,10 @@ + cs->hw_mode |= SPMODE_CI_INACTIVEHIGH; + if (!(spi->mode & SPI_LSB_FIRST)) + cs->hw_mode |= SPMODE_REV; +- if (spi->mode & SPI_LOOP) +- cs->hw_mode |= SPMODE_LOOP; ++ ++ cs->hw_mode = 0x0F700000; ++ mpc83xx_spi_write_reg(&mpc83xx_spi->base->mode,cs->hw_mode); ++ cs->hw_mode = mpc83xx_spi_read_reg(&mpc83xx_spi->base->mode); + + retval = mpc83xx_spi_setup_transfer(spi, NULL); + if (retval < 0) { +@@ -637,7 +641,7 @@ + INIT_LIST_HEAD(&mpc83xx_spi->queue); + + mpc83xx_spi->workqueue = create_singlethread_workqueue( +- master->dev.parent->bus_id); ++ dev->dev.bus_id); + if (mpc83xx_spi->workqueue == NULL) { + ret = -EBUSY; + goto free_irq; diff --git a/recipes/linux/linux_2.6.29.bb b/recipes/linux/linux_2.6.29.bb index eb6b8b98bf..a172b6d074 100644 --- a/recipes/linux/linux_2.6.29.bb +++ b/recipes/linux/linux_2.6.29.bb @@ -27,7 +27,7 @@ SRC_URI_append_boc01 = "\ file://004-081205-usb.patch;patch=1 \ file://005-090226-isl12024.patch;patch=1 \ file://007-091005-lm73.patch;patch=1 \ - file://008-081208-spi.patch;patch=1 \ + file://008-091005-spi.patch;patch=1 \ file://011-090115-gpio.patch;patch=1 \ file://012-090219-capsense.patch;patch=1 \ file://013-090306-lcd.patch;patch=1 \ -- cgit v1.2.3 From d9ec7f1a8d1920dca358dc1f4396d64f055b4275 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Mon, 5 Oct 2009 23:31:46 +0200 Subject: kexec-tools_klibc-static_2.0.1: rewrite some functions for klibc compatibility (getline, fscanf). Now it builds...WIP --- recipes/kexec/files/kexec-tools-2-klibc.patch | 43 +++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/recipes/kexec/files/kexec-tools-2-klibc.patch b/recipes/kexec/files/kexec-tools-2-klibc.patch index 581d8a4aa0..43b2ebc173 100644 --- a/recipes/kexec/files/kexec-tools-2-klibc.patch +++ b/recipes/kexec/files/kexec-tools-2-klibc.patch @@ -143,7 +143,7 @@ Index: kexec-tools-2.0.1/purgatory/string.c Index: kexec-tools-2.0.1/kexec/kexec.c =================================================================== --- kexec-tools-2.0.1.orig/kexec/kexec.c 2008-02-24 14:15:46.950825917 +0100 -+++ kexec-tools-2.0.1/kexec/kexec.c 2009-09-26 01:58:53.545624148 +0200 ++++ kexec-tools-2.0.1/kexec/kexec.c 2009-10-05 23:19:39.000000000 +0200 @@ -38,9 +38,9 @@ #include "config.h" @@ -157,7 +157,8 @@ Index: kexec-tools-2.0.1/kexec/kexec.c #include #include "kexec.h" #include "kexec-syscall.h" -@@ -555,6 +555,6 @@ +@@ -554,7 +554,7 @@ + return buf; } -#if HAVE_LIBZ @@ -165,6 +166,44 @@ Index: kexec-tools-2.0.1/kexec/kexec.c char *slurp_decompress_file(const char *filename, off_t *r_size) { gzFile fp; +@@ -935,11 +935,19 @@ + { + int ret; + FILE *fp; ++ char *endptr; ++ char *line = NULL; + + fp = fopen("/sys/kernel/kexec_loaded", "r"); + if (fp == NULL) + return -1; +- fscanf(fp, "%d", &ret); ++/* fscanf(fp, "%d", &ret); */ ++ ++ if ( NULL == fgets(line, sizeof(line), fp) ) { ++ return -1; ++ ret = strtol(line, &endptr, 10); ++ } ++ + fclose(fp); + return ret; + } +@@ -994,9 +1002,14 @@ + + fp = fopen("/proc/cmdline", "r"); + if (!fp) +- die("Could not read /proc/cmdline."); +- getline(&line, &len, fp); ++ die("Could not open /proc/cmdline."); ++ ++ if ( NULL == fgets(line, sizeof(line), fp) ) { ++ die("Can't read /proc/cmdline."); ++ ++/* getline(&line, &len, fp); */ + fclose(fp); ++ } + + if (line) { + /* strip newline */ Index: kexec-tools-2.0.1/kexec/arch/arm/kexec-zImage-arm.c =================================================================== -- cgit v1.2.3 From c518a888a6e5a8180a6e5dddfc7e686d2707a365 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Tue, 6 Oct 2009 01:13:43 +0200 Subject: kexec-tools-klibc-static_2.0.1: revised patchset/Tested on arm. Bump PR. --- recipes/kexec/files/kexec-tools-2-klibc.patch | 17 ++++++++++++++--- recipes/kexec/kexec-tools-klibc-static_2.0.1.bb | 2 +- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/recipes/kexec/files/kexec-tools-2-klibc.patch b/recipes/kexec/files/kexec-tools-2-klibc.patch index 43b2ebc173..2196249a97 100644 --- a/recipes/kexec/files/kexec-tools-2-klibc.patch +++ b/recipes/kexec/files/kexec-tools-2-klibc.patch @@ -143,7 +143,7 @@ Index: kexec-tools-2.0.1/purgatory/string.c Index: kexec-tools-2.0.1/kexec/kexec.c =================================================================== --- kexec-tools-2.0.1.orig/kexec/kexec.c 2008-02-24 14:15:46.950825917 +0100 -+++ kexec-tools-2.0.1/kexec/kexec.c 2009-10-05 23:19:39.000000000 +0200 ++++ kexec-tools-2.0.1/kexec/kexec.c 2009-10-06 00:37:01.000000000 +0200 @@ -38,9 +38,9 @@ #include "config.h" @@ -171,7 +171,7 @@ Index: kexec-tools-2.0.1/kexec/kexec.c int ret; FILE *fp; + char *endptr; -+ char *line = NULL; ++ char *line[3]; fp = fopen("/sys/kernel/kexec_loaded", "r"); if (fp == NULL) @@ -187,7 +187,13 @@ Index: kexec-tools-2.0.1/kexec/kexec.c fclose(fp); return ret; } -@@ -994,9 +1002,14 @@ +@@ -990,17 +998,23 @@ + { + FILE *fp; + size_t len; +- char *line = NULL; ++ const int sizeof_line = 1024; ++ char *line = malloc(sizeof_line); /* according to strdup() later */ fp = fopen("/proc/cmdline", "r"); if (!fp) @@ -204,6 +210,11 @@ Index: kexec-tools-2.0.1/kexec/kexec.c if (line) { /* strip newline */ +- *(line + strlen(line) - 1) = 0; ++ line[strlen(line) - 1] = '\0'; + + remove_parameter(line, "BOOT_IMAGE"); + if (kexec_flags & KEXEC_ON_CRASH) Index: kexec-tools-2.0.1/kexec/arch/arm/kexec-zImage-arm.c =================================================================== diff --git a/recipes/kexec/kexec-tools-klibc-static_2.0.1.bb b/recipes/kexec/kexec-tools-klibc-static_2.0.1.bb index b9586f005c..2dbd1c21ea 100644 --- a/recipes/kexec/kexec-tools-klibc-static_2.0.1.bb +++ b/recipes/kexec/kexec-tools-klibc-static_2.0.1.bb @@ -3,7 +3,7 @@ require kexec-tools2.inc DEFAULT_PREFERENCE = "-1" -PR = "r0" +PR = "r1" DEPENDS = "klibc" SRC_URI += "file://kexec-tools-2-headers.patch;patch=1 \ -- cgit v1.2.3 From 06c06f67c72891d4022ad53cc44ddc1242a87d9b Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Mon, 5 Oct 2009 23:39:53 +0000 Subject: xserver-kdrive-1.3.0.0: Report correct XRandR version. Fixes non-working GTK+. --- .../files/report-correct-randr12.patch | 29 ++++++++++++++++++++++ recipes/xorg-xserver/xserver-kdrive_1.3.0.0.bb | 3 ++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 recipes/xorg-xserver/files/report-correct-randr12.patch diff --git a/recipes/xorg-xserver/files/report-correct-randr12.patch b/recipes/xorg-xserver/files/report-correct-randr12.patch new file mode 100644 index 0000000000..72c8a18add --- /dev/null +++ b/recipes/xorg-xserver/files/report-correct-randr12.patch @@ -0,0 +1,29 @@ +Server reports XRandR version provided by libxrandr instead of XRandR +version implemented. It confuses applications that execute XRandR +version dependent code (e. g. gtk+ >= 2.18.0). + +Index: xorg-server-1.3.0.0/randr/rrdispatch.c +=================================================================== +--- xorg-server-1.3.0.0.orig/randr/rrdispatch.c ++++ xorg-server-1.3.0.0/randr/rrdispatch.c +@@ -22,6 +22,9 @@ + + #include "randrstr.h" + ++#define SERVER_RANDR_MAJOR 1 ++#define SERVER_RANDR_MINOR 2 ++ + Bool + RRClientKnowsRates (ClientPtr pClient) + { +@@ -49,8 +52,8 @@ ProcRRQueryVersion (ClientPtr client) + * Report the current version; the current + * spec says they're all compatible after 1.0 + */ +- rep.majorVersion = RANDR_MAJOR; +- rep.minorVersion = RANDR_MINOR; ++ rep.majorVersion = SERVER_RANDR_MAJOR; ++ rep.minorVersion = SERVER_RANDR_MINOR; + if (client->swapped) { + swaps(&rep.sequenceNumber, n); + swapl(&rep.length, n); diff --git a/recipes/xorg-xserver/xserver-kdrive_1.3.0.0.bb b/recipes/xorg-xserver/xserver-kdrive_1.3.0.0.bb index 1faa0e7990..1b052e7926 100644 --- a/recipes/xorg-xserver/xserver-kdrive_1.3.0.0.bb +++ b/recipes/xorg-xserver/xserver-kdrive_1.3.0.0.bb @@ -3,7 +3,7 @@ require xserver-kdrive-common.inc DEPENDS += "libxkbfile libxcalibrate" PE = "1" -PR = "r26" +PR = "r27" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ @@ -24,6 +24,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ file://gumstix-kmode.patch;patch=1 \ file://fix-picturestr-include-order.patch;patch=1 \ file://autotools.patch;patch=1 \ + file://report-correct-randr12.patch;patch=1 \ " SRC_URI_append_avr32 = " \ -- cgit v1.2.3 From 1c7fac5c2ade328c197973fdaa717efe44c2532c Mon Sep 17 00:00:00 2001 From: Steffen Sledz Date: Tue, 6 Oct 2009 11:45:32 +0200 Subject: linux-2.6.24: enable root nfs support for hipox machine --- recipes/linux/linux-2.6.24/hipox/defconfig | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/recipes/linux/linux-2.6.24/hipox/defconfig b/recipes/linux/linux-2.6.24/hipox/defconfig index a1482fbf4b..657d2f3ce4 100644 --- a/recipes/linux/linux-2.6.24/hipox/defconfig +++ b/recipes/linux/linux-2.6.24/hipox/defconfig @@ -332,7 +332,10 @@ CONFIG_INET=y CONFIG_IP_MULTICAST=y # CONFIG_IP_ADVANCED_ROUTER is not set CONFIG_IP_FIB_HASH=y -# CONFIG_IP_PNP is not set +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +CONFIG_IP_PNP_RARP=y # CONFIG_NET_IPIP is not set # CONFIG_NET_IPGRE is not set # CONFIG_IP_MROUTE is not set @@ -1201,6 +1204,7 @@ CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=y CONFIG_NFS_DIRECTIO=y # CONFIG_NFSD is not set +CONFIG_ROOT_NFS=y CONFIG_LOCKD=y CONFIG_LOCKD_V4=y CONFIG_NFS_ACL_SUPPORT=y -- cgit v1.2.3 From 46243e2ac292b0cc015b7811a802df11f3fa2fe6 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Tue, 6 Oct 2009 12:18:37 +0200 Subject: lighttpd: switch to .inc file and INC_PR --- recipes/lighttpd/lighttpd.inc | 51 ++++++++++++++++++++++++++++++++++++ recipes/lighttpd/lighttpd_1.4.18.bb | 52 +++++-------------------------------- recipes/lighttpd/lighttpd_1.4.23.bb | 52 +++---------------------------------- 3 files changed, 60 insertions(+), 95 deletions(-) create mode 100644 recipes/lighttpd/lighttpd.inc diff --git a/recipes/lighttpd/lighttpd.inc b/recipes/lighttpd/lighttpd.inc new file mode 100644 index 0000000000..1638fb8fce --- /dev/null +++ b/recipes/lighttpd/lighttpd.inc @@ -0,0 +1,51 @@ +DESCRIPTION = "Web server" +SECTION = "net" +LICENSE = "BSD" +DEPENDS = "libpcre" + +INC_PR = "r3" + +SRC_URI = "http://www.lighttpd.net/download/lighttpd-${PV}.tar.gz \ + file://index.html \ + file://lighttpd.conf \ + file://lighttpd \ + " + + +EXTRA_OECONF=" \ + --without-bzip2 \ + --without-ldap \ + --without-lua \ + --without-memcache \ + --with-pcre \ + --without-webdav-props \ + --without-webdav-locks \ + --without-openssl \ + --disable-nls \ + --disable-static \ + " + +inherit autotools pkgconfig update-rc.d + +INITSCRIPT_NAME = "lighttpd" +INITSCRIPT_PARAMS = "defaults 70" + +do_install_append() { + install -d ${D}${sysconfdir}/init.d ${D}/www/logs ${D}/www/pages/dav ${D}/www/var + install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir} + install -m 0644 ${WORKDIR}/index.html ${D}/www/pages/ +} + +do_stage() { + autotools_stage_all +} + +FILES_${PN} += "${sysconfdir} /www" + +PACKAGES_DYNAMIC = "lighttpd-module-*" + +python populate_packages_prepend () { + lighttpd_libdir = bb.data.expand('${libdir}', d) + do_split_packages(d, lighttpd_libdir, '^mod_(.*)\.so$', 'lighttpd-module-%s', 'Lighttpd module for %s', extra_depends='') +} diff --git a/recipes/lighttpd/lighttpd_1.4.18.bb b/recipes/lighttpd/lighttpd_1.4.18.bb index d5870ba5af..3d47a211cf 100644 --- a/recipes/lighttpd/lighttpd_1.4.18.bb +++ b/recipes/lighttpd/lighttpd_1.4.18.bb @@ -1,49 +1,9 @@ -DESCRIPTION = "Web server" -SECTION = "net" -LICENSE = "BSD" -DEPENDS = "libpcre" -PR = "r3" +require lighttpd.inc -SRC_URI = "http://www.lighttpd.net/download/lighttpd-${PV}.tar.gz \ - file://configure.in.patch;patch=1 \ - file://mod_redirect.c.patch;patch=1 \ - file://src-server.c.patch;patch=1 \ - file://index.html \ - file://lighttpd.conf \ - file://lighttpd" +PR = "${INC_PR}.1" -EXTRA_OECONF="--without-bzip2 \ - --without-ldap \ - --without-lua \ - --without-memcache \ - --with-pcre \ - --without-webdav-props \ - --without-webdav-locks \ - --without-openssl \ - --disable-nls \ - --disable-static" +SRC_URI += "file://configure.in.patch;patch=1 \ + file://mod_redirect.c.patch;patch=1 \ + file://src-server.c.patch;patch=1 \ + " -inherit autotools pkgconfig update-rc.d - -INITSCRIPT_NAME = "lighttpd" -INITSCRIPT_PARAMS = "defaults 70" - -do_install_append() { - install -d ${D}${sysconfdir}/init.d ${D}/www/logs ${D}/www/pages/dav ${D}/www/var - install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir} - install -m 0644 ${WORKDIR}/index.html ${D}/www/pages/ -} - -do_stage() { - autotools_stage_all -} - -FILES_${PN} += "${sysconfdir} /www" - -PACKAGES_DYNAMIC = "lighttpd-module-*" - -python populate_packages_prepend () { - lighttpd_libdir = bb.data.expand('${libdir}', d) - do_split_packages(d, lighttpd_libdir, '^mod_(.*)\.so$', 'lighttpd-module-%s', 'Lighttpd module for %s', extra_depends='') -} diff --git a/recipes/lighttpd/lighttpd_1.4.23.bb b/recipes/lighttpd/lighttpd_1.4.23.bb index 79d9e39f8b..4e8a6a6511 100644 --- a/recipes/lighttpd/lighttpd_1.4.23.bb +++ b/recipes/lighttpd/lighttpd_1.4.23.bb @@ -1,52 +1,6 @@ -DESCRIPTION = "Web server" -SECTION = "net" -LICENSE = "BSD" -DEPENDS = "libpcre" -PR = "r0" +require lighttpd.inc -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "http://www.lighttpd.net/download/lighttpd-${PV}.tar.gz \ - file://index.html \ - file://lighttpd.conf \ - file://lighttpd" -# file://configure.in.patch;patch=1 \ -# file://mod_redirect.c.patch;patch=1 \ - - -EXTRA_OECONF="\ ---without-bzip2 \ ---without-ldap \ ---without-lua \ ---without-memcache \ ---with-pcre \ ---without-webdav-props \ ---without-webdav-locks \ ---without-openssl \ ---disable-nls \ ---disable-static" - -inherit autotools pkgconfig update-rc.d +PR = "${INC_PR}.1" -INITSCRIPT_NAME = "lighttpd" -INITSCRIPT_PARAMS = "defaults 70" - -do_install_append() { - install -d ${D}${sysconfdir}/init.d ${D}/www/logs ${D}/www/pages/dav ${D}/www/var - install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir} - install -m 0644 ${WORKDIR}/index.html ${D}/www/pages/ -} - -do_stage() { - autotools_stage_all -} - -FILES_${PN} += "${sysconfdir} /www" - -PACKAGES_DYNAMIC = "lighttpd-module-*" +DEFAULT_PREFERENCE = "-1" -python populate_packages_prepend () { - lighttpd_libdir = bb.data.expand('${libdir}', d) - do_split_packages(d, lighttpd_libdir, '^mod_(.*)\.so$', 'lighttpd-module-%s', 'Lighttpd module for %s', extra_depends='') -} -- cgit v1.2.3 From 6c5f18b9311de8db04a9557f61877eca083b3299 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Tue, 6 Oct 2009 12:29:20 +0200 Subject: lighttpd: inherit gettext * remove --disable-nls from configure line * bump INC_PR --- recipes/lighttpd/lighttpd.inc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/recipes/lighttpd/lighttpd.inc b/recipes/lighttpd/lighttpd.inc index 1638fb8fce..aeb8dc9bfc 100644 --- a/recipes/lighttpd/lighttpd.inc +++ b/recipes/lighttpd/lighttpd.inc @@ -3,7 +3,7 @@ SECTION = "net" LICENSE = "BSD" DEPENDS = "libpcre" -INC_PR = "r3" +INC_PR = "r4" SRC_URI = "http://www.lighttpd.net/download/lighttpd-${PV}.tar.gz \ file://index.html \ @@ -11,7 +11,6 @@ SRC_URI = "http://www.lighttpd.net/download/lighttpd-${PV}.tar.gz \ file://lighttpd \ " - EXTRA_OECONF=" \ --without-bzip2 \ --without-ldap \ @@ -21,11 +20,10 @@ EXTRA_OECONF=" \ --without-webdav-props \ --without-webdav-locks \ --without-openssl \ - --disable-nls \ --disable-static \ " -inherit autotools pkgconfig update-rc.d +inherit autotools pkgconfig update-rc.d gettext INITSCRIPT_NAME = "lighttpd" INITSCRIPT_PARAMS = "defaults 70" -- cgit v1.2.3 From 2403fd53440120102c2c63f3b035c3fe66b50ef2 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Tue, 6 Oct 2009 12:39:03 +0200 Subject: lighttpd: starting depends on three modules * indexfile, dirlisting, staticfile are needed according our config, so let RDEPENDS on them * found out by Michael Lippautz * bump INC_PR --- recipes/lighttpd/lighttpd.inc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/recipes/lighttpd/lighttpd.inc b/recipes/lighttpd/lighttpd.in