summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--abs/core/LinHES-config/PKGBUILD4
-rwxr-xr-xabs/core/LinHES-config/mv_install.py2
-rw-r--r--abs/core/mkinitcpio-busybox/PKGBUILD2
-rw-r--r--abs/core/mkinitcpio-nfs-utils/PKGBUILD23
-rw-r--r--abs/core/mkinitcpio/PKGBUILD11
-rw-r--r--abs/core/mkinitcpio/mkinitcpio.conf.diff11
6 files changed, 33 insertions, 20 deletions
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index bdf3e0f..2136a64 100644
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=2.2
-pkgrel=18
+pkgrel=20
conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
pkgdesc="Install and configure your system"
depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
@@ -101,7 +101,7 @@ build() {
install -m 0755 issue $startdir/pkg/etc/issue
}
-md5sums=('39af24fdaba5c1bb241e63c0b7c757c2'
+md5sums=('4bece36b26e390e609fd7a4f5c710986'
'1a4694fcd694b362c339bda781ed0f3e'
'e36da536dd651ef182e7642337889e77'
'985891a43f7c4c983eb2a362162f1a0f'
diff --git a/abs/core/LinHES-config/mv_install.py b/abs/core/LinHES-config/mv_install.py
index 4c4c555..5892444 100755
--- a/abs/core/LinHES-config/mv_install.py
+++ b/abs/core/LinHES-config/mv_install.py
@@ -669,7 +669,7 @@ def grub_it():
logging.info("Running grub-install")
runcmd(cmd)
rootuuid = find_uuid(hostoptions["rootpartition"])
- cmd = " mkinitcpio -g %s/boot/kernel26.img" % data_config.MOUNTPOINT
+ cmd = " mkinitcpio -b %s -g %s/boot/kernel26.img" %(data_config.MOUNTPOINT, data_config.MOUNTPOINT)
logging.info("Running mkinitcpio")
runcmd(cmd)
logging.info("Adding root uuid to grub menu")
diff --git a/abs/core/mkinitcpio-busybox/PKGBUILD b/abs/core/mkinitcpio-busybox/PKGBUILD
index e58f87a..da2702c 100644
--- a/abs/core/mkinitcpio-busybox/PKGBUILD
+++ b/abs/core/mkinitcpio-busybox/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: Thomas Bächler <thomas@archlinux.org>
pkgname=mkinitcpio-busybox
pkgver=1.18.4
-pkgrel=1
+pkgrel=2
pkgdesc="base initramfs tools"
arch=('i686' 'x86_64')
url="http://www.busybox.net/"
diff --git a/abs/core/mkinitcpio-nfs-utils/PKGBUILD b/abs/core/mkinitcpio-nfs-utils/PKGBUILD
new file mode 100644
index 0000000..962bb33
--- /dev/null
+++ b/abs/core/mkinitcpio-nfs-utils/PKGBUILD
@@ -0,0 +1,23 @@
+# $Id: PKGBUILD 68748 2010-02-14 10:45:02Z thomas $
+# Maintainer: Thomas Bächler <thomas@archlinux.org>
+
+pkgname=mkinitcpio-nfs-utils
+pkgver=0.2
+pkgrel=1
+pkgdesc="ipconfig and nfsmount tools for NFS root support in mkinitcpio"
+arch=('i686' 'x86_64')
+url="http://www.archlinux.org/"
+license=('GPL2')
+depends=('glibc')
+source=(ftp://ftp.archlinux.org/other/mkinitcpio/${pkgname}-${pkgver}.tar.gz)
+sha256sums=('3f2839f21a420cd732d34e58f84534acdb7fc29f69381dbba3f00e3424201cd3')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make || return 1
+}
+
+package() {
+ cd "$srcdir/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/abs/core/mkinitcpio/PKGBUILD b/abs/core/mkinitcpio/PKGBUILD
index 0470c46..c5b823d 100644
--- a/abs/core/mkinitcpio/PKGBUILD
+++ b/abs/core/mkinitcpio/PKGBUILD
@@ -1,24 +1,25 @@
-# $Id$
-# Maintainer: Thomas Baechler <thomas@archlinux.org>
+# $Id: PKGBUILD 131019 2011-07-09 14:04:52Z thomas $
+# Maintainer: Thomas Bächler <thomas@archlinux.org>
pkgname=mkinitcpio
-pkgver=0.6.15
+pkgver=0.7.2
pkgrel=1
pkgdesc="Modular initramfs image creation utility"
arch=(any)
url="http://www.archlinux.org/"
license=('GPL')
-depends=('mkinitcpio-busybox>=1.16.1-2' 'module-init-tools' 'util-linux>=2.19' 'gen-init-cpio' 'coreutils'
+depends=('mkinitcpio-busybox>=1.16.1-2' 'module-init-tools' 'util-linux>=2.19' 'libarchive' 'coreutils'
'bash' 'findutils' 'sed' 'grep' 'filesystem>=2009.01-2' 'udev>=171-2' 'file' 'gzip'
'which')
optdepends=('xz: Use lzma or xz compression for the initramfs image'
'bzip2: Use bzip2 compression for the initramfs image'
+ 'lzop: Use lzo compression for the initramfs image'
'mkinitcpio-nfs-utils: Support for root filesystem on NFS')
replaces=('mkinitrd' 'mkinitramfs' 'klibc' 'klibc-extras' 'klibc-kbd'
'klibc-module-init-tools' 'klibc-udev')
source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz)
backup=(etc/mkinitcpio.conf)
-sha256sums=('b7218ae51018954b0f0ad7d327204759e0934d72ee6d8c8bd1ef4ecf742bacae')
+sha256sums=('b7282c78ef3144f5547a4012f334b0beb575b7108a5f6a006289a1e78aa9823d')
package() {
cd $srcdir/${pkgname}-${pkgver}
diff --git a/abs/core/mkinitcpio/mkinitcpio.conf.diff b/abs/core/mkinitcpio/mkinitcpio.conf.diff
deleted file mode 100644
index 13f896b..0000000
--- a/abs/core/mkinitcpio/mkinitcpio.conf.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- mkinitcpio.conf.orig 2010-08-15 23:10:21.000000000 +0000
-+++ mkinitcpio.conf 2010-08-15 23:10:44.000000000 +0000
-@@ -54,7 +54,7 @@
- #
- # This setup loads an lvm2 volume group on a usb device.
- # HOOKS="base udev usb lvm2 filesystems"
--HOOKS="base udev autodetect pata scsi sata filesystems"
-+HOOKS="base udev autodetect pata scsi sata filesystems fbsplash"
-
- # COMPRESSION
- # Use this to compress the initramfs image. With kernels earlier than