* amend-recipes.inc
@ 2009-05-22 18:20 Christopher Larson
2009-05-22 20:35 ` amend-recipes.inc Michael Smith
0 siblings, 1 reply; 16+ messages in thread
From: Christopher Larson @ 2009-05-22 18:20 UTC (permalink / raw)
To: openembedded-devel
I created a little .inc that can be loaded into a distro .conf. It
just enables the ability to amend bits to a recipe from its
filespath. I mentioned this in a previous email wrt managing
overlays. It's incredibly simple, but I'd like a sanity check :) It
seems to work fine in my local test builds.
python () {
import bb
amendfile = bb.which(d.getVar("FILESPATH", 1), "amend.inc")
if amendfile:
bb.parse.handle(amendfile, d, 1)
}
--
Chris Larson
Software Engineer
MontaVista Software, Inc.
Email: clarson AT mvista DOT com
Email: clarson AT kergoth DOT com
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: amend-recipes.inc
2009-05-22 18:20 amend-recipes.inc Christopher Larson
@ 2009-05-22 20:35 ` Michael Smith
2009-05-22 20:50 ` amend-recipes.inc Christopher Larson
0 siblings, 1 reply; 16+ messages in thread
From: Michael Smith @ 2009-05-22 20:35 UTC (permalink / raw)
To: openembedded-devel
Hi Chris,
This works for me. I can put multiple recipes dirs in my COLLECTIONS,
set FILESPATHBASE to reference them all, and create a busybox/amend.inc
under any of my COLLECTIONS dirs.
There is something strange going on: when I require amend-recipes.inc in
my distro config, and the cache is rebuilt, I see deprecation warnings
about base_set_filespath that weren't printing before. If I comment out
the require line and let bb rebuild the cache, the warnings go away.
About 45 recipes are using base_set_filespath, including glibc,
e2fsprogs-native, and many others. I don't see why the warnings don't
show up normally if amend-recipes is not included. It looks to me like
they would always print, but they don't.
My FILESPATHBASE is set to:
FILESPATHBASE =. "${@ \
':'.join([os.path.join(recipedir, \
os.path.basename(os.path.dirname( \
d.getVar('FILE', 1))))
\ for recipedir in d.getVar('COLLECTIONS', 1).split()])}:"
and COLLECTIONS is just a list of a few recipes directories, with
oe/recipes last.
Mike
Christopher Larson wrote:
> I created a little .inc that can be loaded into a distro .conf. It just
> enables the ability to amend bits to a recipe from its filespath. I
> mentioned this in a previous email wrt managing overlays. It's
> incredibly simple, but I'd like a sanity check :) It seems to work fine
> in my local test builds.
>
> python () {
> import bb
> amendfile = bb.which(d.getVar("FILESPATH", 1), "amend.inc")
> if amendfile:
> bb.parse.handle(amendfile, d, 1)
> }
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: amend-recipes.inc
2009-05-22 20:35 ` amend-recipes.inc Michael Smith
@ 2009-05-22 20:50 ` Christopher Larson
2009-05-22 21:32 ` amend-recipes.inc Michael Smith
2009-05-26 6:28 ` amend-recipes.inc Michael Smith
0 siblings, 2 replies; 16+ messages in thread
From: Christopher Larson @ 2009-05-22 20:50 UTC (permalink / raw)
To: openembedded-devel
Ah, I can tell you why that's happening. This amend-recipes bit has
to get to FILESPATH in order to find the amend.inc, and expansion of
FILESPATH is when the base_set_filespaths are called. Under normal
circumstances, it wouldn't be expanded until tasks are executed, I
think.
I expect for now the best bet is to fix those base_set_filespath
usages :) I'll see about fixing some this weekend, if I have the time.
On May 22, 2009, at 1:35 PM, Michael Smith wrote:
> Hi Chris,
>
> This works for me. I can put multiple recipes dirs in my
> COLLECTIONS, set FILESPATHBASE to reference them all, and create a
> busybox/amend.inc under any of my COLLECTIONS dirs.
>
> There is something strange going on: when I require amend-
> recipes.inc in my distro config, and the cache is rebuilt, I see
> deprecation warnings about base_set_filespath that weren't printing
> before. If I comment out the require line and let bb rebuild the
> cache, the warnings go away.
>
> About 45 recipes are using base_set_filespath, including glibc,
> e2fsprogs-native, and many others. I don't see why the warnings
> don't show up normally if amend-recipes is not included. It looks to
> me like they would always print, but they don't.
>
> My FILESPATHBASE is set to:
>
> FILESPATHBASE =. "${@ \
> ':'.join([os.path.join(recipedir, \
> os.path.basename(os.path.dirname( \
> d.getVar('FILE',
> 1)))) \ for recipedir in d.getVar('COLLECTIONS',
> 1).split()])}:"
>
> and COLLECTIONS is just a list of a few recipes directories, with oe/
> recipes last.
>
> Mike
>
> Christopher Larson wrote:
>> I created a little .inc that can be loaded into a distro .conf. It
>> just enables the ability to amend bits to a recipe from its
>> filespath. I mentioned this in a previous email wrt managing
>> overlays. It's incredibly simple, but I'd like a sanity check :)
>> It seems to work fine in my local test builds.
>> python () {
>> import bb
>> amendfile = bb.which(d.getVar("FILESPATH", 1), "amend.inc")
>> if amendfile:
>> bb.parse.handle(amendfile, d, 1)
>> }
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
--
Chris Larson
Software Engineer
MontaVista Software, Inc.
Work: 480-517-5031
Home: 480-963-2636
Email: clarson AT mvista DOT com
Email: clarson AT kergoth DOT com
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: amend-recipes.inc
2009-05-22 20:50 ` amend-recipes.inc Christopher Larson
@ 2009-05-22 21:32 ` Michael Smith
2009-05-26 6:28 ` amend-recipes.inc Michael Smith
1 sibling, 0 replies; 16+ messages in thread
From: Michael Smith @ 2009-05-22 21:32 UTC (permalink / raw)
To: openembedded-devel
Christopher Larson wrote:
> I expect for now the best bet is to fix those base_set_filespath usages
> :) I'll see about fixing some this weekend, if I have the time.
OK, thanks for the explanation. It looks like the default FILESPATHPKG
already covers most of the cases for recipes that are using
base_set_filespath(). I guess that's probably by design. :)
Mike
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: amend-recipes.inc
2009-05-22 20:50 ` amend-recipes.inc Christopher Larson
2009-05-22 21:32 ` amend-recipes.inc Michael Smith
@ 2009-05-26 6:28 ` Michael Smith
2009-05-26 6:34 ` [PATCH 1/4] Remove references to base_set_filespath() from recipes that don't need it Michael Smith
1 sibling, 1 reply; 16+ messages in thread
From: Michael Smith @ 2009-05-26 6:28 UTC (permalink / raw)
To: openembedded-devel
On Fri, 22 May 2009, Christopher Larson wrote:
> I expect for now the best bet is to fix those base_set_filespath usages :)
> I'll see about fixing some this weekend, if I have the time.
I have a few patches coming up for this.
Mike
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 1/4] Remove references to base_set_filespath() from recipes that don't need it.
2009-05-26 6:28 ` amend-recipes.inc Michael Smith
@ 2009-05-26 6:34 ` Michael Smith
2009-05-26 6:34 ` [PATCH 2/4] Replace obsolete base_set_filespath() with FILESPATHPKG in some recipes Michael Smith
` (2 more replies)
0 siblings, 3 replies; 16+ messages in thread
From: Michael Smith @ 2009-05-26 6:34 UTC (permalink / raw)
To: openembedded-devel
These recipes are covered by the default FILESPATHPKG setting.
Signed-off-by: Michael Smith <msmith@cbnco.com>
---
Of these, the following were build tested:
recipes/db/db3-native_3.2.9.bb | 1 -
.../e2fsprogs-libs/e2fsprogs-libs-native_1.41.2.bb | 1 -
recipes/e2fsprogs/e2fsprogs-native_1.41.5.bb | 1 -
recipes/mysql/mysql_4.1.22.bb | 2 --
recipes/recode/recode_3.6.bb | 7 ++-----
recipes/e2tools/e2tools-native_0.0.16.bb | 1 -
(this build was broken before, and is still broken -- seems
e2fsprogs-native isn't staging the include files for some reason)
The rest were not:
.../e2fsprogs-libs/e2fsprogs-libs-native_1.35.bb | 1 -
recipes/e2fsprogs/e2fsprogs-native_1.38.bb | 1 -
recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb | 1 -
recipes/genext2fs/genext2fs-native_1.3.bb | 1 -
recipes/slugimage/slugimage-native.bb | 2 --
recipes/slugtool/slugtool-native.bb | 1 -
.../squashfs-tools/squashfs-tools-native_2.0r2.bb | 2 --
.../squashfs-tools/squashfs-tools-native_2.2r2.bb | 1 -
.../squashfs-tools/squashfs-tools-native_3.1r2.bb | 1 -
.../squashfs-tools/squashfs-tools-native_3.3.bb | 1 -
.../squashfs-tools/squashfs-tools-native_4.0.bb | 1 -
17 files changed, 2 insertions(+), 24 deletions(-)
diff --git a/recipes/db/db3-native_3.2.9.bb b/recipes/db/db3-native_3.2.9.bb
index 492f740..f16b19f 100644
--- a/recipes/db/db3-native_3.2.9.bb
+++ b/recipes/db/db3-native_3.2.9.bb
@@ -4,5 +4,4 @@ CONFLICTS = "db-native"
inherit native
require db3_${PV}.bb
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/db3-${PV}', '${FILE_DIRNAME}/db3', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
PACKAGES = ""
diff --git a/recipes/e2fsprogs-libs/e2fsprogs-libs-native_1.35.bb b/recipes/e2fsprogs-libs/e2fsprogs-libs-native_1.35.bb
index 9d0afa8..5f94c08 100644
--- a/recipes/e2fsprogs-libs/e2fsprogs-libs-native_1.35.bb
+++ b/recipes/e2fsprogs-libs/e2fsprogs-libs-native_1.35.bb
@@ -2,5 +2,4 @@ SECTION = "base"
require e2fsprogs-libs_${PV}.bb
inherit native
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/e2fsprogs-libs-${PV}', '${FILE_DIRNAME}/e2fsprogs-libs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
PACKAGES = ""
diff --git a/recipes/e2fsprogs-libs/e2fsprogs-libs-native_1.41.2.bb b/recipes/e2fsprogs-libs/e2fsprogs-libs-native_1.41.2.bb
index 3db9e02..2632db4 100644
--- a/recipes/e2fsprogs-libs/e2fsprogs-libs-native_1.41.2.bb
+++ b/recipes/e2fsprogs-libs/e2fsprogs-libs-native_1.41.2.bb
@@ -2,7 +2,6 @@ SECTION = "base"
require e2fsprogs-libs_${PV}.bb
inherit native
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/e2fsprogs-libs-${PV}', '${FILE_DIRNAME}/e2fsprogs-libs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
PACKAGES = ""
DEPENDS = "gettext-native"
diff --git a/recipes/e2fsprogs/e2fsprogs-native_1.38.bb b/recipes/e2fsprogs/e2fsprogs-native_1.38.bb
index af49b0d..13fd2be 100644
--- a/recipes/e2fsprogs/e2fsprogs-native_1.38.bb
+++ b/recipes/e2fsprogs/e2fsprogs-native_1.38.bb
@@ -11,7 +11,6 @@ SRC_URI += "file://no-hardlinks.patch;patch=1 \
EXTRA_OECONF = ""
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/e2fsprogs-${PV}', '${FILE_DIRNAME}/e2fsprogs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
PACKAGES = ""
DEPENDS = ""
diff --git a/recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb b/recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb
index e79958c..4ff399b 100644
--- a/recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb
+++ b/recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb
@@ -7,7 +7,6 @@ DEFAULT_PREFERENCE = "-1"
EXTRA_OECONF = ""
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/e2fsprogs-${PV}', '${FILE_DIRNAME}/e2fsprogs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
PACKAGES = ""
DEPENDS = ""
diff --git a/recipes/e2fsprogs/e2fsprogs-native_1.41.5.bb b/recipes/e2fsprogs/e2fsprogs-native_1.41.5.bb
index b29064f..2951363 100644
--- a/recipes/e2fsprogs/e2fsprogs-native_1.41.5.bb
+++ b/recipes/e2fsprogs/e2fsprogs-native_1.41.5.bb
@@ -6,7 +6,6 @@ SRC_URI += "file://mkinstalldirs.patch;patch=1"
EXTRA_OECONF = ""
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/e2fsprogs-${PV}', '${FILE_DIRNAME}/e2fsprogs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
PACKAGES = ""
DEPENDS = ""
diff --git a/recipes/e2tools/e2tools-native_0.0.16.bb b/recipes/e2tools/e2tools-native_0.0.16.bb
index e37eed2..f23a0b1 100644
--- a/recipes/e2tools/e2tools-native_0.0.16.bb
+++ b/recipes/e2tools/e2tools-native_0.0.16.bb
@@ -3,7 +3,6 @@ require e2tools_${PV}.bb
inherit native
DEPENDS = "e2fsprogs-libs-native e2fsprogs-native"
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/e2tools-${PV}', '${FILE_DIRNAME}/e2tools', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
PACKAGES = ""
e2links = "e2ln e2ls e2mkdir e2mv e2rm e2tail"
diff --git a/recipes/genext2fs/genext2fs-native_1.3.bb b/recipes/genext2fs/genext2fs-native_1.3.bb
index 2e26fa0..50b371b 100644
--- a/recipes/genext2fs/genext2fs-native_1.3.bb
+++ b/recipes/genext2fs/genext2fs-native_1.3.bb
@@ -1,6 +1,5 @@
require genext2fs_${PV}.bb
inherit native
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/genext2fs-${PV}', '${FILE_DIRNAME}/genext2fs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
do_stage () {
install -m 0755 genext2fs ${STAGING_BINDIR}/
diff --git a/recipes/mysql/mysql_4.1.22.bb b/recipes/mysql/mysql_4.1.22.bb
index 7f32b4d..09c52ec 100644
--- a/recipes/mysql/mysql_4.1.22.bb
+++ b/recipes/mysql/mysql_4.1.22.bb
@@ -14,8 +14,6 @@ SRC_URI = "http://downloads.mysql.com/archives/mysql-4.1/mysql-${PV}.tar.gz \
S = "${WORKDIR}/mysql-${PV}"
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/mysql-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
-
BINCONFIG_GLOB = "mysql_config"
inherit autotools binconfig update-rc.d
diff --git a/recipes/recode/recode_3.6.bb b/recipes/recode/recode_3.6.bb
index 6fd60ae..37e3b2a 100644
--- a/recipes/recode/recode_3.6.bb
+++ b/recipes/recode/recode_3.6.bb
@@ -3,11 +3,8 @@ SECTION = "console/utils"
LICENSE = "GPL"
PR = "r1"
-SRC_URI = "${GNU_MIRROR}/recode/recode-${PV}.tar.gz"
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/recode-${PV}', '${FILE_DIRNAME}' ], d)}"
-
-SRC_URI += "file://recode-bitfield-width.patch;patch=1 \
- "
+SRC_URI = "${GNU_MIRROR}/recode/recode-${PV}.tar.gz \
+ file://recode-bitfield-width.patch;patch=1"
inherit autotools
diff --git a/recipes/slugimage/slugimage-native.bb b/recipes/slugimage/slugimage-native.bb
index 8b60ff1..f8408a1 100644
--- a/recipes/slugimage/slugimage-native.bb
+++ b/recipes/slugimage/slugimage-native.bb
@@ -6,8 +6,6 @@ RDEPENDS = ""
inherit native
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/slugimage-${PV}', '${FILE_DIRNAME}/slugimage', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
-
do_stage () {
install -m 0755 slugimage ${STAGING_BINDIR}/
}
diff --git a/recipes/slugtool/slugtool-native.bb b/recipes/slugtool/slugtool-native.bb
index 2d1fe91..088839c 100644
--- a/recipes/slugtool/slugtool-native.bb
+++ b/recipes/slugtool/slugtool-native.bb
@@ -2,7 +2,6 @@ SECTION = "unknown"
require slugtool.bb
inherit native
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/slugtool-${PV}', '${FILE_DIRNAME}/slugtool', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
PACKAGES = ""
do_stage () {
diff --git a/recipes/squashfs-tools/squashfs-tools-native_2.0r2.bb b/recipes/squashfs-tools/squashfs-tools-native_2.0r2.bb
index 2423e47..9ba5684 100644
--- a/recipes/squashfs-tools/squashfs-tools-native_2.0r2.bb
+++ b/recipes/squashfs-tools/squashfs-tools-native_2.0r2.bb
@@ -1,11 +1,9 @@
require squashfs-tools_${PV}.bb
DEPENDS = "lzma-native"
-PN_BASE = "squashfs-tools"
inherit native
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${PN_BASE}-${PV}', '${FILE_DIRNAME}/${PN_BASE}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
PACKAGES = ""
do_stage () {
diff --git a/recipes/squashfs-tools/squashfs-tools-native_2.2r2.bb b/recipes/squashfs-tools/squashfs-tools-native_2.2r2.bb
index b6ee6e7..9ba5684 100644
--- a/recipes/squashfs-tools/squashfs-tools-native_2.2r2.bb
+++ b/recipes/squashfs-tools/squashfs-tools-native_2.2r2.bb
@@ -4,7 +4,6 @@ DEPENDS = "lzma-native"
inherit native
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/squashfs-tools-${PV}', '${FILE_DIRNAME}/squashfs-tools', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
PACKAGES = ""
do_stage () {
diff --git a/recipes/squashfs-tools/squashfs-tools-native_3.1r2.bb b/recipes/squashfs-tools/squashfs-tools-native_3.1r2.bb
index c35d183..c171e43 100644
--- a/recipes/squashfs-tools/squashfs-tools-native_3.1r2.bb
+++ b/recipes/squashfs-tools/squashfs-tools-native_3.1r2.bb
@@ -2,7 +2,6 @@ require squashfs-tools_${PV}.bb
inherit native
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/squashfs-tools-${PV}', '${FILE_DIRNAME}/squashfs-tools', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
PACKAGES = ""
do_stage () {
diff --git a/recipes/squashfs-tools/squashfs-tools-native_3.3.bb b/recipes/squashfs-tools/squashfs-tools-native_3.3.bb
index 87ba761..5858bb1 100644
--- a/recipes/squashfs-tools/squashfs-tools-native_3.3.bb
+++ b/recipes/squashfs-tools/squashfs-tools-native_3.3.bb
@@ -3,7 +3,6 @@ PR = "r0"
inherit native
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/squashfs-tools-${PV}', '${FILE_DIRNAME}/squashfs-tools', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
PACKAGES = ""
do_stage () {
diff --git a/recipes/squashfs-tools/squashfs-tools-native_4.0.bb b/recipes/squashfs-tools/squashfs-tools-native_4.0.bb
index 87ba761..5858bb1 100644
--- a/recipes/squashfs-tools/squashfs-tools-native_4.0.bb
+++ b/recipes/squashfs-tools/squashfs-tools-native_4.0.bb
@@ -3,7 +3,6 @@ PR = "r0"
inherit native
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/squashfs-tools-${PV}', '${FILE_DIRNAME}/squashfs-tools', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
PACKAGES = ""
do_stage () {
--
1.5.6.5
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 2/4] Replace obsolete base_set_filespath() with FILESPATHPKG in some recipes.
2009-05-26 6:34 ` [PATCH 1/4] Remove references to base_set_filespath() from recipes that don't need it Michael Smith
@ 2009-05-26 6:34 ` Michael Smith
2009-05-26 6:34 ` [PATCH 3/4] glibc/eglibc: remove calls to obsolete base_set_filespath() Michael Smith
2009-05-30 16:42 ` [PATCH 2/4] Replace obsolete base_set_filespath() with FILESPATHPKG in some recipes Tom Rini
2009-05-30 0:48 ` [PATCH 1/4] Remove references to base_set_filespath()from recipes that don't need it Michael Smith
2009-05-30 16:42 ` [PATCH 1/4] Remove references to base_set_filespath() from " Tom Rini
2 siblings, 2 replies; 16+ messages in thread
From: Michael Smith @ 2009-05-26 6:34 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Michael Smith <msmith@cbnco.com>
---
Of these, the following were build tested:
recipes/cherokee/cherokee-nossl_0.5.3.bb | 2 +-
.../squashfs-lzma-tools-native_3.1r2.bb | 2 +-
The rest were not:
recipes/freesmartphone/frameworkd-devel_git.bb | 2 +-
recipes/initscripts/initscripts-openprotium_1.0.bb | 2 +-
recipes/vim/gvim_7.0.bb | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/recipes/cherokee/cherokee-nossl_0.5.3.bb b/recipes/cherokee/cherokee-nossl_0.5.3.bb
index 4093660..3ea9068 100644
--- a/recipes/cherokee/cherokee-nossl_0.5.3.bb
+++ b/recipes/cherokee/cherokee-nossl_0.5.3.bb
@@ -2,7 +2,7 @@ require cherokee_${PV}.bb
DEPENDS = "libpcre"
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/cherokee-${PV}', '${FILE_DIRNAME}/cherokee', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+FILESPATHPKG =. "cherokee-${PV}:cherokee:"
S = "${WORKDIR}/cherokee-${PV}"
diff --git a/recipes/freesmartphone/frameworkd-devel_git.bb b/recipes/freesmartphone/frameworkd-devel_git.bb
index f5f6c0b..a6439ee 100644
--- a/recipes/freesmartphone/frameworkd-devel_git.bb
+++ b/recipes/freesmartphone/frameworkd-devel_git.bb
@@ -1,5 +1,5 @@
require frameworkd_git.bb
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/frameworkd', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+FILESPATHPKG =. "frameworkd:"
PROVIDES = "frameworkd"
RPROVIDES = "frameworkd"
PV = "0.8.5.x+gitr${SRCREV}"
diff --git a/recipes/initscripts/initscripts-openprotium_1.0.bb b/recipes/initscripts/initscripts-openprotium_1.0.bb
index e787eed..aa20e29 100644
--- a/recipes/initscripts/initscripts-openprotium_1.0.bb
+++ b/recipes/initscripts/initscripts-openprotium_1.0.bb
@@ -13,7 +13,7 @@ RCONFLICTS = "initscripts"
# a suffix
PR := "${PR}.11"
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${P}', '${FILE_DIRNAME}/initscripts-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+FILESPATHPKG =. "${P}:initscripts-${PV}:"
PACKAGES = "${PN}-dbg ${PN}"
diff --git a/recipes/squashfs-tools/squashfs-lzma-tools-native_3.1r2.bb b/recipes/squashfs-tools/squashfs-lzma-tools-native_3.1r2.bb
index 5520896..8261ef5 100644
--- a/recipes/squashfs-tools/squashfs-lzma-tools-native_3.1r2.bb
+++ b/recipes/squashfs-tools/squashfs-lzma-tools-native_3.1r2.bb
@@ -4,7 +4,7 @@ DEPENDS = "lzma-native"
inherit native
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/squashfs-tools-${PV}', '${FILE_DIRNAME}/squashfs-tools', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+FILESPATHPKG =. "squashfs-tools-${PV}:squashfs-tools:"
PACKAGES = ""
do_stage () {
diff --git a/recipes/vim/gvim_7.0.bb b/recipes/vim/gvim_7.0.bb
index 78a0c54..a073e65 100644
--- a/recipes/vim/gvim_7.0.bb
+++ b/recipes/vim/gvim_7.0.bb
@@ -4,7 +4,7 @@ require vim.inc
DEPENDS += "gtk+ xt"
PR = "r1"
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/vim-7.0', '${FILE_DIRNAME}/vim', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+FILESPATHPKG =. "vim-${PV}:vim:"
EXTRA_OECONF = "--enable-gui=gtk2 --enable-gtk2-test --disable-gtktest \
--disable-xim --with-features=big \
--
1.5.6.5
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 3/4] glibc/eglibc: remove calls to obsolete base_set_filespath()
2009-05-26 6:34 ` [PATCH 2/4] Replace obsolete base_set_filespath() with FILESPATHPKG in some recipes Michael Smith
@ 2009-05-26 6:34 ` Michael Smith
2009-05-26 6:34 ` [PATCH 4/4] uclibc: " Michael Smith
2009-05-30 16:42 ` [PATCH 3/4] glibc/eglibc: " Tom Rini
2009-05-30 16:42 ` [PATCH 2/4] Replace obsolete base_set_filespath() with FILESPATHPKG in some recipes Tom Rini
1 sibling, 2 replies; 16+ messages in thread
From: Michael Smith @ 2009-05-26 6:34 UTC (permalink / raw)
To: openembedded-devel
Some recipes can use the default FILESPATHPKG, others need to override.
Signed-off-by: Michael Smith <msmith@cbnco.com>
---
Of these, the following were build tested:
recipes/glibc/glibc-initial.inc | 2 +-
(for glibc 2.6.1)
The rest were not.
I think something might be dicey here: glibc-2.4 was being prepended
to the FILESPATH in many recipes, including glibc-initial.inc (and still
is -- I just converted it to FILESPATHPKG). It's at the start of the
path, so for example glibc-2.4/blah.patch would override
glibc-2.999/blah.patch for glibc-initial_2.999.
So far there are no duplicate files between glibc-2.4 and the higher
versions, so it hasn't bitten anybody yet.
recipes/glibc/glibc-initial_2.3.2.bb | 1 -
recipes/glibc/glibc-initial_2.3.6.bb | 2 --
recipes/glibc/glibc-initial_cvs.bb | 3 ++-
recipes/glibc/glibc_2.3.6.bb | 2 --
recipes/glibc/glibc_2.7.bb | 2 +-
recipes/glibc/glibc_2.9.bb | 2 +-
10 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/recipes/eglibc/eglibc-initial.inc b/recipes/eglibc/eglibc-initial.inc
index 5fbb5db..7a5a7b2 100644
--- a/recipes/eglibc/eglibc-initial.inc
+++ b/recipes/eglibc/eglibc-initial.inc
@@ -1,7 +1,6 @@
SECTION = "libs"
DEPENDS = "linux-libc-headers virtual/${TARGET_PREFIX}gcc-initial"
PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/eglibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
PACKAGES = ""
PACKAGES_DYNAMIC = ""
diff --git a/recipes/glibc/glibc-initial.inc b/recipes/glibc/glibc-initial.inc
index 5528cf8..cd65924 100644
--- a/recipes/glibc/glibc-initial.inc
+++ b/recipes/glibc/glibc-initial.inc
@@ -1,7 +1,7 @@
SECTION = "libs"
DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial linux-libc-headers"
PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-2.4', '${FILE_DIRNAME}/glibc-${PV}', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+FILESPATHPKG =. "glibc-2.4:"
PACKAGES = ""
PACKAGES_DYNAMIC = ""
diff --git a/recipes/glibc/glibc-initial_2.2.5.bb b/recipes/glibc/glibc-initial_2.2.5.bb
index 84412bd..c7dde23 100644
--- a/recipes/glibc/glibc-initial_2.2.5.bb
+++ b/recipes/glibc/glibc-initial_2.2.5.bb
@@ -2,4 +2,3 @@ require glibc_${PV}.bb
require glibc-initial.inc
DEFAULT_PREFERENCE_sh3 = "-99"
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-${PV}', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
diff --git a/recipes/glibc/glibc-initial_2.3.2+cvs20040726.bb b/recipes/glibc/glibc-initial_2.3.2+cvs20040726.bb
index 4d7129b..c7dde23 100644
--- a/recipes/glibc/glibc-initial_2.3.2+cvs20040726.bb
+++ b/recipes/glibc/glibc-initial_2.3.2+cvs20040726.bb
@@ -2,4 +2,3 @@ require glibc_${PV}.bb
require glibc-initial.inc
DEFAULT_PREFERENCE_sh3 = "-99"
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-cvs', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
diff --git a/recipes/glibc/glibc-initial_2.3.2.bb b/recipes/glibc/glibc-initial_2.3.2.bb
index 84412bd..c7dde23 100644
--- a/recipes/glibc/glibc-initial_2.3.2.bb
+++ b/recipes/glibc/glibc-initial_2.3.2.bb
@@ -2,4 +2,3 @@ require glibc_${PV}.bb
require glibc-initial.inc
DEFAULT_PREFERENCE_sh3 = "-99"
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-${PV}', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
diff --git a/recipes/glibc/glibc-initial_2.3.6.bb b/recipes/glibc/glibc-initial_2.3.6.bb
index 8249cd6..fa7836a 100644
--- a/recipes/glibc/glibc-initial_2.3.6.bb
+++ b/recipes/glibc/glibc-initial_2.3.6.bb
@@ -1,4 +1,2 @@
require glibc_${PV}.bb
require glibc-initial.inc
-
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-${PV}', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
diff --git a/recipes/glibc/glibc-initial_cvs.bb b/recipes/glibc/glibc-initial_cvs.bb
index 81be5fc..0bfd665 100644
--- a/recipes/glibc/glibc-initial_cvs.bb
+++ b/recipes/glibc/glibc-initial_cvs.bb
@@ -1,4 +1,5 @@
require glibc_${PV}.bb
require glibc-initial.inc
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-cvs', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+# glibc_cvs.bb overrides PV; glibc-cvs won't automatically be in FILESPATHPKG
+FILESPATHPKG =. "glibc-cvs:"
diff --git a/recipes/glibc/glibc_2.3.6.bb b/recipes/glibc/glibc_2.3.6.bb
index ab167da..8d64540 100644
--- a/recipes/glibc/glibc_2.3.6.bb
+++ b/recipes/glibc/glibc_2.3.6.bb
@@ -2,8 +2,6 @@ require glibc.inc
PR = "r5"
-#FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-2.3.6', '${FILE_DIRNAME}/orig/glibc', '${FILE_DIRNAME}/orig/files', '${FILE_DIRNAME}/orig' ], d)}"
-
GLIBC_ADDONS ?= "linuxthreads"
# ${CROSSTOOL_PATCH_URL}glibc-2.3.5-cygwin.patch;patch=1
diff --git a/recipes/glibc/glibc_2.7.bb b/recipes/glibc/glibc_2.7.bb
index 8ae84c1..1a2902d 100644
--- a/recipes/glibc/glibc_2.7.bb
+++ b/recipes/glibc/glibc_2.7.bb
@@ -12,7 +12,7 @@ BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}"
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-2.4', '${FILE_DIRNAME}/glibc-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+FILESPATHPKG =. "glibc-2.4:"
GLIBC_ADDONS ?= "ports,nptl,libidn"
diff --git a/recipes/glibc/glibc_2.9.bb b/recipes/glibc/glibc_2.9.bb
index 7859876..7709d26 100644
--- a/recipes/glibc/glibc_2.9.bb
+++ b/recipes/glibc/glibc_2.9.bb
@@ -12,7 +12,7 @@ BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}"
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-2.4', '${FILE_DIRNAME}/glibc-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+FILESPATHPKG =. "glibc-2.4:"
GLIBC_ADDONS ?= "ports,nptl,libidn"
--
1.5.6.5
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 4/4] uclibc: remove calls to obsolete base_set_filespath()
2009-05-26 6:34 ` [PATCH 3/4] glibc/eglibc: remove calls to obsolete base_set_filespath() Michael Smith
@ 2009-05-26 6:34 ` Michael Smith
2009-05-30 16:42 ` Tom Rini
2009-05-30 16:42 ` [PATCH 3/4] glibc/eglibc: " Tom Rini
1 sibling, 1 reply; 16+ messages in thread
From: Michael Smith @ 2009-05-26 6:34 UTC (permalink / raw)
To: openembedded-devel
Some recipes can use the default FILESPATHPKG, others need to override.
Signed-off-by: Michael Smith <msmith@cbnco.com>
---
All untested.
recipes/uclibc/bfin-uclibc_svn.bb | 2 +-
recipes/uclibc/uclibc-initial_0.9.26.bb | 2 --
recipes/uclibc/uclibc-initial_0.9.27.bb | 2 --
recipes/uclibc/uclibc-initial_0.9.28.bb | 2 --
recipes/uclibc/uclibc-initial_0.9.29.bb | 2 --
recipes/uclibc/uclibc-initial_0.9.30.1.bb | 2 --
recipes/uclibc/uclibc-initial_0.9.30.bb | 2 --
recipes/uclibc/uclibc_nptl.bb | 2 +-
recipes/uclibc/uclibc_svn.bb | 2 +-
9 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/recipes/uclibc/bfin-uclibc_svn.bb b/recipes/uclibc/bfin-uclibc_svn.bb
index 9b438a2..9305245 100644
--- a/recipes/uclibc/bfin-uclibc_svn.bb
+++ b/recipes/uclibc/bfin-uclibc_svn.bb
@@ -25,7 +25,7 @@ KERNEL_SOURCE = "${CROSS_DIR}/${TARGET_SYS}"
SRC_URI = "svn://sources.blackfin.uclinux.org/toolchain/trunk;module=uClibc "
SRC_URI += "file://uClibc.machine file://uClibc.distro"
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-${UCLIBC_BASE}', '${FILE_DIRNAME}/uclibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+FILESPATHPKG =. "uclibc-${UCLIBC_BASE}:uclibc:"
S = "${WORKDIR}/uClibc"
diff --git a/recipes/uclibc/uclibc-initial_0.9.26.bb b/recipes/uclibc/uclibc-initial_0.9.26.bb
index a6a83bd..d36a647 100644
--- a/recipes/uclibc/uclibc-initial_0.9.26.bb
+++ b/recipes/uclibc/uclibc-initial_0.9.26.bb
@@ -1,8 +1,6 @@
SECTION = "base"
require uclibc_${PV}.bb
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-${PV}', '${FILE_DIRNAME}/uclibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
-
DEPENDS = "linux-libc-headers virtual/${TARGET_PREFIX}gcc-initial"
PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
PACKAGES = ""
diff --git a/recipes/uclibc/uclibc-initial_0.9.27.bb b/recipes/uclibc/uclibc-initial_0.9.27.bb
index 3aecd80..f48e81d 100644
--- a/recipes/uclibc/uclibc-initial_0.9.27.bb
+++ b/recipes/uclibc/uclibc-initial_0.9.27.bb
@@ -1,8 +1,6 @@
SECTION = "base"
require uclibc_${PV}.bb
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-${PV}', '${FILE_DIRNAME}/uclibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
-
DEPENDS = "linux-libc-headers virtual/${TARGET_PREFIX}gcc-initial"
PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
PACKAGES = ""
diff --git a/recipes/uclibc/uclibc-initial_0.9.28.bb b/recipes/uclibc/uclibc-initial_0.9.28.bb
index b996f64..dbd90fc 100644
--- a/recipes/uclibc/uclibc-initial_0.9.28.bb
+++ b/recipes/uclibc/uclibc-initial_0.9.28.bb
@@ -1,8 +1,6 @@
SECTION = "base"
require uclibc_${PV}.bb
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-${PV}', '${FILE_DIRNAME}/uclibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
-
DEPENDS = "linux-libc-headers ncurses-native virtual/${TARGET_PREFIX}gcc-initial"
PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
PACKAGES = ""
diff --git a/recipes/uclibc/uclibc-initial_0.9.29.bb b/recipes/uclibc/uclibc-initial_0.9.29.bb
index c56e5fb..98ef7b2 100644
--- a/recipes/uclibc/uclibc-initial_0.9.29.bb
+++ b/recipes/uclibc/uclibc-initial_0.9.29.bb
@@ -1,8 +1,6 @@
SECTION = "base"
require uclibc_${PV}.bb
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-${PV}', '${FILE_DIRNAME}/uclibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
-
DEPENDS = "linux-libc-headers ncurses-native virtual/${TARGET_PREFIX}gcc-initial"
PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
PACKAGES = ""
diff --git a/recipes/uclibc/uclibc-initial_0.9.30.1.bb b/recipes/uclibc/uclibc-initial_0.9.30.1.bb
index c56e5fb..98ef7b2 100644
--- a/recipes/uclibc/uclibc-initial_0.9.30.1.bb
+++ b/recipes/uclibc/uclibc-initial_0.9.30.1.bb
@@ -1,8 +1,6 @@
SECTION = "base"
require uclibc_${PV}.bb
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-${PV}', '${FILE_DIRNAME}/uclibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
-
DEPENDS = "linux-libc-headers ncurses-native virtual/${TARGET_PREFIX}gcc-initial"
PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
PACKAGES = ""
diff --git a/recipes/uclibc/uclibc-initial_0.9.30.bb b/recipes/uclibc/uclibc-initial_0.9.30.bb
index c56e5fb..98ef7b2 100644
--- a/recipes/uclibc/uclibc-initial_0.9.30.bb
+++ b/recipes/uclibc/uclibc-initial_0.9.30.bb
@@ -1,8 +1,6 @@
SECTION = "base"
require uclibc_${PV}.bb
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-${PV}', '${FILE_DIRNAME}/uclibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
-
DEPENDS = "linux-libc-headers ncurses-native virtual/${TARGET_PREFIX}gcc-initial"
PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
PACKAGES = ""
diff --git a/recipes/uclibc/uclibc_nptl.bb b/recipes/uclibc/uclibc_nptl.bb
index 18c88c8..ba46a50 100644
--- a/recipes/uclibc/uclibc_nptl.bb
+++ b/recipes/uclibc/uclibc_nptl.bb
@@ -19,7 +19,7 @@ PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc"
#recent versions uclibc require real kernel headers
PACKAGE_ARCH = "${MACHINE_ARCH}"
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-nptl', '${FILE_DIRNAME}/uclibc-${UCLIBC_BASE}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+FILESPATHPKG =. "uclibc-nptl:uclibc-${UCLIBC_BASE}:"
#as stated above, uclibc needs real kernel-headers
#however: we can't depend on virtual/kernel when nptl hits due to depends deadlocking ....
diff --git a/recipes/uclibc/uclibc_svn.bb b/recipes/uclibc/uclibc_svn.bb
index 127cea7..d3f0973 100644
--- a/recipes/uclibc/uclibc_svn.bb
+++ b/recipes/uclibc/uclibc_svn.bb
@@ -19,7 +19,7 @@ PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc"
#recent versions uclibc require real kernel headers
PACKAGE_ARCH = "${MACHINE_ARCH}"
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-svn', '${FILE_DIRNAME}/uclibc-${UCLIBC_BASE}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+FILESPATHPKG =. "uclibc-svn:uclibc-${UCLIBC_BASE}:"
#as stated above, uclibc needs real kernel-headers
#however: we can't depend on virtual/kernel when nptl hits due to depends deadlocking ....
--
1.5.6.5
^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH 1/4] Remove references to base_set_filespath()from recipes that don't need it.
2009-05-26 6:34 ` [PATCH 1/4] Remove references to base_set_filespath() from recipes that don't need it Michael Smith
2009-05-26 6:34 ` [PATCH 2/4] Replace obsolete base_set_filespath() with FILESPATHPKG in some recipes Michael Smith
@ 2009-05-30 0:48 ` Michael Smith
2009-05-30 5:29 ` Chris Larson
2009-05-30 16:42 ` [PATCH 1/4] Remove references to base_set_filespath() from " Tom Rini
2 siblings, 1 reply; 16+ messages in thread
From: Michael Smith @ 2009-05-30 0:48 UTC (permalink / raw)
To: openembedded-devel
Michael Smith <msmith <at> cbnco.com> writes:
>
> These recipes are covered by the default FILESPATHPKG setting.
>
> Signed-off-by: Michael Smith <msmith <at> cbnco.com>
> ---
ping
(patchbundle here:
http://patchwork.openembedded.org/bundle/msmith%40cbnco.com/nuke_base_set_filespath_usage/ )
Mike
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/4] Remove references to base_set_filespath()from recipes that don't need it.
2009-05-30 0:48 ` [PATCH 1/4] Remove references to base_set_filespath()from recipes that don't need it Michael Smith
@ 2009-05-30 5:29 ` Chris Larson
2009-05-30 17:32 ` Tom Rini
0 siblings, 1 reply; 16+ messages in thread
From: Chris Larson @ 2009-05-30 5:29 UTC (permalink / raw)
To: openembedded-devel; +Cc: openembedded-devel
On Fri, May 29, 2009 at 5:48 PM, Michael Smith <msmith@cbnco.com> wrote:
> Michael Smith <msmith <at> cbnco.com> writes:
>
>>
>> These recipes are covered by the default FILESPATHPKG setting.
>>
>> Signed-off-by: Michael Smith <msmith <at> cbnco.com>
>> ---
>
> ping
>
> (patchbundle here:
> http://patchwork.openembedded.org/bundle/msmith%40cbnco.com/nuke_base_set_filespath_usage/ )
Looks fine to me.
--
Chris Larson
clarson at kergoth dot com
clarson at mvista dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Software Engineer
MontaVista Software, Inc.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/4] Remove references to base_set_filespath() from recipes that don't need it.
2009-05-26 6:34 ` [PATCH 1/4] Remove references to base_set_filespath() from recipes that don't need it Michael Smith
2009-05-26 6:34 ` [PATCH 2/4] Replace obsolete base_set_filespath() with FILESPATHPKG in some recipes Michael Smith
2009-05-30 0:48 ` [PATCH 1/4] Remove references to base_set_filespath()from recipes that don't need it Michael Smith
@ 2009-05-30 16:42 ` Tom Rini
2 siblings, 0 replies; 16+ messages in thread
From: Tom Rini @ 2009-05-30 16:42 UTC (permalink / raw)
To: openembedded-devel
On Tue, May 26, 2009 at 02:34:53AM -0400, Michael Smith wrote:
> These recipes are covered by the default FILESPATHPKG setting.
>
> Signed-off-by: Michael Smith <msmith@cbnco.com>
Acked-by: Tom Rini <trini@embeddedalley.com>
> ---
>
> Of these, the following were build tested:
>
> recipes/db/db3-native_3.2.9.bb | 1 -
> .../e2fsprogs-libs/e2fsprogs-libs-native_1.41.2.bb | 1 -
> recipes/e2fsprogs/e2fsprogs-native_1.41.5.bb | 1 -
> recipes/mysql/mysql_4.1.22.bb | 2 --
> recipes/recode/recode_3.6.bb | 7 ++-----
>
> recipes/e2tools/e2tools-native_0.0.16.bb | 1 -
> (this build was broken before, and is still broken -- seems
> e2fsprogs-native isn't staging the include files for some reason)
>
>
> The rest were not:
>
> .../e2fsprogs-libs/e2fsprogs-libs-native_1.35.bb | 1 -
> recipes/e2fsprogs/e2fsprogs-native_1.38.bb | 1 -
> recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb | 1 -
> recipes/genext2fs/genext2fs-native_1.3.bb | 1 -
> recipes/slugimage/slugimage-native.bb | 2 --
> recipes/slugtool/slugtool-native.bb | 1 -
> .../squashfs-tools/squashfs-tools-native_2.0r2.bb | 2 --
> .../squashfs-tools/squashfs-tools-native_2.2r2.bb | 1 -
> .../squashfs-tools/squashfs-tools-native_3.1r2.bb | 1 -
> .../squashfs-tools/squashfs-tools-native_3.3.bb | 1 -
> .../squashfs-tools/squashfs-tools-native_4.0.bb | 1 -
> 17 files changed, 2 insertions(+), 24 deletions(-)
>
> diff --git a/recipes/db/db3-native_3.2.9.bb b/recipes/db/db3-native_3.2.9.bb
> index 492f740..f16b19f 100644
> --- a/recipes/db/db3-native_3.2.9.bb
> +++ b/recipes/db/db3-native_3.2.9.bb
> @@ -4,5 +4,4 @@ CONFLICTS = "db-native"
> inherit native
> require db3_${PV}.bb
>
> -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/db3-${PV}', '${FILE_DIRNAME}/db3', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
> PACKAGES = ""
> diff --git a/recipes/e2fsprogs-libs/e2fsprogs-libs-native_1.35.bb b/recipes/e2fsprogs-libs/e2fsprogs-libs-native_1.35.bb
> index 9d0afa8..5f94c08 100644
> --- a/recipes/e2fsprogs-libs/e2fsprogs-libs-native_1.35.bb
> +++ b/recipes/e2fsprogs-libs/e2fsprogs-libs-native_1.35.bb
> @@ -2,5 +2,4 @@ SECTION = "base"
> require e2fsprogs-libs_${PV}.bb
> inherit native
>
> -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/e2fsprogs-libs-${PV}', '${FILE_DIRNAME}/e2fsprogs-libs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
> PACKAGES = ""
> diff --git a/recipes/e2fsprogs-libs/e2fsprogs-libs-native_1.41.2.bb b/recipes/e2fsprogs-libs/e2fsprogs-libs-native_1.41.2.bb
> index 3db9e02..2632db4 100644
> --- a/recipes/e2fsprogs-libs/e2fsprogs-libs-native_1.41.2.bb
> +++ b/recipes/e2fsprogs-libs/e2fsprogs-libs-native_1.41.2.bb
> @@ -2,7 +2,6 @@ SECTION = "base"
> require e2fsprogs-libs_${PV}.bb
> inherit native
>
> -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/e2fsprogs-libs-${PV}', '${FILE_DIRNAME}/e2fsprogs-libs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
> PACKAGES = ""
>
> DEPENDS = "gettext-native"
> diff --git a/recipes/e2fsprogs/e2fsprogs-native_1.38.bb b/recipes/e2fsprogs/e2fsprogs-native_1.38.bb
> index af49b0d..13fd2be 100644
> --- a/recipes/e2fsprogs/e2fsprogs-native_1.38.bb
> +++ b/recipes/e2fsprogs/e2fsprogs-native_1.38.bb
> @@ -11,7 +11,6 @@ SRC_URI += "file://no-hardlinks.patch;patch=1 \
>
> EXTRA_OECONF = ""
>
> -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/e2fsprogs-${PV}', '${FILE_DIRNAME}/e2fsprogs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
> PACKAGES = ""
> DEPENDS = ""
>
> diff --git a/recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb b/recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb
> index e79958c..4ff399b 100644
> --- a/recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb
> +++ b/recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb
> @@ -7,7 +7,6 @@ DEFAULT_PREFERENCE = "-1"
>
> EXTRA_OECONF = ""
>
> -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/e2fsprogs-${PV}', '${FILE_DIRNAME}/e2fsprogs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
> PACKAGES = ""
> DEPENDS = ""
>
> diff --git a/recipes/e2fsprogs/e2fsprogs-native_1.41.5.bb b/recipes/e2fsprogs/e2fsprogs-native_1.41.5.bb
> index b29064f..2951363 100644
> --- a/recipes/e2fsprogs/e2fsprogs-native_1.41.5.bb
> +++ b/recipes/e2fsprogs/e2fsprogs-native_1.41.5.bb
> @@ -6,7 +6,6 @@ SRC_URI += "file://mkinstalldirs.patch;patch=1"
>
> EXTRA_OECONF = ""
>
> -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/e2fsprogs-${PV}', '${FILE_DIRNAME}/e2fsprogs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
> PACKAGES = ""
> DEPENDS = ""
>
> diff --git a/recipes/e2tools/e2tools-native_0.0.16.bb b/recipes/e2tools/e2tools-native_0.0.16.bb
> index e37eed2..f23a0b1 100644
> --- a/recipes/e2tools/e2tools-native_0.0.16.bb
> +++ b/recipes/e2tools/e2tools-native_0.0.16.bb
> @@ -3,7 +3,6 @@ require e2tools_${PV}.bb
> inherit native
>
> DEPENDS = "e2fsprogs-libs-native e2fsprogs-native"
> -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/e2tools-${PV}', '${FILE_DIRNAME}/e2tools', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
> PACKAGES = ""
>
> e2links = "e2ln e2ls e2mkdir e2mv e2rm e2tail"
> diff --git a/recipes/genext2fs/genext2fs-native_1.3.bb b/recipes/genext2fs/genext2fs-native_1.3.bb
> index 2e26fa0..50b371b 100644
> --- a/recipes/genext2fs/genext2fs-native_1.3.bb
> +++ b/recipes/genext2fs/genext2fs-native_1.3.bb
> @@ -1,6 +1,5 @@
> require genext2fs_${PV}.bb
> inherit native
> -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/genext2fs-${PV}', '${FILE_DIRNAME}/genext2fs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
>
> do_stage () {
> install -m 0755 genext2fs ${STAGING_BINDIR}/
> diff --git a/recipes/mysql/mysql_4.1.22.bb b/recipes/mysql/mysql_4.1.22.bb
> index 7f32b4d..09c52ec 100644
> --- a/recipes/mysql/mysql_4.1.22.bb
> +++ b/recipes/mysql/mysql_4.1.22.bb
> @@ -14,8 +14,6 @@ SRC_URI = "http://downloads.mysql.com/archives/mysql-4.1/mysql-${PV}.tar.gz \
>
> S = "${WORKDIR}/mysql-${PV}"
>
> -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/mysql-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
> -
> BINCONFIG_GLOB = "mysql_config"
>
> inherit autotools binconfig update-rc.d
> diff --git a/recipes/recode/recode_3.6.bb b/recipes/recode/recode_3.6.bb
> index 6fd60ae..37e3b2a 100644
> --- a/recipes/recode/recode_3.6.bb
> +++ b/recipes/recode/recode_3.6.bb
> @@ -3,11 +3,8 @@ SECTION = "console/utils"
> LICENSE = "GPL"
>
> PR = "r1"
> -SRC_URI = "${GNU_MIRROR}/recode/recode-${PV}.tar.gz"
> -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/recode-${PV}', '${FILE_DIRNAME}' ], d)}"
> -
> -SRC_URI += "file://recode-bitfield-width.patch;patch=1 \
> - "
> +SRC_URI = "${GNU_MIRROR}/recode/recode-${PV}.tar.gz \
> + file://recode-bitfield-width.patch;patch=1"
>
> inherit autotools
>
> diff --git a/recipes/slugimage/slugimage-native.bb b/recipes/slugimage/slugimage-native.bb
> index 8b60ff1..f8408a1 100644
> --- a/recipes/slugimage/slugimage-native.bb
> +++ b/recipes/slugimage/slugimage-native.bb
> @@ -6,8 +6,6 @@ RDEPENDS = ""
>
> inherit native
>
> -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/slugimage-${PV}', '${FILE_DIRNAME}/slugimage', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
> -
> do_stage () {
> install -m 0755 slugimage ${STAGING_BINDIR}/
> }
> diff --git a/recipes/slugtool/slugtool-native.bb b/recipes/slugtool/slugtool-native.bb
> index 2d1fe91..088839c 100644
> --- a/recipes/slugtool/slugtool-native.bb
> +++ b/recipes/slugtool/slugtool-native.bb
> @@ -2,7 +2,6 @@ SECTION = "unknown"
> require slugtool.bb
> inherit native
>
> -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/slugtool-${PV}', '${FILE_DIRNAME}/slugtool', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
> PACKAGES = ""
>
> do_stage () {
> diff --git a/recipes/squashfs-tools/squashfs-tools-native_2.0r2.bb b/recipes/squashfs-tools/squashfs-tools-native_2.0r2.bb
> index 2423e47..9ba5684 100644
> --- a/recipes/squashfs-tools/squashfs-tools-native_2.0r2.bb
> +++ b/recipes/squashfs-tools/squashfs-tools-native_2.0r2.bb
> @@ -1,11 +1,9 @@
> require squashfs-tools_${PV}.bb
>
> DEPENDS = "lzma-native"
> -PN_BASE = "squashfs-tools"
>
> inherit native
>
> -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${PN_BASE}-${PV}', '${FILE_DIRNAME}/${PN_BASE}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
> PACKAGES = ""
>
> do_stage () {
> diff --git a/recipes/squashfs-tools/squashfs-tools-native_2.2r2.bb b/recipes/squashfs-tools/squashfs-tools-native_2.2r2.bb
> index b6ee6e7..9ba5684 100644
> --- a/recipes/squashfs-tools/squashfs-tools-native_2.2r2.bb
> +++ b/recipes/squashfs-tools/squashfs-tools-native_2.2r2.bb
> @@ -4,7 +4,6 @@ DEPENDS = "lzma-native"
>
> inherit native
>
> -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/squashfs-tools-${PV}', '${FILE_DIRNAME}/squashfs-tools', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
> PACKAGES = ""
>
> do_stage () {
> diff --git a/recipes/squashfs-tools/squashfs-tools-native_3.1r2.bb b/recipes/squashfs-tools/squashfs-tools-native_3.1r2.bb
> index c35d183..c171e43 100644
> --- a/recipes/squashfs-tools/squashfs-tools-native_3.1r2.bb
> +++ b/recipes/squashfs-tools/squashfs-tools-native_3.1r2.bb
> @@ -2,7 +2,6 @@ require squashfs-tools_${PV}.bb
>
> inherit native
>
> -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/squashfs-tools-${PV}', '${FILE_DIRNAME}/squashfs-tools', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
> PACKAGES = ""
>
> do_stage () {
> diff --git a/recipes/squashfs-tools/squashfs-tools-native_3.3.bb b/recipes/squashfs-tools/squashfs-tools-native_3.3.bb
> index 87ba761..5858bb1 100644
> --- a/recipes/squashfs-tools/squashfs-tools-native_3.3.bb
> +++ b/recipes/squashfs-tools/squashfs-tools-native_3.3.bb
> @@ -3,7 +3,6 @@ PR = "r0"
>
> inherit native
>
> -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/squashfs-tools-${PV}', '${FILE_DIRNAME}/squashfs-tools', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
> PACKAGES = ""
>
> do_stage () {
> diff --git a/recipes/squashfs-tools/squashfs-tools-native_4.0.bb b/recipes/squashfs-tools/squashfs-tools-native_4.0.bb
> index 87ba761..5858bb1 100644
> --- a/recipes/squashfs-tools/squashfs-tools-native_4.0.bb
> +++ b/recipes/squashfs-tools/squashfs-tools-native_4.0.bb
> @@ -3,7 +3,6 @@ PR = "r0"
>
> inherit native
>
> -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/squashfs-tools-${PV}', '${FILE_DIRNAME}/squashfs-tools', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
> PACKAGES = ""
>
> do_stage () {
> --
> 1.5.6.5
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
--
Tom Rini
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 2/4] Replace obsolete base_set_filespath() with FILESPATHPKG in some recipes.
2009-05-26 6:34 ` [PATCH 2/4] Replace obsolete base_set_filespath() with FILESPATHPKG in some recipes Michael Smith
2009-05-26 6:34 ` [PATCH 3/4] glibc/eglibc: remove calls to obsolete base_set_filespath() Michael Smith
@ 2009-05-30 16:42 ` Tom Rini
1 sibling, 0 replies; 16+ messages in thread
From: Tom Rini @ 2009-05-30 16:42 UTC (permalink / raw)
To: openembedded-devel
On Tue, May 26, 2009 at 02:34:54AM -0400, Michael Smith wrote:
> Signed-off-by: Michael Smith <msmith@cbnco.com>
Acked-by: Tom Rini <trini@embeddedalley.com>
> ---
>
> Of these, the following were build tested:
>
> recipes/cherokee/cherokee-nossl_0.5.3.bb | 2 +-
> .../squashfs-lzma-tools-native_3.1r2.bb | 2 +-
>
>
> The rest were not:
>
> recipes/freesmartphone/frameworkd-devel_git.bb | 2 +-
> recipes/initscripts/initscripts-openprotium_1.0.bb | 2 +-
> recipes/vim/gvim_7.0.bb | 2 +-
> 5 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/recipes/cherokee/cherokee-nossl_0.5.3.bb b/recipes/cherokee/cherokee-nossl_0.5.3.bb
> index 4093660..3ea9068 100644
> --- a/recipes/cherokee/cherokee-nossl_0.5.3.bb
> +++ b/recipes/cherokee/cherokee-nossl_0.5.3.bb
> @@ -2,7 +2,7 @@ require cherokee_${PV}.bb
>
> DEPENDS = "libpcre"
>
> -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/cherokee-${PV}', '${FILE_DIRNAME}/cherokee', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
> +FILESPATHPKG =. "cherokee-${PV}:cherokee:"
>
> S = "${WORKDIR}/cherokee-${PV}"
>
> diff --git a/recipes/freesmartphone/frameworkd-devel_git.bb b/recipes/freesmartphone/frameworkd-devel_git.bb
> index f5f6c0b..a6439ee 100644
> --- a/recipes/freesmartphone/frameworkd-devel_git.bb
> +++ b/recipes/freesmartphone/frameworkd-devel_git.bb
> @@ -1,5 +1,5 @@
> require frameworkd_git.bb
> -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/frameworkd', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
> +FILESPATHPKG =. "frameworkd:"
> PROVIDES = "frameworkd"
> RPROVIDES = "frameworkd"
> PV = "0.8.5.x+gitr${SRCREV}"
> diff --git a/recipes/initscripts/initscripts-openprotium_1.0.bb b/recipes/initscripts/initscripts-openprotium_1.0.bb
> index e787eed..aa20e29 100644
> --- a/recipes/initscripts/initscripts-openprotium_1.0.bb
> +++ b/recipes/initscripts/initscripts-openprotium_1.0.bb
> @@ -13,7 +13,7 @@ RCONFLICTS = "initscripts"
> # a suffix
> PR := "${PR}.11"
>
> -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${P}', '${FILE_DIRNAME}/initscripts-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
> +FILESPATHPKG =. "${P}:initscripts-${PV}:"
>
> PACKAGES = "${PN}-dbg ${PN}"
>
> diff --git a/recipes/squashfs-tools/squashfs-lzma-tools-native_3.1r2.bb b/recipes/squashfs-tools/squashfs-lzma-tools-native_3.1r2.bb
> index 5520896..8261ef5 100644
> --- a/recipes/squashfs-tools/squashfs-lzma-tools-native_3.1r2.bb
> +++ b/recipes/squashfs-tools/squashfs-lzma-tools-native_3.1r2.bb
> @@ -4,7 +4,7 @@ DEPENDS = "lzma-native"
>
> inherit native
>
> -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/squashfs-tools-${PV}', '${FILE_DIRNAME}/squashfs-tools', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
> +FILESPATHPKG =. "squashfs-tools-${PV}:squashfs-tools:"
> PACKAGES = ""
>
> do_stage () {
> diff --git a/recipes/vim/gvim_7.0.bb b/recipes/vim/gvim_7.0.bb
> index 78a0c54..a073e65 100644
> --- a/recipes/vim/gvim_7.0.bb
> +++ b/recipes/vim/gvim_7.0.bb
> @@ -4,7 +4,7 @@ require vim.inc
>
> DEPENDS += "gtk+ xt"
> PR = "r1"
> -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/vim-7.0', '${FILE_DIRNAME}/vim', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
> +FILESPATHPKG =. "vim-${PV}:vim:"
>
> EXTRA_OECONF = "--enable-gui=gtk2 --enable-gtk2-test --disable-gtktest \
> --disable-xim --with-features=big \
> --
> 1.5.6.5
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
--
Tom Rini
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 3/4] glibc/eglibc: remove calls to obsolete base_set_filespath()
2009-05-26 6:34 ` [PATCH 3/4] glibc/eglibc: remove calls to obsolete base_set_filespath() Michael Smith
2009-05-26 6:34 ` [PATCH 4/4] uclibc: " Michael Smith
@ 2009-05-30 16:42 ` Tom Rini
1 sibling, 0 replies; 16+ messages in thread
From: Tom Rini @ 2009-05-30 16:42 UTC (permalink / raw)
To: openembedded-devel
On Tue, May 26, 2009 at 02:34:55AM -0400, Michael Smith wrote:
> Some recipes can use the default FILESPATHPKG, others need to override.
>
> Signed-off-by: Michael Smith <msmith@cbnco.com>
Acked-by: Tom Rini <trini@embeddedalley.com>
> ---
>
> Of these, the following were build tested:
> recipes/glibc/glibc-initial.inc | 2 +-
> (for glibc 2.6.1)
>
> The rest were not.
>
> I think something might be dicey here: glibc-2.4 was being prepended
> to the FILESPATH in many recipes, including glibc-initial.inc (and still
> is -- I just converted it to FILESPATHPKG). It's at the start of the
> path, so for example glibc-2.4/blah.patch would override
> glibc-2.999/blah.patch for glibc-initial_2.999.
>
> So far there are no duplicate files between glibc-2.4 and the higher
> versions, so it hasn't bitten anybody yet.
>
> recipes/glibc/glibc-initial_2.3.2.bb | 1 -
> recipes/glibc/glibc-initial_2.3.6.bb | 2 --
> recipes/glibc/glibc-initial_cvs.bb | 3 ++-
> recipes/glibc/glibc_2.3.6.bb | 2 --
> recipes/glibc/glibc_2.7.bb | 2 +-
> recipes/glibc/glibc_2.9.bb | 2 +-
> 10 files changed, 5 insertions(+), 12 deletions(-)
>
> diff --git a/recipes/eglibc/eglibc-initial.inc b/recipes/eglibc/eglibc-initial.inc
> index 5fbb5db..7a5a7b2 100644
> --- a/recipes/eglibc/eglibc-initial.inc
> +++ b/recipes/eglibc/eglibc-initial.inc
> @@ -1,7 +1,6 @@
> SECTION = "libs"
> DEPENDS = "linux-libc-headers virtual/${TARGET_PREFIX}gcc-initial"
> PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
> -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/eglibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
>
> PACKAGES = ""
> PACKAGES_DYNAMIC = ""
> diff --git a/recipes/glibc/glibc-initial.inc b/recipes/glibc/glibc-initial.inc
> index 5528cf8..cd65924 100644
> --- a/recipes/glibc/glibc-initial.inc
> +++ b/recipes/glibc/glibc-initial.inc
> @@ -1,7 +1,7 @@
> SECTION = "libs"
> DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial linux-libc-headers"
> PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
> -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-2.4', '${FILE_DIRNAME}/glibc-${PV}', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
> +FILESPATHPKG =. "glibc-2.4:"
>
> PACKAGES = ""
> PACKAGES_DYNAMIC = ""
> diff --git a/recipes/glibc/glibc-initial_2.2.5.bb b/recipes/glibc/glibc-initial_2.2.5.bb
> index 84412bd..c7dde23 100644
> --- a/recipes/glibc/glibc-initial_2.2.5.bb
> +++ b/recipes/glibc/glibc-initial_2.2.5.bb
> @@ -2,4 +2,3 @@ require glibc_${PV}.bb
> require glibc-initial.inc
>
> DEFAULT_PREFERENCE_sh3 = "-99"
> -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-${PV}', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
> diff --git a/recipes/glibc/glibc-initial_2.3.2+cvs20040726.bb b/recipes/glibc/glibc-initial_2.3.2+cvs20040726.bb
> index 4d7129b..c7dde23 100644
> --- a/recipes/glibc/glibc-initial_2.3.2+cvs20040726.bb
> +++ b/recipes/glibc/glibc-initial_2.3.2+cvs20040726.bb
> @@ -2,4 +2,3 @@ require glibc_${PV}.bb
> require glibc-initial.inc
>
> DEFAULT_PREFERENCE_sh3 = "-99"
> -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-cvs', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
> diff --git a/recipes/glibc/glibc-initial_2.3.2.bb b/recipes/glibc/glibc-initial_2.3.2.bb
> index 84412bd..c7dde23 100644
> --- a/recipes/glibc/glibc-initial_2.3.2.bb
> +++ b/recipes/glibc/glibc-initial_2.3.2.bb
> @@ -2,4 +2,3 @@ require glibc_${PV}.bb
> require glibc-initial.inc
>
> DEFAULT_PREFERENCE_sh3 = "-99"
> -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-${PV}', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
> diff --git a/recipes/glibc/glibc-initial_2.3.6.bb b/recipes/glibc/glibc-initial_2.3.6.bb
> index 8249cd6..fa7836a 100644
> --- a/recipes/glibc/glibc-initial_2.3.6.bb
> +++ b/recipes/glibc/glibc-initial_2.3.6.bb
> @@ -1,4 +1,2 @@
> require glibc_${PV}.bb
> require glibc-initial.inc
> -
> -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-${PV}', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
> diff --git a/recipes/glibc/glibc-initial_cvs.bb b/recipes/glibc/glibc-initial_cvs.bb
> index 81be5fc..0bfd665 100644
> --- a/recipes/glibc/glibc-initial_cvs.bb
> +++ b/recipes/glibc/glibc-initial_cvs.bb
> @@ -1,4 +1,5 @@
> require glibc_${PV}.bb
> require glibc-initial.inc
>
> -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-cvs', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
> +# glibc_cvs.bb overrides PV; glibc-cvs won't automatically be in FILESPATHPKG
> +FILESPATHPKG =. "glibc-cvs:"
> diff --git a/recipes/glibc/glibc_2.3.6.bb b/recipes/glibc/glibc_2.3.6.bb
> index ab167da..8d64540 100644
> --- a/recipes/glibc/glibc_2.3.6.bb
> +++ b/recipes/glibc/glibc_2.3.6.bb
> @@ -2,8 +2,6 @@ require glibc.inc
>
> PR = "r5"
>
> -#FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-2.3.6', '${FILE_DIRNAME}/orig/glibc', '${FILE_DIRNAME}/orig/files', '${FILE_DIRNAME}/orig' ], d)}"
> -
> GLIBC_ADDONS ?= "linuxthreads"
>
> # ${CROSSTOOL_PATCH_URL}glibc-2.3.5-cygwin.patch;patch=1
> diff --git a/recipes/glibc/glibc_2.7.bb b/recipes/glibc/glibc_2.7.bb
> index 8ae84c1..1a2902d 100644
> --- a/recipes/glibc/glibc_2.7.bb
> +++ b/recipes/glibc/glibc_2.7.bb
> @@ -12,7 +12,7 @@ BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
> TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}"
>
>
> -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-2.4', '${FILE_DIRNAME}/glibc-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
> +FILESPATHPKG =. "glibc-2.4:"
>
> GLIBC_ADDONS ?= "ports,nptl,libidn"
>
> diff --git a/recipes/glibc/glibc_2.9.bb b/recipes/glibc/glibc_2.9.bb
> index 7859876..7709d26 100644
> --- a/recipes/glibc/glibc_2.9.bb
> +++ b/recipes/glibc/glibc_2.9.bb
> @@ -12,7 +12,7 @@ BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
> TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}"
>
>
> -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-2.4', '${FILE_DIRNAME}/glibc-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
> +FILESPATHPKG =. "glibc-2.4:"
>
> GLIBC_ADDONS ?= "ports,nptl,libidn"
>
> --
> 1.5.6.5
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
--
Tom Rini
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 4/4] uclibc: remove calls to obsolete base_set_filespath()
2009-05-26 6:34 ` [PATCH 4/4] uclibc: " Michael Smith
@ 2009-05-30 16:42 ` Tom Rini
0 siblings, 0 replies; 16+ messages in thread
From: Tom Rini @ 2009-05-30 16:42 UTC (permalink / raw)
To: openembedded-devel
On Tue, May 26, 2009 at 02:34:56AM -0400, Michael Smith wrote:
> Some recipes can use the default FILESPATHPKG, others need to override.
>
> Signed-off-by: Michael Smith <msmith@cbnco.com>
Acked-by: Tom Rini <trini@embeddedalley.com>
> ---
>
> All untested.
>
> recipes/uclibc/bfin-uclibc_svn.bb | 2 +-
> recipes/uclibc/uclibc-initial_0.9.26.bb | 2 --
> recipes/uclibc/uclibc-initial_0.9.27.bb | 2 --
> recipes/uclibc/uclibc-initial_0.9.28.bb | 2 --
> recipes/uclibc/uclibc-initial_0.9.29.bb | 2 --
> recipes/uclibc/uclibc-initial_0.9.30.1.bb | 2 --
> recipes/uclibc/uclibc-initial_0.9.30.bb | 2 --
> recipes/uclibc/uclibc_nptl.bb | 2 +-
> recipes/uclibc/uclibc_svn.bb | 2 +-
> 9 files changed, 3 insertions(+), 15 deletions(-)
>
> diff --git a/recipes/uclibc/bfin-uclibc_svn.bb b/recipes/uclibc/bfin-uclibc_svn.bb
> index 9b438a2..9305245 100644
> --- a/recipes/uclibc/bfin-uclibc_svn.bb
> +++ b/recipes/uclibc/bfin-uclibc_svn.bb
> @@ -25,7 +25,7 @@ KERNEL_SOURCE = "${CROSS_DIR}/${TARGET_SYS}"
> SRC_URI = "svn://sources.blackfin.uclinux.org/toolchain/trunk;module=uClibc "
> SRC_URI += "file://uClibc.machine file://uClibc.distro"
>
> -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-${UCLIBC_BASE}', '${FILE_DIRNAME}/uclibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
> +FILESPATHPKG =. "uclibc-${UCLIBC_BASE}:uclibc:"
>
>
> S = "${WORKDIR}/uClibc"
> diff --git a/recipes/uclibc/uclibc-initial_0.9.26.bb b/recipes/uclibc/uclibc-initial_0.9.26.bb
> index a6a83bd..d36a647 100644
> --- a/recipes/uclibc/uclibc-initial_0.9.26.bb
> +++ b/recipes/uclibc/uclibc-initial_0.9.26.bb
> @@ -1,8 +1,6 @@
> SECTION = "base"
> require uclibc_${PV}.bb
>
> -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-${PV}', '${FILE_DIRNAME}/uclibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
> -
> DEPENDS = "linux-libc-headers virtual/${TARGET_PREFIX}gcc-initial"
> PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
> PACKAGES = ""
> diff --git a/recipes/uclibc/uclibc-initial_0.9.27.bb b/recipes/uclibc/uclibc-initial_0.9.27.bb
> index 3aecd80..f48e81d 100644
> --- a/recipes/uclibc/uclibc-initial_0.9.27.bb
> +++ b/recipes/uclibc/uclibc-initial_0.9.27.bb
> @@ -1,8 +1,6 @@
> SECTION = "base"
> require uclibc_${PV}.bb
>
> -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-${PV}', '${FILE_DIRNAME}/uclibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
> -
> DEPENDS = "linux-libc-headers virtual/${TARGET_PREFIX}gcc-initial"
> PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
> PACKAGES = ""
> diff --git a/recipes/uclibc/uclibc-initial_0.9.28.bb b/recipes/uclibc/uclibc-initial_0.9.28.bb
> index b996f64..dbd90fc 100644
> --- a/recipes/uclibc/uclibc-initial_0.9.28.bb
> +++ b/recipes/uclibc/uclibc-initial_0.9.28.bb
> @@ -1,8 +1,6 @@
> SECTION = "base"
> require uclibc_${PV}.bb
>
> -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-${PV}', '${FILE_DIRNAME}/uclibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
> -
> DEPENDS = "linux-libc-headers ncurses-native virtual/${TARGET_PREFIX}gcc-initial"
> PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
> PACKAGES = ""
> diff --git a/recipes/uclibc/uclibc-initial_0.9.29.bb b/recipes/uclibc/uclibc-initial_0.9.29.bb
> index c56e5fb..98ef7b2 100644
> --- a/recipes/uclibc/uclibc-initial_0.9.29.bb
> +++ b/recipes/uclibc/uclibc-initial_0.9.29.bb
> @@ -1,8 +1,6 @@
> SECTION = "base"
> require uclibc_${PV}.bb
>
> -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-${PV}', '${FILE_DIRNAME}/uclibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
> -
> DEPENDS = "linux-libc-headers ncurses-native virtual/${TARGET_PREFIX}gcc-initial"
> PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
> PACKAGES = ""
> diff --git a/recipes/uclibc/uclibc-initial_0.9.30.1.bb b/recipes/uclibc/uclibc-initial_0.9.30.1.bb
> index c56e5fb..98ef7b2 100644
> --- a/recipes/uclibc/uclibc-initial_0.9.30.1.bb
> +++ b/recipes/uclibc/uclibc-initial_0.9.30.1.bb
> @@ -1,8 +1,6 @@
> SECTION = "base"
> require uclibc_${PV}.bb
>
> -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-${PV}', '${FILE_DIRNAME}/uclibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
> -
> DEPENDS = "linux-libc-headers ncurses-native virtual/${TARGET_PREFIX}gcc-initial"
> PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
> PACKAGES = ""
> diff --git a/recipes/uclibc/uclibc-initial_0.9.30.bb b/recipes/uclibc/uclibc-initial_0.9.30.bb
> index c56e5fb..98ef7b2 100644
> --- a/recipes/uclibc/uclibc-initial_0.9.30.bb
> +++ b/recipes/uclibc/uclibc-initial_0.9.30.bb
> @@ -1,8 +1,6 @@
> SECTION = "base"
> require uclibc_${PV}.bb
>
> -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-${PV}', '${FILE_DIRNAME}/uclibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
> -
> DEPENDS = "linux-libc-headers ncurses-native virtual/${TARGET_PREFIX}gcc-initial"
> PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
> PACKAGES = ""
> diff --git a/recipes/uclibc/uclibc_nptl.bb b/recipes/uclibc/uclibc_nptl.bb
> index 18c88c8..ba46a50 100644
> --- a/recipes/uclibc/uclibc_nptl.bb
> +++ b/recipes/uclibc/uclibc_nptl.bb
> @@ -19,7 +19,7 @@ PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc"
>
> #recent versions uclibc require real kernel headers
> PACKAGE_ARCH = "${MACHINE_ARCH}"
> -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-nptl', '${FILE_DIRNAME}/uclibc-${UCLIBC_BASE}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
> +FILESPATHPKG =. "uclibc-nptl:uclibc-${UCLIBC_BASE}:"
>
> #as stated above, uclibc needs real kernel-headers
> #however: we can't depend on virtual/kernel when nptl hits due to depends deadlocking ....
> diff --git a/recipes/uclibc/uclibc_svn.bb b/recipes/uclibc/uclibc_svn.bb
> index 127cea7..d3f0973 100644
> --- a/recipes/uclibc/uclibc_svn.bb
> +++ b/recipes/uclibc/uclibc_svn.bb
> @@ -19,7 +19,7 @@ PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc"
>
> #recent versions uclibc require real kernel headers
> PACKAGE_ARCH = "${MACHINE_ARCH}"
> -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-svn', '${FILE_DIRNAME}/uclibc-${UCLIBC_BASE}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
> +FILESPATHPKG =. "uclibc-svn:uclibc-${UCLIBC_BASE}:"
>
> #as stated above, uclibc needs real kernel-headers
> #however: we can't depend on virtual/kernel when nptl hits due to depends deadlocking ....
> --
> 1.5.6.5
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
--
Tom Rini
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/4] Remove references to base_set_filespath()from recipes that don't need it.
2009-05-30 5:29 ` Chris Larson
@ 2009-05-30 17:32 ` Tom Rini
0 siblings, 0 replies; 16+ messages in thread
From: Tom Rini @ 2009-05-30 17:32 UTC (permalink / raw)
To: openembedded-devel
On Fri, May 29, 2009 at 10:29:56PM -0700, Chris Larson wrote:
> On Fri, May 29, 2009 at 5:48 PM, Michael Smith <msmith@cbnco.com> wrote:
> > Michael Smith <msmith <at> cbnco.com> writes:
> >
> >>
> >> These recipes are covered by the default FILESPATHPKG setting.
> >>
> >> Signed-off-by: Michael Smith <msmith <at> cbnco.com>
> >> ---
> >
> > ping
> >
> > (patchbundle here:
> > http://patchwork.openembedded.org/bundle/msmith%40cbnco.com/nuke_base_set_filespath_usage/ )
>
> Looks fine to me.
I've ack'd them all too, pushed.
--
Tom Rini
^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2009-05-30 17:41 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-05-22 18:20 amend-recipes.inc Christopher Larson
2009-05-22 20:35 ` amend-recipes.inc Michael Smith
2009-05-22 20:50 ` amend-recipes.inc Christopher Larson
2009-05-22 21:32 ` amend-recipes.inc Michael Smith
2009-05-26 6:28 ` amend-recipes.inc Michael Smith
2009-05-26 6:34 ` [PATCH 1/4] Remove references to base_set_filespath() from recipes that don't need it Michael Smith
2009-05-26 6:34 ` [PATCH 2/4] Replace obsolete base_set_filespath() with FILESPATHPKG in some recipes Michael Smith
2009-05-26 6:34 ` [PATCH 3/4] glibc/eglibc: remove calls to obsolete base_set_filespath() Michael Smith
2009-05-26 6:34 ` [PATCH 4/4] uclibc: " Michael Smith
2009-05-30 16:42 ` Tom Rini
2009-05-30 16:42 ` [PATCH 3/4] glibc/eglibc: " Tom Rini
2009-05-30 16:42 ` [PATCH 2/4] Replace obsolete base_set_filespath() with FILESPATHPKG in some recipes Tom Rini
2009-05-30 0:48 ` [PATCH 1/4] Remove references to base_set_filespath()from recipes that don't need it Michael Smith
2009-05-30 5:29 ` Chris Larson
2009-05-30 17:32 ` Tom Rini
2009-05-30 16:42 ` [PATCH 1/4] Remove references to base_set_filespath() from " Tom Rini
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.