Whamcloud - gitweb
LU-18054 build: Debian 12 with module-assistant 0.11.11 17/55817/2
authorShaun Tancheff <shaun.tancheff@hpe.com>
Sat, 20 Jul 2024 04:46:23 +0000 (11:46 +0700)
committerOleg Drokin <green@whamcloud.com>
Thu, 8 Aug 2024 00:17:48 +0000 (00:17 +0000)
Building with module-assistant 0.11.11 fails in module-assistant
prep-deb-files generic.make rule:

   The required compiler '<...gcc-12 make...>' is not installed, \
   won't continue!
   Set RELAX_CC_CHECK variable to skip plausibility checks.

Suppress the auto detection by explicitly setting
CC and RELAX_CC_CHECK when running m-a

HPE-bug-id: LUS-12443
Test-Parameters: trivial
Signed-off-by: Shaun Tancheff <shaun.tancheff@hpe.com>
Change-Id: Icb2330884b542ba2a1a36b0318a3551c14c8ea09
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/55817
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Caleb Carlson <caleb.carlson@hpe.com>
Reviewed-by: Shuichi Ihara <sihara@ddn.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Petros Koutoupis <petros.koutoupis@hpe.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
autoMakefile.am
debian/rules

index 62ebee6..11c423a 100644 (file)
@@ -554,6 +554,7 @@ debs: undef.h debs_common
        export KSRC_TREE=$(LINUX) && \
        KSRC=$${KSRC:-$(LINUX_OBJ)} && \
        TARBALL=$$(realpath usr/src/lustre-$${SRC_GIT_HASH}.tar.bz2) \
+       CC=$(CC) RELAX_CC_CHECK=$(CC) \
        m-a build $${KSRC:+-k $$KSRC} $${KVERS:+-l $$KVERS} -i -u $$(pwd) lustre && \
        popd && \
        VER=$$(sed -ne '1s/^lustre (\(.*-[0-9][0-9]*\)).*$$/\1/p' debian/changelog) && \
@@ -572,6 +573,7 @@ debs: undef.h debs_common
           ../lustre_$${VER}.dsc ../lustre_$${VER}_*.changes \
           ../lustre_$${VER}.tar.gz ../lustre-*-modules-$${KVERS}_$${VER}_*.deb \
           ../lustre-*-dbgsym_$${VER}_*.ddeb ../lustre_$${VER}_*.buildinfo \
+          ../lustre-*-dbgsym_$${VER}_*.deb \
           debs/ 2> /dev/null || true
 
 dkms-debs: undef.h debs_common
index 7fe4c68..b180856 100755 (executable)
@@ -474,6 +474,7 @@ binary-kern-mods:
        # Build client or server modules
        mkdir -p debian/m-a_root/usr_src/modules
        ln -s ../../../../ debian/m-a_root/usr_src/modules/lustre
+       CC=$(CC) RELAX_CC_CHECK=$(CC) \
        m-a -t -u debian/m-a_root/ -d -v -k $(KSRC) build lustre
        mv -f debian/m-a_root/*.deb ..