make-3.82 adaptation

The issue actually hit image.in/Makefile: "metadata" target in features.in/metadata/lib/50-metadata.mk wasn't reached even if features.in/build-distro/lib/90-build-distro.mk would ACK that the "whatever" actions included "metadata"; thus Metadata/pkg-groups.tar wasn't created and the installer silently failed to install the .base system. Let's armour the rest of the cases where the order of inclusion might be important as well.

make-3.82 adaptation
6f5be918 · Michael Shigorin · 718a50b9 · 6f5be918 · 6f5be918 · 6f5be918
Commit 6f5be918 authored Oct 10, 2012 by Michael Shigorin
Showing with 5 additions and 5 deletions

Makefile image.in/Makefile +1 -1

main.mk main.mk +1 -1

Makefile sub.in/main/Makefile +1 -1

Makefile sub.in/stage1/Makefile +1 -1

Makefile sub.in/stage2/Makefile +1 -1

No files found.
--- 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)

--- 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


--- 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

--- 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

--- 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