| Message ID | 20180326120006.24104-1-arnout@mind.be |
|---|---|
| State | Accepted |
| Commit | 0876b023663377bc3a24c80399f447c1f2afe0c1 |
| Headers | show |
| Series | busybox: disable PAM in the config if linux-pam is not selected | expand |
Arnout, On Mon, Mar 26, 2018 at 7:00 AM, Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> wrote: > Currently there is only logic to enable PAM when linux-pam is selected. > However, busybox will fail to build with PAM enabled if the linux-pam > package has not been built before. So we should forcibly disable PAM in > busybox in that case. > > Normally this is not an issue since our default busybox config doesn't > have PAM enabled. However, if you enable linux-pam, then save the > busybox config to a custom configuration file, then disable linux-pam > again, and then do a "make clean; make", the build will fail. A more > practical situation where this can occur is when the same custom > busybox config is used in a Buildroot config with and without > linux-pam. I've observed that fun behaviour when we've gone between basic builds and configurations with STIG/SELinux requirements. Reviewed-by: Matt Weber <matthew.weber@rockwellcollins.com>
>>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> writes: > Currently there is only logic to enable PAM when linux-pam is selected. > However, busybox will fail to build with PAM enabled if the linux-pam > package has not been built before. So we should forcibly disable PAM in > busybox in that case. > Normally this is not an issue since our default busybox config doesn't > have PAM enabled. However, if you enable linux-pam, then save the > busybox config to a custom configuration file, then disable linux-pam > again, and then do a "make clean; make", the build will fail. A more > practical situation where this can occur is when the same custom > busybox config is used in a Buildroot config with and without > linux-pam. > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> > --- > Resend, patchwork missed the first send. Committed, thanks.
>>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> writes: > Currently there is only logic to enable PAM when linux-pam is selected. > However, busybox will fail to build with PAM enabled if the linux-pam > package has not been built before. So we should forcibly disable PAM in > busybox in that case. > Normally this is not an issue since our default busybox config doesn't > have PAM enabled. However, if you enable linux-pam, then save the > busybox config to a custom configuration file, then disable linux-pam > again, and then do a "make clean; make", the build will fail. A more > practical situation where this can occur is when the same custom > busybox config is used in a Buildroot config with and without > linux-pam. > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> > --- > Resend, patchwork missed the first send. Committed to 2018.02.x, thanks.
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index bc0c661754..7009f6a675 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -248,6 +248,10 @@ define BUSYBOX_LINUX_PAM $(call KCONFIG_ENABLE_OPT,CONFIG_PAM,$(BUSYBOX_BUILD_CONFIG)) endef BUSYBOX_DEPENDENCIES += linux-pam +else +define BUSYBOX_LINUX_PAM + $(call KCONFIG_DISABLE_OPT,CONFIG_PAM,$(BUSYBOX_BUILD_CONFIG)) +endef endif # Telnet support
Currently there is only logic to enable PAM when linux-pam is selected. However, busybox will fail to build with PAM enabled if the linux-pam package has not been built before. So we should forcibly disable PAM in busybox in that case. Normally this is not an issue since our default busybox config doesn't have PAM enabled. However, if you enable linux-pam, then save the busybox config to a custom configuration file, then disable linux-pam again, and then do a "make clean; make", the build will fail. A more practical situation where this can occur is when the same custom busybox config is used in a Buildroot config with and without linux-pam. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> --- Resend, patchwork missed the first send. --- package/busybox/busybox.mk | 4 ++++ 1 file changed, 4 insertions(+)