dany/meta-diya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: dany:scarthgap
Branches Tags
dany:master
dany:scarthgap
...
compare: dany:master
Branches Tags
dany:master
dany:scarthgap

2 Commits
scarthgap ... master

Author SHA1 Message Date
DanyLE
bb5a5245c8 add gui users to seat groups 2025-07-12 23:54:51 +02:00
DanyLE
a9cce7b660 switch to walnascar 2025-07-12 17:21:52 +02:00
15 changed files with 38 additions and 36 deletions
Expand all files Collapse all files

4
conf/layer.conf
View File

@ -10,7 +10,7 @@ BBFILE_PATTERN_meta-diya = "^${LAYERDIR}/"
BBFILE_PRIORITY_meta-diya = "11"
LAYERDEPENDS_meta-diya = " core "
LAYERSERIES_COMPAT_meta-diya = "scarthgap"
LAYERSERIES_COMPAT_meta-diya = "walnascar"
PACKAGE_CLASSES = "package_ipk"
@ -22,7 +22,7 @@ INHERIT += "rm_work"
EXTRA_IMAGE_FEATURES ?= " ssh-server-dropbear read-only-rootfs "
DISTRO_FEATURES:append := " opengl pam "
DISTRO_FEATURES:remove = " x11 vulkan ptest "
TOOLCHAIN_TARGET_TASK:append = " libgles3-mesa-dev "
TOOLCHAIN_TARGET_TASK:append := " libgles3-mesa-dev "
# DISTRO_FEATURES:append := " vc4-gfx opengl directfb "
WKS_FILE="image.wks.in"

2
recipes-core/dropbear/dropbear_%.bbappend
View File

@ -3,5 +3,5 @@ SRC_URI += "file://default"
do_install:append () {
rm -rf ${D}/etc/dropbear
install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/default/dropbear
install -m 0644 ${UNPACKDIR}/default ${D}${sysconfdir}/default/dropbear
}

4
recipes-core/images/core-image-base.bbappend
View File

@ -8,6 +8,8 @@ EXTRA_USERS_PARAMS:append = "useradd xdg; \
usermod -a -G input xdg; \
usermod -a -G tty xdg; \
usermod -a -G avahi diya; \
usermod -a -G seat diya; \
usermod -a -G seat xdg; \
usermod -a -G xdg diya;"
IMAGE_INSTALL:append = "pango \
seatd \
@ -22,7 +24,7 @@ IMAGE_INSTALL:append = "pango \
gtk4-layer-shell \
libadwaita \
gobject-introspection \
wayland wayland-protocols wlroots \
wayland wayland-protocols wlroots-0.18 \
foot \
mc \
gdbserver gdb \

2
recipes-core/init-ifupdown/init-ifupdown_%.bbappend
View File

@ -3,5 +3,5 @@ SRC_URI += " file://itf_diya "
do_install:append () {
rm ${D}/etc/network/interfaces
install -m 0644 ${WORKDIR}/itf_diya ${D}/etc/network/interfaces
install -m 0644 ${UNPACKDIR}/itf_diya ${D}/etc/network/interfaces
}

16
recipes-diya/diya-overlay/diya-overlay.bb
View File

