summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2013-05-03 12:13:19 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2013-05-03 12:16:53 +0000
commit8eb4bb04d7dec57418738bc0972c5ccfb0cd0f31 (patch)
treeebd253193e461d7535454e5e099fb44cf7cfe5ca
parent83b7ec3a0e771620c039908bf5584e6d4d52f400 (diff)
downloadaports-8eb4bb04d7dec57418738bc0972c5ccfb0cd0f31.tar.bz2
aports-8eb4bb04d7dec57418738bc0972c5ccfb0cd0f31.tar.xz
main/hwdata: upgrade to 0.248
-rw-r--r--main/hwdata/APKBUILD18
-rw-r--r--main/hwdata/install-T.patch11
2 files changed, 23 insertions, 6 deletions
diff --git a/main/hwdata/APKBUILD b/main/hwdata/APKBUILD
index 4352772f7..bdb25ceb8 100644
--- a/main/hwdata/APKBUILD
+++ b/main/hwdata/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=hwdata
-pkgver=0.240
-pkgrel=2
+pkgver=0.248
+pkgrel=0
pkgdesc="Hardware identification and configuration data"
url="http://git.fedorahosted.org/git/hwdata.git"
arch="noarch"
@@ -10,7 +10,8 @@ makedepends="bash"
install=""
subpackages="$pkgname-usb $pkgname-pci $pkgname-pnp $pkgname-oui"
depends="$subpackages"
-source="http://fedorahosted.org/releases/h/w/hwdata/hwdata-$pkgver.tar.bz2"
+source="http://fedorahosted.org/releases/h/w/hwdata/hwdata-$pkgver.tar.bz2
+ install-T.patch"
_builddir="$srcdir"/hwdata-$pkgver
prepare() {
@@ -34,9 +35,9 @@ build() {
package() {
cd "$_builddir"
- make DESTDIR="$pkgdir" install || return 1
+ make -j1 DESTDIR="$pkgdir" install || return 1
# remove modprobe blacklist
- rm -r "$pkgdir"/etc/
+ rm -r "$pkgdir"/usr/lib
}
_mv() {
@@ -51,4 +52,9 @@ pci() { replaces="pciutils"; _mv pci.ids; }
pnp() { _mv pnp.ids; }
oui() { _mv oui.txt; }
-md5sums="e7fbd88a28a6acea05feb6064bb49f2c hwdata-0.240.tar.bz2"
+md5sums="0ad47033d24a7c6c174e108d8fec07c4 hwdata-0.248.tar.bz2
+b30d7aab15c0c399d01867e797319cf0 install-T.patch"
+sha256sums="ec150fa99b01283f53d1a3aec7063622bc77e42e34a8dcb5023a7d112859e5a6 hwdata-0.248.tar.bz2
+d3020c09de374f28d1ffb470c1cae5c45af6b5eac161b2f805f9d0332959d5be install-T.patch"
+sha512sums="cdc2d2ec21325c8d9672681214840ffbc433f14392ab220858c3803e3157f06d91abfde4c6dceb8c7729d36c197d8a9c751b7d56c590b747a4a46f29097d7e45 hwdata-0.248.tar.bz2
+f3e67cb573ad617ff6b9c57af502652780581b3e87d5eec4fbe9bcf8c16c3eccb0629193e38fd0ebd21eeaae87aad152687f0bc62c4ddc17cedaebf82fd1d94d install-T.patch"
diff --git a/main/hwdata/install-T.patch b/main/hwdata/install-T.patch
new file mode 100644
index 000000000..d958765fe
--- /dev/null
+++ b/main/hwdata/install-T.patch
@@ -0,0 +1,11 @@
+--- ./Makefile.orig 2013-05-03 12:07:54.694533310 +0000
++++ ./Makefile 2013-05-03 12:08:10.531359273 +0000
+@@ -21,7 +21,7 @@
+ install -m 644 $$foo $(DESTDIR)$(datadir)/$(NAME) ;\
+ done
+ mkdir -p -m 755 $(DESTDIR)$(prefix)/lib/modprobe.d
+- install -m 644 -T blacklist.conf $(DESTDIR)$(prefix)/lib/modprobe.d/dist-blacklist.conf
++ install -m 644 blacklist.conf $(DESTDIR)$(prefix)/lib/modprobe.d/dist-blacklist.conf
+
+ commit:
+ git commit -a ||: