diff options
Diffstat (limited to 'packages/meta')
| -rw-r--r-- | packages/meta/jlime-opie.bb | 12 | ||||
| -rw-r--r-- | packages/meta/meta-sdk.bb | 2 | ||||
| -rw-r--r-- | packages/meta/meta-toolchain.bb | 2 |
3 files changed, 8 insertions, 8 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 } diff --git a/packages/meta/meta-sdk.bb b/packages/meta/meta-sdk.bb index 4894e6659c..7bf8606418 100644 --- a/packages/meta/meta-sdk.bb +++ b/packages/meta/meta-sdk.bb @@ -51,7 +51,7 @@ EOF rm -r ${SDK_OUTPUT} mkdir -p ${SDK_OUTPUT} - + ${IPKG_HOST} update ${IPKG_HOST} -nodeps install ${HOST_INSTALL} diff --git a/packages/meta/meta-toolchain.bb b/packages/meta/meta-toolchain.bb index 3f51644c68..7995ac3cb8 100644 --- a/packages/meta/meta-toolchain.bb +++ b/packages/meta/meta-toolchain.bb @@ -48,7 +48,7 @@ EOF rm -r ${SDK_OUTPUT} mkdir -p ${SDK_OUTPUT} - + ${IPKG_HOST} update ${IPKG_HOST} -nodeps install ${HOST_INSTALL} |