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 6e1f78cd0..198fe0340 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 | |||
16 | 16 | ||
17 | EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc ${@base_contains('DISTRO_FEATURES', 'pam', '', '--disable-pam', d)}" | 17 | EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc ${@base_contains('DISTRO_FEATURES', 'pam', '', '--disable-pam', d)}" |
18 | 18 | ||
19 | PR = "r4" | 19 | PR = "r7" |
20 | PV = "0.0.4+svnr${SRCPV}" | 20 | PV = "0.0.4+svnr${SRCPV}" |
21 | SRCREV = "${EFL_SRCREV}" | 21 | SRCREV = "${EFL_SRCREV}" |
22 | 22 | ||
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 98b98140c..e9ead0f24 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+" | |||
5 | LIC_FILES_CHKSUM = "file://fbreader/LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f" | 5 | LIC_FILES_CHKSUM = "file://fbreader/LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f" |
6 | DEPENDS = "gtk+ enca expat bzip2 libgpewidget virtual/libiconv liblinebreak libfribidi curl sqlite3" | 6 | DEPENDS = "gtk+ enca expat bzip2 libgpewidget virtual/libiconv liblinebreak libfribidi curl sqlite3" |
7 | 7 | ||
8 | PR = "r1" | ||
9 | |||
8 | SRC_URI = "http://www.fbreader.org/fbreader-sources-${PV}.tgz \ | 10 | SRC_URI = "http://www.fbreader.org/fbreader-sources-${PV}.tgz \ |
9 | file://Makefile.patch \ | 11 | file://Makefile.patch \ |
10 | file://gcc45.patch" | 12 | file://gcc45.patch" |
diff --git a/meta-gpe/recipes-support/fbreader/fbreader_git.bb b/meta-gpe/recipes-support/fbreader/fbreader_git.bb index 7bb826c90..763889a56 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 | |||
7 | SRCREV = "2cf1ec0e306e1122dbed850bfa005cd59a6168ee" | 7 | SRCREV = "2cf1ec0e306e1122dbed850bfa005cd59a6168ee" |
8 | PV = "0.99.5+gitr${SRCPV}" | 8 | PV = "0.99.5+gitr${SRCPV}" |
9 | 9 | ||
10 | PR = "r1" | ||
11 | |||
10 | DEFAULT_PREFERENCE = "-1" | 12 | DEFAULT_PREFERENCE = "-1" |
11 | 13 | ||
12 | SRC_URI = "git://github.com/geometer/FBReader.git;protocol=http;branch=master \ | 14 | 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 cebad44a7..cfc61d4ef 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" | |||
6 | 6 | ||
7 | DEPENDS = "libpng libav libsndfile1" | 7 | DEPENDS = "libpng libav libsndfile1" |
8 | 8 | ||
9 | PR = "r1" | 9 | PR = "r2" |
10 | 10 | ||
11 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ | 11 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ |
12 | ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ | 12 | ${@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 29739c2dc..dde86569e 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 @@ | |||
1 | SUMMARY = "Configuration files for online package repositories aka feeds" | 1 | SUMMARY = "Configuration files for online package repositories aka feeds" |
2 | PR = "r1" | 2 | PR = "r6" |
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 4 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
5 | 5 | ||
diff --git a/meta-oe/recipes-multimedia/mplayer/mplayer-common.bb b/meta-oe/recipes-multimedia/mplayer/mplayer-common.bb index a4e8b70a7..829c3b243 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" | |||
7 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 7 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
8 | 8 | ||
9 | PV = "0.0.1" | 9 | PV = "0.0.1" |
10 | PR = "r1" | ||
10 | 11 | ||
11 | SRC_URI = "file://mplayer.conf" | 12 | SRC_URI = "file://mplayer.conf" |
12 | 13 | ||
diff --git a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb index 3c80782f4..63ee55eca 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" | |||
22 | ARM_INSTRUCTION_SET = "arm" | 22 | ARM_INSTRUCTION_SET = "arm" |
23 | 23 | ||
24 | PV = "2.0+gitr${SRCPV}" | 24 | PV = "2.0+gitr${SRCPV}" |
25 | PR = "r10" | 25 | PR = "r13" |
26 | 26 | ||
27 | PARALLEL_MAKE = "" | 27 | PARALLEL_MAKE = "" |
28 | 28 | ||
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.7.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.7.bb index e78f80eac..97f3354bd 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" | |||
7 | 7 | ||
8 | EXTRANATIVEPATH += "chrpath-native" | 8 | EXTRANATIVEPATH += "chrpath-native" |
9 | 9 | ||
10 | PR = "r7" | 10 | PR = "r14" |
11 | 11 | ||
12 | SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \ | 12 | SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \ |
13 | file://0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch \ | 13 | 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 a90203a59..8b63bba9b 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 | |||
13 | RSUGGESTS_${PN} = "flite-alsa espeak ${PN}-speech-dbus ${PN}-gui-gtk ${PN}-gui-qml ${PN}-graphics-sdl ${PN}-graphics-qt ${PN}-maptool" | 13 | RSUGGESTS_${PN} = "flite-alsa espeak ${PN}-speech-dbus ${PN}-gui-gtk ${PN}-gui-qml ${PN}-graphics-sdl ${PN}-graphics-qt ${PN}-maptool" |
14 | 14 | ||
15 | PE = "1" | 15 | PE = "1" |
16 | INC_PR = "r9" | 16 | INC_PR = "r11" |
17 | 17 | ||
18 | inherit autotools gettext | 18 | inherit autotools gettext |
19 | 19 | ||
diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc index 64dfd0350..c2e100701 100644 --- a/meta-oe/recipes-support/lvm2/lvm2.inc +++ b/meta-oe/recipes-support/lvm2/lvm2.inc | |||
@@ -4,7 +4,7 @@ DEPENDS = "udev" | |||
4 | LICENSE = "GPLv2 & LGPLv2" | 4 | LICENSE = "GPLv2 & LGPLv2" |
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ |
6 | file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24" | 6 | file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24" |
7 | INC_PR = "r2" | 7 | INC_PR = "r4" |
8 | 8 | ||
9 | 9 | ||
10 | S = "${WORKDIR}/LVM2.${PV}" | 10 | 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 36b83e05e..bc40c6022 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 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
2 | PRINC := "${@int(PRINC) + 7}" | ||
3 | 2 | ||
4 | SRC_URI += " file://keymaps.service" | 3 | SRC_URI += " file://keymaps.service" |
5 | 4 | ||
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 d3f4775b7..5b6e559cc 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 @@ | |||
1 | PRINC := "${@int(PRINC) + 2}" | ||
2 | |||
3 | inherit systemd | 1 | inherit systemd |
4 | 2 | ||
5 | RPROVIDES_${PN} += "${PN}-systemd" | 3 | 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 495fffad2..da01b0583 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 @@ | |||
1 | PRINC := "${@int(PRINC) + 2}" | ||
2 | |||
3 | inherit systemd | 1 | inherit systemd |
4 | 2 | ||
5 | EXTRA_OECONF += "--with-systemdunitdir=${systemd_unitdir}/system/" | 3 | 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 e9e09d34d..1dd6d58eb 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}:" | |||
3 | 3 | ||
4 | inherit systemd | 4 | inherit systemd |
5 | 5 | ||
6 | PRINC := "${@int(PRINC) + 3}" | ||
7 | |||
8 | SYSTEMD_PACKAGES = "dhcp-server dhcp-relay dhcp-client" | 6 | SYSTEMD_PACKAGES = "dhcp-server dhcp-relay dhcp-client" |
9 | SYSTEMD_SERVICE_dhcp-server = "dhcpd.service" | 7 | SYSTEMD_SERVICE_dhcp-server = "dhcpd.service" |
10 | SYSTEMD_SERVICE_dhcp-relay = "dhcrelay.service" | 8 | 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 5efba3ed9..765f4b328 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 @@ | |||
1 | FILESEXTRAPATHS := "${THISDIR}/${PN}" | 1 | FILESEXTRAPATHS := "${THISDIR}/${PN}" |
2 | 2 | ||
3 | PRINC := "${@int(PRINC) + 2}" | ||
4 | |||
5 | inherit systemd | 3 | inherit systemd |
6 | 4 | ||
7 | RPROVIDES_${PN} += "${PN}-systemd" | 5 | 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 5b9181bd6..db5508209 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 @@ | |||
1 | PRINC := "${@int(PRINC) + 2}" | ||
2 | |||
3 | # Register with logind to make screen/tmux/etc work | 1 | # Register with logind to make screen/tmux/etc work |
4 | do_install_append() { | 2 | do_install_append() { |
5 | echo "session required pam_systemd.so" >> ${D}${sysconfdir}/pam.d/common-session | 3 | 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 73f4e6e29..6a66ac214 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 | |||
5 | 5 | ||
6 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 6 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
7 | 7 | ||
8 | PR = "r1" | 8 | PR = "r18" |
9 | 9 | ||
10 | inherit systemd | 10 | inherit systemd |
11 | SYSTEMD_SERVICE_${PN} = "" | 11 | SYSTEMD_SERVICE_${PN} = "" |