diff options
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 4 | ||||
-rw-r--r-- | 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 00e5d7cd4d..79e0608d36 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" | |||
46 | FILES_util-linux-fdisk = "${base_sbindir}/fdisk.${BPN}" | 46 | FILES_util-linux-fdisk = "${base_sbindir}/fdisk.${BPN}" |
47 | FILES_util-linux-cfdisk = "${base_sbindir}/cfdisk" | 47 | FILES_util-linux-cfdisk = "${base_sbindir}/cfdisk" |
48 | FILES_util-linux-sfdisk = "${sbindir}/sfdisk" | 48 | FILES_util-linux-sfdisk = "${sbindir}/sfdisk" |
49 | FILES_util-linux-swaponoff = "${base_sbindir}/swapon.${BPN} ${sbindir}/swapoff.${BPN}" | 49 | FILES_util-linux-swaponoff = "${base_sbindir}/swapon.${BPN} ${base_sbindir}/swapoff.${BPN}" |
50 | FILES_util-linux-losetup = "${base_sbindir}/losetup.${BPN}" | 50 | FILES_util-linux-losetup = "${base_sbindir}/losetup.${BPN}" |
51 | FILES_util-linux-mount = "${base_bindir}/mount.${BPN}" | 51 | FILES_util-linux-mount = "${base_bindir}/mount.${BPN}" |
52 | FILES_util-linux-mcookie = "${bindir}/mcookie" | 52 | FILES_util-linux-mcookie = "${bindir}/mcookie" |
@@ -121,7 +121,7 @@ do_install () { | |||
121 | install -d ${D}${sysconfdir}/default/ | 121 | install -d ${D}${sysconfdir}/default/ |
122 | echo 'MOUNTALL="-t nonfs,nosmbfs,noncpfs"' > ${D}${sysconfdir}/default/mountall | 122 | echo 'MOUNTALL="-t nonfs,nosmbfs,noncpfs"' > ${D}${sysconfdir}/default/mountall |
123 | 123 | ||
124 | ln -sf swapon ${D}${base_sbindir}/swapoff | 124 | ln -sf swapon.${BPN} ${D}${base_sbindir}/swapoff.${BPN} |
125 | rm -f ${D}${sbindir}/swapoff | 125 | rm -f ${D}${sbindir}/swapoff |
126 | } | 126 | } |
127 | 127 | ||
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 0f5fdc6122..6ef31633dc 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 @@ | |||
1 | MAJOR_VERSION = "2.21" | 1 | MAJOR_VERSION = "2.21" |
2 | PR = "r1" | 2 | PR = "r2" |
3 | require util-linux.inc | 3 | require util-linux.inc |
4 | 4 | ||
5 | # note that `lscpu' is under GPLv3+ | 5 | # note that `lscpu' is under GPLv3+ |