Patchwork udev: Remove deprecated binaries from packaging

login
register
mail settings
Submitter Marko Kati?
Date Dec. 14, 2012, 3:17 p.m.
Message ID <1355498223.9104.2.camel@dromedary>
Download mbox | patch
Permalink /patch/41017/
State New
Headers show

Comments

Marko Kati? - Dec. 14, 2012, 3:17 p.m.
On Thu, 2012-12-13 at 21:30 -0200, Otavio Salvador wrote:
> On Thu, Dec 13, 2012 at 5:53 PM, Marko Kati? <dromede@gmail.com> wrote:
> > Oh dear, i completely forgot about this patch. It's been sitting in my
> > local repo for weeks!
> >
> > So here's my (hopefully) final solution:
> 
> The patch seems broken for my e-mail reader (dunno if you pasted it here).
> 
> --
> Otavio Salvador                             O.S. Systems
> E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
> Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

Sorry about that. This one should work.
Otavio Salvador - Dec. 14, 2012, 3:23 p.m.
On Fri, Dec 14, 2012 at 1:17 PM, Marko Kati? <dromede@gmail.com> wrote:
> On Thu, 2012-12-13 at 21:30 -0200, Otavio Salvador wrote:
>> On Thu, Dec 13, 2012 at 5:53 PM, Marko Kati? <dromede@gmail.com> wrote:
>> > Oh dear, i completely forgot about this patch. It's been sitting in my
>> > local repo for weeks!
>> >
>> > So here's my (hopefully) final solution:
>>
>> The patch seems broken for my e-mail reader (dunno if you pasted it here).
>>
>> --
>> Otavio Salvador                             O.S. Systems
>> E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
>> Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br
>
> Sorry about that. This one should work.

Please send a full patch, with commit log and everything. The patch
itself seems fine but it would be better to have the final and ready
to apply patch for test and review.

Regards,

--
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

Patch

diff --git a/meta/recipes-core/udev/udev.inc b/meta/recipes-core/udev/udev.inc
index 4705b9b..9b1ebcf 100644
--- a/meta/recipes-core/udev/udev.inc
+++ b/meta/recipes-core/udev/udev.inc
@@ -74,7 +74,7 @@  FILES_udev-cache = "${sysconfdir}/init.d/udev-cache ${sysconfdir}/default/udev-c
 
 FILES_udev-acl = "${base_libdir}/udev/udev-acl ${base_libdir}/udev/rules.d/70-acl.rules"
 
-FILES_udev-utils = "${bindir}/udevinfo ${bindir}/udevtest ${base_sbindir}/udevadm"
+FILES_udev-utils = "${bindir}/udevinfo ${bindir}/udevtest ${base_sbindir}/udevadm ${bindir}/udevadm"
 
 RDEPENDS_udev-consolekit += "udev-acl"
 FILES_udev-consolekit = "${libdir}/ConsoleKit"
@@ -97,4 +97,16 @@  do_install_append () {
 	rm -f ${D}${base_libdir}/udev/hid2hci
 
 	echo 'udev_run="/var/run/udev"' >> ${D}${sysconfdir}/udev/udev.conf
+	
+	if [ "${PV}" -gt "175" ]
+	then
+		install -d ${D}${base_sbindir}
+		ln -s ${bindir}/udevadm ${D}${base_sbindir}/udevadm
+
+	elif [ "${PV}" -lt "175" ]
+	then
+		install -d ${D}${bindir}
+		ln -s ${base_sbindir}/udevadm ${D}${bindir}/udevadm
+
+	fi
 }