...
 
Commits (20)
......@@ -2,40 +2,44 @@
"meta" : {
"meta-openembedded":[
"git://git.openembedded.org/meta-openembedded",
"master","73854a05565b30a5ca146ac53959c679b27815aa"
"master","34aa4c3202b427f59f843dc43a4e1afda4f81d13"
],
"meta-xilinx":[
"https://github.com/Xilinx/meta-xilinx.git",
"master","cc146d6c170f100eb2f445047969893faa7a6a55"
"master","a18947c20dba2c0c38db8bde1ad4684995df4bbd"
],
"meta-swupdate":[
"https://github.com/sbabic/meta-swupdate.git",
"master","f6ab29cfac2b9c6da8881c754e2a316ea43b884d"
"master","0fb115e97187c069f0da90163f1f374a6b7a4af7"
],
"meta-ezynq":[
"https://git.elphel.com/Elphel/meta-ezynq.git",
"master","",
"rocko","",
"#master","00496002f513fc253f5356ee675fdcbb8b4a9962"
],
"meta-elphel393":[
"https://git.elphel.com/Elphel/meta-elphel393.git",
"master","",
"rocko","",
"#master","a93edc1f91e82e5e613fa38bd800e307c348b9ee"
],
"meta-ros":[
"https://github.com/bmwcarit/meta-ros.git",
"master","72068b17e4192b51e09c8dc633805a35edac8701"
]
},
"poky":[
"git://git.yoctoproject.org/poky.git",
"master","3d2c0f5902cacf9d8544bf263b51ef0dd1a7218c"
"master","72867393fe2004ab9f0ee23eb09a975c82938b9e"
],
"linux-elphel" :[
"https://git.elphel.com/Elphel/linux-elphel.git",
"master","",
"rocko","",
"#master","cc50d7fa07140e680b09a8add617e62b4ba35aa0"
],
"fpga-elphel" : {
"x393" :[
"https://git.elphel.com/Elphel/x393.git",
"master","",
"lwir","",
"#master","edcdce9550c20726618210149bc1cb4549fd00be"
],
"x393_sata":[
......@@ -50,64 +54,72 @@
"rootfs-elphel": {
"elphel-apps-imgsrv":[
"https://git.elphel.com/Elphel/elphel-apps-imgsrv.git",
"master",""
"rocko",""
],
"elphel-apps-php-extension":[
"https://git.elphel.com/Elphel/elphel-apps-php-extension.git",
"master",""
"rocko",""
],
"elphel-apps-camogm":[
"https://git.elphel.com/Elphel/elphel-apps-camogm.git",
"master",""
"tiff",""
],
"elphel-udev-rules":[
"https://git.elphel.com/Elphel/elphel-udev-rules.git",
"master",""
"rocko",""
],
"elphel-web-393":[
"https://git.elphel.com/Elphel/elphel-web-393.git",
"master",""
"rocko",""
],
"elphel-apps-autocampars":[
"https://git.elphel.com/Elphel/elphel-apps-autocampars.git",
"master",""
"rocko",""
],
"elphel-apps-autoexposure":[
"https://git.elphel.com/Elphel/elphel-apps-autoexposure.git",
"master",""
"rocko",""
],
"elphel-apps-histograms":[
"https://git.elphel.com/Elphel/elphel-apps-histograms.git",
"master",""
"rocko",""
],
"elphel-web-camvc":[
"https://git.elphel.com/Elphel/elphel-web-camvc.git",
"master",""
"rocko",""
],
"elphel-apps-editconf":[
"https://git.elphel.com/Elphel/elphel-apps-editconf.git",
"master",""
"rocko",""
],
"elphel-init":[
"https://git.elphel.com/Elphel/elphel-init.git",
"master",""
"rocko",""
],
"elphel-web-hwmon":[
"https://git.elphel.com/Elphel/elphel-web-hwmon.git",
"master",""
"rocko",""
],
"elphel-apps-tempmon":[
"https://git.elphel.com/Elphel/elphel-apps-tempmon.git",
"master",""
"rocko",""
],
"elphel-apps-gps":[
"https://git.elphel.com/Elphel/elphel-apps-gps.git",
"master",""
"rocko",""
],
"elphel-apps-astreamer":[
"https://git.elphel.com/Elphel/elphel-apps-astreamer.git",
"master",""
]
"rocko",""
],
"ros2-scripts":[
"https://git.elphel.com/Elphel/ros2-scripts.git",
"rocko",""
],
"ros2-interfaces":[
"https://git.elphel.com/Elphel/ros2-interfaces.git",
"rocko",""
]
},
"tools" : {
"elphel-tools-update":[
......@@ -115,4 +127,4 @@
"master",""
]
}
}
\ No newline at end of file
}
......@@ -178,7 +178,8 @@ def update_branch(names_from_conf,name_from_list,pars,git_proto):
print(bcolors.BOLDWHITE+"Step 0: Running self git pull"+bcolors.ENDC)
selfpullresult = subprocess.check_output("git pull",shell=True)
if selfpullresult.strip()!="Already up-to-date.":
if selfpullresult.strip()!="Already up-to-date." and \
selfpullresult.strip()!="Already up to date.":
print(bcolors.WARNING+"Wasn't up-to-date. Please, rerun ./setup.py"+bcolors.ENDC)
sys.exit()
else:
......@@ -237,7 +238,7 @@ shout("ln -sf poky/build/tmp/deploy/images/elphel393/ bootable-images")
path = os.getcwd()
os.chdir(path+"/poky")
conf_notes = "meta-yocto/conf/conf-notes.txt"
conf_notes = "meta-poky/conf/conf-notes.txt"
if os.path.isfile(conf_notes):
os.remove(conf_notes)
......@@ -278,11 +279,12 @@ with open(bblayers_conf,"a") as f:
f.write("""\
BBLAYERS = " \\
{0}/poky/meta \\
{0}/poky/meta-yocto \\
{0}/poky/meta-poky \\
{0}/poky/meta-yocto-bsp \\
{0}/meta/meta-ezynq \\
{0}/meta/meta-elphel393 \\
{0}/meta/meta-xilinx \\
{0}/meta/meta-ros \\
{0}/meta/meta-xilinx/meta-xilinx-bsp \\
{0}/meta/meta-openembedded/meta-oe \\
{0}/meta/meta-openembedded/meta-python \\
{0}/meta/meta-openembedded/meta-networking \\
......@@ -319,11 +321,13 @@ REMOTE_USER ?= "root"
IDENTITY_FILE ?= "~/.ssh/id_rsa"
COPY_TO_NAND = "0"
REMOTE_IP ?= "192.168.0.9"
REMOTE_IP ?= "192.168.0.9"
REMOTE_NETMASK ?= "255.255.255.0"
REMOTE_GATEWAY ?= "192.168.0.15"
INITSTRING ?= "init_elphel393.py \\"{\\
\\\\"usb_hub\\\\" :1,\\
\\\\"ip\\\\" :1,\\
\\\\"ip\\\\" :0,\\
\\\\"imgsrv\\\\" :1,\\
\\\\"autoexp_daemon\\\\" :1,\\
\\\\"autocampars\\\\" :1,\\
......
<?xml version="1.0" encoding="UTF-8"?>
<project_paths>
<path>linux-elphel</path>
<path>rootfs-elphel/elphel-apps-astreamer</path>
<path>rootfs-elphel/elphel-apps-autocampars</path>
<path>rootfs-elphel/elphel-apps-autoexposure</path>
<path>rootfs-elphel/elphel-apps-camogm</path>
......