summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-efl/recipes-efl/efl/entrance_svn.bb2
-rw-r--r--meta-gpe/recipes-support/fbreader/fbreader_0.12.10.bb2
-rw-r--r--meta-gpe/recipes-support/fbreader/fbreader_git.bb2
-rw-r--r--meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb2
-rw-r--r--meta-oe/recipes-core/meta/distro-feed-configs.bb2
-rw-r--r--meta-oe/recipes-multimedia/mplayer/mplayer-common.bb1
-rw-r--r--meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb2
-rw-r--r--meta-oe/recipes-navigation/gpsd/gpsd_3.7.bb2
-rw-r--r--meta-oe/recipes-navigation/navit/navit.inc2
-rw-r--r--meta-oe/recipes-support/lvm2/lvm2.inc2
-rw-r--r--meta-systemd/oe-core/recipes-bsp/keymaps/keymaps_1.0.bbappend1
-rw-r--r--meta-systemd/oe-core/recipes-connectivity/avahi/avahi_0.6.31.bbappend2
-rw-r--r--meta-systemd/oe-core/recipes-connectivity/bluez/bluez4_4.101.bbappend2
-rw-r--r--meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bbappend2
-rw-r--r--meta-systemd/oe-core/recipes-connectivity/portmap/portmap_6.0.bbappend2
-rw-r--r--meta-systemd/oe-core/recipes-extended/pam/libpam_1.1.6.bbappend2
-rw-r--r--meta-systemd/recipes-core/systemd/systemd-machine-units_1.0.bb2
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
17EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc ${@base_contains('DISTRO_FEATURES', 'pam', '', '--disable-pam', d)}" 17EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc ${@base_contains('DISTRO_FEATURES', 'pam', '', '--disable-pam', d)}"
18 18
19PR = "r4" 19PR = "r7"
20PV = "0.0.4+svnr${SRCPV}" 20PV = "0.0.4+svnr${SRCPV}"
21SRCREV = "${EFL_SRCREV}" 21SRCREV = "${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+"
5LIC_FILES_CHKSUM = "file://fbreader/LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f" 5LIC_FILES_CHKSUM = "file://fbreader/LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f"
6DEPENDS = "gtk+ enca expat bzip2 libgpewidget virtual/libiconv liblinebreak libfribidi curl sqlite3" 6DEPENDS = "gtk+ enca expat bzip2 libgpewidget virtual/libiconv liblinebreak libfribidi curl sqlite3"
7 7
8PR = "r1"
9
8SRC_URI = "http://www.fbreader.org/fbreader-sources-${PV}.tgz \ 10SRC_URI = "http://www.fbreader.org/fbreader-sources-${PV}.tgz \
9file://Makefile.patch \ 11file://Makefile.patch \
10file://gcc45.patch" 12file://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
7SRCREV = "2cf1ec0e306e1122dbed850bfa005cd59a6168ee" 7SRCREV = "2cf1ec0e306e1122dbed850bfa005cd59a6168ee"
8PV = "0.99.5+gitr${SRCPV}" 8PV = "0.99.5+gitr${SRCPV}"
9 9
10PR = "r1"
11
10DEFAULT_PREFERENCE = "-1" 12DEFAULT_PREFERENCE = "-1"
11 13
12SRC_URI = "git://github.com/geometer/FBReader.git;protocol=http;branch=master \ 14SRC_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
7DEPENDS = "libpng libav libsndfile1" 7DEPENDS = "libpng libav libsndfile1"
8 8
9PR = "r1" 9PR = "r2"
10 10
11PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ 11PACKAGECONFIG ??= "${@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 @@
1SUMMARY = "Configuration files for online package repositories aka feeds" 1SUMMARY = "Configuration files for online package repositories aka feeds"
2PR = "r1" 2PR = "r6"
3LICENSE = "MIT" 3LICENSE = "MIT"
4LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 4LIC_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"
7LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 7LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
8 8
9PV = "0.0.1" 9PV = "0.0.1"
10PR = "r1"
10 11
11SRC_URI = "file://mplayer.conf" 12SRC_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"
22ARM_INSTRUCTION_SET = "arm" 22ARM_INSTRUCTION_SET = "arm"
23 23
24PV = "2.0+gitr${SRCPV}" 24PV = "2.0+gitr${SRCPV}"
25PR = "r10" 25PR = "r13"
26 26
27PARALLEL_MAKE = "" 27PARALLEL_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
8EXTRANATIVEPATH += "chrpath-native" 8EXTRANATIVEPATH += "chrpath-native"
9 9
10PR = "r7" 10PR = "r14"
11 11
12SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \ 12SRC_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
13RSUGGESTS_${PN} = "flite-alsa espeak ${PN}-speech-dbus ${PN}-gui-gtk ${PN}-gui-qml ${PN}-graphics-sdl ${PN}-graphics-qt ${PN}-maptool" 13RSUGGESTS_${PN} = "flite-alsa espeak ${PN}-speech-dbus ${PN}-gui-gtk ${PN}-gui-qml ${PN}-graphics-sdl ${PN}-graphics-qt ${PN}-maptool"
14 14
15PE = "1" 15PE = "1"
16INC_PR = "r9" 16INC_PR = "r11"
17 17
18inherit autotools gettext 18inherit 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"
4LICENSE = "GPLv2 & LGPLv2" 4LICENSE = "GPLv2 & LGPLv2"
5LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ 5LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
6 file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24" 6 file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24"
7INC_PR = "r2" 7INC_PR = "r4"
8 8
9 9
10S = "${WORKDIR}/LVM2.${PV}" 10S = "${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 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" 1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2PRINC := "${@int(PRINC) + 7}"
3 2
4SRC_URI += " file://keymaps.service" 3SRC_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 @@
1PRINC := "${@int(PRINC) + 2}"
2
3inherit systemd 1inherit systemd
4 2
5RPROVIDES_${PN} += "${PN}-systemd" 3RPROVIDES_${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 @@
1PRINC := "${@int(PRINC) + 2}"
2
3inherit systemd 1inherit systemd
4 2
5EXTRA_OECONF += "--with-systemdunitdir=${systemd_unitdir}/system/" 3EXTRA_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
4inherit systemd 4inherit systemd
5 5
6PRINC := "${@int(PRINC) + 3}"
7
8SYSTEMD_PACKAGES = "dhcp-server dhcp-relay dhcp-client" 6SYSTEMD_PACKAGES = "dhcp-server dhcp-relay dhcp-client"
9SYSTEMD_SERVICE_dhcp-server = "dhcpd.service" 7SYSTEMD_SERVICE_dhcp-server = "dhcpd.service"
10SYSTEMD_SERVICE_dhcp-relay = "dhcrelay.service" 8SYSTEMD_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 @@
1FILESEXTRAPATHS := "${THISDIR}/${PN}" 1FILESEXTRAPATHS := "${THISDIR}/${PN}"
2 2
3PRINC := "${@int(PRINC) + 2}"
4
5inherit systemd 3inherit systemd
6 4
7RPROVIDES_${PN} += "${PN}-systemd" 5RPROVIDES_${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 @@
1PRINC := "${@int(PRINC) + 2}"
2
3# Register with logind to make screen/tmux/etc work 1# Register with logind to make screen/tmux/etc work
4do_install_append() { 2do_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
6PACKAGE_ARCH = "${MACHINE_ARCH}" 6PACKAGE_ARCH = "${MACHINE_ARCH}"
7 7
8PR = "r1" 8PR = "r18"
9 9
10inherit systemd 10inherit systemd
11SYSTEMD_SERVICE_${PN} = "" 11SYSTEMD_SERVICE_${PN} = ""