diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-07-16 15:29:26 +0200 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-07-16 15:29:26 +0200 |
| commit | 1520848b7812e6daf8f78cf084fbb14f57802082 (patch) | |
| tree | db5f006c0d84ecf42a2173aa26a5ea2032038a2c /generic/etc | |
| parent | 97cdd287d8ed06c3154340f04f43d491df669a13 (diff) | |
| parent | 219728562e61ab5cf73bb6b5499fb68a36b273d2 (diff) | |
| download | ptxdist-1520848b7812e6daf8f78cf084fbb14f57802082.tar.gz ptxdist-1520848b7812e6daf8f78cf084fbb14f57802082.tar.xz | |
Merge branch 'next/image_cleanups' of git://git.pengutronix.de/git/mkl/ptxdist
Conflicts:
scripts/lib/ptxd_make_install.sh
This is due to "360f73777af1661d85ae0aa2434b6acde22da9fa" Fix
dependencies to files in projectroot.
The modifications to ptxd_make_install_init have been moved to
ptxd_make_xpkg_prepare.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'generic/etc')
| -rw-r--r-- | generic/etc/ipkg.conf | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/generic/etc/ipkg.conf b/generic/etc/ipkg.conf index d38d9bd80..991616a66 100644 --- a/generic/etc/ipkg.conf +++ b/generic/etc/ipkg.conf @@ -5,9 +5,8 @@ # src: <url-of-ipkg-repository> @SRC@ -dest root / - -arch @ARCH@ 10 -arch all 1 -arch noarch 1 +dest root / +arch @ARCH@ 10 +arch all 1 +arch noarch 1 |