From 0ffc8419b44179821f2f86fe9fb6e89543405be2 Mon Sep 17 00:00:00 2001
From: "Steven J. Hill"
Date: Fri, 20 Jul 2007 14:37:48 +0000
Subject: Fix hdparm to cross build correctly. Also fix thttpd to build and
 install sanely and add simplified start up.

---
 package/hdparm/hdparm.mk    |  4 +++-
 package/hdparm/hdparm.patch | 12 ++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 package/hdparm/hdparm.patch

(limited to 'package/hdparm')

diff --git a/package/hdparm/hdparm.mk b/package/hdparm/hdparm.mk
index c43e2ecf0..91d2ee5cb 100644
--- a/package/hdparm/hdparm.mk
+++ b/package/hdparm/hdparm.mk
@@ -19,15 +19,17 @@ hdparm-source: $(DL_DIR)/$(HDPARM_SOURCE)
 hdparm-unpacked: $(HDPARM_DIR)/.unpacked
 $(HDPARM_DIR)/.unpacked: $(DL_DIR)/$(HDPARM_SOURCE)
 	$(HDPARM_CAT) $(DL_DIR)/$(HDPARM_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	toolchain/patch-kernel.sh $(HDPARM_DIR) package/hdparm hdparm.patch
 	touch $(HDPARM_DIR)/.unpacked
 
 $(HDPARM_DIR)/.configured: $(HDPARM_DIR)/.unpacked
 	touch $(HDPARM_DIR)/.configured
 
 $(HDPARM_DIR)/$(HDPARM_BINARY): $(HDPARM_DIR)/.configured
-	$(MAKE) CC=$(TARGET_CC) -C $(HDPARM_DIR)
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(HDPARM_DIR)
 
 $(TARGET_DIR)/$(HDPARM_TARGET_BINARY): $(HDPARM_DIR)/$(HDPARM_BINARY)
+	rm -f $(TARGET_DIR)/$(HDPARM_TARGET_BINARY)
 	cp -a $(HDPARM_DIR)/$(HDPARM_BINARY) $(TARGET_DIR)/$(HDPARM_TARGET_BINARY)
 
 hdparm: uclibc $(TARGET_DIR)/$(HDPARM_TARGET_BINARY)
diff --git a/package/hdparm/hdparm.patch b/package/hdparm/hdparm.patch
new file mode 100644
index 000000000..d271eb879
--- /dev/null
+++ b/package/hdparm/hdparm.patch
@@ -0,0 +1,12 @@
+diff -ur hdparm-7.6/Makefile hdparm-7.6-patched/Makefile
+--- hdparm-7.6/Makefile	2007-06-07 12:39:24.000000000 -0500
++++ hdparm-7.6-patched/Makefile	2007-07-19 12:11:03.000000000 -0500
+@@ -28,7 +28,7 @@
+ 
+ hdparm: hdparm.h $(OBJS)
+ 	$(CC) $(LDFLAGS) -o hdparm $(OBJS)
+-	strip hdparm
++	$(STRIP) hdparm
+  
+ install: all hdparm.8
+ 	if [ ! -z $(DESTDIR) ]; then $(INSTALL_DIR) $(DESTDIR) ; fi
-- 
cgit v1.2.3-55-g7522