diff options
| author | Jamie Lenehan <lenehan@twibble.org> | 2006-10-04 22:49:09 +0000 |
|---|---|---|
| committer | Jamie Lenehan <lenehan@twibble.org> | 2006-10-04 22:49:09 +0000 |
| commit | beeab4b68aa9865a66fb04ea37bb263aa356763b (patch) | |
| tree | 406fa3a2967815568569516aa65d2b18a0892aa0 | |
| parent | 9bcca56c162aaa999f35bf303ab3fdc0f475dbb7 (diff) | |
util-linux: Put mkfs.minix and fsck.minix under update-alternatives
control so they don't conflict with the busybox versions.
| -rw-r--r-- | packages/util-linux/util-linux.inc | 6 | ||||
| -rw-r--r-- | packages/util-linux/util-linux_2.12.bb | 2 | ||||
| -rw-r--r-- | packages/util-linux/util-linux_2.12o.bb | 2 | ||||
| -rw-r--r-- | packages/util-linux/util-linux_2.12q.bb | 2 | ||||
| -rw-r--r-- | packages/util-linux/util-linux_2.12r.bb | 2 |
5 files changed, 10 insertions, 4 deletions
diff --git a/packages/util-linux/util-linux.inc b/packages/util-linux/util-linux.inc index 99207213bd..37dd579d6f 100644 --- a/packages/util-linux/util-linux.inc +++ b/packages/util-linux/util-linux.inc @@ -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} diff --git a/packages/util-linux/util-linux_2.12.bb b/packages/util-linux/util-linux_2.12.bb index 5e85330c35..368e127d28 100644 --- a/packages/util-linux/util-linux_2.12.bb +++ b/packages/util-linux/util-linux_2.12.bb @@ -1,4 +1,4 @@ -PR = "r3" +PR = "r4" require util-linux.inc diff --git a/packages/util-linux/util-linux_2.12o.bb b/packages/util-linux/util-linux_2.12o.bb index ded31fb578..14e50d13ac 100644 --- a/packages/util-linux/util-linux_2.12o.bb +++ b/packages/util-linux/util-linux_2.12o.bb @@ -1,3 +1,3 @@ require util-linux.inc -PR = "r6" +PR = "r7" diff --git a/packages/util-linux/util-linux_2.12q.bb b/packages/util-linux/util-linux_2.12q.bb index 2ab3099f4f..92df2df532 100644 --- a/packages/util-linux/util-linux_2.12q.bb +++ b/packages/util-linux/util-linux_2.12q.bb @@ -4,4 +4,4 @@ ARM_INSTRUCTION_SET = "arm" require util-linux.inc -PR = "r5" +PR = "r6" diff --git a/packages/util-linux/util-linux_2.12r.bb b/packages/util-linux/util-linux_2.12r.bb index 14e50d13ac..bb874d9573 100644 --- a/packages/util-linux/util-linux_2.12r.bb +++ b/packages/util-linux/util-linux_2.12r.bb @@ -1,3 +1,3 @@ require util-linux.inc -PR = "r7" +PR = "r8" |