diff options
8 files changed, 2 insertions, 12 deletions
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc index b60178cefc..d2ae0967eb 100644 --- a/meta/recipes-connectivity/connman/connman.inc +++ b/meta/recipes-connectivity/connman/connman.inc | |||
@@ -17,8 +17,6 @@ inherit autotools pkgconfig systemd update-rc.d update-alternatives | |||
17 | 17 | ||
18 | DEPENDS = "dbus glib-2.0 ppp" | 18 | DEPENDS = "dbus glib-2.0 ppp" |
19 | 19 | ||
20 | INC_PR = "r20" | ||
21 | |||
22 | EXTRA_OECONF += "\ | 20 | EXTRA_OECONF += "\ |
23 | ac_cv_path_WPASUPPLICANT=${sbindir}/wpa_supplicant \ | 21 | ac_cv_path_WPASUPPLICANT=${sbindir}/wpa_supplicant \ |
24 | ac_cv_path_PPPD=${sbindir}/pppd \ | 22 | ac_cv_path_PPPD=${sbindir}/pppd \ |
diff --git a/meta/recipes-graphics/xorg-app/xorg-app-common.inc b/meta/recipes-graphics/xorg-app/xorg-app-common.inc index 101b3dfffd..cb8cf4f5fa 100644 --- a/meta/recipes-graphics/xorg-app/xorg-app-common.inc +++ b/meta/recipes-graphics/xorg-app/xorg-app-common.inc | |||
@@ -8,8 +8,6 @@ DEPENDS = "util-macros-native virtual/libx11" | |||
8 | # depends on virtual/libx11 | 8 | # depends on virtual/libx11 |
9 | REQUIRED_DISTRO_FEATURES = "x11" | 9 | REQUIRED_DISTRO_FEATURES = "x11" |
10 | 10 | ||
11 | INC_PR = "r8" | ||
12 | |||
13 | SRC_URI = "${XORG_MIRROR}/individual/app/${BPN}-${PV}.tar.bz2" | 11 | SRC_URI = "${XORG_MIRROR}/individual/app/${BPN}-${PV}.tar.bz2" |
14 | 12 | ||
15 | inherit autotools pkgconfig features_check | 13 | inherit autotools pkgconfig features_check |
diff --git a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc index e30f044724..493b90a298 100644 --- a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc +++ b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc | |||
@@ -5,7 +5,6 @@ SECTION = "x11/drivers" | |||
5 | LICENSE = "MIT-X" | 5 | LICENSE = "MIT-X" |
6 | 6 | ||
7 | PE = "2" | 7 | PE = "2" |
8 | INC_PR = "r21" | ||
9 | 8 | ||
10 | DEPENDS = "virtual/xserver xorgproto util-macros" | 9 | DEPENDS = "virtual/xserver xorgproto util-macros" |
11 | 10 | ||
diff --git a/meta/recipes-graphics/xorg-font/encodings_1.0.5.bb b/meta/recipes-graphics/xorg-font/encodings_1.0.5.bb index a39609b5da..4d61aed183 100644 --- a/meta/recipes-graphics/xorg-font/encodings_1.0.5.bb +++ b/meta/recipes-graphics/xorg-font/encodings_1.0.5.bb | |||
@@ -7,7 +7,7 @@ require xorg-font-common.inc | |||
7 | LICENSE = "PD" | 7 | LICENSE = "PD" |
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=9da93f2daf2d5572faa2bfaf0dbd9e76" | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=9da93f2daf2d5572faa2bfaf0dbd9e76" |
9 | PE = "1" | 9 | PE = "1" |
10 | PR = "${INC_PR}.1" | 10 | PR = "r3" |
11 | 11 | ||
12 | DEPENDS = "mkfontscale-native mkfontdir-native font-util-native" | 12 | DEPENDS = "mkfontscale-native mkfontdir-native font-util-native" |
13 | RDEPENDS_${PN} = "" | 13 | RDEPENDS_${PN} = "" |
diff --git a/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb b/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb index 15e101596a..c5990a9e44 100644 --- a/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb +++ b/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb | |||
@@ -18,7 +18,7 @@ RDEPENDS_${PN}_class-native = "font-util-native" | |||
18 | inherit allarch | 18 | inherit allarch |
19 | 19 | ||
20 | PE = "1" | 20 | PE = "1" |
21 | PR = "${INC_PR}.3" | 21 | PR = "r3" |
22 | 22 | ||
23 | SRC_URI[md5sum] = "6d25f64796fef34b53b439c2e9efa562" | 23 | SRC_URI[md5sum] = "6d25f64796fef34b53b439c2e9efa562" |
24 | SRC_URI[sha256sum] = "8b453b2aae1cfa8090009ca037037b8c5e333550651d5a158b7264ce1d472c9a" | 24 | SRC_URI[sha256sum] = "8b453b2aae1cfa8090009ca037037b8c5e333550651d5a158b7264ce1d472c9a" |
diff --git a/meta/recipes-graphics/xorg-font/xorg-font-common.inc b/meta/recipes-graphics/xorg-font/xorg-font-common.inc index f18c8aefc2..7ca5c76a66 100644 --- a/meta/recipes-graphics/xorg-font/xorg-font-common.inc +++ b/meta/recipes-graphics/xorg-font/xorg-font-common.inc | |||
@@ -8,8 +8,6 @@ DEPENDS = " encodings font-alias font-util-native" | |||
8 | RDEPENDS_${PN} = "encodings font-util font-alias" | 8 | RDEPENDS_${PN} = "encodings font-util font-alias" |
9 | 9 | ||
10 | XORG_PN = "${BPN}" | 10 | XORG_PN = "${BPN}" |
11 | INC_PR = "r2" | ||
12 | |||
13 | 11 | ||
14 | SRC_URI = "${XORG_MIRROR}/individual/font/${XORG_PN}-${PV}.tar.bz2" | 12 | SRC_URI = "${XORG_MIRROR}/individual/font/${XORG_PN}-${PV}.tar.bz2" |
15 | S = "${WORKDIR}/${XORG_PN}-${PV}" | 13 | S = "${WORKDIR}/${XORG_PN}-${PV}" |
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index b4f0760176..b3e03744c0 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | |||
@@ -13,7 +13,6 @@ PROVIDES = "virtual/xserver-xf86" | |||
13 | PROVIDES += "virtual/xserver" | 13 | PROVIDES += "virtual/xserver" |
14 | 14 | ||
15 | PE = "2" | 15 | PE = "2" |
16 | INC_PR = "r8" | ||
17 | 16 | ||
18 | XORG_PN = "xorg-server" | 17 | XORG_PN = "xorg-server" |
19 | SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2" | 18 | SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2" |
diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc index 91df9c1cd5..f560dec589 100644 --- a/meta/recipes-kernel/linux/linux-yocto.inc +++ b/meta/recipes-kernel/linux/linux-yocto.inc | |||
@@ -6,8 +6,6 @@ LIC_FILES_CHKSUM ?= "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" | |||
6 | 6 | ||
7 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.\d+)*)" | 7 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.\d+)*)" |
8 | 8 | ||
9 | INC_PR = "r4" | ||
10 | |||
11 | # Skip processing of this recipe if it is not explicitly specified as the | 9 | # Skip processing of this recipe if it is not explicitly specified as the |
12 | # PREFERRED_PROVIDER for virtual/kernel. This avoids network access required | 10 | # PREFERRED_PROVIDER for virtual/kernel. This avoids network access required |
13 | # by the use of AUTOREV SRCREVs, which are the default for this recipe. | 11 | # by the use of AUTOREV SRCREVs, which are the default for this recipe. |