From 8538150e2ee59f2ead9546692eba5723dee2f104 Mon Sep 17 00:00:00 2001
From: abveritas <abveritas@chakra-project.org>
Date: Fri, 8 Jun 2012 20:52:38 +0000
Subject: [PATCH] moving all firmwares to /usr/lib

---
 linux-firmware/PKGBUILD             |  5 ++---
 pcmciautils/PKGBUILD                | 12 +++---------
 pcmciautils/initcpio-install-pcmcia |  6 +++---
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/linux-firmware/PKGBUILD b/linux-firmware/PKGBUILD
index 04240f209..537f5d686 100644
--- a/linux-firmware/PKGBUILD
+++ b/linux-firmware/PKGBUILD
@@ -70,11 +70,10 @@ package() {
   rm -f "${pkgdir}/usr/lib/firmware/GPL*"
   mv "${pkgdir}/usr/lib/firmware"/{LICEN*,WHENCE} "${pkgdir}/usr/share/licenses/linux-firmware/"
 
-  install -d -m755 "${pkgdir}/lib/firmware"
   # install b43-firmware
-  b43-fwcutter -w "${pkgdir}/lib/firmware/" ${srcdir}/broadcom-wl-${_b43}/linux/wl_apsta.o
+  b43-fwcutter -w "${pkgdir}/usr/lib/firmware/" ${srcdir}/broadcom-wl-${_b43}/linux/wl_apsta.o
 
   # install b43-legacy-firmware
-  b43-fwcutter -w "${pkgdir}/lib/firmware/" ${srcdir}/wl_apsta-${_legacy}.o
+  b43-fwcutter -w "${pkgdir}/usr/lib/firmware/" ${srcdir}/wl_apsta-${_legacy}.o
 }
 # vim:set ts=2 sw=2 et:
diff --git a/pcmciautils/PKGBUILD b/pcmciautils/PKGBUILD
index 7498c4455..0fe5a8f45 100644
--- a/pcmciautils/PKGBUILD
+++ b/pcmciautils/PKGBUILD
@@ -16,24 +16,18 @@ conflicts=('pcmcia-cs')
 options=(!makeflags)
 # The sources on kernel.org seem to be missing after the server got hacked...
 #source=("http://kernel.org/pub/linux/utils/kernel/pcmcia/${pkgname}-${pkgver}.tar.bz2")
-source=("http://ftp.de.debian.org/debian/pool/main/p/${pkgname}/${pkgname}_${pkgver}.orig.tar.gz"
-        'initcpio-install-pcmcia')
-md5sums=('3c388cb559975b37a75cb5965e9800a9'
-         '2659576a4637c58c4e79a96f8e43e316')
+source=("http://ftp.de.debian.org/debian/pool/main/p/${pkgname}/${pkgname}_${pkgver}.orig.tar.gz")
+md5sums=('3c388cb559975b37a75cb5965e9800a9')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i -e 's,/usr/bin/install,install,g;
-             s,/lib/udev,/usr/lib/udev,g' Makefile
+  sed -i -e 's,/usr/bin/install,/bin/install,g' Makefile
   make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-
-  # install the mkinitpcio hook
-  install -D -m644 ../initcpio-install-pcmcia ${pkgdir}/usr/lib/initcpio/install/pcmcia
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/pcmciautils/initcpio-install-pcmcia b/pcmciautils/initcpio-install-pcmcia
index 71052d6b2..f51ed6e2a 100644
--- a/pcmciautils/initcpio-install-pcmcia
+++ b/pcmciautils/initcpio-install-pcmcia
@@ -6,9 +6,9 @@ build() {
 
     [[ $MODULES ]] && MODULES+=" sd_mod?"
 
-    add_binary "/usr/lib/udev/pcmcia-socket-startup"
-    add_binary "/usr/lib/udev/pcmcia-check-broken-cis"
-    add_file "/usr/lib/udev/rules.d/60-pcmcia.rules"
+    add_binary "/lib/udev/pcmcia-socket-startup"
+    add_binary "/lib/udev/pcmcia-check-broken-cis"
+    add_file "/lib/udev/rules.d/60-pcmcia.rules"
 }
 
 help() {