rename alpine -> alpine-extended and alpine-mini -> alpine

7 files changed, 231 insertions, 231 deletions

diff --git a/Makefile b/Makefile
index 19a5328..c3b0c96 100755
--- a/Makefile
+++ b/Makefile
@@ -518,9 +518,9 @@ ifeq ($(ALPINE_ARCH),armhf)
 profiles ?= alpine-rpi alpine-uboot
 else
 ifeq ($(ALPINE_ARCH),x86_64)
-profiles ?= alpine alpine-mini alpine-vanilla alpine-xen
+profiles ?= alpine alpine-extended alpine-vanilla alpine-xen
 else
-profiles ?= alpine alpine-mini alpine-vanilla
+profiles ?= alpine alpine-extended alpine-vanilla
 endif
 endif
 
diff --git a/alpine-extended.conf.mk b/alpine-extended.conf.mk
new file mode 100644
index 0000000..302e8c3
--- /dev/null
+++ b/alpine-extended.conf.mk
@@ -0,0 +1,4 @@
+ALPINE_NAME     := alpine
+KERNEL_FLAVOR   := grsec
+MODLOOP_EXTRA	= $(addsuffix -grsec, dahdi-linux xtables-addons)
+
diff --git a/alpine-extended.packages b/alpine-extended.packages
new file mode 100644
index 0000000..8eb2d7d
--- /dev/null
+++ b/alpine-extended.packages
@@ -0,0 +1,220 @@
+
+dahdi-linux-grsec
+linux-grsec
+xtables-addons-grsec
+
+acct
+acf-alpine-baselayout
+acf-alpine-conf
+acf-amavisd-new
+acf-apk-tools
+acf-asterisk
+acf-chrony
+acf-clamav
+acf-clamsmtp
+acf-core
+acf-dansguardian
+acf-dhcp
+acf-dnscache
+acf-dnsmasq
+acf-dovecot
+acf-fetchmail
+acf-freeswitch
+acf-freeswitch-vmail
+acf-gross
+acf-heimdal
+acf-iproute2-qos
+acf-ipsec-tools
+acf-iptables
+acf-jquery
+acf-kamailio
+acf-lib
+acf-lighttpd
+acf-lvm2
+acf-mdadm
+acf-opennhrp
+acf-openntpd
+acf-openssh
+acf-openssl
+acf-openvpn
+acf-pingu
+acf-postfix
+acf-postgresql
+acf-ppp
+acf-provisioning
+acf-quagga
+acf-samba
+acf-shorewall
+acf-skins
+acf-snort
+acf-squid
+acf-tcpproxy
+acf-tinydns
+acf-weblog
+amavis
+alpine-base
+alpine-baselayout
+alpine-conf
+alpine-mirrors
+apk-tools
+arpon
+arpwatch
+asterisk
+asterisk-addons
+asterisk-addons-mp3
+asterisk-addons-mysql
+asterisk-addons-ooh323
+asterisk-addons-saycountpl
+asterisk-audio-konf
+asterisk-fax
+asterisk-mobile
+asterisk-odbc
+asterisk-pgsql
+asterisk-sample-config
+asterisk-speex
+asterisk-srtp
+asterisk-tds
+awall
+bbsuid
+bind
+bind-libs
+bind-tools
+bkeymaps
+bridge-utils
+busybox
+bwm-ng
+cksfv
+clamav
+clamsmtp
+conntrack-tools
+cryptsetup
+cutter
+cyrus-sasl
+dahdi-linux
+dahdi-tools
+dansguardian
+dhcp
+dhcpcd
+dhcrelay
+dnscache
+dnsmasq
+dosfstools
+dovecot
+drill
+e2fsprogs
+email
+espeak
+ethtool
+fetchmail
+fping
+fprobe
+haserl
+htop
+igmpproxy
+ip6tables
+iproute2
+iproute2-qos
+ipsec-tools
+iptables
+iptraf
+iputils
+irssi
+kamailio-*
+ldns-tools
+lftp
+links
+lm_sensors
+lm_sensors-detect
+logrotate
+
+lua
+lua5.2
+lua5.3
+lua*-alt-getopt
+lua*-asn1
+lua*-bitlib
+lua*-discount
+lua*-dns
+lua*-expat
+lua*-iconv
+lua*-json4
+lua*-md5
+lua*-openrc
+lua*-ossl
+lua*-pc
+lua*-posix
+lua*-socket
+lua*-sql-mysql
+lua*-sql-postgres
+lua*-sql-sqlite3
+lua*-stdlib
+lua*-stringy
+lua*-uuid
+lua*-zlib
+
+lsof
+lvm2
+man
+mdadm
+mini_httpd
+miniperl
+mkinitfs
+mpg123
+mtools
+nano
+ncurses-terminfo
+net-snmp
+net-snmp-tools
+network-extras
+nmap
+nrpe
+opennhrp
+openntpd
+openrc
+openssh
+openssl
+openvpn
+p7zip
+parted
+pax-utils
+paxctl
+pciutils
+pingu
+ppp
+quagga
+rsync
+screen
+sfdisk
+shorewall*
+snort
+sntpc
+socat
+squark
+squid
+squid-lang-*
+ssmtp
+strace
+sudo
+sysklogd
+syslinux
+tcpdump
+tcpproxy
+tinydns
+tinyproxy
+transmission-cli
+tzdata
+unbound
+unfs3
+unrar
+usbutils
+util-linux
+v86d
+vim
+vsftpd
+xe-guest-utilities
+xfsprogs
+wireless-tools
+wpa_supplicant
+xtables-addons
+zonenotify
+
diff --git a/alpine-mini.conf.mk b/alpine-mini.conf.mk
deleted file mode 100644
index 59fbe70..0000000
--- a/alpine-mini.conf.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-ALPINE_NAME     := alpine-mini
-MODLOOP_EXTRA   :=
-KERNEL_FLAVOR   := grsec
-
diff --git a/alpine-mini.packages b/alpine-mini.packages
deleted file mode 100644
index e23e151..0000000
--- a/alpine-mini.packages
+++ /dev/null
@@ -1,8 +0,0 @@
-bkeymaps
-alpine-base
-alpine-mirrors
-network-extras
-openssl
-openssh
-chrony
-tzdata
diff --git a/alpine.conf.mk b/alpine.conf.mk
index 302e8c3..59fbe70 100644
--- a/alpine.conf.mk
+++ b/alpine.conf.mk
@@ -1,4 +1,4 @@
-ALPINE_NAME     := alpine
+ALPINE_NAME     := alpine-mini
+MODLOOP_EXTRA   :=
 KERNEL_FLAVOR   := grsec
