diff options
| -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 | ||||
| -rw-r--r-- | rules/host-ipkg-utils.make | 29 |
4 files changed, 36 insertions, 51 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 - diff --git a/rules/host-ipkg-utils.make b/rules/host-ipkg-utils.make index bd57142d2..bc70ff919 100644 --- a/rules/host-ipkg-utils.make +++ b/rules/host-ipkg-utils.make @@ -1,5 +1,5 @@ # -*-makefile-*- -# $Id: template 2224 2005-01-20 15:19:18Z rsc $ +# $Id$ # # Copyright (C) 2005 by Robert Schwebel # @@ -17,14 +17,13 @@ HOST_PACKAGES-$(PTXCONF_HOST_IPKG_UTILS) += host-ipkg-utils # # Paths and names # -HOST_IPKG_UTILS_VERSION := 1.7 +HOST_IPKG_UTILS_VERSION := 050831 HOST_IPKG_UTILS := ipkg-utils-$(HOST_IPKG_UTILS_VERSION) HOST_IPKG_UTILS_SUFFIX := tar.gz HOST_IPKG_UTILS_URL := http://www.handhelds.org/download/packages/ipkg-utils/$(HOST_IPKG_UTILS).$(HOST_IPKG_UTILS_SUFFIX) HOST_IPKG_UTILS_SOURCE := $(SRCDIR)/$(HOST_IPKG_UTILS).$(HOST_IPKG_UTILS_SUFFIX) HOST_IPKG_UTILS_DIR := $(HOST_BUILDDIR)/$(HOST_IPKG_UTILS) - # ---------------------------------------------------------------------------- # Get # ---------------------------------------------------------------------------- @@ -50,10 +49,6 @@ $(STATEDIR)/host-ipkg-utils.extract: $(host-ipkg-utils_extract_deps_default) @$(call clean, $(HOST_IPKG_UTILS_DIR)) @$(call extract, HOST_IPKG_UTILS, $(HOST_BUILDDIR)) @$(call patchin, HOST_IPKG_UTILS, $(HOST_IPKG_UTILS_DIR)) - perl -i -p -e "s,^PREFIX=(.*),PREFIX=$(PTXCONF_HOST_PREFIX)/usr,g" \ - $(HOST_IPKG_UTILS_DIR)/Makefile - perl -i -p -e "s,^ python setup.py install, python setup.py install --prefix=$(PTXCONF_HOST_PREFIX)/usr,g" \ - $(HOST_IPKG_UTILS_DIR)/Makefile @$(call touch, $@) # ---------------------------------------------------------------------------- @@ -62,7 +57,9 @@ $(STATEDIR)/host-ipkg-utils.extract: $(host-ipkg-utils_extract_deps_default) host-ipkg-utils_prepare: $(STATEDIR)/host-ipkg-utils.prepare -HOST_IPKG_UTILS_PATH := PATH=$(CROSS_PATH) +HOST_IPKG_UTILS_PATH := PATH=$(HOST_PATH) +HOST_IPKG_UTILS_ENV := $(HOST_ENV) +HOST_IPKG_UTILS_MAKEVARS := PREFIX=$(PTX_PREFIX_HOST) $(STATEDIR)/host-ipkg-utils.prepare: $(host-ipkg-utils_prepare_deps_default) @$(call targetinfo, $@) @@ -76,7 +73,7 @@ host-ipkg-utils_compile: $(STATEDIR)/host-ipkg-utils.compile $(STATEDIR)/host-ipkg-utils.compile: $(host-ipkg-utils_compile_deps_default) @$(call targetinfo, $@) - cd $(HOST_IPKG_UTILS_DIR) && $(HOST_IPKG_UTILS_ENV) $(HOST_IPKG_UTILS_PATH) make + cd $(HOST_IPKG_UTILS_DIR) && $(HOST_IPKG_UTILS_PATH) $(MAKE) $(PARALLELMFLAGS) @$(call touch, $@) # ---------------------------------------------------------------------------- @@ -87,21 +84,7 @@ host-ipkg-utils_install: $(STATEDIR)/host-ipkg-utils.install $(STATEDIR)/host-ipkg-utils.install: $(host-ipkg-utils_install_deps_default) @$(call targetinfo, $@) - mkdir -p $(PTXCONF_HOST_PREFIX)/usr/bin - # ipkg.py is forgotten by MAKE_INSTALL, so we copy it manually - # FIXME: this should probably be fixed upstream @$(call install, HOST_IPKG_UTILS,,h) - cp -f $(HOST_IPKG_UTILS_DIR)/ipkg.py $(PTXCONF_HOST_PREFIX)/usr/bin/ - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -host-ipkg-utils_targetinstall: $(STATEDIR)/host-ipkg-utils.targetinstall - -$(STATEDIR)/host-ipkg-utils.targetinstall: $(host-ipkg-utils_targetinstall_deps_default) - @$(call targetinfo, $@) @$(call touch, $@) # ---------------------------------------------------------------------------- |