From 94266d638908a140ef5cdd9b27d2eb367f97249f Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 21 Jun 2006 06:19:43 +0000
Subject: massive cleanup of toolchain/

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4038 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 .../1.7/ipkg-utils-1.7-ipkg_build_clean.patch      | 36 ------------------
 .../1.7/ipkg-utils-1.7-ipkg_build_tar.patch        | 16 --------
 .../1.7/ipkg-utils-1.7-ipkg_buildpackage.patch     | 24 ------------
 toolchain/ipkg-utils/Makefile                      | 44 ++++++----------------
 toolchain/ipkg-utils/patches/100-build_clean.patch | 36 ++++++++++++++++++
 .../ipkg-utils/patches/110-buildpackage.patch      | 24 ++++++++++++
 toolchain/ipkg-utils/patches/120-build_tar.patch   | 16 ++++++++
 7 files changed, 88 insertions(+), 108 deletions(-)
 delete mode 100644 toolchain/ipkg-utils/1.7/ipkg-utils-1.7-ipkg_build_clean.patch
 delete mode 100644 toolchain/ipkg-utils/1.7/ipkg-utils-1.7-ipkg_build_tar.patch
 delete mode 100644 toolchain/ipkg-utils/1.7/ipkg-utils-1.7-ipkg_buildpackage.patch
 create mode 100644 toolchain/ipkg-utils/patches/100-build_clean.patch
 create mode 100644 toolchain/ipkg-utils/patches/110-buildpackage.patch
 create mode 100644 toolchain/ipkg-utils/patches/120-build_tar.patch

(limited to 'toolchain/ipkg-utils')

diff --git a/toolchain/ipkg-utils/1.7/ipkg-utils-1.7-ipkg_build_clean.patch b/toolchain/ipkg-utils/1.7/ipkg-utils-1.7-ipkg_build_clean.patch
deleted file mode 100644
index 4cff731d5..000000000
--- a/toolchain/ipkg-utils/1.7/ipkg-utils-1.7-ipkg_build_clean.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ruN ipkg-utils-1.7-old/ipkg-build ipkg-utils-1.7-new/ipkg-build
---- ipkg-utils-1.7-old/ipkg-build	2004-08-24 04:56:12.000000000 +0200
-+++ ipkg-utils-1.7-new/ipkg-build	2004-08-24 04:55:49.000000000 +0200
-@@ -47,6 +47,19 @@
- 
- 	PKG_ERROR=0
- 
-+	cvs_dirs=`find . -name 'CVS'`
-+	if [ -n "$cvs_dirs" ]; then
-+	    if [ "$noclean" = "1" ]; then
-+		echo "*** Warning: The following CVS directories where found.
-+You probably want to remove them: " >&2
-+		ls -ld $cvs_dirs
-+		echo >&2
-+	    else
-+		echo "*** Removing the following files: $cvs_dirs"
-+		rm -rf "$cvs_dirs"
-+	    fi
-+	fi
-+
- 	tilde_files=`find . -name '*~'`
- 	if [ -n "$tilde_files" ]; then
- 	    if [ "$noclean" = "1" ]; then
-@@ -134,8 +147,12 @@
- 
- 	for script in $CONTROL/preinst $CONTROL/postinst $CONTROL/prerm $CONTROL/postrm; do
- 		if [ -f $script -a ! -x $script ]; then
-+		    if [ "$noclean" = "1" ]; then
- 			echo "*** Error: package script $script is not executable" >&2
- 			PKG_ERROR=1
-+		    else
-+			chmod a+x $script
-+		    fi
- 		fi
- 	done
- 
diff --git a/toolchain/ipkg-utils/1.7/ipkg-utils-1.7-ipkg_build_tar.patch b/toolchain/ipkg-utils/1.7/ipkg-utils-1.7-ipkg_build_tar.patch
deleted file mode 100644
index 441d3adf0..000000000
--- a/toolchain/ipkg-utils/1.7/ipkg-utils-1.7-ipkg_build_tar.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-This patch from aorlinsk fixes an issue with order in options passed to tar
-
-  http://openwrt.org/forum/viewtopic.php?pid=8332#p8332
-
-
---- ipkg-utils-1.7/ipkg-build.orig	2005-06-14 23:48:36.000000000 +0200
-+++ ipkg-utils-1.7/ipkg-build	2005-06-14 23:50:03.000000000 +0200
-@@ -243,7 +243,7 @@
- mkdir $tmp_dir
- 
- echo $CONTROL > $tmp_dir/tarX
--( cd $pkg_dir && tar $ogargs -czf $tmp_dir/data.tar.gz . -X $tmp_dir/tarX )
-+( cd $pkg_dir && tar $ogargs -X $tmp_dir/tarX -czf $tmp_dir/data.tar.gz . )
- ( cd $pkg_dir/$CONTROL && tar $ogargs -czf $tmp_dir/control.tar.gz . )
- rm $tmp_dir/tarX
- 
diff --git a/toolchain/ipkg-utils/1.7/ipkg-utils-1.7-ipkg_buildpackage.patch b/toolchain/ipkg-utils/1.7/ipkg-utils-1.7-ipkg_buildpackage.patch
deleted file mode 100644
index d0a30489a..000000000
--- a/toolchain/ipkg-utils/1.7/ipkg-utils-1.7-ipkg_buildpackage.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ruN ipkg-utils-1.7-old/ipkg-buildpackage ipkg-utils-1.7-new/ipkg-buildpackage
---- ipkg-utils-1.7-old/ipkg-buildpackage	2001-07-26 17:36:36.000000000 +0200
-+++ ipkg-utils-1.7-new/ipkg-buildpackage	2004-07-05 19:46:24.000000000 +0200
-@@ -30,8 +30,9 @@
- 
- set -e
- 
--#SCRIPTDIR=/usr/local/bin
--SCRIPTDIR=/other/kurth/ipaq-dev/familiar/dist/ipkg/util/
-+SCRIPTDIR=/usr/local/bin
-+
-+IPKG_BUILD_OPTIONS=$*
- 
- SCRIPTNAME=`basename $0`
- 
-@@ -212,7 +213,7 @@
- # build the ipk package
- owd=`pwd`
- cd ..
--ipkg-build /tmp/${pkg} || exit 1
-+ipkg-build $IPKG_BUILD_OPTIONS /tmp/${pkg} || exit 1
- 
- rm -rf /tmp/${pkg}
- 
diff --git a/toolchain/ipkg-utils/Makefile b/toolchain/ipkg-utils/Makefile
index 0183257b3..5d324f728 100644
--- a/toolchain/ipkg-utils/Makefile
+++ b/toolchain/ipkg-utils/Makefile
@@ -1,35 +1,18 @@
-# ipkg-utils
-#
-# http://handhelds.org/packages/ipkg-utils
-#
+include $(TOPDIR)/rules.mk
 
 PKG_NAME := ipkg-utils
 PKG_VERSION := 1.7
 
