From 00adab6430aa5c7ea44a903e10f9c118e9f98059 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 11 Sep 2009 14:25:14 +0000 Subject: alpine.mk: support for profiles renamed default package list to alpine.packages --- alpine.mk | 36 +++-- alpine.packages | 466 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ packages | 466 -------------------------------------------------------- 3 files changed, 492 insertions(+), 476 deletions(-) create mode 100644 alpine.packages delete mode 100644 packages diff --git a/alpine.mk b/alpine.mk index c0d1c96..004b6b6 100755 --- a/alpine.mk +++ b/alpine.mk @@ -1,12 +1,14 @@ #!/usr/bin/make -f --include alpine.conf.mk +PROFILE ?= alpine + +-include $(PROFILE).conf.mk BUILD_DATE := $(shell date +%y%m%d) ALPINE_RELEASE ?= $(BUILD_DATE) ALPINE_NAME ?= alpine-test ALPINE_ARCH := i386 -DESTDIR ?= $(shell pwd)/isotmp +DESTDIR ?= $(shell pwd)/isotmp.$(PROFILE) MKCRAMFS = mkcramfs SUDO = sudo @@ -16,6 +18,8 @@ ISO_LINK ?= $(ALPINE_NAME).iso ISO_DIR := $(DESTDIR)/isofs ISO_PKGDIR := $(ISO_DIR)/apks +APKS ?= $(shell sed 's/\#.*//; s/\*/\\*/g' $(PROFILE).packages) + APK_OPTS := $(addprefix --repository ,$(APK_REPOS)) --keys-dir /etc/apk/keys find_apk_ver = $(shell apk search $(APK_OPTS) $(1) | sort | uniq) @@ -86,12 +90,14 @@ $(APK_FILES): # MODLOOP := $(ISO_DIR)/boot/$(KERNEL_NAME).cmg MODLOOP_DIR := $(DESTDIR)/modloop +MODLOOP_KERNELSTAMP := $(DESTDIR)/stamp.modloop.kernel MODLOOP_DIRSTAMP := $(DESTDIR)/stamp.modloop -MODLOOP_PKGS := $(KERNEL_PKGNAME) $(addsuffix -$(KERNEL_FLAVOR), dahdi-linux iscsitarget xtables-addons) +MODLOOP_EXTRA ?= $(addsuffix -$(KERNEL_FLAVOR), dahdi-linux iscsitarget xtables-addons) +MODLOOP_PKGS = $(KERNEL_PKGNAME) $(MODLOOP_EXTRA) modloop: $(MODLOOP) -$(MODLOOP_DIRSTAMP): +$(MODLOOP_KERNELSTAMP): @echo "==> modloop: Unpacking kernel modules"; @rm -rf $(MODLOOP_DIR) @mkdir -p $(MODLOOP_DIR)/lib/modules/ @@ -99,8 +105,13 @@ $(MODLOOP_DIRSTAMP): apk fetch $(APK_OPTS) --stdout $$i \ | tar -C $(MODLOOP_DIR) -xz; \ done + @cp $(MODLOOP_DIR)/usr/share/$(KERNEL_PKGNAME)/kernel.release $@ + +MODLOOP_KERNEL_RELEASE = $(shell cat $(MODLOOP_KERNELSTAMP)) + +$(MODLOOP_DIRSTAMP): $(MODLOOP_KERNELSTAMP) @rm -rf $(addprefix $(MODLOOP_DIR)/lib/modules/*/, source build) - @depmod $(KERNEL) -b $(MODLOOP_DIR) + @depmod $(MODLOOP_KERNEL_RELEASE) -b $(MODLOOP_DIR) @touch $(MODLOOP_DIRSTAMP) $(MODLOOP): $(MODLOOP_DIRSTAMP) @@ -109,7 +120,7 @@ $(MODLOOP): $(MODLOOP_DIRSTAMP) @$(MKCRAMFS) $(MODLOOP_DIR)/lib $(MODLOOP) clean-modloop: - @rm -rf $(MODLOOP_DIR) $(MODLOOP_DIRSTAMP) $(MODLOOP) + @rm -rf $(MODLOOP_DIR) $(MODLOOP_DIRSTAMP) $(MODLOOP_PKGSTAMP) $(MODLOOP) # # Initramfs rules @@ -137,9 +148,9 @@ $(INITFS_DIRSTAMP): @touch $@ #$(INITFS): $(shell mkinitfs -F "$(INITFS_FEATURES)" -l $(KERNEL)) -$(INITFS): $(INITFS_DIRSTAMP) +$(INITFS): $(INITFS_DIRSTAMP) $(MODLOOP_DIRSTAMP) @mkinitfs -F "$(INITFS_FEATURES)" -t $(INITFS_TMP) \ - -b $(INITFS_DIR) -o $@ $(KERNEL) + -b $(INITFS_DIR) -o $@ $(MODLOOP_KERNEL_RELEASE) clean-initfs: @rm -rf $(INITFS) $(INITFS_DIRSTAMP) $(INITFS_DIR) @@ -186,7 +197,7 @@ $(ISOLINUX_CFG): @echo " kernel /boot/$(KERNEL_NAME)" >>$(ISOLINUX_CFG) @echo " append initrd=/boot/$(KERNEL_NAME).gz alpine_dev=cdrom:iso9660 modules=loop,cramfs,sd-mod,usb-storage,floppy quiet" >>$(ISOLINUX_CFG) -$(SYSLINUX_CFG): +$(SYSLINUX_CFG): $(MODLOOP_DIRSTAMP) @echo "==> iso: configure syslinux" @echo "timeout 20" >$@ @echo "prompt 1" >>$@ @@ -195,6 +206,9 @@ $(SYSLINUX_CFG): @echo " kernel /boot/$(KERNEL_NAME)" >>$@ @echo " append initrd=/boot/$(KERNEL_NAME).gz alpine_dev=usbdisk:vfat modules=loop,cramfs,sd-mod,usb-storage quiet" >>$@ +clean-syslinux: + @rm -f $(SYSLINUX_CFG) $(ISOLINUX_CFG) $(ISOLINUX_BIN) + ISO_KERNEL := $(ISO_DIR)/boot/$(KERNEL_NAME) ISO_REPOS_DIRSTAMP := $(DESTDIR)/stamp.isorepos ISOFS_DIRSTAMP := $(DESTDIR)/stamp.isofs @@ -209,11 +223,13 @@ $(ISO_PKGDIR)/APKINDEX.tar.gz: $(APK_FILES) -o $@ $(ISO_PKGDIR)/*.apk @abuild-sign $@ -$(ISO_KERNEL): +$(ISO_KERNEL): $(MODLOOP_DIRSTAMP) @echo "==> iso: install kernel $(KERNEL)" @mkdir -p $(dir $(ISO_KERNEL)) @apk fetch $(APK_OPTS) --stdout $(KERNEL_PKGNAME) \ | tar -C $(ISO_DIR) -xz boot + @rm -f $(ISO_DIR)/boot/$(KERNEL_NAME) + @ln -s vmlinuz-$(MODLOOP_KERNEL_RELEASE) $@ @rm -rf $(ISO_DIR)/.[A-Z]* $(ISO_DIR)/.[a-z]* $(ISO_DIR)/lib $(ISOFS_DIRSTAMP): $(MODLOOP) $(INITFS) $(ISOLINUX_CFG) $(ISOLINUX_BIN) $(ISO_KERNEL) $(ISO_REPOS_DIRSTAMP) $(SYSLINUX_CFG) diff --git a/alpine.packages b/alpine.packages new file mode 100644 index 0000000..703a765 --- /dev/null +++ b/alpine.packages @@ -0,0 +1,466 @@ +*-grsec +*-grsec-dev +acct +acct-doc +acf-* +amavis +alpine-base +alpine-baselayout +alpine-conf +alpine-sdk +apk-tools +arpon +arpwatch +aspell +aspell-doc +asterisk +asterisk-doc +asterisk-odbc +asterisk-pgsql +asterisk-tds +aumix +bash +bash-doc +bbsuid +bc +bc-doc +beep +beep-doc +bind +bind-doc +bind-libs +bind-tools +binutils +binutils-doc +bitlib +bkeymaps +bridge-utils +bridge-utils-doc +build-base +busybox +bzip2 +bzip2-doc +c-ares +c-ares-doc +ca-certificates +ccache +ccache-doc +cdrkit +cdrkit-doc +cgit +chrony +chrony-doc +cksfv +cksfv-doc +clamav +clamav-doc +clamsmtp +clamsmtp-doc +conntrack-tools +conntrack-tools-doc +coreutils +coreutils-doc +cpufreqd +cpufreqd-doc +cpufrequtils +cpufrequtils-doc +cracklib +cracklib-words +cramfs +ctags +curl +curl-doc +cutter +cvs +cvs-doc +cyrus-sasl +cyrus-sasl-doc +dahdi-linux +dahdi-tools +dahdi-tools-doc +dansguardian +dansguardian-doc +db +db-doc +device-mapper +device-mapper-doc +dhcp +dhcp-doc +dhcpcd +dhcpcd-doc +dialog +dialog-doc +diffutils +diffutils-doc +dircproxy +dircproxy-doc +distcc +distcc-doc +djbdns +dnscache +dnsmasq +dnsmasq-doc +dosfstools +dosfstools-doc +dovecot +dovecot-doc +dropbear +dtach +dtach-doc +e2fsprogs +e2fsprogs-doc +eggdrop +eggdrop-gseen +eggdrop-logs2html +email +email-doc +espeak +ethtool +ethtool-doc +expat +expat-doc +fakeroot +fakeroot-doc +fcgi +fetchmail +fetchmail-doc +fetchmailconf +file +file-doc +flac +flac-doc +fping +fping-doc +freetds +freetds-doc +freetype +g++ +gawk +gawk-doc +gcc +gcc-doc +gd +gd-doc +gdb +gdb-doc +gdbm +gettext +gettext-doc +ghostscript +ghostscript-doc +git +glib +glib-doc +gmp +gmp-doc +gnupg +gnupg-doc +gnutls +gnutls-doc +gperf +gperf-doc +grep +grep-doc +groff +groff-doc +gross +gross-doc +gzip +gzip-doc +haserl +haserl-doc +heimdal +heimdal-doc +heimdal-ftp +heimdal-kf +heimdal-pagsh +heimdal-rcp +heimdal-rsh +heimdal-su +heimdal-telnet +htop +htop-doc +hunspell +hunspell-doc +hypermail +iaxmodem +iaxmodem-doc +imagemagick +imagemagick-doc +ip6tables +iproute2 +iproute2-doc +iproute2-qos +ipsec-tools +ipsec-tools-doc +iptables +iptables-doc +iptraf +iptraf-doc +iputils +irssi +irssi-doc +irssi-perl +iscsitarget +iscsitarget-doc +json4lua +ksymoops +ksymoops-doc +less +less-doc +lftp +lftp-doc +lighttpd +lighttpd-doc +links +links-doc +lm_sensors +lm_sensors-detect +lm_sensors-doc +logrotate +logrotate-doc +lpc +lua +lua-doc +luaposix +lsof +lvm2 +lvm2-doc +lzo +m4 +m4-doc +make +make-doc +man +man-doc +md5 +mdadm +mdadm-doc +mini_httpd +mini_httpd-doc +miniperl +mkinitfs +mlmmj +mlmmj-doc +module-init-tools +mpfr +mpfr-doc +mpg123 +mpg123-doc +mtools +mtools-doc +mysql +mysql-client +mysql-doc +mysql-test +nano +nano-doc +nasm +nasm-doc +ncftp +ncftp-bookmarks +ncftp-doc +ncurses +ncurses-doc +ncurses-terminfo +net-snmp +net-snmp-doc +net-snmp-tools +newt +newt-doc +nfs-utils +nfs-utils-doc +nmap +nmap-doc +nmap-nse +ntfs +oidentd +oidentd-doc +openldap +openldap-doc +opennhrp +opennhrp-doc +openntpd +openntpd-doc +openrc +openrc-doc +openssh +openssh-doc +openssl +openssl-doc +openvpn +openvpn-doc +p7zip +p7zip-doc +parted +parted-doc +patch +patch-doc +pax-utils +pax-utils-doc +paxctl +paxctl-doc +pciutils +pciutils-doc +pcmciautils +pcmciautils-doc +perl +perl-doc +perl-uri +perl-uri-doc +perl-xml-parser +php +php-apc +php-bcmath +php-bz2 +php-calendar +php-curl +php-doc +php-exif +php-fileinfo +php-ftp +php-gd +php-iconv +php-json +php-mcrypt +php-mime_magic +php-mysql +php-mysqli +php-openssl +php-pdo +php-pdo_mysql +php-pdo_pgsql +php-pdo_sqlite +php-posix +php-postgresql +php-session +php-shmop +php-soap +php-sockets +php-sqlite +php-sysvmsg +php-sysvsem +php-sysvshm +php-xmlrpc +php-zip +php-zlib +pinentry +pinentry-doc +pingu +pkgconfig +pkgconfig-doc +portmap +portmap-doc +postfix +postfix-doc +postfix-ldap +postfix-mysql +postfix-pcre +postfix-pgsql +postgresql +postgresql-client +postgresql-doc +postgrey +ppp +ppp-doc +pth +pth-doc +python +python-doc +quagga +quagga-doc +razor +roundcubemail +rrdtool +rrdtool-doc +rsync +rsync-doc +ruby +ruby-doc +rubygems +run-parts +run-parts-doc +samba +samba-common +samba-doc +samba-initscript +screen +screen-doc +sed +sed-doc +sfdisk +sfic +sfic-doc +'shorewall*' +sic +sic-doc +slang +slang-doc +snort +snort-doc +sntpc +spamassasin +sqlite +sqlite-doc +squid +squid-doc +'squid-errors-*' +ssmtp +ssmtp-doc +strace +strace-doc +subversion +subversion-doc +sudo +sudo-doc +sysfsutils +sysfsutils-doc +sysklogd +sysklogd-doc +syslinux +syslinux-doc +sysstat +sysstat-doc +tar +tar-doc +tcl +tcl-doc +tcpdump +tcpdump-doc +tcpproxy +tinydns +tinyproxy +tinyproxy-doc +transmission +transmission-doc +uclibc +uclibc-dev +uclibc++ +udev +udev-doc +unfs3 +unfs3-doc +unixodbc +unrar +unrar-doc +usbutils +util-linux-ng +v86d +valgrind +valgrind-doc +vim +vim-doc +vsftpd +vsftpd-doc +wget +wget-doc +winbind +xfsprogs +xfsprogs-doc +xtables-addons +xtables-addons-doc +zip +zip-doc +zlib +zonenotify + diff --git a/packages b/packages deleted file mode 100644 index 703a765..0000000 --- a/packages +++ /dev/null @@ -1,466 +0,0 @@ -*-grsec -*-grsec-dev -acct -acct-doc -acf-* -amavis -alpine-base -alpine-baselayout -alpine-conf -alpine-sdk -apk-tools -arpon -arpwatch -aspell -aspell-doc -asterisk -asterisk-doc -asterisk-odbc -asterisk-pgsql -asterisk-tds -aumix -bash -bash-doc -bbsuid -bc -bc-doc -beep -beep-doc -bind -bind-doc -bind-libs -bind-tools -binutils -binutils-doc -bitlib -bkeymaps -bridge-utils -bridge-utils-doc -build-base -busybox -bzip2 -bzip2-doc -c-ares -c-ares-doc -ca-certificates -ccache -ccache-doc -cdrkit -cdrkit-doc -cgit -chrony -chrony-doc -cksfv -cksfv-doc -clamav -clamav-doc -clamsmtp -clamsmtp-doc -conntrack-tools -conntrack-tools-doc -coreutils -coreutils-doc -cpufreqd -cpufreqd-doc -cpufrequtils -cpufrequtils-doc -cracklib -cracklib-words -cramfs -ctags -curl -curl-doc -cutter -cvs -cvs-doc -cyrus-sasl -cyrus-sasl-doc -dahdi-linux -dahdi-tools -dahdi-tools-doc -dansguardian -dansguardian-doc -db -db-doc -device-mapper -device-mapper-doc -dhcp -dhcp-doc -dhcpcd -dhcpcd-doc -dialog -dialog-doc -diffutils -diffutils-doc -dircproxy -dircproxy-doc -distcc -distcc-doc -djbdns -dnscache -dnsmasq -dnsmasq-doc -dosfstools -dosfstools-doc -dovecot -dovecot-doc -dropbear -dtach -dtach-doc -e2fsprogs -e2fsprogs-doc -eggdrop -eggdrop-gseen -eggdrop-logs2html -email -email-doc -espeak -ethtool -ethtool-doc -expat -expat-doc -fakeroot -fakeroot-doc -fcgi -fetchmail -fetchmail-doc -fetchmailconf -file -file-doc -flac -flac-doc -fping -fping-doc -freetds -freetds-doc -freetype -g++ -gawk -gawk-doc -gcc -gcc-doc -gd -gd-doc -gdb -gdb-doc -gdbm -gettext -gettext-doc -ghostscript -ghostscript-doc -git -glib -glib-doc -gmp -gmp-doc -gnupg -gnupg-doc -gnutls -gnutls-doc -gperf -gperf-doc -grep -grep-doc -groff -groff-doc -gross -gross-doc -gzip -gzip-doc -haserl -haserl-doc -heimdal -heimdal-doc -heimdal-ftp -heimdal-kf -heimdal-pagsh -heimdal-rcp -heimdal-rsh -heimdal-su -heimdal-telnet -htop -htop-doc -hunspell -hunspell-doc -hypermail -iaxmodem -iaxmodem-doc -imagemagick -imagemagick-doc -ip6tables -iproute2 -iproute2-doc -iproute2-qos -ipsec-tools -ipsec-tools-doc -iptables -iptables-doc -iptraf -iptraf-doc -iputils -irssi -irssi-doc -irssi-perl -iscsitarget -iscsitarget-doc -json4lua -ksymoops -ksymoops-doc -less -less-doc -lftp -lftp-doc -lighttpd -lighttpd-doc -links -links-doc -lm_sensors -lm_sensors-detect -lm_sensors-doc -logrotate -logrotate-doc -lpc -lua -lua-doc -luaposix -lsof -lvm2 -lvm2-doc -lzo -m4 -m4-doc -make -make-doc -man -man-doc -md5 -mdadm -mdadm-doc -mini_httpd -mini_httpd-doc -miniperl -mkinitfs -mlmmj -mlmmj-doc -module-init-tools -mpfr -mpfr-doc -mpg123 -mpg123-doc -mtools -mtools-doc -mysql -mysql-client -mysql-doc -mysql-test -nano -nano-doc -nasm -nasm-doc -ncftp -ncftp-bookmarks -ncftp-doc -ncurses -ncurses-doc -ncurses-terminfo -net-snmp -net-snmp-doc -net-snmp-tools -newt -newt-doc -nfs-utils -nfs-utils-doc -nmap -nmap-doc -nmap-nse -ntfs -oidentd -oidentd-doc -openldap -openldap-doc -opennhrp -opennhrp-doc -openntpd -openntpd-doc -openrc -openrc-doc -openssh -openssh-doc -openssl -openssl-doc -openvpn -openvpn-doc -p7zip -p7zip-doc -parted -parted-doc -patch -patch-doc -pax-utils -pax-utils-doc -paxctl -paxctl-doc -pciutils -pciutils-doc -pcmciautils -pcmciautils-doc -perl -perl-doc -perl-uri -perl-uri-doc -perl-xml-parser -php -php-apc -php-bcmath -php-bz2 -php-calendar -php-curl -php-doc -php-exif -php-fileinfo -php-ftp -php-gd -php-iconv -php-json -php-mcrypt -php-mime_magic -php-mysql -php-mysqli -php-openssl -php-pdo -php-pdo_mysql -php-pdo_pgsql -php-pdo_sqlite -php-posix -php-postgresql -php-session -php-shmop -php-soap -php-sockets -php-sqlite -php-sysvmsg -php-sysvsem -php-sysvshm -php-xmlrpc -php-zip -php-zlib -pinentry -pinentry-doc -pingu -pkgconfig -pkgconfig-doc -portmap -portmap-doc -postfix -postfix-doc -postfix-ldap -postfix-mysql -postfix-pcre -postfix-pgsql -postgresql -postgresql-client -postgresql-doc -postgrey -ppp -ppp-doc -pth -pth-doc -python -python-doc -quagga -quagga-doc -razor -roundcubemail -rrdtool -rrdtool-doc -rsync -rsync-doc -ruby -ruby-doc -rubygems -run-parts -run-parts-doc -samba -samba-common -samba-doc -samba-initscript -screen -screen-doc -sed -sed-doc -sfdisk -sfic -sfic-doc -'shorewall*' -sic -sic-doc -slang -slang-doc -snort -snort-doc -sntpc -spamassasin -sqlite -sqlite-doc -squid -squid-doc -'squid-errors-*' -ssmtp -ssmtp-doc -strace -strace-doc -subversion -subversion-doc -sudo -sudo-doc -sysfsutils -sysfsutils-doc -sysklogd -sysklogd-doc -syslinux -syslinux-doc -sysstat -sysstat-doc -tar -tar-doc -tcl -tcl-doc -tcpdump -tcpdump-doc -tcpproxy -tinydns -tinyproxy -tinyproxy-doc -transmission -transmission-doc -uclibc -uclibc-dev -uclibc++ -udev -udev-doc -unfs3 -unfs3-doc -unixodbc -unrar -unrar-doc -usbutils -util-linux-ng -v86d -valgrind -valgrind-doc -vim -vim-doc -vsftpd -vsftpd-doc -wget -wget-doc -winbind -xfsprogs -xfsprogs-doc -xtables-addons -xtables-addons-doc -zip -zip-doc -zlib -zonenotify - -- cgit v1.2.3