Skip to content

Commit c177b30

Browse files
Tomaz Zamanigorpecovnik
authored andcommitted
gateway-dk-ask: fix Ubuntu build, pin ASK with GCC 14 fixes
- Fix deb-src enablement to handle both Debian (.sources in /etc/apt/sources.list.d/) and Ubuntu (ubuntu.sources) by iterating all *.sources files instead of checking only debian.sources - Pin ASK to commit with -Waddress-of-packed-member fixes for GCC 14 (Ubuntu Noble) and xtables __attribute__((constructor)) init
1 parent f28ccb1 commit c177b30

1 file changed

Lines changed: 11 additions & 7 deletions

File tree

extensions/gateway-dk-ask.sh

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# Source repos and refs (pinned to match Yocto)
1616
# For local testing: set ASK_REPO="file:///path/to/ASK" — the Docker mount hook below handles it
1717
declare -g ASK_REPO="https://github.com/we-are-mono/ASK.git"
18-
declare -g ASK_BRANCH="commit:4e73c4b467edb4508adaa4faa024ef5670132d47"
18+
declare -g ASK_BRANCH="commit:252b6db5a274383917c7a7688c931d61409978c2"
1919
declare -g FMLIB_REPO="https://github.com/nxp-qoriq/fmlib.git"
2020
declare -g FMLIB_COMMIT="7a58ecaf0d90d71d6b78d3ac7998282a472c4394"
2121
declare -g FMC_REPO="https://github.com/nxp-qoriq/fmc.git"
@@ -168,12 +168,16 @@ function pre_customize_image__000_prepare_ask_patches() {
168168
cp "${ASK_CACHE_DIR}/patches/${pdir}/"*.patch "${SDCARD}/tmp/ask-patches/"
169169
done
170170

171-
# Enable deb-src for apt-get source
172-
chroot_sdcard "if [ -f /etc/apt/sources.list.d/debian.sources ]; then \
173-
sed -i 's/^Types: deb\$/Types: deb deb-src/' /etc/apt/sources.list.d/debian.sources; \
174-
elif [ -f /etc/apt/sources.list ]; then \
175-
sed -i 's/^#\\s*deb-src/deb-src/' /etc/apt/sources.list; \
176-
fi && apt-get update -qq"
171+
# Enable deb-src for apt-get source (handles both Debian and Ubuntu)
172+
# deb822 format: *.sources files (Debian bookworm+, Ubuntu noble+)
173+
# Legacy format: sources.list (older Debian/Ubuntu)
174+
chroot_sdcard "shopt -s nullglob; \
175+
for f in /etc/apt/sources.list.d/*.sources; do \
176+
sed -i 's/^Types: deb\$/Types: deb deb-src/' \"\$f\"; \
177+
done; \
178+
if [ -f /etc/apt/sources.list ]; then \
179+
sed -i 's/^#\\s*deb-src/deb-src/' /etc/apt/sources.list; \
180+
fi && apt-get update -qq"
177181
chroot_sdcard_apt_get_install dpkg-dev devscripts
178182
}
179183

0 commit comments

Comments
 (0)