| Submitter | Saul Wold |
|---|---|
| Date | May 18, 2011, 10:26 p.m. |
| Message ID | <8305336c6b1eb0789af195f28230ecfca178538a.1305756950.git.sgw@linux.intel.com> |
| Download | mbox | patch |
| Permalink | /patch/4433/ |
| State | New, archived |
| Headers | show |
Comments
Hi, We're nearly there with this, I'd like just one other tweak please: On Thu, 2011-05-19 at 12:19 -0700, Saul Wold wrote: > diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass > index 4faeb4a..f9ef32c 100644 > --- a/meta/classes/package_deb.bbclass > +++ b/meta/classes/package_deb.bbclass > @@ -431,3 +431,12 @@ python do_package_write_deb () { > do_package_write_deb[dirs] = "${PKGWRITEDIRDEB}" > addtask package_write_deb before do_package_write after do_package > > + > +PACKAGEINDEXES += "package_index_deb;" > +PACKAGEINDEXDEPS += "dpkg-native:do_populate_sysroot" > +PACKAGEINDEXDEPS += "apt-native:do_populate_sysroot" > + > +package_index_deb() { > + package_update_index_deb > +} Can't we just do +PACKAGEINDEXES += "package_update_index_deb;" instead of adding the function? > diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass > index 3c2472b..97de17a 100644 > --- a/meta/classes/package_ipk.bbclass > +++ b/meta/classes/package_ipk.bbclass > @@ -386,3 +386,12 @@ python do_package_write_ipk () { > } > do_package_write_ipk[dirs] = "${PKGWRITEDIRIPK}" > addtask package_write_ipk before do_package_write after do_package > + > +PACKAGEINDEXES += "package_index_ipk;" > +PACKAGEINDEXDEPS += "opkg-utils-native:do_populate_sysroot" > +PACKAGEINDEXDEPS += "opkg-native:do_populate_sysroot" > + > +package_index_ipk() { > + package_update_index_ipk > +} ditto? Cheers, Richard
Richard Purdie wrote: > Hi, > > We're nearly there with this, I'd like just one other tweak please: > > On Thu, 2011-05-19 at 12:19 -0700, Saul Wold wrote: >> diff --git a/meta/classes/package_deb.bbclass >> b/meta/classes/package_deb.bbclass index 4faeb4a..f9ef32c 100644 --- >> a/meta/classes/package_deb.bbclass +++ >> b/meta/classes/package_deb.bbclass @@ -431,3 +431,12 @@ python >> do_package_write_deb () { do_package_write_deb[dirs] = >> "${PKGWRITEDIRDEB}" addtask package_write_deb before >> do_package_write after do_package >> >> + >> +PACKAGEINDEXES += "package_index_deb;" >> +PACKAGEINDEXDEPS += "dpkg-native:do_populate_sysroot" >> +PACKAGEINDEXDEPS += "apt-native:do_populate_sysroot" + >> +package_index_deb() { >> + package_update_index_deb >> +} > > Can't we just do +PACKAGEINDEXES += "package_update_index_deb;" > > instead of adding the function? Richard, thanks for the suggestion! I made a new git commit at: please review it: http://git.pokylinux.org/cgit.cgi/poky-contrib/commit/?h=dcui/master&id=949f58a3ff0b4227986cff2c165a0d49aa2631cc Thanks, -- Dexuan
Patch
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass index 4faeb4a..f9ef32c 100644 --- a/meta/classes/package_deb.bbclass +++ b/meta/classes/package_deb.bbclass @@ -431,3 +431,12 @@ python do_package_write_deb () { do_package_write_deb[dirs] = "${PKGWRITEDIRDEB}" addtask package_write_deb before do_package_write after do_package + +PACKAGEINDEXES += "package_index_deb;" +PACKAGEINDEXDEPS += "dpkg-native:do_populate_sysroot" +PACKAGEINDEXDEPS += "apt-native:do_populate_sysroot" + +package_index_deb() { + package_update_index_deb +} + diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index 3c2472b..97de17a 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass @@ -386,3 +386,12 @@ python do_package_write_ipk () { } do_package_write_ipk[dirs] = "${PKGWRITEDIRIPK}" addtask package_write_ipk before do_package_write after do_package + +PACKAGEINDEXES += "package_index_ipk;" +PACKAGEINDEXDEPS += "opkg-utils-native:do_populate_sysroot" +PACKAGEINDEXDEPS += "opkg-native:do_populate_sysroot" + +package_index_ipk() { + package_update_index_ipk +} + diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index 1cf9f79..390d17c 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass @@ -815,3 +815,12 @@ python do_package_write_rpm () { do_package_write_rpm[dirs] = "${PKGWRITEDIRRPM}" addtask package_write_rpm before do_package_write after do_package +PACKAGEINDEXES += "package_index_rpm;" +PACKAGEINDEXDEPS += "rpm-native:do_populate_sysroot" +PACKAGEINDEXDEPS += "createrepo-native:do_populate_sysroot" + +package_index_rpm() { + package_update_index_rpm + createrepo "${DEPLOY_DIR_RPM}" +} + diff --git a/meta/recipes-core/meta/package-index.bb b/meta/recipes-core/meta/package-index.bb index 3c642cb..bf3922f 100644 --- a/meta/recipes-core/meta/package-index.bb +++ b/meta/recipes-core/meta/package-index.bb @@ -19,13 +19,11 @@ do_package_write_deb[noexec] = "1" do_populate_sysroot[noexec] = "1" do_package_index[nostamp] = "1" -do_package_index[dirs] = "${DEPLOY_DIR_IPK}" -do_package_index[depends] += "opkg-utils-native:do_populate_sysroot" -do_package_index[depends] += "opkg-native:do_populate_sysroot" +do_package_index[depends] += "${PACKAGEINDEXDEPS}" do_package_index() { set -ex - package_update_index_ipk + ${PACKAGEINDEXES} set +ex } addtask do_package_index before do_build