Re: [ptxdist] [PATCH 2/7] opkg can now be used instead of ipkg
On Wed, Apr 27, 2011 at 07:54:07AM -0500, George McCollister wrote: > I've replied to all of your comments below. > > On 04/26/2011 08:26 AM, Michael Olbrich wrote: > >On Mon, Apr 25, 2011 at 01:14:18PM -0500, George McCollister wrote: > >>opkg and opkg-utils can now be used to build .ipk files and generate > >>images from them. > >Please split into multiple commits. E.g. to add a host tool, some > >generalization, and finlly the actual ipkg/opkg selection. > I've broken it down as follows. Is this alright or were you thinking > differently? > > commit 085e8316772b65771ab1c9bd30d1586e3a2977c6 > Author: George McCollister > Date: Tue Apr 26 15:13:52 2011 -0500 > > opkg can now be used instead of ipkg > > opkg and opkg-utils can now be used to build .ipk files and generate > images from them. > > Added template opkg.conf file. > > No longer default HOST_IPKG_UTILS and HOST_IPKG to yes. > HOST_PACKAGE_MANAGEMENT_IPKG will select HOST_IPKG. > HOST_IPKG will select HOST_IPKG_UTILS. > > Added package management selection to hosttools. > > Changed scripts to use the package management utilities for the > selected > package management system. > > Signed-off-by: George McCollister > > generic/etc/opkg/opkg.conf | 12 ++ Shouldn't this be installed to the target somewhere, or did I miss it. This could be a separate patch too. > rules/host-ipkg-utils.in|2 - > rules/host-ipkg.in |3 +- > rules/host-package-management.in| 22 +++ > rules/post/image_ipkg.make |9 +++-- > rules/post/ptxd_make_image_common.make |1 + > rules/post/ptxd_make_xpkg_common.make |4 ++- > rules/post/virtual.make |5 +++ > scripts/ipkg-push |5 ++- > scripts/lib/ptxd_make_image_prepare_work_dir.sh | 18 ++--- > scripts/lib/ptxd_make_ipkg_finish.sh|3 +- > scripts/lib/ptxd_make_opkg_common.sh| 21 +++ > scripts/lib/ptxd_make_opkg_finish.sh| 45 > +++ > 13 files changed, 133 insertions(+), 17 deletions(-) This is still a lot, but I don't think it can be split up. [...] > >>diff --git a/rules/host-opkg-utils.make b/rules/host-opkg-utils.make > >>new file mode 100644 > >>index 000..e831714 > >>--- /dev/null > >>+++ b/rules/host-opkg-utils.make > >>@@ -0,0 +1,44 @@ > >>+# -*-makefile-*- > >>+# > >>+# Copyright (C) 2005 by Robert Schwebel > >>+# 2010 by Marc Kleine-Budde > >>+# 2011 by George McCollister > >This is a new file. Just your (C) is fine. > Okay, I'll change it. I copied host-ipkg-utils.make to create this however. Yes, but anything still left from there is in the template too. > >>+# > >>+# See CREDITS for details about who has contributed to this project. > >>+# > >>+# For further information about the PTXdist project and license conditions > >>+# see the README file. > >>+# > >>+ > >>+# > >>+# We provide this package > >>+# > >>+HOST_PACKAGES-$(PTXCONF_HOST_OPKG_UTILS) += host-opkg-utils > >>+ > >>+# > >>+# Paths and names > >>+# > >>+HOST_OPKG_UTILS_VERSION:= r4747 > >>+HOST_OPKG_UTILS:= opkg-utils-$(HOST_OPKG_UTILS_VERSION) > >>+HOST_OPKG_UTILS_SUFFIX := tar.gz > >>+HOST_OPKG_UTILS_URL:= > >>http://fixme/packages/opkg-utils/$(HOST_OPKG_UTILS).$(HOST_OPKG_UTILS_SUFFIX) > This was a place holder URL. The file is hosted now and this is > fixed. Will be correct in next posted patch. > >>+HOST_OPKG_UTILS_SOURCE := > >>$(SRCDIR)/$(HOST_OPKG_UTILS).$(HOST_OPKG_UTILS_SUFFIX) > >>+HOST_OPKG_UTILS_DIR:= $(HOST_BUILDDIR)/$(HOST_OPKG_UTILS) > >>+ > >>+# > >> > >>+# Get > >>+# > >> > >>+ > >>+$(HOST_OPKG_UTILS_SOURCE): > >>+ @$(call targetinfo) > >>+ @$(call get, HOST_OPKG_UTILS) > >remove this stage. > Will do. I copied this file from host-ipkg-utils.make so I figured > it didn't need to be cleaned up but I'll do it regardless for now > on. That file should be cleaned up at some point. I'm just a bit more pedantic about new packages, to minimize later cleanups. > >>+ > >>+# > >> > >>+# Prepare > >>+# > >> > >>+ > >>+HOST_OPKG_UTILS_CONF_TOOL := NO > >>+HOST_OPKG_UTILS_MAKE_OPT := PREFIX= $(HOST_ENV_CC) > >>+HOST_OPKG_UTILS_INSTALL_OPT := $(HOST_OPKG_UTILS_MAKE_OPT) install > >please align the ':=' > dito > >>+ > >>+# vim: syntax=make > >>diff --git a/rules/host-opkg.in b/rules/host-opkg.in > >>new file mode 100644 > >>index 000..7309eb0 > >>--- /dev/null > >>+++ b/rules/host-opkg.in > >>@@ -0,0 +1,
Re: [ptxdist] [PATCH 2/7] opkg can now be used instead of ipkg
I've replied to all of your comments below. On 04/26/2011 08:26 AM, Michael Olbrich wrote: On Mon, Apr 25, 2011 at 01:14:18PM -0500, George McCollister wrote: opkg and opkg-utils can now be used to build .ipk files and generate images from them. Please split into multiple commits. E.g. to add a host tool, some generalization, and finlly the actual ipkg/opkg selection. I've broken it down as follows. Is this alright or were you thinking differently? commit 085e8316772b65771ab1c9bd30d1586e3a2977c6 Author: George McCollister Date: Tue Apr 26 15:13:52 2011 -0500 opkg can now be used instead of ipkg opkg and opkg-utils can now be used to build .ipk files and generate images from them. Added template opkg.conf file. No longer default HOST_IPKG_UTILS and HOST_IPKG to yes. HOST_PACKAGE_MANAGEMENT_IPKG will select HOST_IPKG. HOST_IPKG will select HOST_IPKG_UTILS. Added package management selection to hosttools. Changed scripts to use the package management utilities for the selected package management system. Signed-off-by: George McCollister generic/etc/opkg/opkg.conf | 12 ++ rules/host-ipkg-utils.in|2 - rules/host-ipkg.in |3 +- rules/host-package-management.in| 22 +++ rules/post/image_ipkg.make |9 +++-- rules/post/ptxd_make_image_common.make |1 + rules/post/ptxd_make_xpkg_common.make |4 ++- rules/post/virtual.make |5 +++ scripts/ipkg-push |5 ++- scripts/lib/ptxd_make_image_prepare_work_dir.sh | 18 ++--- scripts/lib/ptxd_make_ipkg_finish.sh|3 +- scripts/lib/ptxd_make_opkg_common.sh| 21 +++ scripts/lib/ptxd_make_opkg_finish.sh| 45 +++ 13 files changed, 133 insertions(+), 17 deletions(-) commit 3991ae31680afa5b122fdddf4e468b2fa7f49411 Author: George McCollister Date: Tue Apr 26 13:52:57 2011 -0500 make ptxd_make_xpkg more generic Change name of pkg_ipkg_control_dir to pkg_xpkg_control_dir. Change name of pkg_ipkg_control to pkg_xpkg_control. Signed-off-by: George McCollister scripts/lib/ptxd_make_ipkg_common.sh |7 --- scripts/lib/ptxd_make_xpkg_fixup.sh |3 ++- scripts/lib/ptxd_make_xpkg_prepare.sh |7 --- 3 files changed, 10 insertions(+), 7 deletions(-) commit ba7153e6b6a773759d435a12571ac1c9c0bf66e0 Author: George McCollister Date: Tue Apr 26 11:42:48 2011 -0500 host-opkg-utils: Added new host package. Use opkg-utils instead of ipkg-utils when using opkg as the package managment system. svn trunk of opkg-utils is here: http://svn.openmoko.org/trunk/src/host/opkg-utils As of April 26, 2011 last change was: r4747 2008-11-02 21:59:59 I've hosted a tar.gz of r4747 at this URL: http://www.novatech-llc.com/files/opkg-utils-r4747.tar.gz Signed-off-by: George McCollister ...tils-use-env-python-instead-of-fixed-path.patch | 71 patches/opkg-utils-r4747/series|1 + rules/host-opkg-utils.in |7 ++ rules/host-opkg-utils.make | 34 + 4 files changed, 113 insertions(+), 0 deletions(-) commit a12b5ff9f4ca5b20b1f3ad4072a53837c22651ea Author: George McCollister Date: Tue Apr 26 11:35:54 2011 -0500 host-opkg: Added new host package. I have added host-opkg so opkg-cl is available for use in building an ipk repository. Signed-off-by: George McCollister rules/host-opkg.in | 11 +++ rules/host-opkg.make | 45 + 2 files changed, 56 insertions(+), 0 deletions(-) Signed-off-by: George McCollister --- generic/etc/opkg/opkg.conf | 12 ++ patches/opkg-utils-r4747/env_python.patch | 45 ++ patches/opkg-utils-r4747/series |1 + rules/host-ipkg-utils.in|2 - rules/host-ipkg.in |3 +- rules/host-opkg-utils.in|7 +++ rules/host-opkg-utils.make | 44 + rules/host-opkg.in | 11 + rules/host-opkg.make| 47 +++ rules/host-package-management.in| 18 + rules/post/image_ipkg.make | 13 +- rules/post/ptxd_make_xpkg_common.make | 10 + rules/post/virtual.make |5 ++ scripts/ipkg-push |5 ++- scripts/lib/ptxd_make_image_prepare_work_dir.sh | 21 +++--- scripts/lib/ptxd_make_ipkg_common.sh|7 ++- scripts/lib/ptxd_make_ipkg_fin
Re: [ptxdist] [PATCH 2/7] opkg can now be used instead of ipkg
On Mon, Apr 25, 2011 at 01:14:18PM -0500, George McCollister wrote: > opkg and opkg-utils can now be used to build .ipk files and generate > images from them. Please split into multiple commits. E.g. to add a host tool, some generalization, and finlly the actual ipkg/opkg selection. > Signed-off-by: George McCollister > --- > generic/etc/opkg/opkg.conf | 12 ++ > patches/opkg-utils-r4747/env_python.patch | 45 ++ > patches/opkg-utils-r4747/series |1 + > rules/host-ipkg-utils.in|2 - > rules/host-ipkg.in |3 +- > rules/host-opkg-utils.in|7 +++ > rules/host-opkg-utils.make | 44 + > rules/host-opkg.in | 11 + > rules/host-opkg.make| 47 > +++ > rules/host-package-management.in| 18 + > rules/post/image_ipkg.make | 13 +- > rules/post/ptxd_make_xpkg_common.make | 10 + > rules/post/virtual.make |5 ++ > scripts/ipkg-push |5 ++- > scripts/lib/ptxd_make_image_prepare_work_dir.sh | 21 +++--- > scripts/lib/ptxd_make_ipkg_common.sh|7 ++- > scripts/lib/ptxd_make_ipkg_finish.sh|3 +- > scripts/lib/ptxd_make_opkg_common.sh| 21 ++ > scripts/lib/ptxd_make_opkg_finish.sh| 45 ++ > scripts/lib/ptxd_make_xpkg_fixup.sh |3 +- > scripts/lib/ptxd_make_xpkg_prepare.sh |7 ++- > 21 files changed, 308 insertions(+), 22 deletions(-) > create mode 100644 generic/etc/opkg/opkg.conf > create mode 100644 patches/opkg-utils-r4747/env_python.patch > create mode 100644 patches/opkg-utils-r4747/series > create mode 100644 rules/host-opkg-utils.in > create mode 100644 rules/host-opkg-utils.make > create mode 100644 rules/host-opkg.in > create mode 100644 rules/host-opkg.make > create mode 100644 rules/host-package-management.in > create mode 100644 scripts/lib/ptxd_make_opkg_common.sh > create mode 100644 scripts/lib/ptxd_make_opkg_finish.sh > > diff --git a/generic/etc/opkg/opkg.conf b/generic/etc/opkg/opkg.conf > new file mode 100644 > index 000..e9c75c1 > --- /dev/null > +++ b/generic/etc/opkg/opkg.conf > @@ -0,0 +1,12 @@ > +# > +# /etc/opkg/opkg.conf > +# > + > +# src: > +@SRC@ > + > +dest root/ > + > +arch @ARCH@ 10 > +arch all 1 > +arch noarch 1 > diff --git a/patches/opkg-utils-r4747/env_python.patch > b/patches/opkg-utils-r4747/env_python.patch > new file mode 100644 > index 000..717e13d This patch need a header. > --- /dev/null > +++ b/patches/opkg-utils-r4747/env_python.patch > @@ -0,0 +1,45 @@ > +diff -Naur opkg-utils-r4747/opkg-list-fields > opkg-utils-r4747.new/opkg-list-fields > +--- opkg-utils-r4747/opkg-list-fields2011-04-05 15:24:18.0 > -0500 > opkg-utils-r4747.new/opkg-list-fields2011-04-12 09:50:28.0 > -0500 > +@@ -1,4 +1,4 @@ > +-#!/usr/bin/python > ++#!/usr/bin/env python > + > + import sys, opkg > + > +diff -Naur opkg-utils-r4747/opkg-make-index > opkg-utils-r4747.new/opkg-make-index > +--- opkg-utils-r4747/opkg-make-index 2011-04-05 15:24:18.0 -0500 > opkg-utils-r4747.new/opkg-make-index 2011-04-12 09:50:43.0 > -0500 > +@@ -1,4 +1,4 @@ > +-#!/usr/bin/python > ++#!/usr/bin/env python > + > + import sys, os, posixpath > + from glob import glob > +diff -Naur opkg-utils-r4747/opkg-show-deps > opkg-utils-r4747.new/opkg-show-deps > +--- opkg-utils-r4747/opkg-show-deps 2011-04-05 15:24:18.0 -0500 > opkg-utils-r4747.new/opkg-show-deps 2011-04-12 09:49:15.0 > -0500 > +@@ -1,4 +1,4 @@ > +-#!/usr/bin/python > ++#!/usr/bin/env python > + > + import sys, os, posixpath > + from glob import glob > +diff -Naur opkg-utils-r4747/opkg-unbuild opkg-utils-r4747.new/opkg-unbuild > +--- opkg-utils-r4747/opkg-unbuild2011-04-05 15:24:18.0 -0500 > opkg-utils-r4747.new/opkg-unbuild2011-04-12 09:49:35.0 > -0500 > +@@ -1,4 +1,4 @@ > +-#!/usr/bin/python > ++#!/usr/bin/env python > + > + import sys, os, re > + > +diff -Naur opkg-utils-r4747/opkg-update-index > opkg-utils-r4747.new/opkg-update-index > +--- opkg-utils-r4747/opkg-update-index 2011-04-05 15:24:18.0 > -0500 > opkg-utils-r4747.new/opkg-update-index 2011-04-12 09:50:01.0 > -0500 > +@@ -1,4 +1,4 @@ > +-#!/usr/bin/env python2.1 > ++#!/usr/bin/env python > + > + import sys, os > + from glob import glob > diff --git a/patches/opkg-utils-r4747/series b/patches/opkg-utils-r4747/series > new file mode 100644 > index 000..237a9b9 > --- /dev/null > +++ b/patches/opkg-utils-r4747/series > @@ -0,0 +1 @@ > +env_python.patch > diff --git a/rules/host-ip
