diff options
| author | Rene Wagner <rw@handhelds.org> | 2006-07-27 23:43:35 +0200 |
|---|---|---|
| committer | Rene Wagner <rw@handhelds.org> | 2006-07-27 23:43:35 +0200 |
| commit | 438f43ca2a57669c7ddc8d955e74170668cc7f37 (patch) | |
| tree | d822d0c9cd25c8db55799c9c5cc94036309e463d | |
| parent | c22a5de5784a1bb66caf54d6828dd44b705a211e (diff) | |
image_ipk.bbclass: make sure feed names are unique.
Signed-off-by: Rene Wagner <rw@handhelds.org>
| -rw-r--r-- | org.handhelds.familiar/classes/image_ipk.bbclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/org.handhelds.familiar/classes/image_ipk.bbclass b/org.handhelds.familiar/classes/image_ipk.bbclass index bb99c12..206210f 100644 --- a/org.handhelds.familiar/classes/image_ipk.bbclass +++ b/org.handhelds.familiar/classes/image_ipk.bbclass @@ -73,8 +73,8 @@ python __anonymous() { for f in feeds: desc = bb.data.getVar("DISTRO_FEEDS_FEED_DESC_%s" % f, d, 1) cmds += "# %s - %s\n" % (f, desc) - cmds += "src/gz %s %s/%s/%s\n" % (f, pfx, c, f) - cmds += "src/gz %s-%s %s/%s/%s/machine/%s\n\n" % (f, m, pfx, c, f, m) + cmds += "src/gz %s-%s %s/%s/%s\n" % (c, f, pfx, c, f) + cmds += "src/gz %s-%s-%s %s/%s/%s/machine/%s\n\n" % (c, f, m, pfx, c, f, m) # locale subfeeds @@ -84,7 +84,7 @@ python __anonymous() { cmds += "# To point ipkg at packages for your locale, replace <my_locale> with the\n" cmds += "# locale code in the template below and remove the leading '#' characters.\n\n" for f in feeds: - cmds += "# src/gz %s-locale-<my_locale> %s/%s/%s/locale/<my_locale>\n" % (f, pfx, c, f) + cmds += "# src/gz %s-%s-locale-<my_locale> %s/%s/%s/locale/<my_locale>\n" % (c, f, pfx, c, f) # add feed for each IMAGE_LINGUA linguas = bb.data.getVar("IMAGE_LINGUAS", d, 1).split() @@ -92,7 +92,7 @@ python __anonymous() { fst = l.split('-')[0] cmds += "\n# %s locale feeds\n" % fst for f in feeds: - cmds += "src/gz %s-locale-%s %s/%s/%s/locale/%s\n" % (f, fst, pfx, c, f, fst) + cmds += "src/gz %s-%s-locale-%s %s/%s/%s/locale/%s\n" % (c, f, fst, pfx, c, f, fst) cmds += "\nEOF\n" |