From c0b6dd9b41279ff00c5a90e49108945a0fee9cdd Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 15 Oct 2008 10:56:42 +0200 Subject: bb files: Revert the introduction of FILE_PR This is a partial revert of aa03004ace2fabb135a6208ef8c2d2b312aa7b0b. The approach that was taken leads to disagreement and the change was pushed too early. DISTRO_PR is going to say and will be used inside the package creation. There will be more disucssion on the list about where to continue from here. --- packages/u-boot/u-boot-env.bb | 2 +- packages/u-boot/u-boot-mkimage-openmoko-native_oe.bb | 2 +- packages/u-boot/u-boot-omap2430sdp_1.1.4.bb | 2 +- packages/u-boot/u-boot-omap3_git.bb | 2 +- packages/u-boot/u-boot-omap3beagleboard_1.1.4.bb | 2 +- packages/u-boot/u-boot-openmoko.inc | 2 +- packages/u-boot/u-boot-utils-native_1.2.0.bb | 2 +- packages/u-boot/u-boot-utils_1.2.0.bb | 2 +- packages/u-boot/u-boot_1.1.2.bb | 2 +- packages/u-boot/u-boot_1.1.4.bb | 2 +- packages/u-boot/u-boot_1.1.6.bb | 2 +- packages/u-boot/u-boot_1.2.0.bb | 2 +- packages/u-boot/u-boot_1.3.1.bb | 2 +- packages/u-boot/u-boot_1.3.2.bb | 2 +- packages/u-boot/u-boot_git.bb | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) (limited to 'packages/u-boot') diff --git a/packages/u-boot/u-boot-env.bb b/packages/u-boot/u-boot-env.bb index ff1e5733a3..1bee272d82 100644 --- a/packages/u-boot/u-boot-env.bb +++ b/packages/u-boot/u-boot-env.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Dummy package to get uboot env image into deploy" -FILE_PR = "r1" +PR = "r1" inherit kernel-arch diff --git a/packages/u-boot/u-boot-mkimage-openmoko-native_oe.bb b/packages/u-boot/u-boot-mkimage-openmoko-native_oe.bb index eef35c5b60..8b5564c14c 100644 --- a/packages/u-boot/u-boot-mkimage-openmoko-native_oe.bb +++ b/packages/u-boot/u-boot-mkimage-openmoko-native_oe.bb @@ -3,7 +3,7 @@ require u-boot-openmoko_git.bb inherit native PV = "1.2.0+git9912121f7ed804ea58fd62f3f230b5dcfc357d88svn2238" -FILE_PR = "r1" +PR = "r1" SRC_URI = "git://www.denx.de/git/u-boot.git/;protocol=git;tag=9912121f7ed804ea58fd62f3f230b5dcfc357d88 \ file://uboot-machtypes.patch;patch=1 \ diff --git a/packages/u-boot/u-boot-omap2430sdp_1.1.4.bb b/packages/u-boot/u-boot-omap2430sdp_1.1.4.bb index 6c731d501b..af0d0a14a7 100644 --- a/packages/u-boot/u-boot-omap2430sdp_1.1.4.bb +++ b/packages/u-boot/u-boot-omap2430sdp_1.1.4.bb @@ -1,5 +1,5 @@ require u-boot.inc -FILE_PR ="r1" +PR ="r1" DEFAULT_PREFERENCE = "-1" SRC_URI = "http://linux.omap.com/pub/bootloader/2430sdp/source/u-boot-SEP1106.tar.gz \ diff --git a/packages/u-boot/u-boot-omap3_git.bb b/packages/u-boot/u-boot-omap3_git.bb index 2bd2dc91f1..5be3657fba 100644 --- a/packages/u-boot/u-boot-omap3_git.bb +++ b/packages/u-boot/u-boot-omap3_git.bb @@ -5,7 +5,7 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/u-boot-omap3-git/${M SRCREV = "c492706ba046124333323273f6fc21123360cb50" PV = "2008.10-rc1+${PR}+git${SRCREV}" -FILE_PR ="r1" +PR ="r1" SRC_URI = "git://www.sakoman.net/git/u-boot-omap3.git;branch=common;protocol=git \ " diff --git a/packages/u-boot/u-boot-omap3beagleboard_1.1.4.bb b/packages/u-boot/u-boot-omap3beagleboard_1.1.4.bb index e02a95c7dd..f29292feb8 100644 --- a/packages/u-boot/u-boot-omap3beagleboard_1.1.4.bb +++ b/packages/u-boot/u-boot-omap3beagleboard_1.1.4.bb @@ -1,5 +1,5 @@ require u-boot.inc -FILE_PR ="r1" +PR ="r1" DEFAULT_PREFERENCE = "-1" SRC_URI = "http://www.sakoman.net/omap3/u-boot.tar.gz \ diff --git a/packages/u-boot/u-boot-openmoko.inc b/packages/u-boot/u-boot-openmoko.inc index 65390ab465..c25afd38f6 100644 --- a/packages/u-boot/u-boot-openmoko.inc +++ b/packages/u-boot/u-boot-openmoko.inc @@ -6,7 +6,7 @@ PRIORITY = "optional" PROVIDES = "virtual/bootloader" LOCALVERSION = "+gitr${SRCREV}" PV = "1.3.1${LOCALVERSION}" -FILE_PR = "r0" +PR = "r0" UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v2 gta02v4 gta02v5" diff --git a/packages/u-boot/u-boot-utils-native_1.2.0.bb b/packages/u-boot/u-boot-utils-native_1.2.0.bb index bc29ddbd5c..b04b366ffe 100644 --- a/packages/u-boot/u-boot-utils-native_1.2.0.bb +++ b/packages/u-boot/u-boot-utils-native_1.2.0.bb @@ -3,7 +3,7 @@ SECTION = "bootloaders" PRIORITY = "optional" LICENSE = "GPL" ALLOW_EMPTY = "1" -FILE_PR = "r1" +PR = "r1" SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2" diff --git a/packages/u-boot/u-boot-utils_1.2.0.bb b/packages/u-boot/u-boot-utils_1.2.0.bb index 94ede71c6f..1734b41a0e 100644 --- a/packages/u-boot/u-boot-utils_1.2.0.bb +++ b/packages/u-boot/u-boot-utils_1.2.0.bb @@ -3,7 +3,7 @@ SECTION = "bootloaders" PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "mtd-utils" -FILE_PR = "r7" +PR = "r7" SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \ file://fw_env.c.patch;patch=1 \ diff --git a/packages/u-boot/u-boot_1.1.2.bb b/packages/u-boot/u-boot_1.1.2.bb index 72c706ed51..8287d35a1d 100644 --- a/packages/u-boot/u-boot_1.1.2.bb +++ b/packages/u-boot/u-boot_1.1.2.bb @@ -1,4 +1,4 @@ -FILE_PR = "r3" +PR = "r3" require u-boot.inc SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \ diff --git a/packages/u-boot/u-boot_1.1.4.bb b/packages/u-boot/u-boot_1.1.4.bb index 07cd745f17..df6a357c63 100644 --- a/packages/u-boot/u-boot_1.1.4.bb +++ b/packages/u-boot/u-boot_1.1.4.bb @@ -1,6 +1,6 @@ require u-boot.inc -FILE_PR = "r1" +PR = "r1" DEFAULT_PREFERENCE = "-1" diff --git a/packages/u-boot/u-boot_1.1.6.bb b/packages/u-boot/u-boot_1.1.6.bb index 3c75eb8d2c..e003c69d7b 100644 --- a/packages/u-boot/u-boot_1.1.6.bb +++ b/packages/u-boot/u-boot_1.1.6.bb @@ -1,6 +1,6 @@ require u-boot.inc -FILE_PR = "r3" +PR = "r3" SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-1.1.6.tar.bz2 \ file://devkit-idp.patch;patch=1 \ diff --git a/packages/u-boot/u-boot_1.2.0.bb b/packages/u-boot/u-boot_1.2.0.bb index 2efd974254..7c6aff8920 100644 --- a/packages/u-boot/u-boot_1.2.0.bb +++ b/packages/u-boot/u-boot_1.2.0.bb @@ -1,6 +1,6 @@ require u-boot.inc -FILE_PR = "r3" +PR = "r3" SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-1.2.0.tar.bz2 \ " diff --git a/packages/u-boot/u-boot_1.3.1.bb b/packages/u-boot/u-boot_1.3.1.bb index 67a082c61d..5c32b9a156 100644 --- a/packages/u-boot/u-boot_1.3.1.bb +++ b/packages/u-boot/u-boot_1.3.1.bb @@ -2,7 +2,7 @@ require u-boot.inc DEFAULT_PREFERENCE = "-1" -FILE_PR = "r1" +PR = "r1" SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \ file://mpc8313e-rdb-autoboot.patch;patch=1 \ diff --git a/packages/u-boot/u-boot_1.3.2.bb b/packages/u-boot/u-boot_1.3.2.bb index 6ffbcef491..d610526081 100644 --- a/packages/u-boot/u-boot_1.3.2.bb +++ b/packages/u-boot/u-boot_1.3.2.bb @@ -2,7 +2,7 @@ require u-boot.inc DEFAULT_PREFERENCE = "-1" -FILE_PR = "r3" +PR = "r3" SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2" diff --git a/packages/u-boot/u-boot_git.bb b/packages/u-boot/u-boot_git.bb index 2f17cbddee..7a7d5be531 100644 --- a/packages/u-boot/u-boot_git.bb +++ b/packages/u-boot/u-boot_git.bb @@ -1,5 +1,5 @@ require u-boot.inc -FILE_PR ="r18" +PR ="r18" SRCREV_davinci-sffsdr = "4b50cd12a3b3c644153c4cf393f4a4c12289e5aa" SRCREV_davinci-dvevm = "4b50cd12a3b3c644153c4cf393f4a4c12289e5aa" -- cgit v1.2.3