apr-util: make gdbm optional
PATCH 1/2 apr-util: make gdbm optional
This helps with gpl3-free builds.
--- meta/recipes-support/apr/apr-util_1.6.1.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
meta/recipes-support/apr/apr-util_1.6.1.bb +3 -3
@@ -1,7 +1,7 @@ SUMMARY = "Apache Portable Runtime (APR) companion library" HOMEPAGE = "http://apr.apache.org/" SECTION = "libs" -DEPENDS = "apr expat gdbm" +DEPENDS = "apr expat" BBCLASSEXTEND = "native nativesdk"
@@ -23,7 +23,6 @@ EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ --without-odbc \ --without-pgsql \ --with-dbm=gdbm \ - --with-gdbm=${STAGING_DIR_HOST}${prefix} \ --without-sqlite2 \ --with-expat=${STAGING_DIR_HOST}${prefix}"
@@ -66,10 +65,11 @@ do_install_append_class-target() { -e 's,APU_BUILD_DIR=.*,APR_BUILD_DIR=,g' ${D}${bindir}/apu-1-config } -PACKAGECONFIG ??= "crypto" +PACKAGECONFIG ??= "crypto gdbm" PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap" PACKAGECONFIG[crypto] = "--with-openssl=${STAGING_DIR_HOST}${prefix} --with-crypto,--without-crypto,openssl" PACKAGECONFIG[sqlite3] = "--with-sqlite3=${STAGING_DIR_HOST}${prefix},--without-sqlite3,sqlite3" +PACKAGECONFIG[gdbm] = "--with-gdbm=${STAGING_DIR_HOST}${prefix},--without-gdbm,gdbm" #files ${libdir}/apr-util-1/*.so are not symlinks but loadable modules thus they are packaged in ${PN} FILES_${PN} += "${libdir}/apr-util-1/apr*${SOLIBS} ${libdir}/apr-util-1/apr*${SOLIBSDEV}"
Signature · 1 line
2.27.0
PATCH 2/2 gobject-introspection: add a patch to fix a build race
--- ...ency-for-g-ir-compiler-for-building-.patch | 33 +++++++++++++++++++ .../gobject-introspection_1.64.1.bb | 1 + 2 files changed, 34 insertions(+) create mode 100644 meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-gir-add-a-dependency-for-g-ir-compiler-for-building-.patch
meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-gir-add-a-dependency-for-g-ir-compiler-for-building-.patch new file +33 -0
@@ -0,0 +1,33 @@ +From 56ba5656258b82dbc069ab3a61e597c931a16a83 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Wed, 17 Jun 2020 11:43:16 +0200 +Subject: [PATCH] gir: add a dependency for g-ir-compiler for building .girs + +meson inserts the dependency if the compiler is used directly, but +fails to do so if the compiler is run through a wrapper. This leads +to build race errors between building the compiler and using it. + +Fix provided by Quentin Schulz <[email protected]> + +Upstream-Status: Accepted [https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/228] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + gir/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gir/meson.build b/gir/meson.build +index b37fdb81..557e5517 100644 +--- a/gir/meson.build ++++ b/gir/meson.build +@@ -448,7 +448,7 @@ foreach gir : gir_files + typelibs += custom_target('generate-typelib-@0@'.format(gir).underscorify(), + input: gir, + output: '@[email protected]', +- depends: [gobject_gir, ], ++ depends: [gobject_gir, gircompiler, ], + command: gircompiler_command, + install: true, + install_dir: typelibdir, +-- +2.27.0 +
meta/recipes-gnome/gobject-introspection/gobject-introspection_1.64.1.bb +1 -0
@@ -15,6 +15,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c434e8128a68bedd59b80b2ac1eb1c4a \ SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-${PV}.tar.xz \ file://0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch \ + file://0001-gir-add-a-dependency-for-g-ir-compiler-for-building-.patch \ " SRC_URI[md5sum] = "3419dfd086efcf83768e0579ab6abd2b"
Signature · 1 line
2.27.0
Quoted 37 lines
-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Alexander Kanavin
Sent: den 17 juni 2020 12:16
To: [email protected]
Cc: Alexander Kanavin <[email protected]>
Subject: [OE-core] [PATCH 1/2] apr-util: make gdbm optionalThis helps with gpl3-free builds.
Signed-off-by Alexander Kanavin <[email protected]>--- meta/recipes-support/apr/apr-util_1.6.1.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)meta/recipes-support/apr/apr-util_1.6.1.bb +1
-2@@ -1,7 +1,7 @@ SUMMARY = "Apache Portable Runtime (APR) companion library" HOMEPAGE = "http://apr.apache.org/" SECTION = "libs" -DEPENDS = "apr expat gdbm" +DEPENDS = "apr expat" BBCLASSEXTEND = "native nativesdk"@@ -23,7 +23,6 @@ EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ --without-odbc \ --without-pgsql \ --with-dbm=gdbm \ - --with-gdbm=${STAGING_DIR_HOST}${prefix} \ --without-sqlite2 \ --with-expat=${STAGING_DIR_HOST}${prefix}"
meta/recipes-support/apr/apr-util_1.6.1.bb do_install_append_class-target() { · line 68
Quoted 5 lines
meta/recipes-support/apr/apr-util_1.6.1.bb +1
-1@@ -66,10 +65,11 @@ do_install_append_class-target() { -e 's,APU_BUILD_DIR=.*,APR_BUILD_DIR=,g' ${D}${bindir}/apu-1-config } -PACKAGECONFIG ??= "crypto" +PACKAGECONFIG ??= "crypto gdbm"
Since I assume this is not the only place where it is needed to disable a feature to achieve a GPL-3.0 free build, maybe we should introduce a distro feature to control them? E.g.:
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'allow-gpl3', 'gdbm', '', d)} \
crypto"
This would make it a lot easier for anyone who wants to disable the use of GPL-3.0 code as they would not have to go searching through the recipes for these kind of features to disable.
Quoted 9 lines
meta/recipes-support/apr/apr-util_1.6.1.bb +1
-1PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap" PACKAGECONFIG[crypto] = "--with-openssl=${STAGING_DIR_HOST}${prefix} --with-crypto,--without-crypto,openssl" PACKAGECONFIG[sqlite3] = "--with-sqlite3=${STAGING_DIR_HOST}${prefix},--without-sqlite3,sqlite3" +PACKAGECONFIG[gdbm] = "--with-gdbm=${STAGING_DIR_HOST}${prefix},--without-gdbm,gdbm" #files ${libdir}/apr-util-1/*.so are not symlinks but loadable modules thus they are packaged in ${PN} FILES_${PN} += "${libdir}/apr-util-1/apr*${SOLIBS} ${libdir}/apr-util-1/apr*${SOLIBSDEV}" --2.27.0
//Peter
In our environment gpl3 is not banned across the distro but rather banned only in the product image, with a targeted set of recipe tweaks aimed to allow that image to build. Non-product images are still permitted to contain gpl3 items. Since everyone has a different set of what goes into their product image, and what doesn't, and there are inevitably various 3rd party layers in the mix, I do not think a distro setting would make much sense.
Alex
Quoted 78 lines · Peter Kjellerstedt
Quoted 8 lines
-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Alexander Kanavin
Sent: den 17 juni 2020 12:16
To: [email protected]
Cc: Alexander Kanavin <[email protected]>
Subject: [OE-core] [PATCH 1/2] apr-util: make gdbm optionalReview
Quoted 8 lines
This helps with gpl3-free builds.
Signed-off-by Alexander Kanavin <[email protected]>--- meta/recipes-support/apr/apr-util_1.6.1.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)(quoted diff) +0
-0b/meta/recipes-support/apr/apr-util_1.6.1.bb
meta/recipes-support/apr/apr-util_1.6.1.bb EXTRA_OECONF =
Quoted 13 lines
index
3896c924f0..0dd8f025e8100644meta/recipes-support/apr/apr-util_1.6.1.bb +1
-1@@ -1,7 +1,7 @@ SUMMARY = "Apache Portable Runtime (APR) companion library" HOMEPAGE = "http://apr.apache.org/" SECTION = "libs" -DEPENDS = "apr expat gdbm" +DEPENDS = "apr expat" BBCLASSEXTEND = "native nativesdk"@@ -23,7 +23,6 @@ EXTRA_OECONF ="--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \
meta/recipes-support/apr/apr-util_1.6.1.bb do_install_append_class-target() { · line 65
Quoted 9 lines
meta/recipes-support/apr/apr-util_1.6.1.bb +0
-1--without-odbc \ --without-pgsql \ --with-dbm=gdbm \ - --with-gdbm=${STAGING_DIR_HOST}${prefix} \ --without-sqlite2 \ --with-expat=${STAGING_DIR_HOST}${prefix}"@@ -66,10 +65,11 @@ do_install_append_class-target() { -e 's,APU_BUILD_DIR=.*,APR_BUILD_DIR=,g'${D}${bindir}/apu-1-config
meta/recipes-support/apr/apr-util_1.6.1.bb do_install_append_class-target() { · line 68
Quoted 4 lines
meta/recipes-support/apr/apr-util_1.6.1.bb +1
-1} -PACKAGECONFIG ??= "crypto" +PACKAGECONFIG ??= "crypto gdbm"Since I assume this is not the only place where it is needed to disable a feature to achieve a GPL-3.0 free build, maybe we should introduce a distro
feature to control them? E.g.:PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'allow-gpl3', 'gdbm', '', d)} \
crypto"This would make it a lot easier for anyone who wants to disable the use of GPL-3.0 code as they would not have to go searching through the recipes for
these kind of features to disable.meta/recipes-support/apr/apr-util_1.6.1.bb do_install_append_class-target() { · line 70
Quoted 2 lines
meta/recipes-support/apr/apr-util_1.6.1.bb +0
-0PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap" PACKAGECONFIG[crypto] = "--with-openssl=${STAGING_DIR_HOST}${prefix}--with-crypto,--without-crypto,openssl"
meta/recipes-support/apr/apr-util_1.6.1.bb do_install_append_class-target() { · line 71
Quoted 1 line
meta/recipes-support/apr/apr-util_1.6.1.bb +0
-0PACKAGECONFIG[sqlite3] ="--with-sqlite3=${STAGING_DIR_HOST}${prefix},--without-sqlite3,sqlite3"
meta/recipes-support/apr/apr-util_1.6.1.bb do_install_append_class-target() { · line 72
Quoted 1 line
meta/recipes-support/apr/apr-util_1.6.1.bb +1
-0+PACKAGECONFIG[gdbm] ="--with-gdbm=${STAGING_DIR_HOST}${prefix},--without-gdbm,gdbm"
meta/recipes-support/apr/apr-util_1.6.1.bb do_install_append_class-target() { · line 73
Quoted 2 lines
meta/recipes-support/apr/apr-util_1.6.1.bb +0
-0#files ${libdir}/apr-util-1/*.so are not symlinks but loadable modulesthus they are packaged in ${PN}
meta/recipes-support/apr/apr-util_1.6.1.bb do_install_append_class-target() { · line 74
Quoted 1 line
meta/recipes-support/apr/apr-util_1.6.1.bb +0
-0FILES_${PN} += "${libdir}/apr-util-1/apr*${SOLIBS}${libdir}/apr-util-1/apr*${SOLIBSDEV}"
Quoted 2 lines
meta/recipes-support/apr/apr-util_1.6.1.bb +0
-1--2.27.0
//Peter
Hmm, ok. How about a common without_gpl3.inc file? It could serve as a place to gather/document these PACKAGECONFIGs and other setting that need to be enabled to build without GPL-3.0. That way you are not forced in the same way as a distro feature would be, but at the same time it is easy for anyone who wants to disable GPL-3.0 for their build to find all the setting they need to tweak.
//Peter
From: Alexander Kanavin <[email protected]>
Sent: den 20 juni 2020 14:52
To: Peter Kjellerstedt <[email protected]>
Cc: [email protected]
Subject: Re: [OE-core] [PATCH 1/2] apr-util: make gdbm optional
In our environment gpl3 is not banned across the distro but rather banned only in the product image, with a targeted set of recipe tweaks aimed to allow that image to build. Non-product images are still permitted to contain gpl3 items. Since everyone has a different set of what goes into their product image, and what doesn't, and there are inevitably various 3rd party layers in the mix, I do not think a distro setting would make much sense.
Alex
Quoted 37 lines · On Sat, 20 Jun 2020 at 13:30, Peter Kjellerstedt…
-----Original Message-----
From: [email protected]<mailto:[email protected]> <openembedded- [email protected]<mailto:[email protected]>> On Behalf Of Alexander Kanavin
Sent: den 17 juni 2020 12:16
To: [email protected]<mailto:[email protected]>
Cc: Alexander Kanavin <[email protected]<mailto:[email protected]>>
Subject: [OE-core] [PATCH 1/2] apr-util: make gdbm optionalThis helps with gpl3-free builds.
--- meta/recipes-support/apr/apr-util_1.6.1.bb<http://apr-util_1.6.1.bb> | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)meta/recipes-support/apr/apr-util_1.6.1.bb<http://apr-util_1.6.1.bb> +1
-2@@ -1,7 +1,7 @@ SUMMARY = "Apache Portable Runtime (APR) companion library" HOMEPAGE = "http://apr.apache.org/" SECTION = "libs" -DEPENDS = "apr expat gdbm" +DEPENDS = "apr expat" BBCLASSEXTEND = "native nativesdk"@@ -23,7 +23,6 @@ EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ --without-odbc \ --without-pgsql \ --with-dbm=gdbm \ - --with-gdbm=${STAGING_DIR_HOST}${prefix} \ --without-sqlite2 \ --with-expat=${STAGING_DIR_HOST}${prefix}"
meta/recipes-support/apr/apr-util_1.6.1.bb<http://apr-util_1.6.1.bb> do_install_append_class-target() { · line 68
Quoted 5 lines
meta/recipes-support/apr/apr-util_1.6.1.bb<http://apr-util_1.6.1.bb> +1
-1@@ -66,10 +65,11 @@ do_install_append_class-target() { -e 's,APU_BUILD_DIR=.*,APR_BUILD_DIR=,g' ${D}${bindir}/apu-1-config } -PACKAGECONFIG ??= "crypto" +PACKAGECONFIG ??= "crypto gdbm"
Since I assume this is not the only place where it is needed to disable a feature to achieve a GPL-3.0 free build, maybe we should introduce a distro feature to control them? E.g.:
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'allow-gpl3', 'gdbm', '', d)} \
crypto<mailto:$%[email protected]('DISTRO_FEATURES',%20'allow-gpl3',%20'gdbm',%20'',%20d)%7d%20\%0b %20 %20 %20 %20 %20 %20 %20 %20 %20 crypto>"This would make it a lot easier for anyone who wants to disable the use of GPL-3.0 code as they would not have to go searching through the recipes for these kind of features to disable.
Quoted 9 lines
meta/recipes-support/apr/apr-util_1.6.1.bb<http://apr-util_1.6.1.bb> +1
-1PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap" PACKAGECONFIG[crypto] = "--with-openssl=${STAGING_DIR_HOST}${prefix} --with-crypto,--without-crypto,openssl" PACKAGECONFIG[sqlite3] = "--with-sqlite3=${STAGING_DIR_HOST}${prefix},--without-sqlite3,sqlite3" +PACKAGECONFIG[gdbm] = "--with-gdbm=${STAGING_DIR_HOST}${prefix},--without-gdbm,gdbm" #files ${libdir}/apr-util-1/*.so are not symlinks but loadable modules thus they are packaged in ${PN} FILES_${PN} += "${libdir}/apr-util-1/apr*${SOLIBS} ${libdir}/apr-util-1/apr*${SOLIBSDEV}" --2.27.0
//Peter
This would still need to be tested with a specific image(s) from oe-core, otherwise it is prone to bit rot. And it would not include tweaks from meta-oe (e.g. lua) or anywhere else.
We already test no-gpl3-ness for core-image-minimal and core-image-full-cmdline (to match the meta-gpl2 tests), and neither needs PACKAGECONFIG tweaks:
The same test could be extended for maybe core-image-sato and core-image-weston. Whether those images will produce a nice list of tweaks, or are good as they are, I can't tell. apr-util for example is not included into any of them.
Alex
Quoted 118 lines · Peter Kjellerstedt
Hmm, ok. How about a common without_gpl3.inc file? It could serve as a place to gather/document these PACKAGECONFIGs and other setting that need to be enabled to build without GPL-3.0. That way you are not forced in the same way as a distro feature would be, but at the same time it is easy for anyone who wants to disable GPL-3.0 for their build to find all the setting they need to tweak.
//Peter
*From:* Alexander Kanavin <[email protected]> *Sent:* den 20 juni 2020 14:52
*To:* Peter Kjellerstedt <[email protected]> *Cc:* [email protected] *Subject:* Re: [OE-core] [PATCH 1/2] apr-util: make gdbm optionalIn our environment gpl3 is not banned across the distro but rather banned only in the product image, with a targeted set of recipe tweaks aimed to allow that image to build. Non-product images are still permitted to contain gpl3 items. Since everyone has a different set of what goes into their product image, and what doesn't, and there are inevitably various 3rd party layers in the mix, I do not think a distro setting would make much sense.
Alex
Quoted 8 lines · Peter Kjellerstedt
-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Alexander Kanavin
Sent: den 17 juni 2020 12:16
To: [email protected]
Cc: Alexander Kanavin <[email protected]>
Subject: [OE-core] [PATCH 1/2] apr-util: make gdbm optionalReview
Quoted 8 lines
This helps with gpl3-free builds.
Signed-off-by Alexander Kanavin <[email protected]>--- meta/recipes-support/apr/apr-util_1.6.1.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)(quoted diff) +0
-0b/meta/recipes-support/apr/apr-util_1.6.1.bb
meta/recipes-support/apr/apr-util_1.6.1.bb EXTRA_OECONF =
Quoted 13 lines
index
3896c924f0..0dd8f025e8100644meta/recipes-support/apr/apr-util_1.6.1.bb +1
-1@@ -1,7 +1,7 @@ SUMMARY = "Apache Portable Runtime (APR) companion library" HOMEPAGE = "http://apr.apache.org/" SECTION = "libs" -DEPENDS = "apr expat gdbm" +DEPENDS = "apr expat" BBCLASSEXTEND = "native nativesdk"@@ -23,7 +23,6 @@ EXTRA_OECONF ="--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \
meta/recipes-support/apr/apr-util_1.6.1.bb do_install_append_class-target() { · line 65
Quoted 9 lines
meta/recipes-support/apr/apr-util_1.6.1.bb +0
-1--without-odbc \ --without-pgsql \ --with-dbm=gdbm \ - --with-gdbm=${STAGING_DIR_HOST}${prefix} \ --without-sqlite2 \ --with-expat=${STAGING_DIR_HOST}${prefix}"@@ -66,10 +65,11 @@ do_install_append_class-target() { -e 's,APU_BUILD_DIR=.*,APR_BUILD_DIR=,g'${D}${bindir}/apu-1-config
meta/recipes-support/apr/apr-util_1.6.1.bb do_install_append_class-target() { · line 68
Quoted 4 lines
meta/recipes-support/apr/apr-util_1.6.1.bb +1
-1} -PACKAGECONFIG ??= "crypto" +PACKAGECONFIG ??= "crypto gdbm"Since I assume this is not the only place where it is needed to disable a feature to achieve a GPL-3.0 free build, maybe we should introduce a distro
feature to control them? E.g.:PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'allow-gpl3',
'gdbm', '', d)} \
crypto
<$%[email protected]('DISTRO_FEATURES',%20'allow-gpl3',%20'gdbm',%20'',%20d)%7d%20%5C%0b%C2%A0%20%C2%A0%20%C2%A0%20%C2%A0%20%C2%A0%20%C2%A0%20%C2%A0%20%C2%A0%20%C2%A0%20%C2%A0crypto> "This would make it a lot easier for anyone who wants to disable the use of GPL-3.0 code as they would not have to go searching through the recipes for
these kind of features to disable.meta/recipes-support/apr/apr-util_1.6.1.bb do_install_append_class-target() { · line 70
Quoted 2 lines
meta/recipes-support/apr/apr-util_1.6.1.bb +0
-0PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap" PACKAGECONFIG[crypto] = "--with-openssl=${STAGING_DIR_HOST}${prefix}--with-crypto,--without-crypto,openssl"
meta/recipes-support/apr/apr-util_1.6.1.bb do_install_append_class-target() { · line 71
Quoted 1 line
meta/recipes-support/apr/apr-util_1.6.1.bb +0
-0PACKAGECONFIG[sqlite3] ="--with-sqlite3=${STAGING_DIR_HOST}${prefix},--without-sqlite3,sqlite3"
meta/recipes-support/apr/apr-util_1.6.1.bb do_install_append_class-target() { · line 72
Quoted 1 line
meta/recipes-support/apr/apr-util_1.6.1.bb +1
-0+PACKAGECONFIG[gdbm] ="--with-gdbm=${STAGING_DIR_HOST}${prefix},--without-gdbm,gdbm"
meta/recipes-support/apr/apr-util_1.6.1.bb do_install_append_class-target() { · line 73
Quoted 2 lines
meta/recipes-support/apr/apr-util_1.6.1.bb +0
-0#files ${libdir}/apr-util-1/*.so are not symlinks but loadable modulesthus they are packaged in ${PN}
meta/recipes-support/apr/apr-util_1.6.1.bb do_install_append_class-target() { · line 74
Quoted 1 line
meta/recipes-support/apr/apr-util_1.6.1.bb +0
-0FILES_${PN} += "${libdir}/apr-util-1/apr*${SOLIBS}${libdir}/apr-util-1/apr*${SOLIBSDEV}"
Quoted 2 lines
meta/recipes-support/apr/apr-util_1.6.1.bb +0
-1--2.27.0
//Peter