cronie: add PACKAGECONFIG data
PATCH 1/1 cronie: add PACKAGECONFIG data
We add PACKAGECONFIG[] data for audit and move the current pam related stuff into it's own entry.
Signed-off-by Joe Slater <[email protected]>
--- meta/recipes-extended/cronie/cronie_1.4.11.bb | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-)
meta/recipes-extended/cronie/cronie_1.4.11.bb +9 -6
@@ -14,9 +14,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=963ea0772a2adbdcd607a9b2ec320c11 \ SECTION = "utils" -DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" -RDEPENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_DEPS}', '', d)}" -PAM_DEPS = "libpam libpam-runtime pam-plugin-access pam-plugin-loginuid" SRC_URI = "https://fedorahosted.org/releases/c/r/cronie/cronie-${PV}.tar.gz \ file://fix-out-of-tree-build.patch \
@@ -25,15 +22,21 @@ SRC_URI = "https://fedorahosted.org/releases/c/r/cronie/cronie-${PV}.tar.gz \ ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" PAM_SRC_URI = "file://crond_pam_config.patch" - +PAM_DEPS = "libpam libpam-runtime pam-plugin-access pam-plugin-loginuid" SRC_URI[md5sum] = "2ba645cf54de17f138ef70312843862f" SRC_URI[sha256sum] = "fd08084cedddbb42499f80ddb7f2158195c3555c2ff40ee11d4ece2f9864d7be" inherit autotools update-rc.d useradd -EXTRA_OECONF += "\ - ${@base_contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)}" + +PACKAGECONFIG ?= "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" + +# yes, no, depends, rdepends +# +PACKAGECONFIG[audit] = "--with-audit,--without-audit,audit," +PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam,${PAM_DEPS}" + INITSCRIPT_NAME = "crond" INITSCRIPT_PARAMS = "start 90 2 3 4 5 . stop 60 0 1 6 ."
Signature · 1 line
1.7.3.4
Quoted 31 lines · Joe Slater
We add PACKAGECONFIG[] data for audit and move the current pam related stuff into it's own entry.
Signed-off-by Joe Slater <[email protected]>--- meta/recipes-extended/cronie/cronie_1.4.11.bb | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-)meta/recipes-extended/cronie/cronie_1.4.11.bb +1
-4@@ -14,9 +14,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=963ea0772a2adbdcd607a9b2ec320c11 \ SECTION = "utils" -DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" -RDEPENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_DEPS}', '', d)}" -PAM_DEPS = "libpam libpam-runtime pam-plugin-access pam-plugin-loginuid" SRC_URI = "https://fedorahosted.org/releases/c/r/cronie/cronie-${PV}.tar.gz \ file://fix-out-of-tree-build.patch \@@ -25,15 +22,21 @@ SRC_URI = "https://fedorahosted.org/releases/c/r/cronie/cronie-${PV}.tar.gz \ ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" PAM_SRC_URI = "file://crond_pam_config.patch" - +PAM_DEPS = "libpam libpam-runtime pam-plugin-access pam-plugin-loginuid" SRC_URI[md5sum] = "2ba645cf54de17f138ef70312843862f" SRC_URI[sha256sum] = "fd08084cedddbb42499f80ddb7f2158195c3555c2ff40ee11d4ece2f9864d7be"
meta/recipes-extended/cronie/cronie_1.4.11.bb SRC_URI = "https://fedorahosted.org/releases/c/r/cronie/cronie-${PV}.tar.gz \ · line 36
Quoted 10 lines
meta/recipes-extended/cronie/cronie_1.4.11.bb +5
-2inherit autotools update-rc.d useradd -EXTRA_OECONF += "\ - ${@base_contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)}" + +PACKAGECONFIG ?= "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" + +# yes, no, depends, rdepends +#
You must have this in your cut and paste, as with the other patch, we don't need the extra comments here.
Thanks
Sau!
Quoted 7 lines
meta/recipes-extended/cronie/cronie_1.4.11.bb +3
-0+PACKAGECONFIG[audit] = "--with-audit,--without-audit,audit," +PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam,${PAM_DEPS}" + INITSCRIPT_NAME = "crond" INITSCRIPT_PARAMS = "start 90 2 3 4 5 . stop 60 0 1 6 ."