util-linux: added configuration for mtx-[12]

5 files changed, 37 insertions, 2 deletions

diff --git a/packages/util-linux/files/mtx-1/.mtn2git_empty b/packages/util-linux/files/mtx-1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/util-linux/files/mtx-1/.mtn2git_empty
diff --git a/packages/util-linux/files/mtx-1/make_include b/packages/util-linux/files/mtx-1/make_include
new file mode 100644
index 0000000000..a2713298f6
--- /dev/null
+++ b/packages/util-linux/files/mtx-1/make_include
@@ -0,0 +1,16 @@
+VERSION=2.12
+CC=gcc
+CFLAGS=
+LDFLAGS=
+HAVE_OLD_GCC=yes
+HAVE_RAW_H=yes
+HAVE_NCURSES=yes
+CURSESFLAGS=-DNCH=1
+LIBCURSES=-lncurses
+HAVE_TERMCAP=no
+NEED_LIBCRYPT=yes
+FOREIGN = --foreign-user
+HAVE_XGETTEXT=yes
+HAVE_OPENPTY=yes
+HAVE_GOOD_RPC=yes
+HAVE_ZLIB=yes
diff --git a/packages/util-linux/files/mtx-2/.mtn2git_empty b/packages/util-linux/files/mtx-2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/util-linux/files/mtx-2/.mtn2git_empty
diff --git a/packages/util-linux/files/mtx-2/make_include b/packages/util-linux/files/mtx-2/make_include
new file mode 100644
index 0000000000..a2713298f6
--- /dev/null
+++ b/packages/util-linux/files/mtx-2/make_include
@@ -0,0 +1,16 @@
+VERSION=2.12
+CC=gcc
+CFLAGS=
+LDFLAGS=
+HAVE_OLD_GCC=yes
+HAVE_RAW_H=yes
+HAVE_NCURSES=yes
+CURSESFLAGS=-DNCH=1
+LIBCURSES=-lncurses
+HAVE_TERMCAP=no
+NEED_LIBCRYPT=yes
+FOREIGN = --foreign-user
+HAVE_XGETTEXT=yes
+HAVE_OPENPTY=yes
+HAVE_GOOD_RPC=yes
+HAVE_ZLIB=yes
diff --git a/packages/util-linux/util-linux.inc b/packages/util-linux/util-linux.inc
index 37dd579d6f..aaad0a9697 100644
--- a/packages/util-linux/util-linux.inc
+++ b/packages/util-linux/util-linux.inc
@@ -72,12 +72,13 @@ do_install () {
 		'OPT=${CFLAGS}' 'CC=${CC}' 'LD=${LD}' \
 		'LDFLAGS=${LDFLAGS}' 'DESTDIR=${D}' install
 
+	test -f ${D}${base_sbindir}/pivot_root && \
+	mv ${D}${base_sbindir}/pivot_root ${D}${base_sbindir}/pivot_root.${PN}
 	mv ${D}${base_bindir}/dmesg ${D}${base_bindir}/dmesg.${PN}
 	mv ${D}${base_bindir}/kill ${D}${base_bindir}/kill.${PN}
 	mv ${D}${base_bindir}/more ${D}${base_bindir}/more.${PN}
 	mv ${D}${base_sbindir}/hwclock ${D}${base_sbindir}/hwclock.${PN}
 	mv ${D}${base_sbindir}/mkswap ${D}${base_sbindir}/mkswap.${PN}
-	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}
@@ -107,6 +108,7 @@ pkg_postinst_${PN} () {
 	update-alternatives --install ${base_bindir}/kill kill kill.${PN} 100
 	update-alternatives --install ${base_bindir}/more more more.${PN} 100
 	update-alternatives --install ${base_sbindir}/mkswap mkswap mkswap.${PN} 100
+	test -x ${base_sbindir}/pivot_root.${PN} && \
 	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
@@ -127,13 +129,14 @@ pkg_postinst_${PN} () {
 }
 
 pkg_prerm_${PN} () {
+	test -x ${base_sbindir}/pivot_root.${PN} && \
+	update-alternatives --remove pivot_root pivot_root.${PN}
 	update-alternatives --remove dmesg dmesg.${PN}
 	update-alternatives --remove kill kill.${PN}
 	update-alternatives --remove more more.${PN}
 	update-alternatives --remove halt halt.${PN}
 	update-alternatives --remove hwclock hwclock.${PN}
 	update-alternatives --remove mkswap mkswap.${PN}
-	update-alternatives --remove pivot_root pivot_root.${PN}
 	update-alternatives --remove reboot reboot.${PN}
 	update-alternatives --remove shutdown shutdown.${PN}
 	update-alternatives --remove sln sln.${PN}