| Submitter | Andrei Gherzan |
|---|---|
| Date | Sept. 17, 2012, 10:49 a.m. |
| Message ID | <1347878998-19019-1-git-send-email-andrei@gherzan.ro> |
| Download | mbox | patch |
| Permalink | /patch/36599/ |
| State | Accepted |
| Commit | 0ff32e8fb5463a23af9966afcb58eb00772af65b |
| Headers | show |
Comments
On 09/17/2012 03:49 AM, Andrei Gherzan wrote: > 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@gherzan.ro> > --- > 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 > } > > 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+ > Merged into OE-Core Thanks Sau!
Patch
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 } 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+
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@gherzan.ro> --- 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(-)