Re: [OE-core] [CONSOLIDATED PULL 4/4] multiple recipes converted to -staticdev packages
On Fri, 2011-06-10 at 10:25 +0100, Phil Blundell wrote: This can't be right. I guess that would be a good thing for recipe-sanity to test for in fact. ... except that this wouldn't have helped because oe-core doesn't currently have recipe_sanity at all. Heh. I'll send a patch for that later, and then maybe we can add the bogus DEPENDS checking as a future enhancement. p. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [CONSOLIDATED PULL 4/4] multiple recipes converted to -staticdev packages
On 06/10/2011 02:25 AM, Phil Blundell wrote:
On Thu, 2011-06-09 at 23:26 -0700, Saul Wold wrote:
+DEPENDS_libpci-staticdev = libpci-dev (= ${EXTENDPKGV})
This can't be right. I guess that would be a good thing for
recipe-sanity to test for in fact.
It's not, I did not catch the cut and paste error on the RDEPENDS vs
DEPENDS.
+FILES_eglibc-dev_append += ${bindir}/rpcgen ${base_libdir}/*.o
${datadir}/aclocal
+FILES_eglibc-staticdev_append += ${libdir}/*.a ${base_libdir}/*.a
You need to make sure that libc_nonshared.a goes into -dev rather than
-staticdev somehow. I didn't immediately spot any mechanism which would
do this, though I haven't tested the package to find out what happens.
+FILES_uclibc-staticdev_append = \
+${libdir}/*_nonshared.a \
+${libdir}/lib*.a \
In similar vein, this doesn't look right.
I think I should be able to remove nonshared from a list.
diff --git a/meta/recipes-core/util-linux/util-linux.inc
b/meta/recipes-core/util-linux/util-linux.inc
index b77266a..ed4bcdb 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -13,6 +13,8 @@ LIC_FILES_CHKSUM =
file://README.licensing;md5=9c920d811858a74b67a36ba23cbaa95f
file://licenses/COPYING.UCB;md5=263860f8968d8bafa5392cab74285262 \
file://getopt/COPYING;md5=8ca43cbc842c2336e835926c2166c28b
+INC_PR = r0
+
diff --git a/meta/recipes-core/util-linux/util-linux_2.19.1.bb
b/meta/recipes-core/util-linux/util-linux_2.19.1.bb
index 132f28b..3c5747c 100644
--- a/meta/recipes-core/util-linux/util-linux_2.19.1.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.19.1.bb
@@ -1,5 +1,5 @@
MAJOR_VERSION = 2.19
-PR = r1
+PR = ${INC_PR}.0
This looks like it will cause PR to go backwards.
require util-linux.inc
# note that `lscpu' is under GPLv3+
diff --git a/meta/recipes-devtools/binutils/binutils.inc
b/meta/recipes-devtools/binutils/binutils.inc
index 08c14b2..82d9511 100644
--- a/meta/recipes-devtools/binutils/binutils.inc
+++ b/meta/recipes-devtools/binutils/binutils.inc
@@ -24,7 +24,6 @@ FILES_${PN} = \
FILES_${PN}-dev = \
${includedir} \
- ${libdir}/*.a \
${libdir}/*.la \
${libdir}/libbfd.so \
${libdir}/libopcodes.so
This one is a bit odd: it seems to just be dropping the .a files
altogether without introducing a -staticdev package for them.
I thought that maybe the default rule provided in bitbake.conf should
accomplish this since it is FILES_${PN}-staticdev = ${libdir}/*.a
${base_libdir}/*.a
+DEPENDS_libg2c-staticdev = libg2c-dev (= ${EXTENDPKGV})
+DEPENDS_libstdc++-staticdev = libstdc++-dev (= ${EXTENDPKGV})
+DEPENDS_libssp-staticdev = libssp-dev (= ${EXTENDPKGV})
+DEPENDS_libfortran-staticdev = libfortran-dev (= ${EXTENDPKGV})
+DEPENDS_libmudflap-staticdev = libmudflap-dev (= ${EXTENDPKGV})
+DEPENDS_libopkg${PKGSUFFIX}-staticdev = libopkg${PKGSUFFIX}-dev (=
${EXTENDPKGV})
Those all look wrong.
Cut and paste issue
--- a/meta/recipes-multimedia/liba52/liba52_0.7.4.bb
+++ b/meta/recipes-multimedia/liba52/liba52_0.7.4.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM =
file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
file://include/a52.h;beginline=1;endline=12;md5=81152ceb3562bf20a60d1b6018175dd1
SECTION = libs
PRIORITY = optional
-PR = r2
+PR = r3
inherit autotools
@@ -21,7 +21,8 @@ EXTRA_OECONF = --enable-shared
PACKAGES =+ a52dec a52dec-dbg a52dec-doc
FILES_${PN} = ${libdir}/liba52.so.0 ${libdir}/liba52.so.0.0.0
-FILES_${PN}-dev = ${includedir}/a52dec/*.h ${libdir}/liba52.so
${libdir}/liba52.la ${libdir}/liba52.a
+#FILES_${PN}-dev = ${includedir}/a52dec/*.h ${libdir}/liba52.so
${libdir}/liba52.la
+#FILES_${PN}-staticdev = ${libdir}/liba52.a
This is a bit weird. What's going on here?
As above, trying to ensure that the default bitbake.conf rules would work.
+DEPENDS_lib${PN}-staticdev = lib${PN}-dev (= ${EXTENDPKGV})
As above.
+DEPENDS_lib${PN}-staticdev = lib${PN}-dev (= ${EXTENDPKGV})
Ditto.
All in all I think this patch needs a bit more work. It was quite a big
diff so I only skimmed it rather than reviewing it thoroughly but I
don't think it is quite ready to go in yet. Also, can't a lot of this
be done in bitbake.conf without quite so much recipe patching?
Most of it is done there, I was looking at adding a staticdev.bbclass
that would handle the lib${PN} case generically, as a second phase of this.
p.
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [CONSOLIDATED PULL 4/4] multiple recipes converted to -staticdev packages
On Fri, 2011-06-10 at 11:36 -0700, Saul Wold wrote:
+FILES_eglibc-dev_append += ${bindir}/rpcgen ${base_libdir}/*.o
${datadir}/aclocal
+FILES_eglibc-staticdev_append += ${libdir}/*.a ${base_libdir}/*.a
You need to make sure that libc_nonshared.a goes into -dev rather than
-staticdev somehow. I didn't immediately spot any mechanism which would
do this, though I haven't tested the package to find out what happens.
+FILES_uclibc-staticdev_append = \
+${libdir}/*_nonshared.a \
+${libdir}/lib*.a \
In similar vein, this doesn't look right.
I think I should be able to remove nonshared from a list.
I'm not entirely sure I understand what you said there. Just to be
totally clear, for eglibc and glibc at least (and I imagine uclibc too),
libc_nonshared.a needs to go into the -dev package and not -staticdev.
So I don't think it should ever be appearing in a FILES...staticdev
list.
This one is a bit odd: it seems to just be dropping the .a files
altogether without introducing a -staticdev package for them.
I thought that maybe the default rule provided in bitbake.conf should
accomplish this since it is FILES_${PN}-staticdev = ${libdir}/*.a
${base_libdir}/*.a
Ah yes, right.
+#FILES_${PN}-dev = ${includedir}/a52dec/*.h ${libdir}/liba52.so
${libdir}/liba52.la
+#FILES_${PN}-staticdev = ${libdir}/liba52.a
This is a bit weird. What's going on here?
As above, trying to ensure that the default bitbake.conf rules would work.
Okay, fair enough. But in that case please don't leave the old bits
commented out.
All in all I think this patch needs a bit more work. It was quite a big
diff so I only skimmed it rather than reviewing it thoroughly but I
don't think it is quite ready to go in yet. Also, can't a lot of this
be done in bitbake.conf without quite so much recipe patching?
Most of it is done there, I was looking at adding a staticdev.bbclass
that would handle the lib${PN} case generically, as a second phase of this.
Can the RDEPENDS_${PN}-staticdev not go in bitbake.conf? That would
avoid all these cut and paste errors that seem to be plaguing that
particular area.
p.
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [CONSOLIDATED PULL 4/4] multiple recipes converted to -staticdev packages
On (09/06/11 23:26), Saul Wold wrote:
Signed-off-by: Saul Wold s...@linux.intel.com
---
meta/recipes-bsp/pciutils/pciutils_3.1.7.bb|7 -
.../wireless-tools/wireless-tools_29.bb|9 +--
meta/recipes-core/eglibc/eglibc-package.inc|8 --
meta/recipes-core/eglibc/eglibc_2.12.bb|2 +-
meta/recipes-core/gettext/gettext_0.18.1.1.bb | 16 ++--
meta/recipes-core/glibc/glibc-package.inc |9 +--
meta/recipes-core/glibc/glibc_2.10.1.bb|2 +-
.../meta/external-csl-toolchain_2008q3-72.bb |8 --
meta/recipes-core/uclibc/uclibc.inc| 10 +--
meta/recipes-core/udev/udev-new.inc| 14 ---
meta/recipes-core/udev/udev_164.bb |2 +-
meta/recipes-core/util-linux/util-linux.inc| 11 +++-
meta/recipes-core/util-linux/util-linux_2.19.1.bb |2 +-
meta/recipes-devtools/binutils/binutils.inc|1 -
meta/recipes-devtools/gcc/gcc-4.6.0.inc|2 +-
meta/recipes-devtools/gcc/gcc-package-runtime.inc | 24 ++-
meta/recipes-devtools/gcc/libgcc_4.6.0.bb |2 +-
meta/recipes-devtools/opkg/opkg_0.1.8.bb |8 --
meta/recipes-devtools/opkg/opkg_svn.bb |8 --
meta/recipes-devtools/python/python_2.6.6.bb |2 -
meta/recipes-devtools/rpm/rpm_5.4.0.bb | 18 --
meta/recipes-extended/augeas/augeas.inc|4 ++-
meta/recipes-extended/augeas/augeas_0.8.1.bb |2 +-
meta/recipes-extended/gamin/gamin_0.1.10.bb|9 ---
.../tcp-wrappers/tcp-wrappers_7.6.bb |9 +--
meta/recipes-graphics/cairo/cairo_1.10.2.bb|9 ---
meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb |7 +
meta/recipes-multimedia/liba52/liba52_0.7.4.bb |5 ++-
meta/recipes-support/attr/acl_2.2.51.bb|2 +-
meta/recipes-support/attr/attr_2.4.46.bb |2 +-
meta/recipes-support/attr/ea-acl.inc |8 --
meta/recipes-support/curl/curl_7.21.6.bb |8 --
meta/recipes-support/sqlite/sqlite3.inc|7 +++--
meta/recipes-support/sqlite/sqlite3_3.7.6.2.bb |2 +-
34 files changed, 146 insertions(+), 93 deletions(-)
diff --git a/meta/recipes-bsp/pciutils/pciutils_3.1.7.bb
b/meta/recipes-bsp/pciutils/pciutils_3.1.7.bb
index 4e6d4e1..f2bbe99 100644
--- a/meta/recipes-bsp/pciutils/pciutils_3.1.7.bb
+++ b/meta/recipes-bsp/pciutils/pciutils_3.1.7.bb
@@ -9,7 +9,7 @@ LICENSE = GPLv2+
LIC_FILES_CHKSUM = file://COPYING;md5=751419260aa954499f7abaabaa882bbe
DEPENDS = zlib
RDEPENDS_${PN} = ${PN}-ids
-PR = r1
+PR = r2
SRC_URI =
${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.bz2 \
file://configure.patch \
@@ -49,9 +49,12 @@ do_install () {
ln -s ../sbin/lspci ${D}${bindir}/lspci
}
-PACKAGES =+ pciutils-ids libpci libpci-dev libpci-dbg
+PACKAGES =+ pciutils-ids libpci libpci-dev libpci-dbg libpci-staticdev
FILES_pciutils-ids = ${datadir}/pci.ids*
FILES_libpci = ${libdir}/libpci.so.*
FILES_libpci-dbg = ${libdir}/.debug
FILES_libpci-dev = ${libdir}/libpci.a ${libdir}/libpci.la
${libdir}/libpci.so \
${includedir}/pci ${libdir}/pkgconfig
+FILES_libpci-staticdev = ${libdir}/libpci.a
+DEPENDS_libpci-staticdev = libpci-dev (= ${EXTENDPKGV})
+
diff --git a/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb
b/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb
index 70bf91b..d5b0f98 100644
--- a/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb
+++ b/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM =
file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
SECTION = base
PRIORITY = optional
PE = 1
-PR = r1
+PR = r2
SRC_URI =
http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.29.tar.gz
\
file://man.patch;apply=yes \
@@ -41,14 +41,17 @@ do_install() {
}
PACKAGES = libiw-dbg ifrename-dbg ${PN}-dbg \
-libiw libiw-dev libiw-doc ifrename-doc ifrename ${PN} ${PN}-doc
+libiw libiw-dev libiw-doc libiw-staticdev ifrename-doc ifrename ${PN}
${PN}-doc
FILES_libiw-dbg = ${libdir}/.debug/*.so.*
FILES_ifrename-dbg = ${sbindir}/.debug/ifrename
FILES_libiw = ${libdir}/*.so.*
-FILES_libiw-dev = ${libdir}/*.a ${libdir}/*.so ${includedir}
+FILES_libiw-dev = ${libdir}/*.so ${includedir}
FILES_libiw-doc = ${mandir}/man7
+FILES_libiw-staticdev = ${libdir}/*.a
+RDEPENDS_libiw-staticdev = libiw-dev (= ${EXTENDPKGV})
FILES_ifrename = ${sbindir}/ifrename
FILES_ifrename-doc = ${mandir}/man8/ifrename.8 ${mandir}/man5/iftab.5
FILES_${PN} = ${bindir} ${sbindir}/iw* ${base_sbindir} ${base_bindir}
${sysconfdir}/network
FILES_${PN}-doc = ${mandir}
+
Re: [OE-core] [CONSOLIDATED PULL 4/4] multiple recipes converted to -staticdev packages
On 06/10/2011 02:36 PM, Phil Blundell wrote:
On Fri, 2011-06-10 at 11:36 -0700, Saul Wold wrote:
+FILES_eglibc-dev_append += ${bindir}/rpcgen ${base_libdir}/*.o
${datadir}/aclocal
+FILES_eglibc-staticdev_append += ${libdir}/*.a ${base_libdir}/*.a
You need to make sure that libc_nonshared.a goes into -dev rather than
-staticdev somehow. I didn't immediately spot any mechanism which would
do this, though I haven't tested the package to find out what happens.
+FILES_uclibc-staticdev_append = \
+${libdir}/*_nonshared.a \
+${libdir}/lib*.a \
In similar vein, this doesn't look right.
I think I should be able to remove nonshared from a list.
I'm not entirely sure I understand what you said there. Just to be
totally clear, for eglibc and glibc at least (and I imagine uclibc too),
libc_nonshared.a needs to go into the -dev package and not -staticdev.
So I don't think it should ever be appearing in a FILES...staticdev
list.
I understand that, Khem also mentioned it. It a matter of doing some
python RE stuff to drop them from the -staticdev list.
This one is a bit odd: it seems to just be dropping the .a files
altogether without introducing a -staticdev package for them.
I thought that maybe the default rule provided in bitbake.conf should
accomplish this since it is FILES_${PN}-staticdev = ${libdir}/*.a
${base_libdir}/*.a
Ah yes, right.
+#FILES_${PN}-dev = ${includedir}/a52dec/*.h ${libdir}/liba52.so
${libdir}/liba52.la
+#FILES_${PN}-staticdev = ${libdir}/liba52.a
This is a bit weird. What's going on here?
As above, trying to ensure that the default bitbake.conf rules would work.
Okay, fair enough. But in that case please don't leave the old bits
commented out.
Right, that was a goof on my part.
All in all I think this patch needs a bit more work. It was quite a big
diff so I only skimmed it rather than reviewing it thoroughly but I
don't think it is quite ready to go in yet. Also, can't a lot of this
be done in bitbake.conf without quite so much recipe patching?
Most of it is done there, I was looking at adding a staticdev.bbclass
that would handle the lib${PN} case generically, as a second phase of this.
Can the RDEPENDS_${PN}-staticdev not go in bitbake.conf? That would
avoid all these cut and paste errors that seem to be plaguing that
particular area.
Arealy in bitbake.conf, it's the RDEPENDS_lib${PN}-staticdev (note the
'lib' prefix), this is special for a hand full, if I can set up the
inherit than it done that way.
p.
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
