Skip to content
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.

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

Various Minor Recipe Cleanups #110

Merged
merged 13 commits into from
Feb 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
SUMMARY = "Set up LXA TAC LEDs with triggers that need sysfs interaction"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"

SUMMARY = "Set up LXA TAC LEDs with triggers that need sysfs interaction"

inherit allarch systemd

RDEPENDS:${PN} = "bash"

SYSTEMD_SERVICE:${PN} = "lxatac-led-setup.service"

SRC_URI += " \
file://lxatac-led-setup.service \
file://lxatac-led-setup.sh \
"

SYSTEMD_SERVICE:${PN} = "lxatac-led-setup.service"

inherit allarch systemd

do_install() {
install -m 0644 -D ${WORKDIR}/lxatac-led-setup.service ${D}${systemd_system_unitdir}/lxatac-led-setup.service
install -m 0755 -D ${WORKDIR}/lxatac-led-setup.sh ${D}${sbindir}/lxatac-led-setup
}

RDEPENDS:${PN} = "bash"
3 changes: 1 addition & 2 deletions meta-lxatac-bsp/recipes-kernel/linux/linux-lxatac.bb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ SECTION = "kernel"
LICENSE = "GPL-2.0-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"

PR = "r0"
PV = "6.7"

SRC_URI = "https://www.kernel.org/pub/linux/kernel/v6.x/linux-${PV}.tar.xz \
Expand All @@ -22,7 +21,7 @@ COMPATIBLE_MACHINE = "lxatac"

RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""

DEPENDS:append = "panel-shineworld-lh133k"
DEPENDS:append = " panel-shineworld-lh133k"

do_copy_fw() {
mkdir -p ${S}/firmware/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
PACKAGECONFIG = "testapp apps"
PACKAGECONFIG:remove[apps] = "--enable-kcapi-hasher"

do_install:append() {
# avoid conflicts with busybox and coreutils
Expand Down
1 change: 1 addition & 0 deletions meta-lxatac-software/recipes-devtools/bcu/bcu_1.1.75.bb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
SUMMARY = "Board Remote Control Utilities"
LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=884d48c2aa7b82e1ad4a33909fab24b6"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,3 @@ do_install() {
install -D -m0755 ${WORKDIR}/container-start.sh ${D}${bindir}/container-start
install -D -m0755 ${WORKDIR}/container-update.sh ${D}${bindir}/container-update
}

FILES_${PN} = "${bindir}"
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda

SUMMARY = "Export USB Gadget functions over the TAC USB-C connector"

PACKAGE_ARCH = "lxatac"
PACKAGE_ARCH = "${MACHINE_ARCH}"

INHIBIT_DEFAULT_DEPS = "1"

RDEPENDS:${PN} = " \
bash \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,27 +1,21 @@
FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
SUMMARY = "Tool to make firmware files for the Linux display driver panel-mipi-dbi."
LICENSE = "CC0-1.0"
LIC_FILES_CHKSUM = "file://mipi-dbi-cmd;beginline=4;endline=13;md5=5e3d3f14cc87aa9e8976d728520cbcae"
SRCREV = "374b15f78611c619c381c643c5b3a8b5d23f479b"
PV = "1.0+git${SRCPV}"

SRC_URI = "git://github.com/notro/panel-mipi-dbi.git;protocol=https;branch=main \
file://0001-Use-python3-in-shebang.patch \
"

PV = "1.0+git${SRCPV}"
SRCREV = "374b15f78611c619c381c643c5b3a8b5d23f479b"

S = "${WORKDIR}/git"

LICENSE = "CC0-1.0"
LIC_FILES_CHKSUM = "file://mipi-dbi-cmd;beginline=4;endline=13;md5=5e3d3f14cc87aa9e8976d728520cbcae"

DEPENDS = "python3-native"

inherit native

do_configure () {
}

do_compile () {
}

do_configure[noexec] = "1"
do_compile[noexec] = "1"
do_install () {
install -D -p -m 0755 ${S}/mipi-dbi-cmd ${D}${bindir}/mipi-dbi-cmd
}

RDEPENDS:${PN} += "python3-native"
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
SUMMARY = "Shineworld Panel Configuration"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"

PANEL_FIRMWARE = "shineworld,lh133k.txt"
SRC_URI = "file://${PANEL_FIRMWARE}"

inherit panel-mipi-dbi

PV = "1.0"

#S = "${WORKDIR}/git"

LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"

2 changes: 0 additions & 2 deletions meta-lxatac-software/recipes-rust/tacd/tacd.inc
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,3 @@ do_install:append() {
install -d ${D}${sysconfdir}/dbus-1/system.d
install -m 0644 ${WORKDIR}/de.pengutronix.tacd.conf ${D}/${sysconfdir}/dbus-1/system.d/
}

#FILES:${PN} += "${sysconfdir} ${systemd_system_unitdir} ${sysconfdir}/dbus-1/system.d"
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
SUMMARY = "The LXA TAC System Daemon - Web Interface"
SRC_URI = " \
git://github.com/linux-automation/tacd.git;protocol=https;branch=main \
npmsw://${THISDIR}/${BPN}/npm-shrinkwrap.json \
"
LICENSE = "GPL-2.0-or-later"
LIC_FILES_CHKSUM = " \
file://../LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
"

PV = "0.1.0+git${SRCPV}"
SRCREV = "803b2084b26634542ebf763c818083884d49ac0d"
Expand All @@ -14,7 +19,7 @@ inherit npm
# build process to generate static html, js and css files.
RDEPENDS:${PN}:remove = "nodejs"

WEBUI_INSTALL_DIR="${NPM_BUILD}/lib/node_modules/tacd-web"
WEBUI_INSTALL_DIR = "${NPM_BUILD}/lib/node_modules/tacd-web"

npm_run_build () {
cd "${WEBUI_INSTALL_DIR}"
Expand All @@ -35,9 +40,4 @@ do_install() {
cp -r "${WEBUI_INSTALL_DIR}/build" "${D}${datadir}/tacd/webui"
}

LICENSE = "GPL-2.0-or-later"
LIC_FILES_CHKSUM = " \
file://../LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
"

FILES:${PN} = "${datadir}/tacd"