From: Matthias Hentges <oe@hentges.net>
Date: Sun, 3 Oct 2004 13:19:26 +0000 (+0000)
Subject: Merge bk://openembedded@openembedded.bkbits.net/packages
X-Git-Tag: Release-2010-05/1~16759
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0fdb97981bd1bb717d77bb8064460276ef411449;p=openembedded.git

Merge bk://openembedded@openembedded.bkbits.net/packages
into mhcln01.hentges.local:/home/mhentges/OpenEmbedded/packages

2004/10/03 15:19:17+02:00 local!CoreDump
Remove borked destination for openzaurus in ipkg-collateral

BKrev: 415ffc5eq6Nx1wfk1qQEBMqh7nLmzw
---

diff --git a/meta/opie-image.oe b/meta/opie-image.oe
index dc01065ae6..00e58aad13 100644
--- a/meta/opie-image.oe
+++ b/meta/opie-image.oe
@@ -65,7 +65,7 @@ merge_feeds() {
 #IMAGE_POSTPROCESS_COMMAND = "zap_root_password"
 
 # merge feed-sources into ipkg.conf
-#IMAGE_PREPROCESS_COMMAND = "merge_feeds"
+IMAGE_PREPROCESS_COMMAND = "merge_feeds"
 
 inherit image_ipk