Skip to contentSkip to conversation

amend-recipes.inc

PATCH In review Christopher Larson 4 participants 16 messages May 22, 2009 – May 30, 2009

lore
Share & tools
lore
#0 lore raw

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)
}
Signature · 5 lines
Chris Larson
Software Engineer
MontaVista Software, Inc.
Email: clarson AT mvista DOT com
Email: clarson AT kergoth DOT com
#1 lore raw

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

Quoted 8 lines · Christopher Larson

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)
}

#2 lore raw

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.

Quoted 34 lines · Michael Smith

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

Quoted 7 lines · Christopher Larson

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
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Signature · 7 lines
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
#3 lore raw
Quoted 1 line · Christopher Larson

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

#4 lore raw
In reply to Christopher Larson
Quoted 2 lines · Christopher Larson

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

#5 lore raw

PATCH 1/4 Remove references to base_set_filespath() from recipes that don't need it.

These recipes are covered by the default FILESPATHPKG setting.

---

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(-)
recipes/db/db3-native_3.2.9.bb +0 -1
index 492f740..f16b19f 100644
@@ -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 = ""
recipes/e2fsprogs-libs/e2fsprogs-libs-native_1.35.bb +0 -1
index 9d0afa8..5f94c08 100644
@@ -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 = ""
recipes/e2fsprogs-libs/e2fsprogs-libs-native_1.41.2.bb +0 -1
index 3db9e02..2632db4 100644
@@ -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"
recipes/e2fsprogs/e2fsprogs-native_1.38.bb +0 -1
index af49b0d..13fd2be 100644
@@ -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 = ""
 
recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb +0 -1
index e79958c..4ff399b 100644
@@ -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 = ""
 
recipes/e2fsprogs/e2fsprogs-native_1.41.5.bb +0 -1
index b29064f..2951363 100644
@@ -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 = ""
 
recipes/e2tools/e2tools-native_0.0.16.bb +0 -1
index e37eed2..f23a0b1 100644
@@ -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"
recipes/genext2fs/genext2fs-native_1.3.bb +0 -1
index 2e26fa0..50b371b 100644
@@ -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}/
recipes/mysql/mysql_4.1.22.bb +0 -2
index 7f32b4d..09c52ec 100644
@@ -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
recipes/recode/recode_3.6.bb +2 -5
index 6fd60ae..37e3b2a 100644
@@ -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
 
recipes/slugimage/slugimage-native.bb +0 -2
index 8b60ff1..f8408a1 100644
@@ -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}/
 }
