* [PATCH 1/3] cracklib: Allow use in SDK @ 2014-08-11 20:21 Otavio Salvador 2014-08-11 20:21 ` [PATCH 2/3] attr: Allow use during build and SDK Otavio Salvador 2014-08-11 20:21 ` [PATCH 3/3] libpam: Allow use during build and in SDK Otavio Salvador 0 siblings, 2 replies; 5+ messages in thread From: Otavio Salvador @ 2014-08-11 20:21 UTC (permalink / raw) To: openembedded-core; +Cc: Otavio Salvador This adds 'nativesdk' in the BBCLASSEXTEND. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> --- meta/recipes-extended/cracklib/cracklib_2.9.1.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/cracklib/cracklib_2.9.1.bb b/meta/recipes-extended/cracklib/cracklib_2.9.1.bb index d70e76f..99ccde3 100644 --- a/meta/recipes-extended/cracklib/cracklib_2.9.1.bb +++ b/meta/recipes-extended/cracklib/cracklib_2.9.1.bb @@ -18,8 +18,8 @@ SRC_URI[sha256sum] = "408905c2539a97dc8cbbb6d7cd2046cb5647a345b4bda399220d9471be inherit autotools-brokensep gettext -BBCLASSEXTEND = "native" - do_install_append_class-target() { create-cracklib-dict -o ${D}${datadir}/cracklib/pw_dict ${D}${datadir}/cracklib/cracklib-small } + +BBCLASSEXTEND = "native nativesdk" -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/3] attr: Allow use during build and SDK 2014-08-11 20:21 [PATCH 1/3] cracklib: Allow use in SDK Otavio Salvador @ 2014-08-11 20:21 ` Otavio Salvador 2014-08-11 20:21 ` [PATCH 3/3] libpam: Allow use during build and in SDK Otavio Salvador 1 sibling, 0 replies; 5+ messages in thread From: Otavio Salvador @ 2014-08-11 20:21 UTC (permalink / raw) To: openembedded-core; +Cc: Otavio Salvador Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> --- meta/recipes-support/attr/attr.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-support/attr/attr.inc b/meta/recipes-support/attr/attr.inc index c37d34f..28c750f 100644 --- a/meta/recipes-support/attr/attr.inc +++ b/meta/recipes-support/attr/attr.inc @@ -35,3 +35,5 @@ do_install_ptest() { } RDEPENDS_${PN}-ptest = "coreutils perl-module-filehandle perl-module-getopt-std perl-module-posix" + +BBCLASSEXTEND = "native nativesdk" \ No newline at end of file -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/3] libpam: Allow use during build and in SDK 2014-08-11 20:21 [PATCH 1/3] cracklib: Allow use in SDK Otavio Salvador 2014-08-11 20:21 ` [PATCH 2/3] attr: Allow use during build and SDK Otavio Salvador @ 2014-08-11 20:21 ` Otavio Salvador 2014-08-15 9:45 ` Richard Purdie 1 sibling, 1 reply; 5+ messages in thread From: Otavio Salvador @ 2014-08-11 20:21 UTC (permalink / raw) To: openembedded-core; +Cc: Otavio Salvador The recipe had libpam hardcoded in some places which were causing failures as the metadata renaming hooks does not change those, generating a broken dependencies list. This patch fixes those and add the native and nativesdk support. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> --- meta/recipes-extended/pam/libpam_1.1.6.bb | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/meta/recipes-extended/pam/libpam_1.1.6.bb b/meta/recipes-extended/pam/libpam_1.1.6.bb index 3190aaf..c06709f 100644 --- a/meta/recipes-extended/pam/libpam_1.1.6.bb +++ b/meta/recipes-extended/pam/libpam_1.1.6.bb @@ -61,7 +61,7 @@ FILES_${PN}-dev += "${base_libdir}/security/*.la ${base_libdir}/*.la ${base_libd FILES_${PN}-runtime = "${sysconfdir}" FILES_${PN}-xtests = "${datadir}/Linux-PAM/xtests" -PACKAGES_DYNAMIC += "^pam-plugin-.*" +PACKAGES_DYNAMIC += "^${MLPREFIX}pam-plugin-.*" def get_multilib_bit(d): baselib = d.getVar('baselib', True) or '' @@ -69,12 +69,12 @@ def get_multilib_bit(d): libpam_suffix = "suffix${@get_multilib_bit(d)}" -RPROVIDES_${PN} += "libpam-${libpam_suffix}" -RPROVIDES_${PN}-runtime += "libpam-runtime-${libpam_suffix}" +RPROVIDES_${PN} += "${PN}-${libpam_suffix}" +RPROVIDES_${PN}-runtime += "${PN}-runtime-${libpam_suffix}" -RDEPENDS_${PN}-runtime = "libpam-${libpam_suffix} pam-plugin-deny-${libpam_suffix} pam-plugin-permit-${libpam_suffix} pam-plugin-warn-${libpam_suffix} pam-plugin-unix-${libpam_suffix}" -RDEPENDS_${PN}-xtests = "libpam-${libpam_suffix} pam-plugin-access-${libpam_suffix} pam-plugin-debug-${libpam_suffix} pam-plugin-cracklib-${libpam_suffix} pam-plugin-pwhistory-${libpam_suffix} pam-plugin-succeed-if-${libpam_suffix} pam-plugin-time-${libpam_suffix} coreutils" -RRECOMMENDS_${PN} = "libpam-runtime-${libpam_suffix}" +RDEPENDS_${PN}-runtime = "${PN}-${libpam_suffix} pam-plugin-deny-${libpam_suffix} pam-plugin-permit-${libpam_suffix} pam-plugin-warn-${libpam_suffix} pam-plugin-unix-${libpam_suffix}" +RDEPENDS_${PN}-xtests = "${PN}-${libpam_suffix} pam-plugin-access-${libpam_suffix} pam-plugin-debug-${libpam_suffix} pam-plugin-cracklib-${libpam_suffix} pam-plugin-pwhistory-${libpam_suffix} pam-plugin-succeed-if-${libpam_suffix} pam-plugin-time-${libpam_suffix} coreutils" +#RRECOMMENDS_${PN} = "${PN}-runtime-${libpam_suffix}" python populate_packages_prepend () { def pam_plugin_append_file(pn, dir, file): @@ -85,14 +85,15 @@ python populate_packages_prepend () { d.setVar('FILES_' + pn, nf) def pam_plugin_hook(file, pkg, pattern, format, basename): + pn = d.getVar('PN', True) libpam_suffix = d.getVar('libpam_suffix', True) mlprefix = d.getVar('MLPREFIX', True) or '' rdeps = d.getVar('RDEPENDS_' + pkg, True) if rdeps: - rdeps = rdeps + " " + mlprefix + "libpam-" + libpam_suffix + rdeps = rdeps + " " + mlprefix + pn + "-" + libpam_suffix else: - rdeps = mlprefix + "libpam-" + libpam_suffix + rdeps = mlprefix + pn + "-" + libpam_suffix d.setVar('RDEPENDS_' + pkg, rdeps) provides = d.getVar('RPROVIDES_' + pkg, True) @@ -142,3 +143,5 @@ python do_pam_sanity () { bb.warn("Building libpam but 'pam' isn't in DISTRO_FEATURES, PAM won't work correctly") } addtask pam_sanity before do_configure + +BBCLASSEXTEND = "nativesdk native" -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 3/3] libpam: Allow use during build and in SDK 2014-08-11 20:21 ` [PATCH 3/3] libpam: Allow use during build and in SDK Otavio Salvador @ 2014-08-15 9:45 ` Richard Purdie 2014-08-15 12:18 ` Otavio Salvador 0 siblings, 1 reply; 5+ messages in thread From: Richard Purdie @ 2014-08-15 9:45 UTC (permalink / raw) To: Otavio Salvador; +Cc: openembedded-core On Mon, 2014-08-11 at 17:21 -0300, Otavio Salvador wrote: > The recipe had libpam hardcoded in some places which were causing > failures as the metadata renaming hooks does not change those, > generating a broken dependencies list. > > This patch fixes those and add the native and nativesdk support. Well, it doesn't as far as I can tell. Firstly, the autobuilder blew up since nativesdk-coreutils isn't available, which in turn shows nativesdk-libcap isn't either. I pushed patches into master-next for those, next I see: WARNING: QA Issue: nativesdk-pam-plugin-xauth rdepends on nativesdk-nativesdk-libpam-suffix, but it isn't a build dependency? [build-deps] So I'd love to know what testing this had? Cheers, Richard > Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> > --- > meta/recipes-extended/pam/libpam_1.1.6.bb | 19 +++++++++++-------- > 1 file changed, 11 insertions(+), 8 deletions(-) > > diff --git a/meta/recipes-extended/pam/libpam_1.1.6.bb b/meta/recipes-extended/pam/libpam_1.1.6.bb > index 3190aaf..c06709f 100644 > --- a/meta/recipes-extended/pam/libpam_1.1.6.bb > +++ b/meta/recipes-extended/pam/libpam_1.1.6.bb > @@ -61,7 +61,7 @@ FILES_${PN}-dev += "${base_libdir}/security/*.la ${base_libdir}/*.la ${base_libd > FILES_${PN}-runtime = "${sysconfdir}" > FILES_${PN}-xtests = "${datadir}/Linux-PAM/xtests" > > -PACKAGES_DYNAMIC += "^pam-plugin-.*" > +PACKAGES_DYNAMIC += "^${MLPREFIX}pam-plugin-.*" > > def get_multilib_bit(d): > baselib = d.getVar('baselib', True) or '' > @@ -69,12 +69,12 @@ def get_multilib_bit(d): > > libpam_suffix = "suffix${@get_multilib_bit(d)}" > > -RPROVIDES_${PN} += "libpam-${libpam_suffix}" > -RPROVIDES_${PN}-runtime += "libpam-runtime-${libpam_suffix}" > +RPROVIDES_${PN} += "${PN}-${libpam_suffix}" > +RPROVIDES_${PN}-runtime += "${PN}-runtime-${libpam_suffix}" > > -RDEPENDS_${PN}-runtime = "libpam-${libpam_suffix} pam-plugin-deny-${libpam_suffix} pam-plugin-permit-${libpam_suffix} pam-plugin-warn-${libpam_suffix} pam-plugin-unix-${libpam_suffix}" > -RDEPENDS_${PN}-xtests = "libpam-${libpam_suffix} pam-plugin-access-${libpam_suffix} pam-plugin-debug-${libpam_suffix} pam-plugin-cracklib-${libpam_suffix} pam-plugin-pwhistory-${libpam_suffix} pam-plugin-succeed-if-${libpam_suffix} pam-plugin-time-${libpam_suffix} coreutils" > -RRECOMMENDS_${PN} = "libpam-runtime-${libpam_suffix}" > +RDEPENDS_${PN}-runtime = "${PN}-${libpam_suffix} pam-plugin-deny-${libpam_suffix} pam-plugin-permit-${libpam_suffix} pam-plugin-warn-${libpam_suffix} pam-plugin-unix-${libpam_suffix}" > +RDEPENDS_${PN}-xtests = "${PN}-${libpam_suffix} pam-plugin-access-${libpam_suffix} pam-plugin-debug-${libpam_suffix} pam-plugin-cracklib-${libpam_suffix} pam-plugin-pwhistory-${libpam_suffix} pam-plugin-succeed-if-${libpam_suffix} pam-plugin-time-${libpam_suffix} coreutils" > +#RRECOMMENDS_${PN} = "${PN}-runtime-${libpam_suffix}" > > python populate_packages_prepend () { > def pam_plugin_append_file(pn, dir, file): > @@ -85,14 +85,15 @@ python populate_packages_prepend () { > d.setVar('FILES_' + pn, nf) > > def pam_plugin_hook(file, pkg, pattern, format, basename): > + pn = d.getVar('PN', True) > libpam_suffix = d.getVar('libpam_suffix', True) > mlprefix = d.getVar('MLPREFIX', True) or '' > > rdeps = d.getVar('RDEPENDS_' + pkg, True) > if rdeps: > - rdeps = rdeps + " " + mlprefix + "libpam-" + libpam_suffix > + rdeps = rdeps + " " + mlprefix + pn + "-" + libpam_suffix > else: > - rdeps = mlprefix + "libpam-" + libpam_suffix > + rdeps = mlprefix + pn + "-" + libpam_suffix > d.setVar('RDEPENDS_' + pkg, rdeps) > > provides = d.getVar('RPROVIDES_' + pkg, True) > @@ -142,3 +143,5 @@ python do_pam_sanity () { > bb.warn("Building libpam but 'pam' isn't in DISTRO_FEATURES, PAM won't work correctly") > } > addtask pam_sanity before do_configure > + > +BBCLASSEXTEND = "nativesdk native" > -- > 1.7.10.4 > ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 3/3] libpam: Allow use during build and in SDK 2014-08-15 9:45 ` Richard Purdie @ 2014-08-15 12:18 ` Otavio Salvador 0 siblings, 0 replies; 5+ messages in thread From: Otavio Salvador @ 2014-08-15 12:18 UTC (permalink / raw) To: Richard Purdie; +Cc: Patches and discussions about the oe-core layer On Fri, Aug 15, 2014 at 6:45 AM, Richard Purdie <richard.purdie@linuxfoundation.org> wrote: > On Mon, 2014-08-11 at 17:21 -0300, Otavio Salvador wrote: >> The recipe had libpam hardcoded in some places which were causing >> failures as the metadata renaming hooks does not change those, >> generating a broken dependencies list. >> >> This patch fixes those and add the native and nativesdk support. > > Well, it doesn't as far as I can tell. > > Firstly, the autobuilder blew up since nativesdk-coreutils isn't > available, which in turn shows nativesdk-libcap isn't either. I pushed > patches into master-next for those, next I see: > > WARNING: QA Issue: nativesdk-pam-plugin-xauth rdepends on nativesdk-nativesdk-libpam-suffix, but it isn't a build dependency? [build-deps] > > So I'd love to know what testing this had? I will test this better here and send a new patchset. This was my fault as this were not tested in master. Will proper fix it and send. Sorry for that. -- Otavio Salvador O.S. Systems http://www.ossystems.com.br http://code.ossystems.com.br Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750 ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-08-15 12:18 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-08-11 20:21 [PATCH 1/3] cracklib: Allow use in SDK Otavio Salvador 2014-08-11 20:21 ` [PATCH 2/3] attr: Allow use during build and SDK Otavio Salvador 2014-08-11 20:21 ` [PATCH 3/3] libpam: Allow use during build and in SDK Otavio Salvador 2014-08-15 9:45 ` Richard Purdie 2014-08-15 12:18 ` Otavio Salvador
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox