summaryrefslogtreecommitdiffstats
path: root/rules/sudo.make
diff options
context:
space:
mode:
authorRobert Schwebel <r.schwebel@pengutronix.de>2007-10-27 20:08:01 +0000
committerRobert Schwebel <r.schwebel@pengutronix.de>2007-10-27 20:08:01 +0000
commit479ab79d27a7e9f827700dfce6254d00433306af (patch)
treeeb8abc95c7fae0605066dd24c7980579f180784c /rules/sudo.make
parentffa1ab50c3f435bddf5b788eeb0efafbf0c523a7 (diff)
downloadptxdist-479ab79d27a7e9f827700dfce6254d00433306af.tar.gz
ptxdist-479ab79d27a7e9f827700dfce6254d00433306af.tar.xz
* sudo: update to version 1.6.9p2. It patches some compile
breakage, when trying to cross compile. It also allows to install a user sudoers file from projectroot. Signed-off-by: Carsten Schlote <c.schlote@konzeptpark.de> git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@7593 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/sudo.make')
-rw-r--r--rules/sudo.make21
1 files changed, 14 insertions, 7 deletions
diff --git a/rules/sudo.make b/rules/sudo.make
index 10dceed88..df8bc3c78 100644
--- a/rules/sudo.make
+++ b/rules/sudo.make
@@ -74,6 +74,13 @@ ifdef PTXCONF_SUDO_DONT_SEND_MAILS
SUDO_AUTOCONF += --without-sendmail
endif
+ ifdef PTXCONF_SUDO_NO_SENDMAIL
+SUDO_AUTOCONF += --without-sendmail
+ endif
+ ifdef PTXCONF_SUDO_NO_PAM
+SUDO_AUTOCONF += --without-pam
+ endif
+
$(STATEDIR)/sudo.prepare: $(sudo_prepare_deps_default)
@$(call targetinfo, $@)
@$(call clean, $(SUDO_DIR)/config.cache)
@@ -112,7 +119,7 @@ sudo_targetinstall: $(STATEDIR)/sudo.targetinstall
$(STATEDIR)/sudo.targetinstall: $(sudo_targetinstall_deps_default)
@$(call targetinfo, $@)
- @$(call install_init, sudo)
+ @$(call install_init, sudo)
@$(call install_fixup, sudo,PACKAGE,sudo)
@$(call install_fixup, sudo,PRIORITY,optional)
@$(call install_fixup, sudo,VERSION,$(SUDO_VERSION))
@@ -126,14 +133,14 @@ $(STATEDIR)/sudo.targetinstall: $(sudo_targetinstall_deps_default)
@$(call install_copy, sudo, 0, 0, 0755, $(SUDO_DIR)/.libs/sudo_noexec.so, /usr/libexec/sudo_noexec.so)
-ifdef PTXCONF_SUDO_ETC_SUDOERS
-ifdef PTXCONF_SUDO_ETC_SUDOERS_DEFAULT
+ ifdef PTXCONF_SUDO_ETC_SUDOERS
+ ifdef PTXCONF_SUDO_ETC_SUDOERS_DEFAULT
@$(call install_copy, sudo, 0, 0, 0440, $(SUDO_DIR)/sudoers, /etc/sudoers,n)
-endif
-ifdef PTXCONF_SUDO_ETC_SUDOERS_USER
+ endif
+ ifdef PTXCONF_SUDO_ETC_SUDOERS_USER
@$(call install_copy, sudo, 0, 0, 0440, ${PTXDIST_WORKSPACE}/projectroot/etc/sudoers, /etc/sudoers,n)
-endif
-endif
+ endif
+ endif
@$(call install_finish, sudo)
@$(call touch, $@)