[oe-commits] org.oe.dev util-linux: added configuration for mtx-[12]

[MartinDietze commit]

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

Author: MartinDietze at openembedded.org
Branch: org.openembedded.dev
Revision: bc7b3a47428b689a9785871fb5b0412af1f39bb1
ViewMTN: http://monotone.openembedded.org/revision.psp?id=bc7b3a47428b689a9785871fb5b0412af1f39bb1
Files:
1
packages/util-linux/files/mtx-1
packages/util-linux/files/mtx-2
packages/util-linux/files/mtx-1/make_include
packages/util-linux/files/mtx-2/make_include
packages/util-linux/util-linux.inc
Diffs:

#
# mt diff -r417360ac033b4479de942b20e0673d048a529f97 -rbc7b3a47428b689a9785871fb5b0412af1f39bb1
#
# 
# 
# add_dir "packages/util-linux/files/mtx-1"
# 
# add_dir "packages/util-linux/files/mtx-2"
# 
# add_file "packages/util-linux/files/mtx-1/make_include"
#  content [601ccf466103cfb2f7fb900a5e6eed30575c9254]
# 
# add_file "packages/util-linux/files/mtx-2/make_include"
#  content [601ccf466103cfb2f7fb900a5e6eed30575c9254]
# 
# patch "packages/util-linux/util-linux.inc"
#  from [3746025d0903a4a9a2d5ce586e151db00c456e57]
#    to [0e31380fb3c26bb69831500935a7116bbeea040a]
# 
============================================================
--- packages/util-linux/files/mtx-1/make_include	601ccf466103cfb2f7fb900a5e6eed30575c9254
+++ packages/util-linux/files/mtx-1/make_include	601ccf466103cfb2f7fb900a5e6eed30575c9254
@@ -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
============================================================
--- packages/util-linux/files/mtx-2/make_include	601ccf466103cfb2f7fb900a5e6eed30575c9254
+++ packages/util-linux/files/mtx-2/make_include	601ccf466103cfb2f7fb900a5e6eed30575c9254
@@ -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
============================================================
--- packages/util-linux/util-linux.inc	3746025d0903a4a9a2d5ce586e151db00c456e57
+++ packages/util-linux/util-linux.inc	0e31380fb3c26bb69831500935a7116bbeea040a
@@ -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_prerm_${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}