diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2015-06-19 11:07:21 +0200 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2015-06-19 11:58:03 +0200 |
| commit | 6a45ee9652c815ff473e242b41b9ad3cd567b1fd (patch) | |
| tree | f6d1bb7bf24b1d3ffb3a7b5718cca63204cd1a01 | |
| parent | e39285622d144e8755d1f27d5b1f3dfbcfd89ce7 (diff) | |
| download | ptxdist-6a45ee9652c815ff473e242b41b9ad3cd567b1fd.tar.gz ptxdist-6a45ee9652c815ff473e242b41b9ad3cd567b1fd.tar.xz | |
ipkg: fix migration from generic -> projectroot
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
| -rw-r--r-- | projectroot/usr/bin/ipkg_log_wrapper (renamed from projectroot/bin/ipkg_log_wrapper) | 0 | ||||
| -rw-r--r-- | rules/host-ipkg.in | 2 | ||||
| -rw-r--r-- | rules/host-opkg.in | 2 | ||||
| -rw-r--r-- | rules/ipkg.make | 4 |
4 files changed, 3 insertions, 5 deletions
diff --git a/projectroot/bin/ipkg_log_wrapper b/projectroot/usr/bin/ipkg_log_wrapper index aac142fca..aac142fca 100644 --- a/projectroot/bin/ipkg_log_wrapper +++ b/projectroot/usr/bin/ipkg_log_wrapper diff --git a/rules/host-ipkg.in b/rules/host-ipkg.in index c940daaeb..c7158d6e6 100644 --- a/rules/host-ipkg.in +++ b/rules/host-ipkg.in @@ -8,5 +8,5 @@ config HOST_IPKG ipkg is used on the development host to install packets into some directory. Example: - ipkg-cl -o . --force-depends -f ../generic/etc/ipkg.conf install foo.ipk + ipkg-cl -o . --force-depends -f ../projectroot/etc/ipkg.conf install foo.ipk diff --git a/rules/host-opkg.in b/rules/host-opkg.in index 2bb2140df..a2b05be65 100644 --- a/rules/host-opkg.in +++ b/rules/host-opkg.in @@ -8,5 +8,5 @@ config HOST_OPKG opkg is used on the development host to install packets into some directory. Example: - opkg-cl -o . --force-depends -f ../generic/etc/opkg.conf install foo.ipk + opkg-cl -o . --force-depends -f ../projectroot/etc/opkg.conf install foo.ipk diff --git a/rules/ipkg.make b/rules/ipkg.make index 67d595941..2cf404fc4 100644 --- a/rules/ipkg.make +++ b/rules/ipkg.make @@ -66,9 +66,7 @@ $(STATEDIR)/ipkg.targetinstall: ifdef PTXCONF_IPKG_LOG_WRAPPER @$(call install_copy, ipkg, 0, 0, 0755, -, \ /usr/bin/ipkg-cl) - @$(call install_copy, ipkg, 0, 0, 0755, \ - $(PTXDIST_TOPDIR)/generic/bin/ipkg_log_wrapper, \ - /usr/bin/ipkg, n) + @$(call install_alternative, ipkg, 0, 0, 0755, /usr/bin/ipkg_log_wrapper) else @$(call install_copy, ipkg, 0, 0, 0755, \ $(IPKG_PKGDIR)/usr/bin/ipkg-cl, \ |