From 40da9d6feaf0914dc027dd25b7b13a3b73fa7df0 Mon Sep 17 00:00:00 2001
From: Stefan Fiedler <stefan.fiedler@students.jku.at>
Date: Fri, 2 Nov 2007 13:24:04 +0000
Subject: [PATCH] Stefan Fiedler: 	util-linux: some cleanups

[2007091023141131463] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@8745 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/base/util-linux/util-linux.conf | 34 ++++++++-----------------
 1 file changed, 10 insertions(+), 24 deletions(-)

diff --git a/package/base/util-linux/util-linux.conf b/package/base/util-linux/util-linux.conf
index 58f07a0ec..cbfca1443 100644
--- a/package/base/util-linux/util-linux.conf
+++ b/package/base/util-linux/util-linux.conf
@@ -1,3 +1,4 @@
+#!/bin/bash
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
@@ -20,30 +21,17 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-prepare_cross_build() {
-	for x in `grep -l 'LIBCURSES.' */Makefile`
-	do
-		echo -n "Patching $x ... "
-		sed -i 's/\$(LIBCURSES)//g' $x
-		echo "done"
-	done
-	for x in `egrep -l '#.*include.*[<"](n?curses|term).h[">]' */*.c`
-	do
-		echo -n "Killing $x ... "
-		echo "int main() { return 1; }" > $x
-		echo "done"
-	done
+hook_add premake 5 "cp hwclock/hwclock.c{,.orig}; \
+	sed 's@etc/adjtime@var/lib/hwclock/adjtime@g' \
+	    hwclock/hwclock.c.orig > hwclock/hwclock.c; \
+	mkdir -pv ${CLFS}/var/lib/hwclock"
+# hook_add postmake 5 "mv -v ${CLFS}/usr/bin/logger ${CLFS}/bin"
 
-	# disable cramfs tools
-	patch -p1 < $confdir/disable_cramfs_tools.diff
-}
-
-[ $stagelevel -le 1 ] && premake='prepare_cross_build'
-
-tmp1=`echo "$arch_machine" | sed 's/i.86/intel/;s/arm.*/arm/'`
+var_append makeopt " " "CC='$CC' CPU='$arch_machine' ARCH='$tmp1'"
+var_append makeinstopt " " "CC='$CC' CPU='$arch_machine' ARCH='$tmp1' DESTDIR='$root'"
 
-makeopt="CC='$CC' CPU='$arch_machine' ARCH='$tmp1'"
-makeinstopt="CC='$CC' CPU='$arch_machine' ARCH='$tmp1' DESTDIR='$root' install"
+var_append makeopt " " 'HAVE_KILL=yes HAVE_SLN=yes'
+var_append makeinstopt " " 'HAVE_KILL=yes HAVE_SLN=yes USE_TTY_GROUP=no'
 
 util_linux_postmake() {
 	rm -f $root/sbin/sln  # we are using sln from glibc
@@ -52,12 +40,10 @@ util_linux_postmake() {
 	cp -v partx/{partx,delpart,addpart} $root/sbin
 	install -m 644 misc-utils/scriptreplay.1 $mandir/man1/scriptreplay.1
 	install -m 755 misc-utils/scriptreplay.pl $bindir/scriptreplay.pl
-	olddir=$PWD
 	cd $mandir/man1
 	ln -s -v -f scriptreplay.1 replay.1
 	cd $bindir/
 	ln -s  -v -f scriptreplay.pl replay
-	cd $olddir
 }
 
 postmake="util_linux_postmake"