[Armadeus-commitlog] SF.net SVN: armadeus: [617] trunk/buildroot/toolchain
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] SF.net SVN: armadeus: [617] trunk/buildroot/toolchain
|
From: <ar...@us...> - 2007-08-09 16:30:21
|
Revision: 617
http://armadeus.svn.sourceforge.net/armadeus/?rev=617&view=rev
Author: artemys
Date: 2007-08-09 09:30:21 -0700 (Thu, 09 Aug 2007)
Log Message:
-----------
[BUILDROOT] Add ipkg-utils building for the Host
Added Paths:
-----------
trunk/buildroot/toolchain/ipkg-utils/
trunk/buildroot/toolchain/ipkg-utils/1.7/
trunk/buildroot/toolchain/ipkg-utils/1.7/ipkg-utils-1.7-ipkg_build_clean.patch
trunk/buildroot/toolchain/ipkg-utils/1.7/ipkg-utils-1.7-ipkg_build_tar.patch
trunk/buildroot/toolchain/ipkg-utils/1.7/ipkg-utils-1.7-ipkg_buildpackage.patch
trunk/buildroot/toolchain/ipkg-utils/1.7/ipkg-utils-1.7-ipkg_tar_wildcards.patch
trunk/buildroot/toolchain/ipkg-utils/ipkg-utils.mk
Added: trunk/buildroot/toolchain/ipkg-utils/1.7/ipkg-utils-1.7-ipkg_build_clean.patch
===================================================================
--- trunk/buildroot/toolchain/ipkg-utils/1.7/ipkg-utils-1.7-ipkg_build_clean.patch (rev 0)
+++ trunk/buildroot/toolchain/ipkg-utils/1.7/ipkg-utils-1.7-ipkg_build_clean.patch 2007-08-09 16:30:21 UTC (rev 617)
@@ -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
+
Added: trunk/buildroot/toolchain/ipkg-utils/1.7/ipkg-utils-1.7-ipkg_build_tar.patch
===================================================================
--- trunk/buildroot/toolchain/ipkg-utils/1.7/ipkg-utils-1.7-ipkg_build_tar.patch (rev 0)
+++ trunk/buildroot/toolchain/ipkg-utils/1.7/ipkg-utils-1.7-ipkg_build_tar.patch 2007-08-09 16:30:21 UTC (rev 617)
@@ -0,0 +1,12 @@
+diff -ruN ipkg-utils-1.7-old/ipkg-build ipkg-utils-1.7-new/ipkg-build
+--- ipkg-utils-1.7-old/ipkg-build 2005-07-13 04:36:16.727438000 -0400
++++ ipkg-utils-1.7-new/ipkg-build 2005-07-13 05:27:49.385282832 -0400
+@@ -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
+
Added: trunk/buildroot/toolchain/ipkg-utils/1.7/ipkg-utils-1.7-ipkg_buildpackage.patch
===================================================================
--- trunk/buildroot/toolchain/ipkg-utils/1.7/ipkg-utils-1.7-ipkg_buildpackage.patch (rev 0)
+++ trunk/buildroot/toolchain/ipkg-utils/1.7/ipkg-utils-1.7-ipkg_buildpackage.patch 2007-08-09 16:30:21 UTC (rev 617)
@@ -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}
+
Added: trunk/buildroot/toolchain/ipkg-utils/1.7/ipkg-utils-1.7-ipkg_tar_wildcards.patch
===================================================================
--- trunk/buildroot/toolchain/ipkg-utils/1.7/ipkg-utils-1.7-ipkg_tar_wildcards.patch (rev 0)
+++ trunk/buildroot/toolchain/ipkg-utils/1.7/ipkg-utils-1.7-ipkg_tar_wildcards.patch 2007-08-09 16:30:21 UTC (rev 617)
@@ -0,0 +1,23 @@
+--- ipkg-utils-1.7/ipkg.py.orig 2006-06-29 14:16:00.000000000 +0200
++++ ipkg-utils-1.7/ipkg.py 2006-06-29 14:36:01.000000000 +0200
+@@ -93,9 +93,9 @@
+ self.filename = os.path.basename(fn)
+ ## sys.stderr.write(" extracting control.tar.gz from %s\n"% (fn,))
+ if self.isdeb:
+- control = os.popen("ar p "+fn+" control.tar.gz | tar xfzO - '*control'","r")
++ control = os.popen("ar p "+fn+" control.tar.gz | tar xzO --wildcards -f - '*control'","r")
+ else:
+- control = os.popen("tar xfzO "+fn+" '*control.tar.gz' | tar xfzO - '*control'","r")
++ control = os.popen("tar xzO --wildcards -f "+fn+" '*control.tar.gz' | tar xzO --wildcards -f - '*control'","r")
+ line = control.readline()
+ while 1:
+ if not line: break
+@@ -122,7 +122,7 @@
+ if self.isdeb:
+ data = os.popen("ar p "+fn+" data.tar.gz | tar tfz -","r")
+ else:
+- data = os.popen("tar xfzO "+fn+" '*data.tar.gz' | tar tfz -","r")
++ data = os.popen("tar xzO --wildcards -f "+fn+" '*data.tar.gz' | tar tfz -","r")
+ while 1:
+ line = data.readline()
+ if not line: break
Added: trunk/buildroot/toolchain/ipkg-utils/ipkg-utils.mk
===================================================================
--- trunk/buildroot/toolchain/ipkg-utils/ipkg-utils.mk (rev 0)
+++ trunk/buildroot/toolchain/ipkg-utils/ipkg-utils.mk 2007-08-09 16:30:21 UTC (rev 617)
@@ -0,0 +1,53 @@
+# ipkg-utils
+#
+# http://handhelds.org/packages/ipkg-utils
+#
+
+IPKG-UTILS_NAME := ipkg-utils
+IPKG-UTILS_VERSION := 1.7
+
+IPKG-UTILS_SOURCE_SITE := http://handhelds.org/packages/ipkg-utils/
+IPKG-UTILS_SOURCE_FILE := $(IPKG-UTILS_NAME)-$(IPKG-UTILS_VERSION).tar.gz
+IPKG-UTILS_SOURCE_CAT := $(ZCAT)
+IPKG-UTILS_SOURCE_DIR := $(IPKG-UTILS_NAME)-$(IPKG-UTILS_VERSION)
+
+IPKG-UTILS_BUILD_DIR := $(BUILD_DIR)/$(IPKG-UTILS_SOURCE_DIR)
+
+
+$(DL_DIR)/$(IPKG-UTILS_SOURCE_FILE):
+ $(WGET) -P $(DL_DIR) $(IPKG-UTILS_SOURCE_SITE)/$(IPKG-UTILS_SOURCE_FILE)
+
+$(IPKG-UTILS_BUILD_DIR)/.unpacked: $(DL_DIR)/$(IPKG-UTILS_SOURCE_FILE)
+ $(IPKG-UTILS_SOURCE_CAT) $(DL_DIR)/$(IPKG-UTILS_SOURCE_FILE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ touch $@
+
+$(IPKG-UTILS_BUILD_DIR)/.patched: $(IPKG-UTILS_BUILD_DIR)/.unpacked
+ toolchain/patch-kernel.sh $(IPKG-UTILS_BUILD_DIR) toolchain/$(IPKG-UTILS_NAME)/$(IPKG-UTILS_VERSION) \*.patch
+ touch $@
+
+$(STAGING_DIR)/usr/bin/ipkg-build: $(IPKG-UTILS_BUILD_DIR)/.patched
+ mkdir -p $(STAGING_DIR)/etc
+ echo "dest root /" > $(STAGING_DIR)/etc/ipkg.conf
+ echo "option offline_root $(TARGET_DIR)" >> $(STAGING_DIR)/etc/ipkg.conf
+ mkdir -p $(STAGING_DIR)/usr/bin
+ install -m0755 $(IPKG-UTILS_BUILD_DIR)/ipkg-build $(STAGING_DIR)/usr/bin
+ install -m0755 $(IPKG-UTILS_BUILD_DIR)/ipkg-buildpackage $(STAGING_DIR)/usr/bin
+ install -m0755 $(IPKG-UTILS_BUILD_DIR)/ipkg-make-index $(STAGING_DIR)/usr/bin
+ install -m0755 $(IPKG-UTILS_BUILD_DIR)/ipkg.py $(STAGING_DIR)/usr/bin
+
+$(IPKG-UTILS_NAME)-source: $(DL_DIR)/$(IPKG-UTILS_SOURCE_FILE)
+
+$(IPKG-UTILS_NAME): $(STAGING_DIR)/usr/bin/ipkg-build
+
+$(IPKG-UTILS_NAME)-clean:
+ rm -f $(STAGING_DIR)/etc/ipkg.conf
+ rm -f $(STAGING_DIR)/usr/bin/ipkg*
+ rm -rf $(IPKG-UTILS_BUILD_DIR)
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+TARGETS+=$(IPKG-UTILS_NAME)
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
