[OE-core] [oe-commits] Andrei Gherzan : util-linux: Fix bloken swapoff symlink

[Martin Jansa]

On Wed, Sep 19, 2012 at 05:03:32PM +0000, git at git.openembedded.org wrote:
> Module: openembedded-core.git
> Branch: master
> Commit: 0ff32e8fb5463a23af9966afcb58eb00772af65b
> URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=0ff32e8fb5463a23af9966afcb58eb00772af65b
> 
> Author: Andrei Gherzan <andrei at gherzan.ro>
> Date:   Mon Sep 17 13:49:58 2012 +0300
> 
> util-linux: Fix bloken swapoff symlink
> 
> There were 2 issues with this symlink.
> 1. Is was installed in base_bindidir but packaged in bindir. Fixed to
> be packaged in base_bindir
> 2. The symlink swapoff was created to point to swapon. The problem is
> that swapoff is an alternative so it would end up pointing to
> swapoff.util-linux which was an inexistent file. The fix is to create
> a symlink swapoff.util-linux to swapon.util-linux.
> 
> Signed-off-by: Andrei Gherzan <andrei at gherzan.ro>
> Signed-off-by: Saul Wold <sgw at linux.intel.com>
> 
> ---
> 
>  meta/recipes-core/util-linux/util-linux.inc       |    4 ++--
>  meta/recipes-core/util-linux/util-linux_2.21.2.bb |    2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
> index 00e5d7c..79e0608 100644
> --- a/meta/recipes-core/util-linux/util-linux.inc
> +++ b/meta/recipes-core/util-linux/util-linux.inc
> @@ -46,7 +46,7 @@ FILES_util-linux-agetty = "${base_sbindir}/agetty"
>  FILES_util-linux-fdisk = "${base_sbindir}/fdisk.${BPN}"
>  FILES_util-linux-cfdisk = "${base_sbindir}/cfdisk"
>  FILES_util-linux-sfdisk = "${sbindir}/sfdisk"
> -FILES_util-linux-swaponoff = "${base_sbindir}/swapon.${BPN} ${sbindir}/swapoff.${BPN}"
> +FILES_util-linux-swaponoff = "${base_sbindir}/swapon.${BPN} ${base_sbindir}/swapoff.${BPN}"
>  FILES_util-linux-losetup = "${base_sbindir}/losetup.${BPN}"
>  FILES_util-linux-mount = "${base_bindir}/mount.${BPN}"
>  FILES_util-linux-mcookie = "${bindir}/mcookie"
> @@ -121,7 +121,7 @@ do_install () {
>  	install -d ${D}${sysconfdir}/default/
>  	echo 'MOUNTALL="-t nonfs,nosmbfs,noncpfs"' > ${D}${sysconfdir}/default/mountall
>  
> -	ln -sf swapon   ${D}${base_sbindir}/swapoff
> +	ln -sf swapon.${BPN}   ${D}${base_sbindir}/swapoff.${BPN}
>  	rm -f ${D}${sbindir}/swapoff
>  }

This looks like correct change, but doesn't provide upgrade path :/
Collected errors:
 * check_data_file_clashes: Package util-linux-swaponoff wants to
 * install file /sbin/swapoff.util-linux
        But that file is already provided by package  * util-linux

Something like
RREPLACES_${PN}-swaponoff = "${PN}"
should work but for RPM you probably need to include PV in that too. See
threads:
http://lists.linuxtogo.org/pipermail/openembedded-core/2012-September/029715.html
http://lists.linuxtogo.org/pipermail/openembedded-core/2012-September/029779.html
http://lists.linuxtogo.org/pipermail/openembedded-core/2012-September/030014.html
http://lists.linuxtogo.org/pipermail/openembedded-core/2012-September/029837.html

Cheers,

>  
> diff --git a/meta/recipes-core/util-linux/util-linux_2.21.2.bb b/meta/recipes-core/util-linux/util-linux_2.21.2.bb
> index 0f5fdc6..6ef3163 100644
> --- a/meta/recipes-core/util-linux/util-linux_2.21.2.bb
> +++ b/meta/recipes-core/util-linux/util-linux_2.21.2.bb
> @@ -1,5 +1,5 @@
>  MAJOR_VERSION = "2.21"
> -PR = "r1"
> +PR = "r2"
>  require util-linux.inc
>  
>  # note that `lscpu' is under GPLv3+
> 
> 
> _______________________________________________
> Openembedded-commits mailing list
> Openembedded-commits at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20120921/f2872178/attachment-0002.sig>