diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2007-01-02 11:45:36 +0000 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2007-01-02 11:45:36 +0000 |
| commit | 43da0d74cbdcf7df65d2406242a7d897819cb596 (patch) | |
| tree | 092361ec6b16dd5cccfb7a77c83121f783bd5234 /patches | |
| parent | df2c9345553f2523563a10e18355616025be1020 (diff) | |
| download | ptxdist-43da0d74cbdcf7df65d2406242a7d897819cb596.tar.gz ptxdist-43da0d74cbdcf7df65d2406242a7d897819cb596.tar.xz | |
* ipkg-utils: updated from 1.7 to 050831, which is a newer
version. Merged from branch/ptxdist-trunk-mkl by rsc.
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@6593 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/ipkg-utils-050831/generic/Makefile-prefix.diff | 29 | ||||
| -rw-r--r-- | patches/ipkg-utils-050831/generic/series | 1 | ||||
| -rw-r--r-- | patches/ipkg-utils-1.7/generic/ipkg-utils-1.7-tarX.diff | 28 |
3 files changed, 30 insertions, 28 deletions
diff --git a/patches/ipkg-utils-050831/generic/Makefile-prefix.diff b/patches/ipkg-utils-050831/generic/Makefile-prefix.diff new file mode 100644 index 000000000..75369756f --- /dev/null +++ b/patches/ipkg-utils-050831/generic/Makefile-prefix.diff @@ -0,0 +1,29 @@ +# +# Submitted-By: Marc Kleine-Budde, 2006-12-25 +# Committed-By: Marc Kleine-Budde +# +# Error: +# +# python install is called w/o giving a prefix +# +# Description: +# +# This patch add --prefix to python install +# +# State: +# +# should be send upstream +# +Index: ipkg-utils-050831/Makefile +=================================================================== +--- ipkg-utils-050831.orig/Makefile ++++ ipkg-utils-050831/Makefile +@@ -12,7 +12,7 @@ ipkg-compare-versions: ipkg-compare-vers + + install: ${UTILS} + cp ${UTILS} $(PREFIX)/bin +- python setup.py install ++ python setup.py install --prefix=$(PREFIX) + chmod agu+rx ipkg-make-index + cp -f ipkg-make-index $(PREFIX)/bin + diff --git a/patches/ipkg-utils-050831/generic/series b/patches/ipkg-utils-050831/generic/series new file mode 100644 index 000000000..1c0790d5d --- /dev/null +++ b/patches/ipkg-utils-050831/generic/series @@ -0,0 +1 @@ +Makefile-prefix.diff diff --git a/patches/ipkg-utils-1.7/generic/ipkg-utils-1.7-tarX.diff b/patches/ipkg-utils-1.7/generic/ipkg-utils-1.7-tarX.diff deleted file mode 100644 index a44bf9cfc..000000000 --- a/patches/ipkg-utils-1.7/generic/ipkg-utils-1.7-tarX.diff +++ /dev/null @@ -1,28 +0,0 @@ -# -# Submitted-By: Robert Schwebel, 2005-12-14 -# Committed-By: Robert Schwebel -# -# Error: -# -# Sometimes CONTROL files are being archived by accident; the -X -# argument needs to come before the file argument. -# -# Description: -# -# State: -# -# undefined -# - -diff -urN ipkg-utils-1.7/ipkg-build ipkg-utils-1.7-ptx/ipkg-build ---- ipkg-utils-1.7/ipkg-build 2004-04-24 11:43:51.000000000 +0200 -+++ ipkg-utils-1.7-ptx/ipkg-build 2005-12-14 23:30:52.000000000 +0100 -@@ -226,7 +226,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 - |