summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerhard Brauer <gerbra@archlinux.de>2009-07-24 19:00:46 +0200
committerAaron Griffin <aaronmgriffin@gmail.com>2009-07-27 11:03:37 -0700
commit952fa353982e4ceefd0d1ca4d41248ff4f80afa7 (patch)
tree6ef38ec1566b664fde961f913620f27babc5c29c
parent333dd4b4ba030640920c3ddfd9ea887852b18a24 (diff)
downloadarchiso32-952fa353982e4ceefd0d1ca4d41248ff4f80afa7.tar.xz
Modified packages.list and handling
* 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> Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-rw-r--r--configs/install-iso/Makefile6
-rw-r--r--configs/install-iso/packages.i686 (renamed from configs/install-iso/packages.list)1
-rw-r--r--configs/install-iso/packages.x86_6441
3 files changed, 45 insertions, 3 deletions
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.list b/configs/install-iso/packages.i686
index 0519ada..472c89b 100644
--- a/configs/install-iso/packages.list
+++ b/configs/install-iso/packages.i686
@@ -26,6 +26,7 @@ nfs-utils
nmap
ntfs-3g
ntfsprogs
+ntp
openssh
openvpn
parted
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