Merge branch 'pr-updates' (#252)

intel-aero · Aug 4, 2017 · 9070934 · 9070934
2 parents b5f9e71 + 5fb26f1
commit 9070934
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 10 deletions.
diff --git a/recipes-cockpit/aero-cockpit-plugins/aero-cockpit-plugins_0.1.bb b/recipes-cockpit/aero-cockpit-plugins/aero-cockpit-plugins_0.1.bb
@@ -6,7 +6,7 @@ PR = "r1"
 DEPENDS = "cockpit"
 
 PV = "0.1+git${SRCPV}"
-SRCREV = "401415f1dfe4cfaa5e518e95fdb79609c8fdcffa"
+SRCREV = "15a693cbbc40b96fdf289dbf97078260de2bf215"
 SRC_URI = "git://github.com/intel-aero/aero-cockpit-plugins"
 
 S = "${WORKDIR}/git"

diff --git a/recipes-cockpit/cockpit/cockpit_145.bb b/recipes-cockpit/cockpit/cockpit_145.bb
@@ -29,7 +29,7 @@ SYSTEMD_SERVICE_${PN} = "cockpit.socket"
 # Avoid warnings "file XXX is owned by uid 1001, which is the same as the user running bitbake. This may be due to host contamination"
 INSANE_SKIP_${PN} += "host-user-contaminated"
 
-PACKAGES =+ "${PN}-bridge ${PN}-pcp ${PN}-docker ${PN}-ws ${PN}-system ${PN}-dashboard"
+PACKAGES =+ "${PN}-bridge ${PN}-pcp ${PN}-docker ${PN}-ws ${PN}-system ${PN}-dashboard ${PN}-networkmanager"
 
 FILES_${PN} += "${libdir}/firewalld \
                 ${libdir}/security \
@@ -64,6 +64,8 @@ FILES_${PN}-dashboard =+ "${datadir}/cockpit/dashboard \
                           ${libexecdir}/cockpit-ssh \
                           "
 
+FILES_${PN}-networkmanager =+ "${datadir}/cockpit/networkmanager"
+
 DEPENDS += "glib-2.0-native intltool-native"
 DEPENDS += "systemd gettext gtk+ json-glib polkit krb5 libpam"
 
@@ -80,7 +82,6 @@ do_install_append() {
     rm -rf ${D}${pkgdatadir}/kdump
     rm -rf ${D}${pkgdatadir}/kubernetes
     rm -rf ${D}${pkgdatadir}/machines
-    rm -rf ${D}${pkgdatadir}/networkmanager
     rm -rf ${D}${pkgdatadir}/ostree
     rm -rf ${D}${pkgdatadir}/packagekit
     rm -rf ${D}${pkgdatadir}/playground

diff --git a/recipes-core/images/intel-aero-image.bb b/recipes-core/images/intel-aero-image.bb
@@ -87,13 +87,17 @@ IMAGE_INSTALL += "cockpit-bridge"
 IMAGE_INSTALL += "cockpit-docker"
 IMAGE_INSTALL += "cockpit-system"
 IMAGE_INSTALL += "cockpit-dashboard"
+IMAGE_INSTALL += "aero-cockpit-plugins"
 
 # SimpleHTTPServer
 IMAGE_INSTALL += "aero-http-server"
 
 # repo metadata
 IMAGE_INSTALL += "intel-aero-repo"
 
+# bios
+IMAGE_INSTALL += "aero-bios"
+
 enable_repo() {
 		sed -i 's/enabled=0/enabled=1/' ${IMAGE_ROOTFS}/etc/yum.repos.d/intel-aero.repo
 }

diff --git a/...-support/ardupilot-fw/ardupilot-fw_0.1.bb → ...ardupilot-fw/ardupilot-fw_3.5.1-aerofc.bb b/...-support/ardupilot-fw/ardupilot-fw_0.1.bb → ...ardupilot-fw/ardupilot-fw_3.5.1-aerofc.bb
diff --git a/recipes-support/ardupilot-fw/files/arducopter-aerofc-v1.px4 b/recipes-support/ardupilot-fw/files/arducopter-aerofc-v1.px4
diff --git a/...port/mavlink-router/mavlink-router_0.1.bb → ...port/mavlink-router/mavlink-router_0.2.bb b/...port/mavlink-router/mavlink-router_0.1.bb → ...port/mavlink-router/mavlink-router_0.2.bb
@@ -3,7 +3,7 @@ DEPENDS = "python python-future"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=93888867ace35ffec2c845ea90b2e16b"
 
-SRCREV = "7196d3d827ac3f1e4e53f45c5a6e8bf8998c4ec1"
+SRCREV = "2de87d42501665df1ef7e707db23e1d25b8df245"
 SRC_URI = "gitsm://[email protected]/01org/mavlink-router.git;protocol=https;branch=master"
 SRC_URI += "file://mavlink-routerd.sh"
 SRC_URI += "file://main.conf"