Skip to content

Commit e88afe2

Browse files
committed
partition-utils: use qcom-ptool
qcom-ptool is a new project which is part of Qualcomm Linux, where we intend to provide all partition tools to generate GPT images, flashing artefact, ... These tools were maintained in various places up until now, and there was a copy of them in meta-qcom for some of them. With this patch, we removed the local copy from meta-qcom, and fetch all the tools we need from the new 'upstream' qcom-ptool. Having these tools in a single, maintained repo (upstream) will make it easier for other distro to use them (such as our Qualcomm Linux Debian flavor). Since qcom-ptool provides both ptool.py and gen_partition.py, the qcom-gen-partitions-tool recipe is simply removed from here. This patch is effectively a no-op, and the tools we fetch are (at the time of this commit) exactly the same. qcom-ptool also has a copy of each platform partition configuration file. For now, we are not using them in meta-qcom, and instead we are keeping our own copy. It's not clear yet, how we will manage the partition config files over time, over multiple LTS releases.. and it's not clear that we can have a single partition config file that will work everywhere. This change can be done later if needed. The LICENSE md5 change is because of cosmetic changes in the LICENSE file, there is no change in the license itself. Signed-off-by: Nicolas Dechesne <[email protected]>
1 parent 6665d09 commit e88afe2

File tree

4 files changed

+6
-292
lines changed

4 files changed

+6
-292
lines changed

recipes-bsp/partition/qcom-partition-conf.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ DESCRIPTION = "GPT partition binaries and QDL scripts for ${MACHINE_DESC}."
33
LICENSE = "BSD-3-Clause-Clear"
44
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause-Clear;md5=7a434440b651f4a472ca93716d01033a"
55

6-
DEPENDS += "qcom-gen-partitions-tool-native qcom-ptool-native"
6+
DEPENDS += "qcom-ptool-native"
77

88
SRC_URI = "file://${PARTCONF}"
99

recipes-devtools/partition-utils/qcom-gen-partitions-tool/gen_partition.py

Lines changed: 0 additions & 259 deletions
This file was deleted.

recipes-devtools/partition-utils/qcom-gen-partitions-tool_1.0.bb

Lines changed: 0 additions & 23 deletions
This file was deleted.
Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
11
SUMMARY = "Qualcomm partitioning tool"
22
DESCRIPTION = "Partitioning tool, generates the GPT and/or Partition MBN"
3-
HOMEPAGE = "https://git.codelinaro.org/linaro/qcomlt/partioning_tool"
3+
HOMEPAGE = "https://github.com/qualcomm-linux/qcom-ptool"
44
SECTION = "devel"
55
LICENSE = "BSD-3-Clause"
6-
LIC_FILES_CHKSUM = "file://LICENSE;md5=7530c1d01d9cfee94e67d6a55e886db5"
6+
LIC_FILES_CHKSUM = "file://LICENSE;md5=b0a8acd90d872086b279ead88af03369"
77

88
RDEPENDS:${PN} += "python3-xml"
99

10-
SRC_URI = "git://git.codelinaro.org/linaro/qcomlt/partioning_tool.git;branch=master;protocol=https \
11-
file://0001-ptool.py-Generate-zero-files-in-output-folder-when-s.patch \
12-
file://0002-ptool.py-Python-3-support.patch \
13-
"
10+
SRC_URI = "git://github.com/qualcomm-linux/qcom-ptool.git;branch=main;protocol=https"
1411

15-
SRCREV = "3484fc0a88088dea00397774fc93f9acd3a23ce0"
12+
SRCREV = "be9d04e7940c777d361f05f0468e260ee493b76e"
1613

1714
PV = "0.0+git"
1815
S = "${WORKDIR}/git"
@@ -25,8 +22,7 @@ do_configure[noexec] = "1"
2522
do_compile[noexec] = "1"
2623

2724
do_install() {
28-
install -d ${D}${bindir}
29-
install -m 755 ${S}/ptool.py ${D}${bindir}/ptool.py
25+
oe_runmake install DESTDIR=${D} PREFIX=${prefix}
3026
}
3127

3228
BBCLASSEXTEND = "native nativesdk"

0 commit comments

Comments
 (0)