Move packages from meta-oe to core for X11

Please consider moving xterm, xclock, twm and libxaw from meta-openembedded/recipes-graphics to OE-core.

This fixes 'core-image-x11' image dependancy on meta-oe packages since xinit requires xterm, xclock and twm to 'startx'.

if approved and commited, I will post patches to remove those packages from meta-oe.

Armin Kuster (5):
xclock: move from meta-oe to core.
twm: move from meta-oe to core.
libxaw: move from meta-oe to core.
xterm: move from meta-oe to core.
xinit: fix depends issue

 meta/recipes-graphics/xorg-app/twm_1.0.8.bb     | 20 +++++++++++++++
 meta/recipes-graphics/xorg-app/xclock_1.0.5.bb  | 15 +++++++++++
 meta/recipes-graphics/xorg-app/xinit_1.3.3.bb   |  8 +++++-
 meta/recipes-graphics/xorg-app/xterm_313.bb     |  1 +
 meta/recipes-graphics/xorg-lib/libxaw_1.0.10.bb | 33 +++++++++++++++++++++++++
 5 files changed, 76 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-graphics/xorg-app/twm_1.0.8.bb
 create mode 100644 meta/recipes-graphics/xorg-app/xclock_1.0.5.bb
 create mode 120000 meta/recipes-graphics/xorg-app/xterm_313.bb
 create mode 100644 meta/recipes-graphics/xorg-lib/libxaw_1.0.10.bb

1.9.1

core "xinit" package has a dependency to xclock so move it from meta-oe to core.

core image "core-image-x11" includes xinit.

---
 meta/recipes-graphics/xorg-app/xclock_1.0.5.bb | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 meta/recipes-graphics/xorg-app/xclock_1.0.5.bb

new file mode 100644
index 0000000..9573761
@@ -0,0 +1,15 @@
+require recipes-graphics/xorg-app/xorg-app-common.inc
+
+SUMMARY = "analog / digital clock for X"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=857759ade8f2ddde5c7b32ef7356ea36"
+
+DEPENDS += " libxaw libxrender libxft libxkbfile libxt"
+
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
+
+SRC_URI[md5sum] = "eaf124bbc9d13e1a12a29faaa2ed3612"
+SRC_URI[sha256sum] = "53a9169e24f3814fbfcfee3ca0b98637840a3156ed7c7e36ae03940fabae4c9a"
+
+inherit distro_features_check

1.9.1

core "xinit" package has a dependency to twm so
move it from meta-oe to core.

core image "core-image-x11" includes xinit.

---
 meta/recipes-graphics/xorg-app/twm_1.0.8.bb | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 meta/recipes-graphics/xorg-app/twm_1.0.8.bb

new file mode 100644
index 0000000..cc8808b
@@ -0,0 +1,20 @@
+require recipes-graphics/xorg-app/xorg-app-common.inc
+SUMMARY = "tiny window manager"
+DEPENDS += " libxext libxt libxmu bison-native"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=4c6d42ef60e8166aa26606524c0b9586"
+
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
+
+SRC_URI[md5sum] = "4b28317d4a9f7ca61bef8462e132bd4c"
+SRC_URI[sha256sum] = "7660352353d632127ff50390991706aa660b28a4ada816c2582ac02720722e44"
+
+inherit distro_features_check
+
+FILES_${PN} += "${datadir}/X11/twm/system.twmrc"
+ALTERNATIVE_NAME = "x-window-manager"
+ALTERNATIVE_PATH = "${bindir}/twm"
+ALTERNATIVE_LINK = "${bindir}/x-window-manager"
+ALTERNATIVE_PRIORITY = "1"

1.9.1

xinit, xterm and xclock depend on libxaw so move to to core too.

add x11 to required DISTRO_FEATURES check

---
 meta/recipes-graphics/xorg-lib/libxaw_1.0.10.bb | 33 +++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 meta/recipes-graphics/xorg-lib/libxaw_1.0.10.bb

new file mode 100644
index 0000000..807717c
@@ -0,0 +1,33 @@
+require recipes-graphics/xorg-lib/xorg-lib-common.inc
+SUMMARY = "X Athena Widget Set"
+DEPENDS += "xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxau xmlto-native"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=1c65719d42900bb81b83e8293c20a364"
+
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
+
+PE = "1"
+PR = "r2"
+
+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
+}
+
+inherit distro_features_check
+
+PACKAGES =+ "libxaw6 libxaw7 libxaw8"
+
+FILES_libxaw6 = "${libdir}/libXaw*.so.6*"
+FILES_libxaw7 = "${libdir}/libXaw*.so.7*"
+FILES_libxaw8 = "${libdir}/libXaw8.so.8*"
+
+# Avoid dependency on libxaw as it is not build
+RDEPENDS_${PN}-dev = ""
+
+XORG_PN = "libXaw"

1.9.1

core "xinit" package has a dependency to xterm so
move it from meta-oe to core.

core image "core-image-x11" includes xinit.

Updated to latest verison
Updated SRC_URI to us Debian. Old one was flakey.

Added X11 distro check.

---
 meta/recipes-graphics/xorg-app/xterm_313.bb | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 meta/recipes-graphics/xorg-app/xterm_313.bb

new file mode 120000
index 0000000..7193661
@@ -0,0 +1 @@
+/home/akuster/oss/mylayers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_303.bb
\ No newline at end of file

1.9.1

xinit.cpp in xinit package calls xterm, xclock and twm so add depends for those packages.

Added X11 distro check.

---
 meta/recipes-graphics/xorg-app/xinit_1.3.3.bb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

index 583ea87..874756d 100644
@@ -10,11 +10,17 @@ then terminate."
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=18f01e7b39807bebe2b8df101a039b68"
 
+DEPENDS = "twm xterm xclock"
+# depends on virtual/libx11
+REQUIRED_DISTRO_FEATURES = "x11"
+
 PE = "1"
 
 SRC_URI[md5sum] = "3b8da0e6237aee9828cc809c647510a7"
 SRC_URI[sha256sum] = "74b2878de6e3d5b5948f1562a77e7f53b4e10621e505ddb278050c7f3cae00af"
 
+inherit distro_features_check
+
 EXTRA_OECONF = "ac_cv_path_MCOOKIE=${bindir}/mcookie"
 
-RDEPENDS_${PN} += "util-linux-mcookie"
+RDEPENDS_${PN} += "util-linux-mcookie twm xterm xclock"

1.9.1

Why can't we just make core-image-x11 start Matchbox instead? Adding twm and xclock to oe-core seems crazy.

Ross

Crazy?? consider the source ; ) Let me look into matchbox, I am not familary with it. I might be able to disable calling xterm, xclock and twm via configure.

  --with-twm=TWM          Path to twm
  --with-xclock=XCLOCK    Path to xclock
  --with-xterm=XTERM      Path to xterm

I wasn't a total waste. the recipes need some tlc.

Thanks for the response.

- Armin

So are you open to move 'xinit' from core to meta-oe?

- Armin

No, xinit is used by all X11 images to start X. The default script starts twm etc, but images provide their own.

core-image-x11 installs matchbox-terminal and matchbox-window-manager so if the init isn't working in that images then that's a bug.

Ross