| Submitter | Robert P. J. Day |
|---|---|
| Date | July 26, 2012, 11:06 p.m. |
| Message ID | <alpine.DEB.2.02.1207261904590.18831@oneiric> |
| Download | mbox | patch |
| Permalink | /patch/33169/ |
| State | New |
| Headers | show |
Comments
On Thu, 2012-07-26 at 19:06 -0400, Robert P. J. Day wrote: > Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> > > --- > > does this look about right? > > diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass > index 1799bf1..b0b476f 100644 > --- a/meta/classes/image.bbclass > +++ b/meta/classes/image.bbclass > @@ -58,10 +58,9 @@ PACKAGE_GROUP_dev-pkgs[optional] = "1" > PACKAGE_GROUP_doc-pkgs = "${@' '.join('%s-doc' % pkg for pkg in normal_pkgs_to_install(d))}" > PACKAGE_GROUP_doc-pkgs[optional] = "1" > > -# "export IMAGE_BASENAME" not supported at this time > IMAGE_INSTALL ?= "" > IMAGE_INSTALL[type] = "list" > -IMAGE_BASENAME[export] = "1" > +export IMAGE_BASENAME > export PACKAGE_INSTALL ?= "${IMAGE_INSTALL} ${ROOTFS_BOOTSTRAP_INSTALL} ${FEATURE_INSTALL}" > PACKAGE_INSTALL_ATTEMPTONLY ?= "${FEATURE_INSTALL_OPTIONAL}" > > diff --git a/meta/recipes-core/images/core-image-minimal-initramfs.bb b/meta/recipes-core/images/core-image-minimal-initramfs.bb > index 7f6826c..ddc2142 100644 > --- a/meta/recipes-core/images/core-image-minimal-initramfs.bb > +++ b/meta/recipes-core/images/core-image-minimal-initramfs.bb > @@ -8,7 +8,6 @@ IMAGE_INSTALL = "initramfs-live-boot initramfs-live-install initramfs-live-insta > # Do not pollute the initrd image with rootfs features > IMAGE_FEATURES = "" > > -export IMAGE_BASENAME = "core-image-minimal-initramfs" > IMAGE_LINGUAS = "" I meant just to remove the export flag here, so: -export IMAGE_BASENAME = "core-image-minimal-initramfs" +IMAGE_BASENAME = "core-image-minimal-initramfs" Cheers, Richard
On Fri, Jul 27, 2012 at 1:25 PM, Richard Purdie < richard.purdie@linuxfoundation.org> wrote: > On Thu, 2012-07-26 at 19:06 -0400, Robert P. J. Day wrote: > > Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> > > > > --- > > > > does this look about right? > > > > diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass > > index 1799bf1..b0b476f 100644 > > --- a/meta/classes/image.bbclass > > +++ b/meta/classes/image.bbclass > > @@ -58,10 +58,9 @@ PACKAGE_GROUP_dev-pkgs[optional] = "1" > > PACKAGE_GROUP_doc-pkgs = "${@' '.join('%s-doc' % pkg for pkg in > normal_pkgs_to_install(d))}" > > PACKAGE_GROUP_doc-pkgs[optional] = "1" > > > > -# "export IMAGE_BASENAME" not supported at this time > > IMAGE_INSTALL ?= "" > > IMAGE_INSTALL[type] = "list" > > -IMAGE_BASENAME[export] = "1" > > +export IMAGE_BASENAME > > export PACKAGE_INSTALL ?= "${IMAGE_INSTALL} ${ROOTFS_BOOTSTRAP_INSTALL} > ${FEATURE_INSTALL}" > > PACKAGE_INSTALL_ATTEMPTONLY ?= "${FEATURE_INSTALL_OPTIONAL}" > > > > diff --git a/meta/recipes-core/images/core-image-minimal-initramfs.bbb/meta/recipes-core/images/ > core-image-minimal-initramfs.bb > > index 7f6826c..ddc2142 100644 > > --- a/meta/recipes-core/images/core-image-minimal-initramfs.bb > > +++ b/meta/recipes-core/images/core-image-minimal-initramfs.bb > > @@ -8,7 +8,6 @@ IMAGE_INSTALL = "initramfs-live-boot > initramfs-live-install initramfs-live-insta > > # Do not pollute the initrd image with rootfs features > > IMAGE_FEATURES = "" > > > > -export IMAGE_BASENAME = "core-image-minimal-initramfs" > > IMAGE_LINGUAS = "" > > I meant just to remove the export flag here, so: > > -export IMAGE_BASENAME = "core-image-minimal-initramfs" > +IMAGE_BASENAME = "core-image-minimal-initramfs" > Why is this finally needed? I'd redefine IMAGE_BASENAME only to change from its default value (PN) Cheers Andrea > Cheers, > > Richard > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core >
On Fri, 27 Jul 2012, Richard Purdie wrote: > On Thu, 2012-07-26 at 19:06 -0400, Robert P. J. Day wrote: > > Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> > > > > --- > > > > does this look about right? > > > > diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass > > index 1799bf1..b0b476f 100644 > > --- a/meta/classes/image.bbclass > > +++ b/meta/classes/image.bbclass > > @@ -58,10 +58,9 @@ PACKAGE_GROUP_dev-pkgs[optional] = "1" > > PACKAGE_GROUP_doc-pkgs = "${@' '.join('%s-doc' % pkg for pkg in normal_pkgs_to_install(d))}" > > PACKAGE_GROUP_doc-pkgs[optional] = "1" > > > > -# "export IMAGE_BASENAME" not supported at this time > > IMAGE_INSTALL ?= "" > > IMAGE_INSTALL[type] = "list" > > -IMAGE_BASENAME[export] = "1" > > +export IMAGE_BASENAME > > export PACKAGE_INSTALL ?= "${IMAGE_INSTALL} ${ROOTFS_BOOTSTRAP_INSTALL} ${FEATURE_INSTALL}" > > PACKAGE_INSTALL_ATTEMPTONLY ?= "${FEATURE_INSTALL_OPTIONAL}" > > > > diff --git a/meta/recipes-core/images/core-image-minimal-initramfs.bb b/meta/recipes-core/images/core-image-minimal-initramfs.bb > > index 7f6826c..ddc2142 100644 > > --- a/meta/recipes-core/images/core-image-minimal-initramfs.bb > > +++ b/meta/recipes-core/images/core-image-minimal-initramfs.bb > > @@ -8,7 +8,6 @@ IMAGE_INSTALL = "initramfs-live-boot initramfs-live-install initramfs-live-insta > > # Do not pollute the initrd image with rootfs features > > IMAGE_FEATURES = "" > > > > -export IMAGE_BASENAME = "core-image-minimal-initramfs" > > IMAGE_LINGUAS = "" > > I meant just to remove the export flag here, so: > > -export IMAGE_BASENAME = "core-image-minimal-initramfs" > +IMAGE_BASENAME = "core-image-minimal-initramfs" ah, all right, then. rday
On Fri, Jul 27, 2012 at 2:01 PM, Robert P. J. Day <rpjday@crashcourse.ca>wrote: > On Fri, 27 Jul 2012, Richard Purdie wrote: > > > On Thu, 2012-07-26 at 19:06 -0400, Robert P. J. Day wrote: > > > Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> > > > > > > --- > > > > > > does this look about right? > > > > > > diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass > > > index 1799bf1..b0b476f 100644 > > > --- a/meta/classes/image.bbclass > > > +++ b/meta/classes/image.bbclass > > > @@ -58,10 +58,9 @@ PACKAGE_GROUP_dev-pkgs[optional] = "1" > > > PACKAGE_GROUP_doc-pkgs = "${@' '.join('%s-doc' % pkg for pkg in > normal_pkgs_to_install(d))}" > > > PACKAGE_GROUP_doc-pkgs[optional] = "1" > > > > > > -# "export IMAGE_BASENAME" not supported at this time > > > IMAGE_INSTALL ?= "" > > > IMAGE_INSTALL[type] = "list" > > > -IMAGE_BASENAME[export] = "1" > > > +export IMAGE_BASENAME > > > export PACKAGE_INSTALL ?= "${IMAGE_INSTALL} > ${ROOTFS_BOOTSTRAP_INSTALL} ${FEATURE_INSTALL}" > > > PACKAGE_INSTALL_ATTEMPTONLY ?= "${FEATURE_INSTALL_OPTIONAL}" > > > > > > diff --git a/meta/recipes-core/images/core-image-minimal-initramfs.bbb/meta/recipes-core/images/ > core-image-minimal-initramfs.bb > > > index 7f6826c..ddc2142 100644 > > > --- a/meta/recipes-core/images/core-image-minimal-initramfs.bb > > > +++ b/meta/recipes-core/images/core-image-minimal-initramfs.bb > > > @@ -8,7 +8,6 @@ IMAGE_INSTALL = "initramfs-live-boot > initramfs-live-install initramfs-live-insta > > > # Do not pollute the initrd image with rootfs features > > > IMAGE_FEATURES = "" > > > > > > -export IMAGE_BASENAME = "core-image-minimal-initramfs" > > > IMAGE_LINGUAS = "" > > > > I meant just to remove the export flag here, so: > > > > -export IMAGE_BASENAME = "core-image-minimal-initramfs" > > +IMAGE_BASENAME = "core-image-minimal-initramfs" > > ah, all right, then. > > rday > > -- > > ======================================================================== > Robert P. J. Day Ottawa, Ontario, CANADA > http://crashcourse.ca > > Twitter: http://twitter.com/rpjday > LinkedIn: http://ca.linkedin.com/in/rpjday > ======================================================================== > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core > By the way, we have followed pedissequally and re-introduced 'export IMAGE_BASENAME' [1] when we adapted our initramfs image for oe-core, even though we had built whitout until then, both in oe-classic and in oe-core. ** Regards Andrea [1] http://cgit.openembedded.org/meta-handheld/commit/?id=3021e1fc380067666a63fa5b2bdfc5fd16282973 **
On Fri, 27 Jul 2012, Andrea Adami wrote: > By the way, > > we have followed pedissequally and re-introduced 'export IMAGE_BASENAME' [1] when we adapted our > initramfs image for oe-core, even though we had built whitout until then, both in oe-classic and in > oe-core. > > Regards > > Andrea > > [1] http://cgit.openembedded.org/meta-handheld/commit/?id=3021e1fc380067666a63fa5b2bdfc5fd16282973 i think i'll just leave this for someone else higher up the food chain to deal with if they think it's worth it. rday
On Fri, 2012-07-27 at 14:53 +0200, Andrea Adami wrote: > > By the way, > > we have followed pedissequally and re-introduced 'export > IMAGE_BASENAME' [1] when we adapted our initramfs image for oe-core, > even though we had built whitout until then, both in oe-classic and in > oe-core. > > Regards > > Andrea > > [1] > http://cgit.openembedded.org/meta-handheld/commit/?id=3021e1fc380067666a63fa5b2bdfc5fd16282973 At this point I don't know if this is necessary or not. It might be unnecessary but we would need someone to confirm that before we remove it. Cheers, Richard
On Fri, Jul 27, 2012 at 3:15 PM, Richard Purdie < richard.purdie@linuxfoundation.org> wrote: > On Fri, 2012-07-27 at 14:53 +0200, Andrea Adami wrote: > > > > > By the way, > > > > we have followed pedissequally and re-introduced 'export > > IMAGE_BASENAME' [1] when we adapted our initramfs image for oe-core, > > even though we had built whitout until then, both in oe-classic and in > > oe-core. > > > > Regards > > > > Andrea > > > > [1] > > > http://cgit.openembedded.org/meta-handheld/commit/?id=3021e1fc380067666a63fa5b2bdfc5fd16282973 > > At this point I don't know if this is necessary or not. It might be > unnecessary but we would need someone to confirm that before we remove > it. > > Cheers, > > Richard > > > I see in bitbake.conf IMAGE_BASENAME = "${PN}" This is enough in the default case. Cheers Andrea > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core >
Patch
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 1799bf1..b0b476f 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -58,10 +58,9 @@ PACKAGE_GROUP_dev-pkgs[optional] = "1" PACKAGE_GROUP_doc-pkgs = "${@' '.join('%s-doc' % pkg for pkg in normal_pkgs_to_install(d))}" PACKAGE_GROUP_doc-pkgs[optional] = "1" -# "export IMAGE_BASENAME" not supported at this time IMAGE_INSTALL ?= "" IMAGE_INSTALL[type] = "list" -IMAGE_BASENAME[export] = "1" +export IMAGE_BASENAME export PACKAGE_INSTALL ?= "${IMAGE_INSTALL} ${ROOTFS_BOOTSTRAP_INSTALL} ${FEATURE_INSTALL}" PACKAGE_INSTALL_ATTEMPTONLY ?= "${FEATURE_INSTALL_OPTIONAL}" diff --git a/meta/recipes-core/images/core-image-minimal-initramfs.bb b/meta/recipes-core/images/core-image-minimal-initramfs.bb index 7f6826c..ddc2142 100644 --- a/meta/recipes-core/images/core-image-minimal-initramfs.bb +++ b/meta/recipes-core/images/core-image-minimal-initramfs.bb @@ -8,7 +8,6 @@ IMAGE_INSTALL = "initramfs-live-boot initramfs-live-install initramfs-live-insta # Do not pollute the initrd image with rootfs features IMAGE_FEATURES = "" -export IMAGE_BASENAME = "core-image-minimal-initramfs" IMAGE_LINGUAS = "" LICENSE = "MIT"
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> --- does this look about right? rday