From 34ce698d69330574dd6487047357e03486a2aa88 Mon Sep 17 00:00:00 2001
From: Tobias Hintze <th@rocklinux.org>
Date: Sat, 14 Jul 2007 02:46:50 +0000
Subject: [PATCH] Tobias Hintze: 	more minit cleanups 	allow both:
 diet- and non-diet-builds

git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@8638 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 ...on-diet-adaptions.patch => makefile.patch} | 45 ++++++-------------
 package/teha/minit/minit.conf                 | 20 +++++----
 .../teha/minit/no-diet-please.patch_noauto    | 23 ++++++++++
 3 files changed, 48 insertions(+), 40 deletions(-)
 rename package/teha/minit/{non-diet-adaptions.patch => makefile.patch} (56%)
 create mode 100644 package/teha/minit/no-diet-please.patch_noauto

diff --git a/package/teha/minit/non-diet-adaptions.patch b/package/teha/minit/makefile.patch
similarity index 56%
rename from package/teha/minit/non-diet-adaptions.patch
rename to package/teha/minit/makefile.patch
index 563a962ea..f0a3c4a31 100644
--- a/package/teha/minit/non-diet-adaptions.patch
+++ b/package/teha/minit/makefile.patch
@@ -1,16 +1,22 @@
 diff -Naur minit-0.10-orig/Makefile minit-0.10/Makefile
 --- minit-0.10-orig/Makefile	2005-04-08 19:24:04.000000000 +0200
-+++ minit-0.10/Makefile	2007-07-12 04:06:35.679742211 +0200
-@@ -34,7 +34,7 @@
++++ minit-0.10/Makefile	2007-07-14 01:43:48.000000000 +0200
+@@ -34,19 +34,24 @@
  
  LDLIBS=-lowfat
  
 -libowfat_path = $(strip $(foreach dir,../libowfat*,$(wildcard $(dir)/textcode.h)))
-+libowfat_path = .
- ifneq ($(libowfat_path),)
- CFLAGS+=$(foreach fnord,$(libowfat_path),-I$(dir $(fnord)))
- LDFLAGS+=$(foreach fnord,$(libowfat_path),-L$(dir $(fnord)))
-@@ -44,9 +44,13 @@
+-ifneq ($(libowfat_path),)
+-CFLAGS+=$(foreach fnord,$(libowfat_path),-I$(dir $(fnord)))
+-LDFLAGS+=$(foreach fnord,$(libowfat_path),-L$(dir $(fnord)))
++ifneq ($(libowfat_inc),)
++CFLAGS+=-I$(libowfat_inc)
++endif
++ifneq ($(libowfat_lib),)
++LDFLAGS+=-L$(libowfat_lib)
+ endif
+ 
+ minit: minit.o split.o openreadclose.o opendevconsole.o
  msvc: msvc.o
  minit-update: minit-update.o split.o openreadclose.o
  serdo: serdo.o
@@ -25,7 +31,7 @@ diff -Naur minit-0.10-orig/Makefile minit-0.10/Makefile
  
  %.o: %.c
  	$(DIET) $(CROSS)$(CC) $(CFLAGS) -c $<
-@@ -61,18 +65,6 @@
+@@ -61,18 +66,6 @@
  test: test.c
  	gcc -nostdlib -o $@ $^ -I../dietlibc/include ../dietlibc/start.o ../dietlibc/dietlibc.a
  
@@ -44,26 +50,3 @@ diff -Naur minit-0.10-orig/Makefile minit-0.10/Makefile
  install-files:
  	install -d $(DESTDIR)/etc/minit $(DESTDIR)/sbin $(DESTDIR)/bin $(DESTDIR)$(MANDIR)/man8
  	install minit pidfilehack $(DESTDIR)/sbin
-diff -Naur minit-0.10-orig/serdo.c minit-0.10/serdo.c
---- minit-0.10-orig/serdo.c	2005-02-26 18:00:22.000000000 +0100
-+++ minit-0.10/serdo.c	2007-07-12 03:58:30.292420270 +0200
-@@ -7,6 +7,8 @@
- #include <str.h>
- #include <byte.h>
- 
-+extern char **environ;
-+
- #define MAXENV 256
- char* envp[MAXENV+2];
- int envc;
-diff -Naur minit-0.10-orig/shutdown.c minit-0.10/shutdown.c
---- minit-0.10-orig/shutdown.c	2004-01-29 15:40:45.000000000 +0100
-+++ minit-0.10/shutdown.c	2007-07-12 03:57:10.051209844 +0200
-@@ -26,6 +26,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <sys/wait.h>
-+#include <string.h>
- 
- #include "str.h"
- 
diff --git a/package/teha/minit/minit.conf b/package/teha/minit/minit.conf
index 1f2d1634b..d9c15bf02 100644
--- a/package/teha/minit/minit.conf
+++ b/package/teha/minit/minit.conf
@@ -20,6 +20,17 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
+if pkginstalled dietlibc; then
+	echo "dietlibc installed. using dietlibc-style path to owfat..."
+	var_append makeopt ' ' "libowfat_lib=$root/usr/dietlibc/lib-i386"
+else
+	echo 'dietlibc NOT installed. using $prefix/lib path to owfat...'
+	var_append patchfiles ' ' $confdir/no-diet-please.patch_noauto
+	var_append makeopt ' ' "DIET="
+	var_append makeopt ' ' "libowfat_lib=$root/opt/libowfat/lib"
+fi
+var_append makeopt ' ' "libowfat_inc=$root/opt/libowfat/include"
+
 
 minit_postmake() {
 	mkdir -p $root/etc/minit/default
@@ -105,14 +116,5 @@ EOT
 	echo getty >> $root/etc/minit/default/depends
 }
 
-minit_premake() {
-	if [ -f $root/opt/libowfat/lib/libowfat.a ]
-	then
-		cp $root/opt/libowfat/lib/libowfat.a .
-		cp $root/opt/libowfat/include/*.h .
-	fi
-}
-
 var_append makeinstopt ' ' "DESTDIR=$root/"
-hook_add premake 5 "minit_premake"
 hook_add postmake 5 "minit_postmake"
diff --git a/package/teha/minit/no-diet-please.patch_noauto b/package/teha/minit/no-diet-please.patch_noauto
new file mode 100644
index 000000000..de967d132
--- /dev/null
+++ b/package/teha/minit/no-diet-please.patch_noauto
@@ -0,0 +1,23 @@
+diff -Naur minit-0.10-orig/serdo.c minit-0.10/serdo.c
+--- minit-0.10-orig/serdo.c	2005-02-26 18:00:22.000000000 +0100
++++ minit-0.10/serdo.c	2007-07-12 03:58:30.292420270 +0200
+@@ -7,6 +7,8 @@
+ #include <str.h>
+ #include <byte.h>
+ 
++extern char **environ;
++
+ #define MAXENV 256
+ char* envp[MAXENV+2];
+ int envc;
+diff -Naur minit-0.10-orig/shutdown.c minit-0.10/shutdown.c
+--- minit-0.10-orig/shutdown.c	2004-01-29 15:40:45.000000000 +0100
++++ minit-0.10/shutdown.c	2007-07-12 03:57:10.051209844 +0200
+@@ -26,6 +26,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <sys/wait.h>
++#include <string.h>
+ 
+ #include "str.h"
+