libtool: Remove FILESDIR, use INC_PR and FILESPATHPKG

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Denys Dmytriyenko <denis@denix.org>

diff --git a/recipes/libtool/libtool-cross_1.5.10.bb b/recipes/libtool/libtool-cross_1.5.10.bb
index 7374f107de331bbbd6448629c14352eda9058725..256e71c05aae1247a53f0be78d044ad819c82529 100644 (file)
--- a/recipes/libtool/libtool-cross_1.5.10.bb
+++ b/recipes/libtool/libtool-cross_1.5.10.bb
@@ -1,9 +1,8 @@
 require libtool.inc
 require libtool_${PV}.bb
 
-PR = "r10"
+PR = "${INC_PR}.0"
 PACKAGES = ""
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
 SRC_URI_append = " file://rpath-control.patch;patch=1 \
                    file://libdir-la.patch;patch=1 \
                    file://libdir-la2.patch;patch=1 \

diff --git a/recipes/libtool/libtool-cross_1.5.22.bb b/recipes/libtool/libtool-cross_1.5.22.bb
index c44b0512eec273c9ffe19bb0b90b3d4f06f92e44..949031146c37a58f230ee24af3be6c053ebd44cd 100644 (file)
--- a/recipes/libtool/libtool-cross_1.5.22.bb
+++ b/recipes/libtool/libtool-cross_1.5.22.bb
@@ -3,9 +3,8 @@ DEFAULT_PREFERENCE = "-1"
 require libtool.inc
 require libtool_${PV}.bb
 
-PR = "r0"
+PR = "${INC_PR}.0"
 PACKAGES = ""
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
 SRC_URI_append = " file://libdir-la.patch;patch=1 \
                    file://prefix.patch;patch=1 \
                    file://tag.patch;patch=1 \

diff --git a/recipes/libtool/libtool-cross_1.5.24.bb b/recipes/libtool/libtool-cross_1.5.24.bb
index cf6cc18ef6565397edfacae8dcb33ed63cfac32d..2a7e4d728874ac8997588bc18f9d6bac0f9924dc 100644 (file)
--- a/recipes/libtool/libtool-cross_1.5.24.bb
+++ b/recipes/libtool/libtool-cross_1.5.24.bb
@@ -1,9 +1,8 @@
 require libtool.inc
 require libtool_${PV}.bb
 
-PR = "r0"
+PR = "${INC_PR}.0"
 PACKAGES = ""
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
 SRC_URI_append = " file://libdir-la.patch;patch=1 \
                    file://prefix.patch;patch=1 \
                    file://tag.patch;patch=1 \

diff --git a/recipes/libtool/libtool-cross_2.2.4.bb b/recipes/libtool/libtool-cross_2.2.4.bb
index dd8b598fde2f38c1ff519d919c99d1218f746ba7..e2c6bbeb6ad859a91bd18a9240487a4fa8dcbcff 100644 (file)
--- a/recipes/libtool/libtool-cross_2.2.4.bb
+++ b/recipes/libtool/libtool-cross_2.2.4.bb
@@ -1,6 +1,6 @@
 require libtool.inc
 require libtool_${PV}.bb
-PR = "r24"
+PR = "${INC_PR}.0"
 
 SRC_URI += "\
   file://cross_compile.patch;patch=1 \

diff --git a/recipes/libtool/libtool-cross_2.2.6a.bb b/recipes/libtool/libtool-cross_2.2.6a.bb
index 1b2defb43fec382e66147bf418e7fba9ee2ec65c..b26e7cc26a5e112f67dd4d3c987d3ce74b3b964f 100644 (file)
--- a/recipes/libtool/libtool-cross_2.2.6a.bb
+++ b/recipes/libtool/libtool-cross_2.2.6a.bb
@@ -1,6 +1,6 @@
 require libtool.inc
 require libtool_${PV}.bb
-PR = "r1"
+PR = "${INC_PR}.0"
 
 SRC_URI += "\
   file://cross_compile.patch;patch=1 \

diff --git a/recipes/libtool/libtool-native_1.5.10.bb b/recipes/libtool/libtool-native_1.5.10.bb
index 59b323d8ff79a601e78ee293940734049289eb97..362aea22f71f9211e275ade2c182d94f8221aedc 100644 (file)
--- a/recipes/libtool/libtool-native_1.5.10.bb
+++ b/recipes/libtool/libtool-native_1.5.10.bb
@@ -1,8 +1,7 @@
 require libtool.inc
 require libtool_${PV}.bb
 
-PR = "r10"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
+PR = "${INC_PR}.0"
 SRC_URI_append = " file://libdir-la.patch;patch=1 \
                    file://libdir-la2.patch;patch=1 \
                    file://prefix.patch;patch=1 \

