summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/opie-image.oe4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/opie-image.oe b/meta/opie-image.oe
index 9c10ddb9c7..dc01065ae6 100644
--- a/meta/opie-image.oe
+++ b/meta/opie-image.oe
@@ -8,7 +8,7 @@ export FEED_URIS_openzaurus = "OZ-3.5.1##http://openzaurus.org/official/unstable
export FEED_URIS_familiar = "OZ-3.5.1##http://openzaurus.org/official/unstable/3.5.1/feed/ \
OZ-Upgrades##http://openzaurus.org/official/unstable/3.5.1/upgrades/"
-PR = "r2"
+PR = "r3"
include opie-collections.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