From 88e13bb236fec2f3832eafe75391edd257350eea Mon Sep 17 00:00:00 2001 From: Norman Feske Date: Thu, 1 Sep 2022 14:56:49 +0200 Subject: [PATCH] base-linux: src/lib/initramfs -> /src/initramfs Move the target for initramfs outside the src/lib/ directory because target.mk files within src/lib/ are no longer reachable. Issue #4599 --- repos/base-linux/recipes/src/base-linux/content.mk | 2 +- repos/base-linux/src/{lib => }/initramfs/init.c | 0 repos/base-linux/src/{lib => }/initramfs/target.mk | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) rename repos/base-linux/src/{lib => }/initramfs/init.c (100%) rename repos/base-linux/src/{lib => }/initramfs/target.mk (72%) diff --git a/repos/base-linux/recipes/src/base-linux/content.mk b/repos/base-linux/recipes/src/base-linux/content.mk index ad1db4cc75..2751459570 100644 --- a/repos/base-linux/recipes/src/base-linux/content.mk +++ b/repos/base-linux/recipes/src/base-linux/content.mk @@ -12,5 +12,5 @@ content: sed -i "s/BOARD.*unknown/BOARD := linux/" lib/mk/core-linux.inc sed -i "s/ld-linux/ld/" src/lib/ld/linux/target.mk sed -i "s/linux_timer_drv/timer/" src/timer/linux/target.mk - rm -rf src/lib/initramfs + rm -rf src/initramfs diff --git a/repos/base-linux/src/lib/initramfs/init.c b/repos/base-linux/src/initramfs/init.c similarity index 100% rename from repos/base-linux/src/lib/initramfs/init.c rename to repos/base-linux/src/initramfs/init.c diff --git a/repos/base-linux/src/lib/initramfs/target.mk b/repos/base-linux/src/initramfs/target.mk similarity index 72% rename from repos/base-linux/src/lib/initramfs/target.mk rename to repos/base-linux/src/initramfs/target.mk index c684f26c29..b7146371f4 100644 --- a/repos/base-linux/src/lib/initramfs/target.mk +++ b/repos/base-linux/src/initramfs/target.mk @@ -5,14 +5,14 @@ REQUIRES = x86_64 INITRAMFS = initramfs INITRAMFS_SRC_C = init.c -EXT_OBJECTS += $(BUILD_BASE_DIR)/lib/initramfs/$(INITRAMFS) +EXT_OBJECTS += $(BUILD_BASE_DIR)/initramfs/$(INITRAMFS) $(TARGET): $(INITRAMFS) $(INITRAMFS): $(INITRAMFS_SRC_C) $(MSG_BUILD)$(INITRAMFS) $(VERBOSE)gcc $^ -O0 $(CC_MARCH) -Wall -W -Wextra -Werror -std=gnu99 -o $@ -Wl,-O3 -Wl,--as-needed -static - $(VERBOSE)ln -sf $(BUILD_BASE_DIR)/lib/initramfs/$(INITRAMFS) $(BUILD_BASE_DIR)/bin/ + $(VERBOSE)ln -sf $(BUILD_BASE_DIR)/initramfs/$(INITRAMFS) $(BUILD_BASE_DIR)/bin/ clean_initramfs: $(VERBOSE)rm -rf $(INITRAMFS)