diff --git a/recipes/libtool/libtool-native_1.5.22.bb b/recipes/libtool/libtool-native_1.5.22.bb
index 16db0bb65b4287627d7b4aa227d33e8eb7c66890..4d660f4965b4df921ec7f45228780cc3dd77d42e 100644 (file)
--- a/recipes/libtool/libtool-native_1.5.22.bb
+++ b/recipes/libtool/libtool-native_1.5.22.bb
@@ -3,8 +3,7 @@ DEFAULT_PREFERENCE = "-1"
 require libtool.inc
 require libtool_${PV}.bb
 
-PR = "r0"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
+PR = "${INC_PR}.0"
 SRC_URI_append = " file://libdir-la.patch;patch=1 \
                    file://prefix.patch;patch=1 \
                    file://tag.patch;patch=1 \

diff --git a/recipes/libtool/libtool-native_1.5.24.bb b/recipes/libtool/libtool-native_1.5.24.bb
index 1b0cb90a1e7be14b846c7694af94de2e8e33f915..95368819bb40ead5be4363dd349e9502148cb6b4 100644 (file)
--- a/recipes/libtool/libtool-native_1.5.24.bb
+++ b/recipes/libtool/libtool-native_1.5.24.bb
@@ -3,8 +3,7 @@ SECTION = "devel"
 require libtool.inc
 require libtool_${PV}.bb
 
-PR = "r0"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
+PR = "${INC_PR}.0"
 SRC_URI_append = " file://libdir-la.patch;patch=1 \
                    file://prefix.patch;patch=1 \
                    file://tag.patch;patch=1 \

diff --git a/recipes/libtool/libtool-native_2.2.4.bb b/recipes/libtool/libtool-native_2.2.4.bb
index bfef6a6c96c6cc8c5daf01b1a3534c6116146f9b..06564c74c391f4cb56968e7e2a279751e11a7b7b 100644 (file)
--- a/recipes/libtool/libtool-native_2.2.4.bb
+++ b/recipes/libtool/libtool-native_2.2.4.bb
@@ -1,6 +1,6 @@
 require libtool.inc
 require libtool_${PV}.bb
-PR = "r20"
+PR = "${INC_PR}.0"
 
 SRC_URI += "\
   file://cross_compile.patch;patch=1 \

diff --git a/recipes/libtool/libtool-native_2.2.6a.bb b/recipes/libtool/libtool-native_2.2.6a.bb
index c5a4a99db097ab63c270a4b471a5f081805dd12b..e699a2f33c28a767ceec279ab9ac147296a1f1b3 100644 (file)
--- a/recipes/libtool/libtool-native_2.2.6a.bb
+++ b/recipes/libtool/libtool-native_2.2.6a.bb
@@ -1,6 +1,6 @@
 require libtool.inc
 require libtool_${PV}.bb
-PR = "r0"
+PR = "${INC_PR}.0"
 
 SRC_URI += "\
   file://cross_compile.patch;patch=1 \

diff --git a/recipes/libtool/libtool-sdk_1.5.10.bb b/recipes/libtool/libtool-sdk_1.5.10.bb
index e068b531adfa78744575e02dbbf94f7d18424461..21e408dc73fe2b81716a6aa16b4b1faae3f2171a 100644 (file)
--- a/recipes/libtool/libtool-sdk_1.5.10.bb
+++ b/recipes/libtool/libtool-sdk_1.5.10.bb
@@ -1,8 +1,7 @@
 require libtool.inc
 require libtool_${PV}.bb
 
-PR = "r0"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
+PR = "${INC_PR}.0"
 SRC_URI_append = " file://rpath-control.patch;patch=1 \
                    file://libdir-la.patch;patch=1 \
                    file://libdir-la2.patch;patch=1 \

diff --git a/recipes/libtool/libtool-sdk_2.2.4.bb b/recipes/libtool/libtool-sdk_2.2.4.bb
index f2c3c628b00e9a076d956df3260193bb96686d63..0e9ae9b66e41c84a7492c8f90722d7c54645262e 100644 (file)
--- a/recipes/libtool/libtool-sdk_2.2.4.bb
+++ b/recipes/libtool/libtool-sdk_2.2.4.bb
@@ -1,8 +1,8 @@
 require libtool.inc
 require libtool_${PV}.bb
 
-PR = "r2"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
+PR = "${INC_PR}.0"
+
 SRC_URI_append = " file://cross_compile.patch;patch=1"
 
 S = "${WORKDIR}/libtool-${PV}"

diff --git a/recipes/libtool/libtool-sdk_2.2.6a.bb b/recipes/libtool/libtool-sdk_2.2.6a.bb
index 88ec4df8c03567f43c454b19db46826597dd5fd5..263879beeb464cef798fed92657cab6505baeb33 100644 (file)
--- a/recipes/libtool/libtool-sdk_2.2.6a.bb
+++ b/recipes/libtool/libtool-sdk_2.2.6a.bb
@@ -1,7 +1,7 @@
 require libtool.inc
 require libtool_${PV}.bb
 
