Skip to contentSkip to conversation

Andrei Gherzan : util-linux: Fix bloken swapoff symlink

oe-commits Martin Jansa 1 participant 1 message Sep 21, 2012 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): 20120919170333.13AC810336@opal

Martin Jansa

author
#1 lore raw
Quoted 41 lines · On Wed, Sep 19, 2012 at 05:03:32PM +0000, [email protected] 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 <[email protected]>
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 <[email protected]>
Signed-off-by Saul Wold <[email protected]>

---

 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(-)
meta/recipes-core/util-linux/util-linux.inc +1 -1
index 00e5d7c..79e0608 100644
@@ -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"

meta/recipes-core/util-linux/util-linux.inc do_install () { · line 126

Quoted 7 lines
meta/recipes-core/util-linux/util-linux.inc +1 -1
@@ -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,

Quoted 18 lines
meta/recipes-core/util-linux/util-linux_2.21.2.bb +1 -1
index 0f5fdc6..6ef3163 100644
@@ -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
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]