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 dc01065..00e58aa 100644 (file)
--- 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