diff options
| author | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2006-12-31 13:25:04 +0000 |
|---|---|---|
| committer | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2006-12-31 13:25:04 +0000 |
| commit | de9b02eb7296b392d3b9f52aa0f30c56fe6a6299 (patch) | |
| tree | 179895849d289c7a5cf08a55ff21afa74985a54d /packages/meta/jlime-opie.bb | |
| parent | 51623a4e90bb2cfe64fee34ab42e9e65647d61a5 (diff) | |
| parent | f907777709b20d8d73e3587026296a6616262229 (diff) | |
merge of '44da8efcf85940e173cd83b2ea95fa7ae8782bb5'
and 'ca1dbbdd8a20d72c6e8277b66f14e016ff7b8cc2'
Diffstat (limited to 'packages/meta/jlime-opie.bb')
| -rw-r--r-- | packages/meta/jlime-opie.bb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/packages/meta/jlime-opie.bb b/packages/meta/jlime-opie.bb index 0d81066778..679dacdf2d 100644 --- a/packages/meta/jlime-opie.bb +++ b/packages/meta/jlime-opie.bb @@ -30,11 +30,11 @@ merge_feeds() { echo "[${IMAGE_ROOTFS}/etc/ipkg.conf] is missing!" exit 1 fi - + # comment out existing feed-sources inserted by ipkg-collateral cat ${IMAGE_ROOTFS}/etc/ipkg.conf | sed "s/^src\ /#src\ /" > ${IMAGE_ROOTFS}/etc/ipkg.conf_ rm ${IMAGE_ROOTFS}/etc/ipkg.conf && mv ${IMAGE_ROOTFS}/etc/ipkg.conf_ ${IMAGE_ROOTFS}/etc/ipkg.conf - + # extract, then delete destinations cat ${IMAGE_ROOTFS}/etc/ipkg.conf | egrep "^dest\ " > ${IMAGE_ROOTFS}/etc/ipkg.conf.dest cat ${IMAGE_ROOTFS}/etc/ipkg.conf | egrep -v "^dest\ " > ${IMAGE_ROOTFS}/etc/ipkg.conf_ @@ -46,19 +46,19 @@ merge_feeds() { # strip leading and trailing spaces/tabs, then split into name and uri line_clean="`echo "$line"|sed 's/^[ \t]*//;s/[ \t]*$//'`" feed_name="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\1/p'`" - feed_uri="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\2/p'`" + feed_uri="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\2/p'`" # insert new feed-sources echo "src/gz $feed_name $feed_uri" >> ${IMAGE_ROOTFS}/etc/ipkg.conf done - + # remove temporary files and rebuild ipkg.conf echo "" >> ${IMAGE_ROOTFS}/etc/ipkg.conf cat ${IMAGE_ROOTFS}/etc/ipkg.conf.dest >> ${IMAGE_ROOTFS}/etc/ipkg.conf rm ${IMAGE_ROOTFS}/etc/ipkg.conf.dest - + # remove -feed.conf files which are no longer needed - cd ${IMAGE_ROOTFS}/etc/ipkg/ && rm -- *-feed.conf + cd ${IMAGE_ROOTFS}/etc/ipkg/ && rm -- *-feed.conf fi } |