Skip to contentSkip to conversation

busybox: disable PAM in the config if linux-pam is not selected

PATCH New Arnout Vandecappelle (Essensium/Mind) 3 participants 4 messages Mar 26, 2018 – Apr 7, 2018

lore
Share & tools
lore

Arnout Vandecappelle (Essensium/Mind)

author
#0 lore raw

PATCH 1/1 busybox: disable PAM in the config if linux-pam is not selected

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) <[email protected]>

---
Resend, patchwork missed the first send.

---
 package/busybox/busybox.mk | 4 ++++
 1 file changed, 4 insertions(+)
package/busybox/busybox.mk +4 -0
index bc0c661754..7009f6a675 100644
@@ -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
Signature · 1 line
2.16.2
#1 lore raw

PATCH 1/1 busybox: disable PAM in the config if linux-pam is not selected

Arnout,

Quoted 5 lines · Arnout Vandecappelle (Essensium/Mind)

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.

Quoted 7 lines

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 <[email protected]>
#2 lore raw

PATCH 1/1 busybox: disable PAM in the config if linux-pam is not selected

In reply to Arnout Vandecappelle (Essensium/Mind)
Quoted 15 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Arnout" == Arnout Vandecappelle (Essensium/Mind) <[email protected]> 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.

Quoted 3 lines
Signed-off-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

---
Resend, patchwork missed the first send.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 1/1 busybox: disable PAM in the config if linux-pam is not selected

In reply to Arnout Vandecappelle (Essensium/Mind)
Quoted 15 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Arnout" == Arnout Vandecappelle (Essensium/Mind) <[email protected]> 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.

Quoted 3 lines
Signed-off-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

---
Resend, patchwork missed the first send.

Committed to 2018.02.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard