[PATCH 0/3] dexuan: build appliance: install xterm into the target [Apr 6, 2012]

[PATCH 0/3] dexuan: build appliance: install xterm into the target [Apr 6, 2012]

[Dexuan Cui]

The following changes since commit a8b5a3ed58d2a136867fc55b53443b59557c6459:

  self-hosted-image: use the correct location of the file sudoers (2012-04-05 12:01:31 +0800)

are available in the git repository at:
  git://git.pokylinux.org/poky-contrib dcui/self
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dcui/self

Dexuan Cui (3):
  libxaw: move it from meta-demoapps/ into meta/ and upgrade it to
    1.0.10
  xterm: port the recipe from OE and upgrade to v278
  task-self-hosted: install xterm into the target

 meta/recipes-core/tasks/task-self-hosted.bb        |    3 +-
 meta/recipes-graphics/xorg-app/xterm_278.bb        |   25 ++++++++++++++++++++
 .../recipes-graphics/xorg-lib/libxaw_1.0.10.bb     |   15 +++++------
 3 files changed, 34 insertions(+), 9 deletions(-)
 create mode 100644 meta/recipes-graphics/xorg-app/xterm_278.bb
 rename meta-demoapps/recipes-graphics/xorg-lib/libxaw_1.0.5.bb => meta/recipes-graphics/xorg-lib/libxaw_1.0.10.bb (59%)

-- 
1.7.6

[PATCH 1/3] libxaw: move it from meta-demoapps/ into meta/ and upgrade it to 1.0.10

[Dexuan Cui]

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%)

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

[PATCH 2/3] xterm: port the recipe from OE and upgrade to v278

[Dexuan Cui]

The recipe is ported from OE:
http://git.openembedded.org/openembedded/tree/recipes/xorg-app/xterm_266.bb

I upgraded it from v266 to v278.
I added LICENSE, LIC_FILES_CHKSUM and updated SRC_URI checksums.

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
---
 meta/recipes-graphics/xorg-app/xterm_278.bb |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-graphics/xorg-app/xterm_278.bb

diff --git a/meta/recipes-graphics/xorg-app/xterm_278.bb b/meta/recipes-graphics/xorg-app/xterm_278.bb
new file mode 100644
index 0000000..64c8866
--- /dev/null
+++ b/meta/recipes-graphics/xorg-app/xterm_278.bb
@@ -0,0 +1,25 @@
+require xorg-app-common.inc
+DESCRIPTION = "xterm is the standard terminal emulator for the X Window System."
+DEPENDS = "libxaw xproto xextproto libxext libxau libxpm ncurses"
+PR = "${INC_PR}.0"
+
+SRC_URI = "ftp://invisible-island.net/xterm/${PN}-${PV}.tgz"
+
+LICENSE = "MIT & MIT-style"
+LIC_FILES_CHKSUM = "file://package/debian/copyright;md5=d1415419990d510a698de36fb386f797"
+
+SRC_URI[md5sum] = "3eeddfe35cb0a2db1924cfe0c20be443"
+SRC_URI[sha256sum] = "1372f9afe07bc35bfd47482db146c649223dadd0b472da31f8c337ab37f90585"
+
+EXTRA_OECONF = " --x-includes=${STAGING_INCDIR} \
+                 --x-libraries=${STAGING_LIBDIR} \
+                 FREETYPE_CONFIG=${STAGING_BINDIR_CROSS}/freetype-config \
+                 --disable-imake \
+                 --disable-setuid"
+
+do_configure() {
+        sed -e "s%/usr/contrib/X11R6%${STAGING_LIBDIR}%g" -i configure
+        oe_runconf
+}
+
+FILES_${PN} += " /usr/lib/X11"
-- 
1.7.6

[PATCH 3/3] task-self-hosted: install xterm into the target

[Dexuan Cui]

xterm is needed by the "Run image" functionality of the hob:
See bitbake/lib/bb/ui/crumbs/builder.py's runqemu_image().

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
---
 meta/recipes-core/tasks/task-self-hosted.bb |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-core/tasks/task-self-hosted.bb b/meta/recipes-core/tasks/task-self-hosted.bb
index 87928b6..4fd3070 100644
--- a/meta/recipes-core/tasks/task-self-hosted.bb
+++ b/meta/recipes-core/tasks/task-self-hosted.bb
@@ -3,7 +3,7 @@
 #
 
 DESCRIPTION = "Create Basic Image Tasks"
-PR = "r7"
+PR = "r8"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
@@ -179,6 +179,7 @@ RDEPENDS_task-self-hosted-extended = "\
     wget \
     which \
     xinetd \
+    xterm \
     zip \
     zlib \
     "
-- 
1.7.6

Re: [PATCH 2/3] xterm: port the recipe from OE and upgrade to v278

