Skip to content

recipes-core/easysplash: Update for modern OE-Core and fix service install #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lucianogdittgen wants to merge 1 commit into
base: wrynose
Choose a base branch
from
+7 −6
Open

recipes-core/easysplash: Update for modern OE-Core and fix service install #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion recipes-core/easysplash/easysplash-common-2.0.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ SRC_URI = "git://github.com/OSSystems/EasySplash.git;branch=${SRCBRANCH};protoco

PV = "2.0.0"

S = "${WORKDIR}/git"

EXTRA_OEMAKE += " \
prefix=${prefix} \
Expand Down
2 changes: 1 addition & 1 deletion recipes-core/easysplash/easysplash-config_2.0.0.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ LICENSE = "CLOSED"
SRC_URI += "file://easysplash.default"

do_install() {
install -Dm 0644 ${WORKDIR}/easysplash.default ${D}${sysconfdir}/default/easysplash
install -Dm 0644 ${UNPACKDIR}/easysplash.default ${D}${sysconfdir}/default/easysplash
}

PACKAGE_ARCH = "${MACHINE_ARCH}"
10 changes: 6 additions & 4 deletions recipes-core/easysplash/easysplash_2.0.0.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,14 @@ PACKAGECONFIG ?= "\
${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
"

PACKAGECONFIG[sysvinit] = "INIT=1, INIT=0,"
PACKAGECONFIG[systemd] = "SYSTEMD=1, SYSTEM=0, systemd"
PACKAGECONFIG[sysvinit] = ",,"
PACKAGECONFIG[systemd] = ",, systemd"

do_install:append() {
(cd ${S} ; oe_runmake install-service DESTDIR=${D})
rm ${D}${sysconfdir}/default/easysplash
(cd ${S} ; oe_runmake install-service DESTDIR=${D} \
${@bb.utils.contains('PACKAGECONFIG', 'sysvinit', 'INIT=1', 'INIT=0', d)} \
${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'SYSTEMD=1', 'SYSTEMD=0', d)})
rm ${D}${sysconfdir}/default/easysplash
}

RDEPENDS:${PN} += "easysplash-config"