Repository: qualcomm-linux/meta-qcom
Pull request #909: qbootctl: update to 0.2.2
Author: login: koenkooi
Created: 2025-05-22T11:33:46Z | Merged: 2025-05-22T12:50:07Z

* Move to the new upstream location on github
* Drop patch that was applied upstream
* Fix typo in service file name 'clt' vs 'ctl'
* Drop zlib dependency
* License checksum change due to addition of Apache license that previously was inside source files.


Diff:
diff --git a/recipes-support/qbootctl/files/0001-Fix-to-uint32_t-has-not-been-declared.patch b/recipes-support/qbootctl/files/0001-Fix-to-uint32_t-has-not-been-declared.patch
deleted file mode 100644
index 9a374bf7..00000000
--- a/recipes-support/qbootctl/files/0001-Fix-to-uint32_t-has-not-been-declared.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 26d488b38a0357468b8657f283ad24a433e30beb Mon Sep 17 00:00:00 2001
-From: alefnode <adrian.campos@teachelp.com>
-Date: Thu, 4 May 2023 09:15:29 +0200
-Subject: [PATCH] Fix to << uint32_t has not been declared >>
-
-Upstream-Status: Submitted [https://gitlab.com/sdm845-mainline/qbootctl/-/commit/df63d7c21c19a3e3afb41d029b97b9d068880484]
-Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
----
- bootctrl_impl.cpp | 1 +
- gpt-utils.h       | 1 +
- qbootctl.cpp      | 1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/bootctrl_impl.cpp b/bootctrl_impl.cpp
-index 7c1a082..59fcc7d 100644
---- a/bootctrl_impl.cpp
-+++ b/bootctrl_impl.cpp
-@@ -30,6 +30,7 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <limits.h>
-+#include <stdint.h>
- 
- #include "utils.h"
- #include "gpt-utils.h"
-diff --git a/gpt-utils.h b/gpt-utils.h
-index 319f3fe..f153012 100644
---- a/gpt-utils.h
-+++ b/gpt-utils.h
-@@ -37,6 +37,7 @@ extern "C" {
- #endif
- #include <unistd.h>
- #include <stdlib.h>
-+#include <stdint.h>
- 
- #define GPT_SIGNATURE		"EFI PART"
- #define HEADER_SIZE_OFFSET	12
-diff --git a/qbootctl.cpp b/qbootctl.cpp
-index 0225f0f..3559e29 100644
---- a/qbootctl.cpp
-+++ b/qbootctl.cpp
-@@ -25,6 +25,7 @@
- #include <string.h>
- #include <stdlib.h>
- #include <unistd.h>
-+#include <cstdint>
- 
- #include "bootctrl.h"
- 
diff --git a/recipes-support/qbootctl/files/qbootclt-bless-boot.service.in b/recipes-support/qbootctl/files/qbootctl-bless-boot.service.in
similarity index 94%
rename from recipes-support/qbootctl/files/qbootclt-bless-boot.service.in
rename to recipes-support/qbootctl/files/qbootctl-bless-boot.service.in
index 6227a5c3..d8c2fa8f 100644
--- a/recipes-support/qbootctl/files/qbootclt-bless-boot.service.in
+++ b/recipes-support/qbootctl/files/qbootctl-bless-boot.service.in
@@ -21,3 +21,6 @@ Before=shutdown.target
 Type=oneshot
 RemainAfterExit=yes
 ExecStart=@bindir@/qbootctl -m
+
+[Install]
+WantedBy=multi-user.target
diff --git a/recipes-support/qbootctl/qbootctl_0.1.2.bb b/recipes-support/qbootctl/qbootctl_0.1.2.bb
deleted file mode 100644
index c51847c8..00000000
--- a/recipes-support/qbootctl/qbootctl_0.1.2.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-SUMMARY = "A port of the Qualcomm Android bootctrl HAL for musl/glibc userspace"
-HOMEPAGE = "https://gitlab.com/sdm845-mainline/qbootctl"
-LICENSE = "GPL-3.0-only"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=1ebbd3e34237af26da5dc08a4e440464"
-
-SRCREV = "77b48f092a3690d587e2d3b1e30cf8bc2abf87e7"
-SRC_URI = "git://gitlab.com/sdm845-mainline/qbootctl.git;protocol=https;branch=main \
-           file://qbootclt-bless-boot.service.in \
-           file://0001-Fix-to-uint32_t-has-not-been-declared.patch \
-           "
-
-DEPENDS = "zlib"
-
-S = "${WORKDIR}/git"
-
-PV = "0.1.2"
-
-inherit meson systemd
-
-do_install:append () {
-	install -d ${D}${systemd_system_unitdir}
-	sed 's:@bindir@:${bindir}:' < ${UNPACKDIR}/qbootclt-bless-boot.service.in > ${D}${systemd_system_unitdir}/qbootclt-bless-boot.service
-}
-
-SYSTEMD_SERVICE:${PN} = "qbootclt-bless-boot.service"
diff --git a/recipes-support/qbootctl/qbootctl_git.bb b/recipes-support/qbootctl/qbootctl_git.bb
new file mode 100644
index 00000000..981860cd
--- /dev/null
+++ b/recipes-support/qbootctl/qbootctl_git.bb
@@ -0,0 +1,22 @@
+SUMMARY = "A port of the Qualcomm Android bootctrl HAL for musl/glibc userspace"
+HOMEPAGE = "https://gitlab.com/sdm845-mainline/qbootctl"
+LICENSE = "GPL-3.0-only"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=7475d4a045b602c247a1b641ad13d139"
+
+SRCREV = "39a6e6daaf029fb0a083777679a15ea2c18f72de"
+SRC_URI = "git://github.com/linux-msm/qbootctl.git;protocol=https;branch=main \
+           file://qbootctl-bless-boot.service.in \
+           "
+
+S = "${WORKDIR}/git"
+
+PV = "0.2.2"
+
+inherit meson systemd
+
+do_install:append () {
+	install -d ${D}${systemd_system_unitdir}
+	sed 's:@bindir@:${bindir}:' < ${UNPACKDIR}/qbootctl-bless-boot.service.in > ${D}${systemd_system_unitdir}/qbootctl-bless-boot.service
+}
+
+SYSTEMD_SERVICE:${PN} = "qbootctl-bless-boot.service"


Reviews:
user: login: ndechesne
state: DISMISSED
author_association: CONTRIBUTOR
submitted_at: 2025-05-22T11:43:59Z
user: login: ndechesne
state: COMMENTED
author_association: CONTRIBUTOR
submitted_at: 2025-05-22T11:58:16Z
user: login: koenkooi
state: COMMENTED
author_association: CONTRIBUTOR
submitted_at: 2025-05-22T12:07:20Z
user: login: lumag
state: APPROVED
author_association: CONTRIBUTOR
submitted_at: 2025-05-22T12:30:52Z
user: login: ndechesne
state: APPROVED
author_association: CONTRIBUTOR
submitted_at: 2025-05-22T12:50:05Z
user: login: ndechesne
state: COMMENTED
author_association: CONTRIBUTOR
submitted_at: 2025-05-23T14:17:32Z

Review comments:
diff_hunk: @@ -21,3 +21,6 @@ Before=shutdown.target
 Type=oneshot
 RemainAfterExit=yes
 ExecStart=@bindir@/qbootctl -m
+
path: recipes-support/qbootctl/files/qbootctl-bless-boot.service.in
user: login: ndechesne
body: nice catch!
Any specific reason why this file is called qbootctl-bless-boot.service? debian uses qbootctl.service which seems proper.
created_at: 2025-05-22T11:58:16Z
author_association: CONTRIBUTOR
diff_hunk: @@ -21,3 +21,6 @@ Before=shutdown.target
 Type=oneshot
 RemainAfterExit=yes
 ExecStart=@bindir@/qbootctl -m
+
path: recipes-support/qbootctl/files/qbootctl-bless-boot.service.in
user: login: koenkooi
body: Systemd has a systemd-bless-boot.service, maybe it was meant to match that? I can change this quite easily.
created_at: 2025-05-22T12:07:20Z
author_association: CONTRIBUTOR
diff_hunk: @@ -21,3 +21,6 @@ Before=shutdown.target
 Type=oneshot
 RemainAfterExit=yes
 ExecStart=@bindir@/qbootctl -m
+
path: recipes-support/qbootctl/files/qbootctl-bless-boot.service.in
user: login: ndechesne
body: it's not needed for this PR. we should merge it. I just noticed while reviewing!
created_at: 2025-05-23T14:17:32Z
author_association: CONTRIBUTOR

PR comments:
user: login: github-actions[bot]
created_at: 2025-05-22T12:15:51Z
body: ## Test jobs for commit 50bd9de9951261253443b84304334e38f70784e8
 * [Job 75602 on qcs6490](https://lava.infra.foundries.io/scheduler/job/75602)
 * [Job 75604 on qrb2210-rb1](https://lava.infra.foundries.io/scheduler/job/75604)
 * [Job 75603 on qcs9100](https://lava.infra.foundries.io/scheduler/job/75603)
 * [Job 75605 on qcs9100-rb8](https://lava.infra.foundries.io/scheduler/job/75605)

author_association: NONE
user: login: github-actions[bot]
created_at: 2025-05-22T12:29:43Z
body: ## Test jobs for commit e07bf755d1504eac82788c270030538b3cc4b135
 * [Job 75612 on qcs9100-rb8](https://lava.infra.foundries.io/scheduler/job/75612)
 * [Job 75611 on qcs6490](https://lava.infra.foundries.io/scheduler/job/75611)
 * [Job 75609 on qrb2210-rb1](https://lava.infra.foundries.io/scheduler/job/75609)
 * [Job 75610 on qcs9100](https://lava.infra.foundries.io/scheduler/job/75610)

author_association: NONE
user: login: github-actions[bot]
created_at: 2025-05-22T12:55:10Z
body: ## Test jobs for commit 0e512abd6531c851d9a27f67ec0ee1f73de8a21a
 * [Job 75620 on qcs9100-rb8](https://lava.infra.foundries.io/scheduler/job/75620)
 * [Job 75618 on qrb2210-rb1](https://lava.infra.foundries.io/scheduler/job/75618)
 * [Job 75617 on qcs9100](https://lava.infra.foundries.io/scheduler/job/75617)
 * [Job 75619 on qcs6490](https://lava.infra.foundries.io/scheduler/job/75619)

author_association: NONE