Merge remote-tracking branch 'rojkov/meta-swupd3' into meta-swupd

ostroproject · Mar 30, 2016 · 20844e3 · 20844e3
2 parents 99c1761 + 8d8ac87
commit 20844e3
Show file tree

Hide file tree

Showing 30 changed files with 311 additions and 402 deletions.
diff --git a/meta-ostro/recipes-image/images/ostro-image.bb b/meta-ostro/recipes-image/images/ostro-image.bb
@@ -192,8 +192,6 @@ FEATURE_PACKAGES_soletta-tools = "soletta-dev-app"
 # because it is the most common source code management tool.
 FEATURE_PACKAGES_tools-develop = "packagegroup-core-buildessential git"
 
-FEATURE_PACKAGES_swupd = "packagegroup-swupd"
-
 FEATURE_PACKAGES_qatests = "packagegroup-qa-tests"
 
 # Use gummiboot as the EFI bootloader.

diff --git a/meta-ostro/recipes-swupd/clr-systemd-config/clr-systemd-config_98.bb b/meta-ostro/recipes-swupd/clr-systemd-config/clr-systemd-config_98.bb
diff --git a/meta-ostro/recipes-swupd/clr-systemd-config/files/0001-change-clear-path-to-Ostro-path.patch b/meta-ostro/recipes-swupd/clr-systemd-config/files/0001-change-clear-path-to-Ostro-path.patch
diff --git a/...ipes-swupd/clr-systemd-config/files/0002-systemd-service-for-updating-the-efi-combo.patch b/...ipes-swupd/clr-systemd-config/files/0002-systemd-service-for-updating-the-efi-combo.patch
diff --git a/meta-ostro/recipes-swupd/clr-systemd-config/files/clr-systemd-config-98.tar.gz b/meta-ostro/recipes-swupd/clr-systemd-config/files/clr-systemd-config-98.tar.gz
diff --git a/meta-ostro/recipes-swupd/packagegroups/packagegroup-swupd.bb b/meta-ostro/recipes-swupd/packagegroups/packagegroup-swupd.bb
diff --git a/...recipes-swupd/swupd-client/files/0001-change-systemctl-path-to-Ostro-systemctl-path.patch b/...recipes-swupd/swupd-client/files/0001-change-systemctl-path-to-Ostro-systemctl-path.patch
diff --git a/meta-ostro/recipes-swupd/swupd-client/files/0002-Fix-build-failure-on-Yocto.patch b/meta-ostro/recipes-swupd/swupd-client/files/0002-Fix-build-failure-on-Yocto.patch
diff --git a/meta-ostro/recipes-swupd/swupd-client/files/0003-Right-usage-of-AC_ARG_ENABLE-on-bzip2.patch b/meta-ostro/recipes-swupd/swupd-client/files/0003-Right-usage-of-AC_ARG_ENABLE-on-bzip2.patch
diff --git a/meta-ostro/recipes-swupd/swupd-client/files/0004-Tolerate-quotes-in-os-release-files.patch b/meta-ostro/recipes-swupd/swupd-client/files/0004-Tolerate-quotes-in-os-release-files.patch
diff --git a/meta-ostro/recipes-swupd/swupd-client/files/swupd-client-5700.tar.gz b/meta-ostro/recipes-swupd/swupd-client/files/swupd-client-5700.tar.gz
diff --git a/meta-ostro/recipes-swupd/swupd-client/oe-swupd-helpers.bbappend b/meta-ostro/recipes-swupd/swupd-client/oe-swupd-helpers.bbappend
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI_append = "file://efi-combo-trigger.service"
diff --git a/meta-ostro/recipes-swupd/swupd-client/oe-swupd-helpers/efi-combo-trigger.service b/meta-ostro/recipes-swupd/swupd-client/oe-swupd-helpers/efi-combo-trigger.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=Updates the EFI combo application
+BindsTo=update-triggers.target
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/efi_combo_updater
diff --git a/meta-ostro/recipes-swupd/swupd-client/oe-swupd-helpers/update-triggers.target b/meta-ostro/recipes-swupd/swupd-client/oe-swupd-helpers/update-triggers.target
@@ -0,0 +1,6 @@
+[Unit]
+Description=Post system update triggers
+Wants=ldconfig-trigger.service
+Wants=catalog-trigger.service
+Wants=tmpfiles-trigger.service
+Wants=efi-combo-trigger.service
diff --git a/...s/0005-Disable-boot-file-heuristics.patch → ...t/0001-Disable-boot-file-heuristics.patch b/...s/0005-Disable-boot-file-heuristics.patch → ...t/0001-Disable-boot-file-heuristics.patch
diff --git a/...pd/swupd-client/files/efi_combo_updater.c → ...d-client/swupd-client/efi_combo_updater.c b/...pd/swupd-client/files/efi_combo_updater.c → ...d-client/swupd-client/efi_combo_updater.c
diff --git a/meta-ostro/recipes-swupd/swupd-client/swupd-client_%.bbappend b/meta-ostro/recipes-swupd/swupd-client/swupd-client_%.bbappend
@@ -0,0 +1,16 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI_append = "file://0001-Disable-boot-file-heuristics.patch \
+                  file://efi_combo_updater.c \
+                 "
+
+RDEPENDS_${PN}_class-target_append = " gptfdisk"
+
+do_compile_append() {
+  ${CC} ${LDFLAGS} ${WORKDIR}/efi_combo_updater.c  -Os -o ${B}/efi_combo_updater `pkg-config --cflags --libs glib-2.0`
+}
+
+do_install_append () {
+    install -d ${D}/usr/bin
+    install ${B}/efi_combo_updater ${D}/usr/bin/
+}