[oe-commits] org.oe.dev util-linux: Put mkfs.minix and fsck.minix under update-alternatives

[lenehan commit]

util-linux: Put mkfs.minix and fsck.minix under update-alternatives
control so they don't conflict with the busybox versions.

Author: lenehan at openembedded.org
Branch: org.openembedded.dev
Revision: 43a00136393cf6b705dc81f93e15bb8ca90475fa
ViewMTN: http://monotone.openembedded.org/revision.psp?id=43a00136393cf6b705dc81f93e15bb8ca90475fa
Files:
1
packages/util-linux/util-linux.inc
packages/util-linux/util-linux_2.12.bb
packages/util-linux/util-linux_2.12o.bb
packages/util-linux/util-linux_2.12q.bb
packages/util-linux/util-linux_2.12r.bb
Diffs:

#
# mt diff -r22832857979658a75a36946ca08f8db553813bab -r43a00136393cf6b705dc81f93e15bb8ca90475fa
#
# 
# 
# patch "packages/util-linux/util-linux.inc"
#  from [70985b2491b9583f7983b5f8e16ef7d9c5897219]
#    to [3746025d0903a4a9a2d5ce586e151db00c456e57]
# 
# patch "packages/util-linux/util-linux_2.12.bb"
#  from [09f36acd78e807016aebf6341de2b38321e30edb]
#    to [624b422d3062e5f840a4fd1121d999cde8f878b1]
# 
# patch "packages/util-linux/util-linux_2.12o.bb"
#  from [79fb2fa494acab3935a40757fd8b39e09d162be5]
#    to [95a52a86dbdf3578260001a297d40aa6d7ace5fd]
# 
# patch "packages/util-linux/util-linux_2.12q.bb"
#  from [3e4eeb3ad0785c5e3202ca4d8cb1a164b48d3672]
#    to [bcdce3995ff10dc4df712d4c70f48d7abac10a8f]
# 
# patch "packages/util-linux/util-linux_2.12r.bb"
#  from [95a52a86dbdf3578260001a297d40aa6d7ace5fd]
#    to [93fd5c6aa91d9cf854c3999ae72e855e9125d48f]
# 
============================================================
--- packages/util-linux/util-linux.inc	70985b2491b9583f7983b5f8e16ef7d9c5897219
+++ packages/util-linux/util-linux.inc	3746025d0903a4a9a2d5ce586e151db00c456e57
@@ -80,6 +80,8 @@ do_install () {
 	mv ${D}${base_sbindir}/pivot_root ${D}${base_sbindir}/pivot_root.${PN}
 	mv ${D}${base_sbindir}/shutdown ${D}${base_sbindir}/shutdown.${PN}
 	mv ${D}${base_sbindir}/sln ${D}${base_sbindir}/sln.${PN}
+	mv ${D}${base_sbindir}/mkfs.minix ${D}${base_sbindir}/mkfs.minix.${PN}
+	mv ${D}${base_sbindir}/fsck.minix ${D}${base_sbindir}/fsck.minix.${PN}
 	mv ${D}${bindir}/hexdump ${D}${bindir}/hexdump.${PN}
 	mv ${D}${bindir}/last ${D}${bindir}/last.${PN}
 	mv ${D}${bindir}/logger ${D}${bindir}/logger.${PN}
@@ -107,6 +109,8 @@ pkg_postinst_${PN} () {
 	update-alternatives --install ${base_sbindir}/mkswap mkswap mkswap.${PN} 100
 	update-alternatives --install ${base_sbindir}/pivot_root pivot_root pivot_root.${PN} 100
 	update-alternatives --install ${base_sbindir}/sln sln sln.${PN} 100
+	update-alternatives --install ${base_sbindir}/mkfs.minix mkfs.minix mkfs.minix.${PN} 100
+	update-alternatives --install ${base_sbindir}/fsck.minix fsck.minix fsck.minix.${PN} 100
 	update-alternatives --install ${bindir}/hexdump hexdump hexdump.${PN} 100
 	update-alternatives --install ${bindir}/last last last.${PN} 100
 	update-alternatives --install ${bindir}/logger logger logger.${PN} 100
@@ -133,6 +137,8 @@ pkg_prerm_${PN} () {
 	update-alternatives --remove reboot reboot.${PN}
 	update-alternatives --remove shutdown shutdown.${PN}
 	update-alternatives --remove sln sln.${PN}
+	update-alternatives --remove mkfs.minix mkfs.minix.${PN}
+	update-alternatives --remove fsck.minix fsck.minix.${PN}
 	update-alternatives --remove hexdump hexdump.${PN}
 	update-alternatives --remove last last.${PN}
 	update-alternatives --remove logger logger.${PN}
============================================================
--- packages/util-linux/util-linux_2.12.bb	09f36acd78e807016aebf6341de2b38321e30edb
+++ packages/util-linux/util-linux_2.12.bb	624b422d3062e5f840a4fd1121d999cde8f878b1
@@ -1,4 +1,4 @@
-PR = "r3"
+PR = "r4"
 
 require util-linux.inc
 
============================================================
--- packages/util-linux/util-linux_2.12o.bb	79fb2fa494acab3935a40757fd8b39e09d162be5
+++ packages/util-linux/util-linux_2.12o.bb	95a52a86dbdf3578260001a297d40aa6d7ace5fd
@@ -1,3 +1,3 @@ require util-linux.inc
 require util-linux.inc
 
+PR = "r7"
-PR = "r6"
============================================================
--- packages/util-linux/util-linux_2.12q.bb	3e4eeb3ad0785c5e3202ca4d8cb1a164b48d3672
+++ packages/util-linux/util-linux_2.12q.bb	bcdce3995ff10dc4df712d4c70f48d7abac10a8f
@@ -1,7 +1,7 @@ require util-linux.inc
 # fdisk gets a #error unknown architecture when compiling for ARM thumb
 #FIXME: remove this
 ARM_INSTRUCTION_SET = "arm"
 
 require util-linux.inc
 
+PR = "r6"
-PR = "r5"
============================================================
--- packages/util-linux/util-linux_2.12r.bb	95a52a86dbdf3578260001a297d40aa6d7ace5fd
+++ packages/util-linux/util-linux_2.12r.bb	93fd5c6aa91d9cf854c3999ae72e855e9125d48f
@@ -1,3 +1,3 @@ require util-linux.inc
 require util-linux.inc
 
+PR = "r8"
-PR = "r7"