Skip to content

M
meta-elphel393
Commit 2a9946f4 authored by Andrey Filippov's avatar Andrey Filippov
Browse files
Options

merged with master

parents 098d88b1 32cb198b
Expand all Show whitespace changes
Inline Side-by-side
Showing with 126 additions and 1528 deletions
classes/elphel-dev.bbclass
View file @ 2a9946f4
...@@ -17,6 +17,11 @@ do_unpack(){ ...@@ -17,6 +17,11 @@ do_unpack(){
rm -rf ${VPATH}/bitbake-logs rm -rf ${VPATH}/bitbake-logs
fi fi
ln -sf ${WORKDIR}/temp ${VPATH}/bitbake-logs ln -sf ${WORKDIR}/temp ${VPATH}/bitbake-logs
if [ -d ${VPATH}/image ]; then
rm -rf ${VPATH}/image
fi
ln -sf ${WORKDIR}/image ${VPATH}/image
} }
ELPHEL393_USERADD = "eval ${FAKEROOTENV} PSEUDO_LOCALSTATEDIR=${STAGING_DIR_TARGET}${localstatedir}/pseudo ${STAGING_DIR_NATIVE}${bindir}/pseudo useradd --root ${STAGING_DIR_HOST}" ELPHEL393_USERADD = "eval ${FAKEROOTENV} PSEUDO_LOCALSTATEDIR=${STAGING_DIR_TARGET}${localstatedir}/pseudo ${STAGING_DIR_NATIVE}${bindir}/pseudo useradd --root ${STAGING_DIR_HOST}"
......
classes/elphel-scp.bbclass
View file @ 2a9946f4
...@@ -4,15 +4,41 @@ REMOTE_USER ??= "root" ...@@ -4,15 +4,41 @@ REMOTE_USER ??= "root"
REMOTE_IP ??= "192.168.0.9" REMOTE_IP ??= "192.168.0.9"
IDENTITY_FILE ??= "~/.ssh/id_rsa" IDENTITY_FILE ??= "~/.ssh/id_rsa"
do_target_scp () { #do_target_scp () {
#Without next echo - no trace of the scp in the log! # #Without next echo - no trace of the scp in the log!
SSH_COMMAND='tar -C / -xzpf /image.tar.gz; rm -f /image.tar.gz; sync' # SSH_COMMAND='tar -C / -xzpf /image.tar.gz; rm -f /image.tar.gz; sync'
tar -czvf ${WORKDIR}/image.tar.gz -C ${WORKDIR}/image . # tar -czvf ${WORKDIR}/image.tar.gz -C ${WORKDIR}/image .
echo scp -i ${IDENTITY_FILE} -p ${WORKDIR}/image.tar.gz ${REMOTE_USER}@${REMOTE_IP}:/ # echo scp -i ${IDENTITY_FILE} -p ${WORKDIR}/image.tar.gz ${REMOTE_USER}@${REMOTE_IP}:/
scp -i ${IDENTITY_FILE} -p ${WORKDIR}/image.tar.gz ${REMOTE_USER}@${REMOTE_IP}:/ # scp -i ${IDENTITY_FILE} -p ${WORKDIR}/image.tar.gz ${REMOTE_USER}@${REMOTE_IP}:/
echo ssh -i ${IDENTITY_FILE} ${REMOTE_USER}@${REMOTE_IP} ${SSH_COMMAND} # echo ssh -i ${IDENTITY_FILE} ${REMOTE_USER}@${REMOTE_IP} ${SSH_COMMAND}
ssh -i ${IDENTITY_FILE} ${REMOTE_USER}@${REMOTE_IP} ${SSH_COMMAND} # ssh -i ${IDENTITY_FILE} ${REMOTE_USER}@${REMOTE_IP} ${SSH_COMMAND}
#}
python do_target_scp () {
import subprocess
WORKDIR = d.getVar('WORKDIR', True)
IDENTITY_FILE = d.getVar('IDENTITY_FILE', True)
REMOTE_USER = d.getVar('REMOTE_USER', True)
REMOTE_IP = d.getVar('REMOTE_IP', True)
cmd = "tar -czvf "+WORKDIR+"/image.tar.gz -C "+WORKDIR+"/image ."
subprocess.check_output(cmd,stderr=subprocess.STDOUT,shell=True)
cmd = "ping "+REMOTE_IP+" -c 1"
try:
subprocess.check_output(cmd,stderr=subprocess.STDOUT,shell=True)
except subprocess.CalledProcessError:
raise Exception("No route to target "+REMOTE_IP)
cmd = "scp -i "+IDENTITY_FILE+" -p "+WORKDIR+"/image.tar.gz "+REMOTE_USER+"@"+REMOTE_IP+":/"
try:
subprocess.check_output(cmd,stderr=subprocess.STDOUT,shell=True)
except subprocess.CalledProcessError:
raise Exception("Copying to target requires access by public key. Run: ssh-copy-id "+REMOTE_USER+"@"+REMOTE_IP)
cmd = "ssh -i "+IDENTITY_FILE+" "+REMOTE_USER+"@"+REMOTE_IP+" tar -C / -xzpf /image.tar.gz; rm -f /image.tar.gz; sync"
subprocess.check_output(cmd,stderr=subprocess.STDOUT,shell=True)
} }
addtask do_target_scp after do_install addtask do_target_scp after do_install
......
conf/machine/elphel393.conf
View file @ 2a9946f4
...@@ -15,9 +15,8 @@ UBOOT_MACHINE = "elphel393_config" ...@@ -15,9 +15,8 @@ UBOOT_MACHINE = "elphel393_config"
SERIAL_CONSOLE = "115200 ttyPS0" SERIAL_CONSOLE = "115200 ttyPS0"
MACHINE_DEVICETREE := "\ MACHINE_DEVICETREE ?= "elphel393.dts"
elphel393/elphel393.dts \
"
MACHINE_KCONFIG := "common/elphel393_defconfig_${LINUX_VERSION}" MACHINE_KCONFIG := "common/elphel393_defconfig_${LINUX_VERSION}"
#hostname - applied to rootfs image #hostname - applied to rootfs image
......
recipes-bsp/device-tree/device-tree.bbappend
View file @ 2a9946f4
...@@ -2,17 +2,15 @@ ...@@ -2,17 +2,15 @@
FILESEXTRAPATHS_append := "${TOPDIR}/../../linux-elphel/src/arch/arm/boot/dts:" FILESEXTRAPATHS_append := "${TOPDIR}/../../linux-elphel/src/arch/arm/boot/dts:"
SRC_URI += "file://elphel393.dts \ MACHINE_DEVICETREE ?= "elphel393.dts"
SRC_URI += "file://${MACHINE_DEVICETREE} \
file://elphel393-zynq-base.dtsi \ file://elphel393-zynq-base.dtsi \
file://elphel393-bootargs-mmc.dtsi \ file://elphel393-bootargs-mmc.dtsi \
file://elphel393-bootargs-nand.dtsi \ file://elphel393-bootargs-nand.dtsi \
file://elphel393-bootargs-ram.dtsi \ file://elphel393-bootargs-ram.dtsi \
" "
MACHINE_DEVICETREE := "\
elphel393.dts \
"
do_deploy(){ do_deploy(){
for DTS_FILE in ${DEVICETREE}; do for DTS_FILE in ${DEVICETREE}; do
DTS_NAME=`basename ${DTS_FILE} | awk -F "." '{print $1}'` DTS_NAME=`basename ${DTS_FILE} | awk -F "." '{print $1}'`
...@@ -33,7 +31,7 @@ do_deploy(){ ...@@ -33,7 +31,7 @@ do_deploy(){
rm ${DEPLOY_DIR_IMAGE}/${RLOC}/${PRODUCTION_DEVICETREE} rm ${DEPLOY_DIR_IMAGE}/${RLOC}/${PRODUCTION_DEVICETREE}
fi fi
cp ${DEPLOY_DIR_IMAGE}/${MACHINE}_${RLOC}.dtb ${DEPLOY_DIR_IMAGE}/${RLOC}/${PRODUCTION_DEVICETREE} cp ${DEPLOY_DIR_IMAGE}/${DTS_NAME}_${RLOC}.dtb ${DEPLOY_DIR_IMAGE}/${RLOC}/${PRODUCTION_DEVICETREE}
done done
done done
} }
...@@ -74,3 +72,18 @@ do_install() { ...@@ -74,3 +72,18 @@ do_install() {
done done
done done
} }
REMOTE_USER ??= "root"
IDENTITY_FILE ??= "~/.ssh/id_rsa"
REMOTE_IP ??= "192.168.0.9"
do_target_scp () {
# mmc device tree only
echo "scp -i ${IDENTITY_FILE} -p ${DEPLOY_DIR_IMAGE}/mmc/devicetree.dtb ${REMOTE_USER}@${REMOTE_IP}:/mnt/mmc"
scp -i ${IDENTITY_FILE} -p ${DEPLOY_DIR_IMAGE}/mmc/devicetree.dtb ${REMOTE_USER}@${REMOTE_IP}:/mnt/mmc
ssh -i ${IDENTITY_FILE} ${REMOTE_USER}@${REMOTE_IP} sync
}
addtask do_target_scp after do_deploy
do_target_scp[doc] = "scp copied device tree to REMOTE_PATH on the target. REMOTE_USER and REMOTE_IP should be defined (ssh-copy-id -i KEY.pub TARGET_USER@TARGET_IP should be issued once)"
recipes-core/apps-camogm/apps-camogm_1.0.bb
View file @ 2a9946f4
...@@ -18,6 +18,30 @@ DEPENDS += "libogg" ...@@ -18,6 +18,30 @@ DEPENDS += "libogg"
FILES_${PN} += "${bindir}/camogm \ FILES_${PN} += "${bindir}/camogm \
${sysconfdir}/qt_source \ ${sysconfdir}/qt_source \
www/pages/camogmstate.php \ www/pages/camogmstate.php \
www/pages/images/create_folder.png \
www/pages/images/divider.png \
www/pages/images/filebrowser-01.gif \
www/pages/images/filebrowser-bottom-01.gif \
www/pages/images/folder.gif \
www/pages/images/help.png \
www/pages/images/play_audio.png \
www/pages/images/png_white_30.png \
www/pages/images/quicktime.png \
www/pages/images/rec_folder.png \
www/pages/images/record.gif \
www/pages/images/reload.png \
www/pages/images/stop.gif \
www/pages/images/up_folder.gif \
www/pages/images/hdd.png \
www/pages/camogm_interface.php \
www/pages/camogmgui.css \
www/pages/camogmgui.js \
www/pages/camogmgui.php \
www/pages/SpryCollapsiblePanel.css \
www/pages/SpryCollapsiblePanel.js \
www/pages/SpryTabbedPanels.css \
www/pages/SpryTabbedPanels.js \
www/pages/xml_simple.php \
" "
PACKAGES += " camogm" PACKAGES += " camogm"
recipes-core/apps-camogm/files/LICENSE deleted 100644 → 0
View file @ 098d88b1
This diff is collapsed.
recipes-core/apps-tempmon/apps-tempmon_1.0.bb 0 → 100644
View file @ 2a9946f4
SUMMARY = "Extra scripts for the Elphel 10393 board"
DESCRIPTION = "Simple camera temperature monitor"
AUTHOR = "Elphel Inc."
HOMEPAGE = "http://www3.elphel.com/"
PRIORITY = "optional"
LICENSE = "GPL-3.0"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891"
VPATH = "${TOPDIR}/../../rootfs-elphel/elphel-apps-tempmon"
inherit elphel-dev
do_configure[noexec] = "1"
#do_compile[noexec] = "1"
FILES_${PN} += " ${base_prefix}/usr/bin/tempmon.py"
RDEPENDS_${PN} += " python-core"
\ No newline at end of file
recipes-core/images/core-image-elphel393.bb
View file @ 2a9946f4
...@@ -44,7 +44,9 @@ IMAGE_INSTALL_append += " \ ...@@ -44,7 +44,9 @@ IMAGE_INSTALL_append += " \
apps-imgsrv \ apps-imgsrv \
apps-autocampars \ apps-autocampars \
apps-autoexposure \ apps-autoexposure \
apps-editconf \
apps-histograms \ apps-histograms \
apps-tempmon \
web-393 \ web-393 \
web-camvc \ web-camvc \
web-hwmon \ web-hwmon \
...@@ -55,10 +57,12 @@ IMAGE_INSTALL_append += " \ ...@@ -55,10 +57,12 @@ IMAGE_INSTALL_append += " \
linux-firmware-rtl8192cu \ linux-firmware-rtl8192cu \
init \ init \
overlay-sync \ overlay-sync \
init-tempmon \
udev-rules \ udev-rules \
e2fsprogs \ e2fsprogs \
gstreamer1.0 \ gstreamer1.0 \
fpga-x393 \
fpga-x393sata \
fpga-x359 \
" "
# gstreamer1.0-plugins-base \ # gstreamer1.0-plugins-base \
...@@ -88,7 +92,7 @@ IMAGE_ROOTFS_SIZE = "262144" ...@@ -88,7 +92,7 @@ IMAGE_ROOTFS_SIZE = "262144"
#IMAGE_FSTYPES = "ext2.gz ext2.gz.u-boot tar.gz" #IMAGE_FSTYPES = "ext2.gz ext2.gz.u-boot tar.gz"
#IMAGE_FSTYPES = "ext2.gz.u-boot tar.gz" #IMAGE_FSTYPES = "ext2.gz.u-boot tar.gz"
IMAGE_FSTYPES = "tar.gz ubi" IMAGE_FSTYPES = "tar.gz ubi ext4"
######################################################################## ########################################################################
######################################################################## ########################################################################
......
recipes-core/init/init_1.0.bb
View file @ 2a9946f4
...@@ -23,11 +23,3 @@ INITSCRIPT_PARAMS = "defaults 94" ...@@ -23,11 +23,3 @@ INITSCRIPT_PARAMS = "defaults 94"
inherit update-rc.d inherit update-rc.d
RDEPENDS_${PN} += "python-core" RDEPENDS_${PN} += "python-core"
do_install_append() {
if [ -f ${TOPDIR}/../../fpga-elphel/x393/install.sh ]; then
${TOPDIR}/../../fpga-elphel/x393/install.sh ${D}
fi
if [ -f ${TOPDIR}/../../fpga-elphel/x393_sata/install.sh ]; then
${TOPDIR}/../../fpga-elphel/x393_sata/install.sh ${D}
fi
}
recipes-kernel/linux/linux-xlnx_4.0.bbappend
View file @ 2a9946f4
...@@ -168,3 +168,19 @@ sysroot_stage_all_append() { ...@@ -168,3 +168,19 @@ sysroot_stage_all_append() {
## And you'd then use -I=/usr/myheaders/include to reference the sysroot ## And you'd then use -I=/usr/myheaders/include to reference the sysroot
## copy of those headers. ## copy of those headers.
REMOTE_USER ??= "root"
IDENTITY_FILE ??= "~/.ssh/id_rsa"
REMOTE_IP ??= "192.168.0.9"
do_target_scp () {
echo "scp -i ${IDENTITY_FILE} -p ${DEPLOY_DIR_IMAGE}/${RLOC}/${PRODUCTION_KERNEL} ${REMOTE_USER}@${REMOTE_IP}:/mnt/mmc/${PRODUCTION_KERNEL}"
scp -i ${IDENTITY_FILE} -p ${DEPLOY_DIR_IMAGE}/mmc/${PRODUCTION_KERNEL} ${REMOTE_USER}@${REMOTE_IP}:/mnt/mmc/${PRODUCTION_KERNEL}
ssh -i ${IDENTITY_FILE} ${REMOTE_USER}@${REMOTE_IP} sync
}
addtask do_target_scp after do_deploy
do_target_scp[doc] = "scp copied the kernel to REMOTE_PATH on the target. REMOTE_USER and REMOTE_IP should be defined (ssh-copy-id -i KEY.pub TARGET_USER@TARGET_IP should be issued once)"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment