diff options
| author | Mike Baker <mbm@openwrt.org> | 2005-03-06 03:53:29 +0000 |
|---|---|---|
| committer | Mike Baker <mbm@openwrt.org> | 2005-03-06 03:53:29 +0000 |
| commit | 785de8084a0d6513d4250da3002a6c3acb50e2dd (patch) | |
| tree | dbb734891c63f90aa68df75bc65d4dee436c1640 /toolchain/ipkg-utils/1.7 | |
| parent | 3d904bb14a330fb72f60d4b78a40435389398655 (diff) | |
| download | upstream-785de8084a0d6513d4250da3002a6c3acb50e2dd.tar.gz upstream-785de8084a0d6513d4250da3002a6c3acb50e2dd.tar.bz2 upstream-785de8084a0d6513d4250da3002a6c3acb50e2dd.zip | |
bring up to date with nbd's br2_test20.tar.bz2
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@308 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'toolchain/ipkg-utils/1.7')
| -rw-r--r-- | toolchain/ipkg-utils/1.7/ipkg-utils-1.7-ipkg_build_clean.patch | 36 | ||||
| -rw-r--r-- | toolchain/ipkg-utils/1.7/ipkg-utils-1.7-ipkg_buildpackage.patch | 24 |
2 files changed, 60 insertions, 0 deletions
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 new file mode 100644 index 0000000000..4cff731d5b --- /dev/null +++ b/toolchain/ipkg-utils/1.7/ipkg-utils-1.7-ipkg_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/1.7/ipkg-utils-1.7-ipkg_buildpackage.patch b/toolchain/ipkg-utils/1.7/ipkg-utils-1.7-ipkg_buildpackage.patch new file mode 100644 index 0000000000..d0a30489ae --- /dev/null +++ b/toolchain/ipkg-utils/1.7/ipkg-utils-1.7-ipkg_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} + |