--- openembedded-lkft/builders.sh	2017-12-07 12:12:22.090878030 +0100
+++ ../lkft/builders.sh	2017-12-08 19:27:22.131783700 +0100
@@ -4,9 +4,9 @@
 
 # workaround EDK2 is confused by the long path used during the build
 # and truncate files name expected by VfrCompile
-sudo mkdir -p /srv/oe
-sudo chown buildslave:buildslave /srv/oe
-cd /srv/oe
+#sudo mkdir -p /srv/oe
+#sudo chown buildslave:buildslave /srv/oe
+cd /srv/jenkins/oe
 
 trap cleanup_exit INT TERM EXIT
 
@@ -45,10 +45,10 @@
    # our builds config is expecting downloads and sstate-cache, here.
    # DL_DIR = "${OEROOT}/sources/downloads"
    # SSTATE_DIR = "${OEROOT}/build/sstate-cache"
-   mkdir -p ${HOME}/srv/oe/downloads ${HOME}/srv/oe/sstate-cache-${DISTRO}
+   mkdir -p /srv/jenkins/srv-oe/downloads /srv/jenkins/srv-oe/sstate-cache-${DISTRO}
    mkdir -p build
-   ln -s ${HOME}/srv/oe/downloads
-   ln -s ${HOME}/srv/oe/sstate-cache-${DISTRO} sstate-cache
+   ln -s /srv/jenkins/srv-oe/downloads
+   ln -s /srv/jenkins/srv-oe/sstate-cache-${DISTRO} sstate-cache
 fi
 
 repo sync
@@ -160,33 +160,33 @@
 
 # Remove systemd firstboot and machine-id file
 # Backport serialization change from v234 to avoid systemd tty race condition
-mkdir -p ../layers/meta-96boards/recipes-core/systemd/systemd
-wget -q http://people.linaro.org/~fathi.boudra/backport-v234-e266c06-v230.patch \
-  -O ../layers/meta-96boards/recipes-core/systemd/systemd/backport-v234-e266c06-v230.patch
-cat << EOF >> ../layers/meta-96boards/recipes-core/systemd/systemd/e2fsck.conf
-[options]
-# This will prevent e2fsck from stopping boot just because the clock is wrong
-broken_system_clock = 1
-EOF
-cat << EOF >> ../layers/meta-96boards/recipes-core/systemd/systemd_%.bbappend
-FILESEXTRAPATHS_prepend := "\${THISDIR}/\${PN}:"
-
-SRC_URI += "\\
-    file://backport-v234-e266c06-v230.patch \\
-    file://e2fsck.conf \\
-"
-
-PACKAGECONFIG_remove = "firstboot"
-
-do_install_append() {
-    # Install /etc/e2fsck.conf to avoid boot stuck by wrong clock time
-    install -m 644 -p -D \${WORKDIR}/e2fsck.conf \${D}\${sysconfdir}/e2fsck.conf
-
-    rm -f \${D}\${sysconfdir}/machine-id
-}
-
-FILES_\${PN} += "\${sysconfdir}/e2fsck.conf "
-EOF
+#mkdir -p ../layers/meta-96boards/recipes-core/systemd/systemd
+#wget -q http://people.linaro.org/~fathi.boudra/backport-v234-e266c06-v230.patch \
+#  -O ../layers/meta-96boards/recipes-core/systemd/systemd/backport-v234-e266c06-v230.patch
+#cat << EOF >> ../layers/meta-96boards/recipes-core/systemd/systemd/e2fsck.conf
+#[options]
+## This will prevent e2fsck from stopping boot just because the clock is wrong
+#broken_system_clock = 1
+#EOF
+#cat << EOF >> ../layers/meta-96boards/recipes-core/systemd/systemd_%.bbappend
+#FILESEXTRAPATHS_prepend := "\${THISDIR}/\${PN}:"
+#
+#SRC_URI += "\\
+#    file://backport-v234-e266c06-v230.patch \\
+#    file://e2fsck.conf \\
+#"
+#
+#PACKAGECONFIG_remove = "firstboot"
+#
+#do_install_append() {
+#    # Install /etc/e2fsck.conf to avoid boot stuck by wrong clock time
+#    install -m 644 -p -D \${WORKDIR}/e2fsck.conf \${D}\${sysconfdir}/e2fsck.conf
+#
+#    rm -f \${D}\${sysconfdir}/machine-id
+#}
+#
+#FILES_\${PN} += "\${sysconfdir}/e2fsck.conf "
+#EOF
 
 # Update kernel recipe SRCREV
 kernel_recipe=$(find ../layers/meta-96boards -name ${KERNEL_RECIPE}_${KERNEL_VERSION}.bb)
@@ -207,7 +207,7 @@
 rm -f ${DEPLOY_DIR_IMAGE}/*.txt
 rm -rf ${DEPLOY_DIR_IMAGE}/bootloader
 find ${DEPLOY_DIR_IMAGE} -type l -delete
-mv /srv/oe/{source,pinned}-manifest.xml ${DEPLOY_DIR_IMAGE}
+mv /srv/jenkins/oe/{source,pinned}-manifest.xml ${DEPLOY_DIR_IMAGE}
 cat ${DEPLOY_DIR_IMAGE}/pinned-manifest.xml
 
 # FIXME: IMAGE_FSTYPES_remove doesn't work