From 17037081ce680a1c9f98676681856b282075e3b4 Mon Sep 17 00:00:00 2001 From: Anton Midyukov Date: Sun, 23 Jul 2023 11:26:54 +0700 Subject: [PATCH] set GLOBAL_HSH_PROC=1 in lib/profile.mk glibc can be compiled such that mki-fake-dev requires /proc to works. This on loongarch64. --- features.in/build-vm/config.mk | 1 - features.in/hdt/config.mk | 1 - features.in/stage2/config.mk | 1 - lib/profile.mk | 1 + 4 files changed, 1 insertion(+), 3 deletions(-) diff --git a/features.in/build-vm/config.mk b/features.in/build-vm/config.mk index f535a57a..8d2153a1 100644 --- a/features.in/build-vm/config.mk +++ b/features.in/build-vm/config.mk @@ -1,4 +1,3 @@ # hooked from lib/sugar.mk use/build-vm: sub/rootfs@/ use/kernel/initrd-setup @$(call add_feature) - @$(call set,GLOBAL_HSH_PROC,1) diff --git a/features.in/hdt/config.mk b/features.in/hdt/config.mk index be05678c..ea0b2afe 100644 --- a/features.in/hdt/config.mk +++ b/features.in/hdt/config.mk @@ -6,7 +6,6 @@ use/hdt: use/syslinux use/memtest @$(call add,STAGE1_PACKAGES,dosfstools) @$(call add,SYSLINUX_MODULES,hdt) @$(call add,GRUB_CFG,hdt_bios) - @$(call set,GLOBAL_HSH_PROC,1) else use/hdt: ; @: endif diff --git a/features.in/stage2/config.mk b/features.in/stage2/config.mk index 25087dc1..c310fbf7 100644 --- a/features.in/stage2/config.mk +++ b/features.in/stage2/config.mk @@ -5,7 +5,6 @@ use/stage2:: sub/stage1 @$(call add,STAGE1_MODLISTS,$$(FEATURES)) @$(call xport,STAGE1_PACKAGES) @$(call xport,STAGE1_KCONFIG) - @$(call set,GLOBAL_HSH_PROC,1) ifneq (,$(filter-out e2k%,$(ARCH))) ifeq (sisyphus,$(BRANCH)) diff --git a/lib/profile.mk b/lib/profile.mk index 04738391..92810ea1 100644 --- a/lib/profile.mk +++ b/lib/profile.mk @@ -105,6 +105,7 @@ ifeq (sisyphus,$(BRANCH)) else @$(call try,BRANDING,alt-starterkit) endif + @$(call set,GLOBAL_HSH_PROC,1) @$(call add,PINNED_PACKAGES,branding-$$(BRANDING)-alterator:Essential) @$(call add,PINNED_PACKAGES,branding-$$(BRANDING)-bootsplash:Essential) @$(call add,PINNED_PACKAGES,branding-$$(BRANDING)-bootloader:Essential)