diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2005-07-03 17:05:34 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-07-03 17:05:34 +0000 |
| commit | 063bddde698a5d99995ceaa5de2f89b89417f67d (patch) | |
| tree | 34f751e432210f327ba9ec467d795ab324b10712 | |
| parent | a1ce802b1a54b39ec373c6aa2c3eba0d2acabdd3 (diff) | |
| parent | d4026a697b00e068a908fc7086ceebc63bff1c9d (diff) | |
merge of 309baf9561eba78495d1b59322a8ebca28e571bc
and 9493767780c108c1eb032fd49a0a9898244577b9
| -rw-r--r-- | conf/machine/nokia770.conf | 2 | ||||
| -rw-r--r-- | packages/maemo/hildon-home/noWerror.patch | 11 | ||||
| -rw-r--r-- | packages/maemo/hildon-home_0.8.20-2.bb | 5 | ||||
| -rw-r--r-- | packages/samba/files/quota.patch | 11 | ||||
| -rw-r--r-- | packages/samba/samba_3.0.14a.bb | 4 |
5 files changed, 29 insertions, 4 deletions
diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf index 99544de28c..77296e3b8e 100644 --- a/conf/machine/nokia770.conf +++ b/conf/machine/nokia770.conf @@ -6,7 +6,7 @@ IPKG_ARCHS = "all arm armv4 armv5te" PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-omap" PREFERRED_PROVIDER_virtual/bootloader = "" -PREFERRED_PROVIDER_virtual/tslib = "tslib-maemo" +#PREFERRED_PROVIDER_virtual/tslib = "tslib-maemo" XSERVER = "xserver-kdrive-omap" diff --git a/packages/maemo/hildon-home/noWerror.patch b/packages/maemo/hildon-home/noWerror.patch new file mode 100644 index 0000000000..06db4feecc --- /dev/null +++ b/packages/maemo/hildon-home/noWerror.patch @@ -0,0 +1,11 @@ +--- configure.ac.orig 2005-07-03 18:41:20.000000000 +0200 ++++ configure.ac 2005-07-03 18:41:40.000000000 +0200 +@@ -31,7 +31,7 @@ + # D-BUS headers do not compile with -pedantic. Once they are fixed, + #return the flag + #CFLAGS="$CFLAGS -Wall -ansi -pedantic -Wmissing-prototypes -Wmissing-declarations -Werror" +-CFLAGS="$CFLAGS -Wall -ansi -Wmissing-prototypes -Wmissing-declarations -Werror" ++CFLAGS="$CFLAGS -Wall -ansi -Wmissing-prototypes -Wmissing-declarations" + AC_SUBST(CFLAGS) + + PKG_CHECK_MODULES(OSSO,libosso >= 0.0.3) diff --git a/packages/maemo/hildon-home_0.8.20-2.bb b/packages/maemo/hildon-home_0.8.20-2.bb index 241288f2ce..0ac72a55d9 100644 --- a/packages/maemo/hildon-home_0.8.20-2.bb +++ b/packages/maemo/hildon-home_0.8.20-2.bb @@ -1,11 +1,12 @@ -PR = "r1" +PR = "r2" LICENSE = "GPL" MAINTAINER = "Florian Boor <florian@kernelconcepts.de>" DEPENDS = "gtk+-2.6.4-1.osso7 hildon-lgpl libosso hildon-base-lib hildon-libs osso-gnome-vfs2 osso-thumbnail" SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/h/${PN}/${PN}_${PV}.tar.gz \ - file://source.patch;patch=1;pnum=0" + file://source.patch;patch=1;pnum=0 \ + file://noWerror.patch;patch=1;pnum=0" S = "${WORKDIR}/hildon-home-0.8.20" diff --git a/packages/samba/files/quota.patch b/packages/samba/files/quota.patch new file mode 100644 index 0000000000..6f42ff868f --- /dev/null +++ b/packages/samba/files/quota.patch @@ -0,0 +1,11 @@ +--- lib/sysquotas_4A.c.old 2005-07-03 17:16:00.000000000 +0200 ++++ lib/sysquotas_4A.c 2005-07-03 17:10:09.000000000 +0200 +@@ -28,6 +28,8 @@ + /* long quotactl(int cmd, char *special, qid_t id, caddr_t addr) */ + /* this is used by: HPUX,IRIX */ + ++ #define _LINUX_QUOTA_VERSION 1 ++ + #ifdef HAVE_SYS_TYPES_H + #include <sys/types.h> + #endif diff --git a/packages/samba/samba_3.0.14a.bb b/packages/samba/samba_3.0.14a.bb index d58b939399..68a261cbc1 100644 --- a/packages/samba/samba_3.0.14a.bb +++ b/packages/samba/samba_3.0.14a.bb @@ -1,4 +1,5 @@ -PR = "r6" + +PR = "r7" # Ugly patch to hack configure.in to set the CPPFLAGS without actually checking for LFS support # For nslu2. Will probably work for forcing for other archs as well. @@ -10,6 +11,7 @@ SRC_URI = "http://us2.samba.org/samba/ftp/stable/samba-${PV}.tar.gz \ file://cifs.patch;patch=1 \ ${LFS_SRC_URI} \ file://init \ + file://quota.patch;patch=1;pnum=0 \ " S := ${WORKDIR}/${P}/source |