[arch-commits] Commit in archboot/repos (3 files)

Sat Dec 6 18:49:03 UTC 2008

Date: Saturday, December 6, 2008 @ 13:49:03
  Author: tpowa
Revision: 20791

Merged revisions 356,20788 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/archboot/trunk

........
  r356 | aaron | 2008-04-18 22:56:27 +0000 (Fr, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r20788 | tpowa | 2008-12-06 18:45:55 +0000 (Sa, 06 Dez 2008) | 1 line
  
  upgpkg: archboot 2008.12-1
........

Modified:
  archboot/repos/extra-i686/	(properties)
  archboot/repos/extra-i686/PKGBUILD
  archboot/repos/extra-i686/archboot.install

------------------+
 PKGBUILD         |   44 +++++++++++++++++++++++++-------------------
 archboot.install |   19 +++++++------------
 2 files changed, 32 insertions(+), 31 deletions(-)


Property changes on: archboot/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /archboot/trunk:1
   + /archboot/trunk:1-20790

Modified: extra-i686/PKGBUILD
===================================================================

--- extra-i686/PKGBUILD	2008-12-06 18:46:42 UTC (rev 20790)
+++ extra-i686/PKGBUILD	2008-12-06 18:49:03 UTC (rev 20791)
@@ -2,16 +2,35 @@
 # Maintainer : Tobias Powalowski <tpowa at archlinux.org>
 
 pkgname=archboot
-pkgver=2008.03
-pkgrel=2
+pkgver=2008.12
+pkgrel=1
 pkgdesc="Advanced, modular arch boot/install image creation utility"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://www.archlinux.org/"
-depends=('mkinitcpio>=0.5.18-1' 'mksyslinux>=0.2-2' 'mkpxelinux>=0.2-1' 'mkbootcd>=2008.03-1' 'initscripts>=2008.03-4' 'cvs>=1.11.22-6' 'wget>=1.11-1' 'bash>=3.2.033-2' 'coreutils>=6.10-2' 'cryptsetup>=1.0.6-1' 'dialog>=1.1_20071028-1' 'e2fsprogs>=1.40.8-1' 'findutils>=4.2.33-1' 'gawk>=3.1.6-2' 'grep>=2.5.3-3' 'iputils>=20070202-4' 'jfsutils>=1.1.12-2' 'less>=418-1' 'lvm2>=2.02.33-1' 'mdadm>=2.6.4-1' 'module-init-tools>=3.2.2-6' 'nano>=2.0.7-1' 'ncurses>=5.6-6' 'net-tools>=1.60-13' 'gnu-netcat>=0.7.1-2' 'ntfsprogs>=2.0.0-2' 'pcmciautils>=014-4' 'procps>=3.2.7-4' 'psmisc>=22.6-1' 'reiserfsprogs>=3.6.20-3' 'sed>=4.1.5-3' 'snarf>=7.0-2' 'syslog-ng>=2.0.6-1' 'sysvinit>=2.86-4' 'tar>=1.19-2' 'util-linux-ng>=2.13.0.1-2' 'which>=2.19-2' 'kbd>=1.14.1.20080309-2' 'wireless_tools>=29-2' 'xfsprogs>=2.9.7-1' 'dnsutils>=9.4.2-1' 'hdparm>=8.6-1' 'memtest86+>=2.01-1' 'grub>=0.97-12' 'netkit-telnet>=0.17-7' 'openssh>=4.7p1-6' 'hwdetect>=0.9-1' 'portmap>=6.0-2' 'shadow>=4.0.18.2-2' 'bridge-utils>=1.2-2' 'ifenslave>=1.1.0-3' 'cpufrequtils>=002-3' 'links>=2.1pre33-1' 'tcp_wrappers>=7.6-8' 'dosfstools>=2.11-2' 'glibc>=2.7-9' 'kernel-headers>=2.6.24.3-1' 'kernel26>=2.6.24.4-1' 'xinetd>=2.3.14-3' 'naim>=0.11.8.3.1-1' 'kexec-tools>=1.101-7' 'ppp>=2.4.4-6' 'rp-pppoe>=3.8-3' 'lilo>=22.8-2' 'iptables>=1.4.0-2' 'capi4k-utils>=050718-6' 'isdn4k-utils>=3.2p1-3' 'ntfs-3g>=1.2310-1' 'pciutils>=2.2.8-3' 'usbutils>=0.73-5' 'vpnc>=0.5.1-2' 'openvpn>=2.0.9-3' 'bcm43xx-fwcutter>=006-2' 'wpa_supplicant>=0.5.10-1' 'rsync>=3.0.0-1' 'gzip>=1.3.12-4' 'libdownload>=1.3-1' 'libarchive>=2.4.12-1' 'device-mapper>=1.02.24-1' 'screen>=4.0.3-5' 'libelf>=0.8.10-3' 'pam>=0.99.9.0-2' 'cracklib>=2.8.10-5' 'nfs-utils>=1.1.0-4' 'nfsidmap>=0.20-2' 'readline>=5.2-7' 'acl>=2.2.47-1' 'attr>=2.4.41-1' 'pcre>=7.6-3' 'cpio>=2.9-3' 'fuse>=2.7.3-1' 'klibc>=1.5-5' 'libusb>=0.1.12-3' 'vi>=7.1.267-1' 'lzo2>=2.02-3' 'libsasl>=2.1.22-5' 'libldap>=2.3.40-1' 'gpm>=1.20.1-7' 'libevent>=1.3e-1' 'gcc-libs>=4.3.0-1' 'sdparm>=1.02-2' 'licenses>=2.3-1' 'pptpclient>=1.7.1-3' 'madwifi>=0.9.4.3382-3' 'madwifi-utils>=0.9.4.3382-1' 'rt2x00-rt61-fw>=1.2-2' 'rt2x00-rt71w-fw>=1.8-2' 'ndiswrapper>=1.52-2' 'ndiswrapper-utils>=1.52-1' 'zd1211-firmware>=1.4-2' 'wlan-ng26-utils>=0.2.8-2' 'wlan-ng26>=0.2.8-15' 'ipw2100-fw>=1.3-2' 'ipw2200-fw>=3.0-2' 'iwlwifi-3945-ucode>=2.14.1.5-2' 'iwlwifi-4965-ucode>=4.44.1.20-1' 'smbclient>=3.0.28A-1' 'bittorrent>=5.0.6-2' 'dhcpcd>=3.2.1-1' 'openssl>=0.9.8g-2' 'git>=1.5.4.4-1' 'dmraid>=1.0.0.rc14-4' 'linux-atm>=2.4.1-3' 'netcfg>=2.0.6-1' 'tiacx>=20080210-2' 'tiacx-firmware>=2-1' 'parted>=1.8.8-1' 'atl2>=2.0.4')
+depends=('mkinitcpio>=0.5.19-1' 'mksyslinux>=2008.12-1' 'mkpxelinux>=2008.12-1' 'mkisolinux>=2008.12-1' 'initscripts>=2008.09-2' 'subversion>=1.5.4-1' 'wget>=1.11.4-1' 'bash>=3.2.039-3' 'coreutils>=6.12-1' 'cryptsetup>=1.0.6-2' 'dialog>=1.1_20080819-1' 'e2fsprogs>=1.41.3-2' 'findutils>=4.4.0-1' 'gawk>=3.1.6-2' 'grep>=2.5.3-3' 'iputils>=20071127-2' 'jfsutils>=1.1.13-1' 'less>=418-1' 'lvm2>=2.02.43-1' 'mdadm>=2.6.7-1' 'module-init-tools>=3.4-1' 'nano>=2.0.9-1' 'ncurses>=5.7-2' 'net-tools>=1.60-13' 'gnu-netcat>=0.7.1-2' 'ntfsprogs>=2.0.0-2' 'pcmciautils>=015-2' 'procps>=3.2.7-5' 'psmisc>=22.6-2' 'reiserfsprogs>=3.6.20-3' 'sed>=4.1.5-3' 'snarf>=7.0-2' 'syslog-ng>=2.0.9-1' 'sysvinit>=2.86-4' 'tar>=1.20-2' 'util-linux-ng>=2.14-1' 'which>=2.20-1' 'kbd>=1.14.1.20080309-2' 'wireless_tools>=29-2' 'xfsprogs>=2.10.1-1' 'dnsutils>=9.5.0.P2-1' 'hdparm>=8.9-1' 'memtest86+>=2.10-1' 'grub>=0.97-14' 'netkit-telnet>=0.17-8' 'openssh>=5.1p1-1' 'hwdetect>=0.9.1-2' 'portmap>=6.0-2' 'shadow>=4.1.2.1-2' 'bridge-utils>=1.4-2' 'ifenslave>=1.1.0-4' 'cpufrequtils>=005-1' 'links>=2.2-2' 'tcp_wrappers>=7.6-8' 'dosfstools>=3.0.1-1' 'glibc>=2.8-3' 'kernel-headers>=2.6.26.3-1' 'kernel26>=2.6.27.7-1' 'xinetd>=2.3.14-3' 'kexec-tools>=1.101-7' 'ppp>=2.4.4-6' 'rp-pppoe>=3.10-1' 'lilo>=22.8-2' 'iptables>=1.4.2-1' 'capi4k-utils>=050718-6' 'isdn4k-utils>=3.2p1-3' 'ntfs-3g>=1.5130-1' 'pciutils>=3.0.3-1' 'usbutils>=0.73-5' 'vpnc>=0.5.1-2' 'openvpn>=2.0.9-4' 'b43-fwcutter>=011-1' 'wpa_supplicant>=0.5.11-1' 'rsync>=3.0.4-1' 'gzip>=1.3.12-4' 'libdownload>=1.3-1' 'libarchive>=2.5.5-1' 'device-mapper>=1.02.29-1' 'screen>=4.0.3-6' 'libelf>=0.8.10-3' 'pam>=1.0.2-2' 'cracklib>=2.8.13-1' 'nfs-utils>=1.1.3-2' 'nfsidmap>=0.21-2' 'readline>=5.2-8' 'acl>=2.2.47-1' 'attr>=2.4.41-1' 'pcre>=7.8-1' 'cpio>=2.9-3' 'fuse>=2.7.4-1' 'klibc>=1.5.14-1' 'libusb>=0.1.12-3' 'vi>=7.2.25-1' 'lzo2>=2.02-3' 'libsasl>=2.1.22-7' 'libldap>=2.3.43-3' 'gpm>=1.20.5-2' 'libevent>=1.4.8-2' 'gcc-libs>=4.3.2-1' 'sdparm>=1.03-1' 'licenses>=2.4-1' 'pptpclient>=1.7.2-1' 'madwifi>=0.9.4.3844-2' 'madwifi-utils>=0.9.4.3844-1' 'rt2x00-rt61-fw>=1.2-3' 'rt2x00-rt71w-fw>=1.8-3' 'rt2500>=1.1.0_B4-25' 'ndiswrapper>=1.53-3' 'ndiswrapper-utils>=1.53-1' 'zd1211-firmware>=1.4-2' 'wlan-ng26-utils>=0.2.9-1' 'wlan-ng26>=0.2.9-2' 'ipw2100-fw>=1.3-2' 'ipw2200-fw>=3.0-2' 'iwlwifi-3945-ucode>=15.28.2.8-1' 'iwlwifi-4965-ucode>=228.57.2.21-1' 'iwlwifi-5000-ucode>=5.4.A.11-1' 'smbclient>=3.2.5-1' 'tdb>=3.2.5-1' 'bittorrent>=5.0.6-2' 'dhcpcd>=4.0.4-1' 'openssl>=0.9.8i-2' 'git>=1.6.0.4-1' 'dmraid>=1.0.0.rc15-5' 'linux-atm>=2.5.0-1' 'netcfg>=2.1.2-1' 'tiacx>=20080210-7' 'tiacx-firmware>=2-1' 'parted>=1.8.8-2' 'atl2>=2.0.5-2' 'tzdata>=2008i-1' 'ntp>=4.2.4p5-1')
 source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver-$pkgrel.tar.bz2 vmware-detect.c)
 backup=('etc/archboot/archbootcd.conf' 'etc/archboot/archbootcd-lowmem.conf' 'etc/archboot/archpxelinux.conf' \
 'etc/archboot/archsyslinux.conf' 'etc/archboot/install.conf' 'etc/archboot/install-lowmem.conf')
