diff --git a/image.in/Makefile b/image.in/Makefile index 27fc0798..e4cb64b2 100644 --- a/image.in/Makefile +++ b/image.in/Makefile @@ -52,7 +52,7 @@ GLOBAL_TARGET := $(ARCH) GLOBAL_HSH_APT_CONFIG := $(wildcard $(APTCONF)) # the lib/build-*.mk comes from features.in/build-*/lib -include lib/*.mk +include $(sort $(wildcard lib/*.mk)) include $(MKIMAGE_PREFIX)/targets.mk # specified only for the final image (target-specific) diff --git a/main.mk b/main.mk index e5f97f4f..924cb3d2 100644 --- a/main.mk +++ b/main.mk @@ -30,7 +30,7 @@ export MKIMAGE_PROFILES := $(realpath $(dir $(lastword $(MAKEFILE_LIST)))) -include $(HOME)/.mkimage/profiles.mk # most of the actual work done elsewhere -include lib/*.mk +include $(sort $(wildcard lib/*.mk)) include conf.d/*.mk include features.in/*/config.mk diff --git a/sub.in/main/Makefile b/sub.in/main/Makefile index 77eedc52..915f33ac 100644 --- a/sub.in/main/Makefile +++ b/sub.in/main/Makefile @@ -29,7 +29,7 @@ IMAGE_PACKAGES = $(call map,list, \ $(SYSTEM_PACKAGES) $(COMMON_PACKAGES) \ $(THE_PACKAGES) $(BASE_PACKAGES) $(MAIN_PACKAGES) --include lib/*.mk +-include $(sort $(wildcard lib/*.mk)) MKI_DESTDIR = ALTLinux/RPMS.main MKI_PACK_RESULTS = data diff --git a/sub.in/stage1/Makefile b/sub.in/stage1/Makefile index 8e94cb77..edf064b0 100644 --- a/sub.in/stage1/Makefile +++ b/sub.in/stage1/Makefile @@ -41,7 +41,7 @@ CHROOT_PACKAGES = $(STAGE1_PACKAGES) $(SYSTEM_PACKAGES) # pass for use/stage2 GLOBAL_SQUASHFS := $(SQUASHFS) --include lib/*.mk +-include $(sort $(wildcard lib/*.mk)) # scripts prepare bootloader configuration, too # NB: we pass tested squashfs options for ../stage2/Makefile to include diff --git a/sub.in/stage2/Makefile b/sub.in/stage2/Makefile index e12a7435..7f0e24be 100644 --- a/sub.in/stage2/Makefile +++ b/sub.in/stage2/Makefile @@ -37,7 +37,7 @@ IMAGE_PACKAGES_REGEXP += $(call kpackages, \ $(STAGE2_KMODULES) $(STAGE2_KMODULES_REGEXP), \ $(STAGE1_KFLAVOUR)) --include lib/*.mk +-include $(sort $(wildcard lib/*.mk)) # see also scripts.d/99-elf-stats ifdef GLOBAL_SQUASHFS_SORT