-PKG_SOURCE_SITE := http://handhelds.org/packages/ipkg-utils/
-PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_CAT := zcat
-PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION)
-
-include $(TOPDIR)/rules.mk
-
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR)
+PKG_SOURCE := $(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_MD5SUM := da3e3ef772973d7370a6ac95f0fef9b8
+PKG_SOURCE_URL := http://handhelds.org/packages/ipkg-utils/
+PKG_CAT := zcat
 
+PKG_BUILD_DIR := $(TOOL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
-$(DL_DIR)/$(PKG_SOURCE_FILE):
-	mkdir -p $(DL_DIR)
-	$(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) x $(PKG_SOURCE_SITE)
+include $(INCLUDE_DIR)/host-build.mk
 
-$(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE_FILE)
-	mkdir -p $(BUILD_DIR)
-	$(PKG_SOURCE_CAT) $(DL_DIR)/$(PKG_SOURCE_FILE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	touch $(PKG_BUILD_DIR)/.unpacked
-
-$(PKG_BUILD_DIR)/.patched: $(PKG_BUILD_DIR)/.unpacked
-	$(PATCH) $(PKG_BUILD_DIR) $(PKG_VERSION)/ \*.patch
-	touch $(PKG_BUILD_DIR)/.patched
-
-$(STAGING_DIR)/usr/bin/ipkg-build: $(PKG_BUILD_DIR)/.patched
+define Build/Install
 	mkdir -p $(STAGING_DIR)/etc
 	echo "dest root /" > $(STAGING_DIR)/etc/ipkg.conf
 	echo "option offline_root $(TARGET_DIR)" >> $(STAGING_DIR)/etc/ipkg.conf
@@ -38,15 +21,12 @@ $(STAGING_DIR)/usr/bin/ipkg-build: $(PKG_BUILD_DIR)/.patched
 	install -m0755 $(PKG_BUILD_DIR)/ipkg-buildpackage $(STAGING_DIR)/usr/bin
 	install -m0755 $(PKG_BUILD_DIR)/ipkg-make-index $(STAGING_DIR)/usr/bin
 	install -m0755 $(PKG_BUILD_DIR)/ipkg.py $(STAGING_DIR)/usr/bin
+endef
 
-source: $(DL_DIR)/$(PKG_SOURCE_FILE)
-prepare: $(PKG_BUILD_DIR)/.patched
-compile:
-install: $(STAGING_DIR)/usr/bin/ipkg-build
-
-clean: FORCE
+define Build/Clean
 	rm -f $(STAGING_DIR)/etc/ipkg.conf
 	rm -f $(STAGING_DIR)/usr/bin/ipkg*
 	rm -rf $(PKG_BUILD_DIR)
+endef
 
-
+$(eval $(call HostBuild))
diff --git a/toolchain/ipkg-utils/patches/100-build_clean.patch b/toolchain/ipkg-utils/patches/100-build_clean.patch
new file mode 100644
index 000000000..4cff731d5
--- /dev/null
+++ b/toolchain/ipkg-utils/patches/100-build_clean.patch
@@ -0,0 +1,36 @@
+diff -ruN ipkg-utils-1.7-old/ipkg-build ipkg-utils-1.7-new/ipkg-build
+--- ipkg-utils-1.7-old/ipkg-build	2004-08-24 04:56:12.000000000 +0200
++++ ipkg-utils-1.7-new/ipkg-build	2004-08-24 04:55:49.000000000 +0200
+@@ -47,6 +47,19 @@
+ 
+ 	PKG_ERROR=0
+ 
++	cvs_dirs=`find . -name 'CVS'`
++	if [ -n "$cvs_dirs" ]; then
++	    if [ "$noclean" = "1" ]; then
++		echo "*** Warning: The following CVS directories where found.
++You probably want to remove them: " >&2
++		ls -ld $cvs_dirs
++		echo >&2
++	    else
++		echo "*** Removing the following files: $cvs_dirs"
++		rm -rf "$cvs_dirs"
++	    fi
++	fi
++
+ 	tilde_files=`find . -name '*~'`
+ 	if [ -n "$tilde_files" ]; then
+ 	    if [ "$noclean" = "1" ]; then
+@@ -134,8 +147,12 @@
+ 
+ 	for script in $CONTROL/preinst $CONTROL/postinst $CONTROL/prerm $CONTROL/postrm; do
+ 		if [ -f $script -a ! -x $script ]; then
++		    if [ "$noclean" = "1" ]; then
+ 			echo "*** Error: package script $script is not executable" >&2
+ 			PKG_ERROR=1
++		    else
++			chmod a+x $script
++		    fi
+ 		fi
+ 	done
+ 
diff --git a/toolchain/ipkg-utils/patches/110-buildpackage.patch b/toolchain/ipkg-utils/patches/110-buildpackage.patch
new file mode 100644
index 000000000..d0a30489a
--- /dev/null
+++ b/toolchain/ipkg-utils/patches/110-buildpackage.patch
@@ -0,0 +1,24 @@
+diff -ruN ipkg-utils-1.7-old/ipkg-buildpackage ipkg-utils-1.7-new/ipkg-buildpackage
+--- ipkg-utils-1.7-old/ipkg-buildpackage	2001-07-26 17:36:36.000000000 +0200
++++ ipkg-utils-1.7-new/ipkg-buildpackage	2004-07-05 19:46:24.000000000 +0200
+@@ -30,8 +30,9 @@
+ 
+ set -e
+ 
+-#SCRIPTDIR=/usr/local/bin
+-SCRIPTDIR=/other/kurth/ipaq-dev/familiar/dist/ipkg/util/
++SCRIPTDIR=/usr/local/bin
++
++IPKG_BUILD_OPTIONS=$*
+ 
+ SCRIPTNAME=`basename $0`
+ 
+@@ -212,7 +213,7 @@
+ # build the ipk package
+ owd=`pwd`
+ cd ..
+-ipkg-build /tmp/${pkg} || exit 1
++ipkg-build $IPKG_BUILD_OPTIONS /tmp/${pkg} || exit 1
+ 
+ rm -rf /tmp/${pkg}
+ 
diff --git a/toolchain/ipkg-utils/patches/120-build_tar.patch b/toolchain/ipkg-utils/patches/120-build_tar.patch
new file mode 100644
index 000000000..441d3adf0
--- /dev/null
+++ b/toolchain/ipkg-utils/patches/120-build_tar.patch
@@ -0,0 +1,16 @@
+This patch from aorlinsk fixes an issue with order in options passed to tar
+
+  http://openwrt.org/forum/viewtopic.php?pid=8332#p8332
+
+
+--- ipkg-utils-1.7/ipkg-build.orig	2005-06-14 23:48:36.000000000 +0200
++++ ipkg-utils-1.7/ipkg-build	2005-06-14 23:50:03.000000000 +0200
+@@ -243,7 +243,7 @@
+ mkdir $tmp_dir
+ 
+ echo $CONTROL > $tmp_dir/tarX
+-( cd $pkg_dir && tar $ogargs -czf $tmp_dir/data.tar.gz . -X $tmp_dir/tarX )
++( cd $pkg_dir && tar $ogargs -X $tmp_dir/tarX -czf $tmp_dir/data.tar.gz . )
+ ( cd $pkg_dir/$CONTROL && tar $ogargs -czf $tmp_dir/control.tar.gz . )
+ rm $tmp_dir/tarX
+ 
-- 
cgit v1.2.3