Commit 5f4094c9 authored by Andrey Filippov's avatar Andrey Filippov

Merge branch 'master' into framepars

parents c66b8bbf ae279f8b
...@@ -4,36 +4,24 @@ DESCRIPTION = "Simple and fast HTTP server to send camera still images" ...@@ -4,36 +4,24 @@ DESCRIPTION = "Simple and fast HTTP server to send camera still images"
AUTHOR = "Elphel Inc." AUTHOR = "Elphel Inc."
HOMEPAGE = "http://www3.elphel.com/" HOMEPAGE = "http://www3.elphel.com/"
PRIORITY = "optional"
LICENSE = "GPLv3" LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://LICENSE;beginline=21;endline=699;md5=ccd2fef7dee090f3b211c6677c3e34cc" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891"
SRCDATE = "20160503" VPATH = "${TOPDIR}/../../rootfs-elphel/elphel-apps-camogm"
PV = "${SRCDATE}" inherit elphel-dev
PR = "r0"
DEV_DIR ?= "${TOPDIR}/../../linux-elphel/linux/source" do_configure[noexec] = "1"
EXTRA_OEMAKE = "ELPHEL_KERNEL_DIR=${DEV_DIR}"
APPS_DIR = "${TOPDIR}/../../rootfs-elphel"
FILESEXTRAPATHS_append := "${APPS_DIR}/elphel-apps-camogm:"
S = "${WORKDIR}"
SRC_URI = "file://.* \
file://LICENSE \
"
FILES_${PN} += "${bindir}/camogm ${sysconfdir}/qt_source"
DEPENDS += "libogg" DEPENDS += "libogg"
do_install() { do_install_append() {
install -d ${D}${bindir} install -d ${D}${bindir}
install -m 0755 ${S}/camogm ${D}${bindir} install -m 0755 ${S}/camogm ${D}${bindir}
install -d ${D}${sysconfdir} install -d ${D}${sysconfdir}
install -m 0644 qt_source ${D}${sysconfdir}/ install -m 0644 qt_source ${D}${sysconfdir}/
} }
FILES_${PN} += "${bindir}/camogm ${sysconfdir}/qt_source"
PACKAGES += " camogm" PACKAGES += " camogm"
...@@ -4,28 +4,14 @@ DESCRIPTION = "Simple and fast HTTP server to send camera still images" ...@@ -4,28 +4,14 @@ DESCRIPTION = "Simple and fast HTTP server to send camera still images"
AUTHOR = "Elphel Inc." AUTHOR = "Elphel Inc."
HOMEPAGE = "http://www3.elphel.com/" HOMEPAGE = "http://www3.elphel.com/"
PRIORITY = "optional"
LICENSE = "GPLv3" LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891"
SRCDATE = "20160405" VPATH = "${TOPDIR}/../../rootfs-elphel/elphel-apps-imgsrv"
PV = "${SRCDATE}"
PR = "r0"
DEV_DIR ?= "${TOPDIR}/../../linux-elphel/linux/source" inherit elphel-dev
EXTRA_OEMAKE = "ELPHEL_KERNEL_DIR=${DEV_DIR}"
APPS_DIR = "${TOPDIR}/../../rootfs-elphel" do_install_append() {
FILESEXTRAPATHS_append := "${APPS_DIR}/elphel-apps-imgsrv:"
SRC_URI = "file://imgsrv.c \
file://Makefile \
file://exif.php \
file://Exif_template.xml \
"
S = "${WORKDIR}"
do_install() {
install -d ${D}${bindir} install -d ${D}${bindir}
install -m 0755 ${S}/imgsrv ${D}${bindir} install -m 0755 ${S}/imgsrv ${D}${bindir}
install -d ${D}/www/pages install -d ${D}/www/pages
......
EXTRA_OECONF += "--enable-elphel" EXTRA_OECONF += "--enable-elphel"
DEV_DIR ?= "${TOPDIR}/../../rootfs-elphel/elphel-apps-php-extension/ext" DEV_DIR = "${TOPDIR}/../../rootfs-elphel/elphel-apps-php-extension"
do_unpack_append(){ do_unpack_append(){
print("Link extension to the main tree") print("Link everything to the main tree")
DEV_DIR = d.getVar('DEV_DIR', True) DEV_DIR = d.getVar('DEV_DIR', True)
S = d.getVar('S', True) S = d.getVar('S', True)
if os.path.isdir(DEV_DIR): if os.path.isdir(DEV_DIR):
print("DEV_DIR exists - creating links...") print("DEV_DIR exists - creating links...")
devdir_abspath = os.path.abspath(DEV_DIR) devdir_abspath = os.path.abspath(DEV_DIR+"/src")
for path, folders, files in os.walk(DEV_DIR): for path, folders, files in os.walk(DEV_DIR+"/src"):
folders[:]=[fd for fd in folders if fd != ".git"] folders[:]=[fd for fd in folders if fd != ".git"]
for folder in folders: for folder in folders:
folder_abspath = os.path.abspath(os.path.join(path, folder)) folder_abspath = os.path.abspath(os.path.join(path, folder))
folder_relpath = folder_abspath.replace(devdir_abspath+"/", '') folder_relpath = folder_abspath.replace(devdir_abspath+"/", '')
os.system("cd "+S+"/ext;mkdir -p "+folder_relpath) os.system("cd "+S+";mkdir -p "+folder_relpath)
for filename in files: for filename in files:
file_abspath = os.path.abspath(os.path.join(path, filename)) file_abspath = os.path.abspath(os.path.join(path, filename))
file_relpath = file_abspath.replace(devdir_abspath+"/", '') file_relpath = file_abspath.replace(devdir_abspath+"/", '')
os.system("cd "+S+"/ext;ln -sf "+file_abspath+" "+file_relpath) os.system("cd "+S+";ln -sf "+file_abspath+" "+file_relpath)
#make a link back:
if not os.path.isdir(DEV_DIR+"/php"):
os.system("ln -sf "+S+" "+DEV_DIR+"/php")
} }
\ No newline at end of file
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