-PR = "r1"
+PR = "${INC_PR}.0"
 SRC_URI_append = " file://cross_compile.patch;patch=1"
 
 inherit sdk

diff --git a/recipes/libtool/libtool.inc b/recipes/libtool/libtool.inc
index 197612910afdbf53b0d767fe438db0c6194e5557..9cc74010c6d988b6a387418bc05fc54f48d0d001 100644 (file)
--- a/recipes/libtool/libtool.inc
+++ b/recipes/libtool/libtool.inc
@@ -6,4 +6,6 @@ HOMEPAGE = "http://www.gnu.org/software/libtool/libtool.html"
 LICENSE = "GPL"
 SECTION = "devel"
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
+INC_PR = "r24"
+
+FILESPATHPKG=. "libtool-${PV}:"

diff --git a/recipes/libtool/libtool_1.5.10.bb b/recipes/libtool/libtool_1.5.10.bb
index 428a06a0e77978d5772d00ee0189de91f8768937..8fd2cdfc59981f38edb56120bf6db70c3e5ccb44 100644 (file)
--- a/recipes/libtool/libtool_1.5.10.bb
+++ b/recipes/libtool/libtool_1.5.10.bb
@@ -1,5 +1,5 @@
 require libtool.inc
-PR = "r5"
+PR = "${INC_PR}.0"
 
 SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
            file://autotools.patch;patch=1 \

diff --git a/recipes/libtool/libtool_1.5.22.bb b/recipes/libtool/libtool_1.5.22.bb
index 4bed7842b48d81d4ababb0046babf11c22ba945e..88116f0455125429640f2f6364b96fcb8a561d2e 100644 (file)
--- a/recipes/libtool/libtool_1.5.22.bb
+++ b/recipes/libtool/libtool_1.5.22.bb
@@ -1,7 +1,7 @@
 DEFAULT_PREFERENCE = "-1"
 
 require libtool.inc
-PR = "r1"
+PR = "${INC_PR}.0"
 
 SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
            file://autotools.patch;patch=1 \

diff --git a/recipes/libtool/libtool_1.5.24.bb b/recipes/libtool/libtool_1.5.24.bb
index 7bdad1bed46bed44759633551eaa5a0804525456..2ab735821fcc89d5191330b11d8e65ed88a27db9 100644 (file)
--- a/recipes/libtool/libtool_1.5.24.bb
+++ b/recipes/libtool/libtool_1.5.24.bb
@@ -1,7 +1,7 @@
 DEFAULT_PREFERENCE = "-1"
 
 require libtool.inc
-PR = "r1"
+PR = "${INC_PR}.0"
 
 SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
            file://autotools.patch;patch=1 \

diff --git a/recipes/libtool/libtool_1.5.6.bb b/recipes/libtool/libtool_1.5.6.bb
index 7fd9b81a3d46211144f882bb7e2aa93f624cd52c..6827ea99a171261b625f7d85868382737f4bef32 100644 (file)
--- a/recipes/libtool/libtool_1.5.6.bb
+++ b/recipes/libtool/libtool_1.5.6.bb
@@ -1,7 +1,7 @@
 # Exists for compatibility with certain distributions (e.g. Maemo).
 
 require libtool.inc
-PR = "r2"
+PR = "${INC_PR}.0"
 
 DEFAULT_PREFERENCE = "-1"
 

diff --git a/recipes/libtool/libtool_2.2.4.bb b/recipes/libtool/libtool_2.2.4.bb
index 8e6682f0969180f50abbfe0eea463323a05b10f7..6de73364062441a53943273a8cd88c92618def88 100644 (file)
--- a/recipes/libtool/libtool_2.2.4.bb
+++ b/recipes/libtool/libtool_2.2.4.bb
@@ -1,5 +1,5 @@
 require libtool.inc
-PR = "r17"
+PR = "${INC_PR}.0"
 
 SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz"
 S = "${WORKDIR}/libtool-${PV}"

diff --git a/recipes/libtool/libtool_2.2.6a.bb b/recipes/libtool/libtool_2.2.6a.bb
index e2996c71987d6bd0f3f9a6fcd19399dedacb8c61..c69a937f16ef3436e5a411160ce5a9dcf08161a6 100644 (file)
--- a/recipes/libtool/libtool_2.2.6a.bb
+++ b/recipes/libtool/libtool_2.2.6a.bb
@@ -1,5 +1,5 @@
 require libtool.inc
-PR = "r2"
+PR = "${INC_PR}.0"
 
 DEFAULT_PREFERENCE = "-1"