-MODLOOP_EXTRA	= $(addsuffix -grsec, dahdi-linux xtables-addons)
 
diff --git a/alpine.packages b/alpine.packages
index 8eb2d7d..e23e151 100644
--- a/alpine.packages
+++ b/alpine.packages
@@ -1,220 +1,8 @@
-
-dahdi-linux-grsec
-linux-grsec
-xtables-addons-grsec
-
-acct
-acf-alpine-baselayout
-acf-alpine-conf
-acf-amavisd-new
-acf-apk-tools
-acf-asterisk
-acf-chrony
-acf-clamav
-acf-clamsmtp
-acf-core
-acf-dansguardian
-acf-dhcp
-acf-dnscache
-acf-dnsmasq
-acf-dovecot
-acf-fetchmail
-acf-freeswitch
-acf-freeswitch-vmail
-acf-gross
-acf-heimdal
-acf-iproute2-qos
-acf-ipsec-tools
-acf-iptables
-acf-jquery
-acf-kamailio
-acf-lib
-acf-lighttpd
-acf-lvm2
-acf-mdadm
-acf-opennhrp
-acf-openntpd
-acf-openssh
-acf-openssl
-acf-openvpn
-acf-pingu
-acf-postfix
-acf-postgresql
-acf-ppp
-acf-provisioning
-acf-quagga
-acf-samba
-acf-shorewall
-acf-skins
-acf-snort
-acf-squid
-acf-tcpproxy
-acf-tinydns
-acf-weblog
-amavis
+bkeymaps
 alpine-base
-alpine-baselayout
-alpine-conf
 alpine-mirrors
-apk-tools
-arpon
-arpwatch
-asterisk
-asterisk-addons
-asterisk-addons-mp3
-asterisk-addons-mysql
-asterisk-addons-ooh323
-asterisk-addons-saycountpl
-asterisk-audio-konf
-asterisk-fax
-asterisk-mobile
-asterisk-odbc
-asterisk-pgsql
-asterisk-sample-config
-asterisk-speex
-asterisk-srtp
-asterisk-tds
-awall
-bbsuid
-bind
-bind-libs
-bind-tools
-bkeymaps
-bridge-utils
-busybox
-bwm-ng
-cksfv
-clamav
-clamsmtp
-conntrack-tools
-cryptsetup
-cutter
-cyrus-sasl
-dahdi-linux
-dahdi-tools
-dansguardian
-dhcp
-dhcpcd
-dhcrelay
-dnscache
-dnsmasq
-dosfstools
-dovecot
-drill
-e2fsprogs
-email
-espeak
-ethtool
-fetchmail
-fping
-fprobe
-haserl
-htop
-igmpproxy
-ip6tables
-iproute2
-iproute2-qos
-ipsec-tools
-iptables
-iptraf
-iputils
-irssi
-kamailio-*
-ldns-tools
-lftp
-links
-lm_sensors
-lm_sensors-detect
-logrotate
-
-lua
-lua5.2
-lua5.3
-lua*-alt-getopt
-lua*-asn1
-lua*-bitlib
-lua*-discount
-lua*-dns
-lua*-expat
-lua*-iconv
-lua*-json4
-lua*-md5
-lua*-openrc
-lua*-ossl
-lua*-pc
-lua*-posix
-lua*-socket
-lua*-sql-mysql
-lua*-sql-postgres
-lua*-sql-sqlite3
-lua*-stdlib
-lua*-stringy
-lua*-uuid
-lua*-zlib
-
-lsof
-lvm2
-man
-mdadm
-mini_httpd
-miniperl
-mkinitfs
-mpg123
-mtools
-nano
-ncurses-terminfo
-net-snmp
-net-snmp-tools
 network-extras
-nmap
-nrpe
-opennhrp
-openntpd
-openrc
-openssh
 openssl
-openvpn
-p7zip
-parted
-pax-utils
-paxctl
-pciutils
-pingu
-ppp
-quagga
-rsync
-screen
-sfdisk
-shorewall*
-snort
-sntpc
-socat
-squark
-squid
-squid-lang-*
-ssmtp
-strace
-sudo
-sysklogd
-syslinux
-tcpdump
-tcpproxy
-tinydns
-tinyproxy
-transmission-cli
+openssh
+chrony
 tzdata
-unbound
-unfs3
-unrar
-usbutils
-util-linux
-v86d
-vim
-vsftpd
-xe-guest-utilities
-xfsprogs
-wireless-tools
-wpa_supplicant
-xtables-addons
-zonenotify
-