On Tue, Apr 26, 2011 at 10:29:18AM -0500, George McCollister wrote:
> I'm making changes to the patches but I'm not going to re-post any
> of them until I've had a chance to go through and reply to comments
> on all of the patches and make necessary changes.
>
> Comments below.
>
> On 04/26/2011 06:08 AM, Michael Olbrich wrote:
> >On Mon, Apr 25, 2011 at 01:14:17PM -0500, George McCollister wrote:
> >>Added option to build images from the ipkg repository.
> >Hmmm, so with this you want tun run "ptxdist images" and create an image
> >from ipks without building everything, right? Isn't there a dependency to
> >'world' in there somewhere?
> The idea is not to avoid building everything.
[...]
Thanks for the explanation. The desired workflow is much clearer now.
> >mkl: I think the dependencies are broken here:
> >images: world<images_targets>
> >
> ><images_target>: $(STATEDIR)/image_working_dir
> >
> >Shouldn't image_working_dir depend on 'world' right now (and not, if this
> >stuff is enabled)?
> >
> >Other comments below.
> >
> >>Signed-off-by: George McCollister<george.mccollis...@gmail.com>
> >>---
> >> platforms/image_ipkg.in | 12 ++++++++
> >> rules/post/ptxd_make_image_prepare_work_dir.make | 6 +++-
> >> rules/post/ptxd_make_world_common.make | 1 +
> >> scripts/ipkg-push | 30
> >> ++++++++++++++++-----
> >> scripts/lib/ptxd_make_image_common.sh | 13 ++++++++-
> >> 5 files changed, 52 insertions(+), 10 deletions(-)
[...]
> >>diff --git a/scripts/lib/ptxd_make_image_common.sh
> >>b/scripts/lib/ptxd_make_image_common.sh
> >>index 035afb7..3646bf4 100644
> >>--- a/scripts/lib/ptxd_make_image_common.sh
> >>+++ b/scripts/lib/ptxd_make_image_common.sh
> >>@@ -38,7 +38,11 @@ ptxd_get_ipkg_files() {
> >> # take first hit
> >> if ptxd_get_path "${ipkg_files[@]}"; then
> >> ptxd_reply_ipkg_files[${#ptxd_reply_ipkg_files[@]}]="${ptxd_reply}"
> >>-
> >>ptxd_reply_perm_files[${#ptxd_reply_perm_files[@]}]="${ptxd_reply%/*/*}/state/${1}.perms"
> >>+ if [ -z "$(ptxd_get_ptxconf
> >>PTXCONF_IMAGE_INSTALL_FROM_IPKG_REPOSITORY)" ]; then
> >>+
> >>ptxd_reply_perm_files[${#ptxd_reply_perm_files[@]}]="${ptxd_reply%/*/*}/state/${1}.perms"
> >fix indent please.
> Indents in this function are a somewhat confusing combination of
> spaces and tabs. I'm still trying to figure out how to fix it so it
> matches the rest of the function.
Ah, yes. In scripts/lib indent works like this:
- each indent level is 4 spaces.
- any 8 spaces are replaced with a tab.
So: level 1 == 2 spaces, level 2 == 1 tab, level 3 == 1 tab + 4 spaces, etc.
I think this is some weird emacs mode, but as a vi user I'm not sure.
> >>+ else
> >>+
> >>ptxd_reply_perm_files[${#ptxd_reply_perm_files[@]}]="${ptxd_reply%.ipk}.perms"
> >>+ fi
> >Hmmm, I don't realy like this. Can't we create a state directory in the
> >right place for this to work without the 'if'?
> We could create a state sub directory in the repository directory
> but it still wouldn't work as is because the original code looks up
> one directory then into state and it wouldn't make sense to have a
> state directory in $REPODIR/$PROJECT/dists. We also need to have the
> perms files in the pool in case the version of the .ipk in the pool
> is reused in a later dist version. It seems to me like a better idea
> to keep the perms files in the pool along with the ipk of the same
> version then the symlinks to correct versions of the ipk and perms
> are placed in $REPODIR/$PROJECT/dists/$DIST/. If you still think the
> perms files should be in a different location where do you think
> they should be?
I see your point. Keep it like it is for now. Maybe I can come up with a
better solution later.
Michael
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
--
ptxdist mailing list
ptxdist@pengutronix.de
