Commit fa20ebf2 authored by Oleg Dzhimiev's avatar Oleg Dzhimiev

1. updated sysroots 2. fixed streamer build 3. fixed python extensions build...

1. updated sysroots 2. fixed streamer build 3. fixed python extensions build 4. fixed linux-xlnx build
parent 32a3a7cb
# developers version # developers version
DEPENDS += "linux-xlnx"
inherit elphel-misc elphel-scp inherit elphel-misc elphel-scp
do_unpack(){ do_unpack(){
...@@ -7,17 +9,20 @@ do_unpack(){ ...@@ -7,17 +9,20 @@ do_unpack(){
rm -rf ${S} rm -rf ${S}
fi fi
ln -sf ${VPATH} ${S} ln -sf ${VPATH} ${S}
if [ -d ${VPATH}/sysroots ]; then if [ -d ${VPATH}/sysroots ]; then
rm -rf ${VPATH}/sysroots rm -rf ${VPATH}/sysroots
fi fi
ln -sf ${TOPDIR}/tmp/sysroots ${VPATH}/sysroots # old:
#ln -sf ${TOPDIR}/tmp/sysroots ${VPATH}/sysroots
# new:
ln -sf ${WORKDIR}/recipe-sysroot ${VPATH}/sysroots
if [ -d ${VPATH}/bitbake-logs ]; then if [ -d ${VPATH}/bitbake-logs ]; then
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 if [ -d ${VPATH}/image ]; then
rm -rf ${VPATH}/image rm -rf ${VPATH}/image
fi fi
...@@ -52,7 +57,7 @@ do_compile_prepend() { ...@@ -52,7 +57,7 @@ do_compile_prepend() {
exit 1 exit 1
fi fi
} }
do_install_append() { do_install_append() {
oe_runmake ${EXTRA_OEMAKE} install oe_runmake ${EXTRA_OEMAKE} install
install -d ${D}/etc/elphel393/packages install -d ${D}/etc/elphel393/packages
......
...@@ -14,6 +14,10 @@ do_configure[noexec] = "1" ...@@ -14,6 +14,10 @@ do_configure[noexec] = "1"
#do_compile[noexec] = "1" #do_compile[noexec] = "1"
DEPENDS += "alsa-lib" DEPENDS += "alsa-lib"
# needed for sysroot?
#DEPENDS += "apache2"
RDEPENDS_apps-astreamer += "alsa-lib" RDEPENDS_apps-astreamer += "alsa-lib"
FILES_${PN} += " ${base_prefix}/usr/bin/*" FILES_${PN} += " ${base_prefix}/usr/bin/*"
...@@ -2,7 +2,7 @@ SUMMARY = "A recipe for python extensions to support features of Elphel cameras" ...@@ -2,7 +2,7 @@ SUMMARY = "A recipe for python extensions to support features of Elphel cameras"
HOMEPAGE = "http://elphel.com" HOMEPAGE = "http://elphel.com"
AUTHOR = "Yuri Nenakhov" AUTHOR = "Yuri Nenakhov"
LICENSE = "GPLv2+" LICENSE = "GPLv2+"
RDEPENDS_${PN} += "\ RDEPENDS_${PN} += "\
python-core \ python-core \
python-numpy \ python-numpy \
python-ctypes" python-ctypes"
...@@ -26,7 +26,10 @@ INHIBIT_PACKAGE_STRIP = "1" ...@@ -26,7 +26,10 @@ INHIBIT_PACKAGE_STRIP = "1"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
do_compile() { do_compile() {
${CC} -Wall -Wextra -O -ansi -pedantic -shared -fPIC libelphel.c -o libelphel.so # old
#${CC} -Wall -Wextra -O -ansi -pedantic -shared -fPIC libelphel.c -o libelphel.so
# Elphel, Rocko: was missing hash style
${CC} -Wl,--hash-style=gnu -Wall -Wextra -O -ansi -pedantic -shared -fPIC libelphel.c -o libelphel.so
} }
do_install() { do_install() {
......
...@@ -76,7 +76,7 @@ python do_link() { ...@@ -76,7 +76,7 @@ python do_link() {
#os.system("cd "+DEV_DIR+"; ln -sf "+S+" linux") #os.system("cd "+DEV_DIR+"; ln -sf "+S+" linux")
if not os.path.isdir(DEV_DIR+"/sysroots"): if not os.path.isdir(DEV_DIR+"/sysroots"):
os.system("cd "+DEV_DIR+"; ln -sf "+TOPDIR+"/tmp/sysroots sysroots") os.system("cd "+DEV_DIR+"; ln -sf "+WORKDIR+"/recipe-sysroot sysroots")
if not os.path.isdir(DEV_DIR+"/linux"): if not os.path.isdir(DEV_DIR+"/linux"):
os.system("cd "+DEV_DIR+"; ln -sf "+WORKDIR+"/linux-"+MACHINE+"-standard-build linux") os.system("cd "+DEV_DIR+"; ln -sf "+WORKDIR+"/linux-"+MACHINE+"-standard-build linux")
if not os.path.isdir(DEV_DIR+"/image"): if not os.path.isdir(DEV_DIR+"/image"):
...@@ -188,7 +188,9 @@ do_install_append() { ...@@ -188,7 +188,9 @@ do_install_append() {
#do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_TARGET}-uapi/" #do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_TARGET}-uapi/"
sysroot_stage_all_append() { sysroot_stage_all_append() {
sysroot_stage_dir ${WORKDIR}/headers/include ${STAGING_DIR_TARGET}/usr/include-uapi #sysroot_stage_dir ${WORKDIR}/headers/include ${STAGING_DIR_TARGET}/usr/include-uapi
# Elphel, Rocko, new:
sysroot_stage_dir ${WORKDIR}/headers/include ${SYSROOT_DESTDIR}/usr/include-uapi
} }
## 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
...@@ -210,5 +212,3 @@ do_target_scp () { ...@@ -210,5 +212,3 @@ do_target_scp () {
addtask do_target_scp after do_deploy 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)" 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