Skip to content

Commit 25da128

Browse files
Add 'qcom-distro' to DISTROOVERRIDES by default (qualcomm-linux#129)
Include 'qcom-distro' in DISTROOVERRIDES for all distros defined in meta-qcom-distro. This ensures consistent override handling and helps to avoid recipe refactoring while introducing new distros.
2 parents 00e3604 + 4f7d4f3 commit 25da128

File tree

4 files changed

+5
-8
lines changed

4 files changed

+5
-8
lines changed

conf/distro/include/qcom-base.inc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ SDK_VENDOR = "-qcomsdk"
77

88
TARGET_VENDOR = "-qcom"
99

10+
# Ensure 'qcom-distro' appear at most once in DISTROOVERRIDES
11+
DISTROOVERRIDES =. "${@ 'qcom-distro:' if d.getVar('DISTRO') != 'qcom-distro' else ''}"
12+
1013
DISTRO_FEATURES:append = " \
1114
bluetooth \
1215
efi \
Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# Go binaries on ARMv7 are built in a strange way
22
INSANE_SKIP:${PN}:append:arm:qcom-distro = " textrel"
3-
INSANE_SKIP:${PN}:append:arm:qcom-distro-sota = " textrel"
43

54
# workaround for permissions preventing rm_work to succeed
65
do_rm_work:prepend:qcom-distro() {
@@ -9,8 +8,3 @@ do_rm_work:prepend:qcom-distro() {
98
fi
109
}
1110

12-
do_rm_work:prepend:qcom-distro-sota() {
13-
if [ -d ${UNPACKDIR} ] ; then
14-
chmod u+w ${UNPACKDIR} -R
15-
fi
16-
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# Enable testapp
2-
PACKAGECONFIG:append = " testapp"
2+
PACKAGECONFIG:append:qcom-distro = " testapp"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Temporarily disable warnings due deprecated libxml2 APIs until the proper fix
22
# gets backported and merged in meta-virtualization
3-
CFLAGS:append:qcom = " -Wno-deprecated-declarations"
3+
CFLAGS:append:qcom-distro = " -Wno-deprecated-declarations"

0 commit comments

Comments
 (0)