switch to walnascar
This commit is contained in:
@ -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
|
||||
|
@ -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 \
|
||||
|
@ -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
|
||||
|
Reference in New Issue
Block a user