[Paul Eggleton]

On Friday 06 April 2012 00:10:12 Dexuan Cui wrote:
> The recipe is ported from OE:
> http://git.openembedded.org/openembedded/tree/recipes/xorg-app/xterm_266.bb
> 
> I upgraded it from v266 to v278.
> I added LICENSE, LIC_FILES_CHKSUM and updated SRC_URI checksums.

I think it's unfortunate we have to pull in xterm just for the sake of showing 
the qemu output - can we not use matchbox-terminal for this?

If we have to have it, Dexuan can you please compare this to the meta-oe xterm 
recipe as that is likely to be more up-to-date than the one in OE-Classic?

Thanks,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre

Re: [PATCH 0/3] dexuan: build appliance: install xterm into the target [Apr 6, 2012]

[Saul Wold]

On 04/05/2012 09:10 AM, Dexuan Cui wrote:
> The following changes since commit a8b5a3ed58d2a136867fc55b53443b59557c6459:
>
>    self-hosted-image: use the correct location of the file sudoers (2012-04-05 12:01:31 +0800)
>
> are available in the git repository at:
>    git://git.pokylinux.org/poky-contrib dcui/self
>    http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dcui/self
>
> Dexuan Cui (3):
>    libxaw: move it from meta-demoapps/ into meta/ and upgrade it to
>      1.0.10
>    xterm: port the recipe from OE and upgrade to v278
>    task-self-hosted: install xterm into the target
>
>   meta/recipes-core/tasks/task-self-hosted.bb        |    3 +-
>   meta/recipes-graphics/xorg-app/xterm_278.bb        |   25 ++++++++++++++++++++
>   .../recipes-graphics/xorg-lib/libxaw_1.0.10.bb     |   15 +++++------
>   3 files changed, 34 insertions(+), 9 deletions(-)
>   create mode 100644 meta/recipes-graphics/xorg-app/xterm_278.bb
>   rename meta-demoapps/recipes-graphics/xorg-lib/libxaw_1.0.5.bb =>  meta/recipes-graphics/xorg-lib/libxaw_1.0.10.bb (59%)
>
I am not sure adding xterm to oe-core at this point is the right answer, 
it might be better to look at the root cause which maybe hob using a 
hard-coded xterm instead of trying to determin what terminal is available.

Sau!

Re: [PATCH 2/3] xterm: port the recipe from OE and upgrade to v278

[Cui, Dexuan]

Paul Eggleton wrote on 2012-04-06:
> On Friday 06 April 2012 00:10:12 Dexuan Cui wrote:
>> The recipe is ported from OE:
>> 
> http://git.openembedded.org/openembedded/tree/recipes/xorg-app/xterm_2
> 66.bb
>> 
>> I upgraded it from v266 to v278.
>> I added LICENSE, LIC_FILES_CHKSUM and updated SRC_URI checksums.
> 
> I think it's unfortunate we have to pull in xterm just for the sake of showing
> the qemu output - can we not use matchbox-terminal for this?
Thanks for the suggestion!
I suppose we could, but we need to fix bitbake as it uses /usr/bin/xterm
by hardcode...

> If we have to have it, Dexuan can you please compare this to the meta-oe
> xterm recipe as that is likely to be more up-to-date than the one in
> OE-Classic?
Ok, I'll investigate this.

Thanks,
-- Dexuan

Re: [PATCH 2/3] xterm: port the recipe from OE and upgrade to v278

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1246 bytes --]

On Thu, Apr 05, 2012 at 05:19:22PM +0100, Paul Eggleton wrote:
> On Friday 06 April 2012 00:10:12 Dexuan Cui wrote:
> > The recipe is ported from OE:
> > http://git.openembedded.org/openembedded/tree/recipes/xorg-app/xterm_266.bb
> > 
> > I upgraded it from v266 to v278.
> > I added LICENSE, LIC_FILES_CHKSUM and updated SRC_URI checksums.
> 
> I think it's unfortunate we have to pull in xterm just for the sake of showing 
> the qemu output - can we not use matchbox-terminal for this?
> 
> If we have to have it, Dexuan can you please compare this to the meta-oe xterm 
> recipe as that is likely to be more up-to-date than the one in OE-Classic?

yes it is..
meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_277.bb

and already with LICENSE from xorg-app-common.inc and LIC_FILES_CHKSUM
using xterm.h instead of package/debian/copyright

Cheers,

> 
> Thanks,
> Paul
> 
> -- 
> 
> Paul Eggleton
> Intel Open Source Technology Centre
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH 1/3] libxaw: move it from meta-demoapps/ into meta/ and upgrade it to 1.0.10

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 2259 bytes --]

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 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH 1/3] libxaw: move it from meta-demoapps/ into meta/ and upgrade it to 1.0.10

[Cui, Dexuan]

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