...
 
Commits (17)
...@@ -2,34 +2,41 @@ ...@@ -2,34 +2,41 @@
"meta" : { "meta" : {
"meta-openembedded":[ "meta-openembedded":[
"git://git.openembedded.org/meta-openembedded", "git://git.openembedded.org/meta-openembedded",
"master","73854a05565b30a5ca146ac53959c679b27815aa" "thud","a15d7f6ebcb0ed76c83c28f854d55e3f9d5b3677",
"#master","34aa4c3202b427f59f843dc43a4e1afda4f81d13"
], ],
"meta-xilinx":[ "meta-xilinx":[
"https://github.com/Xilinx/meta-xilinx.git", "https://github.com/Xilinx/meta-xilinx.git",
"master","cc146d6c170f100eb2f445047969893faa7a6a55" "master","a18947c20dba2c0c38db8bde1ad4684995df4bbd"
], ],
"meta-swupdate":[ "meta-swupdate":[
"https://github.com/sbabic/meta-swupdate.git", "https://github.com/sbabic/meta-swupdate.git",
"master","f6ab29cfac2b9c6da8881c754e2a316ea43b884d" "thud","f2b44eb89dd1145444bbb976c693ad0f9382a2da",
"#master","0fb115e97187c069f0da90163f1f374a6b7a4af7"
], ],
"meta-ezynq":[ "meta-ezynq":[
"https://git.elphel.com/Elphel/meta-ezynq.git", "https://git.elphel.com/Elphel/meta-ezynq.git",
"master","", "thud","",
"#master","00496002f513fc253f5356ee675fdcbb8b4a9962" "#master","00496002f513fc253f5356ee675fdcbb8b4a9962"
], ],
"meta-elphel393":[ "meta-elphel393":[
"https://git.elphel.com/Elphel/meta-elphel393.git", "https://git.elphel.com/Elphel/meta-elphel393.git",
"master","", "thud","",
"#master","a93edc1f91e82e5e613fa38bd800e307c348b9ee" "#master","a93edc1f91e82e5e613fa38bd800e307c348b9ee"
],
"meta-ros":[
"https://github.com/okdzhimiev/meta-ros.git",
"bouncy",""
] ]
}, },
"poky":[ "poky":[
"git://git.yoctoproject.org/poky.git", "git://git.yoctoproject.org/poky.git",
"master","3d2c0f5902cacf9d8544bf263b51ef0dd1a7218c" "thud","074cd4f22c8084a9aa8d60af5746ec22120c3155",
"#master","72867393fe2004ab9f0ee23eb09a975c82938b9e"
], ],
"linux-elphel" :[ "linux-elphel" :[
"https://git.elphel.com/Elphel/linux-elphel.git", "https://git.elphel.com/Elphel/linux-elphel.git",
"master","", "thud","",
"#master","cc50d7fa07140e680b09a8add617e62b4ba35aa0" "#master","cc50d7fa07140e680b09a8add617e62b4ba35aa0"
], ],
"fpga-elphel" : { "fpga-elphel" : {
...@@ -50,64 +57,72 @@ ...@@ -50,64 +57,72 @@
"rootfs-elphel": { "rootfs-elphel": {
"elphel-apps-imgsrv":[ "elphel-apps-imgsrv":[
"https://git.elphel.com/Elphel/elphel-apps-imgsrv.git", "https://git.elphel.com/Elphel/elphel-apps-imgsrv.git",
"master","" "thud",""
], ],
"elphel-apps-php-extension":[ "elphel-apps-php-extension":[
"https://git.elphel.com/Elphel/elphel-apps-php-extension.git", "https://git.elphel.com/Elphel/elphel-apps-php-extension.git",
"master","" "thud",""
], ],
"elphel-apps-camogm":[ "elphel-apps-camogm":[
"https://git.elphel.com/Elphel/elphel-apps-camogm.git", "https://git.elphel.com/Elphel/elphel-apps-camogm.git",
"master","" "thud",""
], ],
"elphel-udev-rules":[ "elphel-udev-rules":[
"https://git.elphel.com/Elphel/elphel-udev-rules.git", "https://git.elphel.com/Elphel/elphel-udev-rules.git",
"master","" "thud",""
], ],
"elphel-web-393":[ "elphel-web-393":[
"https://git.elphel.com/Elphel/elphel-web-393.git", "https://git.elphel.com/Elphel/elphel-web-393.git",
"master","" "thud",""
], ],
"elphel-apps-autocampars":[ "elphel-apps-autocampars":[
"https://git.elphel.com/Elphel/elphel-apps-autocampars.git", "https://git.elphel.com/Elphel/elphel-apps-autocampars.git",
"master","" "thud",""
], ],
"elphel-apps-autoexposure":[ "elphel-apps-autoexposure":[
"https://git.elphel.com/Elphel/elphel-apps-autoexposure.git", "https://git.elphel.com/Elphel/elphel-apps-autoexposure.git",
"master","" "thud",""
], ],
"elphel-apps-histograms":[ "elphel-apps-histograms":[
"https://git.elphel.com/Elphel/elphel-apps-histograms.git", "https://git.elphel.com/Elphel/elphel-apps-histograms.git",
"master","" "thud",""
], ],
"elphel-web-camvc":[ "elphel-web-camvc":[
"https://git.elphel.com/Elphel/elphel-web-camvc.git", "https://git.elphel.com/Elphel/elphel-web-camvc.git",
"master","" "thud",""
], ],
"elphel-apps-editconf":[ "elphel-apps-editconf":[
"https://git.elphel.com/Elphel/elphel-apps-editconf.git", "https://git.elphel.com/Elphel/elphel-apps-editconf.git",
"master","" "thud",""
], ],
"elphel-init":[ "elphel-init":[
"https://git.elphel.com/Elphel/elphel-init.git", "https://git.elphel.com/Elphel/elphel-init.git",
"master","" "thud",""
], ],
"elphel-web-hwmon":[ "elphel-web-hwmon":[
"https://git.elphel.com/Elphel/elphel-web-hwmon.git", "https://git.elphel.com/Elphel/elphel-web-hwmon.git",
"master","" "thud",""
], ],
"elphel-apps-tempmon":[ "elphel-apps-tempmon":[
"https://git.elphel.com/Elphel/elphel-apps-tempmon.git", "https://git.elphel.com/Elphel/elphel-apps-tempmon.git",
"master","" "thud",""
], ],
"elphel-apps-gps":[ "elphel-apps-gps":[
"https://git.elphel.com/Elphel/elphel-apps-gps.git", "https://git.elphel.com/Elphel/elphel-apps-gps.git",
"master","" "thud",""
], ],
"elphel-apps-astreamer":[ "elphel-apps-astreamer":[
"https://git.elphel.com/Elphel/elphel-apps-astreamer.git", "https://git.elphel.com/Elphel/elphel-apps-astreamer.git",
"master","" "thud",""
] ],
"ros2-scripts":[
"https://git.elphel.com/Elphel/ros2-scripts.git",
"thud",""
],
"ros2-interfaces":[
"https://git.elphel.com/Elphel/ros2-interfaces.git",
"thud",""
]
}, },
"tools" : { "tools" : {
"elphel-tools-update":[ "elphel-tools-update":[
...@@ -115,4 +130,4 @@ ...@@ -115,4 +130,4 @@
"master","" "master",""
] ]
} }
} }
\ No newline at end of file
...@@ -178,7 +178,8 @@ def update_branch(names_from_conf,name_from_list,pars,git_proto): ...@@ -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) print(bcolors.BOLDWHITE+"Step 0: Running self git pull"+bcolors.ENDC)
selfpullresult = subprocess.check_output("git pull",shell=True) 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) print(bcolors.WARNING+"Wasn't up-to-date. Please, rerun ./setup.py"+bcolors.ENDC)
sys.exit() sys.exit()
else: else:
...@@ -237,7 +238,7 @@ shout("ln -sf poky/build/tmp/deploy/images/elphel393/ bootable-images") ...@@ -237,7 +238,7 @@ shout("ln -sf poky/build/tmp/deploy/images/elphel393/ bootable-images")
path = os.getcwd() path = os.getcwd()
os.chdir(path+"/poky") 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): if os.path.isfile(conf_notes):
os.remove(conf_notes) os.remove(conf_notes)
...@@ -278,11 +279,12 @@ with open(bblayers_conf,"a") as f: ...@@ -278,11 +279,12 @@ with open(bblayers_conf,"a") as f:
f.write("""\ f.write("""\
BBLAYERS = " \\ BBLAYERS = " \\
{0}/poky/meta \\ {0}/poky/meta \\
{0}/poky/meta-yocto \\ {0}/poky/meta-poky \\
{0}/poky/meta-yocto-bsp \\ {0}/poky/meta-yocto-bsp \\
{0}/meta/meta-ezynq \\ {0}/meta/meta-ezynq \\
{0}/meta/meta-elphel393 \\ {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-oe \\
{0}/meta/meta-openembedded/meta-python \\ {0}/meta/meta-openembedded/meta-python \\
{0}/meta/meta-openembedded/meta-networking \\ {0}/meta/meta-openembedded/meta-networking \\
...@@ -319,11 +321,13 @@ REMOTE_USER ?= "root" ...@@ -319,11 +321,13 @@ REMOTE_USER ?= "root"
IDENTITY_FILE ?= "~/.ssh/id_rsa" IDENTITY_FILE ?= "~/.ssh/id_rsa"
COPY_TO_NAND = "0" 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 \\"{\\ INITSTRING ?= "init_elphel393.py \\"{\\
\\\\"usb_hub\\\\" :1,\\ \\\\"usb_hub\\\\" :1,\\
\\\\"ip\\\\" :1,\\ \\\\"ip\\\\" :0,\\
\\\\"imgsrv\\\\" :1,\\ \\\\"imgsrv\\\\" :1,\\
\\\\"autoexp_daemon\\\\" :1,\\ \\\\"autoexp_daemon\\\\" :1,\\
\\\\"autocampars\\\\" :1,\\ \\\\"autocampars\\\\" :1,\\
...@@ -332,6 +336,7 @@ INITSTRING ?= "init_elphel393.py \\"{\\ ...@@ -332,6 +336,7 @@ INITSTRING ?= "init_elphel393.py \\"{\\
\\\\"eyesis\\\\" :0 \\ \\\\"eyesis\\\\" :0 \\
}\\"" }\\""
MACHINE_DEVICETREE = "elphel393_4_mt9p006.dts" MACHINE_DEVICETREE = "elphel393_4_mt9p006.dts"
PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ezynq-binaries"
""") """)
if missing_bblayers_conf==0: if missing_bblayers_conf==0:
......