recipes/slugtool/slugtool-native.bb +0 -1
index 2d1fe91..088839c 100644
@@ -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 () {
recipes/squashfs-tools/squashfs-tools-native_2.0r2.bb +0 -2
index 2423e47..9ba5684 100644
@@ -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 () {
recipes/squashfs-tools/squashfs-tools-native_2.2r2.bb +0 -1
index b6ee6e7..9ba5684 100644
@@ -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 () {
recipes/squashfs-tools/squashfs-tools-native_3.1r2.bb +0 -1
index c35d183..c171e43 100644
@@ -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 () {
recipes/squashfs-tools/squashfs-tools-native_3.3.bb +0 -1
index 87ba761..5858bb1 100644
@@ -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 () {
recipes/squashfs-tools/squashfs-tools-native_4.0.bb +0 -1
index 87ba761..5858bb1 100644
@@ -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 () {
Signature · 1 line
1.5.6.5
#6 lore raw

PATCH 2/4 Replace obsolete base_set_filespath() with FILESPATHPKG in some recipes.

---

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(-)
recipes/cherokee/cherokee-nossl_0.5.3.bb +1 -1
index 4093660..3ea9068 100644
@@ -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}"
 
recipes/freesmartphone/frameworkd-devel_git.bb +1 -1
index f5f6c0b..a6439ee 100644
@@ -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}"
recipes/initscripts/initscripts-openprotium_1.0.bb +1 -1
index e787eed..aa20e29 100644
@@ -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}"
 
recipes/squashfs-tools/squashfs-lzma-tools-native_3.1r2.bb +1 -1
index 5520896..8261ef5 100644
@@ -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 () {
recipes/vim/gvim_7.0.bb +1 -1
index 78a0c54..a073e65 100644
@@ -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 \
Signature · 1 line
1.5.6.5
#7 lore raw

PATCH 3/4 glibc/eglibc: remove calls to obsolete base_set_filespath()

Some recipes can use the default FILESPATHPKG, others need to override.

---

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(-)
recipes/eglibc/eglibc-initial.inc +0 -1
index 5fbb5db..7a5a7b2 100644
@@ -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 = ""
recipes/glibc/glibc-initial.inc +1 -1
index 5528cf8..cd65924 100644
@@ -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 = ""
recipes/glibc/glibc-initial_2.2.5.bb +0 -1
index 84412bd..c7dde23 100644
@@ -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)}"
recipes/glibc/glibc-initial_2.3.2+cvs20040726.bb +0 -1
index 4d7129b..c7dde23 100644
@@ -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)}"
recipes/glibc/glibc-initial_2.3.2.bb +0 -1
index 84412bd..c7dde23 100644
@@ -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)}"
recipes/glibc/glibc-initial_2.3.6.bb +0 -2
index 8249cd6..fa7836a 100644
@@ -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)}"
recipes/glibc/glibc-initial_cvs.bb +2 -1
index 81be5fc..0bfd665 100644
@@ -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:"
recipes/glibc/glibc_2.3.6.bb +0 -2
index ab167da..8d64540 100644
@@ -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
recipes/glibc/glibc_2.7.bb +1 -1
index 8ae84c1..1a2902d 100644
@@ -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"
 
recipes/glibc/glibc_2.9.bb +1 -1
index 7859876..7709d26 100644
@@ -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"
 
Signature · 1 line
1.5.6.5
#8 lore raw

PATCH 4/4 uclibc: remove calls to obsolete base_set_filespath()

Some recipes can use the default FILESPATHPKG, others need to override.

---

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(-)
recipes/uclibc/bfin-uclibc_svn.bb +1 -1
index 9b438a2..9305245 100644
@@ -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"
recipes/uclibc/uclibc-initial_0.9.26.bb +0 -2
index a6a83bd..d36a647 100644
@@ -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 = ""
recipes/uclibc/uclibc-initial_0.9.27.bb +0 -2
index 3aecd80..f48e81d 100644
@@ -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 = ""
recipes/uclibc/uclibc-initial_0.9.28.bb +0 -2
index b996f64..dbd90fc 100644
@@ -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 = ""
recipes/uclibc/uclibc-initial_0.9.29.bb +0 -2
index c56e5fb..98ef7b2 100644
@@ -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 = ""
recipes/uclibc/uclibc-initial_0.9.30.1.bb +0 -2
index c56e5fb..98ef7b2 100644
@@ -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 = ""
recipes/uclibc/uclibc-initial_0.9.30.bb +0 -2
index c56e5fb..98ef7b2 100644
@@ -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 = ""
recipes/uclibc/uclibc_nptl.bb +1 -1
index 18c88c8..ba46a50 100644
@@ -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 ....
recipes/uclibc/uclibc_svn.bb +1 -1
index 127cea7..d3f0973 100644
@@ -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 ....
Signature · 1 line
1.5.6.5
Acked-by on v1 4/4
#9 lore raw

Re: [PATCH 4/4] uclibc: remove calls to obsolete base_set_filespath()

Quoted 3 lines · Michael Smith

Some recipes can use the default FILESPATHPKG, others need to override.

Quoted 141 lines

