From: Grazvydas Ignotas <notasas@gmail.com>
Date: Thu, 17 Dec 2015 23:24:04 +0000 (+0200)
Subject: util-linux-ng: change mountall as it was before
X-Git-Tag: sz_176~22
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1d145c585c3748b62158d6ff8131d10895bb594;p=openembedded.git

util-linux-ng: change mountall as it was before

mixing old and new stuff is bad
---

diff --git a/recipes/util-linux-ng/util-linux-ng.inc b/recipes/util-linux-ng/util-linux-ng.inc
index c5120c0fbb..f5d36b8beb 100644
--- a/recipes/util-linux-ng/util-linux-ng.inc
+++ b/recipes/util-linux-ng/util-linux-ng.inc
@@ -30,7 +30,8 @@ PACKAGES =+ "util-linux-ng-agetty util-linux-ng-fdisk util-linux-ng-cfdisk util-
              util-linux-ng-mount util-linux-ng-readprofile util-linux-ng-libblkid \
              util-linux-ng-libblkid-dev util-linux-ng-libuuid util-linux-ng-libuuid-dev \
              util-linux-ng-uuidgen util-linux-ng-lscpu util-linux-ng-fsck util-linux-ng-blkid \
-	     util-linux-ng-chkdupexe util-linux-ng-mkfs util-linux-ng-mcookie"
+             util-linux-ng-chkdupexe util-linux-ng-mkfs util-linux-ng-mcookie \
+             util-linux-ng-mountall"
 
 EXTRA_OECONF = "--disable-use-tty-group --disable-makeinstall-chown --enable-elvtune --enable-init --enable-kill --enable-last \
  --enable-mesg --enable-partx --enable-raw --enable-rdev --enable-reset \
@@ -50,6 +51,9 @@ RPROVIDES_util-linux-ng-readprofile = "util-linux-readprofile"
 RPROVIDES_util-linux-ng-fsck = "e2fsprogs-fsck"
 RPROVIDES_util-linux-ng-blkid = "e2fsprogs-blkid"
 
+FILES_${PN}-mountall = "${sysconfdir}/default/mountall.${PN}"
+RREPLACES_${PN}-mountall = "busybox-mountall"
+
 FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*"
 
 FILES_util-linux-ng-agetty = "${base_sbindir}/agetty"
@@ -172,7 +176,7 @@ do_install () {
         done
 	
 	install -d ${D}${sysconfdir}/default/
-	echo 'MOUNTALL="-t nonfs,nosmbfs,noncpfs"' > ${D}${sysconfdir}/default/mountall
+	echo 'MOUNTALL="-t nonfs,nosmbfs,noncpfs"' > ${D}${sysconfdir}/default/mountall.${PN}
 
 	# note ${PN} in swapon.${PN}, swapon is an alternative link that is
 	# not guaranteed to provide multiple functions, similar for shutdown
diff --git a/recipes/util-linux-ng/util-linux-ng_2.19.1.bb b/recipes/util-linux-ng/util-linux-ng_2.19.1.bb
index c95fb9a1d9..a295a4b542 100644
--- a/recipes/util-linux-ng/util-linux-ng_2.19.1.bb
+++ b/recipes/util-linux-ng/util-linux-ng_2.19.1.bb
@@ -1,5 +1,5 @@
 MAJOR_VERSION = "2.19"
-PR = "r13"
+PR = "r15"
 require util-linux-ng.inc
 
 # note that `lscpu' is under GPLv3+