From ecd5eacbdd66a97135e6f57db9065a89828a31f2 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 5 May 2020 10:50:48 +0100 Subject: recipes: Remove remaining INC_PR variables Most of these were unused, remaining in the inc files long after the PR values were removed from the recipes. The only two which did anything wre in xorg-font and for those, bump PR by hand and remove the INC_PR to clean up all references. This kind of change is much better handled by PRServ now. (From OE-Core rev: 3fdd772b419bbecb1fac1efae874a8f160f2112d) Signed-off-by: Richard Purdie --- meta/recipes-connectivity/connman/connman.inc | 2 -- meta/recipes-graphics/xorg-app/xorg-app-common.inc | 2 -- meta/recipes-graphics/xorg-driver/xorg-driver-common.inc | 1 - meta/recipes-graphics/xorg-font/encodings_1.0.5.bb | 2 +- meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb | 2 +- meta/recipes-graphics/xorg-font/xorg-font-common.inc | 2 -- meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 1 - meta/recipes-kernel/linux/linux-yocto.inc | 2 -- 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 DEPENDS = "dbus glib-2.0 ppp" -INC_PR = "r20" - EXTRA_OECONF += "\ ac_cv_path_WPASUPPLICANT=${sbindir}/wpa_supplicant \ 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" # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" -INC_PR = "r8" - SRC_URI = "${XORG_MIRROR}/individual/app/${BPN}-${PV}.tar.bz2" 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" LICENSE = "MIT-X" PE = "2" -INC_PR = "r21" DEPENDS = "virtual/xserver xorgproto util-macros" 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 LICENSE = "PD" LIC_FILES_CHKSUM = "file://COPYING;md5=9da93f2daf2d5572faa2bfaf0dbd9e76" PE = "1" -PR = "${INC_PR}.1" +PR = "r3" DEPENDS = "mkfontscale-native mkfontdir-native font-util-native" 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" inherit allarch PE = "1" -PR = "${INC_PR}.3" +PR = "r3" SRC_URI[md5sum] = "6d25f64796fef34b53b439c2e9efa562" 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" RDEPENDS_${PN} = "encodings font-util font-alias" XORG_PN = "${BPN}" -INC_PR = "r2" - SRC_URI = "${XORG_MIRROR}/individual/font/${XORG_PN}-${PV}.tar.bz2" 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" PROVIDES += "virtual/xserver" PE = "2" -INC_PR = "r8" XORG_PN = "xorg-server" 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" UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+\.\d+(\.\d+)*)" -INC_PR = "r4" - # Skip processing of this recipe if it is not explicitly specified as the # PREFERRED_PROVIDER for virtual/kernel. This avoids network access required # by the use of AUTOREV SRCREVs, which are the default for this recipe. -- cgit v1.2.3-54-g00ecf