---

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(-)
recipes/uclibc/bfin-uclibc_svn.bb +1 -1
index 9b438a2..9305245 100644
@@ -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"
recipes/uclibc/uclibc-initial_0.9.26.bb +0 -2
index a6a83bd..d36a647 100644
@@ -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 = ""
recipes/uclibc/uclibc-initial_0.9.27.bb +0 -2
index 3aecd80..f48e81d 100644
@@ -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 = ""
recipes/uclibc/uclibc-initial_0.9.28.bb +0 -2
index b996f64..dbd90fc 100644
@@ -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 = ""
recipes/uclibc/uclibc-initial_0.9.29.bb +0 -2
index c56e5fb..98ef7b2 100644
@@ -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 = ""
recipes/uclibc/uclibc-initial_0.9.30.1.bb +0 -2
index c56e5fb..98ef7b2 100644
@@ -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 = ""
recipes/uclibc/uclibc-initial_0.9.30.bb +0 -2
index c56e5fb..98ef7b2 100644
@@ -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 = ""
recipes/uclibc/uclibc_nptl.bb +1 -1
index 18c88c8..ba46a50 100644
@@ -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 ....
recipes/uclibc/uclibc_svn.bb +1 -1
index 127cea7..d3f0973 100644
@@ -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 ....
Signature · 7 lines
1.5.6.5


_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Signature · 1 line
Tom Rini
Acked-by on v1 3/4
#10 lore raw

Re: [PATCH 3/4] glibc/eglibc: remove calls to obsolete base_set_filespath()

In reply to Michael Smith
Quoted 3 lines · Michael Smith

Some recipes can use the default FILESPATHPKG, others need to override.

Quoted 145 lines

---

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(-)
recipes/eglibc/eglibc-initial.inc +0 -1
index 5fbb5db..7a5a7b2 100644
@@ -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 = ""
recipes/glibc/glibc-initial.inc +1 -1
index 5528cf8..cd65924 100644
@@ -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 = ""
recipes/glibc/glibc-initial_2.2.5.bb +0 -1
index 84412bd..c7dde23 100644
@@ -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)}"
recipes/glibc/glibc-initial_2.3.2+cvs20040726.bb +0 -1
index 4d7129b..c7dde23 100644
@@ -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)}"
recipes/glibc/glibc-initial_2.3.2.bb +0 -1
index 84412bd..c7dde23 100644
@@ -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)}"
recipes/glibc/glibc-initial_2.3.6.bb +0 -2
index 8249cd6..fa7836a 100644
@@ -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)}"
recipes/glibc/glibc-initial_cvs.bb +2 -1
index 81be5fc..0bfd665 100644
@@ -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:"
recipes/glibc/glibc_2.3.6.bb +0 -2
index ab167da..8d64540 100644
@@ -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
recipes/glibc/glibc_2.7.bb +1 -1
index 8ae84c1..1a2902d 100644
@@ -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"
 
recipes/glibc/glibc_2.9.bb +1 -1
index 7859876..7709d26 100644
@@ -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"
 
Signature · 7 lines
1.5.6.5


_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Signature · 1 line
Tom Rini
Acked-by on v1 2/4
#11 lore raw

Re: [PATCH 2/4] Replace obsolete base_set_filespath() with FILESPATHPKG in some recipes.

In reply to Michael Smith
Quoted 1 line · Michael Smith
Quoted 87 lines

---

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(-)
recipes/cherokee/cherokee-nossl_0.5.3.bb +1 -1
index 4093660..3ea9068 100644
@@ -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}"
 
recipes/freesmartphone/frameworkd-devel_git.bb +1 -1
index f5f6c0b..a6439ee 100644
@@ -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}"
recipes/initscripts/initscripts-openprotium_1.0.bb +1 -1
index e787eed..aa20e29 100644
@@ -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}"
 