@ -12,7 +12,7 @@ SRC_URI += "file://confd \
file://diya.pam \
file://xdg-terminal-exec"
S = "${UNPACKDIR}"
inherit update-rc.d useradd
USERADD_PACKAGES = "${PN}"
@ -26,17 +26,17 @@ INITSCRIPT_PARAMS = "start 30 S ."
do_install() {
install -d ${D}/${sysconfdir}/init.d/
install -d ${DEPLOY_DIR_IMAGE}
install -m 0755 ${WORKDIR}/confd ${D}/${sysconfdir}/init.d/confd
install -m 0755 ${UNPACKDIR}/confd ${D}/${sysconfdir}/init.d/confd
install -d ${D}/sbin/
install -d ${D}/etc/default/volatiles
install -m 0644 ${WORKDIR}/80_diya ${D}${sysconfdir}/default/volatiles
install -m 0755 ${WORKDIR}/expandfs.sh ${D}/sbin/expandfs.sh
install -m 0755 ${WORKDIR}/boot-to-recovery ${D}/sbin/boot-to-recovery
install -m 0755 ${WORKDIR}/fs_resize ${DEPLOY_DIR_IMAGE}/
install -m 0644 ${UNPACKDIR}/80_diya ${D}${sysconfdir}/default/volatiles
install -m 0755 ${UNPACKDIR}/expandfs.sh ${D}/sbin/expandfs.sh
install -m 0755 ${UNPACKDIR}/boot-to-recovery ${D}/sbin/boot-to-recovery
install -m 0755 ${UNPACKDIR}/fs_resize ${DEPLOY_DIR_IMAGE}/
install -d ${D}/etc/pam.d
install -m 0644 ${WORKDIR}/diya.pam ${D}${sysconfdir}/pam.d/diya
install -m 0644 ${UNPACKDIR}/diya.pam ${D}${sysconfdir}/pam.d/diya
install -d ${D}/usr/bin
install -m 0755 ${WORKDIR}/xdg-terminal-exec ${D}/usr/bin
install -m 0755 ${UNPACKDIR}/xdg-terminal-exec ${D}/usr/bin
cat << EOF > ${DEPLOY_DIR_IMAGE}/diya-config.txt
recovery=false
recovery_image=recovery-${MACHINE}.cpio.gz

10
recipes-diya/diya-session-manager/diya-session-manager_git.bb
View File

@ -11,7 +11,7 @@ SRC_URI += "git://git.iohub.dev/dany/diya-session-manager.git;protocol=https;bra
SRCREV = "${AUTOREV}"
PV = "0.1.1+git${SRCPV}"
S = "${WORKDIR}/git"
S = "${UNPACKDIR}/git"
inherit meson pkgconfig
@ -27,10 +27,10 @@ do_install:append() {
install -d ${D}/etc/dbus-1/system.d
install -d ${D}/etc/init.d
install -m 0755 ${WORKDIR}/build/diya-session-manager ${D}/usr/bin/
install -m 0755 ${WORKDIR}/diya-sessiond ${D}/etc/init.d/
install -m 0755 ${WORKDIR}/diya-session-launch ${D}/usr/bin/
install -m 0644 ${WORKDIR}/daemon.conf ${D}/etc/diya/
install -m 0644 ${WORKDIR}/dbus-diya.conf ${D}/etc/dbus-1/system.d/
install -m 0755 ${UNPACKDIR}/diya-sessiond ${D}/etc/init.d/
install -m 0755 ${UNPACKDIR}/diya-session-launch ${D}/usr/bin/
install -m 0644 ${UNPACKDIR}/daemon.conf ${D}/etc/diya/
install -m 0644 ${UNPACKDIR}/dbus-diya.conf ${D}/etc/dbus-1/system.d/
}
FILES:${PN} = "/etc/diya \

8
recipes-diya/initramfs/recovery-boot_0.1.bb
View File

@ -15,7 +15,7 @@ SRC_URI = "file://init \
file://diya-update \
"
S = "${WORKDIR}"
S = "${UNPACKDIR}"
INITSCRIPT_NAME = "confd"
INITSCRIPT_PARAMS = "start 30 S ."
@ -24,12 +24,12 @@ do_install() {
install -d ${D}/etc/init.d
install -d ${D}/sbin
# base
install -m 0755 ${WORKDIR}/init ${D}/init
install -m 0755 ${WORKDIR}/confd ${D}/etc/init.d/confd
install -m 0755 ${UNPACKDIR}/init ${D}/init
install -m 0755 ${UNPACKDIR}/confd ${D}/etc/init.d/confd
cat << EOF >> ${D}/etc/profile
export MACHINE=${MACHINE}
EOF
install -m 0755 ${WORKDIR}/diya-update ${D}/sbin/
install -m 0755 ${UNPACKDIR}/diya-update ${D}/sbin/
# create symlink
ln -sf /sbin/diya-update ${D}/sbin/diya-update-rootfs

0
recipes-graphics/mesa/mesa-gl_%.bbappend → recipes-graphics/mesa/mesa-gl.bbappend
View File

0
recipes-graphics/mesa/mesa_%.bbappend → recipes-graphics/mesa/mesa.bbappend
View File

2
recipes-support/l3afpad/l3afpad_0.8.18.bb
View File

@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-3.0-only;md5=c79ff39f19dfec
FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
S="${WORKDIR}"
S = "${UNPACKDIR}"
DEPENDS = "gtk+3 pango cairo harfbuzz gdk-pixbuf intltool-native"

4
recipes-support/sfwbar/sfwbar_git.bb
View File

@ -12,7 +12,7 @@ SRCREV = "${AUTOREV}"
SRC_URI = "git://github.com/LBCrion/sfwbar.git;protocol=https;branch=main"
SRC_URI += " file://sfwbar.config "
S="${WORKDIR}/git"
S="${UNPACKDIR}/git"
inherit meson pkgconfig
@ -21,7 +21,7 @@ EXTRA_OEMESON += "--buildtype release"
do_install:append () {
install -d ${D}/${sysconfdir}/xdg/
install -d ${D}/${sysconfdir}/xdg/sfwbar/
install -m 0755 ${WORKDIR}/sfwbar.config ${D}/${sysconfdir}/xdg/sfwbar/
install -m 0755 ${UNPACKDIR}/sfwbar.config ${D}/${sysconfdir}/xdg/sfwbar/
}
FILES:${PN} += "/usr/share/icons/*"

6
recipes-support/tofi/tofi_git.bb
View File

@ -12,7 +12,7 @@ SRCREV = "${AUTOREV}"
SRC_URI = "git://github.com/philj56/tofi.git;protocol=https;branch=master"
SRC_URI += " file://config file://drun "
S="${WORKDIR}/git"
S="${UNPACKDIR}/git"
inherit meson pkgconfig
@ -20,8 +20,8 @@ EXTRA_OEMESON += "--buildtype release"
do_install:append () {
# replace the default config
install -m 0755 ${WORKDIR}/drun ${D}/usr/bin/
install -m 0755 ${WORKDIR}/config ${D}/${sysconfdir}/xdg/tofi/
install -m 0755 ${UNPACKDIR}/drun ${D}/usr/bin/
install -m 0755 ${UNPACKDIR}/config ${D}/${sysconfdir}/xdg/tofi/
}
FILES:${PN} += "/usr/share/*"

2
recipes-support/wlopm/wlopm_git.bb
View File

@ -10,7 +10,7 @@ SRCREV = "${AUTOREV}"
SRC_URI = "git://git.iohub.dev/dany/wlopm.git;protocol=https;branch=master"
S="${WORKDIR}/git"
S="${UNPACKDIR}/git"
do_compile () {
oe_runmake

2
recipes-support/wtype/wtype_git.bb
View File

@ -10,7 +10,7 @@ SRCREV = "${AUTOREV}"
SRC_URI = "git://github.com/atx/wtype.git;protocol=https;branch=master"
S="${WORKDIR}/git"
S="${UNPACKDIR}/git"
inherit meson pkgconfig

12
recipes-wlroots/labwc/labwc_%.bbappend
View File

@ -13,13 +13,13 @@ do_install:append () {
install -d ${D}/${sysconfdir}/xdg
install -d ${D}/${sysconfdir}/init.d
install -d ${D}/${sysconfdir}/xdg/labwc
install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/labwc
install -m 0755 ${UNPACKDIR}/init ${D}/${sysconfdir}/init.d/labwc
install -m 0755 ${WORKDIR}/wpp.jpg ${D}/${sysconfdir}/xdg/labwc/
install -m 0755 ${WORKDIR}/autostart ${D}/${sysconfdir}/xdg/labwc/
install -m 0755 ${WORKDIR}/environment ${D}/${sysconfdir}/xdg/labwc/
install -m 0755 ${WORKDIR}/menu.xml ${D}/${sysconfdir}/xdg/labwc/
install -m 0755 ${WORKDIR}/rc.xml ${D}/${sysconfdir}/xdg/labwc/
install -m 0755 ${UNPACKDIR}/wpp.jpg ${D}/${sysconfdir}/xdg/labwc/
install -m 0755 ${UNPACKDIR}/autostart ${D}/${sysconfdir}/xdg/labwc/
install -m 0755 ${UNPACKDIR}/environment ${D}/${sysconfdir}/xdg/labwc/
install -m 0755 ${UNPACKDIR}/menu.xml ${D}/${sysconfdir}/xdg/labwc/
install -m 0755 ${UNPACKDIR}/rc.xml ${D}/${sysconfdir}/xdg/labwc/
}