Minor change

This commit is contained in:
pvizeli 2017-03-22 12:41:19 +01:00
parent b7da05a1fc
commit ccd9952ba8
4 changed files with 7 additions and 23 deletions

View File

@ -96,7 +96,8 @@ docker run --rm \
--machine "$MACHINE" \
${BARYS_ARGUMENTS_VAR} \
--shared-downloads /yocto/shared-downloads \
--shared-sstate /yocto/shared-sstate
--shared-sstate /yocto/shared-sstate \
--resinio
# Write deploy artifacts
BUILD_DEPLOY_DIR=$WORKSPACE/deploy

View File

@ -1,16 +0,0 @@
# resin-connectable-service bbclass
#
# Author: Andrei Gherzan <andrei@resin.io>
python __anonymous() {
# Enable/disable systemd services listed in RESIN_CONNECTABLE_SERVICES based on
# RESIN_CONNECTABLE_ENABLE_SERVICES
pn = d.getVar('PN', True)
services = d.getVar('RESIN_CONNECTABLE_SERVICES', True).split()
if pn in services:
d.setVar('SYSTEMD_AUTO_ENABLE', 'enable')
}
systemd_populate_packages[vardeps] += "RESIN_CONNECTABLE_ENABLE_SERVICES"

View File

@ -1,6 +0,0 @@
# Add hassio flavor
require conf/distro/include/resin-os.inc
PREFERRED_PROVIDER_docker-disk = "docker-resin-supervisor-disk"
RESIN_CONNECTABLE_SERVICES_remove = "openvpn"
DISTRO_FEATURES_remove = "development-image"

View File

@ -19,6 +19,11 @@ do_install_append() {
install -d ${D}${bindir}
install -m 0755 ${WORKDIR}/sync-authorized-keys.sh ${D}${bindir}
if [ "${RESIN_CONNECTABLE_ENABLE_SERVICES}" = "1" ]; then
rm -r ${D}${localstatedir}/lib/dropbear/
rm ${D}/home/root/.ssh/authorized_keys
fi
if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
install -d ${D}${systemd_unitdir}/system
install -c -m 0644 ${WORKDIR}/sync-authorized-keys.service ${D}${systemd_unitdir}/system