Merge branch 'master' into framepars

recipes-core/apps-camogm/apps-camogm_1.0.bb

@@ -15,13 +15,6 @@ do_configure[noexec] = "1"
 
 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"
 
 PACKAGES += " camogm"

recipes-core/apps-imgsrv/apps-imgsrv_1.0.bb

@@ -11,19 +11,12 @@ VPATH = "${TOPDIR}/../../rootfs-elphel/elphel-apps-imgsrv"
 
 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 \
                 www/pages/exif.php \
+                www/pages/start_gps_compass.php \
+                www/pages/imu_setup.php \
                 ${sysconfdir}/Exif_template.xml \
                 "
 
 PACKAGES += "imgsrv"
+