+backup=('etc/archboot/allinone.conf'
+        'etc/archboot/allinone-lowmem.conf'
+        'etc/archboot/default.conf'
+        'etc/archboot/default-ftp.conf'
+        'etc/archboot/default-pxelinux.conf'
+        'etc/archboot/default-ftp-pxelinux.conf'
+        'etc/archboot/lowmem.conf'
+        'etc/archboot/allinone.conf'
+        'etc/archboot/presets/allinone'
+        'etc/archboot/presets/allinone-lowmem'
+        'etc/archboot/presets/isolinux'
+        'etc/archboot/presets/isolinux-lowmem'
+        'etc/archboot/presets/isolinux-ftp'
+        'etc/archboot/presets/syslinux'
+        'etc/archboot/presets/syslinux-lowmem'
+        'etc/archboot/presets/syslinux-ftp'
+        'etc/archboot/presets/pxelinux'
+        'etc/archboot/presets/pxelinux-ftp'
+)
 install=archboot.install
 
 ### to bump the depends list use this:
@@ -19,25 +38,12 @@
 
 build()
 {
-  cd $startdir/src/$pkgname-$pkgver-$pkgrel
-
-  if [ "$CARCH" = "x86_64" ]; then
-    # fix tag for checkout
-    sed  -i -e "s:CURRENT:CURRENT-64:g" install.conf
-  fi
-  mkdir -p $startdir/pkg/etc/archboot/
-  for i in base capi4k cpufreq etc grub iptables isdn kexec lilo linux_atm naim net netcfg openvpn pacman pam ppp pppoe pptpclient remote shadow udev vpnc wireless; do
-  cp -r $i $startdir/pkg/etc/archboot/$i
-  done
-  for i in hooks/*; do install -m644 -D $i $startdir/pkg/lib/initcpio/$i ; done
-  for i in install/*; do install -m644 -D $i $startdir/pkg/lib/initcpio/$i ; done
-  for i in *.conf; do install -m644 -D $i $startdir/pkg/etc/archboot/$i ; done
-  for i in scripts/*; do install -m755 -D $i $startdir/pkg/etc/archboot/$i ; done
-  for i in scripts/config/*; do install -m644 -D $i $startdir/pkg/etc/archboot/$i ; done
+  cd $srcdir/$pkgname-$pkgver-$pkgrel
+  mv * $pkgdir/
   # vmware-detect
   cd $startdir/src
   gcc -o vmware-detect vmware-detect.c
   install -D -m 755 vmware-detect $startdir/pkg/usr/bin/vmware-detect
 }
-md5sums=('0532832387d3f949e0d3c75c7ca33db8'
+md5sums=('90b6aaa5aa0bbfa3f6a9937ac58ea786'
          '7e2b03463747cb22ab388e79a09fa0cb')

Modified: extra-i686/archboot.install
===================================================================
--- extra-i686/archboot.install	2008-12-06 18:46:42 UTC (rev 20790)
+++ extra-i686/archboot.install	2008-12-06 18:49:03 UTC (rev 20791)
@@ -4,19 +4,14 @@
 # arg 1:  the new package version
 post_install() {
   cat << EOF
-ARCHBOOT configs:
------------------
---> Config files installed to /etc/archboot/
-    install.conf is the main config file,
-    the others are for the tools parameters
+ARCHBOOT usage:
+---------------
+--> Main config files were installed to '/etc/archboot/'.
+    Preset files were installed to '/etc/archboot/presets'.
     Modify them to your needs.
---> To build an arch bootcd use:
-    mkbootcd -c=/etc/archboot/archbootcd.conf
---> To build a syslinux arch boot use:
-    mksyslinux -c=/etc/archboot/archsyslinux.conf
---> To build a pxelinux arch boot use:
-    for an install source use, change the config NFSROOTDIR=
-    mkpxelinux -c=/etc/archboot/archpxelinux.conf
+--> Use the preset files as config file of your build tool:
+    mkisolinux, mksyslinux or mkpxelinux
+--> For Allinone ISOs use archboot-allinone.sh
 EOF
 }
 


