Commit 777291cc authored by Oleg Dzhimiev's avatar Oleg Dzhimiev
Browse files

updates for rocko

parent fa20ebf2

recipes-core/apps-astreamer/apps-astreamer_1.0.bb

+1 −1
Original line number Original line Diff line number Diff line
@@ -18,6 +18,6 @@ DEPENDS += "alsa-lib" 
# needed for sysroot?

# needed for sysroot?

#DEPENDS += "apache2"

#DEPENDS += "apache2"





RDEPENDS_apps-astreamer += "alsa-lib"

#RDEPENDS_apps-astreamer += "alsa-lib"





FILES_${PN} += " ${base_prefix}/usr/bin/*"
 
FILES_${PN} += " ${base_prefix}/usr/bin/*"

recipes-core/fpga-x393/fpga-x393_1.0.bb

+17 −2
Original line number Original line Diff line number Diff line
@@ -12,5 +12,20 @@ inherit elphel-dev 




do_configure[noexec] = "1"

do_configure[noexec] = "1"

#do_compile[noexec] = "1"

#do_compile[noexec] = "1"



RDEPENDS_${PN} += "python-core"

RDEPENDS_${PN} += "python-core"

FILES_${PN} += " ${base_prefix}/www/pages/* ${base_prefix}/usr/local/verilog/* ${base_prefix}/usr/local/bin/*"
 


FILES_${PN} += " ${base_prefix}/www/pages/* \

                 ${base_prefix}/usr/local/verilog/* \

                 ${base_prefix}/usr/local/bin/* \

               "



do_install_append() {

  rm ${D}/usr/local/bin/x393_mem.py

}



# THIS ONLY WORKS FOR /usr/bin/

#inherit update-alternatives

#ALTERNATIVE_PRIORITY = "100"

## ../ to get out from ${bindir} = /usr/bin/

#ALTERNATIVE_${PN} = "../local/bin/x393_mem.py"

recipes-core/fpga-x393sata/fpga-x393sata_1.0.bb

+7 −1
Original line number Original line Diff line number Diff line
@@ -14,3 +14,9 @@ do_configure[noexec] = "1" 
#do_compile[noexec] = "1"

#do_compile[noexec] = "1"

RDEPENDS_${PN} += "python-core"

RDEPENDS_${PN} += "python-core"

FILES_${PN} += " ${base_prefix}/usr/local/verilog/* ${base_prefix}/usr/local/bin/* ${base_prefix}/www/pages/*"

FILES_${PN} += " ${base_prefix}/usr/local/verilog/* ${base_prefix}/usr/local/bin/* ${base_prefix}/www/pages/*"



# THIS ONLY WORKS FOR /usr/bin/

#inherit update-alternatives

#ALTERNATIVE_PRIORITY = "50"

## ../ to get out from ${bindir} = /usr/bin/

#ALTERNATIVE_${PN} = "../local/bin/x393_mem.py"

recipes-core/images/core-image-elphel393.bb

+23 −11
Original line number Original line Diff line number Diff line
@@ -129,28 +129,40 @@ UBINIZE_ARGS = " -m 2048 -p 128KiB -s 2048" 




create_symlinks_append(){

create_symlinks_append(){





    IMAGE_NAME = d.getVar('IMAGE_NAME')

    DEPLOY_DIR_IMAGE = d.getVar('DEPLOY_DIR_IMAGE')

    PRODUCTION_ROOTFS = d.getVar('PRODUCTION_ROOTFS')



    rlocs = (d.getVar('PRODUCTION_ROOT_LOCATION', True)).split()

    rlocs = (d.getVar('PRODUCTION_ROOT_LOCATION', True)).split()



    for rloc in rlocs:

    for rloc in rlocs:

        if not os.path.isdir("${DEPLOY_DIR_IMAGE}/"+rloc):

        if not os.path.isdir(DEPLOY_DIR_IMAGE+"/"+rloc):

            os.system("mkdir ${DEPLOY_DIR_IMAGE}/"+rloc)

            os.system("mkdir "+DEPLOY_DIR_IMAGE+"/"+rloc)





        if (rloc=="mmc"):

        if (rloc=="mmc"):

            image_ext = ".tar.gz"

            image_ext = "tar.gz"

            image_ext2 = ""

            image_ext2 = ""

        else:

        else:

            image_ext = ".ubifs"

            image_ext = "ubifs"

            image_ext2 = ".ubi"

            image_ext2 = "ubi"



        fname = os.path.join(deploy_dir, img_name + imgsuffix + image_ext)

        if os.path.exists(fname):

            tmp_fname = DEPLOY_DIR_IMAGE+"/"+rloc+"/"+PRODUCTION_ROOTFS+"."+image_ext





        if os.path.isfile("${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs"+image_ext):

            tmp_fname = "${DEPLOY_DIR_IMAGE}/"+rloc+"/${PRODUCTION_ROOTFS}"+image_ext

            if os.path.isfile(tmp_fname):

            if os.path.isfile(tmp_fname):

                os.system("rm "+tmp_fname)

                os.system("rm "+tmp_fname)

            os.system("cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs"+image_ext+" "+tmp_fname)



            os.system("cp "+fname+" "+tmp_fname)





        if not image_ext2=="":

        if not image_ext2=="":

          if os.path.isfile("${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs"+image_ext2):



              tmp_fname = "${DEPLOY_DIR_IMAGE}/"+rloc+"/${PRODUCTION_ROOTFS}"+image_ext2

          fname2 = os.path.join(deploy_dir, img_name + imgsuffix + image_ext2)

          if os.path.exists(fname2):

              tmp_fname = DEPLOY_DIR_IMAGE+"/"+rloc+"/"+PRODUCTION_ROOTFS+"."+image_ext2



              if os.path.isfile(tmp_fname):

              if os.path.isfile(tmp_fname):

                  os.system("rm "+tmp_fname)

                  os.system("rm "+tmp_fname)

              os.system("cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs"+image_ext2+" "+tmp_fname)



              os.system("cp "+fname2+" "+tmp_fname)

}
 
}

recipes-core/web-393/web-393_1.0.bb

+1 −0
Original line number Original line Diff line number Diff line
@@ -14,3 +14,4 @@ do_configure[noexec] = "1" 
#do_compile[noexec] = "1"

#do_compile[noexec] = "1"





FILES_${PN} += " ${base_prefix}/www/pages/* ${base_prefix}/usr/local/bin/*"

FILES_${PN} += " ${base_prefix}/www/pages/* ${base_prefix}/usr/local/bin/*"