* [PATCH 0/4] Misc Fixes
@ 2013-12-20 6:41 Saul Wold
2013-12-20 6:41 ` [PATCH 1/4] harfbuzz: Allow PACKAGECONFIG to be overridden Saul Wold
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Saul Wold @ 2013-12-20 6:41 UTC (permalink / raw)
To: openembedded-core
Fix up build time with PACKAGECONFIG for perl in openssl, found some non-overridable
PACKAGECONFIGs so fix them and clean up util-linux-dev issue
Sau!
Saul Wold (4):
harfbuzz: Allow PACKAGECONFIG to be overridden
beecrypt: Allow PACKAGECONFIG to be overridden
openssl: use PACKAGECONFIG to disable perl bits
util-linux: remove non PN based -dev packages
meta/recipes-connectivity/openssl/openssl.inc | 16 +++++++++++-----
meta/recipes-core/util-linux/util-linux.inc | 10 ++++------
meta/recipes-graphics/harfbuzz/harfbuzz_0.9.25.bb | 2 +-
meta/recipes-support/beecrypt/beecrypt_4.2.1.bb | 2 +-
4 files changed, 17 insertions(+), 13 deletions(-)
--
1.8.3.1
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 1/4] harfbuzz: Allow PACKAGECONFIG to be overridden 2013-12-20 6:41 [PATCH 0/4] Misc Fixes Saul Wold @ 2013-12-20 6:41 ` Saul Wold 2013-12-20 6:41 ` [PATCH 2/4] beecrypt: " Saul Wold ` (2 subsequent siblings) 3 siblings, 0 replies; 6+ messages in thread From: Saul Wold @ 2013-12-20 6:41 UTC (permalink / raw) To: openembedded-core Signed-off-by: Saul Wold <sgw@linux.intel.com> --- meta/recipes-graphics/harfbuzz/harfbuzz_0.9.25.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.25.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.25.bb index a18dafe..544deecd 100644 --- a/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.25.bb +++ b/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.25.bb @@ -24,7 +24,7 @@ BBCLASSEXTEND = "native" EXTRA_OECONF = "--with-glib --with-freetype --with-cairo --without-graphite2" -PACKAGECONFIG = "" +PACKAGECONFIG ??= "" PACKAGECONFIG[icu] = "--with-icu,--without-icu,icu" PACKAGES =+ "${PN}-icu ${PN}-icu-dbg ${PN}-icu-dev" -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/4] beecrypt: Allow PACKAGECONFIG to be overridden 2013-12-20 6:41 [PATCH 0/4] Misc Fixes Saul Wold 2013-12-20 6:41 ` [PATCH 1/4] harfbuzz: Allow PACKAGECONFIG to be overridden Saul Wold @ 2013-12-20 6:41 ` Saul Wold 2013-12-20 6:41 ` [PATCH 3/4] openssl: use PACKAGECONFIG to disable perl bits Saul Wold 2013-12-20 6:41 ` [PATCH 4/4] util-linux: remove non PN based -dev packages Saul Wold 3 siblings, 0 replies; 6+ messages in thread From: Saul Wold @ 2013-12-20 6:41 UTC (permalink / raw) To: openembedded-core Signed-off-by: Saul Wold <sgw@linux.intel.com> --- meta/recipes-support/beecrypt/beecrypt_4.2.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb b/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb index a917201..5874f9e 100644 --- a/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb +++ b/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb @@ -27,7 +27,7 @@ do_install_append() { EXTRA_OECONF="--without-python --enable-shared --enable-static --disable-openmp --with-java=no" -PACKAGECONFIG = "" +PACKAGECONFIG ??= "" PACKAGECONFIG[cplusplus] = "--with-cplusplus,--without-cplusplus,icu" FILES_${PN} = "${sysconfdir} ${libdir}/*.so.* ${libdir}/${BPN}/*.so.*" -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/4] openssl: use PACKAGECONFIG to disable perl bits 2013-12-20 6:41 [PATCH 0/4] Misc Fixes Saul Wold 2013-12-20 6:41 ` [PATCH 1/4] harfbuzz: Allow PACKAGECONFIG to be overridden Saul Wold 2013-12-20 6:41 ` [PATCH 2/4] beecrypt: " Saul Wold @ 2013-12-20 6:41 ` Saul Wold 2013-12-20 9:36 ` Martin Jansa 2013-12-20 6:41 ` [PATCH 4/4] util-linux: remove non PN based -dev packages Saul Wold 3 siblings, 1 reply; 6+ messages in thread From: Saul Wold @ 2013-12-20 6:41 UTC (permalink / raw) To: openembedded-core Adding perl to the RDEPENDS caused a performance hit to the overall build time since this was the only package that depended on perl. The openssl-misc package is not installed by default so use a PACKAGECONFIG which can be overridden to allow the perl scripts along with perl to be installed. Signed-off-by: Saul Wold <sgw@linux.intel.com> --- meta/recipes-connectivity/openssl/openssl.inc | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc index cdb1809..c58c99f 100644 --- a/meta/recipes-connectivity/openssl/openssl.inc +++ b/meta/recipes-connectivity/openssl/openssl.inc @@ -13,8 +13,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8" DEPENDS = "perl-native-runtime" -# Adding RDEPENDS for perl scripts -RDEPENDS_${PN}-misc +="perl" +PACKAGECONFIG[perl] = ",,,perl" SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ " @@ -157,11 +156,18 @@ do_install () { install -d ${D}${includedir} cp --dereference -R include/openssl ${D}${includedir} - sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/CA.pl oe_multilib_header openssl/opensslconf.h - # The c_rehash utility isn't installed by the normal installation process. - install -m 0755 ${S}/tools/c_rehash ${D}${bindir} + if [ "${@base_contains('PACKAGECONFIG', 'perl', 'perl', '', d)}" = "perl" ]; then + install -m 0755 ${S}/tools/c_rehash ${D}${bindir} + sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${bindir}/c_rehash + sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/CA.pl + sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/tsget + # The c_rehash utility isn't installed by the normal installation process. + else + rm -f ${D}${bindir}/c_rehash + rm -f ${D}${libdir}/ssl/misc/CA.pl ${D}${libdir}/ssl/misc/tsget + fi } BBCLASSEXTEND = "native nativesdk" -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 3/4] openssl: use PACKAGECONFIG to disable perl bits 2013-12-20 6:41 ` [PATCH 3/4] openssl: use PACKAGECONFIG to disable perl bits Saul Wold @ 2013-12-20 9:36 ` Martin Jansa 0 siblings, 0 replies; 6+ messages in thread From: Martin Jansa @ 2013-12-20 9:36 UTC (permalink / raw) To: Saul Wold; +Cc: openembedded-core [-- Attachment #1: Type: text/plain, Size: 2499 bytes --] On Thu, Dec 19, 2013 at 10:41:07PM -0800, Saul Wold wrote: > Adding perl to the RDEPENDS caused a performance hit to the overall build time since this was > the only package that depended on perl. The openssl-misc package is not installed by default > so use a PACKAGECONFIG which can be overridden to allow the perl scripts along with perl to > be installed. > > Signed-off-by: Saul Wold <sgw@linux.intel.com> > --- > meta/recipes-connectivity/openssl/openssl.inc | 16 +++++++++++----- > 1 file changed, 11 insertions(+), 5 deletions(-) > > diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc > index cdb1809..c58c99f 100644 > --- a/meta/recipes-connectivity/openssl/openssl.inc > +++ b/meta/recipes-connectivity/openssl/openssl.inc > @@ -13,8 +13,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8" > > DEPENDS = "perl-native-runtime" > > -# Adding RDEPENDS for perl scripts > -RDEPENDS_${PN}-misc +="perl" > +PACKAGECONFIG[perl] = ",,,perl" Doesn't it add perl to ${PN} (instead of ${PN}-misc)? > SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ > " > @@ -157,11 +156,18 @@ do_install () { > > install -d ${D}${includedir} > cp --dereference -R include/openssl ${D}${includedir} > - sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/CA.pl > > oe_multilib_header openssl/opensslconf.h > - # The c_rehash utility isn't installed by the normal installation process. > - install -m 0755 ${S}/tools/c_rehash ${D}${bindir} > + if [ "${@base_contains('PACKAGECONFIG', 'perl', 'perl', '', d)}" = "perl" ]; then > + install -m 0755 ${S}/tools/c_rehash ${D}${bindir} > + sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${bindir}/c_rehash > + sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/CA.pl > + sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/tsget > + # The c_rehash utility isn't installed by the normal installation process. > + else > + rm -f ${D}${bindir}/c_rehash > + rm -f ${D}${libdir}/ssl/misc/CA.pl ${D}${libdir}/ssl/misc/tsget > + fi > } > > BBCLASSEXTEND = "native nativesdk" > -- > 1.8.3.1 > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 205 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 4/4] util-linux: remove non PN based -dev packages 2013-12-20 6:41 [PATCH 0/4] Misc Fixes Saul Wold ` (2 preceding siblings ...) 2013-12-20 6:41 ` [PATCH 3/4] openssl: use PACKAGECONFIG to disable perl bits Saul Wold @ 2013-12-20 6:41 ` Saul Wold 3 siblings, 0 replies; 6+ messages in thread From: Saul Wold @ 2013-12-20 6:41 UTC (permalink / raw) To: openembedded-core All dev related items should be packaged in the core PN package not in seperate packages. Signed-off-by: Saul Wold <sgw@linux.intel.com> --- meta/recipes-core/util-linux/util-linux.inc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 9f5fd01..2527fbe 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -32,10 +32,9 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin 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-libmount util-linux-libmount-dev \ - util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev \ + util-linux-libmount util-linux-libuuid \ util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \ - util-linux-mkfs util-linux-mcookie util-linux-reset util-linux-uuidd \ + util-linux-mkfs util-linux-mcookie util-linux-reset \ util-linux-mkfs.cramfs util-linux-fsck.cramfs \ util-linux-partx ${PN}-bash-completion" @@ -77,11 +76,8 @@ FILES_util-linux-reset = "${base_bindir}/reset" FILES_util-linux-partx = "${sbindir}/partx" FILES_util-linux-libblkid = "${base_libdir}/libblkid.so.*" -FILES_util-linux-libblkid-dev = "${libdir}/libblkid.so ${libdir}/libblkid.la ${includedir}/blkid ${libdir}/pkgconfig/blkid.pc" FILES_util-linux-libmount = "${base_libdir}/libmount.so.*" -FILES_util-linux-libmount-dev = "${libdir}/libmount.so ${libdir}/libmount.la ${includedir}/libmount ${libdir}/pkgconfig/mount.pc" FILES_util-linux-libuuid = "${base_libdir}/libuuid.so.*" -FILES_util-linux-libuuid-dev = "${libdir}/libuuid.so ${libdir}/libuuid.la ${includedir}/uuid ${libdir}/pkgconfig/uuid.pc" FILES_util-linux-lscpu = "${bindir}/lscpu" FILES_util-linux-fsck = "${base_sbindir}/fsck*" @@ -107,6 +103,8 @@ RRECOMMENDS_${PN}_class-nativesdk = "" RDEPENDS_${PN}_class-native = "" RDEPENDS_${PN}_class-nativesdk = "" +RPROVIDES_${PN}-dev = "util-linux-libblkid-dev util-linux-libmount-dev util-linux-libuuid-dev" + SYSTEMD_PACKAGES = "${PN}-uuidd" SYSTEMD_SERVICE_${PN}-uuidd = "uuidd.service" -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-12-20 9:36 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-12-20 6:41 [PATCH 0/4] Misc Fixes Saul Wold 2013-12-20 6:41 ` [PATCH 1/4] harfbuzz: Allow PACKAGECONFIG to be overridden Saul Wold 2013-12-20 6:41 ` [PATCH 2/4] beecrypt: " Saul Wold 2013-12-20 6:41 ` [PATCH 3/4] openssl: use PACKAGECONFIG to disable perl bits Saul Wold 2013-12-20 9:36 ` Martin Jansa 2013-12-20 6:41 ` [PATCH 4/4] util-linux: remove non PN based -dev packages Saul Wold
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.