| Submitter | Dexuan Cui |
|---|---|
| Date | April 5, 2012, 4:10 p.m. |
| Message ID | <515847c54a45a2cb7922cec91d2aeac26a4a7dea.1333642153.git.dexuan.cui@intel.com> |
| Download | mbox | patch |
| Permalink | /patch/25213/ |
| State | New |
| Headers | show |
Comments
On Fri, Apr 06, 2012 at 12:10:11AM +0800, Dexuan Cui wrote: > Add LICENSE and LIC_FILES_CHKSUM; > Add SRC_URI checksums; > Remove do_install_append since 1.0.10's Makefile has done the work. This is also in meta-oe meta-openembedded/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.9.bb as with xterm, can you compare and merge those changes? Thanks, Cheers, > > libxaw is needed by xterm. > > Signed-off-by: Dexuan Cui <dexuan.cui@intel.com> > --- > .../recipes-graphics/xorg-lib/libxaw_1.0.10.bb | 15 +++++++-------- > 1 files changed, 7 insertions(+), 8 deletions(-) > rename meta-demoapps/recipes-graphics/xorg-lib/libxaw_1.0.5.bb => meta/recipes-graphics/xorg-lib/libxaw_1.0.10.bb (59%) > > diff --git a/meta-demoapps/recipes-graphics/xorg-lib/libxaw_1.0.5.bb b/meta/recipes-graphics/xorg-lib/libxaw_1.0.10.bb > similarity index 59% > rename from meta-demoapps/recipes-graphics/xorg-lib/libxaw_1.0.5.bb > rename to meta/recipes-graphics/xorg-lib/libxaw_1.0.10.bb > index 489f456..a10577e 100644 > --- a/meta-demoapps/recipes-graphics/xorg-lib/libxaw_1.0.5.bb > +++ b/meta/recipes-graphics/xorg-lib/libxaw_1.0.10.bb > @@ -3,16 +3,15 @@ require xorg-lib-common.inc > DESCRIPTION = "X Athena Widget Set" > DEPENDS += "xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau" > PROVIDES = "xaw" > -PR = "r1" > -PE = "1" > +PR = "r0" > > -XORG_PN = "libXaw" > +LICENSE = "MIT & MIT-style" > +LIC_FILES_CHKSUM = "file://COPYING;md5=1c65719d42900bb81b83e8293c20a364" > + > +SRC_URI[md5sum] = "f1ea52debce7a18cc26b21647a00ad8b" > +SRC_URI[sha256sum] = "2d96bcf92638b8ec5c91d379f5ec2e7b15133adeb2ba22066d48bf3239ee1bdd" > > -do_install_append () { > - ln -sf libXaw6.so.6 ${D}${libdir}/libXaw.so.6 > - ln -sf libXaw7.so.7 ${D}${libdir}/libXaw.so.7 > - ln -sf libXaw7.so.7 ${D}${libdir}/libXaw.so > -} > +XORG_PN = "libXaw" > > PACKAGES =+ "libxaw6 libxaw7 libxaw8" > > -- > 1.7.6 > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Martin Jansa wrote on 2012-04-06: > On Fri, Apr 06, 2012 at 12:10:11AM +0800, Dexuan Cui wrote: >> Add LICENSE and LIC_FILES_CHKSUM; >> Add SRC_URI checksums; >> Remove do_install_append since 1.0.10's Makefile has done the work. > > This is also in meta-oe > meta-openembedded/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.9.bb > > as with xterm, can you compare and merge those changes? Hi Martin, thanks for the suggestion! Now I try to avoid introducing new recipes at this phase of release cycle. I'm trying to use a poky variable to tell bitbake which terminal should be used(currently the Run image functionality in hob uses /usr/bin/xterm by hardcode). Thanks, -- Dexuan
Patch
diff --git a/meta-demoapps/recipes-graphics/xorg-lib/libxaw_1.0.5.bb b/meta/recipes-graphics/xorg-lib/libxaw_1.0.10.bb similarity index 59% rename from meta-demoapps/recipes-graphics/xorg-lib/libxaw_1.0.5.bb rename to meta/recipes-graphics/xorg-lib/libxaw_1.0.10.bb index 489f456..a10577e 100644 --- a/meta-demoapps/recipes-graphics/xorg-lib/libxaw_1.0.5.bb +++ b/meta/recipes-graphics/xorg-lib/libxaw_1.0.10.bb @@ -3,16 +3,15 @@ require xorg-lib-common.inc DESCRIPTION = "X Athena Widget Set" DEPENDS += "xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau" PROVIDES = "xaw" -PR = "r1" -PE = "1" +PR = "r0" -XORG_PN = "libXaw" +LICENSE = "MIT & MIT-style" +LIC_FILES_CHKSUM = "file://COPYING;md5=1c65719d42900bb81b83e8293c20a364" + +SRC_URI[md5sum] = "f1ea52debce7a18cc26b21647a00ad8b" +SRC_URI[sha256sum] = "2d96bcf92638b8ec5c91d379f5ec2e7b15133adeb2ba22066d48bf3239ee1bdd" -do_install_append () { - ln -sf libXaw6.so.6 ${D}${libdir}/libXaw.so.6 - ln -sf libXaw7.so.7 ${D}${libdir}/libXaw.so.7 - ln -sf libXaw7.so.7 ${D}${libdir}/libXaw.so -} +XORG_PN = "libXaw" PACKAGES =+ "libxaw6 libxaw7 libxaw8"
Add LICENSE and LIC_FILES_CHKSUM; Add SRC_URI checksums; Remove do_install_append since 1.0.10's Makefile has done the work. libxaw is needed by xterm. Signed-off-by: Dexuan Cui <dexuan.cui@intel.com> --- .../recipes-graphics/xorg-lib/libxaw_1.0.10.bb | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) rename meta-demoapps/recipes-graphics/xorg-lib/libxaw_1.0.5.bb => meta/recipes-graphics/xorg-lib/libxaw_1.0.10.bb (59%)