diff options
| -rw-r--r-- | conf/distro/include/sane-srcrevs-fso.inc | 6 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 2 | ||||
| -rw-r--r-- | recipes/alsa/alsa-oss_1.0.17.bb | 8 | ||||
| -rw-r--r-- | recipes/alsa/alsa-utils_1.0.20.bb | 4 | ||||
| -rw-r--r-- | recipes/findutils/findutils.inc | 4 | ||||
| -rw-r--r-- | recipes/libpcap/libpcap.inc | 3 | ||||
| -rw-r--r-- | recipes/openssl/openssl-native_0.9.8m.bb | 11 | ||||
| -rw-r--r-- | recipes/tasks/task-shr-feed.bb | 4 | ||||
| -rw-r--r-- | recipes/util-linux-ng/util-linux-ng_2.17.bb | 3 |
9 files changed, 23 insertions, 22 deletions
diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc index acc8c52176..45fd0e2118 100644 --- a/conf/distro/include/sane-srcrevs-fso.inc +++ b/conf/distro/include/sane-srcrevs-fso.inc @@ -1,7 +1,7 @@ # To be included from sane-srcrevs.inc # FSO Projects -- Cornucopia -FSO_CORNUCOPIA_SRCREV ?= "fc7ad820fdbf604f4398efd29a9d7fb031f65cc8" +FSO_CORNUCOPIA_SRCREV ?= "2619482c376880ba54389c22e3cb0305cfb87fe8" SRCREV_pn-fso-abyss ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fso-apm ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fso-boot ?= "${FSO_CORNUCOPIA_SRCREV}" @@ -30,9 +30,9 @@ SRCREV_pn-fso-gpsd ?= "39e810899110a9bb302cf2064e1c0f73541fb4e6" SRCREV_pn-fso-gsm0710muxd ?= "1d69fb5b666ac2a9e54e46978c7afa8fe5dfc3c9" SRCREV_pn-fso-monitord ?= "b4ae1e9b10e710042624c2cf1a15b91a7d5b1d44" SRCREV_pn-fso-sounds ?= "3a4767ec01988bd0fd8f72f0c35d6d36e5fbc815" -SRCREV_pn-fso-specs ?= "82529b651f926367f8b5edf13490a9fe31c1016b" +SRCREV_pn-fso-specs ?= "99e821f6eb865cd6a526baa808298275e96ab582" SRCREV_pn-gsmd2 ?= "c16883a079aeff8780e5d461ec4e8348537ab4d8" -SRCREV_pn-libfso-glib ?= "d9f0b1e637b8b2452564e5d5711e10bd24e83007" +SRCREV_pn-libfso-glib ?= "f1a0b3fe2ed6e15d83ad4880b4eb7aece00f9d57" SRCREV_pn-libframeworkd-glib ?= "487b092dd3daa12a5beff0abe1be3f53d82f4bf0" SRCREV_pn-libgsm0710 ?= "52eea64bdbb79c09002b46e98a5e656509884f72" SRCREV_pn-libpersistence ?= "217ad803745f8ac1f3c72c6715e2c0faefb3fd06" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 2aef5ea97d..d96d6feee9 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -219,7 +219,7 @@ SRCREV_pn-xserver-kdrive-glamo ?= "9b28d998424c77fbc057dd3a022ccbb122793a52" # Enlightenment Foundation Libraries # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. -EFL_SRCREV ?= "47372" +EFL_SRCREV ?= "47555" SRCREV_pn-edb-native ?= "${EFL_SRCREV}" SRCREV_pn-edb ?= "${EFL_SRCREV}" SRCREV_pn-eina-native ?= "${EFL_SRCREV}" diff --git a/recipes/alsa/alsa-oss_1.0.17.bb b/recipes/alsa/alsa-oss_1.0.17.bb index cb77cc6759..fcd154b93b 100644 --- a/recipes/alsa/alsa-oss_1.0.17.bb +++ b/recipes/alsa/alsa-oss_1.0.17.bb @@ -2,19 +2,17 @@ DESCRIPTION = "Alsa OSS Compatibility Package" SECTION = "libs/multimedia" LICENSE = "GPL" DEPENDS = "alsa-lib" +PR = "r1" SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2 \ file://libio.patch;patch=1 \ " -inherit autotools +inherit autotools_stage LEAD_SONAME = "libaoss.so.0" do_configure_prepend () { touch NEWS README AUTHORS ChangeLog -} - -do_stage () { - autotools_stage_all + sed -i "s/libaoss.so/${LEAD_SONAME}/" ${S}/alsa/aoss.in } diff --git a/recipes/alsa/alsa-utils_1.0.20.bb b/recipes/alsa/alsa-utils_1.0.20.bb index be146f605a..1ceec4fb9a 100644 --- a/recipes/alsa/alsa-utils_1.0.20.bb +++ b/recipes/alsa/alsa-utils_1.0.20.bb @@ -2,8 +2,8 @@ DESCRIPTION = "ALSA Utilities" HOMEPAGE = "http://www.alsa-project.org" SECTION = "console/utils" LICENSE = "GPLv2" -DEPENDS = "alsa-lib ncurses" -PR = "r0" +DEPENDS = "alsa-lib ncurses gettext-native" +PR = "r1" SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \ file://alsa-utils-remove-xmlto-1.0.19plus.patch;patch=1 \ diff --git a/recipes/findutils/findutils.inc b/recipes/findutils/findutils.inc index 02b2b1bb5b..81831bfe11 100644 --- a/recipes/findutils/findutils.inc +++ b/recipes/findutils/findutils.inc @@ -8,7 +8,7 @@ BBCLASSEXTEND = "native" inherit autotools gettext -INC_PR = "r2" +INC_PR = "r3" # diffutils assumes non-glibc compilation with uclibc and # this causes it to generate its own implementations of @@ -17,6 +17,8 @@ INC_PR = "r2" # see diffutils.mk in buildroot) EXTRA_OECONF_linux-uclibc += "--without-included-regex" +EXTRA_OEMAKE += "SORT=${bindir}/sort" + do_install_append() { cd ${D}${bindir} && mv find find.findutils cd ${D}${bindir} && mv xargs xargs.findutils diff --git a/recipes/libpcap/libpcap.inc b/recipes/libpcap/libpcap.inc index c075bbf363..140a8a03ae 100644 --- a/recipes/libpcap/libpcap.inc +++ b/recipes/libpcap/libpcap.inc @@ -4,7 +4,7 @@ SECTION = "libs/network" LICENSE = "BSD" DEPENDS = "bluez-libs flex-native bison-native" -PR = "r2" +PR = "r3" # Don't forget to edit shared.patch to have the correct version number inside SRC_URI = "http://www.tcpdump.org/release/libpcap-${PV}.tar.gz \ @@ -26,6 +26,7 @@ do_configure_prepend () { do_install_append () { install -d ${D}${includedir}/net + install -d ${D}${datadir}/aclocal ln -sf ../pcap-bpf.h ${D}${includedir}/net/bpf.h install -m 0644 acinclude.m4 ${D}${datadir}/aclocal/libpcap.m4 } diff --git a/recipes/openssl/openssl-native_0.9.8m.bb b/recipes/openssl/openssl-native_0.9.8m.bb index b17bb553b4..169f3ef981 100644 --- a/recipes/openssl/openssl-native_0.9.8m.bb +++ b/recipes/openssl/openssl-native_0.9.8m.bb @@ -1,10 +1,10 @@ -inherit pkgconfig native - require openssl.inc +inherit pkgconfig native + SRC_URI[src.md5sum] = "898bf125370926d5f692a2201124f8ec" SRC_URI[src.sha256sum] = "36037160281cf4977d964e403d2bc0680fbca0a7ff9f65e33136d75fae12cb5b" -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" # This flag can contain target options (e.g -mfpu=neon for armv7-a systems) export FULL_OPTIMIZATION = " " @@ -18,7 +18,4 @@ PARALLEL_MAKE = "" CFLAG += " -Wa,--noexecstack " -do_install() { - : -} - +NATIVE_INSTALL_WORKS = "1" diff --git a/recipes/tasks/task-shr-feed.bb b/recipes/tasks/task-shr-feed.bb index eba0fb6492..fe58b587a1 100644 --- a/recipes/tasks/task-shr-feed.bb +++ b/recipes/tasks/task-shr-feed.bb @@ -1,5 +1,5 @@ DESCRIPTION = "SHR Feed" -PR = "r49" +PR = "r50" PV = "1.0" LICENSE = "GPL" @@ -32,6 +32,8 @@ RDEPENDS_${PN} += "\ gtkmm \ guitartune \ jefliks \ + libyaml-perl \ + libnet-dbus-perl \ mc \ mpd \ mplayer \ diff --git a/recipes/util-linux-ng/util-linux-ng_2.17.bb b/recipes/util-linux-ng/util-linux-ng_2.17.bb index 00a044eb08..9b40ee1fd7 100644 --- a/recipes/util-linux-ng/util-linux-ng_2.17.bb +++ b/recipes/util-linux-ng/util-linux-ng_2.17.bb @@ -1,6 +1,6 @@ require util-linux-ng.inc -PR = "${INC_PR}" +PR = "${INC_PR}.1" SRC_URI += "file://uclibc-compile.patch;patch=1 \ file://util-linux-ng-replace-siginterrupt.patch;patch=1 \ @@ -9,6 +9,7 @@ SRC_URI += "file://uclibc-compile.patch;patch=1 \ # fallocate is glibc 2.10, fallocate64 is glibc 2.11 # we need to disable it for older versions EXTRA_OECONF += "ac_cv_func_fallocate=no" +EXTRA_OECONF_virtclass-native += "--disable-fallocate --disable-use-tty-group" SRC_URI[archive.md5sum] = "11cc8a0138019e7060dd275d47dbc096" SRC_URI[archive.sha256sum] = "8720f7233394b68d17095707c195ebb014943c1075a18fb5fd21ec108f012be3" |