* Added ntp to packages list (Both ARCHes) * Modified Makefile to parse the CARCH related packages.$ARCH We need different lists cause not all packages exist for both arches. And it's bad to edit in the packages.list each build. Signed-off-by: Gerhard Brauer <gerbra@archlinux.de> --- configs/install-iso/Makefile | 6 ++-- configs/install-iso/packages.i686 | 43 +++++++++++++++++++++++++++++++++++ configs/install-iso/packages.list | 42 ---------------------------------- configs/install-iso/packages.x86_64 | 41 +++++++++++++++++++++++++++++++++ 4 files changed, 87 insertions(+), 45 deletions(-) create mode 100644 configs/install-iso/packages.i686 delete mode 100644 configs/install-iso/packages.list create mode 100644 configs/install-iso/packages.x86_64 diff --git a/configs/install-iso/Makefile b/configs/install-iso/Makefile index 77ed056..cfdf6e6 100644 --- a/configs/install-iso/Makefile +++ b/configs/install-iso/Makefile @@ -1,5 +1,5 @@ -ver=2009.02 -kver=2.6.28-ARCH +ver=2009.06 +kver=2.6.30-ARCH WORKDIR=work @@ -10,7 +10,7 @@ PWD:=`pwd` FTPname:=$(PWD)/archlinux-$(ver)-ftp-$(ARCH) COREname:=$(PWD)/archlinux-$(ver)-core-$(ARCH) -PACKAGES="`cat packages.list` $(BOOTLOADER)" +PACKAGES="$(shell cat packages.$(ARCH)) $(BOOTLOADER)" all: ftp-iso ftp-usb core-iso core-usb all-iso: ftp-iso core-iso diff --git a/configs/install-iso/packages.i686 b/configs/install-iso/packages.i686 new file mode 100644 index 0000000..472c89b --- /dev/null +++ b/configs/install-iso/packages.i686 @@ -0,0 +1,43 @@ +aif +aufs2-util +base +ddrescue +dmraid +dnsutils +dosfstools +elinks +gnu-netcat +grub-gfx +inetutils +intel-536ep +intel-537 +ipw2100-fw +ipw2200-fw +iwlwifi-3945-ucode +iwlwifi-4965-ucode +iwlwifi-5000-ucode +joe +lftp +lilo +memtest86+ +ndiswrapper +ndiswrapper-utils +nfs-utils +nmap +ntfs-3g +ntfsprogs +ntp +openssh +openvpn +parted +pptpclient +rt2x00-rt61-fw +rt2x00-rt71w-fw +speedtouch +squashfs-tools +tcpdump +tiacx +tiacx-firmware +wireless_tools +wlan-ng26-utils +zd1211-firmware diff --git a/configs/install-iso/packages.list b/configs/install-iso/packages.list deleted file mode 100644 index 0519ada..0000000 --- a/configs/install-iso/packages.list +++ /dev/null @@ -1,42 +0,0 @@ -aif -aufs2-util -base -ddrescue -dmraid -dnsutils -dosfstools -elinks -gnu-netcat -grub-gfx -inetutils -intel-536ep -intel-537 -ipw2100-fw -ipw2200-fw -iwlwifi-3945-ucode -iwlwifi-4965-ucode -iwlwifi-5000-ucode -joe -lftp -lilo -memtest86+ -ndiswrapper -ndiswrapper-utils -nfs-utils -nmap -ntfs-3g -ntfsprogs -openssh -openvpn -parted -pptpclient -rt2x00-rt61-fw -rt2x00-rt71w-fw -speedtouch -squashfs-tools -tcpdump -tiacx -tiacx-firmware -wireless_tools -wlan-ng26-utils -zd1211-firmware diff --git a/configs/install-iso/packages.x86_64 b/configs/install-iso/packages.x86_64 new file mode 100644 index 0000000..257a275 --- /dev/null +++ b/configs/install-iso/packages.x86_64 @@ -0,0 +1,41 @@ +aif +aufs2-util +base +ddrescue +dmraid +dnsutils +dosfstools +elinks +gnu-netcat +grub-gfx +inetutils +ipw2100-fw +ipw2200-fw +iwlwifi-3945-ucode +iwlwifi-4965-ucode +iwlwifi-5000-ucode +joe +lftp +lilo +memtest86+ +ndiswrapper +ndiswrapper-utils +nfs-utils +nmap +ntfs-3g +ntfsprogs +ntp +openssh +openvpn +parted +pptpclient +rt2x00-rt61-fw +rt2x00-rt71w-fw +speedtouch +squashfs-tools +tcpdump +tiacx +tiacx-firmware +wireless_tools +wlan-ng26-utils +zd1211-firmware -- 1.6.3.3