From 86777e27fcb6870694cd166866a37360b7591f5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Wed, 6 May 2015 17:08:30 +0200 Subject: Remove automatic initram build Not initram must be set and created manually by user. --- Makefile | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index ce3c188..5692342 100644 --- a/Makefile +++ b/Makefile @@ -2,9 +2,6 @@ -include .conf.mk -BENCHMARK_FILES := $(patsubst benchmark/%,scripts/buildroot/system/skeleton/usr/share/benchmark/%,$(shell find benchmark -type f)) -BENCHMARK_FOLDERS := $(shell dirname $(BENCHMARK_FILES)) - all: parse_kconfig write_config picosat help: @@ -41,10 +38,10 @@ mlinux: deflinux: ARCH=$(SRCARCH) $(MAKE) -C linux defconfig -test: $(INITRAM) parse_kconfig +test: $(BUILDROOT_INITRAM) parse_kconfig scripts/test.py -run: parse_kconfig write_config picosat $(INITRAM) +run: parse_kconfig write_config picosat $(BUILDROOT_INITRAM) scripts/loop.py evaluate: @@ -55,8 +52,6 @@ clean: @$(MAKE) -C scripts/write_config clean @if [ -e scripts/picosat-959/makefile ]; then $(MAKE) -C scripts/picosat-959 clean; fi $(RM) -r build - $(RM) -r scripts/buildroot/system/skeleton/usr/share/benchmark - $(RM) $(INITRAM) $(RM) $(NBSCRIPT) distclean: clean distclean_linux distclean_buildroot @@ -85,19 +80,9 @@ parse_kconfig: write_config: @$(MAKE) -C scripts/write_config/ -scripts/buildroot/system/skeleton/usr/share/%: - mkdir -p $@ - -build: - mkdir -p $@ - -$(BUILDROOT_INITRAM): scripts/buildroot/.config scripts/buildroot/system/skeleton/usr/bin/linux-conf-perf $(BENCHMARK_FILES) +$(BUILDROOT_INITRAM): scripts/buildroot/.config scripts/buildroot/system/skeleton/usr/bin/linux-conf-perf @$(MAKE) -C scripts/buildroot -$(INITRAM): build -$(INITRAM): $(BUILDROOT_INITRAM) - cp $< $@ - scripts/buildroot/.config: cp $(BUILDROOT_DEF_CONFIG) $@ @@ -105,10 +90,6 @@ scripts/buildroot/system/skeleton/usr/bin/linux-conf-perf: cp $(BUILDROOT_INITSCRIPT) $@ cat $(BUILDROOT_INITTAB_DIRECTIVE) >> scripts/buildroot/system/skeleton/etc/inittab -$(BENCHMARK_FILES): $(BENCHMARK_FOLDERS) -scripts/buildroot/system/skeleton/usr/share/benchmark/%: benchmark/% - cp $< $@ - picosat: scripts/picosat-959/picosat scripts/picosat-959/picosat: cd scripts/picosat-959 && ./configure -- cgit v1.2.3