* [PATCHv2 1/6] image_types: improve wks path specification
2015-11-13 23:10 [PATCHv2 0/6] Misc improvements 1 from Mentor Christopher Larson
@ 2015-11-13 23:10 ` Christopher Larson
2015-11-13 23:10 ` [PATCHv2 2/6] sysprof: use packageconfig for the gui Christopher Larson
` (4 subsequent siblings)
5 siblings, 0 replies; 14+ messages in thread
From: Christopher Larson @ 2015-11-13 23:10 UTC (permalink / raw)
To: openembedded-core; +Cc: Christopher Larson
From: Christopher Larson <chris_larson@mentor.com>
Hardcoding a full input path with zero flexibility goes against everything the
Yocto Project is about. Rework it to let the user specify the wks base
filename with WKS_FILE and it'll search the layers for the wks file and use
it.
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
meta/classes/image_types.bbclass | 36 +++++++++++++++++++++++++++++-------
1 file changed, 29 insertions(+), 7 deletions(-)
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 5036919..afe8d0c 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -170,15 +170,37 @@ IMAGE_CMD_ubi () {
IMAGE_CMD_ubifs = "mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubifs ${MKUBIFS_ARGS}"
+WKS_FILE ?= "${IMAGE_BASENAME}.${MACHINE}.wks"
+WKS_FILES ?= "${WKS_FILE} ${IMAGE_BASENAME}.wks"
+WKS_SEARCH_PATH ?= "${THISDIR}:${@':'.join('%s/scripts/lib/wic/canned-wks' % l for l in '${BBPATH}:${COREBASE}'.split(':'))}"
+WKS_FULL_PATH = "${@wks_search('${WKS_FILES}'.split(), '${WKS_SEARCH_PATH}') or ''}"
+
+def wks_search(files, search_path):
+ for f in files:
+ if os.path.isabs(f):
+ if os.path.exists(f):
+ return f
+ else:
+ searched = bb.utils.which(search_path, f)
+ if searched:
+ return searched
+
IMAGE_CMD_wic () {
- out=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}
- wks=${FILE_DIRNAME}/${IMAGE_BASENAME}.${MACHINE}.wks
- [ -e $wks ] || wks=${FILE_DIRNAME}/${IMAGE_BASENAME}.wks
- [ -e $wks ] || bbfatal "Kiskstart file $wks doesn't exist"
- BUILDDIR=${TOPDIR} wic create $wks --vars ${STAGING_DIR_TARGET}/imgdata/ -e ${IMAGE_BASENAME} -o $out/
- mv $out/build/${IMAGE_BASENAME}*.direct $out.rootfs.wic
- rm -rf $out/
+ out="${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}"
+ wks="${WKS_FULL_PATH}"
+ if [ -z "$wks" ]; then
+ bbfatal "No kickstart files from WKS_FILES were found: ${WKS_FILES}. Please set WKS_FILE or WKS_FILES appropriately."
+ fi
+
+ BUILDDIR="${TOPDIR}" wic create "$wks" --vars "${STAGING_DIR_TARGET}/imgdata/" -e "${IMAGE_BASENAME}" -o "$out/"
+ mv "$out/build/$(basename "${wks%.wks}")"*.direct "$out.rootfs.wic"
+ rm -rf "$out/"
}
+IMAGE_CMD_wic[vardepsexclude] = "WKS_FULL_PATH WKS_FILES"
+
+# Rebuild when the wks file changes
+USING_WIC = "${@bb.utils.contains_any('IMAGE_FSTYPES', 'wic ' + ' '.join('wic.%s' % c for c in '${COMPRESSIONTYPES}'.split()), '1', '', d)}"
+do_rootfs[file-checksums] += "${@'${WKS_FULL_PATH}:%s' % os.path.exists('${WKS_FULL_PATH}') if '${USING_WIC}' else ''}"
EXTRA_IMAGECMD = ""
--
2.2.1
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCHv2 2/6] sysprof: use packageconfig for the gui
2015-11-13 23:10 [PATCHv2 0/6] Misc improvements 1 from Mentor Christopher Larson
2015-11-13 23:10 ` [PATCHv2 1/6] image_types: improve wks path specification Christopher Larson
@ 2015-11-13 23:10 ` Christopher Larson
2015-11-13 23:10 ` [PATCHv2 3/6] sysprof: add missing gdk-pixbuf/pango deps Christopher Larson
` (3 subsequent siblings)
5 siblings, 0 replies; 14+ messages in thread
From: Christopher Larson @ 2015-11-13 23:10 UTC (permalink / raw)
To: openembedded-core; +Cc: Christopher Larson
From: Christopher Larson <chris_larson@mentor.com>
This makes the gtk dependencies optional.
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
.../sysprof/files/gui-argument.patch | 35 ++++++++++++++++++++++
meta/recipes-kernel/sysprof/sysprof_git.bb | 9 ++++--
2 files changed, 41 insertions(+), 3 deletions(-)
create mode 100644 meta/recipes-kernel/sysprof/files/gui-argument.patch
diff --git a/meta/recipes-kernel/sysprof/files/gui-argument.patch b/meta/recipes-kernel/sysprof/files/gui-argument.patch
new file mode 100644
index 0000000..ad76b40
--- /dev/null
+++ b/meta/recipes-kernel/sysprof/files/gui-argument.patch
@@ -0,0 +1,35 @@
+Add the ability to explicitly enable/disable GUI support
+
+Signed-off-by: Christopher Larson <chris_larson@mentor.com>
+Upstream-status: Pending
+
+--- git.orig/configure.ac
++++ git/configure.ac
+@@ -62,12 +62,24 @@ KMICRO=`uname -r | cut -d"." -f 3 | cut
+ # Pkgconfig dependencies
+
+ core_dep="glib-2.0 >= 2.6.0"
+-gui_dep="gtk+-2.0 > 2.6.0 gdk-pixbuf-2.0 pangoft2 libglade-2.0"
+
+ PKG_CHECK_MODULES(CORE_DEP, $core_dep, [], AC_MSG_ERROR([sysprof dependencies not satisfied]))
+
+-build_gui=yes
+-PKG_CHECK_MODULES(GUI_DEP, $gui_dep, [], build_gui=no)
++gui_dep="gtk+-2.0 > 2.6.0 gdk-pixbuf-2.0 pangoft2 libglade-2.0"
++
++AC_ARG_ENABLE([gui],
++ [AS_HELP_STRING([--disable-gui],
++ [Disable GUI functionality (requires gtk+, gdk-pixbuf, pangoft2, libglade) @<:@default=auto@:>@])],
++ [],
++ [enable_gui=auto])
++
++build_gui=no
++AS_IF([test "x$enable_gui" != xno],
++ [PKG_CHECK_MODULES(GUI_DEP, $gui_dep, build_gui=yes,
++ [if test "x$enable_gui" != xauto; then
++ AC_MSG_FAILURE(
++ [--enable-gui was given, but gui dependencies were not satisfied])
++ fi])])
+
+ AM_CONDITIONAL([BUILD_GUI], [test "$build_gui" = yes])
+
diff --git a/meta/recipes-kernel/sysprof/sysprof_git.bb b/meta/recipes-kernel/sysprof/sysprof_git.bb
index 7d87efe..d331a23 100644
--- a/meta/recipes-kernel/sysprof/sysprof_git.bb
+++ b/meta/recipes-kernel/sysprof/sysprof_git.bb
@@ -2,13 +2,14 @@ SUMMARY = "System-wide Performance Profiler for Linux"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-DEPENDS = "gtk+ libglade"
+DEPENDS = "glib-2.0"
SRCREV = "cd44ee6644c3641507fb53b8a2a69137f2971219"
PV = "1.2.0+git${SRCPV}"
SRC_URI = "git://git.gnome.org/sysprof \
file://define-NT_GNU_BUILD_ID.patch \
+ file://gui-argument.patch \
"
SRC_URI_append_arm = " file://rmb-arm.patch"
@@ -19,8 +20,10 @@ SRC_URI_append_mips64n32 = " file://rmb-mips.patch"
S = "${WORKDIR}/git"
-inherit autotools pkgconfig distro_features_check
-ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}"
+inherit autotools pkgconfig
+
+PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK2DISTROFEATURES}', 'gui', '', d)}"
+PACKAGECONFIG[gui] = "--enable-gui,--disable-gui,gtk+ libglade"
# We do not yet work for aarch64.
#
--
2.2.1
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCHv2 3/6] sysprof: add missing gdk-pixbuf/pango deps
2015-11-13 23:10 [PATCHv2 0/6] Misc improvements 1 from Mentor Christopher Larson
2015-11-13 23:10 ` [PATCHv2 1/6] image_types: improve wks path specification Christopher Larson
2015-11-13 23:10 ` [PATCHv2 2/6] sysprof: use packageconfig for the gui Christopher Larson
@ 2015-11-13 23:10 ` Christopher Larson
2015-11-16 15:12 ` Burton, Ross
2015-11-13 23:10 ` [PATCHv2 4/6] systemd: for valgrind, define VALGRIND=1 Christopher Larson
` (2 subsequent siblings)
5 siblings, 1 reply; 14+ messages in thread
From: Christopher Larson @ 2015-11-13 23:10 UTC (permalink / raw)
To: openembedded-core; +Cc: Christopher Larson
From: Christopher Larson <chris_larson@mentor.com>
These are explicitly checked with pkg-config in the configure script.
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
meta/recipes-kernel/sysprof/sysprof_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-kernel/sysprof/sysprof_git.bb b/meta/recipes-kernel/sysprof/sysprof_git.bb
index d331a23..84c6aad 100644
--- a/meta/recipes-kernel/sysprof/sysprof_git.bb
+++ b/meta/recipes-kernel/sysprof/sysprof_git.bb
@@ -23,7 +23,7 @@ S = "${WORKDIR}/git"
inherit autotools pkgconfig
PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK2DISTROFEATURES}', 'gui', '', d)}"
-PACKAGECONFIG[gui] = "--enable-gui,--disable-gui,gtk+ libglade"
+PACKAGECONFIG[gui] = "--enable-gui,--disable-gui,gtk+ gdk-pixbuf pango libglade"
# We do not yet work for aarch64.
#
--
2.2.1
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCHv2 3/6] sysprof: add missing gdk-pixbuf/pango deps
2015-11-13 23:10 ` [PATCHv2 3/6] sysprof: add missing gdk-pixbuf/pango deps Christopher Larson
@ 2015-11-16 15:12 ` Burton, Ross
2015-11-16 15:55 ` Christopher Larson
0 siblings, 1 reply; 14+ messages in thread
From: Burton, Ross @ 2015-11-16 15:12 UTC (permalink / raw)
To: Christopher Larson; +Cc: Christopher Larson, OE-core
[-- Attachment #1: Type: text/plain, Size: 317 bytes --]
On 13 November 2015 at 23:10, Christopher Larson <kergoth@gmail.com> wrote:
> -PACKAGECONFIG[gui] = "--enable-gui,--disable-gui,gtk+ libglade"
> +PACKAGECONFIG[gui] = "--enable-gui,--disable-gui,gtk+ gdk-pixbuf pango
> libglade"
>
As you're patching something you just introduced, I squashed these.
Ross
[-- Attachment #2: Type: text/html, Size: 744 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCHv2 3/6] sysprof: add missing gdk-pixbuf/pango deps
2015-11-16 15:12 ` Burton, Ross
@ 2015-11-16 15:55 ` Christopher Larson
0 siblings, 0 replies; 14+ messages in thread
From: Christopher Larson @ 2015-11-16 15:55 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 821 bytes --]
On Mon, Nov 16, 2015 at 8:12 AM, Burton, Ross <ross.burton@intel.com> wrote:
> On 13 November 2015 at 23:10, Christopher Larson <kergoth@gmail.com>
> wrote:
>
>> -PACKAGECONFIG[gui] = "--enable-gui,--disable-gui,gtk+ libglade"
>> +PACKAGECONFIG[gui] = "--enable-gui,--disable-gui,gtk+ gdk-pixbuf pango
>> libglade"
>>
>
> As you're patching something you just introduced, I squashed these.
Conceptually, they're independent, since these additional deps weren't in
the original DEPENDS either, so the first makes it conditional, the second
alters what the deps of the recipe are, but I don't feel too strongly about
it, squashing is okay too.
--
Christopher Larson
kergoth at gmail dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics
[-- Attachment #2: Type: text/html, Size: 1484 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCHv2 4/6] systemd: for valgrind, define VALGRIND=1
2015-11-13 23:10 [PATCHv2 0/6] Misc improvements 1 from Mentor Christopher Larson
` (2 preceding siblings ...)
2015-11-13 23:10 ` [PATCHv2 3/6] sysprof: add missing gdk-pixbuf/pango deps Christopher Larson
@ 2015-11-13 23:10 ` Christopher Larson
2015-11-13 23:10 ` [PATCHv2 5/6] bluez5: enable sysvinit support Christopher Larson
2015-11-13 23:10 ` [PATCHv2 6/6] psplash: add systemd support Christopher Larson
5 siblings, 0 replies; 14+ messages in thread
From: Christopher Larson @ 2015-11-13 23:10 UTC (permalink / raw)
To: openembedded-core; +Cc: Christopher Larson
From: Christopher Larson <chris_larson@mentor.com>
Per the systemd README, this should be defined to run systemd under valgrind,
otherwise false positives will be triggered.
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
meta/recipes-core/systemd/systemd_225.bb | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta/recipes-core/systemd/systemd_225.bb b/meta/recipes-core/systemd/systemd_225.bb
index 18c2448..74304be 100644
--- a/meta/recipes-core/systemd/systemd_225.bb
+++ b/meta/recipes-core/systemd/systemd_225.bb
@@ -127,6 +127,9 @@ EXTRA_OECONF = " --with-rootprefix=${rootprefix} \
# uclibc does not have NSS
EXTRA_OECONF_append_libc-uclibc = " --disable-myhostname "
+# per the systemd README, define VALGRIND=1 to run under valgrind
+CFLAGS .= "${@bb.utils.contains('PACKAGECONFIG', 'valgrind', ' -DVALGRIND=1', '', d)}"
+
# disable problematic GCC 5.2 optimizations [YOCTO #8291]
FULL_OPTIMIZATION_append_arm = " -fno-schedule-insns -fno-schedule-insns2"
--
2.2.1
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCHv2 5/6] bluez5: enable sysvinit support
2015-11-13 23:10 [PATCHv2 0/6] Misc improvements 1 from Mentor Christopher Larson
` (3 preceding siblings ...)
2015-11-13 23:10 ` [PATCHv2 4/6] systemd: for valgrind, define VALGRIND=1 Christopher Larson
@ 2015-11-13 23:10 ` Christopher Larson
2015-11-13 23:10 ` [PATCHv2 6/6] psplash: add systemd support Christopher Larson
5 siblings, 0 replies; 14+ messages in thread
From: Christopher Larson @ 2015-11-13 23:10 UTC (permalink / raw)
To: openembedded-core; +Cc: Christopher Larson
From: Christopher Larson <chris_larson@mentor.com>
This is from Shrikant Bobade <Shrikant_Bobade@mentor.com>.
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
meta/recipes-connectivity/bluez5/bluez5.inc | 8 +++-
meta/recipes-connectivity/bluez5/bluez5/init | 68 ++++++++++++++++++++++++++++
2 files changed, 75 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-connectivity/bluez5/bluez5/init
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index df42c88..13fd600 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -18,10 +18,11 @@ PACKAGECONFIG[experimental] = "--enable-experimental,--disable-experimental,"
SRC_URI = "\
${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \
+ file://init \
"
S = "${WORKDIR}/bluez-${PV}"
-inherit autotools-brokensep pkgconfig systemd
+inherit autotools-brokensep pkgconfig systemd update-rc.d
EXTRA_OECONF = "\
--enable-tools \
@@ -42,6 +43,9 @@ NOINST_TOOLS = " \
"
do_install_append() {
+ install -d ${D}${INIT_D_DIR}
+ install -m 0755 ${WORKDIR}/init ${D}${INIT_D_DIR}/bluetooth
+
install -d ${D}${sysconfdir}/bluetooth/
if [ -f ${S}/profiles/audio/audio.conf ]; then
install -m 0644 ${S}/profiles/audio/audio.conf ${D}/${sysconfdir}/bluetooth/
@@ -100,5 +104,7 @@ FILES_${PN}-dbg += "\
RDEPENDS_${PN}-testtools += "python python-dbus python-pygobject"
SYSTEMD_SERVICE_${PN} = "bluetooth.service"
+INITSCRIPT_PACKAGES = "${PN}"
+INITSCRIPT_NAME_${PN} = "bluetooth"
EXCLUDE_FROM_WORLD = "1"
diff --git a/meta/recipes-connectivity/bluez5/bluez5/init b/meta/recipes-connectivity/bluez5/bluez5/init
new file mode 100644
index 0000000..1606a5c
--- /dev/null
+++ b/meta/recipes-connectivity/bluez5/bluez5/init
@@ -0,0 +1,68 @@
+#!/bin/sh
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+DESC=bluetooth
+
+DAEMON=/usr/lib/bluez5/bluetooth/bluetoothd
+
+# If you want to be ignore error of "org.freedesktop.hostname1",
+# please enable NOPLUGIN_OPTION.
+# NOPLUGIN_OPTION="--noplugin=hostname"
+NOPLUGIN_OPTION=""
+SSD_OPTIONS="--oknodo --quiet --exec $DAEMON -- $NOPLUGIN_OPTION"
+
+test -f $DAEMON || exit 0
+
+# FIXME: any of the sourced files may fail if/with syntax errors
+test -f /etc/default/bluetooth && . /etc/default/bluetooth
+test -f /etc/default/rcS && . /etc/default/rcS
+
+set -e
+
+case $1 in
+ start)
+ echo "Starting $DESC"
+
+ if test "$BLUETOOTH_ENABLED" = 0; then
+ echo "disabled. see /etc/default/bluetooth"
+ exit 0
+ fi
+
+ start-stop-daemon --start --background $SSD_OPTIONS
+ echo "${DAEMON##*/}"
+
+ ;;
+ stop)
+ echo "Stopping $DESC"
+ if test "$BLUETOOTH_ENABLED" = 0; then
+ echo "disabled."
+ exit 0
+ fi
+ start-stop-daemon --stop $SSD_OPTIONS
+ echo "${DAEMON}"
+ ;;
+ restart|force-reload)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+ status)
+ pidof ${DAEMON} >/dev/null
+ status=$?
+ if [ $status -eq 0 ]; then
+ echo "bluetooth is running."
+ else
+ echo "bluetooth is not running"
+ fi
+ exit $status
+ ;;
+ *)
+ N=/etc/init.d/bluetooth
+ echo "Usage: $N {start|stop|restart|force-reload|status}" >&2
+ exit 1
+ ;;
+esac
+
+exit 0
+
+# vim:noet
--
2.2.1
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCHv2 6/6] psplash: add systemd support
2015-11-13 23:10 [PATCHv2 0/6] Misc improvements 1 from Mentor Christopher Larson
` (4 preceding siblings ...)
2015-11-13 23:10 ` [PATCHv2 5/6] bluez5: enable sysvinit support Christopher Larson
@ 2015-11-13 23:10 ` Christopher Larson
2015-11-17 21:36 ` Burton, Ross
5 siblings, 1 reply; 14+ messages in thread
From: Christopher Larson @ 2015-11-13 23:10 UTC (permalink / raw)
To: openembedded-core; +Cc: Christopher Larson
From: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
meta/recipes-core/psplash/files/psplash-quit.service | 11 +++++++++++
.../recipes-core/psplash/files/psplash-start.service | 11 +++++++++++
meta/recipes-core/psplash/psplash_git.bb | 20 +++++++++++++++-----
3 files changed, 37 insertions(+), 5 deletions(-)
create mode 100755 meta/recipes-core/psplash/files/psplash-quit.service
create mode 100755 meta/recipes-core/psplash/files/psplash-start.service
diff --git a/meta/recipes-core/psplash/files/psplash-quit.service b/meta/recipes-core/psplash/files/psplash-quit.service
new file mode 100755
index 0000000..14bd499
--- /dev/null
+++ b/meta/recipes-core/psplash/files/psplash-quit.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Terminate Psplash Boot Screen
+After=psplash-start.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/psplash-write QUIT
+TimeoutSec=20
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-core/psplash/files/psplash-start.service b/meta/recipes-core/psplash/files/psplash-start.service
new file mode 100755
index 0000000..502b150
--- /dev/null
+++ b/meta/recipes-core/psplash/files/psplash-start.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Starts Psplash Boot screen
+Wants=systemd-vconsole-setup.service
+After=systemd-vconsole-setup.service systemd-udev-trigger.service systemd-udevd.service
+DefaultDependencies=no
+
+[Service]
+ExecStart=/usr/bin/psplash
+
+[Install]
+WantedBy=sysinit.target
diff --git a/meta/recipes-core/psplash/psplash_git.bb b/meta/recipes-core/psplash/psplash_git.bb
index b3b6479..acf294f 100644
--- a/meta/recipes-core/psplash/psplash_git.bb
+++ b/meta/recipes-core/psplash/psplash_git.bb
@@ -12,6 +12,8 @@ PR = "r15"
SRC_URI = "git://git.yoctoproject.org/${BPN} \
file://0001-psplash-fb-Convert-psplash_fb_plot_pixel-to-a-static.patch \
file://psplash-init \
+ file://psplash-start.service \
+ file://psplash-quit.service \
${SPLASH_IMAGES}"
SPLASH_IMAGES = "file://psplash-poky-img.h;outsuffix=default"
@@ -66,11 +68,13 @@ python __anonymous() {
S = "${WORKDIR}/git"
-inherit autotools pkgconfig update-rc.d update-alternatives
+inherit autotools pkgconfig update-rc.d update-alternatives systemd
ALTERNATIVE_PRIORITY = "100"
ALTERNATIVE_LINK_NAME[psplash] = "${bindir}/psplash"
+SYSTEMD_SERVICE_${PN} = "psplash-start.service psplash-quit.service"
+
python do_compile () {
import shutil
@@ -97,8 +101,15 @@ python do_compile () {
do_install_append() {
install -d ${D}/mnt/.psplash/
- install -d ${D}${sysconfdir}/init.d/
- install -m 0755 ${WORKDIR}/psplash-init ${D}${sysconfdir}/init.d/psplash.sh
+ if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
+ install -d ${D}${sysconfdir}/init.d/
+ install -m 0755 ${WORKDIR}/psplash-init ${D}${sysconfdir}/init.d/psplash.sh
+ fi
+ if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+ install -d ${D}${systemd_unitdir}/system
+ install -m 0644 ${WORKDIR}/psplash-quit.service ${D}${systemd_unitdir}/system
+ install -m 0644 ${WORKDIR}/psplash-start.service ${D}${systemd_unitdir}/system
+ fi
install -d ${D}${bindir}
for i in ${SPLASH_INSTALL} ; do
install -m 0755 $i ${D}${bindir}/$i
@@ -111,9 +122,8 @@ FILES_${PN} += "/mnt/.psplash"
INITSCRIPT_NAME = "psplash.sh"
INITSCRIPT_PARAMS = "start 0 S . stop 20 0 1 6 ."
-DEPENDS_append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}"
pkg_postinst_${PN} () {
- if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+ if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
if [ -n "$D" ]; then
OPTS="--root=$D"
fi
--
2.2.1
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCHv2 6/6] psplash: add systemd support
2015-11-13 23:10 ` [PATCHv2 6/6] psplash: add systemd support Christopher Larson
@ 2015-11-17 21:36 ` Burton, Ross
2015-11-18 2:03 ` Christopher Larson
0 siblings, 1 reply; 14+ messages in thread
From: Burton, Ross @ 2015-11-17 21:36 UTC (permalink / raw)
To: Christopher Larson; +Cc: Christopher Larson, OE-core
[-- Attachment #1: Type: text/plain, Size: 1552 bytes --]
On 13 November 2015 at 23:10, Christopher Larson <kergoth@gmail.com> wrote:
> meta/recipes-core/psplash/files/psplash-quit.service | 11 +++++++++++
> .../recipes-core/psplash/files/psplash-start.service | 11 +++++++++++
> meta/recipes-core/psplash/psplash_git.bb | 20
> +++++++++++++++-----
>
This causes the selftest to fail:
| ======================================================================
| FAIL: test_systemd_failed (oeqa.runtime.systemd.SystemdBasicTests)
| ----------------------------------------------------------------------
| Traceback (most recent call last):
| File
"/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-systemd/build/meta/lib/oeqa/utils/decorators.py",
line 106, in wrapped_f
| return func(*args, **kwargs)
| File
"/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-systemd/build/meta/lib/oeqa/utils/decorators.py",
line 94, in wrapped_f
| return f(*args, **kwargs)
| File
"/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-systemd/build/meta/lib/oeqa/runtime/systemd.py",
line 65, in test_systemd_failed
| self.assertTrue(match, msg="Some systemd units failed:\n%s" % output)
| AssertionError: None is not true : Some systemd units failed:
| UNIT LOAD ACTIVE SUB DESCRIPTION
| ● bluetooth.service loaded failed failed Bluetooth service
| ● psplash-quit.service loaded failed failed Terminate Psplash Boot Screen
| ● psplash-start.service loaded failed failed Starts Psplash Boot screen
Ross
[-- Attachment #2: Type: text/html, Size: 2311 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCHv2 6/6] psplash: add systemd support
2015-11-17 21:36 ` Burton, Ross
@ 2015-11-18 2:03 ` Christopher Larson
2015-11-20 15:23 ` Ross Burton
0 siblings, 1 reply; 14+ messages in thread
From: Christopher Larson @ 2015-11-18 2:03 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 2144 bytes --]
On Tue, Nov 17, 2015 at 2:36 PM, Burton, Ross <ross.burton@intel.com> wrote:
> On 13 November 2015 at 23:10, Christopher Larson <kergoth@gmail.com>
> wrote:
>
>> meta/recipes-core/psplash/files/psplash-quit.service | 11 +++++++++++
>> .../recipes-core/psplash/files/psplash-start.service | 11 +++++++++++
>> meta/recipes-core/psplash/psplash_git.bb | 20
>> +++++++++++++++-----
>>
>
> This causes the selftest to fail:
> | ======================================================================
> | FAIL: test_systemd_failed (oeqa.runtime.systemd.SystemdBasicTests)
> | ----------------------------------------------------------------------
> | Traceback (most recent call last):
> | File
> "/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-systemd/build/meta/lib/oeqa/utils/decorators.py",
> line 106, in wrapped_f
> | return func(*args, **kwargs)
> | File
> "/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-systemd/build/meta/lib/oeqa/utils/decorators.py",
> line 94, in wrapped_f
> | return f(*args, **kwargs)
> | File
> "/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-systemd/build/meta/lib/oeqa/runtime/systemd.py",
> line 65, in test_systemd_failed
> | self.assertTrue(match, msg="Some systemd units failed:\n%s" % output)
> | AssertionError: None is not true : Some systemd units failed:
> | UNIT LOAD ACTIVE SUB DESCRIPTION
> | ● bluetooth.service loaded failed failed Bluetooth service
> | ● psplash-quit.service loaded failed failed Terminate Psplash Boot
> Screen
> | ● psplash-start.service loaded failed failed Starts Psplash Boot screen
Interesting, is psplash configured in our test environment? Either way,
worst case we can drop this commit for now and can revisit it. I'm heading
out of town tomorrow until December 1st, so likely will be limited in what
I can do to address any issues that crop up during that period. Thanks.
--
Christopher Larson
kergoth at gmail dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics
[-- Attachment #2: Type: text/html, Size: 3034 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCHv2 6/6] psplash: add systemd support
2015-11-18 2:03 ` Christopher Larson
@ 2015-11-20 15:23 ` Ross Burton
2015-12-08 15:38 ` Christopher Larson
0 siblings, 1 reply; 14+ messages in thread
From: Ross Burton @ 2015-11-20 15:23 UTC (permalink / raw)
To: Christopher Larson; +Cc: OE-core
On 18/11/2015 02:03, Christopher Larson wrote:
> Interesting, is psplash configured in our test environment? Either way,
> worst case we can drop this commit for now and can revisit it. I'm
> heading out of town tomorrow until December 1st, so likely will be
> limited in what I can do to address any issues that crop up during that
> period. Thanks.
It should be working - at least the sysvinit images work absolutely fine
and show the splash. I'll add giving this a go locally to my list of
things to do.
Ross
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCHv2 6/6] psplash: add systemd support
2015-11-20 15:23 ` Ross Burton
@ 2015-12-08 15:38 ` Christopher Larson
2015-12-08 17:15 ` Otavio Salvador
0 siblings, 1 reply; 14+ messages in thread
From: Christopher Larson @ 2015-12-08 15:38 UTC (permalink / raw)
To: Ross Burton; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 907 bytes --]
On Fri, Nov 20, 2015 at 8:23 AM, Ross Burton <ross.burton@intel.com> wrote:
> On 18/11/2015 02:03, Christopher Larson wrote:
>
>> Interesting, is psplash configured in our test environment? Either way,
>> worst case we can drop this commit for now and can revisit it. I'm
>> heading out of town tomorrow until December 1st, so likely will be
>> limited in what I can do to address any issues that crop up during that
>> period. Thanks.
>>
>
> It should be working - at least the sysvinit images work absolutely fine
> and show the splash. I'll add giving this a go locally to my list of
> things to do.
I'll dig into this shortly and re-submit if appropriate. Getting caught up
on the status of submitted patches now. Thanks.
--
Christopher Larson
kergoth at gmail dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics
[-- Attachment #2: Type: text/html, Size: 1413 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCHv2 6/6] psplash: add systemd support
2015-12-08 15:38 ` Christopher Larson
@ 2015-12-08 17:15 ` Otavio Salvador
0 siblings, 0 replies; 14+ messages in thread
From: Otavio Salvador @ 2015-12-08 17:15 UTC (permalink / raw)
To: Christopher Larson; +Cc: OE-core
On Tue, Dec 8, 2015 at 1:38 PM, Christopher Larson <kergoth@gmail.com> wrote:
>
> On Fri, Nov 20, 2015 at 8:23 AM, Ross Burton <ross.burton@intel.com> wrote:
>>
>> On 18/11/2015 02:03, Christopher Larson wrote:
>>>
>>> Interesting, is psplash configured in our test environment? Either way,
>>> worst case we can drop this commit for now and can revisit it. I'm
>>> heading out of town tomorrow until December 1st, so likely will be
>>> limited in what I can do to address any issues that crop up during that
>>> period. Thanks.
>>
>>
>> It should be working - at least the sysvinit images work absolutely fine
>> and show the splash. I'll add giving this a go locally to my list of things
>> to do.
>
>
> I'll dig into this shortly and re-submit if appropriate. Getting caught up
> on the status of submitted patches now. Thanks.
We have an internal user-space splash system and we ended using
libsystemd to notify when the initialization is complete.
--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
^ permalink raw reply [flat|nested] 14+ messages in thread