factor out openssh packages

There's no need to repeat the typical openssh-* triade all over the place; those who need server and client are better off pulling in "openssh" pkglist, and those needing a particular package should specify it.

factor out openssh packages
3f21b6b0 · Michael Shigorin · b24bd31f · 3f21b6b0 · 3f21b6b0 · 3f21b6b0
Commit 3f21b6b0 authored Jun 25, 2012 by Michael Shigorin
7 changed files
--- a/conf.d/live.mk
+++ b/conf.d/live.mk
@@ -38,7 +38,7 @@ distro/live-plymouth: distro/.live-base use/plymouth/live; @:

 distro/live-rescue: distro/live-icewm
 	@$(call add,LIVE_LISTS,$(call tags,rescue && (fs || live || x11)))
-	@$(call add,LIVE_LISTS, \
+	@$(call add,LIVE_LISTS,openssh \
 		$(call tags,(base || extra) && (archive || rescue || network)))

 distro/live-webkiosk-mini: distro/.live-kiosk use/live/hooks use/live/ru

--- a/conf.d/server.mk
+++ b/conf.d/server.mk
@@ -2,7 +2,7 @@
 ifeq (distro,$(IMAGE_CLASS))

 distro/.server-base: distro/.installer use/syslinux/ui/menu use/memtest
-	@$(call add,BASE_LISTS,server-base)
+	@$(call add,BASE_LISTS,server-base openssh)

 distro/server-nano: distro/.server-base \
 	use/cleanup/x11-alterator use/bootloader/lilo

--- a/lib/ve.mk
+++ b/lib/ve.mk
@@ -13,8 +13,7 @@ ve/bare: ve/.bare
 	@$(call add,BASE_PACKAGES,apt)

 ve/generic: ve/.bare
-	@$(call add,BASE_PACKAGES,openssh-server openssh-blacklist openssh-clients)
-	@$(call add,BASE_LISTS,\
+	@$(call add,BASE_LISTS,openssh \
 		$(call tags,base && (server || network || security || pkg)))

 ve/openvpn: ve/.bare

--- a/pkg.in/lists/openssh
+++ b/pkg.in/lists/openssh
+openssh-server
+openssh-blacklist
+openssh-clients
--- a/pkg.in/lists/server-base
+++ b/pkg.in/lists/server-base
@@ -4,8 +4,5 @@ vim-console
 sfdisk
 mdadm

-openssh-server
-openssh-clients
-openssh-blacklist
 screen
 acpid
--- a/pkg.in/lists/tagged/rescue+extra
+++ b/pkg.in/lists/tagged/rescue+extra
@@ -78,8 +78,6 @@ netlist
 nfs-utils
 ngrep
 nmap
-openssh-clients
-openssh-server
 p0f
 postfix
 rsync

--- a/pkg.in/lists/tagged/server+network
+++ b/pkg.in/lists/tagged/server+network
@@ -8,9 +8,6 @@ lftp
 mailx
 netcat
 netlist
-openssh-clients
-openssh-server
-openssh-blacklist
 rsync
 traceroute
 vlan-utils