diff options
| author | Juergen Beisert <j.beisert@pengutronix.de> | 2006-12-04 18:15:30 +0000 |
|---|---|---|
| committer | Juergen Beisert <j.beisert@pengutronix.de> | 2006-12-04 18:15:30 +0000 |
| commit | cbcf648fed1672b17af8971962606ddfb707eb4b (patch) | |
| tree | 07869295bf19cd48dd31426a5a31a0fc1cb64796 /rules/openssh.make | |
| parent | d2d685094a6e91de3b213626143502b1f719e71d (diff) | |
| download | ptxdist-cbcf648fed1672b17af8971962606ddfb707eb4b.tar.gz ptxdist-cbcf648fed1672b17af8971962606ddfb707eb4b.tar.xz | |
moving relevant menu entries into the package
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@6437 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/openssh.make')
| -rw-r--r-- | rules/openssh.make | 48 |
1 files changed, 38 insertions, 10 deletions
diff --git a/rules/openssh.make b/rules/openssh.make index 07f767b7c..8266fe01b 100644 --- a/rules/openssh.make +++ b/rules/openssh.make @@ -3,7 +3,7 @@ # # Copyright (C) 2002, 2003 by Pengutronix e.K., Hildesheim, Germany # -# See CREDITS for details about who has contributed to this project. +# See CREDITS for details about who has contributed to this project. # # For further information about the PTXdist project and license conditions # see the README file. @@ -15,7 +15,7 @@ PACKAGES-$(PTXCONF_OPENSSH) += openssh # -# Paths and names +# Paths and names # OPENSSH_VERSION = 4.3p2 OPENSSH = openssh-$(OPENSSH_VERSION) @@ -135,9 +135,11 @@ ifdef PTXCONF_OPENSSH_SSH endif ifdef PTXCONF_OPENSSH_SSHD - @$(call install_copy, openssh, 0, 0, 0644, $(OPENSSH_DIR)/moduli.out, /etc/ssh/moduli, n) + @$(call install_copy, openssh, 0, 0, 0644, $(OPENSSH_DIR)/moduli.out, \ + /etc/ssh/moduli, n) @$(call install_alternative, openssh, 0, 0, 0644, /etc/ssh/sshd_config) - @$(call install_copy, openssh, 0, 0, 0755, $(OPENSSH_DIR)/sshd, /usr/sbin/sshd) + @$(call install_copy, openssh, 0, 0, 0755, $(OPENSSH_DIR)/sshd, \ + /usr/sbin/sshd) endif ifdef PTXCONF_ROOTFS_ETC_INITD_OPENSSH @@ -154,16 +156,42 @@ ifneq ($(PTXCONF_ROOTFS_ETC_INITD_OPENSSH_LINK),"") endif ifdef PTXCONF_OPENSSH_SCP - @$(call install_copy, openssh, 0, 0, 0755, $(OPENSSH_DIR)/scp, /usr/bin/scp) + @$(call install_copy, openssh, 0, 0, 0755, $(OPENSSH_DIR)/scp, \ + /usr/bin/scp) endif ifdef PTXCONF_OPENSSH_SFTP_SERVER - @$(call install_copy, openssh, 0, 0, 0755, $(OPENSSH_DIR)/sftp-server, /usr/sbin/sftp-server) + @$(call install_copy, openssh, 0, 0, 0755, $(OPENSSH_DIR)/sftp-server, \ + /usr/sbin/sftp-server) endif ifdef PTXCONF_OPENSSH_KEYGEN - @$(call install_copy, openssh, 0, 0, 0755, $(OPENSSH_DIR)/ssh-keygen, /usr/bin/ssh-keygen) + @$(call install_copy, openssh, 0, 0, 0755, $(OPENSSH_DIR)/ssh-keygen, \ + /usr/bin/ssh-keygen) endif + +ifdef PTXCONF_ROOTFS_ETC_INITD_SSHD +ifdef PTXCONF_ROOTFS_ETC_INITD_OPENSSH_DEFAULT +# install the generic one + @$(call install_copy, openssh, 0, 0, 0755, \ + $(PTXDIST_TOPDIR)/generic/etc/init.d/openssh, \ + /etc/init.d/openssh, n) +endif +ifdef PTXCONF_ROOTFS_ETC_INITD_OPENSSH_USER +# install users one + @$(call install_copy, openssh, 0, 0, 0755, \ + $(PTXDIST_WORKSPACE)/generic/etc/init.d/openssh, \ + /etc/init.d/openssh, n) +endif +# +# FIXME: Is this packet the right location for the link? +# +ifneq ($(PTXCONF_ROOTFS_ETC_INITD_SSHD_LINK),"") + @$(call install_link, openssh, ../init.d/openssh, \ + /etc/rc.d/$(PTXCONF_ROOTFS_ETC_INITD_SSHD_LINK)) +endif +endif + @$(call install_finish, openssh) @$(call touch, $@) @@ -172,9 +200,9 @@ endif # Clean # ---------------------------------------------------------------------------- -openssh_clean: - rm -rf $(STATEDIR)/openssh.* - rm -rf $(IMAGEDIR)/openssh_* +openssh_clean: + rm -rf $(STATEDIR)/openssh.* + rm -rf $(IMAGEDIR)/openssh_* rm -rf $(OPENSSH_DIR) # vim: syntax=make |