diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-10-28 09:02:47 +0100 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-10-28 09:02:47 +0100 |
| commit | 1ca106793e669980354fa9c32fe931bb7a72b070 (patch) | |
| tree | 69b0e465e1c1672db60e84e5946de4a8227338f5 | |
| parent | c9621cc1a42a7cd06529791922dd68d07d46b9de (diff) | |
| parent | 1a4bd59fdadcbada295b10ff9ecc6d1b5f155ab7 (diff) | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
| -rw-r--r-- | conf/checksums.ini | 4 | ||||
| -rw-r--r-- | recipes/klibc/klibc-1.5.15/mntproc-definitions.patch | 20 | ||||
| -rw-r--r-- | recipes/klibc/klibc-1.5.15/signal-cleanup.patch | 32 | ||||
| -rw-r--r-- | recipes/klibc/klibc_1.5.15.bb | 2 | ||||
| -rw-r--r-- | recipes/klibc/klibc_1.5.15.inc | 2 | ||||
| -rw-r--r-- | recipes/xfce-base/xfce4-mixer_4.6.1.bb | 2 |
6 files changed, 61 insertions, 1 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index 1619c93f45..a6f06f0dc9 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -28586,6 +28586,10 @@ sha256=6beda572195d6f7ed108e0659592d1ca6ad5088e769e3d219cc4114533f8b169 md5=c21cb5680f135dc86e5f0a6f9473003a sha256=b390241dfddbc10ae1b870d1326a7675b9ac99e13c89326ba2accea3bfecc47a +[http://mocha.xfce.org/archive/src/apps/xfce4-mixer/4.6/xfce4-mixer-4.6.1.tar.bz2] +md5=a99e2455445480ef5081fe69454a46fc +sha256=cf7b8af6696b0e3795ab65d15a8b5d217123955919713f7bae86008b56abb5dd + [http://mocha.xfce.org/archive/src/xfce/xfce4-mixer/4.6/xfce4-mixer-4.6.1.tar.bz2] md5=a99e2455445480ef5081fe69454a46fc sha256=cf7b8af6696b0e3795ab65d15a8b5d217123955919713f7bae86008b56abb5dd diff --git a/recipes/klibc/klibc-1.5.15/mntproc-definitions.patch b/recipes/klibc/klibc-1.5.15/mntproc-definitions.patch new file mode 100644 index 0000000000..eea606be2b --- /dev/null +++ b/recipes/klibc/klibc-1.5.15/mntproc-definitions.patch @@ -0,0 +1,20 @@ +Description: MNTPROC_MNT and MNTPROC_UMNT are no longer defined by the + kernel. Hack around this by restoring the old definitions. +Upstream: http://thread.gmane.org/gmane.linux.nfs/28059 suggests a better + fix is in progress. + +diff -Nur -x '*.orig' -x '*~' klibc-1.5.15/usr/kinit/nfsmount/mount.c klibc-1.5.15.new/usr/kinit/nfsmount/mount.c +--- klibc-1.5.15/usr/kinit/nfsmount/mount.c 2009-01-04 19:28:03.000000000 +0000 ++++ klibc-1.5.15.new/usr/kinit/nfsmount/mount.c 2009-10-04 22:52:44.000000000 +0100 +@@ -44,6 +44,11 @@ + + #define MNT_REPLY_MINSIZE (sizeof(struct rpc_reply) + sizeof(uint32_t)) + ++#ifndef MNTPROC_MNT ++# define MNTPROC_MNT 1 ++# define MNTPROC_UMNT 3 ++#endif /* MNTPROC_MNT */ ++ + static int get_ports(uint32_t server, const struct nfs_mount_data *data) + { + uint32_t nfs_ver, mount_ver; diff --git a/recipes/klibc/klibc-1.5.15/signal-cleanup.patch b/recipes/klibc/klibc-1.5.15/signal-cleanup.patch new file mode 100644 index 0000000000..fd41f4d7b7 --- /dev/null +++ b/recipes/klibc/klibc-1.5.15/signal-cleanup.patch @@ -0,0 +1,32 @@ +Description: Cope with header changes in kernel commit + 63b852a6b67d0820d388b0ecd0da83ccb4048b8d. + +diff -Nur -x '*.orig' -x '*~' klibc-1.5.15/usr/include/arch/i386/klibc/archsignal.h klibc-1.5.15.new/usr/include/arch/i386/klibc/archsignal.h +--- klibc-1.5.15/usr/include/arch/i386/klibc/archsignal.h 2009-10-04 23:10:17.000000000 +0100 ++++ klibc-1.5.15.new/usr/include/arch/i386/klibc/archsignal.h 2009-10-05 09:35:14.000000000 +0100 +@@ -96,7 +96,7 @@ + #define MINSIGSTKSZ 2048 + #define SIGSTKSZ 8192 + +-#include <asm-generic/signal.h> ++#include <asm-generic/signal-defs.h> + + /* This uses gcc anonymous union support... */ + struct siginfo; +diff -Nur -x '*.orig' -x '*~' klibc-1.5.15/usr/include/arch/sparc/klibc/archsignal.h klibc-1.5.15.new/usr/include/arch/sparc/klibc/archsignal.h +--- klibc-1.5.15/usr/include/arch/sparc/klibc/archsignal.h 2009-01-04 19:28:03.000000000 +0000 ++++ klibc-1.5.15.new/usr/include/arch/sparc/klibc/archsignal.h 2009-10-05 09:37:31.000000000 +0100 +@@ -11,13 +11,6 @@ + #define __WANT_POSIX1B_SIGNALS__ + #include <asm/signal.h> + +-struct sigaction { +- __sighandler_t sa_handler; +- unsigned long sa_flags; +- void (*sa_restorer)(void); /* Not used by Linux/SPARC */ +- sigset_t sa_mask; +-}; +- + /* Not actually used by the kernel... */ + #define SA_RESTORER 0x80000000 + diff --git a/recipes/klibc/klibc_1.5.15.bb b/recipes/klibc/klibc_1.5.15.bb index 13fe8a2499..31c4fbca3d 100644 --- a/recipes/klibc/klibc_1.5.15.bb +++ b/recipes/klibc/klibc_1.5.15.bb @@ -1,4 +1,4 @@ require klibc_1.5.15.inc -PR = "r2" +PR = "r3" KLIBC_FETCHDIR = "Testing" diff --git a/recipes/klibc/klibc_1.5.15.inc b/recipes/klibc/klibc_1.5.15.inc index 89378b7e7f..f6f5b879ef 100644 --- a/recipes/klibc/klibc_1.5.15.inc +++ b/recipes/klibc/klibc_1.5.15.inc @@ -2,6 +2,8 @@ require klibc-common.inc SRC_URI += "file://staging.patch;patch=1 \ file://klibc_kexecsyscall.patch;patch=1 \ + file://mntproc-definitions.patch;patch=1 \ + file://signal-cleanup.patch;patch=1 \ " # we want only the shared programms and the lib so we chose them manually diff --git a/recipes/xfce-base/xfce4-mixer_4.6.1.bb b/recipes/xfce-base/xfce4-mixer_4.6.1.bb index f6a42d0087..8d1f38b402 100644 --- a/recipes/xfce-base/xfce4-mixer_4.6.1.bb +++ b/recipes/xfce-base/xfce4-mixer_4.6.1.bb @@ -8,6 +8,8 @@ PR = "r2" inherit xfce46 +SRC_URI = "http://mocha.xfce.org/archive/src/apps/${PN}/${@'${PV}'[0:3]}/${PN}-${PV}.tar.bz2" + FILES_${PN} += "${datadir}/xfce4/panel-plugins/*.desktop" FILES_${PN} += "${libdir}/xfce4/modules/libxfce4mixer.so" FILES_${PN}-dbg += "${libexecdir}/xfce4/panel-plugins/.debug/" |