diff options
| -rw-r--r-- | main/mdadm/APKBUILD | 14 | ||||
| -rw-r--r-- | main/mdadm/mdadm-uclibc.patch | 13 |
2 files changed, 16 insertions, 11 deletions
diff --git a/main/mdadm/APKBUILD b/main/mdadm/APKBUILD index f6efdc58daf..ed49a4c6a27 100644 --- a/main/mdadm/APKBUILD +++ b/main/mdadm/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter <clandmeter at gmail> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mdadm -pkgver=3.1.1 -pkgrel=2 +pkgver=3.1.2 +pkgrel=0 pkgdesc="a tool for managing Linux Software RAID arrays" url="http://neil.brown.name/blog/mdadm" license="GPL-2" @@ -16,9 +16,13 @@ source="http://www.kernel.org/pub/linux/utils/raid/${pkgname}/${pkgname}-${pkgve mdadm-uclibc.patch " -build() { +prepare() { cd "$srcdir/$pkgname-$pkgver" patch -p1 -i ../mdadm-uclibc.patch || return 1 +} + +build() { + cd "$srcdir/$pkgname-$pkgver" make } @@ -32,8 +36,8 @@ package() { install -m644 -D mdadm.conf-example "$pkgdir"/etc/mdadm.conf } -md5sums="8bfeea282d21b5ef8e825122fb359457 mdadm-3.1.1.tar.gz +md5sums="15c0112467df486b5805b18c7e51401f mdadm-3.1.2.tar.gz ce57e798431f7ab89f9b07a7daaa4852 mdadm.initd 16d2b8eb2e17184357db503470fdd8eb mdadm.confd af5bb6e1479bf1d27cf50521af82dae1 mdadm-raid.initd -aa601f072096fb8bae8b8946f59a561f mdadm-uclibc.patch" +bca76ff25366bd1b70654b0cf4814236 mdadm-uclibc.patch" diff --git a/main/mdadm/mdadm-uclibc.patch b/main/mdadm/mdadm-uclibc.patch index abc9969ca80..a7b01a08d56 100644 --- a/main/mdadm/mdadm-uclibc.patch +++ b/main/mdadm/mdadm-uclibc.patch @@ -1,6 +1,8 @@ ---- a/platform-intel.c Mon Nov 9 15:58:52 2009 -+++ b/platform-intel.c Mon Nov 9 16:01:47 2009 -@@ -87,7 +87,9 @@ +diff --git a/platform-intel.c b/platform-intel.c +index 30f7914..1e62e87 100644 +--- a/platform-intel.c ++++ b/platform-intel.c +@@ -91,7 +91,9 @@ struct sys_dev *find_driver_devices(const char *bus, const char *driver) /* generate canonical path name for the device */ sprintf(path, "/sys/bus/%s/drivers/%s/%s", bus, driver, de->d_name); @@ -11,13 +13,12 @@ list->next = NULL; } closedir(driver_dir); -@@ -203,9 +205,10 @@ +@@ -207,9 +209,9 @@ const struct imsm_orom *find_imsm_orom(void) char *devt_to_devpath(dev_t dev) { - char device[40]; + char device[46]; - + char *tmp = malloc(PATH_MAX); -+ sprintf(device, "/sys/dev/block/%d:%d/device", major(dev), minor(dev)); - return canonicalize_file_name(device); + return tmp ? realpath(device, tmp) : NULL; |