recipes/squashfs-tools/squashfs-lzma-tools-native_3.1r2.bb +1 -1
index 5520896..8261ef5 100644
@@ -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 () {
recipes/vim/gvim_7.0.bb +1 -1
index 78a0c54..a073e65 100644
@@ -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 \
Signature · 7 lines
1.5.6.5


_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Signature · 1 line
Tom Rini
#13 lore raw

Re: [PATCH 1/4] Remove references to base_set_filespath()from recipes that don't need it.

Quoted 5 lines · Michael Smith
Quoted 3 lines · Michael Smith <msmith <at> cbnco.com> writes:

These recipes are covered by the default FILESPATHPKG setting.

Quoted 7 lines
Quoted 2 lines
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.

Signature · 7 lines
Chris Larson
clarson at kergoth dot com
clarson at mvista dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Software Engineer
MontaVista Software, Inc.
#14 lore raw

Re: [PATCH 1/4] Remove references to base_set_filespath()from recipes that don't need it.

Quoted 9 lines · Chris Larson
Quoted 8 lines · Michael Smith
Quoted 5 lines · 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>

---

Quoted 6 lines
Quoted 4 lines

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.

Signature · 1 line
Tom Rini
Acked-by on v1 1/4
#15 lore raw

Re: [PATCH 1/4] Remove references to base_set_filespath() from recipes that don't need it.

In reply to Michael Smith
Quoted 3 lines · Michael Smith

These recipes are covered by the default FILESPATHPKG setting.

Quoted 250 lines

---

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(-)
recipes/db/db3-native_3.2.9.bb +0 -1
index 492f740..f16b19f 100644
@@ -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 = ""
recipes/e2fsprogs-libs/e2fsprogs-libs-native_1.35.bb +0 -1
index 9d0afa8..5f94c08 100644
@@ -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 = ""
recipes/e2fsprogs-libs/e2fsprogs-libs-native_1.41.2.bb +0 -1
index 3db9e02..2632db4 100644
@@ -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"
recipes/e2fsprogs/e2fsprogs-native_1.38.bb +0 -1
index af49b0d..13fd2be 100644
@@ -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 = ""
 
recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb +0 -1
index e79958c..4ff399b 100644
@@ -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 = ""
 
recipes/e2fsprogs/e2fsprogs-native_1.41.5.bb +0 -1
index b29064f..2951363 100644
@@ -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 = ""
 
recipes/e2tools/e2tools-native_0.0.16.bb +0 -1
index e37eed2..f23a0b1 100644
@@ -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"
recipes/genext2fs/genext2fs-native_1.3.bb +0 -1
index 2e26fa0..50b371b 100644
@@ -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}/
recipes/mysql/mysql_4.1.22.bb +0 -2
index 7f32b4d..09c52ec 100644
@@ -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
recipes/recode/recode_3.6.bb +2 -5
index 6fd60ae..37e3b2a 100644
@@ -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
 
recipes/slugimage/slugimage-native.bb +0 -2
index 8b60ff1..f8408a1 100644
@@ -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}/
 }
recipes/slugtool/slugtool-native.bb +0 -1
index 2d1fe91..088839c 100644
@@ -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 () {
recipes/squashfs-tools/squashfs-tools-native_2.0r2.bb +0 -2
index 2423e47..9ba5684 100644
@@ -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 () {
recipes/squashfs-tools/squashfs-tools-native_2.2r2.bb +0 -1
index b6ee6e7..9ba5684 100644
@@ -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 () {
recipes/squashfs-tools/squashfs-tools-native_3.1r2.bb +0 -1
index c35d183..c171e43 100644
@@ -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 () {
recipes/squashfs-tools/squashfs-tools-native_3.3.bb +0 -1
index 87ba761..5858bb1 100644
@@ -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 () {
recipes/squashfs-tools/squashfs-tools-native_4.0.bb +0 -1
index 87ba761..5858bb1 100644
@@ -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 () {
Signature · 7 lines
1.5.6.5


_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Signature · 1 line
Tom Rini