Patchwork [1/6] udev (165): move ConsoleKit support to udev-consolekit package

login
register
mail settings
Submitter Otavio Salvador
Date April 7, 2011, 1:19 p.m.
Message ID <1302182396-4171-2-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/2049/
State New, archived
Headers show

Comments

Otavio Salvador - April 7, 2011, 1:19 p.m.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes/udev/udev_165.bb |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
Phil Blundell - April 7, 2011, 5:21 p.m.
On Thu, 2011-04-07 at 13:19 +0000, Otavio Salvador wrote:
> -PACKAGES =+ "libudev libgudev udev-utils"
> +PACKAGES =+ "libudev libgudev udev-utils udev-consolekit"
>  
>  FILES_libudev = "${base_libdir}/libudev.so.*"
>  FILES_libgudev = "${base_libdir}/libgudev*.so.*"
> @@ -84,7 +84,8 @@ FILES_${PN}-dbg += "${usrbindir}/.debug ${usrsbindir}/.debug"
>  
>  # udev installs binaries under $(udev_prefix)/lib/udev, even if ${libdir}
>  # is ${prefix}/lib64
> -FILES_${PN} += "/lib/udev* ${libdir}/ConsoleKit"
> +FILES_${PN} += "/lib/udev*"
> +FILES_${PN}-consokekit += "${libdir}/ConsoleKit"

Did you test this patch?  Surely the line above should read
"${PN}-consolekit" otherwise it won't match anything.

p.
Otavio Salvador - April 7, 2011, 5:30 p.m.
On Thu, Apr 7, 2011 at 14:21, Phil Blundell <philb@gnu.org> wrote:
> On Thu, 2011-04-07 at 13:19 +0000, Otavio Salvador wrote:
>> -PACKAGES =+ "libudev libgudev udev-utils"
>> +PACKAGES =+ "libudev libgudev udev-utils udev-consolekit"
>>
>>  FILES_libudev = "${base_libdir}/libudev.so.*"
>>  FILES_libgudev = "${base_libdir}/libgudev*.so.*"
>> @@ -84,7 +84,8 @@ FILES_${PN}-dbg += "${usrbindir}/.debug ${usrsbindir}/.debug"
>>
>>  # udev installs binaries under $(udev_prefix)/lib/udev, even if ${libdir}
>>  # is ${prefix}/lib64
>> -FILES_${PN} += "/lib/udev* ${libdir}/ConsoleKit"
>> +FILES_${PN} += "/lib/udev*"
>> +FILES_${PN}-consokekit += "${libdir}/ConsoleKit"
>
> Did you test this patch?  Surely the line above should read
> "${PN}-consolekit" otherwise it won't match anything.

I did but probably did a mistake when rebasing it; will fix it.

Patch

diff --git a/recipes/udev/udev_165.bb b/recipes/udev/udev_165.bb
index d426aff..822891f 100644
--- a/recipes/udev/udev_165.bb
+++ b/recipes/udev/udev_165.bb
@@ -3,7 +3,7 @@  DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod
 the hotplug package and requires a kernel not older than 2.6.12."
 LICENSE = "GPLv2+"
 
-PR = "r3"
+PR = "r4"
 
 # Untested
 DEFAULT_PREFERENCE = "-1"
@@ -71,7 +71,7 @@  EXTRA_OECONF += " --with-udev-prefix= \
 INITSCRIPT_NAME = "udev"
 INITSCRIPT_PARAMS = "start 03 S ."
 
-PACKAGES =+ "libudev libgudev udev-utils"
+PACKAGES =+ "libudev libgudev udev-utils udev-consolekit"
 
 FILES_libudev = "${base_libdir}/libudev.so.*"
 FILES_libgudev = "${base_libdir}/libgudev*.so.*"
@@ -84,7 +84,8 @@  FILES_${PN}-dbg += "${usrbindir}/.debug ${usrsbindir}/.debug"
 
 # udev installs binaries under $(udev_prefix)/lib/udev, even if ${libdir}
 # is ${prefix}/lib64
-FILES_${PN} += "/lib/udev* ${libdir}/ConsoleKit"
+FILES_${PN} += "/lib/udev*"
+FILES_${PN}-consokekit += "${libdir}/ConsoleKit"
 FILES_${PN}-dbg += "/lib/udev/.debug"
 
 RPROVIDES_udev_append = " udev-compat-wrapper"