* [PATCH V2 00/25] Static Library Updated
@ 2011-07-13 7:33 Saul Wold
2011-07-13 7:33 ` [PATCH V2 01/25] bitbake.conf: Add *-config to default ${PN}-dev package Saul Wold
` (25 more replies)
0 siblings, 26 replies; 31+ messages in thread
From: Saul Wold @ 2011-07-13 7:33 UTC (permalink / raw)
To: openembedded-core
Richard,
This patch includes feedback from the community.
Thanks
Sau!
The following changes since commit a6e9edb7b4b5b0bdb067a59d691d33fba8948963:
sato-sdk: add clutter for sato-sdk image (2011-07-12 15:23:35 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib sgw/static
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/static
Saul Wold (25):
bitbake.conf: Add *-config to default ${PN}-dev package
shlibpackaging.bbclass: create common class
pciutils: repackage development files in pciutils instead of libpci
wireless-tools: Updated for staticdevpackaging
augeas: inherit shlibpackaging class
gamin: inherit shlibpackaging class
sqlite3: inherit shlibpackaging class
curl: inherit shlibpackaging class
attr: inherit shlibpackaging class
rpm: Create -staticdev package
libxft: use default bitbake.conf FILES Packaging to handle staticdev
js: Use bitbake default FILES for packaging
tcp-wrappers: Use bitbake default FILES for packaging
udev: Use bitbake default FILES for packaging
liba52: Use bitbake default FILES for packaging
python: Use bitbake default FILES for packaging
external-csl-toolchain: Use bitbake default FILES for packaging
opkg: Use bitbake default FILES for packaging
util-linux: Use bitbake default FILES for packaging
gettext: Use bitbake default FILES for packaging
gcc: Use bitbake default FILES for packaging
glibc: Use bitbake default FILES for packaging
eglibc: Use bitbake default FILES for packaging
uclibc: Use bitbake default FILES for packaging
binutils: Use bitbake default FILES for packaging
meta/classes/shlibpackaging.bbclass | 9 +++++++
meta/conf/bitbake.conf | 2 +-
meta/recipes-bsp/pciutils/pciutils_3.1.7.bb | 10 +++----
.../wireless-tools/wireless-tools_29.bb | 14 ++++++----
meta/recipes-core/eglibc/eglibc-common.inc | 2 +-
meta/recipes-core/eglibc/eglibc-package.inc | 8 ++++--
meta/recipes-core/gettext/gettext_0.16.1.bb | 6 ++--
meta/recipes-core/gettext/gettext_0.18.1.1.bb | 24 +++++++++---------
meta/recipes-core/glibc/glibc-package.inc | 12 ++++++---
meta/recipes-core/glibc/glibc_2.10.1.bb | 2 +-
.../meta/external-csl-toolchain_2008q3-72.bb | 20 ++++++++-------
meta/recipes-core/uclibc/uclibc.inc | 7 +++--
meta/recipes-core/udev/udev-new.inc | 26 ++++++++++++-------
meta/recipes-core/udev/udev_164.bb | 2 +-
meta/recipes-core/util-linux/util-linux.inc | 17 +++++++++----
meta/recipes-core/util-linux/util-linux_2.19.1.bb | 2 +-
.../binutils/binutils-cross-canadian_2.21.1.bb | 2 +-
meta/recipes-devtools/binutils/binutils-cross.inc | 2 +
.../binutils/binutils-cross_csl-arm-2008q1.bb | 2 +-
.../binutils/binutils-crosssdk_2.21.1.bb | 2 +-
meta/recipes-devtools/binutils/binutils.inc | 9 +-----
meta/recipes-devtools/binutils/binutils_2.21.1.bb | 2 +-
meta/recipes-devtools/gcc/gcc-package-runtime.inc | 25 +++++++++++++-----
meta/recipes-devtools/gcc/libgcc_4.6.bb | 2 +-
meta/recipes-devtools/opkg/opkg_0.1.8.bb | 10 ++++---
meta/recipes-devtools/opkg/opkg_svn.bb | 10 ++++---
meta/recipes-devtools/python/python_2.6.6.bb | 4 +--
meta/recipes-devtools/rpm/rpm_5.4.0.bb | 18 +++++++------
meta/recipes-extended/augeas/augeas.inc | 7 +----
meta/recipes-extended/augeas/augeas_0.8.1.bb | 2 +-
meta/recipes-extended/gamin/gamin_0.1.10.bb | 13 +--------
.../tcp-wrappers/tcp-wrappers_7.6.bb | 17 +++++++-----
meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb | 7 +----
meta/recipes-multimedia/liba52/liba52_0.7.4.bb | 4 +--
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 | 16 +-----------
meta/recipes-support/curl/curl_7.21.7.bb | 17 ++++--------
meta/recipes-support/js/js_1.7.0+1.8.0rc1.bb | 3 +-
meta/recipes-support/sqlite/sqlite3.inc | 10 +------
40 files changed, 176 insertions(+), 175 deletions(-)
create mode 100644 meta/classes/shlibpackaging.bbclass
--
1.7.3.4
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PATCH V2 01/25] bitbake.conf: Add *-config to default ${PN}-dev package
2011-07-13 7:33 [PATCH V2 00/25] Static Library Updated Saul Wold
@ 2011-07-13 7:33 ` Saul Wold
2011-07-13 7:33 ` [PATCH V2 02/25] shlibpackaging.bbclass: create common class Saul Wold
` (24 subsequent siblings)
25 siblings, 0 replies; 31+ messages in thread
From: Saul Wold @ 2011-07-13 7:33 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/conf/bitbake.conf | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 463991d..2024dfb 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -252,7 +252,7 @@ SECTION_${PN}-doc = "doc"
FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \
${libdir}/*.o ${libdir}/pkgconfig ${datadir}/pkgconfig \
- ${datadir}/aclocal ${base_libdir}/*.o"
+ ${datadir}/aclocal ${base_libdir}/*.o ${bindir}/*-config"
SECTION_${PN}-dev = "devel"
ALLOW_EMPTY_${PN}-dev = "1"
RDEPENDS_${PN}-dev = "${PN} (= ${EXTENDPKGV})"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH V2 02/25] shlibpackaging.bbclass: create common class
2011-07-13 7:33 [PATCH V2 00/25] Static Library Updated Saul Wold
2011-07-13 7:33 ` [PATCH V2 01/25] bitbake.conf: Add *-config to default ${PN}-dev package Saul Wold
@ 2011-07-13 7:33 ` Saul Wold
2011-07-13 9:17 ` Phil Blundell
2011-07-13 7:33 ` [PATCH V2 03/25] pciutils: repackage development files in pciutils instead of libpci Saul Wold
` (23 subsequent siblings)
25 siblings, 1 reply; 31+ messages in thread
From: Saul Wold @ 2011-07-13 7:33 UTC (permalink / raw)
To: openembedded-core
This class is for packages that do not work with debian library naming
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/classes/shlibpackaging.bbclass | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
create mode 100644 meta/classes/shlibpackaging.bbclass
diff --git a/meta/classes/shlibpackaging.bbclass b/meta/classes/shlibpackaging.bbclass
new file mode 100644
index 0000000..3406793
--- /dev/null
+++ b/meta/classes/shlibpackaging.bbclass
@@ -0,0 +1,9 @@
+#
+# This bbclass it a common case for lib${PN} shared libraries
+#
+SUMMARY_lib${PN} ?= "${SUMMARY} - Shared Libraries"
+DESCRIPTION_lib${PN} ?= "${DESCRIPTION} This package contains the shared libraries"
+
+PACKAGES =+ "lib${PN}"
+FILES_lib${PN} = "${libdir}/*${SOLIBS} ${base_libdir}/*${SOLIBS}"
+RDEPENDS_lib${PN} = "${PN}"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH V2 03/25] pciutils: repackage development files in pciutils instead of libpci
2011-07-13 7:33 [PATCH V2 00/25] Static Library Updated Saul Wold
2011-07-13 7:33 ` [PATCH V2 01/25] bitbake.conf: Add *-config to default ${PN}-dev package Saul Wold
2011-07-13 7:33 ` [PATCH V2 02/25] shlibpackaging.bbclass: create common class Saul Wold
@ 2011-07-13 7:33 ` Saul Wold
2011-07-13 7:33 ` [PATCH V2 04/25] wireless-tools: Updated for staticdevpackaging Saul Wold
` (22 subsequent siblings)
25 siblings, 0 replies; 31+ messages in thread
From: Saul Wold @ 2011-07-13 7:33 UTC (permalink / raw)
To: openembedded-core
And use default bitbake.conf settings for FILES contents
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-bsp/pciutils/pciutils_3.1.7.bb | 10 ++++------
1 files changed, 4 insertions(+), 6 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..6449e21 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,7 @@ do_install () {
ln -s ../sbin/lspci ${D}${bindir}/lspci
}
-PACKAGES =+ "pciutils-ids libpci libpci-dev libpci-dbg"
+PACKAGES += "pciutils-ids libpci"
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 = "${libdir}/lib*${SOLIBS}"
+
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH V2 04/25] wireless-tools: Updated for staticdevpackaging
2011-07-13 7:33 [PATCH V2 00/25] Static Library Updated Saul Wold
` (2 preceding siblings ...)
2011-07-13 7:33 ` [PATCH V2 03/25] pciutils: repackage development files in pciutils instead of libpci Saul Wold
@ 2011-07-13 7:33 ` Saul Wold
2011-07-13 7:33 ` [PATCH V2 05/25] augeas: inherit shlibpackaging class Saul Wold
` (21 subsequent siblings)
25 siblings, 0 replies; 31+ messages in thread
From: Saul Wold @ 2011-07-13 7:33 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../wireless-tools/wireless-tools_29.bb | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb b/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb
index cc51dec..29a8f0a 100644
--- a/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb
+++ b/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://sample_enc.c;beginline=1;endline=4;md5=838372be07874260b566bae2f6ed33b6"
SECTION = "base"
PE = "1"
-PR = "r2"
+PR = "r3"
SRC_URI = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.29.tar.gz \
file://man.patch;apply=yes \
@@ -40,14 +40,16 @@ do_install() {
#install ${WORKDIR}/zzz-wireless.if-pre-up ${D}${sysconfdir}/network/if-pre-up.d/zzz-wireless
}
-PACKAGES = "libiw-dbg ifrename-dbg ${PN}-dbg \
-libiw libiw-dev libiw-doc ifrename-doc ifrename ${PN} ${PN}-doc"
+PACKAGES += "libiw libiw-dev libiw-dbg libiw-doc libiw-staticdev \
+ ifrename-dbg ifrename-doc ifrename"
-FILES_libiw-dbg = "${libdir}/.debug/*.so.*"
+FILES_libiw-dbg = "${libdir}/.debug/*${SOLIBS}"
FILES_ifrename-dbg = "${sbindir}/.debug/ifrename"
-FILES_libiw = "${libdir}/*.so.*"
-FILES_libiw-dev = "${libdir}/*.a ${libdir}/*.so ${includedir}"
+FILES_libiw = "${libdir}/*${SOLIBS}"
+FILES_libiw-dev = "${libdir}/${SOLIBSDEV} ${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"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH V2 05/25] augeas: inherit shlibpackaging class
2011-07-13 7:33 [PATCH V2 00/25] Static Library Updated Saul Wold
` (3 preceding siblings ...)
2011-07-13 7:33 ` [PATCH V2 04/25] wireless-tools: Updated for staticdevpackaging Saul Wold
@ 2011-07-13 7:33 ` Saul Wold
2011-07-13 7:33 ` [PATCH V2 06/25] gamin: " Saul Wold
` (20 subsequent siblings)
25 siblings, 0 replies; 31+ messages in thread
From: Saul Wold @ 2011-07-13 7:33 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-extended/augeas/augeas.inc | 7 ++-----
meta/recipes-extended/augeas/augeas_0.8.1.bb | 2 +-
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-extended/augeas/augeas.inc b/meta/recipes-extended/augeas/augeas.inc
index 619cd20..4ceea0e 100644
--- a/meta/recipes-extended/augeas/augeas.inc
+++ b/meta/recipes-extended/augeas/augeas.inc
@@ -9,14 +9,11 @@ SRC_URI = "http://augeas.net/download/${BP}.tar.gz"
DEPENDS = "readline"
-inherit autotools
+inherit autotools shlibpackaging
-PACKAGES =+ "${PN}-lenses lib${PN} lib${PN}-dev lib${PN}-dbg"
+PACKAGES =+ "${PN}-lenses"
FILES_${PN}-lenses = "${datadir}/augeas/lenses"
-FILES_lib${PN} = "${libdir}/*.so.*"
-FILES_lib${PN}-dev = "${libdir}/*.so ${libdir}/*.a ${libdir}/*.la ${includedir} ${libdir}/pkgconfig"
-FILES_lib${PN}-dbg = "${libdir}/.debug"
RDEPENDS_lib${PN} += "${PN}-lenses"
RRECOMMENDS_lib${PN} += "${PN}"
diff --git a/meta/recipes-extended/augeas/augeas_0.8.1.bb b/meta/recipes-extended/augeas/augeas_0.8.1.bb
index 51eeb33..ee45098 100644
--- a/meta/recipes-extended/augeas/augeas_0.8.1.bb
+++ b/meta/recipes-extended/augeas/augeas_0.8.1.bb
@@ -1,6 +1,6 @@
require augeas.inc
-PR = "r0"
+PR = "r1"
SRC_URI[md5sum] = "62d47bdc60e175f93aed3b81cb8e2785"
SRC_URI[sha256sum] = "916fef67e8eed6d1abe02433830301bd01dfc8228e9cfffb490347545155c4d7"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH V2 06/25] gamin: inherit shlibpackaging class
2011-07-13 7:33 [PATCH V2 00/25] Static Library Updated Saul Wold
` (4 preceding siblings ...)
2011-07-13 7:33 ` [PATCH V2 05/25] augeas: inherit shlibpackaging class Saul Wold
@ 2011-07-13 7:33 ` Saul Wold
2011-07-13 7:33 ` [PATCH V2 07/25] sqlite3: " Saul Wold
` (19 subsequent siblings)
25 siblings, 0 replies; 31+ messages in thread
From: Saul Wold @ 2011-07-13 7:33 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-extended/gamin/gamin_0.1.10.bb | 13 ++-----------
1 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/meta/recipes-extended/gamin/gamin_0.1.10.bb b/meta/recipes-extended/gamin/gamin_0.1.10.bb
index 81b27c0..8ed5bd1 100644
--- a/meta/recipes-extended/gamin/gamin_0.1.10.bb
+++ b/meta/recipes-extended/gamin/gamin_0.1.10.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=412a9be54757a155d0b997b52b519f62"
DEPENDS = "glib-2.0"
PROVIDES = "fam"
-PR = "r3"
+PR = "r4"
SRC_URI = "http://www.gnome.org/~veillard/gamin/sources/gamin-${PV}.tar.gz \
file://no-abstract-sockets.patch"
@@ -16,18 +16,9 @@ SRC_URI = "http://www.gnome.org/~veillard/gamin/sources/gamin-${PV}.tar.gz \
SRC_URI[md5sum] = "b4ec549e57da470c04edd5ec2876a028"
SRC_URI[sha256sum] = "28085f0ae8be10eab582ff186af4fb0be92cc6c62b5cc19cd09b295c7c2899a1"
-inherit autotools pkgconfig
+inherit autotools pkgconfig shlibpackaging
EXTRA_OECONF = "--without-python"
-PACKAGES += "lib${PN} lib${PN}-dev"
-FILES_${PN} = "${libexecdir}"
-FILES_${PN}-dbg += "${libexecdir}/.debug"
-FILES_lib${PN} = "${libdir}/lib*.so.*"
-FILES_lib${PN}-dev = "${includedir} ${libdir}/pkgconfig ${libdir}/lib*.la \
- ${libdir}/lib*.a ${libdir}/lib*.so"
-
-RDEPENDS_lib${PN} = "${PN}"
-
LEAD_SONAME = "libgamin-1.so"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH V2 07/25] sqlite3: inherit shlibpackaging class
2011-07-13 7:33 [PATCH V2 00/25] Static Library Updated Saul Wold
` (5 preceding siblings ...)
2011-07-13 7:33 ` [PATCH V2 06/25] gamin: " Saul Wold
@ 2011-07-13 7:33 ` Saul Wold
2011-07-13 7:33 ` [PATCH V2 08/25] curl: " Saul Wold
` (18 subsequent siblings)
25 siblings, 0 replies; 31+ messages in thread
From: Saul Wold @ 2011-07-13 7:33 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-support/sqlite/sqlite3.inc | 10 ++--------
1 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/meta/recipes-support/sqlite/sqlite3.inc b/meta/recipes-support/sqlite/sqlite3.inc
index a5d122d..f1aa087 100644
--- a/meta/recipes-support/sqlite/sqlite3.inc
+++ b/meta/recipes-support/sqlite/sqlite3.inc
@@ -5,7 +5,7 @@ DEPENDS = "readline ncurses"
DEPENDS_virtclass-native = ""
LICENSE = "PD"
-inherit autotools pkgconfig
+inherit autotools pkgconfig shlibpackaging
EXTRA_OECONF = "--disable-tcl --enable-shared --enable-threadsafe"
EXTRA_OECONF_virtclass-native = "--disable-tcl --enable-shared --enable-threadsafe --disable-readline --enable-tempstore"
@@ -17,12 +17,6 @@ export config_TARGET_LINK = "${CCLD}"
export config_TARGET_CFLAGS = "${CFLAGS}"
export config_TARGET_LFLAGS = "${LDFLAGS}"
-PACKAGES = "lib${PN} lib${PN}-dev lib${PN}-doc ${PN} ${PN}-dbg"
-FILES_${PN} = "${bindir}/*"
-FILES_lib${PN} = "${libdir}/*.so.*"
-FILES_lib${PN}-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so \
- ${libdir}/pkgconfig ${includedir}"
-FILES_lib${PN}-doc = "${docdir} ${mandir} ${infodir}"
-AUTO_LIBNAME_PKGS = "lib${PN}"
+FILES_lib${PN}-doc += "${docdir} ${mandir} ${infodir}"
BBCLASSEXTEND = "native nativesdk"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH V2 08/25] curl: inherit shlibpackaging class
2011-07-13 7:33 [PATCH V2 00/25] Static Library Updated Saul Wold
` (6 preceding siblings ...)
2011-07-13 7:33 ` [PATCH V2 07/25] sqlite3: " Saul Wold
@ 2011-07-13 7:33 ` Saul Wold
2011-07-13 9:14 ` Phil Blundell
2011-07-13 7:33 ` [PATCH V2 09/25] attr: " Saul Wold
` (17 subsequent siblings)
25 siblings, 1 reply; 31+ messages in thread
From: Saul Wold @ 2011-07-13 7:33 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-support/curl/curl_7.21.7.bb | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/meta/recipes-support/curl/curl_7.21.7.bb b/meta/recipes-support/curl/curl_7.21.7.bb
index 28344e2..fd8d358 100644
--- a/meta/recipes-support/curl/curl_7.21.7.bb
+++ b/meta/recipes-support/curl/curl_7.21.7.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e66
DEPENDS = "zlib gnutls"
DEPENDS_virtclass-native = "zlib-native"
DEPENDS_virtclass-nativesdk = "zlib-nativesdk"
-PR = "r0"
+PR = "r2"
SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
file://noldlibpath.patch \
@@ -17,7 +17,7 @@ SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
SRC_URI[md5sum] = "5f6d50c4d4ee38c57fe37e3cff75adbd"
SRC_URI[sha256sum] = "1a50dd17400c042090203eef347e946f29c342c32b6c4843c740c80975e8215a"
-inherit autotools pkgconfig binconfig
+inherit autotools pkgconfig binconfig shlibpackaging
EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
--without-ssl \
@@ -36,7 +36,7 @@ do_configure_prepend() {
sed -i s:OPT_GNUTLS/bin:OPT_GNUTLS:g configure.ac
}
-PACKAGES += "${PN}-certs libcurl libcurl-dev libcurl-doc"
+PACKAGES += "${PN}-certs"
FILES_${PN} = "${bindir}/curl"
@@ -45,17 +45,12 @@ PACKAGE_ARCH_${PN}-certs = "all"
FILES_${PN}-doc = "${mandir}/man1/curl.1"
-FILES_lib${PN} = "${libdir}/lib*.so.*"
RRECOMMENDS_lib${PN} += "${PN}-certs"
-FILES_lib${PN}-dev = "${includedir} \
- ${libdir}/lib*.so \
- ${libdir}/lib*.a \
- ${libdir}/lib*.la \
- ${libdir}/pkgconfig \
+FILES_lib${PN}-dev =+ "${libdir}/pkgconfig \
${datadir}/aclocal \
${bindir}/*-config"
-FILES_lib${PN}-doc = "${mandir}/man3 \
- ${mandir}/man1/curl-config.1"
+
+FILES_lib${PN}-doc =+ "${mandir}/man1/curl-config.1"
BBCLASSEXTEND = "native nativesdk"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH V2 09/25] attr: inherit shlibpackaging class
2011-07-13 7:33 [PATCH V2 00/25] Static Library Updated Saul Wold
` (7 preceding siblings ...)
2011-07-13 7:33 ` [PATCH V2 08/25] curl: " Saul Wold
@ 2011-07-13 7:33 ` Saul Wold
2011-07-13 7:33 ` [PATCH V2 10/25] rpm: Create -staticdev package Saul Wold
` (16 subsequent siblings)
25 siblings, 0 replies; 31+ messages in thread
From: Saul Wold @ 2011-07-13 7:33 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
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 | 16 +---------------
3 files changed, 3 insertions(+), 17 deletions(-)
diff --git a/meta/recipes-support/attr/acl_2.2.51.bb b/meta/recipes-support/attr/acl_2.2.51.bb
index 301d44a..40ba5f1 100644
--- a/meta/recipes-support/attr/acl_2.2.51.bb
+++ b/meta/recipes-support/attr/acl_2.2.51.bb
@@ -1,6 +1,6 @@
require acl.inc
-PR = "r0"
+PR = "r2"
SRC_URI[md5sum] = "3fc0ce99dc5253bdcce4c9cd437bc267"
SRC_URI[sha256sum] = "06854521cf5d396801af7e54b9636680edf8064355e51c07657ec7442a185225"
diff --git a/meta/recipes-support/attr/attr_2.4.46.bb b/meta/recipes-support/attr/attr_2.4.46.bb
index 9fef41b..85c35d0 100644
--- a/meta/recipes-support/attr/attr_2.4.46.bb
+++ b/meta/recipes-support/attr/attr_2.4.46.bb
@@ -1,6 +1,6 @@
require attr.inc
-PR = "r0"
+PR = "r2"
SRC_URI[md5sum] = "db557c17fdfa4f785333ecda08654010"
SRC_URI[sha256sum] = "dcd69bdca7ff166bc45141eddbcf21967999a6b66b0544be12a1cc2fd6340e1f"
diff --git a/meta/recipes-support/attr/ea-acl.inc b/meta/recipes-support/attr/ea-acl.inc
index afe2f1c..8b903c7 100644
--- a/meta/recipes-support/attr/ea-acl.inc
+++ b/meta/recipes-support/attr/ea-acl.inc
@@ -3,7 +3,7 @@
SRC_URI += "file://relative-libdir.patch;striplevel=0 \
"
-inherit autotools gettext
+inherit autotools gettext shlibpackaging
# the package comes with a custom config.h.in, it cannot be
# overwritten by autoheader
@@ -16,19 +16,5 @@ do_install () {
oe_runmake install install-lib install-dev DIST_ROOT="${D}"
}
-PACKAGES =+ "lib${PN} lib${PN}-dev lib${PN}-doc"
-
-FILES_lib${PN} = "${base_libdir}/lib*.so.*"
-
-FILES_lib${PN}-dev = "${includedir} \
- ${libdir}/lib*.so \
- ${libdir}/lib*.a \
- ${libdir}/lib*.la \
- ${base_libdir}/lib*.so \
- ${base_libdir}/lib*.a \
- ${base_libdir}/lib*.la"
-
-FILES_lib${PN}-doc = "${mandir}/man2 \
- ${mandir}/man3"
BBCLASSEXTEND = "native"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH V2 10/25] rpm: Create -staticdev package
2011-07-13 7:33 [PATCH V2 00/25] Static Library Updated Saul Wold
` (8 preceding siblings ...)
2011-07-13 7:33 ` [PATCH V2 09/25] attr: " Saul Wold
@ 2011-07-13 7:33 ` Saul Wold
2011-07-13 7:33 ` [PATCH V2 11/25] libxft: use default bitbake.conf FILES Packaging to handle staticdev Saul Wold
` (15 subsequent siblings)
25 siblings, 0 replies; 31+ messages in thread
From: Saul Wold @ 2011-07-13 7:33 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-devtools/rpm/rpm_5.4.0.bb | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.0.bb b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
index 9cfb3ab..1ebe3a1 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.0.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
@@ -45,7 +45,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
DEPENDS = "bzip2 zlib db openssl elfutils expat libpcre attr acl popt ${extrarpmdeps}"
extrarpmdeps = "python perl"
extrarpmdeps_virtclass-native = ""
-PR = "r19"
+PR = "r20"
# rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed
# in order to extract the distribution SRPM into a format we can extract...
@@ -167,7 +167,7 @@ EXTRA_OECONF = "--verbose \
CFLAGS_append = " -DRPM_VENDOR_WINDRIVER -DRPM_VENDOR_POKY"
-PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-libs ${PN}-dev ${PN}-common ${PN}-build python-rpm-dbg python-rpm perl-module-rpm perl-module-rpm-dev ${PN}-locale"
+PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-libs ${PN}-dev ${PN}-staticdev ${PN}-common ${PN}-build python-rpm-dbg python-rpm perl-module-rpm perl-module-rpm-dev ${PN}-locale"
SOLIBS = "5.4.so"
@@ -302,26 +302,28 @@ FILES_perl-module-rpm-dev = "${prefix}/share/man/man3/RPM* \
"
FILE_${PN}-dev = "${includedir}/rpm \
- ${libdir}/librpm.a \
${libdir}/librpm.la \
${libdir}/librpm.so \
- ${libdir}/librpmconstant.a \
${libdir}/librpmconstant.la \
${libdir}/librpmconstant.so \
- ${libdir}/librpmdb.a \
${libdir}/librpmdb.la \
${libdir}/librpmdb.so \
- ${libdir}/librpmio.a \
${libdir}/librpmio.la \
${libdir}/librpmio.so \
- ${libdir}/librpmmisc.a \
${libdir}/librpmmisc.la \
${libdir}/librpmmisc.so \
- ${libdir}/librpmbuild.a \
${libdir}/librpmbuild.la \
${libdir}/librpmbuild.so \
${libdir}/pkgconfig/rpm.pc \
"
+FILE_${PN}-staticdev = " \
+ ${libdir}/librpm.a \
+ ${libdir}/librpmconstant.a \
+ ${libdir}/librpmdb.a \
+ ${libdir}/librpmio.a \
+ ${libdir}/librpmmisc.a \
+ ${libdir}/librpmbuild.a \
+ "
###%{_rpmhome}/lib/libxar.a
###%{_rpmhome}/lib/libxar.la
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH V2 11/25] libxft: use default bitbake.conf FILES Packaging to handle staticdev
2011-07-13 7:33 [PATCH V2 00/25] Static Library Updated Saul Wold
` (9 preceding siblings ...)
2011-07-13 7:33 ` [PATCH V2 10/25] rpm: Create -staticdev package Saul Wold
@ 2011-07-13 7:33 ` Saul Wold
2011-07-13 7:33 ` [PATCH V2 12/25] js: Use bitbake default FILES for packaging Saul Wold
` (14 subsequent siblings)
25 siblings, 0 replies; 31+ messages in thread
From: Saul Wold @ 2011-07-13 7:33 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb b/meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb
index 1a56702..a7119c8 100644
--- a/meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb
@@ -18,7 +18,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=90b90b60eb30f65fc9c2673d7cf59e24"
DEPENDS += "libxrender freetype fontconfig"
PROVIDES = "xft"
-PR = "r0"
+PR = "r1"
PE = "1"
XORG_PN = "libXft"
@@ -28,10 +28,5 @@ python () {
bb.data.setVar('PKG_${PN}', 'libxft2', d)
}
-FILES_${PN} = "${libdir}/lib*${SOLIBS}"
-FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \
- ${libdir}/*.a ${libdir}/pkgconfig \
- ${datadir}/aclocal ${bindir} ${sbindir}"
-
SRC_URI[md5sum] = "cce3c327258116493b753f157e0360c7"
SRC_URI[sha256sum] = "c8685ae56da0c1dcc2bc1e34607e7d76ae98b86a1a71baba3a6b76dbcf5ff9b2"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH V2 12/25] js: Use bitbake default FILES for packaging
2011-07-13 7:33 [PATCH V2 00/25] Static Library Updated Saul Wold
` (10 preceding siblings ...)
2011-07-13 7:33 ` [PATCH V2 11/25] libxft: use default bitbake.conf FILES Packaging to handle staticdev Saul Wold
@ 2011-07-13 7:33 ` Saul Wold
2011-07-13 7:33 ` [PATCH V2 13/25] tcp-wrappers: " Saul Wold
` (13 subsequent siblings)
25 siblings, 0 replies; 31+ messages in thread
From: Saul Wold @ 2011-07-13 7:33 UTC (permalink / raw)
To: openembedded-core
This will ensure correct -dev and -staticdev packging
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-support/js/js_1.7.0+1.8.0rc1.bb | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-support/js/js_1.7.0+1.8.0rc1.bb b/meta/recipes-support/js/js_1.7.0+1.8.0rc1.bb
index a4423ab..d4e1e4d 100644
--- a/meta/recipes-support/js/js_1.7.0+1.8.0rc1.bb
+++ b/meta/recipes-support/js/js_1.7.0+1.8.0rc1.bb
@@ -5,7 +5,7 @@ SECTION = "libs"
# the package is licensed under either of the following
LICENSE = "MPL-1 | GPLv2+ | LGPLv2.1+"
LIC_FILES_CHKSUM = "file://jsapi.c;beginline=4;endline=39;md5=347c6bbf4fb4547de1fa5ad830030063"
-PR = "r2"
+PR = "r4"
SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/js/js-1.8.0-rc1.tar.gz \
file://link_with_gcc.patch \
@@ -47,5 +47,4 @@ do_install() {
}
FILES_${PN} = "${libdir}/lib*.so"
-FILES_${PN}-dev = "${includedir} ${libdir}/lib*.a"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH V2 13/25] tcp-wrappers: Use bitbake default FILES for packaging
2011-07-13 7:33 [PATCH V2 00/25] Static Library Updated Saul Wold
` (11 preceding siblings ...)
2011-07-13 7:33 ` [PATCH V2 12/25] js: Use bitbake default FILES for packaging Saul Wold
@ 2011-07-13 7:33 ` Saul Wold
2011-07-13 7:33 ` [PATCH V2 14/25] udev: " Saul Wold
` (12 subsequent siblings)
25 siblings, 0 replies; 31+ messages in thread
From: Saul Wold @ 2011-07-13 7:33 UTC (permalink / raw)
To: openembedded-core
This will ensure correct -dev and -staticdev packging
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../tcp-wrappers/tcp-wrappers_7.6.bb | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb b/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb
index 1aeb9ff..1acb15a 100644
--- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb
@@ -5,13 +5,16 @@ SECTION = "console/network"
LICENSE = "tcp-wrappers"
LIC_FILES_CHKSUM = "file://DISCLAIMER;md5=071bd69cb78b18888ea5e3da5c3127fa"
-PR ="r0"
+PR ="r1"
-PACKAGES = "${PN}-dbg libwrap libwrap-doc libwrap-dev tcp-wrappers tcp-wrappers-doc"
-FILES_libwrap = "${base_libdir}/lib*.so.*"
+PACKAGES = "${PN}-dbg libwrap libwrap-doc libwrap-dev libwrap-staticdev \
+ tcp-wrappers tcp-wrappers-doc"
+FILES_libwrap = "${base_libdir}/lib*${SOLIBS}
FILES_libwrap-doc = "${mandir}/man3 ${mandir}/man5"
-FILES_libwrap-dev = "${libdir}/lib*.so ${libdir}/lib*.a ${includedir}"
+FILES_libwrap-dev = "${libdir}/lib*${SOLIBSDEV} ${includedir}"
+FILES_libwrap-staticdev = "${libdir}/lib*.a"
+RDEPENDS_libwrap-staticdev = "libwrap-dev (= ${EXTENDPKGV})"
FILES_tcp-wrappers = "${bindir}"
FILES_tcp-wrappers-doc = "${mandir}/man8"
@@ -86,9 +89,9 @@ do_install () {
oe_libinstall -C shared -so libwrap ${D}${base_libdir}
rel_lib_prefix=`echo ${libdir} | sed 's,\(^/\|\)[^/][^/]*,..,g'`
- libname=`readlink ${D}${base_libdir}/libwrap.so | xargs basename`
- ln -s ${rel_lib_prefix}${base_libdir}/${libname} ${D}${libdir}/libwrap.so
- rm -f ${D}${base_libdir}/libwrap.so
+ libname=`readlink ${D}${base_libdir}/libwrap${SOLIBSDEV} | xargs basename`
+ ln -s ${rel_lib_prefix}${base_libdir}/${libname} ${D}${libdir}/libwrap${SOLIBSDEV}
+ rm -f ${D}${base_libdir}/libwrap${SOLIBSDEV}
install -d ${D}${sbindir}
for b in ${BINS}; do
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH V2 14/25] udev: Use bitbake default FILES for packaging
2011-07-13 7:33 [PATCH V2 00/25] Static Library Updated Saul Wold
` (12 preceding siblings ...)
2011-07-13 7:33 ` [PATCH V2 13/25] tcp-wrappers: " Saul Wold
@ 2011-07-13 7:33 ` Saul Wold
2011-07-13 9:38 ` Phil Blundell
2011-07-13 7:33 ` [PATCH V2 15/25] liba52: " Saul Wold
` (11 subsequent siblings)
25 siblings, 1 reply; 31+ messages in thread
From: Saul Wold @ 2011-07-13 7:33 UTC (permalink / raw)
To: openembedded-core
This will ensure correct -dev and -staticdev packging
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-core/udev/udev-new.inc | 26 ++++++++++++++++----------
meta/recipes-core/udev/udev_164.bb | 2 +-
2 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/meta/recipes-core/udev/udev-new.inc b/meta/recipes-core/udev/udev-new.inc
index 4c4451f..6e49e42 100644
--- a/meta/recipes-core/udev/udev-new.inc
+++ b/meta/recipes-core/udev/udev-new.inc
@@ -10,6 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
file://libudev/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
file://extras/gudev/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
+INC_PR = "r4"
+
DEPENDS = "acl glib-2.0 libusb usbutils pciutils linux-libc-headers gperf-native libxslt-native"
RPROVIDES_${PN} = "hotplug"
RRECOMMENDS_${PN} += "udev-extraconf udev-cache usbutils-ids pciutils-ids"
@@ -35,8 +37,8 @@ libexecdir = "${base_libdir}/udev"
EXTRA_OECONF = "--disable-introspection --with-rootlibdir=${base_libdir} \
--with-pci-ids-path=${datadir}/pci.ids"
-PACKAGES =+ "udev-cache libudev libudev-dev libudev-dbg"
-PACKAGES =+ "libgudev libgudev-dev libgudev-dbg"
+PACKAGES =+ "udev-cache libudev libudev-dev libudev-dbg libudev-staticdev"
+PACKAGES =+ "libgudev libgudev-dev libgudev-dbg libgudev-staticdev"
INITSCRIPT_PACKAGES = "udev udev-cache"
INITSCRIPT_NAME_udev = "udev"
@@ -47,14 +49,18 @@ INITSCRIPT_PARAMS_udev-cache = "start 36 S ."
FILES_${PN} += "${libexecdir} ${libdir}/ConsoleKit"
FILES_${PN}-dbg += "${libexecdir}/.debug"
FILES_${PN}-dev = "${datadir}/pkgconfig/udev.pc"
-FILES_libudev = "${base_libdir}/libudev.so.*"
-FILES_libudev-dbg = "${base_libdir}/.debug/libudev.so.*"
-FILES_libudev-dev = "${includedir}/libudev.h ${libdir}/libudev.so ${libdir}/libudev.la \
- ${libdir}/libudev.a ${libdir}/pkgconfig/libudev.pc"
-FILES_libgudev = "${libdir}/libgudev*.so.*"
-FILES_libgudev-dbg = "${libdir}/.debug/libgudev*.so.*"
-FILES_libgudev-dev = "${includedir}/gudev* ${libdir}/libgudev*.so ${libdir}/libgudev*.la \
- ${libdir}/libgudev*.a ${libdir}/pkgconfig/gudev*.pc"
+FILES_libudev = "${base_libdir}/libudev${SOLIBS}"
+FILES_libudev-dbg = "${base_libdir}/.debug/libudev${SOLIBS}"
+FILES_libudev-dev = "${includedir}/libudev.h ${libdir}/libudev${SOLIBSDEV} ${libdir}/libudev.la \
+ ${libdir}/pkgconfig/libudev.pc"
+FILES_libudev-staticdev = "${libdir}/libudev.a"
+RDEPENDS_libudev-staticdev = "libudev-dev (= ${EXTENDPKGV})"
+FILES_libgudev = "${libdir}/libgudev*${SOLIBS}"
+FILES_libgudev-dbg = "${libdir}/.debug/libgudev*${SOLIBS}"
+FILES_libgudev-dev = "${includedir}/gudev* ${libdir}/libgudev*${SOLIBSDEV} ${libdir}/libgudev*.la \
+ ${libdir}/pkgconfig/gudev*.pc"
+FILES_libgudev-staticdev = "${libdir}/libgudev.a"
+RDEPENDS_libgudev-staticdev = "libgudev-dev (= ${EXTENDPKGV})"
FILES_udev-cache = "${sysconfdir}/init.d/udev-cache"
do_install_append () {
diff --git a/meta/recipes-core/udev/udev_164.bb b/meta/recipes-core/udev/udev_164.bb
index 567e62e..bee0bad 100644
--- a/meta/recipes-core/udev/udev_164.bb
+++ b/meta/recipes-core/udev/udev_164.bb
@@ -1,6 +1,6 @@
include udev-new.inc
-PR = "r3"
+PR = "${INC_PR}.0"
SRC_URI[md5sum] = "fddac2d54761ea34865af9467377ca9f"
SRC_URI[sha256sum] = "c12e66280b5e1465f6587a8cfa47d7405c4caa7e52ce5dd13478d04f6ec05e5c"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH V2 15/25] liba52: Use bitbake default FILES for packaging
2011-07-13 7:33 [PATCH V2 00/25] Static Library Updated Saul Wold
` (13 preceding siblings ...)
2011-07-13 7:33 ` [PATCH V2 14/25] udev: " Saul Wold
@ 2011-07-13 7:33 ` Saul Wold
2011-07-13 7:33 ` [PATCH V2 16/25] python: " Saul Wold
` (10 subsequent siblings)
25 siblings, 0 replies; 31+ messages in thread
From: Saul Wold @ 2011-07-13 7:33 UTC (permalink / raw)
To: openembedded-core
This will ensure correct -dev and -staticdev packging
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-multimedia/liba52/liba52_0.7.4.bb | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-multimedia/liba52/liba52_0.7.4.bb b/meta/recipes-multimedia/liba52/liba52_0.7.4.bb
index 175e494..6f2c724 100644
--- a/meta/recipes-multimedia/liba52/liba52_0.7.4.bb
+++ b/meta/recipes-multimedia/liba52/liba52_0.7.4.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
file://include/a52.h;beginline=1;endline=12;md5=81152ceb3562bf20a60d1b6018175dd1"
SECTION = "libs"
-PR = "r3"
+PR = "r4"
inherit autotools
@@ -19,7 +19,5 @@ EXTRA_OECONF = " --enable-shared "
PACKAGES =+ "a52dec 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_a52dec = " ${bindir}/* "
FILES_a52dec-doc = " ${mandir}/man1/* "
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH V2 16/25] python: Use bitbake default FILES for packaging
2011-07-13 7:33 [PATCH V2 00/25] Static Library Updated Saul Wold
` (14 preceding siblings ...)
2011-07-13 7:33 ` [PATCH V2 15/25] liba52: " Saul Wold
@ 2011-07-13 7:33 ` Saul Wold
2011-07-13 7:33 ` [PATCH V2 17/25] external-csl-toolchain: " Saul Wold
` (9 subsequent siblings)
25 siblings, 0 replies; 31+ messages in thread
From: Saul Wold @ 2011-07-13 7:33 UTC (permalink / raw)
To: openembedded-core
This will ensure correct -dev and -staticdev packging
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-devtools/python/python_2.6.6.bb | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-devtools/python/python_2.6.6.bb b/meta/recipes-devtools/python/python_2.6.6.bb
index b324eb9..dbf27fa 100644
--- a/meta/recipes-devtools/python/python_2.6.6.bb
+++ b/meta/recipes-devtools/python/python_2.6.6.bb
@@ -1,7 +1,7 @@
require python.inc
DEPENDS = "python-native db gdbm openssl readline sqlite3 zlib"
DEPENDS_sharprom = "python-native db readline zlib gdbm openssl"
-PR = "${INC_PR}.7"
+PR = "${INC_PR}.8"
LIC_FILES_CHKSUM = "file://LICENSE;md5=38fdd546420fab09ac6bd3d8a1c83eb6"
DISTRO_SRC_URI ?= "file://sitecustomize.py"
@@ -122,10 +122,8 @@ FILES_${PN}-dev = "\
${includedir} \
${libdir}/lib*${SOLIBSDEV} \
${libdir}/*.la \
- ${libdir}/*.a \
${libdir}/*.o \
${libdir}/pkgconfig \
- ${base_libdir}/*.a \
${base_libdir}/*.o \
${datadir}/aclocal \
${datadir}/pkgconfig \
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH V2 17/25] external-csl-toolchain: Use bitbake default FILES for packaging
2011-07-13 7:33 [PATCH V2 00/25] Static Library Updated Saul Wold
` (15 preceding siblings ...)
2011-07-13 7:33 ` [PATCH V2 16/25] python: " Saul Wold
@ 2011-07-13 7:33 ` Saul Wold
2011-07-13 7:33 ` [PATCH V2 18/25] opkg: " Saul Wold
` (8 subsequent siblings)
25 siblings, 0 replies; 31+ messages in thread
From: Saul Wold @ 2011-07-13 7:33 UTC (permalink / raw)
To: openembedded-core
This will ensure correct -dev and -staticdev packging
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../meta/external-csl-toolchain_2008q3-72.bb | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/meta/recipes-core/meta/external-csl-toolchain_2008q3-72.bb b/meta/recipes-core/meta/external-csl-toolchain_2008q3-72.bb
index a874c8b..10de402 100644
--- a/meta/recipes-core/meta/external-csl-toolchain_2008q3-72.bb
+++ b/meta/recipes-core/meta/external-csl-toolchain_2008q3-72.bb
@@ -18,7 +18,7 @@ PROVIDES = "\
virtual/linux-libc-headers "
RPROVIDES = "glibc-utils libsegfault glibc-thread-db"
PACKAGES_DYNAMIC = "glibc-gconv-*"
-PR = "r1"
+PR = "r2"
#SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-linux-gnueabi/arm-${PV}-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2"
@@ -34,8 +34,8 @@ do_install() {
cp -a ${EXTERNAL_TOOLCHAIN}/arm-none-linux-gnueabi/libc/sbin/* ${D}${base_sbindir}
cp -a ${EXTERNAL_TOOLCHAIN}/arm-none-linux-gnueabi/libc/usr/* ${D}/usr
- sed -i -e "s# /lib# ../../lib#g" -e "s# /usr/lib# .#g" ${D}${libdir}/libc.so
- sed -i -e "s# /lib# ../../lib#g" -e "s# /usr/lib# .#g" ${D}${libdir}/libpthread.so
+ sed -i -e "s# /lib# ../../lib#g" -e "s# /usr/lib# .#g" ${D}${libdir}/libc${SOLIBSDEV}
+ sed -i -e "s# /lib# ../../lib#g" -e "s# /usr/lib# .#g" ${D}${libdir}/libpthread${SOLIBSDEV}
}
GLIBC_INTERNAL_USE_BINARY_LOCALE ?= "compile"
@@ -43,16 +43,18 @@ GLIBC_INTERNAL_USE_BINARY_LOCALE ?= "compile"
inherit libc-common
inherit libc-package
-PACKAGES += "libgcc libgcc-dev libstdc++ libstdc++-dev linux-libc-headers"
-FILES_libgcc = "${base_libdir}/libgcc_s.so.1"
-FILES_libgcc-dev = "${base_libdir}/libgcc_s.so"
-FILES_libstdc++ = "${libdir}/libstdc++.so.*"
+PACKAGES += "libgcc libgcc-dev libstdc++ libstdc++-dev libstdc++-staticdev linux-libc-headers"
+FILES_libgcc = "${base_libdir}/libgcc_s${SOLIBS}"
+FILES_libgcc-dev = "${base_libdir}/libgcc_s${SOLIBSDEV}"
+FILES_libstdc++ = "${libdir}/libstdc++${SOLIBS}"
FILES_libstdc++-dev = "${includedir}/c++/${PV} \
- ${libdir}/libstdc++.so \
+ ${libdir}/libstdc++${SOLIBSDEV} \
${libdir}/libstdc++.la \
+ ${libdir}/libsupc++.la"
+FILES_libstdc++-staticdev = " \
${libdir}/libstdc++.a \
- ${libdir}/libsupc++.la \
${libdir}/libsupc++.a"
+RDEPENDS_libstdc++-staticdev = "libstdc++-dev ( = ${EXTENDPKGV})"
FILES_linux-libc-headers = "${includedir}/asm* \
${includedir}/linux \
${includedir}/mtd \
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH V2 18/25] opkg: Use bitbake default FILES for packaging
2011-07-13 7:33 [PATCH V2 00/25] Static Library Updated Saul Wold
` (16 preceding siblings ...)
2011-07-13 7:33 ` [PATCH V2 17/25] external-csl-toolchain: " Saul Wold
@ 2011-07-13 7:33 ` Saul Wold
2011-07-13 7:33 ` [PATCH V2 19/25] util-linux: " Saul Wold
` (7 subsequent siblings)
25 siblings, 0 replies; 31+ messages in thread
From: Saul Wold @ 2011-07-13 7:33 UTC (permalink / raw)
To: openembedded-core
This will ensure correct -dev and -staticdev packging
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-devtools/opkg/opkg_0.1.8.bb | 10 ++++++----
meta/recipes-devtools/opkg/opkg_svn.bb | 10 ++++++----
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/meta/recipes-devtools/opkg/opkg_0.1.8.bb b/meta/recipes-devtools/opkg/opkg_0.1.8.bb
index 18cf042..f43cbc5 100644
--- a/meta/recipes-devtools/opkg/opkg_0.1.8.bb
+++ b/meta/recipes-devtools/opkg/opkg_0.1.8.bb
@@ -13,13 +13,15 @@ SRC_URI = "http://opkg.googlecode.com/files/opkg-${PV}.tar.gz \
file://headerfix.patch \
"
-PR = "r4"
+PR = "r5"
-PACKAGES =+ "libopkg${PKGSUFFIX}-dev libopkg${PKGSUFFIX} update-alternatives-cworth${PKGSUFFIX}"
+PACKAGES =+ "libopkg${PKGSUFFIX}-dev libopkg${PKGSUFFIX}-staticdev libopkg${PKGSUFFIX} update-alternatives-cworth${PKGSUFFIX}"
FILES_update-alternatives-cworth${PKGSUFFIX} = "${bindir}/update-alternatives"
-FILES_libopkg${PKGSUFFIX}-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so"
-FILES_libopkg${PKGSUFFIX} = "${libdir}/*.so.* ${localstatedir}/lib/opkg/"
+FILES_libopkg${PKGSUFFIX} = "${libdir}/*${SOLIBS} ${localstatedir}/lib/opkg/"
+FILES_libopkg${PKGSUFFIX}-dev = "${libdir}/*.la ${libdir}/*${SOLIBSDEV}"
+FILES_libopkg${PKGSUFFIX}-staticdev = "${libdir}/*.a"
+RDEPENDS_libopkg${PKGSUFFIX}-staticdev = "libopkg${PKGSUFFIX}-dev (= ${EXTENDPKGV})"
# We need to create the lock directory
do_install_append() {
diff --git a/meta/recipes-devtools/opkg/opkg_svn.bb b/meta/recipes-devtools/opkg/opkg_svn.bb
index 5f07c17..6f81419 100644
--- a/meta/recipes-devtools/opkg/opkg_svn.bb
+++ b/meta/recipes-devtools/opkg/opkg_svn.bb
@@ -17,13 +17,15 @@ S = "${WORKDIR}/trunk"
SRCREV = "609"
PV = "0.1.8+svnr${SRCPV}"
-PR = "r2"
+PR = "r3"
-PACKAGES =+ "libopkg${PKGSUFFIX}-dev libopkg${PKGSUFFIX} update-alternatives-cworth${PKGSUFFIX}"
+PACKAGES =+ "libopkg${PKGSUFFIX}-dev libopkg${PKGSUFFIX}-staticdev libopkg${PKGSUFFIX} update-alternatives-cworth${PKGSUFFIX}"
FILES_update-alternatives-cworth${PKGSUFFIX} = "${bindir}/update-alternatives"
-FILES_libopkg${PKGSUFFIX}-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so"
-FILES_libopkg${PKGSUFFIX} = "${libdir}/*.so.* ${localstatedir}/lib/opkg/"
+FILES_libopkg${PKGSUFFIX}-dev = "${libdir}/*.la ${libdir}/*${SOLIBSDEV}"
+FILES_libopkg${PKGSUFFIX}-staticdev = "${libdir}/*.a"
+RDEPENDS_libopkg${PKGSUFFIX}-staticdev = "libopkg${PKGSUFFIX}-dev (= ${EXTENDPKGV})"
+FILES_libopkg${PKGSUFFIX} = "${libdir}/*${SOLIBS} ${localstatedir}/lib/opkg/"
# We need to create the lock directory
do_install_append() {
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH V2 19/25] util-linux: Use bitbake default FILES for packaging
2011-07-13 7:33 [PATCH V2 00/25] Static Library Updated Saul Wold
` (17 preceding siblings ...)
2011-07-13 7:33 ` [PATCH V2 18/25] opkg: " Saul Wold
@ 2011-07-13 7:33 ` Saul Wold
2011-07-13 7:33 ` [PATCH V2 20/25] gettext: " Saul Wold
` (6 subsequent siblings)
25 siblings, 0 replies; 31+ messages in thread
From: Saul Wold @ 2011-07-13 7:33 UTC (permalink / raw)
To: openembedded-core
This will ensure correct -dev and -staticdev packging
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-core/util-linux/util-linux.inc | 17 ++++++++++++-----
meta/recipes-core/util-linux/util-linux_2.19.1.bb | 2 +-
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index b77266a..52fa173 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 = "r3"
+
inherit autotools gettext pkgconfig
DEPENDS = "zlib ncurses"
DEPENDS_virtclass-native = " lzo-native"
@@ -28,7 +30,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux-ng/v${MAJOR_VERSION}/util-
PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfdisk \
util-linux-swaponoff util-linux-losetup util-linux-umount \
util-linux-mount util-linux-readprofile util-linux-libblkid \
- util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev \
+ util-linux-libblkid-dev util-linux-libblkid-staticdev \
+ util-linux-libuuid util-linux-libuuid-dev util-linux-libuuid-staticdev \
util-linux-uuidgen util-linux-lscpu"
EXTRA_OECONF = "--disable-use-tty-group --disable-makeinstall-chown --enable-elvtune --enable-init --enable-kill --enable-last \
@@ -48,10 +51,14 @@ FILES_util-linux-umount = "${base_bindir}/umount.${PN}"
FILES_util-linux-readprofile = "${base_sbindir}/readprofile"
FILES_util-linux-uuidgen = "${bindir}/uuidgen"
-FILES_util-linux-libblkid = "${libdir}/libblkid.so.*"
-FILES_util-linux-libblkid-dev = "${libdir}/libblkid.so ${libdir}/libblkid.a ${libdir}/libblkid.la ${includedir}/blkid"
-FILES_util-linux-libuuid = "${libdir}/libuuid.so.*"
-FILES_util-linux-libuuid-dev = "${libdir}/libuuid.so ${libdir}/libuuid.a ${libdir}/libuuid.la ${includedir}/uuid"
+FILES_util-linux-libblkid = "${libdir}/libblkid${SOLIBS}"
+FILES_util-linux-libblkid-dev = "${libdir}/libblkid${SOLIBSDEV} ${libdir}/libblkid.la ${includedir}/blkid"
+FILES_util-linux-libblkid-staticdev = "${libdir}/libblkid.a"
+RDEPENDS_util-linux-libblkid-staticdev = "util-linux-libblkid-dev (= ${EXTENDPKGV})"
+FILES_util-linux-libuuid = "${libdir}/libuuid${SOLIBS}"
+FILES_util-linux-libuuid-dev = "${libdir}/libuuid${SOLIBSDEV} ${libdir}/libuuid.la ${includedir}/uuid"
+FILES_util-linux-libuuid-staticdev = "${libdir}/libuuid.a"
+RDEPENDS_util-linux-libuuid-staticdev = "util-linux-libuuid-dev (= ${EXTENDPKGV})"
FILES_util-linux-lscpu = "${bindir}/lscpu"
RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile "
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 0fd67d1..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 = "r2"
+PR = "${INC_PR}.0"
require util-linux.inc
# note that `lscpu' is under GPLv3+
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH V2 20/25] gettext: Use bitbake default FILES for packaging
2011-07-13 7:33 [PATCH V2 00/25] Static Library Updated Saul Wold
` (18 preceding siblings ...)
2011-07-13 7:33 ` [PATCH V2 19/25] util-linux: " Saul Wold
@ 2011-07-13 7:33 ` Saul Wold
2011-07-13 7:33 ` [PATCH V2 21/25] gcc: " Saul Wold
` (5 subsequent siblings)
25 siblings, 0 replies; 31+ messages in thread
From: Saul Wold @ 2011-07-13 7:33 UTC (permalink / raw)
To: openembedded-core
This will ensure correct -dev and -staticdev packging
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-core/gettext/gettext_0.16.1.bb | 6 +++---
meta/recipes-core/gettext/gettext_0.18.1.1.bb | 24 ++++++++++++------------
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/meta/recipes-core/gettext/gettext_0.16.1.bb b/meta/recipes-core/gettext/gettext_0.16.1.bb
index 73e5f55..4b44ede 100644
--- a/meta/recipes-core/gettext/gettext_0.16.1.bb
+++ b/meta/recipes-core/gettext/gettext_0.16.1.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=9ea3144f04c41cd2eada5d3f472e6ea5"
-PR = "r4"
+PR = "r5"
DEPENDS = "virtual/libiconv"
DEPENDS_virtclass-native = ""
PROVIDES = "virtual/libintl virtual/gettext"
@@ -51,5 +51,5 @@ do_configure_prepend() {
# 4 KiB /ep93xx/libgcc-s-dev_4.2.2-r2_ep93xx.ipk
PACKAGES =+ "libgettextlib libgettextsrc"
-FILES_libgettextlib = "${libdir}/libgettextlib-*.so*"
-FILES_libgettextsrc = "${libdir}/libgettextsrc-*.so*"
+FILES_libgettextlib = "${libdir}/libgettextlib-*${SOLIBS}"
+FILES_libgettextsrc = "${libdir}/libgettextsrc-*${SOLIBS}"
diff --git a/meta/recipes-core/gettext/gettext_0.18.1.1.bb b/meta/recipes-core/gettext/gettext_0.18.1.1.bb
index 0b11a90..670af19 100644
--- a/meta/recipes-core/gettext/gettext_0.18.1.1.bb
+++ b/meta/recipes-core/gettext/gettext_0.18.1.1.bb
@@ -5,7 +5,7 @@ SECTION = "libs"
LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-PR = "r1"
+PR = "r2"
DEPENDS = "gettext-native virtual/libiconv ncurses expat"
DEPENDS_virtclass-native = ""
PROVIDES = "virtual/libintl virtual/gettext"
@@ -53,27 +53,27 @@ acpaths = '-I ${S}/gettext-runtime/m4 \
# 4 KiB /ep93xx/libgcc-s-dev_4.2.2-r2_ep93xx.ipk
PACKAGES =+ "libgettextlib libgettextsrc"
-FILES_libgettextlib = "${libdir}/libgettextlib-*.so*"
-FILES_libgettextsrc = "${libdir}/libgettextsrc-*.so*"
+FILES_libgettextlib = "${libdir}/libgettextlib-*${SOLIBS}"
+FILES_libgettextsrc = "${libdir}/libgettextsrc-*${SOLIBS}"
-PACKAGES =+ "gettext-runtime gettext-runtime-dev gettext-runtime-doc"
+PACKAGES =+ "gettext-runtime gettext-runtime-dev gettext-runtime-staticdev gettext-runtime-doc"
FILES_gettext-runtime = "${bindir}/gettext \
${bindir}/ngettext \
${bindir}/envsubst \
${bindir}/gettext.sh \
- ${libdir}/libasprintf.so* \
+ ${libdir}/libasprintf${SOLIBS} \
${libdir}/GNU.Gettext.dll \
"
-FILES_gettext-runtime_append_libc-uclibc = " ${libdir}/libintl.so* \
+FILES_gettext-runtime_append_libc-uclibc = " ${libdir}/libintl${SOLIBS} \
${libdir}/charset.alias \
"
-FILES_gettext-runtime-dev += "${libdir}/libasprintf.a \
- ${includedir}/autosprintf.h \
- "
-FILES_gettext-runtime-dev_append_libc-uclibc = " ${libdir}/libintl.a \
- ${includedir}/libintl.h \
- "
+FILES_gettext-runtime-dev += "${includedir}/autosprintf.h"
+FILES_gettext-runtime-staticdev = "${libdir}/libasprintf.a"
+FILES_gettext-runtime-dev_append_libc-uclibc = " ${includedir}/libintl.h"
+FILES_gettext-runtime-staticdev_append_libc-uclibc = " ${libdir}/libintl.a"
+RDEPENDS_gettext-runtime-staticdev = "gettext-runtime-dev (= ${EXTENDPKGV})"
+
FILES_gettext-runtime-doc = "${mandir}/man1/gettext.* \
${mandir}/man1/ngettext.* \
${mandir}/man1/envsubst.* \
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH V2 21/25] gcc: Use bitbake default FILES for packaging
2011-07-13 7:33 [PATCH V2 00/25] Static Library Updated Saul Wold
` (19 preceding siblings ...)
2011-07-13 7:33 ` [PATCH V2 20/25] gettext: " Saul Wold
@ 2011-07-13 7:33 ` Saul Wold
2011-07-13 11:43 ` Phil Blundell
2011-07-13 7:33 ` [PATCH V2 22/25] glibc: " Saul Wold
` (4 subsequent siblings)
25 siblings, 1 reply; 31+ messages in thread
From: Saul Wold @ 2011-07-13 7:33 UTC (permalink / raw)
To: openembedded-core
This will ensure correct -dev and -staticdev packging
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-devtools/gcc/gcc-package-runtime.inc | 25 +++++++++++++++------
meta/recipes-devtools/gcc/libgcc_4.6.bb | 2 +-
2 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/meta/recipes-devtools/gcc/gcc-package-runtime.inc b/meta/recipes-devtools/gcc/gcc-package-runtime.inc
index 7ac68f2..fafb655 100644
--- a/meta/recipes-devtools/gcc/gcc-package-runtime.inc
+++ b/meta/recipes-devtools/gcc/gcc-package-runtime.inc
@@ -3,14 +3,19 @@ PACKAGES = "\
libstdc++ \
libstdc++-precompile-dev \
libstdc++-dev \
+ libstdc++-staticdev \
libg2c \
libg2c-dev \
+ libg2c-staticdev \
libssp \
libssp-dev \
+ libssp-staticdev \
libgfortran \
libgfortran-dev \
+ libgfortran-staticdev \
libmudflap \
libmudflap-dev \
+ libmudflap-staticdev \
"
# The base package doesn't exist, so we clear the recommends.
RRECOMMENDS_${PN}-dbg = ""
@@ -23,36 +28,42 @@ FILES_${PN}-dbg += "\
FILES_libg2c = "${target_libdir}/libg2c.so.*"
FILES_libg2c-dev = "\
${libdir}/libg2c.so \
+FILES_libg2c-staticdev = "\
${libdir}/libg2c.a \
${libdir}/libfrtbegin.a"
-
+RDEPENDS_libg2c-staticdev = "libg2c-dev (= ${EXTENDPKGV})"
FILES_libstdc++ = "${libdir}/libstdc++.so.*"
FILES_libstdc++-dev = "\
${includedir}/c++/ \
${libdir}/libstdc++.so \
${libdir}/libstdc++.la \
- ${libdir}/libstdc++.a \
${libdir}/libsupc++.la \
+FILES_libstdc++-staticdev = " \
+ ${libdir}/libstdc++.a \
${libdir}/libsupc++.a"
+RDEPENDS_libstdc++-staticdev = "libstdc++-dev (= ${EXTENDPKGV})"
FILES_libstdc++-precompile-dev = "${includedir}/c++/${TARGET_SYS}/bits/*.gch"
FILES_libssp = "${libdir}/libssp.so.*"
FILES_libssp-dev = " \
${libdir}/libssp*.so \
- ${libdir}/libssp*.a \
${libdir}/libssp*.la \
+ ${libdir}/libssp_nonshared.a \
${libdir}/gcc/${TARGET_SYS}/${BINV}/include/ssp"
+FILES_libssp-staticdev = "${libdir}/libssp.a"
+RDEPENDS_libssp-staticdev = "libssp-dev (= ${EXTENDPKGV})"
FILES_libgfortran = "${libdir}/libgfortran.so.*"
-FILES_libgfortran-dev = " \
+FILES_libgfortran-dev = "${libdir}/libgfortran.so"
+FILES_libgfortran-staticdev = " \
${libdir}/libgfortran.a \
- ${libdir}/libgfortran.so \
${libdir}/libgfortranbegin.a"
+RDEPENDS_libfortran-staticdev = "libfortran-dev (= ${EXTENDPKGV})"
FILES_libmudflap = "${libdir}/libmudflap*.so.*"
FILES_libmudflap-dev = "\
${libdir}/libmudflap*.so \
- ${libdir}/libmudflap*.a \
${libdir}/libmudflap*.la"
-
+FILES_libmudflap-staticdev = "${libdir}/libmudflap*.a"
+RDEPENDS_libmudflap-staticdev = "libmudflap-dev (= ${EXTENDPKGV})"
diff --git a/meta/recipes-devtools/gcc/libgcc_4.6.bb b/meta/recipes-devtools/gcc/libgcc_4.6.bb
index b0523c7..71130bf 100644
--- a/meta/recipes-devtools/gcc/libgcc_4.6.bb
+++ b/meta/recipes-devtools/gcc/libgcc_4.6.bb
@@ -1,6 +1,6 @@
require gcc-${PV}.inc
-PR = "r0"
+PR = "r1"
INHIBIT_DEFAULT_DEPS = "1"
DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH V2 22/25] glibc: Use bitbake default FILES for packaging
2011-07-13 7:33 [PATCH V2 00/25] Static Library Updated Saul Wold
` (20 preceding siblings ...)
2011-07-13 7:33 ` [PATCH V2 21/25] gcc: " Saul Wold
@ 2011-07-13 7:33 ` Saul Wold
2011-07-13 7:33 ` [PATCH V2 23/25] eglibc: " Saul Wold
` (3 subsequent siblings)
25 siblings, 0 replies; 31+ messages in thread
From: Saul Wold @ 2011-07-13 7:33 UTC (permalink / raw)
To: openembedded-core
This will ensure correct -dev and -staticdev packging
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-core/glibc/glibc-package.inc | 12 ++++++++----
meta/recipes-core/glibc/glibc_2.10.1.bb | 2 +-
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc
index c1c3853..5337de5 100644
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -20,13 +20,14 @@ PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
PACKAGES = "${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFIX} \
ldd${PKGSUFFIX} ${PN}-utils ${PN}-dev ${PN}-doc \
libsegfault${PKGSUFFIX} ${PN}-extra-nss ${PN}-thread-db \
- ${PN}-pcprofile"
+ ${PN}-pcprofile ${PN}-staticdev"
libc_baselibs = "${base_libdir}/libc* ${base_libdir}/libm* ${base_libdir}/ld* \
${base_libdir}/libpthread* ${base_libdir}/libresolv* ${base_libdir}/librt* \
${base_libdir}/libutil* ${base_libdir}/libnsl* ${base_libdir}/libnss_files* \
${base_libdir}/libnss_compat* ${base_libdir}/libnss_dns* ${base_libdir}/libdl* \
- ${base_libdir}/libanl* ${base_libdir}/libBrokenLocale*"
+ ${base_libdir}/libanl* ${base_libdir}/libBrokenLocale* \
+ ${base_libdir}/lib*nonshared.a"
# The problem is that if PN = "glibc", FILES_${PN} will overwrite FILES_glibc
# Solution: Make them both the same thing, then it doesn't matter
@@ -37,8 +38,9 @@ glibcdbgfiles = "${bindir}/.debug ${sbindir}/.debug ${libdir}/.debug \
${base_bindir}/.debug ${base_sbindir}/.debug ${base_libdir}/.debug \
${libdir}/gconv/.debug ${libexecdir}/*/.debug"
glibcdevfiles = "${bindir}/rpcgen ${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \
- ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig \
- ${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal"
+ ${libdir}/*.o ${libdir}/pkgconfig ${base_libdir}/*.o ${datadir}/aclocal"
+
+glibcstaticdev = "${libdir}/*.a ${base_libdir}/*.a"
FILES_glibc = "${glibcfiles}"
FILES_${PN} = "${glibcfiles}"
@@ -48,6 +50,8 @@ FILES_glibc-extra-nss = "${base_libdir}/libnss*"
FILES_sln = "${base_sbindir}/sln"
FILES_glibc-dev = "${glibcdevfiles}"
FILES_${PN}-dev = "${glibcdevfiles}"
+FILES_glibc-staticdev = "${glibcstaticdev}"
+FILES_${PN}-staticdev = "${glibcstaticdev}"
FILES_glibc-dbg = "${glibcdbgfiles}"
FILES_${PN}-dbg = "${glibcdbgfiles}"
FILES_nscd${PKGSUFFIX} = "${sbindir}/nscd* ${sysconfdir}/nscd* ${sysconfdir}/init.d/nscd*"
diff --git a/meta/recipes-core/glibc/glibc_2.10.1.bb b/meta/recipes-core/glibc/glibc_2.10.1.bb
index e76f3c0..e092420 100644
--- a/meta/recipes-core/glibc/glibc_2.10.1.bb
+++ b/meta/recipes-core/glibc/glibc_2.10.1.bb
@@ -5,7 +5,7 @@ ARM_INSTRUCTION_SET = "arm"
PACKAGES_DYNAMIC = "libc6*"
RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev"
-PR = "r7"
+PR = "r8"
# the -isystem in bitbake.conf screws up glibc do_stage
BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH V2 23/25] eglibc: Use bitbake default FILES for packaging
2011-07-13 7:33 [PATCH V2 00/25] Static Library Updated Saul Wold
` (21 preceding siblings ...)
2011-07-13 7:33 ` [PATCH V2 22/25] glibc: " Saul Wold
@ 2011-07-13 7:33 ` Saul Wold
2011-07-13 7:33 ` [PATCH V2 24/25] uclibc: " Saul Wold
` (2 subsequent siblings)
25 siblings, 0 replies; 31+ messages in thread
From: Saul Wold @ 2011-07-13 7:33 UTC (permalink / raw)
To: openembedded-core
This will ensure correct -dev and -staticdev packging
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-core/eglibc/eglibc-common.inc | 2 +-
meta/recipes-core/eglibc/eglibc-package.inc | 8 +++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-core/eglibc/eglibc-common.inc b/meta/recipes-core/eglibc/eglibc-common.inc
index d812618..3e9a77e 100644
--- a/meta/recipes-core/eglibc/eglibc-common.inc
+++ b/meta/recipes-core/eglibc/eglibc-common.inc
@@ -3,7 +3,7 @@ DESCRIPTION = "Embedded GLIBC (EGLIBC) is a variant of the GNU C Library (GLIBC)
HOMEPAGE = "http://www.eglibc.org/home"
SECTION = "libs"
LICENSE = "LGPL"
-INC_PR = "r11"
+INC_PR = "r12"
LIC_FILES_CHKSUM ?= "file://LICENSES;md5=07a394b26e0902b9ffdec03765209770 \
file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \
file://posix/rxspencer/COPYRIGHT;md5=dc5485bb394a13b2332ec1c785f5d83a \
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc
index dd40af1..834cf81 100644
--- a/meta/recipes-core/eglibc/eglibc-package.inc
+++ b/meta/recipes-core/eglibc/eglibc-package.inc
@@ -20,7 +20,7 @@ USE_LDCONFIG ?= "1"
PKGSUFFIX = ""
PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
-PACKAGES = "${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFIX} ldd${PKGSUFFIX} ${PN}-utils ${PN}-pic ${PN}-dev eglibc-doc libcidn libmemusage libsegfault${PKGSUFFIX} eglibc-extra-nss eglibc-thread-db${PKGSUFFIX} eglibc-pcprofile libsotruss${PKGSUFFIX}"
+PACKAGES = "${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFIX} ldd${PKGSUFFIX} ${PN}-utils ${PN}-pic ${PN}-dev ${PN}-staticdev eglibc-doc libcidn libmemusage libsegfault${PKGSUFFIX} eglibc-extra-nss eglibc-thread-db${PKGSUFFIX} eglibc-pcprofile libsotruss${PKGSUFFIX}"
# Create a eglibc-binaries
ALLOW_EMPTY_${PN}-binaries = "1"
@@ -50,6 +50,7 @@ RPROVIDES_eglibc-doc = "glibc-doc"
RPROVIDES_eglibc-extra-nss = "glibc-extra-nss"
RPROVIDES_eglibc-thread-db = "glibc-thread-db"
RPROVIDES_eglibc-pcprofile = "glibc-pcprofile"
+RPROVIDES_eglibc-staticdev = "glibc-staticdev"
RPROVIDES_eglibc-dbg = "glibc-dbg"
libc_baselibs = "${base_libdir}/libcrypt*.so.* ${base_libdir}/libcrypt-*.so ${base_libdir}/libc.so.* ${base_libdir}/libc-*.so ${base_libdir}/libm*.so.* ${base_libdir}/libm-*.so ${base_libdir}/ld*.so.* ${base_libdir}/ld-*.so ${base_libdir}/libpthread*.so.* ${base_libdir}/libpthread-*.so ${base_libdir}/libresolv*.so.* ${base_libdir}/libresolv-*.so ${base_libdir}/librt*.so.* ${base_libdir}/librt-*.so ${base_libdir}/libutil*.so.* ${base_libdir}/libutil-*.so ${base_libdir}/libnsl*.so.* ${base_libdir}/libnsl-*.so ${base_libdir}/libnss_files*.so.* ${base_libdir}/libnss_files-*.so ${base_libdir}/libnss_compat*.so.* ${base_libdir}/libnss_compat-*.so ${base_libdir}/libnss_dns*.so.* ${base_libdir}/libnss_dns-*.so ${base_libdir}/libdl*.so.* ${base_libdir}/libdl-*.so ${base_libdir}/libanl*.so.* ${base_libdir}/libanl-*.so ${base_libdir}/libBrokenLocale*.so.* ${base_libdir}/libBrokenLocale-*.so"
@@ -62,8 +63,9 @@ FILES_eglibc-extra-nss = "${base_libdir}/libnss*"
FILES_sln = "/sbin/sln"
FILES_eglibc-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/"
FILES_libsotruss${PKGSUFFIX} = "${libdir}/audit/sotruss-lib.so"
-FILES_eglibc-dev_append += "${bindir}/rpcgen ${libdir}/*.a \
- ${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal"
+FILES_eglibc-dev_append = "${bindir}/rpcgen ${base_libdir}/*.o ${datadir}/aclocal ${libdir}/lib*_nonshared.a"
+FILES_eglibc-staticdev_append = "${libdir}/*.a ${base_libdir}/*.a"
+RDEPENDS_eglibc-staticdev = "eglibc-dev (= ${EXTENDPKGV})"
FILES_nscd${PKGSUFFIX} = "${sbindir}/nscd*"
FILES_eglibc-utils = "${bindir}/* ${sbindir}/*"
FILES_${PN}-dbg += "${libexecdir}/*/.debug ${libdir}/audit/.debug"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH V2 24/25] uclibc: Use bitbake default FILES for packaging
2011-07-13 7:33 [PATCH V2 00/25] Static Library Updated Saul Wold
` (22 preceding siblings ...)
2011-07-13 7:33 ` [PATCH V2 23/25] eglibc: " Saul Wold
@ 2011-07-13 7:33 ` Saul Wold
2011-07-13 7:33 ` [PATCH V2 25/25] binutils: " Saul Wold
2011-07-13 10:07 ` [PATCH V2 00/25] Static Library Updated Richard Purdie
25 siblings, 0 replies; 31+ messages in thread
From: Saul Wold @ 2011-07-13 7:33 UTC (permalink / raw)
To: openembedded-core
This will ensure correct -dev and -staticdev packging
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-core/uclibc/uclibc.inc | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-core/uclibc/uclibc.inc b/meta/recipes-core/uclibc/uclibc.inc
index 23a8ecb..e16371b 100644
--- a/meta/recipes-core/uclibc/uclibc.inc
+++ b/meta/recipes-core/uclibc/uclibc.inc
@@ -13,7 +13,7 @@ SECTION = "libs"
LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \
file://COPYING.LIB.boilerplate;md5=aaddeadcddeb918297e0e4afc52ce46f \
file://${S}/test/regex/testregex.c;startline=1;endline=31;md5=234efb227d0a40677f895e4a1e26e960"
-INC_PR = "r2"
+INC_PR = "r4"
require uclibc-config.inc
STAGINGCC = "gcc-cross-intermediate"
@@ -71,12 +71,13 @@ FILES_${PN} = "${sysconfdir} ${uclibc_baselibs} /sbin/ldconfig \
FILES_ldd = "${bindir}/ldd"
FILES_uclibc-dev_append = "\
${libdir}/lib*.so \
- ${libdir}/*_nonshared.a \
+ ${libdir}/lib*_nonshared.a \
${libdir}/[S]*crt[1in].o \
${libdir}/crtreloc*.o \
- ${libdir}/lib*.a \
${includedir}/*.h ${includedir}/*/*.h \
"
+
+FILES_uclibc-staticdev_append = "${libdir}/lib*.a"
FILES_uclibc-utils = "${bindir} ${sbindir}"
FILES_uclibc-utils-dbg += "${bindir}/.debug ${sbindir}/.debug"
FILES_uclibc-gconv = "${libdir}/gconv"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH V2 25/25] binutils: Use bitbake default FILES for packaging
2011-07-13 7:33 [PATCH V2 00/25] Static Library Updated Saul Wold
` (23 preceding siblings ...)
2011-07-13 7:33 ` [PATCH V2 24/25] uclibc: " Saul Wold
@ 2011-07-13 7:33 ` Saul Wold
2011-07-13 10:07 ` [PATCH V2 00/25] Static Library Updated Richard Purdie
25 siblings, 0 replies; 31+ messages in thread
From: Saul Wold @ 2011-07-13 7:33 UTC (permalink / raw)
To: openembedded-core
This will ensure correct -dev and -staticdev packging
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../binutils/binutils-cross-canadian_2.21.1.bb | 2 +-
meta/recipes-devtools/binutils/binutils-cross.inc | 2 ++
.../binutils/binutils-cross_csl-arm-2008q1.bb | 2 +-
.../binutils/binutils-crosssdk_2.21.1.bb | 2 +-
meta/recipes-devtools/binutils/binutils.inc | 9 ++-------
meta/recipes-devtools/binutils/binutils_2.21.1.bb | 2 +-
6 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.21.1.bb b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.21.1.bb
index 7dad2a6..e2af092 100644
--- a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.21.1.bb
+++ b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.21.1.bb
@@ -1,3 +1,3 @@
require binutils_${PV}.bb
require binutils-cross-canadian.inc
-PR = "r0"
+PR = "${INC_PR}.2"
diff --git a/meta/recipes-devtools/binutils/binutils-cross.inc b/meta/recipes-devtools/binutils/binutils-cross.inc
index 5a41970..87bfe5a 100644
--- a/meta/recipes-devtools/binutils/binutils-cross.inc
+++ b/meta/recipes-devtools/binutils/binutils-cross.inc
@@ -1,6 +1,8 @@
inherit cross
PROVIDES = "virtual/${TARGET_PREFIX}binutils"
+INC_PR = "r2"
+
EXTRA_OECONF = "--with-sysroot=${STAGING_DIR_TARGET} \
--program-prefix=${TARGET_PREFIX} \
--disable-install-libbfd \
diff --git a/meta/recipes-devtools/binutils/binutils-cross_csl-arm-2008q1.bb b/meta/recipes-devtools/binutils/binutils-cross_csl-arm-2008q1.bb
index 8ab1e7f..f7a2c48 100644
--- a/meta/recipes-devtools/binutils/binutils-cross_csl-arm-2008q1.bb
+++ b/meta/recipes-devtools/binutils/binutils-cross_csl-arm-2008q1.bb
@@ -1,3 +1,3 @@
require binutils_csl-arm-2008q1.bb
require binutils-cross.inc
-PR = "r1"
+PR = "${INC_PR}.0"
diff --git a/meta/recipes-devtools/binutils/binutils-crosssdk_2.21.1.bb b/meta/recipes-devtools/binutils/binutils-crosssdk_2.21.1.bb
index 0d6efff..7508cdf 100644
--- a/meta/recipes-devtools/binutils/binutils-crosssdk_2.21.1.bb
+++ b/meta/recipes-devtools/binutils/binutils-crosssdk_2.21.1.bb
@@ -4,7 +4,7 @@ inherit crosssdk
PROVIDES = "virtual/${TARGET_PREFIX}binutils-crosssdk"
-PR = "r0"
+PR = "${INC_PR}.2"
do_configure_prepend () {
sed -i 's#/usr/local/lib /lib /usr/lib#${SDKPATHNATIVE}/lib ${SDKPATHNATIVE}/usr/lib /usr/local/lib /lib /usr/lib#' ${S}/ld/configure.tgt
diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc
index 08c14b2..8085a21 100644
--- a/meta/recipes-devtools/binutils/binutils.inc
+++ b/meta/recipes-devtools/binutils/binutils.inc
@@ -11,6 +11,8 @@ BUGTRACKER = "http://sourceware.org/bugzilla/"
SECTION = "devel"
LICENSE = "GPLv3"
+INC_PR = "r2"
+
DEPENDS = "flex-native bison-native zlib-native"
inherit autotools gettext
@@ -22,13 +24,6 @@ FILES_${PN} = " \
${libdir}/lib*-*.so \
${prefix}/${TARGET_SYS}/bin/*"
-FILES_${PN}-dev = " \
- ${includedir} \
- ${libdir}/*.a \
- ${libdir}/*.la \
- ${libdir}/libbfd.so \
- ${libdir}/libopcodes.so"
-
FILES_${PN}-symlinks = " \
${bindir}/addr2line \
${bindir}/as \
diff --git a/meta/recipes-devtools/binutils/binutils_2.21.1.bb b/meta/recipes-devtools/binutils/binutils_2.21.1.bb
index 368ec4a..76e8fdc 100644
--- a/meta/recipes-devtools/binutils/binutils_2.21.1.bb
+++ b/meta/recipes-devtools/binutils/binutils_2.21.1.bb
@@ -1,6 +1,6 @@
require binutils.inc
-PR = "r0"
+PR = "${INC_PR}.2"
LIC_FILES_CHKSUM="\
file://src-release;endline=17;md5=4830a9ef968f3b18dd5e9f2c00db2d35\
--
1.7.3.4
^ permalink raw reply related [flat|nested] 31+ messages in thread
* Re: [PATCH V2 08/25] curl: inherit shlibpackaging class
2011-07-13 7:33 ` [PATCH V2 08/25] curl: " Saul Wold
@ 2011-07-13 9:14 ` Phil Blundell
0 siblings, 0 replies; 31+ messages in thread
From: Phil Blundell @ 2011-07-13 9:14 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
I'm slightly confused about what's going on with the various subpackages
in these recipes now.
As far as I can tell, the current shlibpackaging.bbclass just does:
PACKAGES =+ "lib${PN}"
FILES_lib${PN} = "${libdir}/*${SOLIBS} ${base_libdir}/*${SOLIBS}"
RDEPENDS_lib${PN} = "${PN}"
i.e. it doesn't create a lib${PN}-dev or lib${PN}-doc package. But:
On Wed, 2011-07-13 at 00:33 -0700, Saul Wold wrote:
> -PACKAGES += "${PN}-certs libcurl libcurl-dev libcurl-doc"
> +PACKAGES += "${PN}-certs"
[...]
> +FILES_lib${PN}-dev =+ "${libdir}/pkgconfig \
> ${datadir}/aclocal \
> ${bindir}/*-config"
>
> -FILES_lib${PN}-doc = "${mandir}/man3 \
> - ${mandir}/man1/curl-config.1"
> +
> +FILES_lib${PN}-doc =+ "${mandir}/man1/curl-config.1"
... it seems that curl is still appending the FILES for those two even
though it isn't adding them to PACKAGES anymore. Where do they come
from now, and where are the default FILES defined?
p.
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH V2 02/25] shlibpackaging.bbclass: create common class
2011-07-13 7:33 ` [PATCH V2 02/25] shlibpackaging.bbclass: create common class Saul Wold
@ 2011-07-13 9:17 ` Phil Blundell
0 siblings, 0 replies; 31+ messages in thread
From: Phil Blundell @ 2011-07-13 9:17 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Wed, 2011-07-13 at 00:33 -0700, Saul Wold wrote:
> +RDEPENDS_lib${PN} = "${PN}"
Why do we want lib${PN} to have a hard dependency on ${PN}? This seems
somewhat backwards to me.
Also, if ${PN} is the one with the binaries then it will get an
auto-generated dependency back to lib${PN} anyway and it looks like this
will cause a dependency loop.
Also also, if it really is correct for lib${PN} to RDEPEND on ${PN}
then, in the general case, it probably ought to be a precisely versioned
dependency to guarantee correctness. Individual recipes can relax that
if they want to.
p.
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH V2 14/25] udev: Use bitbake default FILES for packaging
2011-07-13 7:33 ` [PATCH V2 14/25] udev: " Saul Wold
@ 2011-07-13 9:38 ` Phil Blundell
0 siblings, 0 replies; 31+ messages in thread
From: Phil Blundell @ 2011-07-13 9:38 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
It's not totally obvious to me that the change below really matches the
description "Use bitbake default FILES". As far as I can tell, after
this patch the recipe actually contains more assignments to FILES_xx
than it did before, whereas if the "default FILES" were being used I
would naively have expected the number of assignments to go down.
If I'm reading the patch right, the real changes are:
- now uses ${SOLIBS}/${SOLIBSDEV} for shared library globs
- added -staticdev packages for libudev and libgudev
- now uses INC_PR for versioning
All of those look like commendable things to be doing but none of them
seem to be mentioned in the changelog.
p.
On Wed, 2011-07-13 at 00:33 -0700, Saul Wold wrote:
> This will ensure correct -dev and -staticdev packging
>
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
> meta/recipes-core/udev/udev-new.inc | 26 ++++++++++++++++----------
> meta/recipes-core/udev/udev_164.bb | 2 +-
> 2 files changed, 17 insertions(+), 11 deletions(-)
>
> diff --git a/meta/recipes-core/udev/udev-new.inc b/meta/recipes-core/udev/udev-new.inc
> index 4c4451f..6e49e42 100644
> --- a/meta/recipes-core/udev/udev-new.inc
> +++ b/meta/recipes-core/udev/udev-new.inc
> @@ -10,6 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
> file://libudev/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
> file://extras/gudev/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
>
> +INC_PR = "r4"
> +
> DEPENDS = "acl glib-2.0 libusb usbutils pciutils linux-libc-headers gperf-native libxslt-native"
> RPROVIDES_${PN} = "hotplug"
> RRECOMMENDS_${PN} += "udev-extraconf udev-cache usbutils-ids pciutils-ids"
> @@ -35,8 +37,8 @@ libexecdir = "${base_libdir}/udev"
> EXTRA_OECONF = "--disable-introspection --with-rootlibdir=${base_libdir} \
> --with-pci-ids-path=${datadir}/pci.ids"
>
> -PACKAGES =+ "udev-cache libudev libudev-dev libudev-dbg"
> -PACKAGES =+ "libgudev libgudev-dev libgudev-dbg"
> +PACKAGES =+ "udev-cache libudev libudev-dev libudev-dbg libudev-staticdev"
> +PACKAGES =+ "libgudev libgudev-dev libgudev-dbg libgudev-staticdev"
>
> INITSCRIPT_PACKAGES = "udev udev-cache"
> INITSCRIPT_NAME_udev = "udev"
> @@ -47,14 +49,18 @@ INITSCRIPT_PARAMS_udev-cache = "start 36 S ."
> FILES_${PN} += "${libexecdir} ${libdir}/ConsoleKit"
> FILES_${PN}-dbg += "${libexecdir}/.debug"
> FILES_${PN}-dev = "${datadir}/pkgconfig/udev.pc"
> -FILES_libudev = "${base_libdir}/libudev.so.*"
> -FILES_libudev-dbg = "${base_libdir}/.debug/libudev.so.*"
> -FILES_libudev-dev = "${includedir}/libudev.h ${libdir}/libudev.so ${libdir}/libudev.la \
> - ${libdir}/libudev.a ${libdir}/pkgconfig/libudev.pc"
> -FILES_libgudev = "${libdir}/libgudev*.so.*"
> -FILES_libgudev-dbg = "${libdir}/.debug/libgudev*.so.*"
> -FILES_libgudev-dev = "${includedir}/gudev* ${libdir}/libgudev*.so ${libdir}/libgudev*.la \
> - ${libdir}/libgudev*.a ${libdir}/pkgconfig/gudev*.pc"
> +FILES_libudev = "${base_libdir}/libudev${SOLIBS}"
> +FILES_libudev-dbg = "${base_libdir}/.debug/libudev${SOLIBS}"
> +FILES_libudev-dev = "${includedir}/libudev.h ${libdir}/libudev${SOLIBSDEV} ${libdir}/libudev.la \
> + ${libdir}/pkgconfig/libudev.pc"
> +FILES_libudev-staticdev = "${libdir}/libudev.a"
> +RDEPENDS_libudev-staticdev = "libudev-dev (= ${EXTENDPKGV})"
> +FILES_libgudev = "${libdir}/libgudev*${SOLIBS}"
> +FILES_libgudev-dbg = "${libdir}/.debug/libgudev*${SOLIBS}"
> +FILES_libgudev-dev = "${includedir}/gudev* ${libdir}/libgudev*${SOLIBSDEV} ${libdir}/libgudev*.la \
> + ${libdir}/pkgconfig/gudev*.pc"
> +FILES_libgudev-staticdev = "${libdir}/libgudev.a"
> +RDEPENDS_libgudev-staticdev = "libgudev-dev (= ${EXTENDPKGV})"
> FILES_udev-cache = "${sysconfdir}/init.d/udev-cache"
>
> do_install_append () {
> diff --git a/meta/recipes-core/udev/udev_164.bb b/meta/recipes-core/udev/udev_164.bb
> index 567e62e..bee0bad 100644
> --- a/meta/recipes-core/udev/udev_164.bb
> +++ b/meta/recipes-core/udev/udev_164.bb
> @@ -1,6 +1,6 @@
> include udev-new.inc
>
> -PR = "r3"
> +PR = "${INC_PR}.0"
>
> SRC_URI[md5sum] = "fddac2d54761ea34865af9467377ca9f"
> SRC_URI[sha256sum] = "c12e66280b5e1465f6587a8cfa47d7405c4caa7e52ce5dd13478d04f6ec05e5c"
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH V2 00/25] Static Library Updated
2011-07-13 7:33 [PATCH V2 00/25] Static Library Updated Saul Wold
` (24 preceding siblings ...)
2011-07-13 7:33 ` [PATCH V2 25/25] binutils: " Saul Wold
@ 2011-07-13 10:07 ` Richard Purdie
25 siblings, 0 replies; 31+ messages in thread
From: Richard Purdie @ 2011-07-13 10:07 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
Hi Saul,
I know we touched on this when we've talked but I'm not sure you saw
what I was getting and and its probably better to ask this question on
the list anyhow.
Fundamentally, is it useful to have a ton of xxx-staticdev packages?
In a few key cases split -dev packages are useful (qt, eds, gcc spring
to mind). In general however they probably aren't and often no thought
has been given into splitting them out. One good indicator is whether
the headers are split up. If not, then there are likely issues.
If split -dev packages aren't useful, its likely that split staticdev
packages are also less useful. I'm really wondering if there ever is a
use case where you'd need the individual staticdev packages or you'd
have the disk space to manage installing the full thing?
Taking wireless-tools as an example, its going to a lot of effort to
change the default PACKAGES and create a libiw-dev package. It drops the
wireless-tools-dev package in the original, your patch changes this so
we have both a wireless-tools-dev and a libiw-dev package.
Perhaps instead we should just add:
PKG_${PN}-dev = "libiw-dev"
PKG_${PN}-staticdev = "libiw-staticdev"
?
Do we even care about that renaming?
Likewise, does it need two separate docs packages? or separate -dbg
packages?
We really need to work out the approach to these fundamental questions
before we can then look at the series...
I think I'm in favour of minimising the number of split
-dev/-dbg/-staticdev/-doc packages out there and hence I therefore am
uncomfortable with the direction the series is taking.
Cheers,
Richard
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH V2 21/25] gcc: Use bitbake default FILES for packaging
2011-07-13 7:33 ` [PATCH V2 21/25] gcc: " Saul Wold
@ 2011-07-13 11:43 ` Phil Blundell
0 siblings, 0 replies; 31+ messages in thread
From: Phil Blundell @ 2011-07-13 11:43 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Wed, 2011-07-13 at 00:33 -0700, Saul Wold wrote:
> This will ensure correct -dev and -staticdev packging
[...]
> +FILES_libgfortran-dev = "${libdir}/libgfortran.so"
> +FILES_libgfortran-staticdev = " \
> ${libdir}/libgfortran.a \
> - ${libdir}/libgfortran.so \
> ${libdir}/libgfortranbegin.a"
Are you sure that's right? I would have expected libgfortranbegin.a to
go into -dev not -staticdev.
p.
^ permalink raw reply [flat|nested] 31+ messages in thread
end of thread, other threads:[~2011-07-13 11:47 UTC | newest]
Thread overview: 31+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-13 7:33 [PATCH V2 00/25] Static Library Updated Saul Wold
2011-07-13 7:33 ` [PATCH V2 01/25] bitbake.conf: Add *-config to default ${PN}-dev package Saul Wold
2011-07-13 7:33 ` [PATCH V2 02/25] shlibpackaging.bbclass: create common class Saul Wold
2011-07-13 9:17 ` Phil Blundell
2011-07-13 7:33 ` [PATCH V2 03/25] pciutils: repackage development files in pciutils instead of libpci Saul Wold
2011-07-13 7:33 ` [PATCH V2 04/25] wireless-tools: Updated for staticdevpackaging Saul Wold
2011-07-13 7:33 ` [PATCH V2 05/25] augeas: inherit shlibpackaging class Saul Wold
2011-07-13 7:33 ` [PATCH V2 06/25] gamin: " Saul Wold
2011-07-13 7:33 ` [PATCH V2 07/25] sqlite3: " Saul Wold
2011-07-13 7:33 ` [PATCH V2 08/25] curl: " Saul Wold
2011-07-13 9:14 ` Phil Blundell
2011-07-13 7:33 ` [PATCH V2 09/25] attr: " Saul Wold
2011-07-13 7:33 ` [PATCH V2 10/25] rpm: Create -staticdev package Saul Wold
2011-07-13 7:33 ` [PATCH V2 11/25] libxft: use default bitbake.conf FILES Packaging to handle staticdev Saul Wold
2011-07-13 7:33 ` [PATCH V2 12/25] js: Use bitbake default FILES for packaging Saul Wold
2011-07-13 7:33 ` [PATCH V2 13/25] tcp-wrappers: " Saul Wold
2011-07-13 7:33 ` [PATCH V2 14/25] udev: " Saul Wold
2011-07-13 9:38 ` Phil Blundell
2011-07-13 7:33 ` [PATCH V2 15/25] liba52: " Saul Wold
2011-07-13 7:33 ` [PATCH V2 16/25] python: " Saul Wold
2011-07-13 7:33 ` [PATCH V2 17/25] external-csl-toolchain: " Saul Wold
2011-07-13 7:33 ` [PATCH V2 18/25] opkg: " Saul Wold
2011-07-13 7:33 ` [PATCH V2 19/25] util-linux: " Saul Wold
2011-07-13 7:33 ` [PATCH V2 20/25] gettext: " Saul Wold
2011-07-13 7:33 ` [PATCH V2 21/25] gcc: " Saul Wold
2011-07-13 11:43 ` Phil Blundell
2011-07-13 7:33 ` [PATCH V2 22/25] glibc: " Saul Wold
2011-07-13 7:33 ` [PATCH V2 23/25] eglibc: " Saul Wold
2011-07-13 7:33 ` [PATCH V2 24/25] uclibc: " Saul Wold
2011-07-13 7:33 ` [PATCH V2 25/25] binutils: " Saul Wold
2011-07-13 10:07 ` [PATCH V2 00/25] Static Library Updated Richard Purdie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox