Commit 4bf057a0 authored by Andrey Filippov's avatar Andrey Filippov

Merge branch 'master' into framepars

parents 5f4094c9 de56fd37
...@@ -15,13 +15,6 @@ do_configure[noexec] = "1" ...@@ -15,13 +15,6 @@ do_configure[noexec] = "1"
DEPENDS += "libogg" DEPENDS += "libogg"
do_install_append() {
install -d ${D}${bindir}
install -m 0755 ${S}/camogm ${D}${bindir}
install -d ${D}${sysconfdir}
install -m 0644 qt_source ${D}${sysconfdir}/
}
FILES_${PN} += "${bindir}/camogm ${sysconfdir}/qt_source" FILES_${PN} += "${bindir}/camogm ${sysconfdir}/qt_source"
PACKAGES += " camogm" PACKAGES += " camogm"
...@@ -11,19 +11,12 @@ VPATH = "${TOPDIR}/../../rootfs-elphel/elphel-apps-imgsrv" ...@@ -11,19 +11,12 @@ VPATH = "${TOPDIR}/../../rootfs-elphel/elphel-apps-imgsrv"
inherit elphel-dev inherit elphel-dev
do_install_append() {
install -d ${D}${bindir}
install -m 0755 ${S}/imgsrv ${D}${bindir}
install -d ${D}/www/pages
install -m 0755 ${S}/exif.php ${D}/www/pages
#install -m 0755 ${S}/exif.php ${D}${bindir}
install -d ${D}${sysconfdir}
install -m 0644 Exif_template.xml ${D}${sysconfdir}
}
FILES_${PN} += "${bindir}/imgsrv \ FILES_${PN} += "${bindir}/imgsrv \
www/pages/exif.php \ www/pages/exif.php \
www/pages/start_gps_compass.php \
www/pages/imu_setup.php \
${sysconfdir}/Exif_template.xml \ ${sysconfdir}/Exif_template.xml \
" "
PACKAGES += "imgsrv" PACKAGES += "imgsrv"
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