From: David-John Willis <John.Willis@Distant-earth.com>
Date: Thu, 22 Apr 2010 11:41:14 +0000 (+0100)
Subject: wl1251-modules: Clean up recipe and install udev rules to /lib/udev/rules.d as they... 
X-Git-Tag: Release-2010-05/1~23^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=openpandora.oe.git;a=commitdiff_plain;h=607a487e8cf2f4fd1e7389b9a04011a93cf7763a

wl1251-modules: Clean up recipe and install udev rules to /lib/udev/rules.d as they are system not user rules.
---

diff --git a/recipes/pandora-system/wl1251-modules.bb b/recipes/pandora-system/wl1251-modules.bb
index 4ee34d8..05754fe 100755
--- a/recipes/pandora-system/wl1251-modules.bb
+++ b/recipes/pandora-system/wl1251-modules.bb
@@ -37,26 +37,28 @@ do_compile_prepend() {
 }
 
 do_install() {
-          install -d ${D}/lib/modules/${KERNEL_VERSION}/updates/compat
-          install -m 0644 ${S}/compat/*.ko ${D}/lib/modules/${KERNEL_VERSION}/updates/compat
-          install -d ${D}/lib/modules/${KERNEL_VERSION}/updates/kernel/net/mac80211
-          install -m 0644 ${S}/net/mac80211/*.ko ${D}/lib/modules/${KERNEL_VERSION}/updates/kernel/net/mac80211
-          install -d ${D}/lib/modules/${KERNEL_VERSION}/updates/kernel/net/wireless
-          install -m 0644 ${S}/net/wireless/*.ko ${D}/lib/modules/${KERNEL_VERSION}/updates/kernel/net/wireless
-          install -d ${D}/lib/modules/${KERNEL_VERSION}/updates/kernel/net/rfkill
-          install -m 0644 ${S}/net/rfkill/*.ko ${D}/lib/modules/${KERNEL_VERSION}/updates/kernel/net/rfkill
-          install -d ${D}/lib/modules/${KERNEL_VERSION}/updates/kernel/drivers/net/wireless/wl12xx      
-          install -m 0644 ${S}/drivers/net/wireless/wl12xx/wl1251.ko ${D}/lib/modules/${KERNEL_VERSION}/updates/kernel/drivers/net/wireless/wl12xx
-          install -m 0644 ${S}/drivers/net/wireless/wl12xx/wl1251_sdio.ko ${D}/lib/modules/${KERNEL_VERSION}/updates/kernel/drivers/net/wireless/wl12xx
+          install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/updates/compat
+          install -m 0644 ${S}/compat/*.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/updates/compat
+          install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/updates/kernel/net/mac80211
+          install -m 0644 ${S}/net/mac80211/*.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/updates/kernel/net/mac80211
+          install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/updates/kernel/net/wireless
+          install -m 0644 ${S}/net/wireless/*.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/updates/kernel/net/wireless
+          install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/updates/kernel/net/rfkill
+          install -m 0644 ${S}/net/rfkill/*.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/updates/kernel/net/rfkill
+          install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/updates/kernel/drivers/net/wireless/wl12xx      
+          install -m 0644 ${S}/drivers/net/wireless/wl12xx/wl1251.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/updates/kernel/drivers/net/wireless/wl12xx
+          install -m 0644 ${S}/drivers/net/wireless/wl12xx/wl1251_sdio.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/updates/kernel/drivers/net/wireless/wl12xx
           
           install -d ${D}${sysconfdir}/init.d/
           install -m 0755 ${WORKDIR}/rc.wl1251 ${D}${sysconfdir}/init.d/wl1251-init
 
-          install -d ${D}${sysconfdir}/udev/rules.d/
-          install -m 0644 ${WORKDIR}/50-compat_firmware.rules ${D}${sysconfdir}/udev/rules.d/
-          install -m 0755 ${WORKDIR}/compat_firmware.sh ${D}${sysconfdir}/udev/rules.d/          
+          # Install UDEV rules to /lib/udev/rules.d not /etc/udev/rules.d as they are system rules.
+          install -d ${D}${base_libdir}/udev/rules.d/
+          install -m 0644 ${WORKDIR}/50-compat_firmware.rules ${D}${base_libdir}/udev/rules.d/
+          install -m 0755 ${WORKDIR}/compat_firmware.sh ${D}${base_libdir}/udev/rules.d/          
 }
 
+FILES_${PN} += "/lib/udev/rules.d/*"
 FILES_${PN} += "/lib/modules/${KERNEL_VERSION}/updates/compat/*.ko.*"
 FILES_${PN} += "/lib/modules/${KERNEL_VERSION}/updates/kernel/net/mac80211/*.ko.*"
 FILES_${PN} += "/lib/modules/${KERNEL_VERSION}/updates/kernel/net/wireless/*.ko.*"
diff --git a/recipes/pandora-system/wl1251-modules/50-compat_firmware.rules b/recipes/pandora-system/wl1251-modules/50-compat_firmware.rules
index 780c74d..d1733a2 100644
--- a/recipes/pandora-system/wl1251-modules/50-compat_firmware.rules
+++ b/recipes/pandora-system/wl1251-modules/50-compat_firmware.rules
@@ -1,4 +1,4 @@
 # do not edit this file, it will be overwritten on update
 
 # compat_firmware-class requests, copies files into the kernel
-SUBSYSTEM=="compat_firmware", ACTION=="add", RUN+="/etc/udev/rules.d/compat_firmware.sh"
+SUBSYSTEM=="compat_firmware", ACTION=="add", RUN+="/lib/udev/rules.d/compat_firmware.sh"