diff options
17 files changed, 13 insertions, 19 deletions
diff --git a/meta-efl/recipes-efl/efl/entrance_svn.bb b/meta-efl/recipes-efl/efl/entrance_svn.bb index 6e1f78cd0e..198fe03404 100644 --- a/meta-efl/recipes-efl/efl/entrance_svn.bb +++ b/meta-efl/recipes-efl/efl/entrance_svn.bb @@ -16,7 +16,7 @@ PACKAGECONFIG[consolekit] = "--enable-consolekit,--disable-consolekit,consolekit EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc ${@base_contains('DISTRO_FEATURES', 'pam', '', '--disable-pam', d)}" -PR = "r4" +PR = "r7" PV = "0.0.4+svnr${SRCPV}" SRCREV = "${EFL_SRCREV}" diff --git a/meta-gpe/recipes-support/fbreader/fbreader_0.12.10.bb b/meta-gpe/recipes-support/fbreader/fbreader_0.12.10.bb index 98b98140cd..e9ead0f248 100644 --- a/meta-gpe/recipes-support/fbreader/fbreader_0.12.10.bb +++ b/meta-gpe/recipes-support/fbreader/fbreader_0.12.10.bb @@ -5,6 +5,8 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://fbreader/LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "gtk+ enca expat bzip2 libgpewidget virtual/libiconv liblinebreak libfribidi curl sqlite3" +PR = "r1" + SRC_URI = "http://www.fbreader.org/fbreader-sources-${PV}.tgz \ file://Makefile.patch \ file://gcc45.patch" diff --git a/meta-gpe/recipes-support/fbreader/fbreader_git.bb b/meta-gpe/recipes-support/fbreader/fbreader_git.bb index 7bb826c901..763889a561 100644 --- a/meta-gpe/recipes-support/fbreader/fbreader_git.bb +++ b/meta-gpe/recipes-support/fbreader/fbreader_git.bb @@ -7,6 +7,8 @@ DEPENDS = "gtk+ enca expat bzip2 libgpewidget virtual/libiconv liblinebreak libf SRCREV = "2cf1ec0e306e1122dbed850bfa005cd59a6168ee" PV = "0.99.5+gitr${SRCPV}" +PR = "r1" + DEFAULT_PREFERENCE = "-1" SRC_URI = "git://github.com/geometer/FBReader.git;protocol=http;branch=master \ diff --git a/meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb b/meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb index cebad44a7c..cfc61d4ef1 100644 --- a/meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb +++ b/meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb @@ -6,7 +6,7 @@ SECTION = "audio" DEPENDS = "libpng libav libsndfile1" -PR = "r1" +PR = "r2" PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ diff --git a/meta-oe/recipes-core/meta/distro-feed-configs.bb b/meta-oe/recipes-core/meta/distro-feed-configs.bb index 29739c2dc7..dde86569e7 100644 --- a/meta-oe/recipes-core/meta/distro-feed-configs.bb +++ b/meta-oe/recipes-core/meta/distro-feed-configs.bb @@ -1,5 +1,5 @@ SUMMARY = "Configuration files for online package repositories aka feeds" -PR = "r1" +PR = "r6" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" diff --git a/meta-oe/recipes-multimedia/mplayer/mplayer-common.bb b/meta-oe/recipes-multimedia/mplayer/mplayer-common.bb index a4e8b70a74..829c3b2439 100644 --- a/meta-oe/recipes-multimedia/mplayer/mplayer-common.bb +++ b/meta-oe/recipes-multimedia/mplayer/mplayer-common.bb @@ -7,6 +7,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" PV = "0.0.1" +PR = "r1" SRC_URI = "file://mplayer.conf" diff --git a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb index 3c80782f4c..63ee55eca9 100644 --- a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb +++ b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb @@ -22,7 +22,7 @@ SRCREV = "e3f5043233336d8b4b0731c6a8b42a8fda5535ac" ARM_INSTRUCTION_SET = "arm" PV = "2.0+gitr${SRCPV}" -PR = "r10" +PR = "r13" PARALLEL_MAKE = "" diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.7.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.7.bb index e78f80eac7..97f3354bdc 100644 --- a/meta-oe/recipes-navigation/gpsd/gpsd_3.7.bb +++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.7.bb @@ -7,7 +7,7 @@ PROVIDES = "virtual/gpsd" EXTRANATIVEPATH += "chrpath-native" -PR = "r7" +PR = "r14" SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \ file://0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch \ diff --git a/meta-oe/recipes-navigation/navit/navit.inc b/meta-oe/recipes-navigation/navit/navit.inc index a90203a599..8b63bba9b9 100644 --- a/meta-oe/recipes-navigation/navit/navit.inc +++ b/meta-oe/recipes-navigation/navit/navit.inc @@ -13,7 +13,7 @@ RRECOMMENDS_${PN} = "gpsd ${PN}-dbus ${PN}-speech-cmdline ${PN}-gui-internal ${P RSUGGESTS_${PN} = "flite-alsa espeak ${PN}-speech-dbus ${PN}-gui-gtk ${PN}-gui-qml ${PN}-graphics-sdl ${PN}-graphics-qt ${PN}-maptool" PE = "1" -INC_PR = "r9" +INC_PR = "r11" inherit autotools gettext diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc index 64dfd03508..c2e100701c 100644 --- a/meta-oe/recipes-support/lvm2/lvm2.inc +++ b/meta-oe/recipes-support/lvm2/lvm2.inc @@ -4,7 +4,7 @@ DEPENDS = "udev" LICENSE = "GPLv2 & LGPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24" -INC_PR = "r2" +INC_PR = "r4" S = "${WORKDIR}/LVM2.${PV}" diff --git a/meta-systemd/oe-core/recipes-bsp/keymaps/keymaps_1.0.bbappend b/meta-systemd/oe-core/recipes-bsp/keymaps/keymaps_1.0.bbappend index 36b83e05e9..bc40c6022b 100644 --- a/meta-systemd/oe-core/recipes-bsp/keymaps/keymaps_1.0.bbappend +++ b/meta-systemd/oe-core/recipes-bsp/keymaps/keymaps_1.0.bbappend @@ -1,5 +1,4 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -PRINC := "${@int(PRINC) + 7}" SRC_URI += " file://keymaps.service" diff --git a/meta-systemd/oe-core/recipes-connectivity/avahi/avahi_0.6.31.bbappend b/meta-systemd/oe-core/recipes-connectivity/avahi/avahi_0.6.31.bbappend index d3f4775b7c..5b6e559cc8 100644 --- a/meta-systemd/oe-core/recipes-connectivity/avahi/avahi_0.6.31.bbappend +++ b/meta-systemd/oe-core/recipes-connectivity/avahi/avahi_0.6.31.bbappend @@ -1,5 +1,3 @@ -PRINC := "${@int(PRINC) + 2}" - inherit systemd RPROVIDES_${PN} += "${PN}-systemd" diff --git a/meta-systemd/oe-core/recipes-connectivity/bluez/bluez4_4.101.bbappend b/meta-systemd/oe-core/recipes-connectivity/bluez/bluez4_4.101.bbappend index 495fffad21..da01b0583b 100644 --- a/meta-systemd/oe-core/recipes-connectivity/bluez/bluez4_4.101.bbappend +++ b/meta-systemd/oe-core/recipes-connectivity/bluez/bluez4_4.101.bbappend @@ -1,5 +1,3 @@ -PRINC := "${@int(PRINC) + 2}" - inherit systemd EXTRA_OECONF += "--with-systemdunitdir=${systemd_unitdir}/system/" diff --git a/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bbappend b/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bbappend index e9e09d34d3..1dd6d58eb6 100644 --- a/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bbappend +++ b/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bbappend @@ -3,8 +3,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" inherit systemd -PRINC := "${@int(PRINC) + 3}" - SYSTEMD_PACKAGES = "dhcp-server dhcp-relay dhcp-client" SYSTEMD_SERVICE_dhcp-server = "dhcpd.service" SYSTEMD_SERVICE_dhcp-relay = "dhcrelay.service" diff --git a/meta-systemd/oe-core/recipes-connectivity/portmap/portmap_6.0.bbappend b/meta-systemd/oe-core/recipes-connectivity/portmap/portmap_6.0.bbappend index 5efba3ed9a..765f4b3285 100644 --- a/meta-systemd/oe-core/recipes-connectivity/portmap/portmap_6.0.bbappend +++ b/meta-systemd/oe-core/recipes-connectivity/portmap/portmap_6.0.bbappend @@ -1,7 +1,5 @@ FILESEXTRAPATHS := "${THISDIR}/${PN}" -PRINC := "${@int(PRINC) + 2}" - inherit systemd RPROVIDES_${PN} += "${PN}-systemd" diff --git a/meta-systemd/oe-core/recipes-extended/pam/libpam_1.1.6.bbappend b/meta-systemd/oe-core/recipes-extended/pam/libpam_1.1.6.bbappend index 5b9181bd6d..db55082093 100644 --- a/meta-systemd/oe-core/recipes-extended/pam/libpam_1.1.6.bbappend +++ b/meta-systemd/oe-core/recipes-extended/pam/libpam_1.1.6.bbappend @@ -1,5 +1,3 @@ -PRINC := "${@int(PRINC) + 2}" - # Register with logind to make screen/tmux/etc work do_install_append() { echo "session required pam_systemd.so" >> ${D}${sysconfdir}/pam.d/common-session diff --git a/meta-systemd/recipes-core/systemd/systemd-machine-units_1.0.bb b/meta-systemd/recipes-core/systemd/systemd-machine-units_1.0.bb index 73f4e6e296..6a66ac214e 100644 --- a/meta-systemd/recipes-core/systemd/systemd-machine-units_1.0.bb +++ b/meta-systemd/recipes-core/systemd/systemd-machine-units_1.0.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d PACKAGE_ARCH = "${MACHINE_ARCH}" -PR = "r1" +PR = "r18" inherit systemd SYSTEMD_SERVICE_${PN} = "" |