diff options
| author | Stelios Koroneos <skoroneos@digital-opsis.com> | 2007-04-29 15:52:25 +0000 |
|---|---|---|
| committer | Stelios Koroneos <skoroneos@digital-opsis.com> | 2007-04-29 15:52:25 +0000 |
| commit | 91a272da8c2875e7f56113afe07f4a05b932cf1d (patch) | |
| tree | c3aba45a4f032e3ad371dbb68dfe6fb3b0c1351a | |
| parent | d6ccf0e7c2823988481bc8ed2cfa2bfedbe8d7d9 (diff) | |
| parent | a158914c5574126c5b99211a9cbd5f61d539984e (diff) | |
merge of '2087be8072069ca04fed4f7641aed94abcddeabd'
and '62ddceade7b13ecdec3ff4ff1a0f8412312a23e2'
| -rw-r--r-- | conf/distro/angstrom-2007.1.conf | 4 | ||||
| -rw-r--r-- | packages/avahi/avahi.inc | 2 | ||||
| -rw-r--r-- | packages/avahi/avahi_0.6.18.bb | 11 | ||||
| -rw-r--r-- | packages/util-linux/files/glibc-umount2.patch | 18 | ||||
| -rw-r--r-- | packages/util-linux/util-linux_2.12r.bb | 3 |
5 files changed, 23 insertions, 15 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 0eebca25b1..daa579f132 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -131,7 +131,7 @@ PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm ?= "gtk+" PREFERRED_VERSION_fontconfig = "2.4.1" PREFERRED_VERSION_freetype = "2.3.3" PREFERRED_VERSION_freetype-native = "2.2.1" -PREFERRED_VERSION_cairo = "1.4.2" +PREFERRED_VERSION_cairo = "1.4.4" PREFERRED_VERSION_glib-2.0 = "2.12.11" # older gtk-webcore releases don't work on ARM/EABI @@ -217,7 +217,7 @@ PREFERRED_VERSION_linux-libc-headers_i586 ?= "2.6.18" PREFERRED_VERSION_linux-libc-headers_i686 ?= "2.6.18" PREFERRED_VERSION_linux-libc-headers_powerpc ?= "2.6.18" PREFERRED_VERSION_linux-libc-headers_ixp4xx ?= "2.6.18" -PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99" +PREFERRED_VERSION_linux-libc-headers ?= "2.6.20" PREFERRED_VERSION_glibc ?= "2.5" diff --git a/packages/avahi/avahi.inc b/packages/avahi/avahi.inc index 72583cb7e9..fa2884b98e 100644 --- a/packages/avahi/avahi.inc +++ b/packages/avahi/avahi.inc @@ -4,7 +4,7 @@ HOMEPAGE = "http://avahi.org" SECTION = "network" PRIORITY = "optional" LICENSE = "GPL" -PR="r2" +PR="r3" DEPENDS = "expat libdaemon dbus glib-2.0" RRECOMMENDS = "libnss-mdns" diff --git a/packages/avahi/avahi_0.6.18.bb b/packages/avahi/avahi_0.6.18.bb index 0edbaf10d5..9189734dfa 100644 --- a/packages/avahi/avahi_0.6.18.bb +++ b/packages/avahi/avahi_0.6.18.bb @@ -1,12 +1 @@ require avahi.inc -PR = "r2" - -DEPENDS =+ "gtk+ libglade" - -PACKAGES =+ "libavahi-ui libavahi-ui-dev libavahi-ui-dbg" -FILES_libavahi-ui = "${libdir}/libavahi-ui.so.*" -FILES_libavahi-ui-dev = "${libdir}/libavahi-ui.*" -FILES_libavahi-ui-dbg = "${libdir}/.debug/libavahi-ui*" - -EXTRA_OECONF = "--with-distro=debian --disable-gdbm --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 --disable-python" - diff --git a/packages/util-linux/files/glibc-umount2.patch b/packages/util-linux/files/glibc-umount2.patch new file mode 100644 index 0000000000..3da3a85cfc --- /dev/null +++ b/packages/util-linux/files/glibc-umount2.patch @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10sparcumount.dpatch by Jeff Bailey <jbailey@ubuntu.com> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Sparc and Arm have umount2 in glibc. + +@DPATCH@ +--- util-linux/mount/umount.c 2005-05-20 11:39:07.000000000 +0000 ++++ util-linux/mount/umount.c 2005-05-20 11:39:15.000000000 +0000 +@@ -31,7 +31,7 @@ + #include <arpa/inet.h> + #endif + +-#if defined(MNT_FORCE) && !defined(__sparc__) && !defined(__arm__) ++#if defined(MNT_FORCE) + /* Interesting ... it seems libc knows about MNT_FORCE and presumably + about umount2 as well -- need not do anything */ + #else /* MNT_FORCE */ diff --git a/packages/util-linux/util-linux_2.12r.bb b/packages/util-linux/util-linux_2.12r.bb index 32cbadae64..0409f61b74 100644 --- a/packages/util-linux/util-linux_2.12r.bb +++ b/packages/util-linux/util-linux_2.12r.bb @@ -2,5 +2,6 @@ require util-linux.inc SRC_URI += "file://util-linux_2.12r-12.diff.gz;patch=1" SRC_URI += "file://glibc-fix.patch;patch=1" +SRC_URI += "file://glibc-umount2.patch;patch=1" -PR = "r10" +PR = "r11" |