From ef62e9c2301a6fe7a772129ccdffeb92fbcbf057 Mon Sep 17 00:00:00 2001 From: Tomaz Zaman Date: Thu, 13 Aug 2026 01:01:49 +0200 Subject: [PATCH 57/72] ask: bump pin to fe36f30; fix kernel-patch glob; derive pkg version from commit Bump ASK to fe36f305a473 -- SA-handle dedup (#2), ctnetlink permanent-conntrack status-delta (#3), real fmc error on PCD failure (#4), and the CTA_LAYERSCAPE_FP static_assert kernel + ASK-Yocto-userspace halves (#9). Refresh PKG_MIRROR_HASH for the new tarball across cmm, dpa-app and ask-modules. ASK_PKG_VERSION now derives from ASK_VERSION (1.0~<12-char sha>) so the apk version changes with the pinned commit instead of a hand-typed date string that two different commits could share. layerscape: apply patches/kernel/*.patch (minus the legacy 999-* monolith) instead of 0*.patch, which silently dropped every patch numbered >= 100 -- e.g. patch 100, the phyless-port ethtool log-spam fix. Also installs the S4 cmm-supervise wrapper (cmm/Makefile, alongside its hash). Co-Authored-By: Claude Opus 4.8 --- package/ask/ask-modules/Makefile | 2 +- package/ask/ask-version.mk | 14 ++++++++++---- package/ask/cmm/Makefile | 4 +++- package/ask/dpa-app/Makefile | 2 +- target/linux/layerscape/Makefile | 8 +++++--- 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/package/ask/ask-modules/Makefile b/package/ask/ask-modules/Makefile index 1d6445dedc..98bf0e7aa5 100644 --- a/package/ask/ask-modules/Makefile +++ b/package/ask/ask-modules/Makefile @@ -10,7 +10,7 @@ PKG_SOURCE_URL:=$(ASK_SOURCE_URL) PKG_SOURCE_VERSION:=$(ASK_VERSION) PKG_SOURCE:=$(ASK_SOURCE) PKG_SOURCE_SUBDIR:=ask-$(ASK_VERSION) -PKG_MIRROR_HASH:=6496547bfb2e9af9161f20ad9fe9ed7e931c2814644988bbb1ac8b77ef26761f +PKG_MIRROR_HASH:=0f14c3fade1cb7050d6d90c9951bea2957674d053f540a98964d1b70f06d5a03 PKG_LICENSE:=GPL-2.0 diff --git a/package/ask/ask-version.mk b/package/ask/ask-version.mk index a96bb25066..b519e013b9 100644 --- a/package/ask/ask-version.mk +++ b/package/ask/ask-version.mk @@ -1,13 +1,19 @@ # Single source of truth for the ASK revision used by all ASK packages. # Must match ASK_VERSION in target/linux/layerscape/Makefile so the kernel # patches and the userspace/modules always come from the same commit. -ASK_VERSION:=366dbbed6059e9cd150cc6f01204425eeb4ce659 +ASK_VERSION:=fe36f305a473d4121cf8613cc8c8c5a8496d8c48 ASK_SOURCE:=ask-$(ASK_VERSION).tar.xz ASK_SOURCE_URL:=https://github.com/we-are-mono/ASK -# APK-valid package version for ASK-sourced packages (apk rejects -# versions that do not start with a digit, so the raw sha cannot be used) -ASK_PKG_VERSION:=1.0_git20260812 +# APK-valid package version for ASK-sourced packages, DERIVED from ASK_VERSION +# so it changes whenever the pinned commit does. apk requires a leading digit +# (so the bare sha cannot be used) but accepts a ~ commit suffix — the +# same scheme the kernel package uses (e.g. 6.12.49~b9036c2b...). The old value +# was a hand-typed date string decoupled from the commit: two different commits +# could share one version, so an in-place `apk upgrade` would skip a new ASK and +# `apk list` misreported which commit was installed. (sysupgrade was unaffected — +# it reflashes the whole rootfs — but the version label lied.) +ASK_PKG_VERSION:=1.0~$(shell echo $(ASK_VERSION) | cut -c1-12) # NXP userspace components, pinned to the same LSDK tag as the kernel # (lf-6.12.49-2.2.0; expressed digits-only for apk) diff --git a/package/ask/cmm/Makefile b/package/ask/cmm/Makefile index 6f030a9c66..59f43d5b42 100644 --- a/package/ask/cmm/Makefile +++ b/package/ask/cmm/Makefile @@ -10,7 +10,7 @@ PKG_SOURCE_URL:=$(ASK_SOURCE_URL) PKG_SOURCE_VERSION:=$(ASK_VERSION) PKG_SOURCE:=$(ASK_SOURCE) PKG_SOURCE_SUBDIR:=ask-$(ASK_VERSION) -PKG_MIRROR_HASH:=6496547bfb2e9af9161f20ad9fe9ed7e931c2814644988bbb1ac8b77ef26761f +PKG_MIRROR_HASH:=0f14c3fade1cb7050d6d90c9951bea2957674d053f540a98964d1b70f06d5a03 PKG_BUILD_DIR:=$(BUILD_DIR)/cmm-ask-$(ASK_VERSION) PKG_BUILD_PARALLEL:=1 @@ -70,6 +70,8 @@ define Package/cmm/install $(INSTALL_BIN) $(PKG_BUILD_DIR)/cmm/src/cmm $(1)/usr/bin/ $(INSTALL_DIR) $(1)/etc/config $(INSTALL_DATA) $(PKG_BUILD_DIR)/config/fastforward $(1)/etc/config/fastforward + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) ./files/cmm-supervise $(1)/usr/sbin/cmm-supervise $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/cmm.init $(1)/etc/init.d/cmm endef diff --git a/package/ask/dpa-app/Makefile b/package/ask/dpa-app/Makefile index 0103346f20..a31c1fd4e9 100644 --- a/package/ask/dpa-app/Makefile +++ b/package/ask/dpa-app/Makefile @@ -10,7 +10,7 @@ PKG_SOURCE_URL:=$(ASK_SOURCE_URL) PKG_SOURCE_VERSION:=$(ASK_VERSION) PKG_SOURCE:=$(ASK_SOURCE) PKG_SOURCE_SUBDIR:=ask-$(ASK_VERSION) -PKG_MIRROR_HASH:=6496547bfb2e9af9161f20ad9fe9ed7e931c2814644988bbb1ac8b77ef26761f +PKG_MIRROR_HASH:=0f14c3fade1cb7050d6d90c9951bea2957674d053f540a98964d1b70f06d5a03 PKG_BUILD_DIR:=$(BUILD_DIR)/dpa-app-ask-$(ASK_VERSION) PKG_BUILD_DEPENDS:=fmlib fmc diff --git a/target/linux/layerscape/Makefile b/target/linux/layerscape/Makefile index 18ae394453..cbc950456e 100644 --- a/target/linux/layerscape/Makefile +++ b/target/linux/layerscape/Makefile @@ -46,7 +46,7 @@ DEFAULT_PACKAGES += kmod-usb3 kmod-usb-dwc3 kmod-usb-storage \ # repository is fetched at a pinned revision and its kernel patch series is # applied, followed by the OpenWrt-integration patches in patches-ask/ # (cherry-picks from the generic stack that OpenWrt userspace depends on). -ASK_VERSION:=366dbbed6059e9cd150cc6f01204425eeb4ce659 +ASK_VERSION:=fe36f305a473d4121cf8613cc8c8c5a8496d8c48 ASK_SOURCE:=ask-$(ASK_VERSION).tar.xz ASK_SUBDIR:=ask-$(ASK_VERSION) @@ -64,7 +64,8 @@ ifneq ($(call qstrip,$(CONFIG_KERNEL_GIT_CLONE_URI)),) KERNEL_FILE_DEPENDS+=$(PLATFORM_DIR)/patches-ask $(PLATFORM_DIR)/files-ask - # 0*.patch only: 999-* is the legacy 5.4 reference monolith, never applied. + # Apply every patches/kernel/*.patch EXCEPT the legacy 5.4 monolith (999-*). + # A bare 0*.patch glob silently dropped 100+ (e.g. the phyless-port ethtool fix). # files-ask/ overlays board files (mono-gateway-dk.dts, vendored from the # meta-mono layer) onto the vendor tree; the dtb-y append is idempotent. define Kernel/Prepare @@ -72,7 +73,8 @@ ifneq ($(call qstrip,$(CONFIG_KERNEL_GIT_CLONE_URI)),) rm -rf $(KERNEL_BUILD_DIR)/$(ASK_SUBDIR) $(KERNEL_BUILD_DIR)/ask-kernel-patches xzcat $(DL_DIR)/$(ASK_SOURCE) | $(TAR) -C $(KERNEL_BUILD_DIR) -xf - mkdir -p $(KERNEL_BUILD_DIR)/ask-kernel-patches - $(CP) $(KERNEL_BUILD_DIR)/$(ASK_SUBDIR)/patches/kernel/0*.patch $(KERNEL_BUILD_DIR)/ask-kernel-patches/ + $(CP) $(KERNEL_BUILD_DIR)/$(ASK_SUBDIR)/patches/kernel/*.patch $(KERNEL_BUILD_DIR)/ask-kernel-patches/ + rm -f $(KERNEL_BUILD_DIR)/ask-kernel-patches/999-*.patch $(call PatchDir,$(LINUX_DIR),$(KERNEL_BUILD_DIR)/ask-kernel-patches,ask/) $(call PatchDir,$(LINUX_DIR),$(PLATFORM_DIR)/patches-ask,ask-openwrt/) $(CP) $(PLATFORM_DIR)/files-ask/. $(LINUX_DIR)/ -- 2.47.3